provider-sdk-v2 + featuresFlag

Kosta Klevensky · Kosta Klevensky · commit 44f6743e970b · 2020-07-22T20:31:41.000+03:00
diff --git a/client/account.go b/client/account.go
@@ -3,8 +3,6 @@ package client
 import (
 	"errors"
 	"fmt"
-	"log"
-	"strconv"
 
 	"github.com/imdario/mergo"
 )
@@ -144,12 +142,7 @@ type AccountDetails struct {
 func (account *Account) SetFeatures(m map[string]interface{}) {
 	res := make(map[string]bool)
 	for k, v := range m {
-		value := v.(string)
-		b, err := strconv.ParseBool(value)
-		if err != nil {
-			log.Fatalf("[ERROR] Can't parse '%s = %s' as boolean", k, value)
-		}
-		res[k] = b
+		res[k] = v.(bool)
 	}
 	account.Features = res
 }
@@ -290,6 +283,28 @@ func (client *Client) UpdateAccount(account *Account) (*Account, error) {
 	if err != nil {
 		return nil, err
 	}
+	
+	// Update Features
+	var featureUpdatePath string 
+	for k, v := range account.Features{
+		//body
+		if v {
+			featureUpdatePath = fmt.Sprintf("/features/%s", id)
+		} else {
+			featureUpdatePath = fmt.Sprintf("/features/switchOff/%s", id)
+		}
+		bodyFeatures := []byte(fmt.Sprintf("{\"feature\": \"%s\"}", k))
+		_, err = client.RequestAPI(&RequestOptions{
+			Path:   featureUpdatePath,
+			Method: "POST",
+			Body:   bodyFeatures,
+		})
+		if err != nil {
+			return nil, err
+		}
+		respAccount.Features[k] = v
+	}
+
 
 	return &respAccount, nil
 }
diff --git a/client/api_key.go b/client/api_key.go
@@ -3,7 +3,7 @@ package client
 import (
 	"errors"
 	"fmt"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"log"
 	"net/http"
 )
diff --git a/codefresh/data_user.go b/codefresh/data_user.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 	cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceUser() *schema.Resource {
diff --git a/codefresh/data_users.go b/codefresh/data_users.go
@@ -2,7 +2,7 @@ package codefresh
 
 import (
 	cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"time"
 )
 
diff --git a/codefresh/provider.go b/codefresh/provider.go
@@ -2,12 +2,12 @@ package codefresh
 
 import (
 	cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-	"github.com/hashicorp/terraform-plugin-sdk/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	//"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 	"os"
 )
 
-func Provider() terraform.ResourceProvider {
+func Provider() *schema.Provider {
 	return &schema.Provider{
 		Schema: map[string]*schema.Schema{
 			"api_url": {
diff --git a/codefresh/provider_test.go b/codefresh/provider_test.go
@@ -1,8 +1,8 @@
 package codefresh
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-	"github.com/hashicorp/terraform-plugin-sdk/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 	"os"
 	"testing"
 )
diff --git a/codefresh/resource_account.go b/codefresh/resource_account.go
@@ -2,7 +2,7 @@ package codefresh
 
 import (
 	cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func resourceAccount() *schema.Resource {
@@ -26,6 +26,21 @@ func resourceAccount() *schema.Resource {
 			// 		Type: schema.TypeString,
 			// 	},
 			// },
+
+			"features": {
+				Type:     schema.TypeMap,
+				Optional: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeBool,
+				},
+				Default: map[string]bool{
+					"OfflineLogging":          true,
+					"ssoManagement":           true,
+					"teamsManagement":         true,
+					"abac":                    true,
+					"customKubernetesCluster": true,
+				},
+			},
 			"limits": {
 				Type:     schema.TypeList,
 				Optional: true,
@@ -137,6 +152,10 @@ func mapAccountToResource(account *cfClient.Account, d *schema.ResourceData) err
 	// if err != nil {
 	// 	return err
 	// }
+	err = d.Set("features", account.Features)
+	if err != nil {
+		return err
+	}
 
 	err = d.Set("limits", []map[string]interface{}{flattenLimits(*account.Limits)})
 	if err != nil {
@@ -173,6 +192,9 @@ func mapResourceToAccount(d *schema.ResourceData) *cfClient.Account {
 		// Admins: convertStringArr(admins),
 	}
 
+	if _, ok := d.GetOk("features"); ok {
+		account.SetFeatures(d.Get("features").(map[string]interface{}))
+	}
 	if _, ok := d.GetOk("limits"); ok {
 		account.Limits = &cfClient.Limits{
 			Collaborators: cfClient.Collaborators{
diff --git a/codefresh/resource_account_admins.go b/codefresh/resource_account_admins.go
@@ -2,7 +2,7 @@ package codefresh
 
 import (
 	cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func resourceAccountAdmins() *schema.Resource {
diff --git a/codefresh/resource_api_key.go b/codefresh/resource_api_key.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 	cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func resourceApiKey() *schema.Resource {
diff --git a/codefresh/resource_idp_accounts.go b/codefresh/resource_idp_accounts.go
@@ -2,7 +2,7 @@ package codefresh
 
 import (
 	cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func resourceIDPAccounts() *schema.Resource {
diff --git a/codefresh/resource_pipeline.go b/codefresh/resource_pipeline.go
@@ -3,7 +3,7 @@ package codefresh
 import (
 	"fmt"
 	cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"strings"
 )
 
diff --git a/codefresh/resource_pipeline_test.go b/codefresh/resource_pipeline_test.go
@@ -3,9 +3,9 @@ package codefresh
 import (
 	"fmt"
 	cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 	"regexp"
 	"testing"
 )
diff --git a/codefresh/resource_project.go b/codefresh/resource_project.go
@@ -2,7 +2,7 @@ package codefresh
 
 import (
 	cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func resourceProject() *schema.Resource {
diff --git a/codefresh/resource_project_test.go b/codefresh/resource_project_test.go
@@ -3,9 +3,9 @@ package codefresh
 import (
 	"fmt"
 	cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 	"regexp"
 	"testing"
 )
diff --git a/codefresh/resource_team.go b/codefresh/resource_team.go
@@ -2,7 +2,7 @@ package codefresh
 
 import (
 	cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func resourceTeam() *schema.Resource {
diff --git a/codefresh/resource_user.go b/codefresh/resource_user.go
@@ -3,7 +3,7 @@ package codefresh
 import (
 	"fmt"
 	cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func resourceUser() *schema.Resource {
@@ -253,7 +253,7 @@ func flattenUserLogins(logins *[]cfClient.Login) []map[string]interface{} {
 
 		m["idp"] = []map[string]interface{}{
 			{
-				"idp_id":          login.IDP.ID,
+				"idp_id":      login.IDP.ID,
 				"client_type": login.IDP.ClientType,
 			},
 		}
@@ -264,8 +264,6 @@ func flattenUserLogins(logins *[]cfClient.Login) []map[string]interface{} {
 	return res
 }
 
-
-
 func mapResourceToUser(d *schema.ResourceData) *cfClient.NewUser {
 
 	roles := d.Get("roles").(*schema.Set).List()
@@ -291,7 +289,6 @@ func mapResourceToUser(d *schema.ResourceData) *cfClient.NewUser {
 
 	logins := d.Get("login").([]interface{})
 
-	
 	for idx := range logins {
 
 		permissions := convertStringArr(d.Get(fmt.Sprintf("login.%v.credentials.0.permissions", idx)).([]interface{}))
diff --git a/go.mod b/go.mod
@@ -1,15 +1,15 @@
 module github.com/codefresh-io/terraform-provider-codefresh
 
 require (
-	github.com/aws/aws-sdk-go v1.30.12
+	github.com/aws/aws-sdk-go v1.30.12 // indirect
 	github.com/bflad/tfproviderdocs v0.6.0
 	github.com/bflad/tfproviderlint v0.14.0
 	github.com/client9/misspell v0.3.4
 	github.com/golangci/golangci-lint v1.27.0
-	github.com/google/martian v2.1.0+incompatible
-	github.com/hashicorp/terraform v0.12.25
-	github.com/hashicorp/terraform-plugin-sdk v1.7.0
+	github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7 // indirect
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.0.0-rc.2.0.20200717132200-7435e2abc9d1
 	github.com/imdario/mergo v0.3.9
+	golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 // indirect
 )
 
 go 1.13
diff --git a/go.sum b/go.sum
diff --git a/main.go b/main.go

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package client`
`3`	`3`	`import (`
`4`	`4`	`"errors"`
`5`	`5`	`"fmt"`
`6`		`- "github.com/hashicorp/terraform-plugin-sdk/helper/acctest"`
	`6`	`+ "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"`
`7`	`7`	`"log"`
`8`	`8`	`"net/http"`
`9`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"errors"`
`5`	`5`	`"fmt"`
`6`	`6`	`cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"`
`7`		`- "github.com/hashicorp/terraform-plugin-sdk/helper/schema"`
	`7`	`+ "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func dataSourceUser() *schema.Resource {`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package codefresh`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"`
`5`		`- "github.com/hashicorp/terraform-plugin-sdk/helper/schema"`
	`5`	`+ "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"`
`6`	`6`	`"time"`
`7`	`7`	`)`
`8`	`8`