run code through gofumpt and add makefile step (hashicorp#9275)

rizkybiz · Nov 16, 2020 · 6193b92 · 6193b92
1 parent fa15ee9
commit 6193b92
Show file tree

Hide file tree

Showing 359 changed files with 303 additions and 435 deletions.
diff --git a/GNUmakefile b/GNUmakefile
@@ -17,6 +17,7 @@ tools:
 	GO111MODULE=off go get -u github.com/bflad/tfproviderlint/cmd/tfproviderlint
 	GO111MODULE=off go get -u github.com/bflad/tfproviderdocs
 	GO111MODULE=off go get -u github.com/katbyte/terrafmt
+	GO111MODULE=off go get -u mvdan.cc/gofumpt
 	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH || $$GOPATH)/bin v1.32.0
 
 build: fmtcheck generate
@@ -31,6 +32,11 @@ fmt:
 	# This logic should match the search logic in scripts/gofmtcheck.sh
 	find . -name '*.go' | grep -v vendor | xargs gofmt -s -w
 
+fumpt:
+	@echo "==> Fixing source code with gofmt..."
+	# This logic should match the search logic in scripts/gofmtcheck.sh
+	find . -name '*.go' | grep -v vendor | xargs gofumpt -s -w
+
 # Currently required by tf-deploy compile, duplicated by linters
 fmtcheck:
 	@sh "$(CURDIR)/scripts/gofmtcheck.sh"

diff --git a/azurerm/helpers/azure/eventhub_test.go b/azurerm/helpers/azure/eventhub_test.go
@@ -52,7 +52,7 @@ func TestValidateEventHubName(t *testing.T) {
 			valid: false,
 		},
 	}
-	var validationFunction = ValidateEventHubName()
+	validationFunction := ValidateEventHubName()
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			_, err := validationFunction(tt.input, "")

diff --git a/azurerm/helpers/azure/servicebus_test.go b/azurerm/helpers/azure/servicebus_test.go
@@ -63,7 +63,7 @@ func TestValidateServiceBusTopicName(t *testing.T) {
 		},
 	}
 
-	var validationFunction = ValidateServiceBusTopicName()
+	validationFunction := ValidateServiceBusTopicName()
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			_, err := validationFunction(tt.input, "name")

diff --git a/azurerm/helpers/azure/sku.go b/azurerm/helpers/azure/sku.go
@@ -16,7 +16,6 @@ func SplitSku(sku string) (string, int32, error) {
 	}
 
 	capacity, err := strconv.Atoi(skuParts[1])
-
 	if err != nil {
 		return "", -1, fmt.Errorf("%s in sku_name is not a valid value.", skuParts[1])
 	}
@@ -37,7 +36,6 @@ func MinCapacitySkuNameInSlice(valid []string, minCapacity int32, ignoreCase boo
 		}
 
 		name, capacity, err := SplitSku(v)
-
 		if err != nil {
 			es = append(es, err)
 			return

diff --git a/azurerm/helpers/azure/storage_account.go b/azurerm/helpers/azure/storage_account.go
@@ -14,7 +14,8 @@ func SchemaStorageAccountCorsRule(patchEnabled bool) *schema.Schema {
 		"MERGE",
 		"POST",
 		"OPTIONS",
-		"PUT"}
+		"PUT",
+	}
 
 	if patchEnabled {
 		allowedMethods = append(allowedMethods, "PATCH")

diff --git a/azurerm/helpers/validate/time_test.go b/azurerm/helpers/validate/time_test.go
@@ -114,6 +114,7 @@ func TestRFC3339DateInFutureBy(t *testing.T) {
 		})
 	}
 }
+
 func TestISO8601Duration(t *testing.T) {
 	cases := []struct {
 		Value  string

diff --git a/azurerm/internal/acceptance/testing.go b/azurerm/internal/acceptance/testing.go
@@ -14,8 +14,10 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-var AzureProvider *schema.Provider
-var SupportedProviders map[string]terraform.ResourceProvider
+var (
+	AzureProvider      *schema.Provider
+	SupportedProviders map[string]terraform.ResourceProvider
+)
 
 func PreCheck(t *testing.T) {
 	variables := []string{

diff --git a/azurerm/internal/location/validation_test.go b/azurerm/internal/location/validation_test.go
@@ -176,49 +176,51 @@ func TestEnhancedValidationEnabled(t *testing.T) {
 	}
 }
 
-var chinaLocations = []string{"chinaeast", "chinanorth", "chinanorth2", "chinaeast2"}
-var publicLocations = []string{
-	"westus",
-	"westus2",
-	"eastus",
-	"centralus",
-	"southcentralus",
-	"northcentralus",
-	"westcentralus",
-	"eastus2",
-	"brazilsouth",
-	"brazilus",
-	"northeurope",
-	"westeurope",
-	"eastasia",
-	"southeastasia",
-	"japanwest",
-	"japaneast",
-	"koreacentral",
-	"koreasouth",
-	"indiasouth",
-	"indiawest",
-	"indiacentral",
-	"australiaeast",
-	"australiasoutheast",
-	"canadacentral",
-	"canadaeast",
-	"uknorth",
-	"uksouth2",
-	"uksouth",
-	"ukwest",
-	"francecentral",
-	"francesouth",
-	"australiacentral",
-	"australiacentral2",
-	"uaecentral",
-	"uaenorth",
-	"southafricanorth",
-	"southafricawest",
-	"switzerlandnorth",
-	"switzerlandwest",
-	"germanynorth",
-	"germanywestcentral",
-	"norwayeast",
-	"norwaywest",
-}
+var (
+	chinaLocations  = []string{"chinaeast", "chinanorth", "chinanorth2", "chinaeast2"}
+	publicLocations = []string{
+		"westus",
+		"westus2",
+		"eastus",
+		"centralus",
+		"southcentralus",
+		"northcentralus",
+		"westcentralus",
+		"eastus2",
+		"brazilsouth",
+		"brazilus",
+		"northeurope",
+		"westeurope",
+		"eastasia",
+		"southeastasia",
+		"japanwest",
+		"japaneast",
+		"koreacentral",
+		"koreasouth",
+		"indiasouth",
+		"indiawest",
+		"indiacentral",
+		"australiaeast",
+		"australiasoutheast",
+		"canadacentral",
+		"canadaeast",
+		"uknorth",
+		"uksouth2",
+		"uksouth",
+		"ukwest",
+		"francecentral",
+		"francesouth",
+		"australiacentral",
+		"australiacentral2",
+		"uaecentral",
+		"uaenorth",
+		"southafricanorth",
+		"southafricawest",
+		"switzerlandnorth",
+		"switzerlandwest",
+		"germanynorth",
+		"germanywestcentral",
+		"norwayeast",
+		"norwaywest",
+	}
+)
diff --git a/azurerm/internal/provider/provider.go b/azurerm/internal/provider/provider.go
@@ -25,7 +25,7 @@ func TestAzureProvider() terraform.ResourceProvider {
 
 func azureProvider(supportLegacyTestSuite bool) terraform.ResourceProvider {
 	// avoids this showing up in test output
-	var debugLog = func(f string, v ...interface{}) {
+	debugLog := func(f string, v ...interface{}) {
 		if os.Getenv("TF_LOG") == "" {
 			return
 		}

diff --git a/azurerm/internal/provider/provider_test.go b/azurerm/internal/provider/provider_test.go
@@ -87,5 +87,5 @@ func TestResourcesSupportCustomTimeouts(t *testing.T) {
 }
 
 func TestProvider_impl(t *testing.T) {
-	var _ = AzureProvider()
+	_ = AzureProvider()
 }
diff --git a/azurerm/internal/services/apimanagement/api_management_api_data_source.go b/azurerm/internal/services/apimanagement/api_management_api_data_source.go
@@ -180,6 +180,7 @@ func flattenApiManagementApiDataSourceProtocols(input *[]apimanagement.Protocol)
 
 	return results
 }
+
 func flattenApiManagementApiDataSourceSubscriptionKeyParamNames(paramNames *apimanagement.SubscriptionKeyParameterNamesContract) []interface{} {
 	if paramNames == nil {
 		return make([]interface{}, 0)

diff --git a/azurerm/internal/services/apimanagement/api_management_product_data_source.go b/azurerm/internal/services/apimanagement/api_management_product_data_source.go
@@ -64,6 +64,7 @@ func dataSourceApiManagementProduct() *schema.Resource {
 		},
 	}
 }
+
 func dataSourceApiManagementProductRead(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*clients.Client).ApiManagement.ProductsClient
 	ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)

diff --git a/azurerm/internal/services/apimanagement/api_management_resource.go b/azurerm/internal/services/apimanagement/api_management_resource.go
@@ -25,14 +25,16 @@ import (
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )
 
-var apimBackendProtocolSsl3 = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30"
-var apimBackendProtocolTls10 = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10"
-var apimBackendProtocolTls11 = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11"
-var apimFrontendProtocolSsl3 = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30"
-var apimFrontendProtocolTls10 = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10"
-var apimFrontendProtocolTls11 = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11"
-var apimTripleDesCiphers = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168"
-var apimHttp2Protocol = "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2"
+var (
+	apimBackendProtocolSsl3   = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30"
+	apimBackendProtocolTls10  = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10"
+	apimBackendProtocolTls11  = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11"
+	apimFrontendProtocolSsl3  = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30"
+	apimFrontendProtocolTls10 = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10"
+	apimFrontendProtocolTls11 = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11"
+	apimTripleDesCiphers      = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168"
+	apimHttp2Protocol         = "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2"
+)
 
 func resourceArmApiManagementService() *schema.Resource {
 	return &schema.Resource{

diff --git a/azurerm/internal/services/apimanagement/tests/api_management_api_diagnostic_resource_test.go b/azurerm/internal/services/apimanagement/tests/api_management_api_diagnostic_resource_test.go
@@ -109,7 +109,6 @@ func testCheckAzureRMApiManagementApiDiagnosticDestroy(s *terraform.State) error
 			return err
 		}
 		resp, err := client.Get(ctx, diagnosticId.ResourceGroup, diagnosticId.ServiceName, diagnosticId.ApiName, diagnosticId.Name)
-
 		if err != nil {
 			if !utils.ResponseWasNotFound(resp.Response) {
 				return err

diff --git a/...nternal/services/apimanagement/tests/api_management_authorization_server_resource_test.go b/...nternal/services/apimanagement/tests/api_management_authorization_server_resource_test.go
@@ -82,7 +82,6 @@ func testCheckAzureRMAPIManagementAuthorizationServerDestroy(s *terraform.State)
 		serviceName := rs.Primary.Attributes["api_management_name"]
 
 		resp, err := client.Get(ctx, resourceGroup, serviceName, name)
-
 		if err != nil {
 			if !utils.ResponseWasNotFound(resp.Response) {
 				return err

diff --git a/azurerm/internal/services/apimanagement/tests/api_management_certificate_resource_test.go b/azurerm/internal/services/apimanagement/tests/api_management_certificate_resource_test.go
@@ -75,7 +75,6 @@ func testCheckAzureRMAPIManagementCertificateDestroy(s *terraform.State) error {
 		serviceName := rs.Primary.Attributes["api_management_name"]
 
 		resp, err := client.Get(ctx, resourceGroup, serviceName, name)
-
 		if err != nil {
 			if !utils.ResponseWasNotFound(resp.Response) {
 				return err

diff --git a/azurerm/internal/services/apimanagement/tests/api_management_data_source_test.go b/azurerm/internal/services/apimanagement/tests/api_management_data_source_test.go
@@ -102,6 +102,7 @@ data "azurerm_api_management" "test" {
 }
 `, data.RandomInteger, data.Locations.Primary, data.RandomInteger)
 }
+
 func testAccDataSourceApiManagement_identitySystemAssigned(data acceptance.TestData) string {
 	return fmt.Sprintf(`
 provider "azurerm" {

diff --git a/azurerm/internal/services/apimanagement/tests/api_management_diagnostic_resource_test.go b/azurerm/internal/services/apimanagement/tests/api_management_diagnostic_resource_test.go
@@ -90,7 +90,6 @@ func testCheckAzureRMApiManagementDiagnosticDestroy(s *terraform.State) error {
 			return err
 		}
 		resp, err := client.Get(ctx, diagnosticId.ResourceGroup, diagnosticId.ServiceName, diagnosticId.Name)
-
 		if err != nil {
 			if !utils.ResponseWasNotFound(resp.Response) {
 				return err

diff --git a/azurerm/internal/services/apimanagement/tests/api_management_group_resource_test.go b/azurerm/internal/services/apimanagement/tests/api_management_group_resource_test.go
@@ -128,7 +128,6 @@ func testCheckAzureRMAPIManagementGroupDestroy(s *terraform.State) error {
 		serviceName := rs.Primary.Attributes["api_management_name"]
 
 		resp, err := client.Get(ctx, resourceGroup, serviceName, name)
-
 		if err != nil {
 			if !utils.ResponseWasNotFound(resp.Response) {
 				return err

diff --git a/...ternal/services/apimanagement/tests/api_management_identity_provider_aad_resource_test.go b/...ternal/services/apimanagement/tests/api_management_identity_provider_aad_resource_test.go
@@ -97,7 +97,6 @@ func testCheckAzureRMApiManagementIdentityProviderAADDestroy(s *terraform.State)
 		serviceName := rs.Primary.Attributes["api_management_name"]
 
 		resp, err := client.Get(ctx, resourceGroup, serviceName, apimanagement.Aad)
-
 		if err != nil {
 			if !utils.ResponseWasNotFound(resp.Response) {
 				return err

diff --git a/...l/services/apimanagement/tests/api_management_identity_provider_facebook_resource_test.go b/...l/services/apimanagement/tests/api_management_identity_provider_facebook_resource_test.go
@@ -93,7 +93,6 @@ func testCheckAzureRMApiManagementIdentityProviderFacebookDestroy(s *terraform.S
 
 		ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext
 		resp, err := client.Get(ctx, resourceGroup, serviceName, apimanagement.Facebook)
-
 		if err != nil {
 			if !utils.ResponseWasNotFound(resp.Response) {
 				return err

diff --git a/...nal/services/apimanagement/tests/api_management_identity_provider_google_resource_test.go b/...nal/services/apimanagement/tests/api_management_identity_provider_google_resource_test.go
@@ -91,7 +91,6 @@ func testCheckAzureRMApiManagementIdentityProviderGoogleDestroy(s *terraform.Sta
 		serviceName := rs.Primary.Attributes["api_management_name"]
 
 		resp, err := client.Get(ctx, resourceGroup, serviceName, apimanagement.Google)
-
 		if err != nil {
 			if !utils.ResponseWasNotFound(resp.Response) {
 				return err

diff --git a/.../services/apimanagement/tests/api_management_identity_provider_microsoft_resource_test.go b/.../services/apimanagement/tests/api_management_identity_provider_microsoft_resource_test.go
@@ -93,7 +93,6 @@ func testCheckAzureRMApiManagementIdentityProviderMicrosoftDestroy(s *terraform.
 
 		ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext
 		resp, err := client.Get(ctx, resourceGroup, serviceName, apimanagement.Microsoft)
-
 		if err != nil {
 			if !utils.ResponseWasNotFound(resp.Response) {
 				return err

diff --git a/...al/services/apimanagement/tests/api_management_identity_provider_twitter_resource_test.go b/...al/services/apimanagement/tests/api_management_identity_provider_twitter_resource_test.go
@@ -93,7 +93,6 @@ func testCheckAzureRMApiManagementIdentityProviderTwitterDestroy(s *terraform.St
 
 		ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext
 		resp, err := client.Get(ctx, resourceGroup, serviceName, apimanagement.Twitter)
-
 		if err != nil {
 			if !utils.ResponseWasNotFound(resp.Response) {
 				return err

diff --git a/azurerm/internal/services/apimanagement/tests/api_management_named_value_resource_test.go b/azurerm/internal/services/apimanagement/tests/api_management_named_value_resource_test.go
@@ -70,7 +70,6 @@ func testCheckAzureRMAPIManagementNamedValueDestroy(s *terraform.State) error {
 		serviceName := rs.Primary.Attributes["api_management_name"]
 
 		resp, err := client.Get(ctx, resourceGroup, serviceName, name)
-
 		if err != nil {
 			if !utils.ResponseWasNotFound(resp.Response) {
 				return err

diff --git a/azurerm/internal/services/apimanagement/tests/api_management_property_resource_test.go b/azurerm/internal/services/apimanagement/tests/api_management_property_resource_test.go
@@ -82,7 +82,6 @@ func testCheckAzureRMAPIManagementPropertyDestroy(s *terraform.State) error {
 		serviceName := rs.Primary.Attributes["api_management_name"]
 
 		resp, err := client.Get(ctx, resourceGroup, serviceName, name)
-
 		if err != nil {
 			if !utils.ResponseWasNotFound(resp.Response) {
 				return err

diff --git a/azurerm/internal/services/apimanagement/tests/api_management_resource_test.go b/azurerm/internal/services/apimanagement/tests/api_management_resource_test.go
@@ -269,7 +269,6 @@ func testCheckAzureRMApiManagementDestroy(s *terraform.State) error {
 		name := rs.Primary.Attributes["name"]
 		resourceGroup := rs.Primary.Attributes["resource_group_name"]
 		resp, err := conn.Get(ctx, resourceGroup, name)
-
 		if err != nil {
 			if utils.ResponseWasNotFound(resp.Response) {
 				return nil

diff --git a/azurerm/internal/services/apimanagement/tests/api_management_subscription_resource_test.go b/azurerm/internal/services/apimanagement/tests/api_management_subscription_resource_test.go
@@ -145,7 +145,6 @@ func testCheckAzureRMAPIManagementSubscriptionDestroy(s *terraform.State) error
 		serviceName := rs.Primary.Attributes["api_management_name"]
 
 		resp, err := client.Get(ctx, resourceGroup, serviceName, subscriptionId)
-
 		if err != nil {
 			if !utils.ResponseWasNotFound(resp.Response) {
 				return err

diff --git a/...erm/internal/services/applicationinsights/application_insights_analytics_item_resource.go b/...erm/internal/services/applicationinsights/application_insights_analytics_item_resource.go
@@ -97,9 +97,11 @@ func resourceArmApplicationInsightsAnalyticsItem() *schema.Resource {
 func resourceArmApplicationInsightsAnalyticsItemCreate(d *schema.ResourceData, meta interface{}) error {
 	return resourceArmApplicationInsightsAnalyticsItemCreateUpdate(d, meta, false)
 }
+
 func resourceArmApplicationInsightsAnalyticsItemUpdate(d *schema.ResourceData, meta interface{}) error {
 	return resourceArmApplicationInsightsAnalyticsItemCreateUpdate(d, meta, true)
 }
+
 func resourceArmApplicationInsightsAnalyticsItemCreateUpdate(d *schema.ResourceData, meta interface{}, overwrite bool) error {
 	client := meta.(*clients.Client).AppInsights.AnalyticsItemsClient
 	ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d)

diff --git a/...internal/services/applicationinsights/tests/application_insights_api_key_resource_test.go b/...internal/services/applicationinsights/tests/application_insights_api_key_resource_test.go
@@ -155,7 +155,6 @@ func testCheckAzureRMApplicationInsightsAPIKeyDestroy(s *terraform.State) error
 		appInsightsName := id.Path["components"]
 
 		resp, err := conn.Get(ctx, resGroup, appInsightsName, name)
-
 		if err != nil {
 			return nil
 		}

diff --git a/azurerm/internal/services/applicationinsights/tests/application_insights_resource_test.go b/azurerm/internal/services/applicationinsights/tests/application_insights_resource_test.go
@@ -187,7 +187,6 @@ func testCheckAzureRMApplicationInsightsDestroy(s *terraform.State) error {
 		resourceGroup := rs.Primary.Attributes["resource_group_name"]
 
 		resp, err := conn.Get(ctx, resourceGroup, name)
-
 		if err != nil {
 			return nil
 		}

diff --git a/...nternal/services/applicationinsights/tests/application_insights_webtests_resource_test.go b/...nternal/services/applicationinsights/tests/application_insights_webtests_resource_test.go
@@ -120,7 +120,6 @@ func testCheckAzureRMApplicationInsightsWebTestsDestroy(s *terraform.State) erro
 		resGroup := rs.Primary.Attributes["resource_group_name"]
 
 		resp, err := conn.Get(ctx, resGroup, name)
-
 		if err != nil {
 			return nil
 		}