Add support for configuring version control system (#19)

* Update to use the new library (https://github.com/tomtucka/go-circleci)
* Add support for configuring the version control system
* Update documentation

Author: TomTucka

circleci/config.go

@@ -1,16 +1,18 @@
 package circleci
 
 import (
-	"github.com/jszwedko/go-circleci"
+	"github.com/TomTucka/go-circleci"
 )
 
 type Config struct {
 	Token        string
 	Organization string
+	vcs          string
 }
 
 type Organization struct {
 	name   string
+	VCS    string
 	client *circleci.Client
 }
 
@@ -19,6 +21,7 @@ func (c *Config) Client() (interface{}, error) {
 
 	org.name = c.Organization
 	org.client = &circleci.Client{Token: c.Token}
+	org.VCS = c.vcs
 
 	return &org, nil
 }

circleci/provider.go

@@ -19,6 +19,12 @@ func Provider() *schema.Provider {
 				DefaultFunc: schema.EnvDefaultFunc("CIRCLECI_ORGANIZATION", nil),
 				Description: "CircleCI organization name to manage.",
 			},
+			"vcs_type": {
+				Type:        schema.TypeString,
+				Required:    true,
+				DefaultFunc: schema.EnvDefaultFunc("CIRCLECI_VCS_TYPE", "github"),
+				Description: "The VCS type for the organization.",
+			},
 		},
 		ResourcesMap: map[string]*schema.Resource{
 			"circleci_project":              resourceCircleciProject(),
@@ -34,6 +40,7 @@ func providerConfiguretest(p *schema.Provider) schema.ConfigureFunc {
 		config := Config{
 			Token:        d.Get("token").(string),
 			Organization: d.Get("organization").(string),
+			vcs:          d.Get("vcs_type").(string),
 		}
 
 		return config.Client()

circleci/provider_test.go

@@ -1,8 +1,9 @@
 package circleci
 
 import (
-	"github.com/stretchr/testify/require"
 	"testing"
+
+	"github.com/stretchr/testify/require"
 )
 
 func TestProvider_HasChildResources(t *testing.T) {
@@ -24,11 +25,13 @@ func TestProvider_SchemaIsValid(t *testing.T) {
 	type testParams struct {
 		token        string
 		organization string
+		vcs          string
 	}
 
 	tests := []testParams{
-		{"myTestToken", "terraform-providers-circleci"},
-		{"myTestToken", "terraform-providers-circleci"},
+		{"myTestToken", "terraform-providers-circleci", "github"},
+		{"myTestToken", "terraform-providers-circleci", "github"},
+		{"myTestToken", "terraform-providers-circleci", "github"},
 	}
 
 	schema := Provider().Schema
@@ -37,5 +40,6 @@ func TestProvider_SchemaIsValid(t *testing.T) {
 	for _, test := range tests {
 		require.NotEmpty(t, test.token, "A property in the schema cannot have a nil value")
 		require.NotNil(t, test.organization, "A property in the schema cannot have a nil value")
+		require.NotNil(t, test.organization, "A property in the schema cannot have a nil value")
 	}
 }

circleci/resource_circleci_environment_variable.go

@@ -2,6 +2,7 @@ package circleci
 
 import (
 	"fmt"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -35,10 +36,11 @@ func resourceCircleciEnvVar() *schema.Resource {
 func resourceCircleciEnvVarCreate(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Organization).client
 	organization := meta.(*Organization).name
+	vcs := meta.(*Organization).VCS
 	project := d.Get("project").(string)
 	name := d.Get("name").(string)
 	value := d.Get("value").(string)
-	_, err := client.AddEnvVar(organization, project, name, value)
+	_, err := client.AddEnvVar(vcs, organization, project, name, value)
 	if err != nil {
 		return err
 	}
@@ -57,7 +59,8 @@ func resourceCircleciEnvVarUpdate(d *schema.ResourceData, meta interface{}) erro
 func resourceCircleciEnvVarDelete(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Organization).client
 	organization := meta.(*Organization).name
+	vcs := meta.(*Organization).VCS
 	project := d.Get("project").(string)
 	name := d.Get("name").(string)
-	return client.DeleteEnvVar(organization, project, name)
+	return client.DeleteEnvVar(vcs, organization, project, name)
 }

circleci/resource_circleci_project.go

@@ -31,18 +31,19 @@ func resourceCircleciProject() *schema.Resource {
 func resourceCircleciProjectCreate(d *schema.ResourceData, m interface{}) error {
 	client := m.(*Organization).client
 	organization := m.(*Organization).name
+	vcs := m.(*Organization).VCS
 	project := d.Get("name").(string)
 	envVars := d.Get("env_vars").(map[string]interface{})
 
-	_, err := client.FollowProject(organization, project)
+	_, err := client.FollowProject(vcs, organization, project)
 	if err != nil {
 		return err
 	}
 
 	d.SetId(project)
 
 	for name, value := range envVars {
-		_, err := client.AddEnvVar(organization, project, name, value.(string))
+		_, err := client.AddEnvVar(vcs, organization, project, name, value.(string))
 		if err != nil {
 			return err
 		}

go.mod

@@ -4,6 +4,6 @@ go 1.14
 
 require (
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.0.0-rc.2
-	github.com/jszwedko/go-circleci v0.3.0
+	github.com/TomTucka/go-circleci v0.4.0
 	github.com/stretchr/testify v1.3.0
 )

go.sum

@@ -9,6 +9,9 @@ cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbf
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/TomTucka/go-circleci v0.4.0 h1:bdpyE9CeIwuCHdy+XhF4zccchf5lkkBsZnaRHszEvKw=
+github.com/TomTucka/go-circleci v0.4.0/go.mod h1:PHouc3cpjYcabxbkLi/XG3EEu/pAWaBWdyJGlXn3aqY=
+github.com/TomTucka/go-circleci v1.0.0 h1:T6cXnkJ4FVpk9eSZNMxYWQwFLBlKs5nkaeCqrg+Vaow=
 github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
 github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE=
 github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=

website/docs/r/environment_variable.html.markdown website/docs/environment_variable.html.markdown

@@ -13,7 +13,16 @@ The CircleCI provider provides resources to interact with and manage CircleCI pr
 
 ```terraform
 provider "circleci" {
-  token        = var.circleci_token 
-  organization = "YourOrganizationName" 
+  token        = var.circleci_token # optionally use CIRCLECI_TOKEN env var
+  organization = "YourOrganizationName" # optionally use CIRCLECI_ORGANIZATION env var
+  vcs_type     = "github" # optionally use CIRCLECI_VCS_TYPE env var
 }
-```
+```
+
+## Schema
+
+- **token** (String, Required) CircleCI API Token. You can create this in your account dashboard. Can be specified with the CIRCLECI_TOKEN environment variable.
+
+- **organization** (String, Required) Configure what organization you are using in CircleCI. Can be specified with the CIRCLECI_ORGANIZATION environment variable.
+
+- **vcs_type** (String, Required) Configure what version control system type your project uses. You may currently select either ‘github’ or ‘bitbucket’. Can be specified with the CIRCLECI_VCS_TYPE environment variable.