From 784c232f94da8a75ac0fe42ecc5cc631c1ed0e9e Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 25 Sep 2019 13:45:26 -0700 Subject: [PATCH] provider: enable whitespace linting (#4368) --- .golangci-travisrest.yml | 1 + .golangci.yml | 1 + GNUmakefile | 6 +++++- azurerm/data_source_azuread_application.go | 2 -- azurerm/data_source_azuread_service_principal.go | 6 ------ azurerm/data_source_express_route_circuit.go | 1 - azurerm/data_source_image.go | 1 - azurerm/data_source_log_analytics_workspace.go | 1 - azurerm/data_source_management_group.go | 1 - azurerm/data_source_redis_cache.go | 1 - azurerm/data_source_redis_cache_test.go | 1 - azurerm/data_source_sql_database.go | 1 - azurerm/data_source_storage_account.go | 1 - .../data_source_storage_account_blob_container_sas.go | 2 -- azurerm/data_source_storage_account_sas.go | 2 -- azurerm/data_source_storage_account_sas_test.go | 1 - azurerm/helpers/azure/app_service.go | 3 --- azurerm/helpers/azure/batch_pool.go | 1 - azurerm/helpers/azure/elasticpool.go | 3 --- azurerm/helpers/azure/eventhub.go | 1 - azurerm/helpers/azure/key_vault.go | 2 -- azurerm/helpers/azure/servicebus.go | 1 - azurerm/helpers/tf/acctest_test.go | 1 - azurerm/helpers/validate/int_test.go | 2 -- azurerm/helpers/validate/network.go | 1 - azurerm/helpers/validate/network_test.go | 1 - azurerm/internal/services/analysisservices/client.go | 1 - azurerm/internal/services/apimanagement/client.go | 1 - .../internal/services/applicationinsights/client.go | 1 - azurerm/internal/services/authorization/client.go | 1 - azurerm/internal/services/automation/client.go | 1 - azurerm/internal/services/batch/client.go | 1 - azurerm/internal/services/bot/client.go | 1 - azurerm/internal/services/cdn/client.go | 1 - azurerm/internal/services/cognitive/client.go | 1 - azurerm/internal/services/containers/client.go | 1 - azurerm/internal/services/cosmos/client.go | 1 - azurerm/internal/services/databricks/client.go | 1 - azurerm/internal/services/datafactory/client.go | 1 - azurerm/internal/services/datalake/client.go | 1 - azurerm/internal/services/devspace/client.go | 1 - azurerm/internal/services/devtestlabs/client.go | 1 - azurerm/internal/services/dns/client.go | 1 - azurerm/internal/services/eventgrid/client.go | 1 - azurerm/internal/services/eventhub/client.go | 1 - azurerm/internal/services/graph/client.go | 1 - azurerm/internal/services/hdinsight/client.go | 1 - azurerm/internal/services/iothub/client.go | 1 - azurerm/internal/services/keyvault/client.go | 1 - azurerm/internal/services/kusto/client.go | 1 - azurerm/internal/services/loganalytics/client.go | 1 - azurerm/internal/services/logic/client.go | 1 - azurerm/internal/services/managementgroup/client.go | 1 - azurerm/internal/services/maps/client.go | 1 - azurerm/internal/services/mariadb/client.go | 1 - azurerm/internal/services/media/client.go | 1 - azurerm/internal/services/monitor/client.go | 1 - azurerm/internal/services/msi/client.go | 1 - azurerm/internal/services/mssql/client.go | 1 - azurerm/internal/services/mysql/client.go | 1 - azurerm/internal/services/network/client.go | 1 - azurerm/internal/services/notificationhub/client.go | 1 - azurerm/internal/services/policy/client.go | 1 - azurerm/internal/services/portal/client.go | 1 - azurerm/internal/services/postgres/client.go | 1 - azurerm/internal/services/recoveryservices/client.go | 1 - azurerm/internal/services/redis/client.go | 1 - azurerm/internal/services/relay/client.go | 1 - azurerm/internal/services/resource/client.go | 1 - azurerm/internal/services/scheduler/client.go | 1 - azurerm/internal/services/search/client.go | 1 - azurerm/internal/services/servicebus/client.go | 1 - azurerm/internal/services/servicefabric/client.go | 1 - azurerm/internal/services/signalr/client.go | 1 - azurerm/internal/services/sql/client.go | 1 - azurerm/internal/services/streamanalytics/client.go | 1 - azurerm/internal/services/subscription/client.go | 1 - azurerm/internal/services/trafficmanager/client.go | 1 - azurerm/internal/services/web/client.go | 1 - azurerm/provider.go | 1 - azurerm/resource_arm_api_management_certificate.go | 1 - azurerm/resource_arm_app_service.go | 1 - azurerm/resource_arm_app_service_test.go | 4 ---- azurerm/resource_arm_application_gateway.go | 7 ------- .../resource_arm_application_insights_api_key_test.go | 2 -- azurerm/resource_arm_application_insights_webtests.go | 1 - azurerm/resource_arm_automation_account_test.go | 1 - azurerm/resource_arm_automation_credential_test.go | 2 -- .../resource_arm_automation_dsc_configuration_test.go | 2 -- ...ource_arm_automation_dsc_nodeconfiguration_test.go | 2 -- azurerm/resource_arm_automation_module.go | 1 - azurerm/resource_arm_automation_module_test.go | 2 -- azurerm/resource_arm_automation_runbook_test.go | 1 - azurerm/resource_arm_automation_schedule.go | 2 -- azurerm/resource_arm_automation_schedule_test.go | 1 - azurerm/resource_arm_autoscale_setting.go | 1 - azurerm/resource_arm_batch_pool.go | 1 - azurerm/resource_arm_bot_connection.go | 1 - azurerm/resource_arm_cognitive_account_test.go | 1 - azurerm/resource_arm_connection_monitor_test.go | 1 - azurerm/resource_arm_container_group.go | 8 -------- azurerm/resource_arm_container_group_test.go | 1 - azurerm/resource_arm_container_service.go | 2 -- azurerm/resource_arm_cosmosdb_account.go | 10 ---------- .../resource_arm_cosmosdb_account_failover_test.go | 2 -- azurerm/resource_arm_cosmosdb_account_test.go | 1 - azurerm/resource_arm_cosmosdb_sql_container.go | 1 - azurerm/resource_arm_data_factory_pipeline.go | 1 - azurerm/resource_arm_dev_test_lab_schedule.go | 2 -- azurerm/resource_arm_dns_ns_record_test.go | 1 - azurerm/resource_arm_eventhub_namespace.go | 2 -- azurerm/resource_arm_eventhub_namespace_test.go | 1 - azurerm/resource_arm_firewall.go | 1 - azurerm/resource_arm_front_door.go | 1 - azurerm/resource_arm_front_door_firewall_policy.go | 1 - azurerm/resource_arm_image.go | 2 -- azurerm/resource_arm_image_test.go | 1 - azurerm/resource_arm_iot_dps_certificate_test.go | 1 - azurerm/resource_arm_iot_dps_test.go | 1 - azurerm/resource_arm_iothub.go | 4 ---- azurerm/resource_arm_iothub_consumer_group_test.go | 1 - azurerm/resource_arm_iothub_shared_access_policy.go | 1 - .../resource_arm_iothub_shared_access_policy_test.go | 1 - azurerm/resource_arm_iothub_test.go | 1 - azurerm/resource_arm_key_vault_access_policy.go | 1 - azurerm/resource_arm_key_vault_certificate.go | 1 - azurerm/resource_arm_key_vault_test.go | 1 - azurerm/resource_arm_kubernetes_cluster.go | 1 - azurerm/resource_arm_loadbalancer.go | 2 -- azurerm/resource_arm_loadbalancer_nat_pool.go | 1 - azurerm/resource_arm_loadbalancer_nat_rule.go | 1 - azurerm/resource_arm_loadbalancer_outbound_rule.go | 2 -- azurerm/resource_arm_loadbalancer_probe.go | 1 - azurerm/resource_arm_loadbalancer_rule.go | 1 - azurerm/resource_arm_log_analytics_solution.go | 1 - azurerm/resource_arm_log_analytics_workspace.go | 1 - .../resource_arm_logic_app_trigger_http_request.go | 1 - azurerm/resource_arm_management_group.go | 1 - azurerm/resource_arm_maps_account_test.go | 1 - azurerm/resource_arm_mariadb_configuration_test.go | 1 - azurerm/resource_arm_marketplace_agreement_test.go | 1 - azurerm/resource_arm_media_services_account_test.go | 1 - azurerm/resource_arm_monitor_autoscale_setting.go | 1 - azurerm/resource_arm_mssql_elasticpool.go | 1 - azurerm/resource_arm_mysql_configuration_test.go | 1 - azurerm/resource_arm_mysql_server.go | 1 - .../resource_arm_network_connection_monitor_test.go | 1 - azurerm/resource_arm_network_interface.go | 1 - azurerm/resource_arm_network_security_group_test.go | 2 -- azurerm/resource_arm_network_security_rule_test.go | 3 --- azurerm/resource_arm_network_watcher_test.go | 3 --- ...esource_arm_notification_hub_authorization_rule.go | 1 - azurerm/resource_arm_postgresql_configuration_test.go | 1 - azurerm/resource_arm_postgresql_server.go | 1 - azurerm/resource_arm_public_ip_test.go | 1 - .../resource_arm_recovery_services_protected_vm.go | 1 - ...urce_arm_recovery_services_protection_policy_vm.go | 4 ---- ...e_arm_recovery_services_replication_policy_test.go | 1 - azurerm/resource_arm_redis_firewall_rule.go | 1 - azurerm/resource_arm_route_table_test.go | 1 - azurerm/resource_arm_route_test.go | 2 -- azurerm/resource_arm_scheduler_job.go | 11 ----------- azurerm/resource_arm_scheduler_job_collection.go | 1 - azurerm/resource_arm_search_service_test.go | 1 - azurerm/resource_arm_security_center_contact.go | 1 - azurerm/resource_arm_security_center_workspace.go | 1 - azurerm/resource_arm_snapshot.go | 1 - azurerm/resource_arm_sql_database.go | 2 -- azurerm/resource_arm_sql_database_test.go | 1 - azurerm/resource_arm_sql_server_test.go | 1 - azurerm/resource_arm_storage_account.go | 2 -- azurerm/resource_arm_storage_blob_test.go | 2 -- azurerm/resource_arm_storage_container_test.go | 1 - azurerm/resource_arm_storage_queue_test.go | 1 - azurerm/resource_arm_storage_table_test.go | 1 - azurerm/resource_arm_stream_analytics_output_mssql.go | 1 - azurerm/resource_arm_template_deployment_test.go | 2 -- azurerm/resource_arm_traffic_manager_endpoint_test.go | 1 - azurerm/resource_arm_virtual_machine.go | 2 -- azurerm/resource_arm_virtual_machine_scale_set.go | 2 -- azurerm/resource_arm_virtual_network_gateway.go | 1 - azurerm/resource_arm_virtual_network_gateway_test.go | 2 -- main.go | 1 - 183 files changed, 7 insertions(+), 262 deletions(-) mode change 100755 => 100644 azurerm/resource_arm_container_group.go mode change 100755 => 100644 azurerm/resource_arm_container_group_test.go mode change 100755 => 100644 azurerm/resource_arm_iothub.go diff --git a/.golangci-travisrest.yml b/.golangci-travisrest.yml index f709a7d0de4c..891ed2590ec5 100644 --- 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 index 10f32d1ed848..ef4d6808c63d 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -27,6 +27,7 @@ linters: - varcheck - vet - vetshadow + - whitespace linters-settings: errcheck: diff --git a/GNUmakefile b/GNUmakefile index 5aaa06fdf9f4..1cdfd03baaa4 100644 --- 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 index bda943d8a36d..664acdc49b51 100644 --- 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 index 295a03fe9fa6..37fb42750516 100644 --- 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 index dcc7460e8d4b..0d3c0e16c4ae 100644 --- 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 index 8794cd1d0402..98be2e5abc27 100644 --- 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 index bdceb89a77d0..126671c1a88b 100644 --- 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 index 00dbedde0c81..a1bb0bdf1561 100644 --- 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 index 76434959a52a..cae96a30f9b8 100644 --- 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 index e92832e7fdfe..d1518b539eba 100644 --- 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 index 1887ddaa0104..9a21d33ea0ae 100644 --- 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 index 883523521523..87a9d2f340f7 100644 --- 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 index dfff17db1ed0..8e0efbe50b39 100644 --- 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 index aacc8e402836..17eee47d45d6 100644 --- 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 index ade1871226ea..5f2b890e93bb 100644 --- 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 index cd76e976ea5e..ae74a16268c8 100644 --- 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 index 74af6ade8cd8..b008a27940f9 100644 --- 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 index 9d9b150a843a..d0934991a782 100644 --- 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 index db1bd149e8b6..cc137ab43015 100644 --- 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 index 3b63eb973ce5..7957380bb594 100644 --- 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 index d98d54b36804..370ee72baf8d 100644 --- 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 index bcc98e0281b3..800338cfe1e2 100644 --- 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 index 5a482b87c492..ea08a3fc438d 100644 --- 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 index fac8c52d1e6e..cfc4d6ecde07 100644 --- 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 index 263b288aaad1..61e4db8c0499 100644 --- 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 index 6e0ad0dff5f0..14a8767f3c2d 100644 --- 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 index c1ebce65c8a4..eddaa30e405a 100644 --- 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 index a76eee2ec3c4..d375a35da727 100644 --- 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 index 2ab939533c59..68535d01e911 100644 --- 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 index ce39b25be4b5..b8038fcb76f2 100644 --- 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 index d5727787cf21..07606a256dbe 100644 --- 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 index a337b6631b04..08af3db6d752 100644 --- 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 index d9d9d8a8505c..c35993f115c8 100644 --- 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 index de8b926b4bf0..9b17d0123e50 100644 --- 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 index fee94ac2e3e4..8a5057e762a4 100644 --- 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 index 9eca73ab7e4e..f2a303bfe259 100644 --- 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) diff --git a/azurerm/internal/services/databricks/client.go b/azurerm/internal/services/databricks/client.go index 14abd2564c13..bd4f50578db2 100644 --- a/azurerm/internal/services/databricks/client.go +++ b/azurerm/internal/services/databricks/client.go @@ -10,7 +10,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - WorkspacesClient := databricks.NewWorkspacesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&WorkspacesClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/datafactory/client.go b/azurerm/internal/services/datafactory/client.go index 8cca2f669bea..d741e279f32c 100644 --- a/azurerm/internal/services/datafactory/client.go +++ b/azurerm/internal/services/datafactory/client.go @@ -13,7 +13,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - DatasetClient := datafactory.NewDatasetsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&DatasetClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/datalake/client.go b/azurerm/internal/services/datalake/client.go index 826f91ca4688..73e8d5b55cdb 100644 --- a/azurerm/internal/services/datalake/client.go +++ b/azurerm/internal/services/datalake/client.go @@ -19,7 +19,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - StoreAccountsClient := store.NewAccountsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&StoreAccountsClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/devspace/client.go b/azurerm/internal/services/devspace/client.go index aae7e53d550b..91d6ddf368e2 100644 --- a/azurerm/internal/services/devspace/client.go +++ b/azurerm/internal/services/devspace/client.go @@ -10,7 +10,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - ControllersClient := devspaces.NewControllersClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&ControllersClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/devtestlabs/client.go b/azurerm/internal/services/devtestlabs/client.go index 9b09b51e683b..dc9aef3e76b9 100644 --- a/azurerm/internal/services/devtestlabs/client.go +++ b/azurerm/internal/services/devtestlabs/client.go @@ -14,7 +14,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - LabsClient := dtl.NewLabsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&LabsClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/dns/client.go b/azurerm/internal/services/dns/client.go index 3d2ef000a41e..0111069133a3 100644 --- a/azurerm/internal/services/dns/client.go +++ b/azurerm/internal/services/dns/client.go @@ -11,7 +11,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - RecordSetsClient := dns.NewRecordSetsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&RecordSetsClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/eventgrid/client.go b/azurerm/internal/services/eventgrid/client.go index f8daf234d8e1..c7b270241b4d 100644 --- a/azurerm/internal/services/eventgrid/client.go +++ b/azurerm/internal/services/eventgrid/client.go @@ -12,7 +12,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - DomainsClient := eventgrid.NewDomainsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&DomainsClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/eventhub/client.go b/azurerm/internal/services/eventhub/client.go index b9355ddbebef..5301956c2485 100644 --- a/azurerm/internal/services/eventhub/client.go +++ b/azurerm/internal/services/eventhub/client.go @@ -12,7 +12,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - EventHubsClient := eventhub.NewEventHubsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&EventHubsClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/graph/client.go b/azurerm/internal/services/graph/client.go index 35e590318e7c..8e6f73b0f780 100644 --- a/azurerm/internal/services/graph/client.go +++ b/azurerm/internal/services/graph/client.go @@ -11,7 +11,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - ApplicationsClient := graphrbac.NewApplicationsClientWithBaseURI(o.GraphEndpoint, o.TenantID) o.ConfigureClient(&ApplicationsClient.Client, o.GraphAuthorizer) diff --git a/azurerm/internal/services/hdinsight/client.go b/azurerm/internal/services/hdinsight/client.go index 05bac3cd402f..6802d1eb49d5 100644 --- a/azurerm/internal/services/hdinsight/client.go +++ b/azurerm/internal/services/hdinsight/client.go @@ -12,7 +12,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - ApplicationsClient := hdinsight.NewApplicationsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&ApplicationsClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/iothub/client.go b/azurerm/internal/services/iothub/client.go index 548d45910afc..69a6af073831 100644 --- a/azurerm/internal/services/iothub/client.go +++ b/azurerm/internal/services/iothub/client.go @@ -13,7 +13,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - ResourceClient := devices.NewIotHubResourceClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&ResourceClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/keyvault/client.go b/azurerm/internal/services/keyvault/client.go index 0239e5ef860e..5b82ec0c87f1 100644 --- a/azurerm/internal/services/keyvault/client.go +++ b/azurerm/internal/services/keyvault/client.go @@ -12,7 +12,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - VaultsClient := keyvault.NewVaultsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&VaultsClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/kusto/client.go b/azurerm/internal/services/kusto/client.go index 9cad316867f2..531fc0275b31 100644 --- a/azurerm/internal/services/kusto/client.go +++ b/azurerm/internal/services/kusto/client.go @@ -11,7 +11,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - ClustersClient := kusto.NewClustersClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&ClustersClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/loganalytics/client.go b/azurerm/internal/services/loganalytics/client.go index c2f8e643e64c..4c81c7727b6f 100644 --- a/azurerm/internal/services/loganalytics/client.go +++ b/azurerm/internal/services/loganalytics/client.go @@ -13,7 +13,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - WorkspacesClient := operationalinsights.NewWorkspacesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&WorkspacesClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/logic/client.go b/azurerm/internal/services/logic/client.go index 04881db897e8..8ce9a871baca 100644 --- a/azurerm/internal/services/logic/client.go +++ b/azurerm/internal/services/logic/client.go @@ -10,7 +10,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - WorkflowsClient := logic.NewWorkflowsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&WorkflowsClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/managementgroup/client.go b/azurerm/internal/services/managementgroup/client.go index e63895a4944e..17b6471fb816 100644 --- a/azurerm/internal/services/managementgroup/client.go +++ b/azurerm/internal/services/managementgroup/client.go @@ -11,7 +11,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - GroupsClient := managementgroups.NewClientWithBaseURI(o.ResourceManagerEndpoint) o.ConfigureClient(&GroupsClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/maps/client.go b/azurerm/internal/services/maps/client.go index e8a21962bcdb..0bca868b2ce5 100644 --- a/azurerm/internal/services/maps/client.go +++ b/azurerm/internal/services/maps/client.go @@ -10,7 +10,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - AccountsClient := maps.NewAccountsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&AccountsClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/mariadb/client.go b/azurerm/internal/services/mariadb/client.go index c5e73ce51ce5..7cf01e01132c 100644 --- a/azurerm/internal/services/mariadb/client.go +++ b/azurerm/internal/services/mariadb/client.go @@ -14,7 +14,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - configurationsClient := mariadb.NewConfigurationsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&configurationsClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/media/client.go b/azurerm/internal/services/media/client.go index 5b3ded217043..a09212a2a638 100644 --- a/azurerm/internal/services/media/client.go +++ b/azurerm/internal/services/media/client.go @@ -10,7 +10,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - ServicesClient := media.NewMediaservicesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&ServicesClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/monitor/client.go b/azurerm/internal/services/monitor/client.go index a7ebc341615b..97d99809524a 100644 --- a/azurerm/internal/services/monitor/client.go +++ b/azurerm/internal/services/monitor/client.go @@ -20,7 +20,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - AutoscaleSettingsClient := insights.NewAutoscaleSettingsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&AutoscaleSettingsClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/msi/client.go b/azurerm/internal/services/msi/client.go index b9af8bd5e304..4aefc92122a4 100644 --- a/azurerm/internal/services/msi/client.go +++ b/azurerm/internal/services/msi/client.go @@ -10,7 +10,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - UserAssignedIdentitiesClient := msi.NewUserAssignedIdentitiesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&UserAssignedIdentitiesClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/mssql/client.go b/azurerm/internal/services/mssql/client.go index cd330d84ffc4..658d67ac02d1 100644 --- a/azurerm/internal/services/mssql/client.go +++ b/azurerm/internal/services/mssql/client.go @@ -10,7 +10,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - ElasticPoolsClient := sql.NewElasticPoolsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&ElasticPoolsClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/mysql/client.go b/azurerm/internal/services/mysql/client.go index 29d985f3fef2..16a4b70fdd47 100644 --- a/azurerm/internal/services/mysql/client.go +++ b/azurerm/internal/services/mysql/client.go @@ -14,7 +14,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - ConfigurationsClient := mysql.NewConfigurationsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&ConfigurationsClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/network/client.go b/azurerm/internal/services/network/client.go index 81c0dba8add6..cb4a6a8d5fe0 100644 --- a/azurerm/internal/services/network/client.go +++ b/azurerm/internal/services/network/client.go @@ -36,7 +36,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - ApplicationGatewaysClient := network.NewApplicationGatewaysClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&ApplicationGatewaysClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/notificationhub/client.go b/azurerm/internal/services/notificationhub/client.go index f521aa498ea5..0ff86a62d2d8 100644 --- a/azurerm/internal/services/notificationhub/client.go +++ b/azurerm/internal/services/notificationhub/client.go @@ -11,7 +11,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - NamespacesClient := notificationhubs.NewNamespacesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&NamespacesClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/policy/client.go b/azurerm/internal/services/policy/client.go index 882822a13c38..00e3d0262fb1 100644 --- a/azurerm/internal/services/policy/client.go +++ b/azurerm/internal/services/policy/client.go @@ -12,7 +12,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - AssignmentsClient := policy.NewAssignmentsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&AssignmentsClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/portal/client.go b/azurerm/internal/services/portal/client.go index 71efcaa97997..1246a83453a9 100644 --- a/azurerm/internal/services/portal/client.go +++ b/azurerm/internal/services/portal/client.go @@ -10,7 +10,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - DashboardsClient := portal.NewDashboardsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&DashboardsClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/postgres/client.go b/azurerm/internal/services/postgres/client.go index e36c9b75296c..0444d1e08734 100644 --- a/azurerm/internal/services/postgres/client.go +++ b/azurerm/internal/services/postgres/client.go @@ -14,7 +14,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - ConfigurationsClient := postgresql.NewConfigurationsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&ConfigurationsClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/recoveryservices/client.go b/azurerm/internal/services/recoveryservices/client.go index bed456fb3bb5..7d3abc4f550d 100644 --- a/azurerm/internal/services/recoveryservices/client.go +++ b/azurerm/internal/services/recoveryservices/client.go @@ -20,7 +20,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - VaultsClient := recoveryservices.NewVaultsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&VaultsClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/redis/client.go b/azurerm/internal/services/redis/client.go index ffe42637c8c6..55ed2bbf81f9 100644 --- a/azurerm/internal/services/redis/client.go +++ b/azurerm/internal/services/redis/client.go @@ -12,7 +12,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - client := redis.NewClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&client.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/relay/client.go b/azurerm/internal/services/relay/client.go index 6cb806255f12..8b10bb708dbc 100644 --- a/azurerm/internal/services/relay/client.go +++ b/azurerm/internal/services/relay/client.go @@ -10,7 +10,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - NamespacesClient := relay.NewNamespacesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&NamespacesClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/resource/client.go b/azurerm/internal/services/resource/client.go index ba6cd0a2f41d..afbf78542116 100644 --- a/azurerm/internal/services/resource/client.go +++ b/azurerm/internal/services/resource/client.go @@ -15,7 +15,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - LocksClient := locks.NewManagementLocksClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&LocksClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/scheduler/client.go b/azurerm/internal/services/scheduler/client.go index d14ebf61a119..61ae260b7d6e 100644 --- a/azurerm/internal/services/scheduler/client.go +++ b/azurerm/internal/services/scheduler/client.go @@ -12,7 +12,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - JobCollectionsClient := scheduler.NewJobCollectionsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) //nolint: megacheck o.ConfigureClient(&JobCollectionsClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/search/client.go b/azurerm/internal/services/search/client.go index b9526ef42a12..51456406d798 100644 --- a/azurerm/internal/services/search/client.go +++ b/azurerm/internal/services/search/client.go @@ -11,7 +11,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - AdminKeysClient := search.NewAdminKeysClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&AdminKeysClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/servicebus/client.go b/azurerm/internal/services/servicebus/client.go index 77f6c6a7254a..6ebd2e99b7ca 100644 --- a/azurerm/internal/services/servicebus/client.go +++ b/azurerm/internal/services/servicebus/client.go @@ -14,7 +14,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - QueuesClient := servicebus.NewQueuesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&QueuesClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/servicefabric/client.go b/azurerm/internal/services/servicefabric/client.go index ed7647a9a7b8..b887a88e9c0b 100644 --- a/azurerm/internal/services/servicefabric/client.go +++ b/azurerm/internal/services/servicefabric/client.go @@ -10,7 +10,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - ClustersClient := servicefabric.NewClustersClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&ClustersClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/signalr/client.go b/azurerm/internal/services/signalr/client.go index 611f2e0b6b62..8786b4382c71 100644 --- a/azurerm/internal/services/signalr/client.go +++ b/azurerm/internal/services/signalr/client.go @@ -10,7 +10,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - client := signalr.NewClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&client.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/sql/client.go b/azurerm/internal/services/sql/client.go index 36c05bfd530a..95458dca13fa 100644 --- a/azurerm/internal/services/sql/client.go +++ b/azurerm/internal/services/sql/client.go @@ -17,7 +17,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - // SQL Azure DatabasesClient := sql.NewDatabasesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&DatabasesClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/streamanalytics/client.go b/azurerm/internal/services/streamanalytics/client.go index e7d816977d75..d6a79e717b78 100644 --- a/azurerm/internal/services/streamanalytics/client.go +++ b/azurerm/internal/services/streamanalytics/client.go @@ -14,7 +14,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - FunctionsClient := streamanalytics.NewFunctionsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&FunctionsClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/subscription/client.go b/azurerm/internal/services/subscription/client.go index 08700b936170..fd186bb9ef3c 100644 --- a/azurerm/internal/services/subscription/client.go +++ b/azurerm/internal/services/subscription/client.go @@ -10,7 +10,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - client := subscriptions.NewClientWithBaseURI(o.ResourceManagerEndpoint) o.ConfigureClient(&client.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/trafficmanager/client.go b/azurerm/internal/services/trafficmanager/client.go index 7eaaa52e8cad..4c74fb338589 100644 --- a/azurerm/internal/services/trafficmanager/client.go +++ b/azurerm/internal/services/trafficmanager/client.go @@ -12,7 +12,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - EndpointsClient := trafficmanager.NewEndpointsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&EndpointsClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/internal/services/web/client.go b/azurerm/internal/services/web/client.go index 1299eda3dc23..a9812d707872 100644 --- a/azurerm/internal/services/web/client.go +++ b/azurerm/internal/services/web/client.go @@ -13,7 +13,6 @@ type Client struct { } func BuildClient(o *common.ClientOptions) *Client { - AppServicePlansClient := web.NewAppServicePlansClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&AppServicePlansClient.Client, o.ResourceManagerAuthorizer) diff --git a/azurerm/provider.go b/azurerm/provider.go index f5aa81c3090c..c3447f6b81b9 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -592,7 +592,6 @@ func Provider() terraform.ResourceProvider { func providerConfigure(p *schema.Provider) schema.ConfigureFunc { return func(d *schema.ResourceData) (interface{}, error) { - var auxTenants []string if v, ok := d.Get("auxiliary_tenant_ids").([]interface{}); ok && len(v) > 0 { auxTenants = *utils.ExpandStringSlice(v) diff --git a/azurerm/resource_arm_api_management_certificate.go b/azurerm/resource_arm_api_management_certificate.go index 8ae1a8255610..aa697ebbaf22 100644 --- a/azurerm/resource_arm_api_management_certificate.go +++ b/azurerm/resource_arm_api_management_certificate.go @@ -136,7 +136,6 @@ func resourceArmApiManagementCertificateRead(d *schema.ResourceData, meta interf d.Set("api_management_name", serviceName) if props := resp.CertificateContractProperties; props != nil { - if expiration := props.ExpirationDate; expiration != nil { formatted := expiration.Format(time.RFC3339) d.Set("expiration", formatted) diff --git a/azurerm/resource_arm_app_service.go b/azurerm/resource_arm_app_service.go index 89a1da076560..b32834677547 100644 --- a/azurerm/resource_arm_app_service.go +++ b/azurerm/resource_arm_app_service.go @@ -397,7 +397,6 @@ func resourceArmAppServiceUpdate(d *schema.ResourceData, meta interface{}) error } if d.HasChange("client_affinity_enabled") { - affinity := d.Get("client_affinity_enabled").(bool) sitePatchResource := web.SitePatchResource{ diff --git a/azurerm/resource_arm_app_service_test.go b/azurerm/resource_arm_app_service_test.go index ec5f1b2cc29a..2d371e43451d 100644 --- a/azurerm/resource_arm_app_service_test.go +++ b/azurerm/resource_arm_app_service_test.go @@ -527,7 +527,6 @@ func TestAccAzureRMAppService_virtualNetwork(t *testing.T) { } func TestAccAzureRMAppService_enableManageServiceIdentity(t *testing.T) { - resourceName := "azurerm_app_service.test" ri := tf.AccRandTimeInt() config := testAccAzureRMAppService_mangedServiceIdentity(ri, testLocation()) @@ -551,7 +550,6 @@ func TestAccAzureRMAppService_enableManageServiceIdentity(t *testing.T) { } func TestAccAzureRMAppService_updateResourceByEnablingManageServiceIdentity(t *testing.T) { - resourceName := "azurerm_app_service.test" ri := tf.AccRandTimeInt() @@ -584,7 +582,6 @@ func TestAccAzureRMAppService_updateResourceByEnablingManageServiceIdentity(t *t } func TestAccAzureRMAppService_userAssignedIdentity(t *testing.T) { - resourceName := "azurerm_app_service.test" ri := tf.AccRandTimeInt() config := testAccAzureRMAppService_userAssignedIdentity(ri, testLocation()) @@ -609,7 +606,6 @@ func TestAccAzureRMAppService_userAssignedIdentity(t *testing.T) { } func TestAccAzureRMAppService_multipleAssignedIdentities(t *testing.T) { - resourceName := "azurerm_app_service.test" ri := tf.AccRandTimeInt() config := testAccAzureRMAppService_multipleAssignedIdentities(ri, testLocation()) diff --git a/azurerm/resource_arm_application_gateway.go b/azurerm/resource_arm_application_gateway.go index f1da9c22f071..1084e7daa81f 100644 --- a/azurerm/resource_arm_application_gateway.go +++ b/azurerm/resource_arm_application_gateway.go @@ -2782,7 +2782,6 @@ func flattenApplicationGatewayRequestRoutingRules(input *[]network.ApplicationGa for _, config := range *input { if props := config.ApplicationGatewayRequestRoutingRulePropertiesFormat; props != nil { - output := map[string]interface{}{ "rule_type": string(props.RuleType), } @@ -2953,7 +2952,6 @@ func flattenApplicationGatewayRewriteRuleSets(input *[]network.ApplicationGatewa for _, config := range *input { if props := config.ApplicationGatewayRewriteRuleSetPropertiesFormat; props != nil { - output := map[string]interface{}{} if config.ID != nil { @@ -2967,7 +2965,6 @@ func flattenApplicationGatewayRewriteRuleSets(input *[]network.ApplicationGatewa if rulesConfig := props.RewriteRules; rulesConfig != nil { rules := make([]interface{}, 0) for _, rule := range *rulesConfig { - ruleOutput := map[string]interface{}{} if rule.Name != nil { @@ -3056,7 +3053,6 @@ func flattenApplicationGatewayRewriteRuleSets(input *[]network.ApplicationGatewa } func expandApplicationGatewayRedirectConfigurations(d *schema.ResourceData, gatewayID string) (*[]network.ApplicationGatewayRedirectConfiguration, error) { - vs := d.Get("redirect_configuration").([]interface{}) results := make([]network.ApplicationGatewayRedirectConfiguration, 0) @@ -3116,7 +3112,6 @@ func flattenApplicationGatewayRedirectConfigurations(input *[]network.Applicatio for _, config := range *input { if props := config.ApplicationGatewayRedirectConfigurationPropertiesFormat; props != nil { - output := map[string]interface{}{ "redirect_type": string(props.RedirectType), } @@ -3681,7 +3676,6 @@ func flattenApplicationGateWayDisabledRuleGroups(input *[]network.ApplicationGat ruleGroupOutput["rules"] = ruleOutputs ruleGroups = append(ruleGroups, ruleGroupOutput) - } return ruleGroups } @@ -3728,7 +3722,6 @@ func flattenApplicationGatewayFirewallExclusion(input *[]network.ApplicationGate exclusionListOutput["selector"] = *exclusionList.Selector } exclusionLists = append(exclusionLists, exclusionListOutput) - } return exclusionLists } diff --git a/azurerm/resource_arm_application_insights_api_key_test.go b/azurerm/resource_arm_application_insights_api_key_test.go index 0e9bfe075af0..b0e7e6647d45 100644 --- a/azurerm/resource_arm_application_insights_api_key_test.go +++ b/azurerm/resource_arm_application_insights_api_key_test.go @@ -149,7 +149,6 @@ func TestAccAzureRMApplicationInsightsAPIKey_authenticate_permission(t *testing. }, }, }) - } func TestAccAzureRMApplicationInsightsAPIKey_full_permissions(t *testing.T) { @@ -180,7 +179,6 @@ func TestAccAzureRMApplicationInsightsAPIKey_full_permissions(t *testing.T) { }, }, }) - } func testCheckAzureRMApplicationInsightsAPIKeyDestroy(s *terraform.State) error { diff --git a/azurerm/resource_arm_application_insights_webtests.go b/azurerm/resource_arm_application_insights_webtests.go index d0b70cdb2cdd..a2edf676126f 100644 --- a/azurerm/resource_arm_application_insights_webtests.go +++ b/azurerm/resource_arm_application_insights_webtests.go @@ -301,7 +301,6 @@ func flattenApplicationInsightsWebTestGeoLocations(input *[]insights.WebTestGeol if prop.Location != nil { results = append(results, azure.NormalizeLocation(*prop.Location)) } - } return results diff --git a/azurerm/resource_arm_automation_account_test.go b/azurerm/resource_arm_automation_account_test.go index 439e8c77f076..85f7b6ab470b 100644 --- a/azurerm/resource_arm_automation_account_test.go +++ b/azurerm/resource_arm_automation_account_test.go @@ -170,7 +170,6 @@ func testCheckAzureRMAutomationAccountDestroy(s *terraform.State) error { } func testCheckAzureRMAutomationAccountExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { // Ensure we have enough information in state to look up in API rs, ok := s.RootModule().Resources[resourceName] diff --git a/azurerm/resource_arm_automation_credential_test.go b/azurerm/resource_arm_automation_credential_test.go index 927ba45ba360..473ff77e46dc 100644 --- a/azurerm/resource_arm_automation_credential_test.go +++ b/azurerm/resource_arm_automation_credential_test.go @@ -121,14 +121,12 @@ func testCheckAzureRMAutomationCredentialDestroy(s *terraform.State) error { } return fmt.Errorf("Automation Credential still exists:\n%#v", resp) - } return nil } func testCheckAzureRMAutomationCredentialExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { // Ensure we have enough information in state to look up in API rs, ok := s.RootModule().Resources[resourceName] diff --git a/azurerm/resource_arm_automation_dsc_configuration_test.go b/azurerm/resource_arm_automation_dsc_configuration_test.go index b87ca202f45e..f7514a0da833 100644 --- a/azurerm/resource_arm_automation_dsc_configuration_test.go +++ b/azurerm/resource_arm_automation_dsc_configuration_test.go @@ -97,14 +97,12 @@ func testCheckAzureRMAutomationDscConfigurationDestroy(s *terraform.State) error } return fmt.Errorf("Automation Dsc Configuration still exists:\n%#v", resp) - } return nil } func testCheckAzureRMAutomationDscConfigurationExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { // Ensure we have enough information in state to look up in API rs, ok := s.RootModule().Resources[resourceName] diff --git a/azurerm/resource_arm_automation_dsc_nodeconfiguration_test.go b/azurerm/resource_arm_automation_dsc_nodeconfiguration_test.go index 447f76160b98..b20faeff954f 100644 --- a/azurerm/resource_arm_automation_dsc_nodeconfiguration_test.go +++ b/azurerm/resource_arm_automation_dsc_nodeconfiguration_test.go @@ -95,14 +95,12 @@ func testCheckAzureRMAutomationDscNodeConfigurationDestroy(s *terraform.State) e } return fmt.Errorf("Automation Dsc Node Configuration still exists:\n%#v", resp) - } return nil } func testCheckAzureRMAutomationDscNodeConfigurationExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { // Ensure we have enough information in state to look up in API rs, ok := s.RootModule().Resources[resourceName] diff --git a/azurerm/resource_arm_automation_module.go b/azurerm/resource_arm_automation_module.go index 4c4d957f495d..2123648095f4 100644 --- a/azurerm/resource_arm_automation_module.go +++ b/azurerm/resource_arm_automation_module.go @@ -136,7 +136,6 @@ func resourceArmAutomationModuleCreateUpdate(d *schema.ResourceData, meta interf Timeout: 30 * time.Minute, MinTimeout: 30 * time.Second, Refresh: func() (interface{}, string, error) { - resp, err2 := client.Get(ctx, resGroup, accName, name) if err2 != nil { return resp, "Error", fmt.Errorf("Error retrieving Module %q (Automation Account %q / Resource Group %q): %+v", name, accName, resGroup, err2) diff --git a/azurerm/resource_arm_automation_module_test.go b/azurerm/resource_arm_automation_module_test.go index 90007ca18e4e..7d875a291c81 100644 --- a/azurerm/resource_arm_automation_module_test.go +++ b/azurerm/resource_arm_automation_module_test.go @@ -121,14 +121,12 @@ func testCheckAzureRMAutomationModuleDestroy(s *terraform.State) error { } return fmt.Errorf("Automation Module still exists:\n%#v", resp) - } return nil } func testCheckAzureRMAutomationModuleExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { // Ensure we have enough information in state to look up in API rs, ok := s.RootModule().Resources[resourceName] diff --git a/azurerm/resource_arm_automation_runbook_test.go b/azurerm/resource_arm_automation_runbook_test.go index bff57309170d..372fc50f0bac 100644 --- a/azurerm/resource_arm_automation_runbook_test.go +++ b/azurerm/resource_arm_automation_runbook_test.go @@ -153,7 +153,6 @@ func testCheckAzureRMAutomationRunbookDestroy(s *terraform.State) error { } func testCheckAzureRMAutomationRunbookExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { // Ensure we have enough information in state to look up in API rs, ok := s.RootModule().Resources[resourceName] diff --git a/azurerm/resource_arm_automation_schedule.go b/azurerm/resource_arm_automation_schedule.go index 9665cb2e7cd8..60a4e05b8291 100644 --- a/azurerm/resource_arm_automation_schedule.go +++ b/azurerm/resource_arm_automation_schedule.go @@ -172,7 +172,6 @@ func resourceArmAutomationSchedule() *schema.Resource { }, CustomizeDiff: func(diff *schema.ResourceDiff, v interface{}) error { - frequency := strings.ToLower(diff.Get("frequency").(string)) interval, _ := diff.GetOk("interval") if frequency == "onetime" && interval.(int) > 0 { @@ -394,7 +393,6 @@ func resourceArmAutomationScheduleDelete(d *schema.ResourceData, meta interface{ } func expandArmAutomationScheduleAdvanced(d *schema.ResourceData, isUpdate bool) (*automation.AdvancedSchedule, error) { - expandedAdvancedSchedule := automation.AdvancedSchedule{} // If frequency is set to `Month` the `week_days` array cannot be set (even empty), otherwise the API returns an error. diff --git a/azurerm/resource_arm_automation_schedule_test.go b/azurerm/resource_arm_automation_schedule_test.go index 2a1aac8b36c4..f870debe8fcd 100644 --- a/azurerm/resource_arm_automation_schedule_test.go +++ b/azurerm/resource_arm_automation_schedule_test.go @@ -506,7 +506,6 @@ func checkAccAzureRMAutomationSchedule_recurring_advanced_month(resourceName str } func testAccAzureRMAutomationSchedule_recurring_advanced_month_week_day(rInt int, location string, weekDay string, weekDayOccurrence int) string { - return fmt.Sprintf(` %s diff --git a/azurerm/resource_arm_autoscale_setting.go b/azurerm/resource_arm_autoscale_setting.go index fe3092dcc0aa..eb9f1c221baf 100644 --- a/azurerm/resource_arm_autoscale_setting.go +++ b/azurerm/resource_arm_autoscale_setting.go @@ -869,7 +869,6 @@ func flattenAzureRmAutoScaleSettingRecurrence(input *insights.Recurrence) []inte result := make(map[string]interface{}) if schedule := input.Schedule; schedule != nil { - if timezone := schedule.TimeZone; timezone != nil { result["timezone"] = *timezone } diff --git a/azurerm/resource_arm_batch_pool.go b/azurerm/resource_arm_batch_pool.go index 5129c056c6c1..cdba850928c7 100644 --- a/azurerm/resource_arm_batch_pool.go +++ b/azurerm/resource_arm_batch_pool.go @@ -628,7 +628,6 @@ func resourceArmBatchPoolRead(d *schema.ResourceData, meta interface{}) error { if props.DeploymentConfiguration != nil && props.DeploymentConfiguration.VirtualMachineConfiguration != nil && props.DeploymentConfiguration.VirtualMachineConfiguration.ImageReference != nil { - imageReference := props.DeploymentConfiguration.VirtualMachineConfiguration.ImageReference d.Set("storage_image_reference", azure.FlattenBatchPoolImageReference(imageReference)) diff --git a/azurerm/resource_arm_bot_connection.go b/azurerm/resource_arm_bot_connection.go index e567b7cc864b..40f67fd38f12 100644 --- a/azurerm/resource_arm_bot_connection.go +++ b/azurerm/resource_arm_bot_connection.go @@ -209,7 +209,6 @@ func resourceArmBotConnectionUpdate(d *schema.ResourceData, meta interface{}) er d.SetId(*resp.ID) return resourceArmBotConnectionRead(d, meta) - } func resourceArmBotConnectionDelete(d *schema.ResourceData, meta interface{}) error { diff --git a/azurerm/resource_arm_cognitive_account_test.go b/azurerm/resource_arm_cognitive_account_test.go index 3a6a4c1e6da3..32a88a81dac7 100644 --- a/azurerm/resource_arm_cognitive_account_test.go +++ b/azurerm/resource_arm_cognitive_account_test.go @@ -184,7 +184,6 @@ func testCheckAzureRMAppCognitiveAccountDestroy(s *terraform.State) error { return nil } - } return nil diff --git a/azurerm/resource_arm_connection_monitor_test.go b/azurerm/resource_arm_connection_monitor_test.go index 28429140b787..b6e50dee0cad 100644 --- a/azurerm/resource_arm_connection_monitor_test.go +++ b/azurerm/resource_arm_connection_monitor_test.go @@ -71,7 +71,6 @@ func testAccAzureRMConnectionMonitor_requiresImport(t *testing.T) { }, }, }) - } func testAccAzureRMConnectionMonitor_addressComplete(t *testing.T) { diff --git a/azurerm/resource_arm_container_group.go b/azurerm/resource_arm_container_group.go old mode 100755 new mode 100644 index d0a2b8310b77..471868dd4b4c --- a/azurerm/resource_arm_container_group.go +++ b/azurerm/resource_arm_container_group.go @@ -849,12 +849,10 @@ func expandContainerGroupContainers(d *schema.ResourceData) (*[]containerinstanc } func expandContainerEnvironmentVariables(input interface{}, secure bool) *[]containerinstance.EnvironmentVariable { - envVars := input.(map[string]interface{}) output := make([]containerinstance.EnvironmentVariable, 0, len(envVars)) if secure { - for k, v := range envVars { ev := containerinstance.EnvironmentVariable{ Name: utils.String(k), @@ -863,9 +861,7 @@ func expandContainerEnvironmentVariables(input interface{}, secure bool) *[]cont output = append(output, ev) } - } else { - for k, v := range envVars { ev := containerinstance.EnvironmentVariable{ Name: utils.String(k), @@ -1009,7 +1005,6 @@ func expandContainerProbe(input interface{}) *containerinstance.ContainerProbe { httpRaw := probeConfig["http_get"].([]interface{}) if len(httpRaw) > 0 { - for _, httpget := range httpRaw { x := httpget.(map[string]interface{}) @@ -1090,7 +1085,6 @@ func flattenContainerImageRegistryCredentials(d *schema.ResourceData, input *[]c } func flattenContainerGroupContainers(d *schema.ResourceData, containers *[]containerinstance.Container, containerGroupPorts *[]containerinstance.Port, containerGroupVolumes *[]containerinstance.Volume) []interface{} { - //map old container names to index so we can look up things up nameIndexMap := map[string]int{} for i, c := range d.Get("container").([]interface{}) { @@ -1100,7 +1094,6 @@ func flattenContainerGroupContainers(d *schema.ResourceData, containers *[]conta containerCfg := make([]interface{}, 0, len(*containers)) for _, container := range *containers { - //TODO fix this crash point name := *container.Name @@ -1221,7 +1214,6 @@ func flattenContainerEnvironmentVariables(input *[]containerinstance.Environment if isSecure { for _, envVar := range *input { - if envVar.Name != nil && envVar.Value == nil { if v, ok := d.GetOk(fmt.Sprintf("container.%d.secure_environment_variables.%s", oldContainerIndex, *envVar.Name)); ok { log.Printf("[DEBUG] SECURE : Name: %s - Value: %s", *envVar.Name, v.(string)) diff --git a/azurerm/resource_arm_container_group_test.go b/azurerm/resource_arm_container_group_test.go old mode 100755 new mode 100644 index f108d1b93685..434f47738f65 --- a/azurerm/resource_arm_container_group_test.go +++ b/azurerm/resource_arm_container_group_test.go @@ -1258,7 +1258,6 @@ func testCheckAzureRMContainerGroupDestroy(s *terraform.State) error { return nil } - } return nil diff --git a/azurerm/resource_arm_container_service.go b/azurerm/resource_arm_container_service.go index 9264b7da9c8d..7a708769ce08 100644 --- a/azurerm/resource_arm_container_service.go +++ b/azurerm/resource_arm_container_service.go @@ -414,7 +414,6 @@ func flattenAzureRmContainerServiceAgentPoolProfiles(profiles *[]containerservic } func flattenAzureRmContainerServiceServicePrincipalProfile(profile *containerservice.ServicePrincipalProfile) *schema.Set { - if profile == nil { return nil } @@ -509,7 +508,6 @@ func expandAzureRmContainerServiceMasterProfile(d *schema.ResourceData) containe } func expandAzureRmContainerServiceServicePrincipal(d *schema.ResourceData) *containerservice.ServicePrincipalProfile { - value, exists := d.GetOk("service_principal") if !exists { return nil diff --git a/azurerm/resource_arm_cosmosdb_account.go b/azurerm/resource_arm_cosmosdb_account.go index c79e53260294..092261304a07 100644 --- a/azurerm/resource_arm_cosmosdb_account.go +++ b/azurerm/resource_arm_cosmosdb_account.go @@ -515,7 +515,6 @@ func resourceArmCosmosDbAccountUpdate(d *schema.ResourceData, meta interface{}) removedOne = true } } - } if removedOne { @@ -702,7 +701,6 @@ func resourceArmCosmosDbAccountRead(d *schema.ResourceData, meta interface{}) er for i, v := range *connStringResp.ConnectionStrings { connStrings[i] = *v.ConnectionString } - } d.Set("connection_strings", connStrings) @@ -736,10 +734,8 @@ func resourceArmCosmosDbAccountDelete(d *schema.ResourceData, meta interface{}) Timeout: 180 * time.Minute, MinTimeout: 30 * time.Second, Refresh: func() (interface{}, string, error) { - resp, err2 := client.Get(ctx, resourceGroup, name) if err2 != nil { - if utils.ResponseWasNotFound(resp.Response) { return resp, "NotFound", nil } @@ -774,7 +770,6 @@ func resourceArmCosmosDbAccountApiUpsert(client *documentdb.DatabaseAccountsClie MinTimeout: 30 * time.Second, Delay: 30 * time.Second, // required because it takes some time before the 'creating' location shows up Refresh: func() (interface{}, string, error) { - resp, err2 := client.Get(ctx, resourceGroup, name) if err2 != nil { return nil, "", fmt.Errorf("Error reading CosmosDB Account %q after create/update (Resource Group %q): %+v", name, resourceGroup, err2) @@ -827,7 +822,6 @@ func resourceArmCosmosDbAccountGenerateDefaultId(databaseName string, location s } func expandAzureRmCosmosDBAccountGeoLocations(databaseName string, d *schema.ResourceData) ([]documentdb.Location, error) { - locations := make([]documentdb.Location, 0) for _, l := range d.Get("geo_location").(*schema.Set).List() { data := l.(map[string]interface{}) @@ -852,7 +846,6 @@ func expandAzureRmCosmosDBAccountGeoLocations(databaseName string, d *schema.Res byPriorities := make(map[int]interface{}, len(locations)) byName := make(map[string]interface{}, len(locations)) for _, location := range locations { - priority := int(*location.FailoverPriority) name := *location.LocationName @@ -878,7 +871,6 @@ func expandAzureRmCosmosDBAccountGeoLocations(databaseName string, d *schema.Res //todo remove when deprecated field `failover_policy` is func expandAzureRmCosmosDBAccountFailoverPolicy(databaseName string, d *schema.ResourceData) ([]documentdb.Location, error) { - input := d.Get("failover_policy").(*schema.Set).List() locations := make([]documentdb.Location, 0, len(input)) @@ -926,7 +918,6 @@ func expandAzureRmCosmosDBAccountFailoverPolicy(databaseName string, d *schema.R } func expandAzureRmCosmosDBAccountCapabilities(d *schema.ResourceData) *[]documentdb.Capability { - capabilities := d.Get("capabilities").(*schema.Set).List() s := make([]documentdb.Capability, 0) @@ -950,7 +941,6 @@ func expandAzureRmCosmosDBAccountVirtualNetworkRules(d *schema.ResourceData) *[] } func flattenAzureRmCosmosDBAccountConsistencyPolicy(policy *documentdb.ConsistencyPolicy) []interface{} { - result := map[string]interface{}{} result["consistency_level"] = string(policy.DefaultConsistencyLevel) if policy.MaxIntervalInSeconds != nil { diff --git a/azurerm/resource_arm_cosmosdb_account_failover_test.go b/azurerm/resource_arm_cosmosdb_account_failover_test.go index d515c674e9d8..081fff4ac7a1 100644 --- a/azurerm/resource_arm_cosmosdb_account_failover_test.go +++ b/azurerm/resource_arm_cosmosdb_account_failover_test.go @@ -30,7 +30,6 @@ func TestAccAzureRMCosmosDBAccount_failover_boundedStaleness(t *testing.T) { } func TestAccAzureRMCosmosDBAccount_failover_boundedStalenessComplete(t *testing.T) { - ri := tf.AccRandTimeInt() config := testAccAzureRMCosmosDBAccount_failover_boundedStalenessComplete(ri, testLocation()) @@ -128,7 +127,6 @@ func TestAccAzureRMCosmosDBAccount_failover_strong(t *testing.T) { } func TestAccAzureRMCosmosDBAccount_failover_geoReplicated(t *testing.T) { - ri := tf.AccRandTimeInt() config := testAccAzureRMCosmosDBAccount_failover_geoReplicated(ri, testLocation(), testAltLocation()) diff --git a/azurerm/resource_arm_cosmosdb_account_test.go b/azurerm/resource_arm_cosmosdb_account_test.go index 2861ad1a3e6b..ae3fbac9a37d 100644 --- a/azurerm/resource_arm_cosmosdb_account_test.go +++ b/azurerm/resource_arm_cosmosdb_account_test.go @@ -898,7 +898,6 @@ func testAccAzureRMCosmosDBAccount_geoReplicated_customId(rInt int, location str } func testAccAzureRMCosmosDBAccount_geoReplicated_customConsistencyLevel(rInt int, location string, altLocation string, cLevel documentdb.DefaultConsistencyLevel) string { - return testAccAzureRMCosmosDBAccount_basic(rInt, location, string(cLevel), "", fmt.Sprintf(` geo_location { prefix = "acctest-%d-custom-id" diff --git a/azurerm/resource_arm_cosmosdb_sql_container.go b/azurerm/resource_arm_cosmosdb_sql_container.go index 64e92cdc5729..f515aa17d2d5 100644 --- a/azurerm/resource_arm_cosmosdb_sql_container.go +++ b/azurerm/resource_arm_cosmosdb_sql_container.go @@ -248,7 +248,6 @@ func flattenCosmosSQLContainerUniqueKeys(keys *[]documentdb.UniqueKey) *[]map[st slice := make([]map[string]interface{}, 0) for _, k := range *keys { - if k.Paths == nil { continue } diff --git a/azurerm/resource_arm_data_factory_pipeline.go b/azurerm/resource_arm_data_factory_pipeline.go index bc9367d2d6a0..ab6489e1468f 100644 --- a/azurerm/resource_arm_data_factory_pipeline.go +++ b/azurerm/resource_arm_data_factory_pipeline.go @@ -180,7 +180,6 @@ func resourceArmDataFactoryPipelineRead(d *schema.ResourceData, meta interface{} if err := d.Set("variables", variables); err != nil { return fmt.Errorf("Error setting `variables`: %+v", err) } - } return nil diff --git a/azurerm/resource_arm_dev_test_lab_schedule.go b/azurerm/resource_arm_dev_test_lab_schedule.go index 8709df4f47b3..a0fb04817c0b 100644 --- a/azurerm/resource_arm_dev_test_lab_schedule.go +++ b/azurerm/resource_arm_dev_test_lab_schedule.go @@ -285,7 +285,6 @@ func resourceArmDevTestLabSchedulesRead(d *schema.ResourceData, meta interface{} d.Set("task_type", resp.TaskType) if props := resp.ScheduleProperties; props != nil { - d.Set("time_zone_id", props.TimeZoneID) d.Set("status", string(props.Status)) @@ -415,7 +414,6 @@ func flattenAzureRmDevTestLabScheduleRecurrenceHourly(hourlyRecurrence *dtl.Hour } func expandArmDevTestLabScheduleNotificationSettings(d *schema.ResourceData) *dtl.NotificationSettings { - notificationSettingsConfigs := d.Get("notification_settings").([]interface{}) notificationSettingsConfig := notificationSettingsConfigs[0].(map[string]interface{}) webhookUrl := notificationSettingsConfig["webhook_url"].(string) diff --git a/azurerm/resource_arm_dns_ns_record_test.go b/azurerm/resource_arm_dns_ns_record_test.go index 10c3debae48d..8e817d3fd37d 100644 --- a/azurerm/resource_arm_dns_ns_record_test.go +++ b/azurerm/resource_arm_dns_ns_record_test.go @@ -297,7 +297,6 @@ func testCheckAzureRMDnsNsRecordDestroy(s *terraform.State) error { if resp.StatusCode != http.StatusNotFound { return fmt.Errorf("DNS NS Record still exists:\n%#v", resp.RecordSetProperties) } - } return nil diff --git a/azurerm/resource_arm_eventhub_namespace.go b/azurerm/resource_arm_eventhub_namespace.go index ae2892d6e781..b5b258bd19c2 100644 --- a/azurerm/resource_arm_eventhub_namespace.go +++ b/azurerm/resource_arm_eventhub_namespace.go @@ -398,7 +398,6 @@ func expandEventHubNamespaceNetworkRuleset(input []interface{}) *eventhub.Networ if v, ok := block["virtual_network_rule"].([]interface{}); ok { if len(v) > 0 { - var rules []eventhub.NWRuleSetVirtualNetworkRules for _, r := range v { rblock := r.(map[string]interface{}) @@ -416,7 +415,6 @@ func expandEventHubNamespaceNetworkRuleset(input []interface{}) *eventhub.Networ if v, ok := block["ip_rule"].([]interface{}); ok { if len(v) > 0 { - var rules []eventhub.NWRuleSetIPRules for _, r := range v { rblock := r.(map[string]interface{}) diff --git a/azurerm/resource_arm_eventhub_namespace_test.go b/azurerm/resource_arm_eventhub_namespace_test.go index 6fe7465f7a3b..4b1564eecce4 100644 --- a/azurerm/resource_arm_eventhub_namespace_test.go +++ b/azurerm/resource_arm_eventhub_namespace_test.go @@ -211,7 +211,6 @@ func TestAccAzureRMEventHubNamespace_maximumThroughputUnits(t *testing.T) { } func TestAccAzureRMEventHubNamespace_NonStandardCasing(t *testing.T) { - ri := tf.AccRandTimeInt() config := testAccAzureRMEventHubNamespaceNonStandardCasing(ri, testLocation()) diff --git a/azurerm/resource_arm_firewall.go b/azurerm/resource_arm_firewall.go index 2a7ee05e9197..43688b244677 100644 --- a/azurerm/resource_arm_firewall.go +++ b/azurerm/resource_arm_firewall.go @@ -391,7 +391,6 @@ func validateAzureFirewallSubnetName(v interface{}, k string) (warnings []string subnetName := parsed.Path["subnets"] if subnetName != "AzureFirewallSubnet" { errors = append(errors, fmt.Errorf("The name of the Subnet for %q must be exactly 'AzureFirewallSubnet' to be used for the Azure Firewall resource", k)) - } return warnings, errors diff --git a/azurerm/resource_arm_front_door.go b/azurerm/resource_arm_front_door.go index 141d1b2e00dc..110709dc5262 100644 --- a/azurerm/resource_arm_front_door.go +++ b/azurerm/resource_arm_front_door.go @@ -1427,7 +1427,6 @@ func flattenArmFrontDoorFrontendEndpointsSubResources(input *[]frontdoor.SubReso } func makeCustomHttpsConfiguration(customHttpsConfiguration map[string]interface{}) frontdoor.CustomHTTPSConfiguration { - customHTTPSConfigurationUpdate := frontdoor.CustomHTTPSConfiguration{ ProtocolType: frontdoor.ServerNameIndication, } diff --git a/azurerm/resource_arm_front_door_firewall_policy.go b/azurerm/resource_arm_front_door_firewall_policy.go index 64c7a02d5a1b..e16d82087913 100644 --- a/azurerm/resource_arm_front_door_firewall_policy.go +++ b/azurerm/resource_arm_front_door_firewall_policy.go @@ -409,7 +409,6 @@ func resourceArmFrontDoorFirewallPolicyRead(d *schema.ResourceData, meta interfa if properties := resp.WebApplicationFirewallPolicyProperties; properties != nil { if policy := properties.PolicySettings; policy != nil { - d.Set("enabled", policy.EnabledState == frontdoor.PolicyEnabledStateEnabled) d.Set("mode", string(policy.Mode)) d.Set("redirect_url", policy.RedirectURL) diff --git a/azurerm/resource_arm_image.go b/azurerm/resource_arm_image.go index b19f9d7559c5..b2787a9a51ef 100644 --- a/azurerm/resource_arm_image.go +++ b/azurerm/resource_arm_image.go @@ -422,7 +422,6 @@ func expandAzureRmImageOsDisk(d *schema.ResourceData) (*compute.ImageOSDisk, err } func expandAzureRmImageDataDisks(d *schema.ResourceData) ([]compute.ImageDataDisk, error) { - disks := d.Get("data_disk").([]interface{}) dataDisks := make([]compute.ImageDataDisk, 0, len(disks)) @@ -460,5 +459,4 @@ func expandAzureRmImageDataDisks(d *schema.ResourceData) ([]compute.ImageDataDis } return dataDisks, nil - } diff --git a/azurerm/resource_arm_image_test.go b/azurerm/resource_arm_image_test.go index 55f4009b6290..69d913a3a955 100644 --- a/azurerm/resource_arm_image_test.go +++ b/azurerm/resource_arm_image_test.go @@ -310,7 +310,6 @@ func deprovisionVM(userName string, password string, hostName string, port strin func testCheckAzureRMImageExists(resourceName string, shouldExist bool) resource.TestCheckFunc { return func(s *terraform.State) error { - log.Printf("[INFO] testing MANAGED IMAGE EXISTS - BEGIN.") rs, ok := s.RootModule().Resources[resourceName] diff --git a/azurerm/resource_arm_iot_dps_certificate_test.go b/azurerm/resource_arm_iot_dps_certificate_test.go index 23c474abea97..a86994a287c5 100644 --- a/azurerm/resource_arm_iot_dps_certificate_test.go +++ b/azurerm/resource_arm_iot_dps_certificate_test.go @@ -161,7 +161,6 @@ func testCheckAzureRMIotDPSCertificateExists(resourceName string) resource.TestC } return nil - } } diff --git a/azurerm/resource_arm_iot_dps_test.go b/azurerm/resource_arm_iot_dps_test.go index 75c431e4018f..aee48e7002c3 100644 --- a/azurerm/resource_arm_iot_dps_test.go +++ b/azurerm/resource_arm_iot_dps_test.go @@ -184,7 +184,6 @@ func testCheckAzureRMIotDPSExists(resourceName string) resource.TestCheckFunc { } return nil - } } diff --git a/azurerm/resource_arm_iothub.go b/azurerm/resource_arm_iothub.go old mode 100755 new mode 100644 index d8da75e1e09e..5176b4533440 --- a/azurerm/resource_arm_iothub.go +++ b/azurerm/resource_arm_iothub.go @@ -417,7 +417,6 @@ func resourceArmIotHub() *schema.Resource { "tags": tags.Schema(), }, } - } func resourceArmIotHubCreateUpdate(d *schema.ResourceData, meta interface{}) error { @@ -548,7 +547,6 @@ func resourceArmIotHubRead(d *schema.ResourceData, meta interface{}) error { } if properties := hub.Properties; properties != nil { - for k, v := range properties.EventHubEndpoints { if v == nil { continue @@ -561,7 +559,6 @@ func resourceArmIotHubRead(d *schema.ResourceData, meta interface{}) error { d.Set("event_hub_operations_endpoint", v.Endpoint) d.Set("event_hub_operations_path", v.Path) } - } d.Set("hostname", properties.HostName) @@ -916,7 +913,6 @@ func flattenIoTHubEndpoint(input *devices.RoutingProperties) []interface{} { results := make([]interface{}, 0) if input != nil && input.Endpoints != nil { - if containers := input.Endpoints.StorageContainers; containers != nil { for _, container := range *containers { output := make(map[string]interface{}) diff --git a/azurerm/resource_arm_iothub_consumer_group_test.go b/azurerm/resource_arm_iothub_consumer_group_test.go index ddcea40b3aed..720d652c1e35 100644 --- a/azurerm/resource_arm_iothub_consumer_group_test.go +++ b/azurerm/resource_arm_iothub_consumer_group_test.go @@ -144,7 +144,6 @@ func testCheckAzureRMIotHubConsumerGroupExists(resourceName string) resource.Tes } return nil - } } diff --git a/azurerm/resource_arm_iothub_shared_access_policy.go b/azurerm/resource_arm_iothub_shared_access_policy.go index 7127ae2a9e79..e52c22c6249d 100644 --- a/azurerm/resource_arm_iothub_shared_access_policy.go +++ b/azurerm/resource_arm_iothub_shared_access_policy.go @@ -302,7 +302,6 @@ type accessRights struct { } func expandAccessRights(d *schema.ResourceData) string { - var possibleAccessRights = []struct { schema string right string diff --git a/azurerm/resource_arm_iothub_shared_access_policy_test.go b/azurerm/resource_arm_iothub_shared_access_policy_test.go index c347548bac29..c4605491e47b 100644 --- a/azurerm/resource_arm_iothub_shared_access_policy_test.go +++ b/azurerm/resource_arm_iothub_shared_access_policy_test.go @@ -200,7 +200,6 @@ func testCheckAzureRMIotHubSharedAccessPolicyExists(resourceName string) resourc } return fmt.Errorf("Bad: No shared access policy %s defined for IotHub %s", keyName, iothubName) - } } diff --git a/azurerm/resource_arm_iothub_test.go b/azurerm/resource_arm_iothub_test.go index 475292d90e45..738dd9ef7a67 100644 --- a/azurerm/resource_arm_iothub_test.go +++ b/azurerm/resource_arm_iothub_test.go @@ -246,7 +246,6 @@ func testCheckAzureRMIotHubExists(resourceName string) resource.TestCheckFunc { } return nil - } } diff --git a/azurerm/resource_arm_key_vault_access_policy.go b/azurerm/resource_arm_key_vault_access_policy.go index 67baf77b453e..f0022d86647b 100644 --- a/azurerm/resource_arm_key_vault_access_policy.go +++ b/azurerm/resource_arm_key_vault_access_policy.go @@ -142,7 +142,6 @@ func resourceArmKeyVaultAccessPolicyCreateOrDelete(d *schema.ResourceData, meta return fmt.Errorf("key_value_id does not contain `vaults`: %q", vaultId) } vaultName = vaultNameTemp - } else if resourceGroup == "" { return fmt.Errorf("one of `resource_group_name` must be set when `vault_name` is used") } diff --git a/azurerm/resource_arm_key_vault_certificate.go b/azurerm/resource_arm_key_vault_certificate.go index 4102d94bb3a7..bdfcd66c9bb0 100644 --- a/azurerm/resource_arm_key_vault_certificate.go +++ b/azurerm/resource_arm_key_vault_certificate.go @@ -623,7 +623,6 @@ func expandKeyVaultCertificatePolicy(d *schema.ResourceData) keyvault.Certificat subjectAlternativeNames := &keyvault.SubjectAlternativeNames{} if v, ok := cert["subject_alternative_names"]; ok { - if sans := v.([]interface{}); len(sans) > 0 { if sans[0] != nil { san := sans[0].(map[string]interface{}) diff --git a/azurerm/resource_arm_key_vault_test.go b/azurerm/resource_arm_key_vault_test.go index 1a30d261b35b..90decce79c86 100644 --- a/azurerm/resource_arm_key_vault_test.go +++ b/azurerm/resource_arm_key_vault_test.go @@ -855,7 +855,6 @@ resource "azurerm_key_vault" "test" { } func testAccAzureRMKeyVault_accessPolicyUpperLimit(rInt int, location string, rs string) string { - var storageAccountConfigs string var accessPoliciesConfigs string diff --git a/azurerm/resource_arm_kubernetes_cluster.go b/azurerm/resource_arm_kubernetes_cluster.go index 417f71744713..6e38c8e2da18 100644 --- a/azurerm/resource_arm_kubernetes_cluster.go +++ b/azurerm/resource_arm_kubernetes_cluster.go @@ -1020,7 +1020,6 @@ func flattenKubernetesClusterAddonProfiles(profile map[string]*containerservice. } func expandKubernetesClusterAgentPoolProfiles(d *schema.ResourceData) ([]containerservice.ManagedClusterAgentPoolProfile, error) { - configs := d.Get("agent_pool_profile").([]interface{}) profiles := make([]containerservice.ManagedClusterAgentPoolProfile, 0) diff --git a/azurerm/resource_arm_loadbalancer.go b/azurerm/resource_arm_loadbalancer.go index 8f1abe0a666d..7aaa23cff99e 100644 --- a/azurerm/resource_arm_loadbalancer.go +++ b/azurerm/resource_arm_loadbalancer.go @@ -396,7 +396,6 @@ func flattenLoadBalancerFrontendIpConfiguration(ipConfigs *[]network.FrontendIPC for _, rule := range *rules { inboundNatRules = append(inboundNatRules, *rule.ID) } - } ipConfig["inbound_nat_rules"] = schema.NewSet(schema.HashString, inboundNatRules) @@ -405,7 +404,6 @@ func flattenLoadBalancerFrontendIpConfiguration(ipConfigs *[]network.FrontendIPC for _, rule := range *rules { outboundRules = append(outboundRules, *rule.ID) } - } ipConfig["outbound_rules"] = schema.NewSet(schema.HashString, outboundRules) } diff --git a/azurerm/resource_arm_loadbalancer_nat_pool.go b/azurerm/resource_arm_loadbalancer_nat_pool.go index 1fbb84d2042f..38718b68a939 100644 --- a/azurerm/resource_arm_loadbalancer_nat_pool.go +++ b/azurerm/resource_arm_loadbalancer_nat_pool.go @@ -266,7 +266,6 @@ func resourceArmLoadBalancerNatPoolDelete(d *schema.ResourceData, meta interface } func expandAzureRmLoadBalancerNatPool(d *schema.ResourceData, lb *network.LoadBalancer) (*network.InboundNatPool, error) { - properties := network.InboundNatPoolPropertiesFormat{ Protocol: network.TransportProtocol(d.Get("protocol").(string)), FrontendPortRangeStart: utils.Int32(int32(d.Get("frontend_port_start").(int))), diff --git a/azurerm/resource_arm_loadbalancer_nat_rule.go b/azurerm/resource_arm_loadbalancer_nat_rule.go index 5944b0bb7bac..ab0cafd26334 100644 --- a/azurerm/resource_arm_loadbalancer_nat_rule.go +++ b/azurerm/resource_arm_loadbalancer_nat_rule.go @@ -277,7 +277,6 @@ func resourceArmLoadBalancerNatRuleDelete(d *schema.ResourceData, meta interface } func expandAzureRmLoadBalancerNatRule(d *schema.ResourceData, lb *network.LoadBalancer) (*network.InboundNatRule, error) { - properties := network.InboundNatRulePropertiesFormat{ Protocol: network.TransportProtocol(d.Get("protocol").(string)), FrontendPort: utils.Int32(int32(d.Get("frontend_port").(int))), diff --git a/azurerm/resource_arm_loadbalancer_outbound_rule.go b/azurerm/resource_arm_loadbalancer_outbound_rule.go index 01708abb29ac..4c7709231783 100644 --- a/azurerm/resource_arm_loadbalancer_outbound_rule.go +++ b/azurerm/resource_arm_loadbalancer_outbound_rule.go @@ -245,7 +245,6 @@ func resourceArmLoadBalancerOutboundRuleRead(d *schema.ResourceData, meta interf if properties.AllocatedOutboundPorts != nil { d.Set("allocated_outbound_ports", properties.AllocatedOutboundPorts) } - } return nil @@ -303,7 +302,6 @@ func resourceArmLoadBalancerOutboundRuleDelete(d *schema.ResourceData, meta inte } func expandAzureRmLoadBalancerOutboundRule(d *schema.ResourceData, lb *network.LoadBalancer) (*network.OutboundRule, error) { - properties := network.OutboundRulePropertiesFormat{ Protocol: network.LoadBalancerOutboundRuleProtocol(d.Get("protocol").(string)), } diff --git a/azurerm/resource_arm_loadbalancer_probe.go b/azurerm/resource_arm_loadbalancer_probe.go index 52464f4c89d9..2aab4052052f 100644 --- a/azurerm/resource_arm_loadbalancer_probe.go +++ b/azurerm/resource_arm_loadbalancer_probe.go @@ -271,7 +271,6 @@ func resourceArmLoadBalancerProbeDelete(d *schema.ResourceData, meta interface{} } func expandAzureRmLoadBalancerProbe(d *schema.ResourceData) *network.Probe { - properties := network.ProbePropertiesFormat{ NumberOfProbes: utils.Int32(int32(d.Get("number_of_probes").(int))), IntervalInSeconds: utils.Int32(int32(d.Get("interval_in_seconds").(int))), diff --git a/azurerm/resource_arm_loadbalancer_rule.go b/azurerm/resource_arm_loadbalancer_rule.go index ce60bb9470d3..4cb928f81e2c 100644 --- a/azurerm/resource_arm_loadbalancer_rule.go +++ b/azurerm/resource_arm_loadbalancer_rule.go @@ -319,7 +319,6 @@ func resourceArmLoadBalancerRuleDelete(d *schema.ResourceData, meta interface{}) } func expandAzureRmLoadBalancerRule(d *schema.ResourceData, lb *network.LoadBalancer) (*network.LoadBalancingRule, error) { - properties := network.LoadBalancingRulePropertiesFormat{ Protocol: network.TransportProtocol(d.Get("protocol").(string)), FrontendPort: utils.Int32(int32(d.Get("frontend_port").(int))), diff --git a/azurerm/resource_arm_log_analytics_solution.go b/azurerm/resource_arm_log_analytics_solution.go index a6f3471ed4ba..84074fa1b4d2 100644 --- a/azurerm/resource_arm_log_analytics_solution.go +++ b/azurerm/resource_arm_log_analytics_solution.go @@ -144,7 +144,6 @@ func resourceArmLogAnalyticsSolutionCreateUpdate(d *schema.ResourceData, meta in d.SetId(*solution.ID) return resourceArmLogAnalyticsSolutionRead(d, meta) - } func resourceArmLogAnalyticsSolutionRead(d *schema.ResourceData, meta interface{}) error { diff --git a/azurerm/resource_arm_log_analytics_workspace.go b/azurerm/resource_arm_log_analytics_workspace.go index 415d0995e22c..5ea5bb95be98 100644 --- a/azurerm/resource_arm_log_analytics_workspace.go +++ b/azurerm/resource_arm_log_analytics_workspace.go @@ -150,7 +150,6 @@ func resourceArmLogAnalyticsWorkspaceCreateUpdate(d *schema.ResourceData, meta i d.SetId(*read.ID) return resourceArmLogAnalyticsWorkspaceRead(d, meta) - } func resourceArmLogAnalyticsWorkspaceRead(d *schema.ResourceData, meta interface{}) error { diff --git a/azurerm/resource_arm_logic_app_trigger_http_request.go b/azurerm/resource_arm_logic_app_trigger_http_request.go index 5390b97990c4..f0aedd323d2b 100644 --- a/azurerm/resource_arm_logic_app_trigger_http_request.go +++ b/azurerm/resource_arm_logic_app_trigger_http_request.go @@ -24,7 +24,6 @@ func resourceArmLogicAppTriggerHttpRequest() *schema.Resource { }, CustomizeDiff: func(diff *schema.ResourceDiff, v interface{}) error { - relativePath := diff.Get("relative_path").(string) if relativePath != "" { method := diff.Get("method").(string) diff --git a/azurerm/resource_arm_management_group.go b/azurerm/resource_arm_management_group.go index 14475ad15387..5881b6aae759 100644 --- a/azurerm/resource_arm_management_group.go +++ b/azurerm/resource_arm_management_group.go @@ -197,7 +197,6 @@ func resourceArmManagementGroupRead(d *schema.ResourceData, meta interface{}) er } } d.Set("parent_management_group_id", parentId) - } return nil diff --git a/azurerm/resource_arm_maps_account_test.go b/azurerm/resource_arm_maps_account_test.go index faabadb013e0..17c304ba4bb6 100644 --- a/azurerm/resource_arm_maps_account_test.go +++ b/azurerm/resource_arm_maps_account_test.go @@ -156,7 +156,6 @@ func testCheckAzureRMMapsAccountDestroy(s *terraform.State) error { } return nil - } func testAccAzureRMMapsAccount_basic(rInt int, location string) string { diff --git a/azurerm/resource_arm_mariadb_configuration_test.go b/azurerm/resource_arm_mariadb_configuration_test.go index 1e6e131ef145..fce5b21a72f9 100644 --- a/azurerm/resource_arm_mariadb_configuration_test.go +++ b/azurerm/resource_arm_mariadb_configuration_test.go @@ -140,7 +140,6 @@ func testCheckAzureRMMariaDbConfigurationValue(resourceName string, value string func testCheckAzureRMMariaDbConfigurationValueReset(rInt int, configurationName string) resource.TestCheckFunc { return func(s *terraform.State) error { - resourceGroup := fmt.Sprintf("acctestRG-%d", rInt) serverName := fmt.Sprintf("acctestmariadbsvr-%d", rInt) diff --git a/azurerm/resource_arm_marketplace_agreement_test.go b/azurerm/resource_arm_marketplace_agreement_test.go index bcf8b74249e1..405687990637 100644 --- a/azurerm/resource_arm_marketplace_agreement_test.go +++ b/azurerm/resource_arm_marketplace_agreement_test.go @@ -85,7 +85,6 @@ func testAccAzureRMMarketplaceAgreement_requiresImport(t *testing.T) { func testCheckAzureRMMarketplaceAgreementExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] if !ok { return fmt.Errorf("Not found: %s", resourceName) diff --git a/azurerm/resource_arm_media_services_account_test.go b/azurerm/resource_arm_media_services_account_test.go index 8791a6e56fb6..7bb8f127c68f 100644 --- a/azurerm/resource_arm_media_services_account_test.go +++ b/azurerm/resource_arm_media_services_account_test.go @@ -86,7 +86,6 @@ func TestAccAzureRMMediaServicesAccount_multiplePrimaries(t *testing.T) { func testCheckAzureRMMediaServicesAccountExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { - // Ensure we have enough information in state to look up in API rs, ok := s.RootModule().Resources[resourceName] if !ok { diff --git a/azurerm/resource_arm_monitor_autoscale_setting.go b/azurerm/resource_arm_monitor_autoscale_setting.go index 1bb3fcff58fe..d6b461a76577 100644 --- a/azurerm/resource_arm_monitor_autoscale_setting.go +++ b/azurerm/resource_arm_monitor_autoscale_setting.go @@ -862,7 +862,6 @@ func flattenAzureRmMonitorAutoScaleSettingRecurrence(input *insights.Recurrence) result := make(map[string]interface{}) if schedule := input.Schedule; schedule != nil { - if timezone := schedule.TimeZone; timezone != nil { result["timezone"] = *timezone } diff --git a/azurerm/resource_arm_mssql_elasticpool.go b/azurerm/resource_arm_mssql_elasticpool.go index 377924f5e883..0364fc061d1c 100644 --- a/azurerm/resource_arm_mssql_elasticpool.go +++ b/azurerm/resource_arm_mssql_elasticpool.go @@ -185,7 +185,6 @@ func resourceArmMsSqlElasticPool() *schema.Resource { }, CustomizeDiff: func(diff *schema.ResourceDiff, v interface{}) error { - if err := azure.MSSQLElasticPoolValidateSKU(diff); err != nil { return err } diff --git a/azurerm/resource_arm_mysql_configuration_test.go b/azurerm/resource_arm_mysql_configuration_test.go index 3a2f2c11afe1..52afe5bef5d8 100644 --- a/azurerm/resource_arm_mysql_configuration_test.go +++ b/azurerm/resource_arm_mysql_configuration_test.go @@ -140,7 +140,6 @@ func testCheckAzureRMMySQLConfigurationValue(resourceName string, value string) func testCheckAzureRMMySQLConfigurationValueReset(rInt int, configurationName string) resource.TestCheckFunc { return func(s *terraform.State) error { - resourceGroup := fmt.Sprintf("acctestRG-%d", rInt) serverName := fmt.Sprintf("acctestmysqlsvr-%d", rInt) diff --git a/azurerm/resource_arm_mysql_server.go b/azurerm/resource_arm_mysql_server.go index cd898e8b56a0..db2a09d93935 100644 --- a/azurerm/resource_arm_mysql_server.go +++ b/azurerm/resource_arm_mysql_server.go @@ -192,7 +192,6 @@ func resourceArmMySqlServer() *schema.Resource { }, CustomizeDiff: func(diff *schema.ResourceDiff, v interface{}) error { - tier, _ := diff.GetOk("sku.0.tier") storageMB, _ := diff.GetOk("storage_profile.0.storage_mb") diff --git a/azurerm/resource_arm_network_connection_monitor_test.go b/azurerm/resource_arm_network_connection_monitor_test.go index b2781ac5887d..6fc13bce9ce5 100644 --- a/azurerm/resource_arm_network_connection_monitor_test.go +++ b/azurerm/resource_arm_network_connection_monitor_test.go @@ -71,7 +71,6 @@ func testAccAzureRMNetworkConnectionMonitor_requiresImport(t *testing.T) { }, }, }) - } func testAccAzureRMNetworkConnectionMonitor_addressComplete(t *testing.T) { diff --git a/azurerm/resource_arm_network_interface.go b/azurerm/resource_arm_network_interface.go index 9a949ce66b57..12a07b389219 100644 --- a/azurerm/resource_arm_network_interface.go +++ b/azurerm/resource_arm_network_interface.go @@ -392,7 +392,6 @@ func resourceArmNetworkInterfaceRead(d *schema.ResourceData, meta interface{}) e } if props := resp.InterfacePropertiesFormat; props != nil { - d.Set("mac_address", props.MacAddress) addresses := make([]interface{}, 0) if configs := props.IPConfigurations; configs != nil { diff --git a/azurerm/resource_arm_network_security_group_test.go b/azurerm/resource_arm_network_security_group_test.go index df197946ca0e..d149d8fc0da6 100644 --- a/azurerm/resource_arm_network_security_group_test.go +++ b/azurerm/resource_arm_network_security_group_test.go @@ -267,7 +267,6 @@ func TestAccAzureRMNetworkSecurityGroup_applicationSecurityGroup(t *testing.T) { func testCheckAzureRMNetworkSecurityGroupExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] if !ok { return fmt.Errorf("Not found: %q", resourceName) @@ -296,7 +295,6 @@ func testCheckAzureRMNetworkSecurityGroupExists(resourceName string) resource.Te func testCheckAzureRMNetworkSecurityGroupDisappears(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] if !ok { return fmt.Errorf("Not found: %s", resourceName) diff --git a/azurerm/resource_arm_network_security_rule_test.go b/azurerm/resource_arm_network_security_rule_test.go index 7eaae852f240..992cee81669d 100644 --- a/azurerm/resource_arm_network_security_rule_test.go +++ b/azurerm/resource_arm_network_security_rule_test.go @@ -159,7 +159,6 @@ func TestAccAzureRMNetworkSecurityRule_applicationSecurityGroups(t *testing.T) { func testCheckAzureRMNetworkSecurityRuleExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] if !ok { return fmt.Errorf("Not found: %s", resourceName) @@ -189,7 +188,6 @@ func testCheckAzureRMNetworkSecurityRuleExists(resourceName string) resource.Tes func testCheckAzureRMNetworkSecurityRuleDisappears(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] if !ok { return fmt.Errorf("Not found: %q", resourceName) @@ -220,7 +218,6 @@ func testCheckAzureRMNetworkSecurityRuleDestroy(s *terraform.State) error { ctx := testAccProvider.Meta().(*ArmClient).StopContext for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_network_security_rule" { continue } diff --git a/azurerm/resource_arm_network_watcher_test.go b/azurerm/resource_arm_network_watcher_test.go index 5d9c1fbd0831..8527e5441f9a 100644 --- a/azurerm/resource_arm_network_watcher_test.go +++ b/azurerm/resource_arm_network_watcher_test.go @@ -202,7 +202,6 @@ func testAccAzureRMNetworkWatcher_disappears(t *testing.T) { func testCheckAzureRMNetworkWatcherExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] if !ok { return fmt.Errorf("Not found: %s", resourceName) @@ -231,7 +230,6 @@ func testCheckAzureRMNetworkWatcherExists(resourceName string) resource.TestChec func testCheckAzureRMNetworkWatcherDisappears(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] if !ok { return fmt.Errorf("Not found: %q", resourceName) @@ -262,7 +260,6 @@ func testCheckAzureRMNetworkWatcherDisappears(resourceName string) resource.Test func testCheckAzureRMNetworkWatcherDestroy(s *terraform.State) error { for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_network_watcher" { continue } diff --git a/azurerm/resource_arm_notification_hub_authorization_rule.go b/azurerm/resource_arm_notification_hub_authorization_rule.go index a3dc2ba04449..4c7a8c7ead36 100644 --- a/azurerm/resource_arm_notification_hub_authorization_rule.go +++ b/azurerm/resource_arm_notification_hub_authorization_rule.go @@ -129,7 +129,6 @@ func resourceArmNotificationHubAuthorizationRuleCreateUpdate(d *schema.ResourceD d.SetId(*read.ID) return resourceArmNotificationHubAuthorizationRuleRead(d, meta) - } func resourceArmNotificationHubAuthorizationRuleRead(d *schema.ResourceData, meta interface{}) error { diff --git a/azurerm/resource_arm_postgresql_configuration_test.go b/azurerm/resource_arm_postgresql_configuration_test.go index e261f0d97a4b..8442672a0af2 100644 --- a/azurerm/resource_arm_postgresql_configuration_test.go +++ b/azurerm/resource_arm_postgresql_configuration_test.go @@ -146,7 +146,6 @@ func testCheckAzureRMPostgreSQLConfigurationValue(resourceName string, value str func testCheckAzureRMPostgreSQLConfigurationValueReset(rInt int, configurationName string) resource.TestCheckFunc { return func(s *terraform.State) error { - resourceGroup := fmt.Sprintf("acctestRG-%d", rInt) serverName := fmt.Sprintf("acctestpsqlsvr-%d", rInt) diff --git a/azurerm/resource_arm_postgresql_server.go b/azurerm/resource_arm_postgresql_server.go index 03dacfa46ad4..b346b7b1520b 100644 --- a/azurerm/resource_arm_postgresql_server.go +++ b/azurerm/resource_arm_postgresql_server.go @@ -198,7 +198,6 @@ func resourceArmPostgreSQLServer() *schema.Resource { }, CustomizeDiff: func(diff *schema.ResourceDiff, v interface{}) error { - tier, _ := diff.GetOk("sku.0.tier") storageMB, _ := diff.GetOk("storage_profile.0.storage_mb") diff --git a/azurerm/resource_arm_public_ip_test.go b/azurerm/resource_arm_public_ip_test.go index eb7fa196f241..fad9584b76ef 100644 --- a/azurerm/resource_arm_public_ip_test.go +++ b/azurerm/resource_arm_public_ip_test.go @@ -206,7 +206,6 @@ func TestAccAzureRMPublicIpDynamic_basic_withIPv6(t *testing.T) { }, }, }) - } func TestAccAzureRMPublicIpStatic_basic_defaultsToIPv4(t *testing.T) { diff --git a/azurerm/resource_arm_recovery_services_protected_vm.go b/azurerm/resource_arm_recovery_services_protected_vm.go index 7b3d87836550..6378baf04e7e 100644 --- a/azurerm/resource_arm_recovery_services_protected_vm.go +++ b/azurerm/resource_arm_recovery_services_protected_vm.go @@ -203,7 +203,6 @@ func resourceArmRecoveryServicesProtectedVmWaitForState(client *backup.Protected MinTimeout: 30 * time.Second, Delay: 10 * time.Second, Refresh: func() (interface{}, string, error) { - resp, err := client.Get(ctx, vaultName, resourceGroup, "Azure", containerName, protectedItemName, "") if err != nil { if utils.ResponseWasNotFound(resp.Response) { diff --git a/azurerm/resource_arm_recovery_services_protection_policy_vm.go b/azurerm/resource_arm_recovery_services_protection_policy_vm.go index f9e51db1f910..a8a0792cd9fa 100644 --- a/azurerm/resource_arm_recovery_services_protection_policy_vm.go +++ b/azurerm/resource_arm_recovery_services_protection_policy_vm.go @@ -247,7 +247,6 @@ func resourceArmRecoveryServicesProtectionPolicyVm() *schema.Resource { //if daily, we need daily retention //if weekly daily cannot be set, and we need weekly CustomizeDiff: func(diff *schema.ResourceDiff, v interface{}) error { - _, hasDaily := diff.GetOk("retention_daily") _, hasWeekly := diff.GetOk("retention_weekly") @@ -369,7 +368,6 @@ func resourceArmRecoveryServicesProtectionPolicyVmRead(d *schema.ResourceData, m d.Set("recovery_vault_name", vaultName) if properties, ok := resp.Properties.AsAzureIaaSVMProtectionPolicy(); ok && properties != nil { - d.Set("timezone", properties.TimeZone) if schedule, ok := properties.SchedulePolicy.AsSimpleSchedulePolicy(); ok && schedule != nil { @@ -410,7 +408,6 @@ func resourceArmRecoveryServicesProtectionPolicyVmRead(d *schema.ResourceData, m } else { d.Set("retention_yearly", nil) } - } } @@ -705,7 +702,6 @@ func resourceArmRecoveryServicesProtectionPolicyWaitForState(client *backup.Prot MinTimeout: 30 * time.Second, Delay: 10 * time.Second, Refresh: func() (interface{}, string, error) { - resp, err := client.Get(ctx, vaultName, resourceGroup, policyName) if err != nil { if utils.ResponseWasNotFound(resp.Response) { diff --git a/azurerm/resource_arm_recovery_services_replication_policy_test.go b/azurerm/resource_arm_recovery_services_replication_policy_test.go index cdd98e268d00..b82a3ab1bdcd 100644 --- a/azurerm/resource_arm_recovery_services_replication_policy_test.go +++ b/azurerm/resource_arm_recovery_services_replication_policy_test.go @@ -37,7 +37,6 @@ func TestAccAzureRMRecoveryReplicationPolicy_basic(t *testing.T) { } func testAccAzureRMRecoveryReplicationPolicy_basic(rInt int, location string) string { - return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" diff --git a/azurerm/resource_arm_redis_firewall_rule.go b/azurerm/resource_arm_redis_firewall_rule.go index 420a1760d58f..82f816085afb 100644 --- a/azurerm/resource_arm_redis_firewall_rule.go +++ b/azurerm/resource_arm_redis_firewall_rule.go @@ -87,7 +87,6 @@ func resourceArmRedisFirewallRuleCreateUpdate(d *schema.ResourceData, meta inter } return resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { - if _, err := client.CreateOrUpdate(ctx, resourceGroup, cacheName, name, parameters); err != nil { return resource.NonRetryableError(fmt.Errorf("Error creating the rule: %s", err)) } diff --git a/azurerm/resource_arm_route_table_test.go b/azurerm/resource_arm_route_table_test.go index 9e5c2879d170..ab900c8fb440 100644 --- a/azurerm/resource_arm_route_table_test.go +++ b/azurerm/resource_arm_route_table_test.go @@ -330,7 +330,6 @@ func TestAccAzureRMRouteTable_withTagsSubnet(t *testing.T) { func testCheckAzureRMRouteTableExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] if !ok { return fmt.Errorf("Not found: %q", resourceName) diff --git a/azurerm/resource_arm_route_test.go b/azurerm/resource_arm_route_test.go index 732acfb32ed7..63f84d9ee450 100644 --- a/azurerm/resource_arm_route_test.go +++ b/azurerm/resource_arm_route_test.go @@ -151,7 +151,6 @@ func TestAccAzureRMRoute_multipleRoutes(t *testing.T) { func testCheckAzureRMRouteExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] if !ok { return fmt.Errorf("Not found: %q", resourceName) @@ -181,7 +180,6 @@ func testCheckAzureRMRouteExists(resourceName string) resource.TestCheckFunc { func testCheckAzureRMRouteDisappears(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] if !ok { return fmt.Errorf("Not found: %s", resourceName) diff --git a/azurerm/resource_arm_scheduler_job.go b/azurerm/resource_arm_scheduler_job.go index 544a1951120a..2202b8363e22 100644 --- a/azurerm/resource_arm_scheduler_job.go +++ b/azurerm/resource_arm_scheduler_job.go @@ -444,7 +444,6 @@ func resourceArmSchedulerJobActionStorageSchema() *schema.Resource { } func resourceArmSchedulerJobCustomizeDiff(diff *schema.ResourceDiff, _ interface{}) error { - _, hasWeb := diff.GetOk("action_web") _, hasStorage := diff.GetOk("action_storage_queue") if !hasWeb && !hasStorage { @@ -453,7 +452,6 @@ func resourceArmSchedulerJobCustomizeDiff(diff *schema.ResourceDiff, _ interface if b, ok := diff.GetOk("recurrence"); ok { if recurrence, ok := b.([]interface{})[0].(map[string]interface{}); ok { - //if neither count nor end time is set the API will silently fail _, hasCount := recurrence["count"] _, hasEnd := recurrence["end_time"] @@ -556,7 +554,6 @@ func resourceArmSchedulerJobRead(d *schema.ResourceData, meta interface{}) error //check & get properties properties := job.Properties if properties != nil { - //action action := properties.Action if action != nil { @@ -643,7 +640,6 @@ func resourceArmSchedulerJobDelete(d *schema.ResourceData, meta interface{}) err } func expandAzureArmSchedulerJobAction(d *schema.ResourceData, meta interface{}) *scheduler.JobAction { - action := scheduler.JobAction{} //action @@ -677,7 +673,6 @@ func expandAzureArmSchedulerJobAction(d *schema.ResourceData, meta interface{}) } func expandAzureArmSchedulerJobActionRequest(b interface{}, meta interface{}) (*scheduler.HTTPRequest, scheduler.JobActionType) { - block := b.([]interface{})[0].(map[string]interface{}) url := block["url"].(string) @@ -838,7 +833,6 @@ func expandAzureArmSchedulerJobRecurrence(b interface{}) *scheduler.JobRecurrenc // flatten (API --> terraform) func flattenAzureArmSchedulerJobActionRequest(d *schema.ResourceData, blockName string, request *scheduler.HTTPRequest) []interface{} { - block := map[string]interface{}{} if v := request.URI; v != nil { @@ -861,7 +855,6 @@ func flattenAzureArmSchedulerJobActionRequest(d *schema.ResourceData, blockName } if auth := request.Authentication; auth != nil { - authBlock := map[string]interface{}{} if basic, ok := auth.AsBasicAuthentication(); ok { @@ -875,7 +868,6 @@ func flattenAzureArmSchedulerJobActionRequest(d *schema.ResourceData, blockName if v, ok := d.GetOk(fmt.Sprintf("%s.0.authentication_basic.0.password", blockName)); ok { authBlock["password"] = v.(string) } - } else if cert, ok := auth.AsClientCertAuthentication(); ok { block["authentication_certificate"] = []interface{}{authBlock} @@ -896,7 +888,6 @@ func flattenAzureArmSchedulerJobActionRequest(d *schema.ResourceData, blockName if v, ok := d.GetOk(fmt.Sprintf("%s.0.authentication_certificate.0.password", blockName)); ok { authBlock["password"] = v.(string) } - } else if oauth, ok := auth.AsOAuthAuthentication(); ok { block["authentication_active_directory"] = []interface{}{authBlock} @@ -970,7 +961,6 @@ func flattenAzureArmSchedulerJobSchedule(recurrence *scheduler.JobRecurrence) [] } if schedule := recurrence.Schedule; schedule != nil { - if v := schedule.Minutes; v != nil { block["minutes"] = set.FromInt32Slice(*v) } @@ -992,7 +982,6 @@ func flattenAzureArmSchedulerJobSchedule(recurrence *scheduler.JobRecurrence) [] if monthly := schedule.MonthlyOccurrences; monthly != nil { s := &schema.Set{F: resourceAzureRMSchedulerJobMonthlyOccurrenceHash} for _, e := range *monthly { - m := map[string]interface{}{ "day": string(e.Day), } diff --git a/azurerm/resource_arm_scheduler_job_collection.go b/azurerm/resource_arm_scheduler_job_collection.go index bc0c39e3b817..7006917186c2 100644 --- a/azurerm/resource_arm_scheduler_job_collection.go +++ b/azurerm/resource_arm_scheduler_job_collection.go @@ -285,7 +285,6 @@ func expandAzureArmSchedulerJobCollectionQuota(d *schema.ResourceData) *schedule } func flattenAzureArmSchedulerJobCollectionQuota(quota *scheduler.JobCollectionQuota) []interface{} { - if quota == nil { return nil } diff --git a/azurerm/resource_arm_search_service_test.go b/azurerm/resource_arm_search_service_test.go index a53e9a10a657..712c0cb1dd8a 100644 --- a/azurerm/resource_arm_search_service_test.go +++ b/azurerm/resource_arm_search_service_test.go @@ -124,7 +124,6 @@ func TestAccAzureRMSearchService_tagUpdate(t *testing.T) { func testCheckAzureRMSearchServiceExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] if !ok { return fmt.Errorf("Not found: %s", resourceName) diff --git a/azurerm/resource_arm_security_center_contact.go b/azurerm/resource_arm_security_center_contact.go index 4c2318b567e1..8fc9df0469a5 100644 --- a/azurerm/resource_arm_security_center_contact.go +++ b/azurerm/resource_arm_security_center_contact.go @@ -95,7 +95,6 @@ func resourceArmSecurityCenterContactCreateUpdate(d *schema.ResourceData, meta i } if d.IsNewResource() { - if _, err := client.Create(ctx, name, contact); err != nil { return fmt.Errorf("Error creating Security Center Contact: %+v", err) } diff --git a/azurerm/resource_arm_security_center_workspace.go b/azurerm/resource_arm_security_center_workspace.go index b054815e3e04..c4fab1747d55 100644 --- a/azurerm/resource_arm_security_center_workspace.go +++ b/azurerm/resource_arm_security_center_workspace.go @@ -104,7 +104,6 @@ func resourceArmSecurityCenterWorkspaceCreateUpdate(d *schema.ResourceData, meta Timeout: 30 * time.Minute, MinTimeout: 30 * time.Second, Refresh: func() (interface{}, string, error) { - resp, err2 := client.Get(ctx, name) if err2 != nil { return resp, "Error", fmt.Errorf("Error reading Security Center Workspace: %+v", err2) diff --git a/azurerm/resource_arm_snapshot.go b/azurerm/resource_arm_snapshot.go index 81f2f105021d..2a26b99f0680 100644 --- a/azurerm/resource_arm_snapshot.go +++ b/azurerm/resource_arm_snapshot.go @@ -184,7 +184,6 @@ func resourceArmSnapshotRead(d *schema.ResourceData, meta interface{}) error { } if props := resp.SnapshotProperties; props != nil { - if data := props.CreationData; data != nil { d.Set("create_option", string(data.CreateOption)) diff --git a/azurerm/resource_arm_sql_database.go b/azurerm/resource_arm_sql_database.go index 13089dd2e02f..320bdbca1c1c 100644 --- a/azurerm/resource_arm_sql_database.go +++ b/azurerm/resource_arm_sql_database.go @@ -314,7 +314,6 @@ func resourceArmSqlDatabase() *schema.Resource { }, CustomizeDiff: func(diff *schema.ResourceDiff, v interface{}) error { - threatDetection, hasThreatDetection := diff.GetOk("threat_detection_policy") if hasThreatDetection { if tl := threatDetection.([]interface{}); len(tl) > 0 { @@ -612,7 +611,6 @@ func flattenEncryptionStatus(encryption *[]sql.TransparentDataEncryption) string } func flattenArmSqlServerThreatDetectionPolicy(d *schema.ResourceData, policy sql.DatabaseSecurityAlertPolicy) []interface{} { - // The SQL database threat detection API always returns the default value even if never set. // If the values are on their default one, threat it as not set. properties := policy.DatabaseSecurityAlertPolicyProperties diff --git a/azurerm/resource_arm_sql_database_test.go b/azurerm/resource_arm_sql_database_test.go index d256bb883d22..0b9fbb7db184 100644 --- a/azurerm/resource_arm_sql_database_test.go +++ b/azurerm/resource_arm_sql_database_test.go @@ -331,7 +331,6 @@ func TestAccAzureRMSqlDatabase_readScale(t *testing.T) { func testCheckAzureRMSqlDatabaseExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] if !ok { return fmt.Errorf("Not found: %s", resourceName) diff --git a/azurerm/resource_arm_sql_server_test.go b/azurerm/resource_arm_sql_server_test.go index cf517d22f8a5..a12131a7e08a 100644 --- a/azurerm/resource_arm_sql_server_test.go +++ b/azurerm/resource_arm_sql_server_test.go @@ -171,7 +171,6 @@ func testCheckAzureRMSqlServerDestroy(s *terraform.State) error { } return fmt.Errorf("SQL Server %s still exists", sqlServerName) - } return nil diff --git a/azurerm/resource_arm_storage_account.go b/azurerm/resource_arm_storage_account.go index 4d61ab8fc00a..64b3adb7a687 100644 --- a/azurerm/resource_arm_storage_account.go +++ b/azurerm/resource_arm_storage_account.go @@ -920,7 +920,6 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e } if d.HasChange("enable_advanced_threat_protection") { - opts := security.AdvancedThreatProtectionSetting{ AdvancedThreatProtectionProperties: &security.AdvancedThreatProtectionProperties{ IsEnabled: utils.Bool(d.Get("enable_advanced_threat_protection").(bool)), @@ -1364,7 +1363,6 @@ func expandQueuePropertiesLogging(input []interface{}) *queues.LoggingConfig { } return logging - } func expandQueuePropertiesCors(input []interface{}) *queues.Cors { diff --git a/azurerm/resource_arm_storage_blob_test.go b/azurerm/resource_arm_storage_blob_test.go index 031b02223a46..9fc83584287d 100644 --- a/azurerm/resource_arm_storage_blob_test.go +++ b/azurerm/resource_arm_storage_blob_test.go @@ -617,7 +617,6 @@ func TestAccAzureRMStorageBlob_update(t *testing.T) { func testCheckAzureRMStorageBlobExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] if !ok { return fmt.Errorf("Not found: %s", resourceName) @@ -659,7 +658,6 @@ func testCheckAzureRMStorageBlobExists(resourceName string) resource.TestCheckFu func testCheckAzureRMStorageBlobDisappears(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] if !ok { return fmt.Errorf("Not found: %s", resourceName) diff --git a/azurerm/resource_arm_storage_container_test.go b/azurerm/resource_arm_storage_container_test.go index 1eed57a474ea..74261557679b 100644 --- a/azurerm/resource_arm_storage_container_test.go +++ b/azurerm/resource_arm_storage_container_test.go @@ -236,7 +236,6 @@ func TestAccAzureRMStorageContainer_web(t *testing.T) { func testCheckAzureRMStorageContainerExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] if !ok { return fmt.Errorf("Not found: %s", resourceName) diff --git a/azurerm/resource_arm_storage_queue_test.go b/azurerm/resource_arm_storage_queue_test.go index 3648a8bcb3b0..594da6192e6a 100644 --- a/azurerm/resource_arm_storage_queue_test.go +++ b/azurerm/resource_arm_storage_queue_test.go @@ -148,7 +148,6 @@ func TestAccAzureRMStorageQueue_metaData(t *testing.T) { func testCheckAzureRMStorageQueueExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] if !ok { return fmt.Errorf("Not found: %s", resourceName) diff --git a/azurerm/resource_arm_storage_table_test.go b/azurerm/resource_arm_storage_table_test.go index e9e7591e29f5..0bb36c5a5b87 100644 --- a/azurerm/resource_arm_storage_table_test.go +++ b/azurerm/resource_arm_storage_table_test.go @@ -132,7 +132,6 @@ func TestAccAzureRMStorageTable_acl(t *testing.T) { func testCheckAzureRMStorageTableExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] if !ok { return fmt.Errorf("Not found: %s", resourceName) diff --git a/azurerm/resource_arm_stream_analytics_output_mssql.go b/azurerm/resource_arm_stream_analytics_output_mssql.go index b4663eec1970..de0d548cb6ee 100644 --- a/azurerm/resource_arm_stream_analytics_output_mssql.go +++ b/azurerm/resource_arm_stream_analytics_output_mssql.go @@ -186,7 +186,6 @@ func resourceArmStreamAnalyticsOutputSqlRead(d *schema.ResourceData, meta interf d.Set("database", v.Database) d.Set("table", v.Table) d.Set("user", v.User) - } return nil diff --git a/azurerm/resource_arm_template_deployment_test.go b/azurerm/resource_arm_template_deployment_test.go index b1ed79e25f13..9f38d039d0fc 100644 --- a/azurerm/resource_arm_template_deployment_test.go +++ b/azurerm/resource_arm_template_deployment_test.go @@ -130,7 +130,6 @@ func TestAccAzureRMTemplateDeployment_withParamsBody(t *testing.T) { }, }, }) - } func TestAccAzureRMTemplateDeployment_withOutputs(t *testing.T) { @@ -589,7 +588,6 @@ DEPLOY depends_on = ["azurerm_key_vault_secret.test-secret"] } `, rInt, location, location, rInt, rInt, rInt, rInt) - } func testAccAzureRMTemplateDeployment_withParams(rInt int, location string) string { diff --git a/azurerm/resource_arm_traffic_manager_endpoint_test.go b/azurerm/resource_arm_traffic_manager_endpoint_test.go index 84a477291e9b..0380c9243819 100644 --- a/azurerm/resource_arm_traffic_manager_endpoint_test.go +++ b/azurerm/resource_arm_traffic_manager_endpoint_test.go @@ -431,7 +431,6 @@ func testCheckAzureRMTrafficManagerEndpointDisappears(resourceName string) resou } func testCheckAzureRMTrafficManagerEndpointDestroy(s *terraform.State) error { - conn := testAccProvider.Meta().(*ArmClient).TrafficManager.EndpointsClient for _, rs := range s.RootModule().Resources { diff --git a/azurerm/resource_arm_virtual_machine.go b/azurerm/resource_arm_virtual_machine.go index a7f8b834115c..ebc897653b92 100644 --- a/azurerm/resource_arm_virtual_machine.go +++ b/azurerm/resource_arm_virtual_machine.go @@ -1538,7 +1538,6 @@ func expandAzureRmVirtualMachineOsProfileLinuxConfig(d *schema.ResourceData) (*c linuxKeys := linuxConfig["ssh_keys"].([]interface{}) sshPublicKeys := make([]compute.SSHPublicKey, 0) for _, key := range linuxKeys { - sshKey, ok := key.(map[string]interface{}) if !ok { continue @@ -1990,7 +1989,6 @@ func determineVirtualMachineIPAddress(ctx context.Context, meta interface{}, pro if props := networkInterface.InterfacePropertiesFormat; props != nil { if configs := props.IPConfigurations; configs != nil { for _, config := range *configs { - if config.PublicIPAddress != nil { id, err := azure.ParseAzureResourceID(*config.PublicIPAddress.ID) if err != nil { diff --git a/azurerm/resource_arm_virtual_machine_scale_set.go b/azurerm/resource_arm_virtual_machine_scale_set.go index 4fb62d6edf0d..dd533027b1e8 100644 --- a/azurerm/resource_arm_virtual_machine_scale_set.go +++ b/azurerm/resource_arm_virtual_machine_scale_set.go @@ -1078,7 +1078,6 @@ func resourceArmVirtualMachineScaleSetRead(d *schema.ResourceData, meta interfac } } } - } if plan := resp.Plan; plan != nil { @@ -1310,7 +1309,6 @@ func flattenAzureRmVirtualMachineScaleSetNetworkProfile(profile *compute.Virtual config["name"] = *ipConfig.Name if properties := ipConfig.VirtualMachineScaleSetIPConfigurationProperties; properties != nil { - if properties.Subnet != nil { config["subnet_id"] = *properties.Subnet.ID } diff --git a/azurerm/resource_arm_virtual_network_gateway.go b/azurerm/resource_arm_virtual_network_gateway.go index 16bf24f5e1ff..1070b1886879 100644 --- a/azurerm/resource_arm_virtual_network_gateway.go +++ b/azurerm/resource_arm_virtual_network_gateway.go @@ -778,7 +778,6 @@ func validateArmVirtualNetworkGatewayExpressRouteSku() schema.SchemaValidateFunc } func resourceArmVirtualNetworkGatewayCustomizeDiff(diff *schema.ResourceDiff, _ interface{}) error { - if vpnClient, ok := diff.GetOk("vpn_client_configuration"); ok { if vpnClientConfig, ok := vpnClient.([]interface{})[0].(map[string]interface{}); ok { hasRadiusAddress := vpnClientConfig["radius_server_address"] != "" diff --git a/azurerm/resource_arm_virtual_network_gateway_test.go b/azurerm/resource_arm_virtual_network_gateway_test.go index 3bf3807cdc27..ecaa84a1ea1f 100644 --- a/azurerm/resource_arm_virtual_network_gateway_test.go +++ b/azurerm/resource_arm_virtual_network_gateway_test.go @@ -493,7 +493,6 @@ resource "azurerm_virtual_network_gateway" "test" { } func testAccAzureRMVirtualNetworkGateway_activeActive(rInt int, location string) string { - return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" @@ -562,7 +561,6 @@ resource "azurerm_virtual_network_gateway" "test" { } } `, rInt, location, rInt, rInt, rInt, rInt) - } func testAccAzureRMVirtualNetworkGateway_vpnClientConfig(rInt int, location string) string { diff --git a/main.go b/main.go index f74922fac0a3..5bc7872f7693 100644 --- a/main.go +++ b/main.go @@ -8,7 +8,6 @@ import ( ) func main() { - // remove date and time stamp from log output as the plugin SDK already adds its own log.SetFlags(log.Flags() &^ (log.Ldate | log.Ltime))