lint fixes

Author: daniel-cit

helpers/foundation-deployer/gcp/gcp.go

@@ -49,8 +49,8 @@ func NewGCP() GCP {
 
 // IsComponentInstalled checks if a given gcloud component is installed
 func (g GCP) IsComponentInstalled(t testing.TB, componentID string) bool {
-	filter := fmt.Sprintf("\"id='%s'\"",componentID)
-    components := g.Runf(t, "components list --filter %s", filter).Array()
+	filter := fmt.Sprintf("\"id='%s'\"", componentID)
+	components := g.Runf(t, "components list --filter %s", filter).Array()
 	if len(components) == 0 {
 		return false
 	}
@@ -158,12 +158,12 @@ func (g GCP) HasTagKey(t testing.TB, orgID, tag string) bool {
 }
 
 // EnableApis enables the apis in the given project
-func (g GCP) EnableApis(t testing.TB, project string, apis []string) {
+func (g GCP) EnableAPIs(t testing.TB, project string, apis []string) {
 	g.Runf(t, "services enable %s --project %s", strings.Join(apis, " "), project)
 }
 
-// IsApiEnabled checks if the api is enabled in the given project
-func (g GCP) IsApiEnabled(t testing.TB, project, api string) bool {
+// IsAPIEnabled checks if the api is enabled in the given project
+func (g GCP) IsAPIEnabled(t testing.TB, project, api string) bool {
 	filter := fmt.Sprintf("config.name=%s", api)
 	return len(g.Runf(t, "services list --enabled --project %s --filter %s", project, filter).Array()) > 0
 }

helpers/foundation-deployer/main.go

@@ -112,20 +112,20 @@ func main() {
 
 	// only enable services if they are not already enabled
 	if globalTFVars.HasValidatorProj() {
-		conf.ValidatorProject = *globalTFVars.ValidatorProjectId
+		conf.ValidatorProject = *globalTFVars.ValidatorProjectID
 		var apis []string
 		gcpConf := gcp.NewGCP()
 		if globalTFVars.EnableSccResourcesInTerraform != nil && *globalTFVars.EnableSccResourcesInTerraform {
 			validatorApis = append(validatorApis, "securitycenter.googleapis.com")
 		}
 		for _, a := range validatorApis {
-			if !gcpConf.IsApiEnabled(t, *globalTFVars.ValidatorProjectId, a) {
+			if !gcpConf.IsAPIEnabled(t, *globalTFVars.ValidatorProjectID, a) {
 				apis = append(apis, a)
 			}
 		}
 		if len(apis) > 0 {
-			fmt.Printf("# Enabling APIs: %s in validator project '%s'\n", strings.Join(apis, ", "), *globalTFVars.ValidatorProjectId)
-			gcpConf.EnableApis(t, *globalTFVars.ValidatorProjectId, apis)
+			fmt.Printf("# Enabling APIs: %s in validator project '%s'\n", strings.Join(apis, ", "), *globalTFVars.ValidatorProjectID)
+			gcpConf.EnableAPIs(t, *globalTFVars.ValidatorProjectID, apis)
 			fmt.Println("# waiting for API propagation")
 			for i := 0; i < 20; i++ {
 				time.Sleep(10 * time.Second)

helpers/foundation-deployer/stages/apply.go

@@ -628,7 +628,7 @@ func applyEnv(t testing.TB, conf utils.GitRepo, project, region, repo, environme
 	return gcp.NewGCP().WaitBuildSuccess(t, project, region, repo, commitSha, fmt.Sprintf("Terraform %s apply %s build Failed.", repo, environment), MaxBuildRetries)
 }
 
-func applyLocal(t testing.TB, options *terraform.Options, serviceAccount, policyPath, validatorProjectId string) error {
+func applyLocal(t testing.TB, options *terraform.Options, serviceAccount, policyPath, ValidatorProjectID string) error {
 	var err error
 
 	if serviceAccount != "" {
@@ -648,8 +648,8 @@ func applyLocal(t testing.TB, options *terraform.Options, serviceAccount, policy
 	}
 
 	// Runs gcloud terraform vet
-	if validatorProjectId != "" {
-		err = TerraformVet(t, options.TerraformDir, policyPath, validatorProjectId)
+	if ValidatorProjectID != "" {
+		err = TerraformVet(t, options.TerraformDir, policyPath, ValidatorProjectID)
 		if err != nil {
 			return err
 		}

helpers/foundation-deployer/stages/data.go

@@ -162,7 +162,7 @@ type GlobalTFVars struct {
 	LocationGCS                           string          `hcl:"location_gcs"`
 	CodeCheckoutPath                      string          `hcl:"code_checkout_path"`
 	FoundationCodePath                    string          `hcl:"foundation_code_path"`
-	ValidatorProjectId                    *string         `hcl:"validator_project_id"`
+	ValidatorProjectID                    *string         `hcl:"validator_project_id"`
 	Groups                                Groups          `hcl:"groups"`
 	InitialGroupConfig                    *string         `hcl:"initial_group_config"`
 	FolderDeletionProtection              *bool           `hcl:"folder_deletion_protection"`
@@ -171,7 +171,7 @@ type GlobalTFVars struct {
 
 // HasValidatorProj checks if a Validator Project was provided
 func (g GlobalTFVars) HasValidatorProj() bool {
-	return g.ValidatorProjectId != nil && *g.ValidatorProjectId != "" && *g.ValidatorProjectId != "EXISTING_PROJECT_ID"
+	return g.ValidatorProjectID != nil && *g.ValidatorProjectID != "" && *g.ValidatorProjectID != "EXISTING_PROJECT_ID"
 }
 
 // HasGroupsCreation checks if Groups creation is enabled