provider: enable whitespace linting (#4368)

hashicorp · Sep 25, 2019 · 784c232 · 784c232
1 parent 1a6b660
commit 784c232
Show file tree

Hide file tree

Showing 183 changed files with 7 additions and 262 deletions.
diff --git a/.golangci-travisrest.yml b/.golangci-travisrest.yml
@@ -26,6 +26,7 @@ linters:
     - varcheck
     - vet
     - vetshadow
+    - whitespace
 
 linters-settings:
   errcheck:

diff --git a/.golangci.yml b/.golangci.yml
@@ -27,6 +27,7 @@ linters:
     - varcheck
     - vet
     - vetshadow
+    - whitespace
 
 linters-settings:
   errcheck:

diff --git a/GNUmakefile b/GNUmakefile
@@ -28,7 +28,7 @@ fmt:
 	# This logic should match the search logic in scripts/gofmtcheck.sh
 	find . -name '*.go' | grep -v vendor | xargs gofmt -s -w
 
-# Currently required by tf-deploy compile
+# Currently required by tf-deploy compile, duplicated by linters
 fmtcheck:
 	@sh "$(CURDIR)/scripts/gofmtcheck.sh"
 
@@ -57,6 +57,10 @@ tflint:
         -S001 -S002 -S003 -S004 -S005 -S006 -S007 -S008 -S009 -S010 -S011 -S012 -S013 -S014 -S015 -S016 -S017 -S018 -S019\
         ./$(PKG_NAME)
 
+whitespace:
+	@echo "==> Fixing source code with whitespace linter..."
+	golangci-lint run ./... --no-config --disable-all --enable=whitespace --fix
+
 test-docker:
 	docker run --rm -v $$(pwd):/go/src/github.com/terraform-providers/terraform-provider-azurerm -w /go/src/github.com/terraform-providers/terraform-provider-azurerm golang:1.13 make test
 

diff --git a/azurerm/data_source_azuread_application.go b/azurerm/data_source_azuread_application.go
@@ -80,7 +80,6 @@ func dataSourceArmAzureADApplicationRead(d *schema.ResourceData, meta interface{
 	var application graphrbac.Application
 
 	if oId, ok := d.GetOk("object_id"); ok {
-
 		// use the object_id to find the Azure AD application
 		objectId := oId.(string)
 		resp, err := client.Get(ctx, objectId)
@@ -94,7 +93,6 @@ func dataSourceArmAzureADApplicationRead(d *schema.ResourceData, meta interface{
 
 		application = resp
 	} else {
-
 		// use the name to find the Azure AD application
 		name := d.Get("name").(string)
 		filter := fmt.Sprintf("displayName eq '%s'", name)

diff --git a/azurerm/data_source_azuread_service_principal.go b/azurerm/data_source_azuread_service_principal.go
@@ -51,7 +51,6 @@ func dataSourceArmActiveDirectoryServicePrincipalRead(d *schema.ResourceData, me
 	var servicePrincipal *graphrbac.ServicePrincipal
 
 	if v, ok := d.GetOk("object_id"); ok {
-
 		//use the object_id to find the Azure AD service principal
 		objectId := v.(string)
 		app, err := client.Get(ctx, objectId)
@@ -64,9 +63,7 @@ func dataSourceArmActiveDirectoryServicePrincipalRead(d *schema.ResourceData, me
 		}
 
 		servicePrincipal = &app
-
 	} else if _, ok := d.GetOk("display_name"); ok {
-
 		// use the display_name to find the Azure AD service principal
 		displayName := d.Get("display_name").(string)
 		filter := fmt.Sprintf("displayName eq '%s'", displayName)
@@ -91,9 +88,7 @@ func dataSourceArmActiveDirectoryServicePrincipalRead(d *schema.ResourceData, me
 		if servicePrincipal == nil {
 			return fmt.Errorf("A Service Principal with the Display Name %q was not found", displayName)
 		}
-
 	} else {
-
 		// use the application_id to find the Azure AD service principal
 		applicationId := d.Get("application_id").(string)
 		filter := fmt.Sprintf("appId eq '%s'", applicationId)
@@ -118,7 +113,6 @@ func dataSourceArmActiveDirectoryServicePrincipalRead(d *schema.ResourceData, me
 		if servicePrincipal == nil {
 			return fmt.Errorf("A Service Principal for Application ID %q was not found", applicationId)
 		}
-
 	}
 
 	d.SetId(*servicePrincipal.ObjectID)

diff --git a/azurerm/data_source_express_route_circuit.go b/azurerm/data_source_express_route_circuit.go
@@ -148,7 +148,6 @@ func dataSourceArmExpressRouteCircuitRead(d *schema.ResourceData, meta interface
 				return fmt.Errorf("Error setting `service_provider_properties`: %+v", err)
 			}
 		}
-
 	}
 
 	if resp.Sku != nil {

diff --git a/azurerm/data_source_image.go b/azurerm/data_source_image.go
@@ -176,7 +176,6 @@ func dataSourceArmImageRead(d *schema.ResourceData, meta interface{}) error {
 			})
 		}
 		img = list[0]
-
 	}
 
 	d.SetId(*img.ID)

diff --git a/azurerm/data_source_log_analytics_workspace.go b/azurerm/data_source_log_analytics_workspace.go
@@ -58,7 +58,6 @@ func dataSourceLogAnalyticsWorkspace() *schema.Resource {
 			"tags": tags.SchemaDataSource(),
 		},
 	}
-
 }
 
 func dataSourceLogAnalyticsWorkspaceRead(d *schema.ResourceData, meta interface{}) error {

diff --git a/azurerm/data_source_management_group.go b/azurerm/data_source_management_group.go
@@ -79,7 +79,6 @@ func dataSourceArmManagementGroupRead(d *schema.ResourceData, meta interface{})
 			}
 		}
 		d.Set("parent_management_group_id", parentId)
-
 	}
 
 	return nil

diff --git a/azurerm/data_source_redis_cache.go b/azurerm/data_source_redis_cache.go
@@ -267,5 +267,4 @@ func dataSourceArmRedisCacheRead(d *schema.ResourceData, meta interface{}) error
 	d.Set("secondary_access_key", keys.SecondaryKey)
 
 	return tags.FlattenAndSet(d, resp.Tags)
-
 }
diff --git a/azurerm/data_source_redis_cache_test.go b/azurerm/data_source_redis_cache_test.go
@@ -33,7 +33,6 @@ func TestAccDataSourceAzureRMRedisCache_standard(t *testing.T) {
 			},
 		},
 	})
-
 }
 
 func testAccDataSourceAzureRMRedisCache_standardWithDataSource(rInt int, location string) string {

diff --git a/azurerm/data_source_sql_database.go b/azurerm/data_source_sql_database.go
@@ -91,7 +91,6 @@ func dataSourceArmSqlDatabaseRead(d *schema.ResourceData, meta interface{}) erro
 	}
 
 	if props := resp.DatabaseProperties; props != nil {
-
 		d.Set("collation", props.Collation)
 
 		d.Set("default_secondary_location", props.DefaultSecondaryLocation)

diff --git a/azurerm/data_source_storage_account.go b/azurerm/data_source_storage_account.go
@@ -254,7 +254,6 @@ func dataSourceArmStorageAccount() *schema.Resource {
 			"tags": tags.SchemaDataSource(),
 		},
 	}
-
 }
 
 func dataSourceArmStorageAccountRead(d *schema.ResourceData, meta interface{}) error {

diff --git a/azurerm/data_source_storage_account_blob_container_sas.go b/azurerm/data_source_storage_account_blob_container_sas.go
@@ -122,11 +122,9 @@ func dataSourceArmStorageAccountBlobContainerSharedAccessSignature() *schema.Res
 			},
 		},
 	}
-
 }
 
 func dataSourceArmStorageContainerSasRead(d *schema.ResourceData, _ interface{}) error {
-
 	connString := d.Get("connection_string").(string)
 	containerName := d.Get("container_name").(string)
 	httpsOnly := d.Get("https_only").(bool)

diff --git a/azurerm/data_source_storage_account_sas.go b/azurerm/data_source_storage_account_sas.go
@@ -179,11 +179,9 @@ func dataSourceArmStorageAccountSharedAccessSignature() *schema.Resource {
 			},
 		},
 	}
-
 }
 
 func dataSourceArmStorageAccountSasRead(d *schema.ResourceData, _ interface{}) error {
-
 	connString := d.Get("connection_string").(string)
 	httpsOnly := d.Get("https_only").(bool)
 	resourceTypesIface := d.Get("resource_types").([]interface{})

diff --git a/azurerm/data_source_storage_account_sas_test.go b/azurerm/data_source_storage_account_sas_test.go
@@ -127,7 +127,6 @@ func TestAccDataSourceArmStorageAccountSas_servicesString(t *testing.T) {
 			t.Fatalf("Failed to build resource type string: expected: %s, result: %s", test.expected, result)
 		}
 	}
-
 }
 
 func TestAccDataSourceArmStorageAccountSas_permissionsString(t *testing.T) {

diff --git a/azurerm/helpers/azure/app_service.go b/azurerm/helpers/azure/app_service.go
@@ -1164,7 +1164,6 @@ func FlattenAppServiceLogs(input *web.SiteLogsConfigProperties) []interface{} {
 
 	appLogs := make([]interface{}, 0)
 	if input.ApplicationLogs != nil {
-
 		appLogsItem := make(map[string]interface{})
 
 		blobStorage := make([]interface{}, 0)
@@ -1197,7 +1196,6 @@ func FlattenAppServiceLogs(input *web.SiteLogsConfigProperties) []interface{} {
 
 		fileSystem := make([]interface{}, 0)
 		if fileSystemInput := input.HTTPLogs.FileSystem; fileSystemInput != nil {
-
 			fileSystemItem := make(map[string]interface{})
 
 			if fileSystemInput.RetentionInDays != nil {
@@ -1464,7 +1462,6 @@ func ExpandAppServiceSiteConfig(input interface{}) (*web.SiteConfig, error) {
 			}
 
 			restrictions = append(restrictions, ipSecurityRestriction)
-
 		}
 		siteConfig.IPSecurityRestrictions = &restrictions
 	}

diff --git a/azurerm/helpers/azure/batch_pool.go b/azurerm/helpers/azure/batch_pool.go
@@ -418,7 +418,6 @@ func ExpandBatchPoolStartTask(list []interface{}) (*batch.StartTask, error) {
 				ElevationLevel: batch.ElevationLevel(autoUserMap["elevation_level"].(string)),
 				Scope:          batch.AutoUserScope(autoUserMap["scope"].(string)),
 			}
-
 		}
 	} else if userNameValue, ok := userIdentityValue["username"]; ok {
 		userName := userNameValue.(string)

diff --git a/azurerm/helpers/azure/elasticpool.go b/azurerm/helpers/azure/elasticpool.go
@@ -187,7 +187,6 @@ var getTierFromName = map[string]string{
 }
 
 func MSSQLElasticPoolValidateSKU(diff *schema.ResourceDiff) error {
-
 	name := diff.Get("sku.0.name")
 	tier := diff.Get("sku.0.tier")
 	capacity := diff.Get("sku.0.capacity")
@@ -324,7 +323,6 @@ func buildErrorString(stub string, m map[int]float64) string {
 }
 
 func doDTUSKUValidation(s sku) error {
-
 	if s.MaxAllowedGB == 0 {
 		return fmt.Errorf(getDTUCapacityErrorMsg(s))
 	}
@@ -363,7 +361,6 @@ func doDTUSKUValidation(s sku) error {
 }
 
 func doVCoreSKUValidation(s sku) error {
-
 	if s.MaxAllowedGB == 0 {
 		return fmt.Errorf(getVCoreCapacityErrorMsg(s))
 	}

diff --git a/azurerm/helpers/azure/eventhub.go b/azurerm/helpers/azure/eventhub.go
@@ -81,7 +81,6 @@ func FlattenEventHubAuthorizationRuleRights(rights *[]eventhub.AccessRights) (li
 }
 
 func EventHubAuthorizationRuleSchemaFrom(s map[string]*schema.Schema) map[string]*schema.Schema {
-
 	authSchema := map[string]*schema.Schema{
 		"listen": {
 			Type:     schema.TypeBool,

diff --git a/azurerm/helpers/azure/key_vault.go b/azurerm/helpers/azure/key_vault.go
@@ -9,7 +9,6 @@ import (
 )
 
 func GetKeyVaultBaseUrlFromID(ctx context.Context, client *keyvault.VaultsClient, keyVaultId string) (string, error) {
-
 	if keyVaultId == "" {
 		return "", fmt.Errorf("keyVaultId is empty")
 	}
@@ -90,7 +89,6 @@ func GetKeyVaultIDFromBaseUrl(ctx context.Context, client *keyvault.VaultsClient
 }
 
 func KeyVaultExists(ctx context.Context, client *keyvault.VaultsClient, keyVaultId string) (bool, error) {
-
 	if keyVaultId == "" {
 		return false, fmt.Errorf("keyVaultId is empty")
 	}

diff --git a/azurerm/helpers/azure/servicebus.go b/azurerm/helpers/azure/servicebus.go
@@ -102,7 +102,6 @@ func MergeSchema(a map[string]*schema.Schema, b map[string]*schema.Schema) map[s
 }
 
 func ServiceBusAuthorizationRuleSchemaFrom(s map[string]*schema.Schema) map[string]*schema.Schema {
-
 	authSchema := map[string]*schema.Schema{
 		"listen": {
 			Type:     schema.TypeBool,

diff --git a/azurerm/helpers/tf/acctest_test.go b/azurerm/helpers/tf/acctest_test.go
@@ -13,6 +13,5 @@ func TestAccRandTimeInt(t *testing.T) {
 		if ri > 999999999999999999 {
 			t.Fatalf("AccRandTimeInt returned a value (%d) longer then expected", ri)
 		}
-
 	})
 }
diff --git a/azurerm/helpers/validate/int_test.go b/azurerm/helpers/validate/int_test.go
@@ -100,7 +100,6 @@ func TestIntDivisibleBy(t *testing.T) {
 }
 
 func TestIntInSlice(t *testing.T) {
-
 	cases := []struct {
 		Input  []int
 		Value  int
@@ -140,5 +139,4 @@ func TestIntInSlice(t *testing.T) {
 			t.Fatalf("Expected the validateIntInSlice trigger a validation error for input: %+v looking for %+v", tc.Input, tc.Value)
 		}
 	}
-
 }
diff --git a/azurerm/helpers/validate/network.go b/azurerm/helpers/validate/network.go
@@ -27,7 +27,6 @@ func validateIpv6Address(i interface{}, k string, allowEmpty bool) (warnings []s
 	}
 
 	return warnings, errors
-
 }
 
 func CIDR(i interface{}, k string) (warnings []string, errors []error) {

diff --git a/azurerm/helpers/validate/network_test.go b/azurerm/helpers/validate/network_test.go
@@ -91,7 +91,6 @@ func TestIPv6Address(t *testing.T) {
 			}
 		})
 	}
-
 }
 
 func TestIPv4Address(t *testing.T) {

diff --git a/azurerm/internal/services/analysisservices/client.go b/azurerm/internal/services/analysisservices/client.go
@@ -10,7 +10,6 @@ type Client struct {
 }
 
 func BuildClient(o *common.ClientOptions) *Client {
-
 	ServerClient := analysisservices.NewServersClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&ServerClient.Client, o.ResourceManagerAuthorizer)
 

diff --git a/azurerm/internal/services/apimanagement/client.go b/azurerm/internal/services/apimanagement/client.go
@@ -33,7 +33,6 @@ type Client struct {
 }
 
 func BuildClient(o *common.ClientOptions) *Client {
-
 	ApiClient := apimanagement.NewAPIClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&ApiClient.Client, o.ResourceManagerAuthorizer)
 

diff --git a/azurerm/internal/services/applicationinsights/client.go b/azurerm/internal/services/applicationinsights/client.go
@@ -12,7 +12,6 @@ type Client struct {
 }
 
 func BuildClient(o *common.ClientOptions) *Client {
-
 	APIKeyClient := insights.NewAPIKeysClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&APIKeyClient.Client, o.ResourceManagerAuthorizer)
 

diff --git a/azurerm/internal/services/authorization/client.go b/azurerm/internal/services/authorization/client.go
@@ -11,7 +11,6 @@ type Client struct {
 }
 
 func BuildClient(o *common.ClientOptions) *Client {
-
 	RoleAssignmentsClient := authorization.NewRoleAssignmentsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&RoleAssignmentsClient.Client, o.ResourceManagerAuthorizer)
 

diff --git a/azurerm/internal/services/automation/client.go b/azurerm/internal/services/automation/client.go
@@ -19,7 +19,6 @@ type Client struct {
 }
 
 func BuildClient(o *common.ClientOptions) *Client {
-
 	AccountClient := automation.NewAccountClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&AccountClient.Client, o.ResourceManagerAuthorizer)
 

diff --git a/azurerm/internal/services/batch/client.go b/azurerm/internal/services/batch/client.go
@@ -13,7 +13,6 @@ type Client struct {
 }
 
 func BuildClient(o *common.ClientOptions) *Client {
-
 	AccountClient := batch.NewAccountClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&AccountClient.Client, o.ResourceManagerAuthorizer)
 

diff --git a/azurerm/internal/services/bot/client.go b/azurerm/internal/services/bot/client.go
@@ -12,7 +12,6 @@ type Client struct {
 }
 
 func BuildClient(o *common.ClientOptions) *Client {
-
 	botClient := botservice.NewBotsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&botClient.Client, o.ResourceManagerAuthorizer)
 

diff --git a/azurerm/internal/services/cdn/client.go b/azurerm/internal/services/cdn/client.go
@@ -12,7 +12,6 @@ type Client struct {
 }
 
 func BuildClient(o *common.ClientOptions) *Client {
-
 	CustomDomainsClient := cdn.NewCustomDomainsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&CustomDomainsClient.Client, o.ResourceManagerAuthorizer)
 

diff --git a/azurerm/internal/services/cognitive/client.go b/azurerm/internal/services/cognitive/client.go
@@ -10,7 +10,6 @@ type Client struct {
 }
 
 func BuildClient(o *common.ClientOptions) *Client {
-
 	AccountsClient := cognitiveservices.NewAccountsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&AccountsClient.Client, o.ResourceManagerAuthorizer)
 

diff --git a/azurerm/internal/services/containers/client.go b/azurerm/internal/services/containers/client.go
@@ -17,7 +17,6 @@ type Client struct {
 }
 
 func BuildClient(o *common.ClientOptions) *Client {
-
 	RegistriesClient := containerregistry.NewRegistriesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&RegistriesClient.Client, o.ResourceManagerAuthorizer)
 

diff --git a/azurerm/internal/services/cosmos/client.go b/azurerm/internal/services/cosmos/client.go
@@ -10,7 +10,6 @@ type Client struct {
 }
 
 func BuildClient(o *common.ClientOptions) *Client {
-
 	DatabaseClient := documentdb.NewDatabaseAccountsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&DatabaseClient.Client, o.ResourceManagerAuthorizer)