Fix: using git token_id on Templates always assumes GitLab (#929)

.golangci.yaml

@@ -0,0 +1,31 @@
+linters:
+  enable:
+    - errname
+    - errorlint
+    - gocheckcompilerdirectives
+    - gochecknoglobals
+    - gochecknoinits
+    - goconst
+    - gocritic
+    - misspell
+    - nilerr
+    - nilnil
+    - nlreturn
+    - perfsprint
+    - prealloc
+    - predeclared
+    - reassign
+    - sloglint
+    - spancheck
+    - testifylint
+    - unparam
+    - unused
+    - usestdlibvars
+    - wsl
+
+linters-settings:
+  errorlint:
+    asserts: false
+  errcheck:
+    exclude-functions:
+      - (*github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema.ResourceData).Set

client/template.go

@@ -61,7 +61,7 @@ type Template struct {
 	IsAzureDevOps        bool             `json:"isAzureDevOps" tfschema:"is_azure_devops"`
 	IsHelmRepository     bool             `json:"isHelmRepository"`
 	HelmChartName        string           `json:"helmChartName" tfschema:",omitempty"`
-	IsGitLab             bool             `json:"isGitLab" tfschema:"is_gitlab"`
+	IsGitlab             bool             `json:"isGitLab"`
 	TerragruntTfBinary   string           `json:"terragruntTfBinary" tfschema:",omitempty"`
 	TokenName            string           `json:"tokenName" tfschema:",omitempty"`
 	GitlabProjectId      int              `json:"gitlabProjectId" tfschema:",omitempty"`
@@ -75,7 +75,7 @@ type TemplateCreatePayload struct {
 	Name                 string           `json:"name"`
 	Repository           string           `json:"repository"`
 	Path                 string           `json:"path,omitempty"`
-	IsGitLab             bool             `json:"isGitLab"`
+	IsGitlab             bool             `json:"isGitLab"`
 	TokenName            string           `json:"tokenName,omitempty"`
 	TokenId              string           `json:"tokenId,omitempty"`
 	GithubInstallationId int              `json:"githubInstallationId,omitempty"`

env0/cloud_configuration.go

@@ -24,7 +24,7 @@ func getCloudConfigurationFromSchema(d *schema.ResourceData, provider string) (i
 	}
 
 	if err := readResourceData(configuration, d); err != nil {
-		return nil, fmt.Errorf("schema resource data deserialization failed: %v", err)
+		return nil, fmt.Errorf("schema resource data deserialization failed: %w", err)
 	}
 
 	return configuration, nil
@@ -47,6 +47,7 @@ func getCloudConfigurationByNameFromApi(apiClient client.ApiClientInterface, nam
 
 func getCloudConfigurationFromApi(apiClient client.ApiClientInterface, id string) (*client.CloudAccount, error) {
 	var err error
+
 	var cloudAccount *client.CloudAccount
 
 	if _, parseErr := uuid.Parse(id); parseErr != nil {
@@ -108,9 +109,8 @@ func createCloudConfiguration(d *schema.ResourceData, meta interface{}, provider
 		return diag.Errorf("failed to create a cloud configuration: %v", err)
 	}
 
-	if err := d.Set("health", cloudAccount.Health); err != nil {
-		return diag.Errorf("failed to set health: %v", err)
-	}
+	d.Set("health", cloudAccount.Health)
+
 	d.SetId(cloudAccount.Id)
 
 	return nil
@@ -156,9 +156,7 @@ func updateCloudConfiguration(d *schema.ResourceData, meta interface{}, provider
 		return diag.Errorf("failed to update cloud configuration: %v", err)
 	}
 
-	if err := d.Set("health", cloudAccount.Health); err != nil {
-		return diag.Errorf("failed to set health: %v", err)
-	}
+	d.Set("health", cloudAccount.Health)
 
 	return nil
 }

env0/credentials.go

@@ -57,6 +57,7 @@ func getCredentialsByName(name string, prefixList []string, meta interface{}) (c
 	}
 
 	var foundCredentials []client.Credentials
+
 	for _, credentials := range credentialsList {
 		if credentials.Name == name && credentials.HasPrefix(prefixList) {
 			foundCredentials = append(foundCredentials, credentials)
@@ -76,11 +77,13 @@ func getCredentialsByName(name string, prefixList []string, meta interface{}) (c
 
 func getCredentialsById(id string, prefixList []string, meta interface{}) (client.Credentials, error) {
 	apiClient := meta.(client.ApiClientInterface)
+
 	credentials, err := apiClient.CloudCredentials(id)
 	if err != nil {
 		if _, ok := err.(*client.NotFoundError); ok {
 			return client.Credentials{}, errors.New("credentials not found")
 		}
+
 		return client.Credentials{}, err
 	}
 
@@ -93,11 +96,14 @@ func getCredentialsById(id string, prefixList []string, meta interface{}) (clien
 
 func getCredentials(ctx context.Context, id string, prefixList []string, meta interface{}) (client.Credentials, error) {
 	_, err := uuid.Parse(id)
+
 	if err == nil {
 		tflog.Info(ctx, "Resolving credentials by id", map[string]interface{}{"id": id})
+
 		return getCredentialsById(id, prefixList, meta)
 	} else {
 		tflog.Info(ctx, "Resolving credentials by name", map[string]interface{}{"name": id})
+
 		return getCredentialsByName(id, prefixList, meta)
 	}
 }
@@ -106,10 +112,12 @@ func resourceCredentialsDelete(ctx context.Context, d *schema.ResourceData, meta
 	apiClient := meta.(client.ApiClientInterface)
 
 	id := d.Id()
+
 	err := apiClient.CloudCredentialsDelete(id)
 	if err != nil {
 		return diag.Errorf("could not delete credentials: %v", err)
 	}
+
 	return nil
 }
 
@@ -137,11 +145,12 @@ func resourceCredentialsImport(cloudType CloudType) schema.StateContextFunc {
 			if _, ok := err.(*client.NotFoundError); ok {
 				return nil, fmt.Errorf(string(cloudType)+" credentials resource with id %v not found", d.Id())
 			}
+
 			return nil, err
 		}
 
 		if err := writeResourceData(&credentials, d); err != nil {
-			return nil, fmt.Errorf("schema resource data serialization failed: %v", err)
+			return nil, fmt.Errorf("schema resource data serialization failed: %w", err)
 		}
 
 		return []*schema.ResourceData{d}, nil

env0/data_agent_values.go

@@ -37,9 +37,7 @@ func dataAgentValuesRead(ctx context.Context, d *schema.ResourceData, meta inter
 		return diag.Errorf("could not get agent values: %v", err)
 	}
 
-	if err := d.Set("values", values); err != nil {
-		return diag.FromErr(err)
-	}
+	d.Set("values", values)
 
 	d.SetId(agentKey)
 

env0/data_api_key.go

@@ -36,14 +36,17 @@ func dataApiKey() *schema.Resource {
 
 func dataApiKeyRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	var apiKey *client.ApiKey
+
 	var err error
 
 	id, ok := d.GetOk("id")
 	if ok {
 		apiKey, err = getApiKeyById(id.(string), meta)
+
 		if err != nil {
 			return diag.Errorf("could not read api key: %v", err)
 		}
+
 		if apiKey == nil {
 			return diag.Errorf("could not read api key: id %v not found", id)
 		}

env0/data_cloud_credentials.go

@@ -65,9 +65,7 @@ func dataCloudCredentialsRead(ctx context.Context, d *schema.ResourceData, meta
 		data = append(data, credentials.Name)
 	}
 
-	if err := d.Set("names", data); err != nil {
-		return diag.FromErr(err)
-	}
+	d.Set("names", data)
 
 	// Not really needed. But required by Terraform SDK - https://github.com/hashicorp/terraform-plugin-sdk/issues/541
 	d.SetId("all_cloud_credential_names")

env0/data_configuration_variable.go

@@ -136,13 +136,10 @@ func dataConfigurationVariableRead(ctx context.Context, d *schema.ResourceData,
 		return diag.Errorf("schema resource data serialization failed: %v", err)
 	}
 
-	if err := d.Set("enum", variable.Schema.Enum); err != nil {
-		return diag.FromErr(err)
-	}
+	d.Set("enum", variable.Schema.Enum)
+
 	if variable.Schema.Format != client.Text {
-		if err := d.Set("format", string(variable.Schema.Format)); err != nil {
-			return diag.FromErr(err)
-		}
+		d.Set("format", string(variable.Schema.Format))
 	}
 
 	return nil
@@ -151,22 +148,27 @@ func dataConfigurationVariableRead(ctx context.Context, d *schema.ResourceData,
 func getScopeAndId(d *schema.ResourceData) (client.Scope, string) {
 	scope := client.ScopeGlobal
 	scopeId := ""
+
 	if projectId, ok := d.GetOk("project_id"); ok {
 		scope = client.ScopeProject
 		scopeId = projectId.(string)
 	}
+
 	if templateId, ok := d.GetOk("template_id"); ok {
 		scope = client.ScopeTemplate
 		scopeId = templateId.(string)
 	}
+
 	if environmentId, ok := d.GetOk("environment_id"); ok {
 		scope = client.ScopeEnvironment
 		scopeId = environmentId.(string)
 	}
+
 	if deploymentLogId, ok := d.GetOk("deployment_log_id"); ok {
 		scope = client.ScopeDeploymentLog
 		scopeId = deploymentLogId.(string)
 	}
+
 	return scope, scopeId
 }
 

env0/data_credentials.go

@@ -32,6 +32,7 @@ func dataCredentials(cloudType CloudType) *schema.Resource {
 func dataCredentialsRead(cloudType CloudType) schema.ReadContextFunc {
 	return func(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 		var err error
+
 		var credentials client.Credentials
 
 		prefixList := credentialsTypeToPrefixList[cloudType]
@@ -47,6 +48,7 @@ func dataCredentialsRead(cloudType CloudType) schema.ReadContextFunc {
 			if !ok {
 				return diag.Errorf("either 'name' or 'id' must be specified")
 			}
+
 			credentials, err = getCredentialsByName(name.(string), prefixList, meta)
 			if err != nil {
 				return diag.Errorf("could not query %s credentials by name: %v", cloudType, err)

env0/data_custom_roles.go

@@ -41,9 +41,7 @@ func dataCustomRolesRead(ctx context.Context, d *schema.ResourceData, meta inter
 		}
 	}
 
-	if err := d.Set("names", data); err != nil {
-		return diag.FromErr(err)
-	}
+	d.Set("names", data)
 
 	// Not really needed. But required by Terraform SDK - https://github.com/hashicorp/terraform-plugin-sdk/issues/541
 	d.SetId("all_roles_names")

env0/data_ip_ranges.go

@@ -47,9 +47,7 @@ func dataIpRangesRead(ctx context.Context, d *schema.ResourceData, meta interfac
 		"54.165.19.49/32",
 	}
 
-	if err := d.Set("ipv4", ipv4s); err != nil {
-		return diag.FromErr(err)
-	}
+	d.Set("ipv4", ipv4s)
 
 	d.SetId("ip_ranges")
 

env0/data_notifications.go

@@ -39,9 +39,7 @@ func dataNotificationsRead(ctx context.Context, d *schema.ResourceData, meta int
 		names = append(names, notification.Name)
 	}
 
-	if err := d.Set("names", names); err != nil {
-		return diag.FromErr(err)
-	}
+	d.Set("names", names)
 
 	d.SetId("all_notification_names")
 

env0/data_organization.go

@@ -56,9 +56,7 @@ func dataOrganizationRead(ctx context.Context, d *schema.ResourceData, meta inte
 
 	oidcSub, err := apiClient.OidcSub()
 	if err == nil {
-		if err := d.Set("oidc_sub", oidcSub); err != nil {
-			return diag.FromErr(err)
-		}
+		d.Set("oidc_sub", oidcSub)
 	}
 
 	return nil

env0/data_project.go

@@ -92,7 +92,7 @@ func dataProjectRead(ctx context.Context, d *schema.ResourceData, meta interface
 	return nil
 }
 
-func filterByParentProjectId(parentId string, projects []client.Project) ([]client.Project, error) {
+func filterByParentProjectId(parentId string, projects []client.Project) []client.Project {
 	filteredProjects := make([]client.Project, 0)
 	for _, project := range projects {
 		if len(project.ParentProjectId) == 0 {
@@ -104,7 +104,7 @@ func filterByParentProjectId(parentId string, projects []client.Project) ([]clie
 		}
 	}
 
-	return filteredProjects, nil
+	return filteredProjects
 }
 
 func filterByParentProjectName(parentName string, projects []client.Project, meta interface{}) ([]client.Project, error) {
@@ -131,7 +131,7 @@ func getProjectByName(name string, parentId string, parentName string, meta inte
 	apiClient := meta.(client.ApiClientInterface)
 	projects, err := apiClient.Projects()
 	if err != nil {
-		return client.Project{}, fmt.Errorf("could not query project by name: %v", err)
+		return client.Project{}, fmt.Errorf("could not query project by name: %w", err)
 	}
 
 	projectsByName := make([]client.Project, 0)
@@ -142,10 +142,7 @@ func getProjectByName(name string, parentId string, parentName string, meta inte
 	}
 	if len(parentId) > 0 {
 		// Use parentId filter to reduce the results.
-		projectsByName, err = filterByParentProjectId(parentId, projectsByName)
-		if err != nil {
-			return client.Project{}, err
-		}
+		projectsByName = filterByParentProjectId(parentId, projectsByName)
 	} else if len(parentName) > 0 {
 		// Use parentName filter to reduce the results.
 		projectsByName, err = filterByParentProjectName(parentName, projectsByName, meta)
@@ -172,7 +169,7 @@ func getProjectById(id string, meta interface{}) (client.Project, error) {
 		if frerr, ok := err.(*http.FailedResponseError); ok && frerr.NotFound() {
 			return client.Project{}, fmt.Errorf("could not find a project with id: %s", id)
 		}
-		return client.Project{}, fmt.Errorf("could not query project: %v", err)
+		return client.Project{}, fmt.Errorf("could not query project: %w", err)
 	}
 	return project, nil
 }

env0/data_project_cloud_credentials.go

@@ -43,6 +43,7 @@ func dataProjectCloudCredentialsRead(ctx context.Context, d *schema.ResourceData
 	}
 
 	d.Set("ids", credentialIds)
+
 	d.SetId(projectId)
 
 	return nil

env0/resource_approval_policy_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/jinzhu/copier"
+	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 )
 
@@ -33,7 +34,7 @@ func TestUnitApprovalPolicyResource(t *testing.T) {
 	}
 
 	var template client.Template
-	copier.Copy(&template, &approvalPolicy)
+	require.NoError(t, copier.Copy(&template, &approvalPolicy))
 	template.Type = string(ApprovalPolicy)
 
 	deletedTemplate := template
@@ -53,7 +54,7 @@ func TestUnitApprovalPolicyResource(t *testing.T) {
 	}
 
 	var updatedTemplate client.Template
-	copier.Copy(&updatedTemplate, &updatedApprovalPolicy)
+	require.NoError(t, copier.Copy(&updatedTemplate, &updatedApprovalPolicy))
 	updatedTemplate.Type = string(ApprovalPolicy)
 
 	createPayload := client.ApprovalPolicyCreatePayload{