Fix acctests (#23)

* Formatting

* Fix tests

Author: palson-cf

client/client.go

@@ -11,10 +11,10 @@ import (
 
 // Client token, host, htpp.Client
 type Client struct {
-	Token  string
+	Token       string
 	TokenHeader string
-	Host   string
-	Client *http.Client
+	Host        string
+	Client      *http.Client
 }
 
 // RequestOptions  path, method, etc
@@ -34,10 +34,10 @@ func NewClient(hostname string, token string, tokenHeader string) *Client {
 		tokenHeader = "Authorization"
 	}
 	return &Client{
-		Host:   hostname,
-		Token:  token,
+		Host:        hostname,
+		Token:       token,
 		TokenHeader: tokenHeader,
-		Client: &http.Client{},
+		Client:      &http.Client{},
 	}
 
 }
@@ -55,9 +55,9 @@ func (client *Client) RequestAPI(opt *RequestOptions) ([]byte, error) {
 
 	tokenHeader := client.TokenHeader
 	if tokenHeader == "" {
-	  tokenHeader = "Authorization"
+		tokenHeader = "Authorization"
 	}
-	request.Header.Set(tokenHeader, client.Token)	
+	request.Header.Set(tokenHeader, client.Token)
 	request.Header.Set("Content-Type", "application/json; charset=utf-8")
 
 	resp, err := client.Client.Do(request)

client/user.go

@@ -119,7 +119,7 @@ func (client *Client) AddPendingUser(user *NewUser) (*User, error) {
 
 // AddUserToTeamByAdmin - adds user to team with swich account
 func (client *Client) AddUserToTeamByAdmin(userID string, accountID string, team string) error {
-    // get first accountAdmin and its token
+	// get first accountAdmin and its token
 	account, err := client.GetAccountByID(accountID)
 	if err != nil {
 		return err
@@ -131,9 +131,9 @@ func (client *Client) AddUserToTeamByAdmin(userID string, accountID string, team
 	accountAdminUserID := account.Admins[0]
 	accountAdminToken, err := client.GetXAccessToken(accountAdminUserID, accountID)
 	if err != nil {
-	  return err
+		return err
 	}
-	// new Client for accountAdmin 
+	// new Client for accountAdmin
 	accountAdminClient := NewClient(client.Host, accountAdminToken, "x-access-token")
 	usersTeam, err := accountAdminClient.GetTeamByName(team)
 	if err != nil {
@@ -152,7 +152,7 @@ func (client *Client) AddUserToTeamByAdmin(userID string, accountID string, team
 	}
 
 	err = accountAdminClient.AddUserToTeam(usersTeam.ID, userID)
- 
+
 	return err
 }
 
@@ -245,7 +245,7 @@ func (client *Client) GetUserByID(userId string) (*User, error) {
 		}
 	}
 
-	return nil, errors.New(fmt.Sprint("[ERROR] User with ID %s wasn't found.", userId))
+	return nil, errors.New(fmt.Sprintf("[ERROR] User with ID %s wasn't found.", userId))
 }
 
 func (client *Client) DeleteUser(userName string) error {

codefresh/resource_api_key.go

@@ -30,8 +30,8 @@ func resourceApiKey() *schema.Resource {
 				Required: true,
 			},
 			"token": {
-				Type:     schema.TypeString,
-				Computed: true,
+				Type:      schema.TypeString,
+				Computed:  true,
 				Sensitive: true,
 			},
 			"scopes": {

codefresh/resource_pipeline_test.go

@@ -53,8 +53,8 @@ func TestAccCodefreshPipeline_Tags(t *testing.T) {
 				Config: testAccCodefreshPipelineBasicConfigTags(name, "codefresh-contrib/react-sample-app", "./codefresh.yml", "master", "git", "testTag1", "testTag2"),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckCodefreshPipelineExists(resourceName),
-					resource.TestCheckResourceAttr(resourceName, "tags.3247715412", "testTag2"),
-					resource.TestCheckResourceAttr(resourceName, "tags.3938019223", "testTag1"),
+					resource.TestCheckResourceAttr(resourceName, "tags.1", "testTag2"),
+					resource.TestCheckResourceAttr(resourceName, "tags.0", "testTag1"),
 				),
 			},
 			{
@@ -103,7 +103,7 @@ func TestAccCodefreshPipeline_Variables(t *testing.T) {
 func TestAccCodefreshPipeline_RuntimeEnvironment(t *testing.T) {
 	name := pipelineNamePrefix + acctest.RandString(10)
 	resourceName := "codefresh_pipeline.test"
-	runtimeName := "system/codefresh-inc-default"
+	runtimeName := "system/default"
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },

codefresh/resource_project_test.go

@@ -50,8 +50,8 @@ func TestAccCodefreshProject_Tags(t *testing.T) {
 				Config: testAccCodefreshProjectBasicConfigTags(name, "testTag1", "testTag2"),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckCodefreshProjectExists(resourceName),
-					resource.TestCheckResourceAttr(resourceName, "tags.3247715412", "testTag2"),
-					resource.TestCheckResourceAttr(resourceName, "tags.3938019223", "testTag1"),
+					resource.TestCheckResourceAttr(resourceName, "tags.1", "testTag2"),
+					resource.TestCheckResourceAttr(resourceName, "tags.0", "testTag1"),
 				),
 			},
 			{

main.go

@@ -12,7 +12,7 @@ import (
 func main() {
 	debugMode := (os.Getenv("CODEFRESH_PLUGIN_DEBUG") != "")
 	// for terraform 0.13: export CODEFRESH_PLUGIN_ADDR="codefresh.io/app/codefresh"
-	providerAddr := os.Getenv("CODEFRESH_PLUGIN_ADDR")	
+	providerAddr := os.Getenv("CODEFRESH_PLUGIN_ADDR")
 	if providerAddr == "" {
 		providerAddr = "registry.terraform.io/-/codefresh"
 	}