diff --git a/GNUmakefile b/GNUmakefile index 8b3aeb501054..c1884903979e 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -17,6 +17,7 @@ tools: GO111MODULE=off go get -u github.com/bflad/tfproviderlint/cmd/tfproviderlint GO111MODULE=off go get -u github.com/bflad/tfproviderdocs GO111MODULE=off go get -u github.com/katbyte/terrafmt + GO111MODULE=off go get -u mvdan.cc/gofumpt curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH || $$GOPATH)/bin v1.32.0 build: fmtcheck generate @@ -31,6 +32,11 @@ fmt: # This logic should match the search logic in scripts/gofmtcheck.sh find . -name '*.go' | grep -v vendor | xargs gofmt -s -w +fumpt: + @echo "==> Fixing source code with gofmt..." + # This logic should match the search logic in scripts/gofmtcheck.sh + find . -name '*.go' | grep -v vendor | xargs gofumpt -s -w + # Currently required by tf-deploy compile, duplicated by linters fmtcheck: @sh "$(CURDIR)/scripts/gofmtcheck.sh" diff --git a/azurerm/helpers/azure/eventhub_test.go b/azurerm/helpers/azure/eventhub_test.go index 11cbf19d7f4e..8a3dadfb109c 100644 --- a/azurerm/helpers/azure/eventhub_test.go +++ b/azurerm/helpers/azure/eventhub_test.go @@ -52,7 +52,7 @@ func TestValidateEventHubName(t *testing.T) { valid: false, }, } - var validationFunction = ValidateEventHubName() + validationFunction := ValidateEventHubName() for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { _, err := validationFunction(tt.input, "") diff --git a/azurerm/helpers/azure/servicebus_test.go b/azurerm/helpers/azure/servicebus_test.go index 266c7445dae7..97620cc62c56 100644 --- a/azurerm/helpers/azure/servicebus_test.go +++ b/azurerm/helpers/azure/servicebus_test.go @@ -63,7 +63,7 @@ func TestValidateServiceBusTopicName(t *testing.T) { }, } - var validationFunction = ValidateServiceBusTopicName() + validationFunction := ValidateServiceBusTopicName() for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { _, err := validationFunction(tt.input, "name") diff --git a/azurerm/helpers/azure/sku.go b/azurerm/helpers/azure/sku.go index 8550a624bd09..cdab76cd20be 100644 --- a/azurerm/helpers/azure/sku.go +++ b/azurerm/helpers/azure/sku.go @@ -16,7 +16,6 @@ func SplitSku(sku string) (string, int32, error) { } capacity, err := strconv.Atoi(skuParts[1]) - if err != nil { return "", -1, fmt.Errorf("%s in sku_name is not a valid value.", skuParts[1]) } @@ -37,7 +36,6 @@ func MinCapacitySkuNameInSlice(valid []string, minCapacity int32, ignoreCase boo } name, capacity, err := SplitSku(v) - if err != nil { es = append(es, err) return diff --git a/azurerm/helpers/azure/storage_account.go b/azurerm/helpers/azure/storage_account.go index 590f304a6347..d98364ad0bec 100644 --- a/azurerm/helpers/azure/storage_account.go +++ b/azurerm/helpers/azure/storage_account.go @@ -14,7 +14,8 @@ func SchemaStorageAccountCorsRule(patchEnabled bool) *schema.Schema { "MERGE", "POST", "OPTIONS", - "PUT"} + "PUT", + } if patchEnabled { allowedMethods = append(allowedMethods, "PATCH") diff --git a/azurerm/helpers/validate/time_test.go b/azurerm/helpers/validate/time_test.go index aa106d7cca18..f7b6f9ddae56 100644 --- a/azurerm/helpers/validate/time_test.go +++ b/azurerm/helpers/validate/time_test.go @@ -114,6 +114,7 @@ func TestRFC3339DateInFutureBy(t *testing.T) { }) } } + func TestISO8601Duration(t *testing.T) { cases := []struct { Value string diff --git a/azurerm/internal/acceptance/testing.go b/azurerm/internal/acceptance/testing.go index 359fffa38371..44a35de5a08a 100644 --- a/azurerm/internal/acceptance/testing.go +++ b/azurerm/internal/acceptance/testing.go @@ -14,8 +14,10 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" ) -var AzureProvider *schema.Provider -var SupportedProviders map[string]terraform.ResourceProvider +var ( + AzureProvider *schema.Provider + SupportedProviders map[string]terraform.ResourceProvider +) func PreCheck(t *testing.T) { variables := []string{ diff --git a/azurerm/internal/location/validation_test.go b/azurerm/internal/location/validation_test.go index f9fb1e36fab1..ab3e07267234 100644 --- a/azurerm/internal/location/validation_test.go +++ b/azurerm/internal/location/validation_test.go @@ -176,49 +176,51 @@ func TestEnhancedValidationEnabled(t *testing.T) { } } -var chinaLocations = []string{"chinaeast", "chinanorth", "chinanorth2", "chinaeast2"} -var publicLocations = []string{ - "westus", - "westus2", - "eastus", - "centralus", - "southcentralus", - "northcentralus", - "westcentralus", - "eastus2", - "brazilsouth", - "brazilus", - "northeurope", - "westeurope", - "eastasia", - "southeastasia", - "japanwest", - "japaneast", - "koreacentral", - "koreasouth", - "indiasouth", - "indiawest", - "indiacentral", - "australiaeast", - "australiasoutheast", - "canadacentral", - "canadaeast", - "uknorth", - "uksouth2", - "uksouth", - "ukwest", - "francecentral", - "francesouth", - "australiacentral", - "australiacentral2", - "uaecentral", - "uaenorth", - "southafricanorth", - "southafricawest", - "switzerlandnorth", - "switzerlandwest", - "germanynorth", - "germanywestcentral", - "norwayeast", - "norwaywest", -} +var ( + chinaLocations = []string{"chinaeast", "chinanorth", "chinanorth2", "chinaeast2"} + publicLocations = []string{ + "westus", + "westus2", + "eastus", + "centralus", + "southcentralus", + "northcentralus", + "westcentralus", + "eastus2", + "brazilsouth", + "brazilus", + "northeurope", + "westeurope", + "eastasia", + "southeastasia", + "japanwest", + "japaneast", + "koreacentral", + "koreasouth", + "indiasouth", + "indiawest", + "indiacentral", + "australiaeast", + "australiasoutheast", + "canadacentral", + "canadaeast", + "uknorth", + "uksouth2", + "uksouth", + "ukwest", + "francecentral", + "francesouth", + "australiacentral", + "australiacentral2", + "uaecentral", + "uaenorth", + "southafricanorth", + "southafricawest", + "switzerlandnorth", + "switzerlandwest", + "germanynorth", + "germanywestcentral", + "norwayeast", + "norwaywest", + } +) diff --git a/azurerm/internal/provider/provider.go b/azurerm/internal/provider/provider.go index 23ceb5bdd12d..d336ca2e742e 100644 --- a/azurerm/internal/provider/provider.go +++ b/azurerm/internal/provider/provider.go @@ -25,7 +25,7 @@ func TestAzureProvider() terraform.ResourceProvider { func azureProvider(supportLegacyTestSuite bool) terraform.ResourceProvider { // avoids this showing up in test output - var debugLog = func(f string, v ...interface{}) { + debugLog := func(f string, v ...interface{}) { if os.Getenv("TF_LOG") == "" { return } diff --git a/azurerm/internal/provider/provider_test.go b/azurerm/internal/provider/provider_test.go index 6342a3be21fb..966777128da0 100644 --- a/azurerm/internal/provider/provider_test.go +++ b/azurerm/internal/provider/provider_test.go @@ -87,5 +87,5 @@ func TestResourcesSupportCustomTimeouts(t *testing.T) { } func TestProvider_impl(t *testing.T) { - var _ = AzureProvider() + _ = AzureProvider() } diff --git a/azurerm/internal/services/apimanagement/api_management_api_data_source.go b/azurerm/internal/services/apimanagement/api_management_api_data_source.go index 90837a02907b..4a3128073229 100644 --- a/azurerm/internal/services/apimanagement/api_management_api_data_source.go +++ b/azurerm/internal/services/apimanagement/api_management_api_data_source.go @@ -180,6 +180,7 @@ func flattenApiManagementApiDataSourceProtocols(input *[]apimanagement.Protocol) return results } + func flattenApiManagementApiDataSourceSubscriptionKeyParamNames(paramNames *apimanagement.SubscriptionKeyParameterNamesContract) []interface{} { if paramNames == nil { return make([]interface{}, 0) diff --git a/azurerm/internal/services/apimanagement/api_management_product_data_source.go b/azurerm/internal/services/apimanagement/api_management_product_data_source.go index 81786c4c3934..d9fe8baa4a15 100644 --- a/azurerm/internal/services/apimanagement/api_management_product_data_source.go +++ b/azurerm/internal/services/apimanagement/api_management_product_data_source.go @@ -64,6 +64,7 @@ func dataSourceApiManagementProduct() *schema.Resource { }, } } + func dataSourceApiManagementProductRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ProductsClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) diff --git a/azurerm/internal/services/apimanagement/api_management_resource.go b/azurerm/internal/services/apimanagement/api_management_resource.go index 97643d4c93a9..10ea9bdff4c8 100644 --- a/azurerm/internal/services/apimanagement/api_management_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_resource.go @@ -25,14 +25,16 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -var apimBackendProtocolSsl3 = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30" -var apimBackendProtocolTls10 = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10" -var apimBackendProtocolTls11 = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11" -var apimFrontendProtocolSsl3 = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30" -var apimFrontendProtocolTls10 = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10" -var apimFrontendProtocolTls11 = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11" -var apimTripleDesCiphers = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168" -var apimHttp2Protocol = "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2" +var ( + apimBackendProtocolSsl3 = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30" + apimBackendProtocolTls10 = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10" + apimBackendProtocolTls11 = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11" + apimFrontendProtocolSsl3 = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30" + apimFrontendProtocolTls10 = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10" + apimFrontendProtocolTls11 = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11" + apimTripleDesCiphers = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168" + apimHttp2Protocol = "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2" +) func resourceArmApiManagementService() *schema.Resource { return &schema.Resource{ diff --git a/azurerm/internal/services/apimanagement/tests/api_management_api_diagnostic_resource_test.go b/azurerm/internal/services/apimanagement/tests/api_management_api_diagnostic_resource_test.go index adf09fbcdf2c..90e1f9c9171f 100644 --- a/azurerm/internal/services/apimanagement/tests/api_management_api_diagnostic_resource_test.go +++ b/azurerm/internal/services/apimanagement/tests/api_management_api_diagnostic_resource_test.go @@ -109,7 +109,6 @@ func testCheckAzureRMApiManagementApiDiagnosticDestroy(s *terraform.State) error return err } resp, err := client.Get(ctx, diagnosticId.ResourceGroup, diagnosticId.ServiceName, diagnosticId.ApiName, diagnosticId.Name) - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { return err diff --git a/azurerm/internal/services/apimanagement/tests/api_management_authorization_server_resource_test.go b/azurerm/internal/services/apimanagement/tests/api_management_authorization_server_resource_test.go index 851fee1af709..4656abadc97f 100644 --- a/azurerm/internal/services/apimanagement/tests/api_management_authorization_server_resource_test.go +++ b/azurerm/internal/services/apimanagement/tests/api_management_authorization_server_resource_test.go @@ -82,7 +82,6 @@ func testCheckAzureRMAPIManagementAuthorizationServerDestroy(s *terraform.State) serviceName := rs.Primary.Attributes["api_management_name"] resp, err := client.Get(ctx, resourceGroup, serviceName, name) - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { return err diff --git a/azurerm/internal/services/apimanagement/tests/api_management_certificate_resource_test.go b/azurerm/internal/services/apimanagement/tests/api_management_certificate_resource_test.go index 60175a0da619..5f0edcb4c2f6 100644 --- a/azurerm/internal/services/apimanagement/tests/api_management_certificate_resource_test.go +++ b/azurerm/internal/services/apimanagement/tests/api_management_certificate_resource_test.go @@ -75,7 +75,6 @@ func testCheckAzureRMAPIManagementCertificateDestroy(s *terraform.State) error { serviceName := rs.Primary.Attributes["api_management_name"] resp, err := client.Get(ctx, resourceGroup, serviceName, name) - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { return err diff --git a/azurerm/internal/services/apimanagement/tests/api_management_data_source_test.go b/azurerm/internal/services/apimanagement/tests/api_management_data_source_test.go index 69eb43450cc8..2be33e6e4abd 100644 --- a/azurerm/internal/services/apimanagement/tests/api_management_data_source_test.go +++ b/azurerm/internal/services/apimanagement/tests/api_management_data_source_test.go @@ -102,6 +102,7 @@ data "azurerm_api_management" "test" { } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } + func testAccDataSourceApiManagement_identitySystemAssigned(data acceptance.TestData) string { return fmt.Sprintf(` provider "azurerm" { diff --git a/azurerm/internal/services/apimanagement/tests/api_management_diagnostic_resource_test.go b/azurerm/internal/services/apimanagement/tests/api_management_diagnostic_resource_test.go index c11dc02228d5..80f4bff1e9f5 100644 --- a/azurerm/internal/services/apimanagement/tests/api_management_diagnostic_resource_test.go +++ b/azurerm/internal/services/apimanagement/tests/api_management_diagnostic_resource_test.go @@ -90,7 +90,6 @@ func testCheckAzureRMApiManagementDiagnosticDestroy(s *terraform.State) error { return err } resp, err := client.Get(ctx, diagnosticId.ResourceGroup, diagnosticId.ServiceName, diagnosticId.Name) - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { return err diff --git a/azurerm/internal/services/apimanagement/tests/api_management_group_resource_test.go b/azurerm/internal/services/apimanagement/tests/api_management_group_resource_test.go index 420cb1aaf8f8..4f612de01ad9 100644 --- a/azurerm/internal/services/apimanagement/tests/api_management_group_resource_test.go +++ b/azurerm/internal/services/apimanagement/tests/api_management_group_resource_test.go @@ -128,7 +128,6 @@ func testCheckAzureRMAPIManagementGroupDestroy(s *terraform.State) error { serviceName := rs.Primary.Attributes["api_management_name"] resp, err := client.Get(ctx, resourceGroup, serviceName, name) - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { return err diff --git a/azurerm/internal/services/apimanagement/tests/api_management_identity_provider_aad_resource_test.go b/azurerm/internal/services/apimanagement/tests/api_management_identity_provider_aad_resource_test.go index f4f03d70837e..f6296fbe323c 100644 --- a/azurerm/internal/services/apimanagement/tests/api_management_identity_provider_aad_resource_test.go +++ b/azurerm/internal/services/apimanagement/tests/api_management_identity_provider_aad_resource_test.go @@ -97,7 +97,6 @@ func testCheckAzureRMApiManagementIdentityProviderAADDestroy(s *terraform.State) serviceName := rs.Primary.Attributes["api_management_name"] resp, err := client.Get(ctx, resourceGroup, serviceName, apimanagement.Aad) - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { return err diff --git a/azurerm/internal/services/apimanagement/tests/api_management_identity_provider_facebook_resource_test.go b/azurerm/internal/services/apimanagement/tests/api_management_identity_provider_facebook_resource_test.go index f41de65225e8..a7ceac771d6e 100644 --- a/azurerm/internal/services/apimanagement/tests/api_management_identity_provider_facebook_resource_test.go +++ b/azurerm/internal/services/apimanagement/tests/api_management_identity_provider_facebook_resource_test.go @@ -93,7 +93,6 @@ func testCheckAzureRMApiManagementIdentityProviderFacebookDestroy(s *terraform.S ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext resp, err := client.Get(ctx, resourceGroup, serviceName, apimanagement.Facebook) - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { return err diff --git a/azurerm/internal/services/apimanagement/tests/api_management_identity_provider_google_resource_test.go b/azurerm/internal/services/apimanagement/tests/api_management_identity_provider_google_resource_test.go index 2a5dd8d9ab19..768d147683e3 100644 --- a/azurerm/internal/services/apimanagement/tests/api_management_identity_provider_google_resource_test.go +++ b/azurerm/internal/services/apimanagement/tests/api_management_identity_provider_google_resource_test.go @@ -91,7 +91,6 @@ func testCheckAzureRMApiManagementIdentityProviderGoogleDestroy(s *terraform.Sta serviceName := rs.Primary.Attributes["api_management_name"] resp, err := client.Get(ctx, resourceGroup, serviceName, apimanagement.Google) - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { return err diff --git a/azurerm/internal/services/apimanagement/tests/api_management_identity_provider_microsoft_resource_test.go b/azurerm/internal/services/apimanagement/tests/api_management_identity_provider_microsoft_resource_test.go index dfc3375d30f3..4f4f2713dcca 100644 --- a/azurerm/internal/services/apimanagement/tests/api_management_identity_provider_microsoft_resource_test.go +++ b/azurerm/internal/services/apimanagement/tests/api_management_identity_provider_microsoft_resource_test.go @@ -93,7 +93,6 @@ func testCheckAzureRMApiManagementIdentityProviderMicrosoftDestroy(s *terraform. ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext resp, err := client.Get(ctx, resourceGroup, serviceName, apimanagement.Microsoft) - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { return err diff --git a/azurerm/internal/services/apimanagement/tests/api_management_identity_provider_twitter_resource_test.go b/azurerm/internal/services/apimanagement/tests/api_management_identity_provider_twitter_resource_test.go index e6393d1f4dcf..d6b70341c525 100644 --- a/azurerm/internal/services/apimanagement/tests/api_management_identity_provider_twitter_resource_test.go +++ b/azurerm/internal/services/apimanagement/tests/api_management_identity_provider_twitter_resource_test.go @@ -93,7 +93,6 @@ func testCheckAzureRMApiManagementIdentityProviderTwitterDestroy(s *terraform.St ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext resp, err := client.Get(ctx, resourceGroup, serviceName, apimanagement.Twitter) - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { return err diff --git a/azurerm/internal/services/apimanagement/tests/api_management_named_value_resource_test.go b/azurerm/internal/services/apimanagement/tests/api_management_named_value_resource_test.go index e95e6aad7a00..b8cc95e21a4b 100644 --- a/azurerm/internal/services/apimanagement/tests/api_management_named_value_resource_test.go +++ b/azurerm/internal/services/apimanagement/tests/api_management_named_value_resource_test.go @@ -70,7 +70,6 @@ func testCheckAzureRMAPIManagementNamedValueDestroy(s *terraform.State) error { serviceName := rs.Primary.Attributes["api_management_name"] resp, err := client.Get(ctx, resourceGroup, serviceName, name) - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { return err diff --git a/azurerm/internal/services/apimanagement/tests/api_management_property_resource_test.go b/azurerm/internal/services/apimanagement/tests/api_management_property_resource_test.go index 36becd0fd4d9..18d6b130946d 100644 --- a/azurerm/internal/services/apimanagement/tests/api_management_property_resource_test.go +++ b/azurerm/internal/services/apimanagement/tests/api_management_property_resource_test.go @@ -82,7 +82,6 @@ func testCheckAzureRMAPIManagementPropertyDestroy(s *terraform.State) error { serviceName := rs.Primary.Attributes["api_management_name"] resp, err := client.Get(ctx, resourceGroup, serviceName, name) - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { return err diff --git a/azurerm/internal/services/apimanagement/tests/api_management_resource_test.go b/azurerm/internal/services/apimanagement/tests/api_management_resource_test.go index 976e06b4097a..70ae171fdf91 100644 --- a/azurerm/internal/services/apimanagement/tests/api_management_resource_test.go +++ b/azurerm/internal/services/apimanagement/tests/api_management_resource_test.go @@ -269,7 +269,6 @@ func testCheckAzureRMApiManagementDestroy(s *terraform.State) error { name := rs.Primary.Attributes["name"] resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/apimanagement/tests/api_management_subscription_resource_test.go b/azurerm/internal/services/apimanagement/tests/api_management_subscription_resource_test.go index 818fb9f6ea7e..5e785c724597 100644 --- a/azurerm/internal/services/apimanagement/tests/api_management_subscription_resource_test.go +++ b/azurerm/internal/services/apimanagement/tests/api_management_subscription_resource_test.go @@ -145,7 +145,6 @@ func testCheckAzureRMAPIManagementSubscriptionDestroy(s *terraform.State) error serviceName := rs.Primary.Attributes["api_management_name"] resp, err := client.Get(ctx, resourceGroup, serviceName, subscriptionId) - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { return err diff --git a/azurerm/internal/services/applicationinsights/application_insights_analytics_item_resource.go b/azurerm/internal/services/applicationinsights/application_insights_analytics_item_resource.go index 0c6aaeb2e5f3..b0f3324beb11 100644 --- a/azurerm/internal/services/applicationinsights/application_insights_analytics_item_resource.go +++ b/azurerm/internal/services/applicationinsights/application_insights_analytics_item_resource.go @@ -97,9 +97,11 @@ func resourceArmApplicationInsightsAnalyticsItem() *schema.Resource { func resourceArmApplicationInsightsAnalyticsItemCreate(d *schema.ResourceData, meta interface{}) error { return resourceArmApplicationInsightsAnalyticsItemCreateUpdate(d, meta, false) } + func resourceArmApplicationInsightsAnalyticsItemUpdate(d *schema.ResourceData, meta interface{}) error { return resourceArmApplicationInsightsAnalyticsItemCreateUpdate(d, meta, true) } + func resourceArmApplicationInsightsAnalyticsItemCreateUpdate(d *schema.ResourceData, meta interface{}, overwrite bool) error { client := meta.(*clients.Client).AppInsights.AnalyticsItemsClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) diff --git a/azurerm/internal/services/applicationinsights/tests/application_insights_api_key_resource_test.go b/azurerm/internal/services/applicationinsights/tests/application_insights_api_key_resource_test.go index c5405f9c5f28..aeb9ec6e1086 100644 --- a/azurerm/internal/services/applicationinsights/tests/application_insights_api_key_resource_test.go +++ b/azurerm/internal/services/applicationinsights/tests/application_insights_api_key_resource_test.go @@ -155,7 +155,6 @@ func testCheckAzureRMApplicationInsightsAPIKeyDestroy(s *terraform.State) error appInsightsName := id.Path["components"] resp, err := conn.Get(ctx, resGroup, appInsightsName, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/applicationinsights/tests/application_insights_resource_test.go b/azurerm/internal/services/applicationinsights/tests/application_insights_resource_test.go index 51026dd098de..51e143df82d6 100644 --- a/azurerm/internal/services/applicationinsights/tests/application_insights_resource_test.go +++ b/azurerm/internal/services/applicationinsights/tests/application_insights_resource_test.go @@ -187,7 +187,6 @@ func testCheckAzureRMApplicationInsightsDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/applicationinsights/tests/application_insights_webtests_resource_test.go b/azurerm/internal/services/applicationinsights/tests/application_insights_webtests_resource_test.go index b33dddc9f1b5..db93b0472729 100644 --- a/azurerm/internal/services/applicationinsights/tests/application_insights_webtests_resource_test.go +++ b/azurerm/internal/services/applicationinsights/tests/application_insights_webtests_resource_test.go @@ -120,7 +120,6 @@ func testCheckAzureRMApplicationInsightsWebTestsDestroy(s *terraform.State) erro resGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/attestation/attestation_provider_resource.go b/azurerm/internal/services/attestation/attestation_provider_resource.go index 87948c482983..efad51ca89dc 100644 --- a/azurerm/internal/services/attestation/attestation_provider_resource.go +++ b/azurerm/internal/services/attestation/attestation_provider_resource.go @@ -73,6 +73,7 @@ func resourceArmAttestationProvider() *schema.Resource { }, } } + func resourceArmAttestationProviderCreate(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Attestation.ProviderClient ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) diff --git a/azurerm/internal/services/authorization/tests/role_assignment_resource_test.go b/azurerm/internal/services/authorization/tests/role_assignment_resource_test.go index f8b85feeac53..8cb4a6dcc2d9 100644 --- a/azurerm/internal/services/authorization/tests/role_assignment_resource_test.go +++ b/azurerm/internal/services/authorization/tests/role_assignment_resource_test.go @@ -102,6 +102,7 @@ func testAccAzureRMRoleAssignment_roleName(t *testing.T) { }, }) } + func testAccAzureRMRoleAssignment_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_role_assignment", "test") id := uuid.New().String() @@ -270,7 +271,6 @@ func testCheckAzureRMRoleAssignmentExists(resourceName string) resource.TestChec roleAssignmentName := rs.Primary.Attributes["name"] resp, err := client.Get(ctx, scope, roleAssignmentName) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return fmt.Errorf("Bad: Role Assignment %q (Scope: %q) does not exist", roleAssignmentName, scope) @@ -295,7 +295,6 @@ func testCheckAzureRMRoleAssignmentDestroy(s *terraform.State) error { roleAssignmentName := rs.Primary.Attributes["name"] resp, err := client.Get(ctx, scope, roleAssignmentName) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/authorization/tests/role_definition_resource_test.go b/azurerm/internal/services/authorization/tests/role_definition_resource_test.go index fa7198181dd9..8505cfcd2a8e 100644 --- a/azurerm/internal/services/authorization/tests/role_definition_resource_test.go +++ b/azurerm/internal/services/authorization/tests/role_definition_resource_test.go @@ -178,7 +178,6 @@ func testCheckAzureRMRoleDefinitionExists(resourceName string) resource.TestChec roleDefinitionId := rs.Primary.Attributes["role_definition_id"] resp, err := client.Get(ctx, scope, roleDefinitionId) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return fmt.Errorf("Bad: Role Definition %q (Scope: %q) does not exist", roleDefinitionId, scope) @@ -203,7 +202,6 @@ func testCheckAzureRMRoleDefinitionDestroy(s *terraform.State) error { roleDefinitionId := rs.Primary.Attributes["role_definition_id"] resp, err := client.Get(ctx, scope, roleDefinitionId) - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { return err diff --git a/azurerm/internal/services/automation/automation_account_resource.go b/azurerm/internal/services/automation/automation_account_resource.go index 41d03bfbc1df..79366d28f87f 100644 --- a/azurerm/internal/services/automation/automation_account_resource.go +++ b/azurerm/internal/services/automation/automation_account_resource.go @@ -204,7 +204,6 @@ func resourceArmAutomationAccountDelete(d *schema.ResourceData, meta interface{} name := id.Path["automationAccounts"] resp, err := client.Delete(ctx, resourceGroup, name) - if err != nil { if utils.ResponseWasNotFound(resp) { return nil diff --git a/azurerm/internal/services/automation/tests/automation_account_resource_test.go b/azurerm/internal/services/automation/tests/automation_account_resource_test.go index 575b4c937740..fee00ac9cbfb 100644 --- a/azurerm/internal/services/automation/tests/automation_account_resource_test.go +++ b/azurerm/internal/services/automation/tests/automation_account_resource_test.go @@ -90,7 +90,6 @@ func testCheckAzureRMAutomationAccountDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil @@ -123,7 +122,6 @@ func testCheckAzureRMAutomationAccountExists(resourceName string) resource.TestC } resp, err := conn.Get(ctx, resourceGroup, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return fmt.Errorf("Automation Account '%s' (resource group: '%s') was not found: %+v", name, resourceGroup, err) diff --git a/azurerm/internal/services/automation/tests/automation_certificate_resource_test.go b/azurerm/internal/services/automation/tests/automation_certificate_resource_test.go index 8d69017b2907..9415a845cdf6 100644 --- a/azurerm/internal/services/automation/tests/automation_certificate_resource_test.go +++ b/azurerm/internal/services/automation/tests/automation_certificate_resource_test.go @@ -15,8 +15,10 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -var testCertThumbprintRaw, _ = ioutil.ReadFile(filepath.Join("testdata", "automation_certificate_test.thumb")) -var testCertRaw, _ = ioutil.ReadFile(filepath.Join("testdata", "automation_certificate_test.pfx")) +var ( + testCertThumbprintRaw, _ = ioutil.ReadFile(filepath.Join("testdata", "automation_certificate_test.thumb")) + testCertRaw, _ = ioutil.ReadFile(filepath.Join("testdata", "automation_certificate_test.pfx")) +) var testCertBase64 = base64.StdEncoding.EncodeToString(testCertRaw) @@ -122,7 +124,6 @@ func testCheckAzureRMAutomationCertificateDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, accName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil @@ -153,7 +154,6 @@ func testCheckAzureRMAutomationCertificateExists(resourceName string) resource.T resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, accName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return fmt.Errorf("Automation Certificate '%s' (resource group: '%s') does not exist", name, resourceGroup) diff --git a/azurerm/internal/services/automation/tests/automation_credential_resource_test.go b/azurerm/internal/services/automation/tests/automation_credential_resource_test.go index f5a4e651ce15..727630128347 100644 --- a/azurerm/internal/services/automation/tests/automation_credential_resource_test.go +++ b/azurerm/internal/services/automation/tests/automation_credential_resource_test.go @@ -89,7 +89,6 @@ func testCheckAzureRMAutomationCredentialDestroy(s *terraform.State) error { } resp, err := conn.Get(ctx, resourceGroup, accName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil @@ -124,7 +123,6 @@ func testCheckAzureRMAutomationCredentialExists(resourceName string) resource.Te } resp, err := conn.Get(ctx, resourceGroup, accName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return fmt.Errorf("Automation Credential '%s' (resource group: '%s') does not exist", name, resourceGroup) diff --git a/azurerm/internal/services/automation/tests/automation_dsc_configuration_resource_test.go b/azurerm/internal/services/automation/tests/automation_dsc_configuration_resource_test.go index 08f07ac0d5a4..2a27ed45a558 100644 --- a/azurerm/internal/services/automation/tests/automation_dsc_configuration_resource_test.go +++ b/azurerm/internal/services/automation/tests/automation_dsc_configuration_resource_test.go @@ -73,7 +73,6 @@ func testCheckAzureRMAutomationDscConfigurationDestroy(s *terraform.State) error } resp, err := conn.Get(ctx, resourceGroup, accName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil @@ -108,7 +107,6 @@ func testCheckAzureRMAutomationDscConfigurationExists(resourceName string) resou } resp, err := conn.Get(ctx, resourceGroup, accName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return fmt.Errorf("Automation Dsc Configuration '%s' (resource group: '%s') does not exist", name, resourceGroup) diff --git a/azurerm/internal/services/automation/tests/automation_dsc_nodeconfiguration_resource_test.go b/azurerm/internal/services/automation/tests/automation_dsc_nodeconfiguration_resource_test.go index 3599dedffb25..aa9c4817f2d0 100644 --- a/azurerm/internal/services/automation/tests/automation_dsc_nodeconfiguration_resource_test.go +++ b/azurerm/internal/services/automation/tests/automation_dsc_nodeconfiguration_resource_test.go @@ -68,7 +68,6 @@ func testCheckAzureRMAutomationDscNodeConfigurationDestroy(s *terraform.State) e } resp, err := conn.Get(ctx, resourceGroup, accName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil @@ -103,7 +102,6 @@ func testCheckAzureRMAutomationDscNodeConfigurationExists(resourceName string) r } resp, err := conn.Get(ctx, resourceGroup, accName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return fmt.Errorf("Automation Dsc Node Configuration '%s' (resource group: '%s') does not exist", name, resourceGroup) diff --git a/azurerm/internal/services/automation/tests/automation_job_schedule_resource_test.go b/azurerm/internal/services/automation/tests/automation_job_schedule_resource_test.go index a0f14b5c3cd4..a7decc84bbfa 100644 --- a/azurerm/internal/services/automation/tests/automation_job_schedule_resource_test.go +++ b/azurerm/internal/services/automation/tests/automation_job_schedule_resource_test.go @@ -115,7 +115,6 @@ func testCheckAzureRMAutomationJobScheduleDestroy(s *terraform.State) error { } resp, err := conn.Get(ctx, resourceGroup, accName, jobScheduleUUID) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/automation/tests/automation_module_resource_test.go b/azurerm/internal/services/automation/tests/automation_module_resource_test.go index 68170e7bc85b..560b03a69ffe 100644 --- a/azurerm/internal/services/automation/tests/automation_module_resource_test.go +++ b/azurerm/internal/services/automation/tests/automation_module_resource_test.go @@ -86,7 +86,6 @@ func testCheckAzureRMAutomationModuleDestroy(s *terraform.State) error { } resp, err := conn.Get(ctx, resourceGroup, accName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil @@ -121,7 +120,6 @@ func testCheckAzureRMAutomationModuleExists(resourceName string) resource.TestCh } resp, err := conn.Get(ctx, resourceGroup, accName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return fmt.Errorf("Automation Module '%s' (resource group: '%s') does not exist", name, resourceGroup) diff --git a/azurerm/internal/services/automation/tests/automation_runbook_resource_test.go b/azurerm/internal/services/automation/tests/automation_runbook_resource_test.go index d923bea9e47e..97fedb16c0f4 100644 --- a/azurerm/internal/services/automation/tests/automation_runbook_resource_test.go +++ b/azurerm/internal/services/automation/tests/automation_runbook_resource_test.go @@ -167,7 +167,6 @@ func testCheckAzureRMAutomationRunbookDestroy(s *terraform.State) error { } resp, err := conn.Get(ctx, resourceGroup, accName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil @@ -202,7 +201,6 @@ func testCheckAzureRMAutomationRunbookExists(resourceName string) resource.TestC } resp, err := conn.Get(ctx, resourceGroup, accName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return fmt.Errorf("Automation Runbook '%s' (resource group: '%s') does not exist", name, resourceGroup) diff --git a/azurerm/internal/services/automation/tests/automation_schedule_resource_test.go b/azurerm/internal/services/automation/tests/automation_schedule_resource_test.go index 42c4a3817e03..86bf13398355 100644 --- a/azurerm/internal/services/automation/tests/automation_schedule_resource_test.go +++ b/azurerm/internal/services/automation/tests/automation_schedule_resource_test.go @@ -29,6 +29,7 @@ func TestAccAzureRMAutomationSchedule_oneTime_basic(t *testing.T) { }, }) } + func TestAccAzureRMAutomationSchedule_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_automation_schedule", "test") @@ -230,7 +231,6 @@ func testCheckAzureRMAutomationScheduleDestroy(s *terraform.State) error { } resp, err := conn.Get(ctx, resourceGroup, accName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/batch/batch_account_data_source.go b/azurerm/internal/services/batch/batch_account_data_source.go index 7b49c70b63e6..ebb5d6cbd7f3 100644 --- a/azurerm/internal/services/batch/batch_account_data_source.go +++ b/azurerm/internal/services/batch/batch_account_data_source.go @@ -107,7 +107,6 @@ func dataSourceArmBatchAccountRead(d *schema.ResourceData, meta interface{}) err if poolAllocationMode == string(batch.BatchService) { keys, err := client.GetKeys(ctx, resourceGroup, name) - if err != nil { return fmt.Errorf("Cannot read keys for Batch account %q (resource group %q): %v", name, resourceGroup, err) } diff --git a/azurerm/internal/services/batch/batch_account_resource.go b/azurerm/internal/services/batch/batch_account_resource.go index b06c935e3df6..2f3a9fa59ee4 100644 --- a/azurerm/internal/services/batch/batch_account_resource.go +++ b/azurerm/internal/services/batch/batch_account_resource.go @@ -221,7 +221,6 @@ func resourceArmBatchAccountRead(d *schema.ResourceData, meta interface{}) error if d.Get("pool_allocation_mode").(string) == string(batch.BatchService) { keys, err := client.GetKeys(ctx, id.ResourceGroup, id.Name) - if err != nil { return fmt.Errorf("Cannot read keys for Batch account %q (resource group %q): %v", id.Name, id.ResourceGroup, err) } diff --git a/azurerm/internal/services/batch/batch_certificate_data_source.go b/azurerm/internal/services/batch/batch_certificate_data_source.go index 9957d8f37e7d..a51c065ad2b4 100644 --- a/azurerm/internal/services/batch/batch_certificate_data_source.go +++ b/azurerm/internal/services/batch/batch_certificate_data_source.go @@ -87,6 +87,7 @@ func dataSourceArmBatchCertificateRead(d *schema.ResourceData, meta interface{}) return nil } + func validateAzureRMBatchCertificateName(v interface{}, k string) (warnings []string, errors []error) { value := v.(string) if !regexp.MustCompile(`^[\w]+-[\w]+$`).MatchString(value) { diff --git a/azurerm/internal/services/batch/batch_certificate_resource_test.go b/azurerm/internal/services/batch/batch_certificate_resource_test.go index 9e3c3e32ce61..1316189c91e5 100644 --- a/azurerm/internal/services/batch/batch_certificate_resource_test.go +++ b/azurerm/internal/services/batch/batch_certificate_resource_test.go @@ -158,6 +158,7 @@ resource "azurerm_batch_certificate" "test" { } `, data.RandomInteger, data.Locations.Primary, data.RandomString) } + func testAccBatchCertificateCer(data acceptance.TestData) string { return fmt.Sprintf(` provider "azurerm" { @@ -186,6 +187,7 @@ resource "azurerm_batch_certificate" "test" { } `, data.RandomInteger, data.Locations.Primary, data.RandomString) } + func testAccBatchCertificateCerWithPassword(data acceptance.TestData) string { return fmt.Sprintf(` provider "azurerm" { diff --git a/azurerm/internal/services/bot/tests/bot_channel_directline_resource_test.go b/azurerm/internal/services/bot/tests/bot_channel_directline_resource_test.go index 94c210e8eabf..3fab6c433b70 100644 --- a/azurerm/internal/services/bot/tests/bot_channel_directline_resource_test.go +++ b/azurerm/internal/services/bot/tests/bot_channel_directline_resource_test.go @@ -127,7 +127,6 @@ func testCheckAzureRMBotChannelDirectlineDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, botName, string(botservice.ChannelNameDirectLineChannel1)) - if err != nil { return nil } diff --git a/azurerm/internal/services/bot/tests/bot_channel_email_resource_test.go b/azurerm/internal/services/bot/tests/bot_channel_email_resource_test.go index 590f3b719c26..b1a808169500 100644 --- a/azurerm/internal/services/bot/tests/bot_channel_email_resource_test.go +++ b/azurerm/internal/services/bot/tests/bot_channel_email_resource_test.go @@ -111,7 +111,6 @@ func testCheckAzureRMBotChannelEmailDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, botName, string(botservice.ChannelNameEmailChannel)) - if err != nil { return nil } diff --git a/azurerm/internal/services/bot/tests/bot_channel_ms_teams_resource_test.go b/azurerm/internal/services/bot/tests/bot_channel_ms_teams_resource_test.go index 49605f5ae7d1..31ed0f958767 100644 --- a/azurerm/internal/services/bot/tests/bot_channel_ms_teams_resource_test.go +++ b/azurerm/internal/services/bot/tests/bot_channel_ms_teams_resource_test.go @@ -108,7 +108,6 @@ func testCheckAzureRMBotChannelMsTeamsDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, botName, string(botservice.ChannelNameMsTeamsChannel)) - if err != nil { return nil } diff --git a/azurerm/internal/services/bot/tests/bot_channel_slack_resource_test.go b/azurerm/internal/services/bot/tests/bot_channel_slack_resource_test.go index f3f93bc51ed1..b993dcda5e37 100644 --- a/azurerm/internal/services/bot/tests/bot_channel_slack_resource_test.go +++ b/azurerm/internal/services/bot/tests/bot_channel_slack_resource_test.go @@ -108,7 +108,6 @@ func testCheckAzureRMBotChannelSlackDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, botName, string(botservice.ChannelNameSlackChannel)) - if err != nil { return nil } diff --git a/azurerm/internal/services/bot/tests/bot_channels_registration_resource_test.go b/azurerm/internal/services/bot/tests/bot_channels_registration_resource_test.go index 3e5ddcac3584..e70df84ab7e4 100644 --- a/azurerm/internal/services/bot/tests/bot_channels_registration_resource_test.go +++ b/azurerm/internal/services/bot/tests/bot_channels_registration_resource_test.go @@ -161,7 +161,6 @@ func testCheckAzureRMBotChannelsRegistrationDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/bot/tests/bot_connection_resource_test.go b/azurerm/internal/services/bot/tests/bot_connection_resource_test.go index 91a1f9ec3f15..cd6dc46c865d 100644 --- a/azurerm/internal/services/bot/tests/bot_connection_resource_test.go +++ b/azurerm/internal/services/bot/tests/bot_connection_resource_test.go @@ -102,7 +102,6 @@ func testCheckAzureRMBotConnectionDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, botName, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/bot/tests/bot_web_app_resource_test.go b/azurerm/internal/services/bot/tests/bot_web_app_resource_test.go index ae3c7df966e0..018a1bdb8454 100644 --- a/azurerm/internal/services/bot/tests/bot_web_app_resource_test.go +++ b/azurerm/internal/services/bot/tests/bot_web_app_resource_test.go @@ -119,7 +119,6 @@ func testCheckAzureRMBotWebAppDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/cdn/tests/cdn_endpoint_resource_test.go b/azurerm/internal/services/cdn/tests/cdn_endpoint_resource_test.go index d33abfdcdaba..808e45deb776 100644 --- a/azurerm/internal/services/cdn/tests/cdn_endpoint_resource_test.go +++ b/azurerm/internal/services/cdn/tests/cdn_endpoint_resource_test.go @@ -131,7 +131,8 @@ func TestAccAzureRMCdnEndpoint_withTags(t *testing.T) { resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"), resource.TestCheckResourceAttr(data.ResourceName, "tags.environment", "staging"), ), - }, data.ImportStep(), + }, + data.ImportStep(), }, }) } diff --git a/azurerm/internal/services/cdn/tests/cdn_profile_resource_test.go b/azurerm/internal/services/cdn/tests/cdn_profile_resource_test.go index 953d00eea4f7..5ee32b74cbe2 100644 --- a/azurerm/internal/services/cdn/tests/cdn_profile_resource_test.go +++ b/azurerm/internal/services/cdn/tests/cdn_profile_resource_test.go @@ -216,7 +216,6 @@ func testCheckAzureRMCdnProfileDestroy(s *terraform.State) error { return err } resp, err := conn.Get(ctx, id.ResourceGroup, id.Name) - if err != nil { return nil } diff --git a/azurerm/internal/services/cognitive/cognitive_account_data_source.go b/azurerm/internal/services/cognitive/cognitive_account_data_source.go index 76e9017beab3..a66f97064d22 100644 --- a/azurerm/internal/services/cognitive/cognitive_account_data_source.go +++ b/azurerm/internal/services/cognitive/cognitive_account_data_source.go @@ -76,7 +76,6 @@ func dataSourceArmCognitiveAccountRead(d *schema.ResourceData, meta interface{}) resourceGroup := d.Get("resource_group_name").(string) resp, err := client.GetProperties(ctx, resourceGroup, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return fmt.Errorf("Error: Cognitive Services Account %q (Resource Group %q) was not found", name, resourceGroup) @@ -85,7 +84,6 @@ func dataSourceArmCognitiveAccountRead(d *schema.ResourceData, meta interface{}) } keys, err := client.ListKeys(ctx, resourceGroup, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return fmt.Errorf("Error: Keys for Cognitive Services Account %q (Resource Group %q) were not found", name, resourceGroup) diff --git a/azurerm/internal/services/cognitive/cognitive_account_resource.go b/azurerm/internal/services/cognitive/cognitive_account_resource.go index 1fbfd831c3e7..9165848663c7 100644 --- a/azurerm/internal/services/cognitive/cognitive_account_resource.go +++ b/azurerm/internal/services/cognitive/cognitive_account_resource.go @@ -249,7 +249,6 @@ func resourceArmCognitiveAccountRead(d *schema.ResourceData, meta interface{}) e } resp, err := client.GetProperties(ctx, id.ResourceGroup, id.Name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { log.Printf("[DEBUG] Cognitive Services Account %q was not found in Resource Group %q - removing from state!", id.Name, id.ResourceGroup) @@ -279,7 +278,6 @@ func resourceArmCognitiveAccountRead(d *schema.ResourceData, meta interface{}) e } keys, err := client.ListKeys(ctx, id.ResourceGroup, id.Name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { log.Printf("[DEBUG] Not able to obtain keys for Cognitive Services Account %q in Resource Group %q - removing from state!", id.Name, id.ResourceGroup) diff --git a/azurerm/internal/services/compute/linux_virtual_machine_resource.go b/azurerm/internal/services/compute/linux_virtual_machine_resource.go index c11e93e7c67f..faf7377f5567 100644 --- a/azurerm/internal/services/compute/linux_virtual_machine_resource.go +++ b/azurerm/internal/services/compute/linux_virtual_machine_resource.go @@ -1135,7 +1135,6 @@ func resourceLinuxVirtualMachineDelete(d *schema.ResourceData, meta interface{}) Refresh: func() (interface{}, string, error) { log.Printf("[INFO] checking on state of Linux Virtual Machine %q", id.Name) resp, err := client.Get(ctx, id.ResourceGroup, id.Name, "") - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return resp, strconv.Itoa(resp.StatusCode), nil diff --git a/azurerm/internal/services/compute/parse/virtual_machine_test.go b/azurerm/internal/services/compute/parse/virtual_machine_test.go index aab444d5f0bc..d5f56384a825 100644 --- a/azurerm/internal/services/compute/parse/virtual_machine_test.go +++ b/azurerm/internal/services/compute/parse/virtual_machine_test.go @@ -18,7 +18,7 @@ func TestVirtualMachineIDFormatter(t *testing.T) { } func TestVirtualMachineID(t *testing.T) { - var testData = []struct { + testData := []struct { Name string Input string Expected *VirtualMachineId diff --git a/azurerm/internal/services/compute/shared_image_data_source.go b/azurerm/internal/services/compute/shared_image_data_source.go index ec013034cb90..e9ab92c19c45 100644 --- a/azurerm/internal/services/compute/shared_image_data_source.go +++ b/azurerm/internal/services/compute/shared_image_data_source.go @@ -99,6 +99,7 @@ func dataSourceArmSharedImage() *schema.Resource { }, } } + func dataSourceArmSharedImageRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Compute.GalleryImagesClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) diff --git a/azurerm/internal/services/compute/tests/availability_set_resource_test.go b/azurerm/internal/services/compute/tests/availability_set_resource_test.go index fbfd16b795f2..3bfad5105d28 100644 --- a/azurerm/internal/services/compute/tests/availability_set_resource_test.go +++ b/azurerm/internal/services/compute/tests/availability_set_resource_test.go @@ -241,7 +241,6 @@ func testCheckAzureRMAvailabilitySetDestroy(s *terraform.State) error { } resp, err := client.Get(ctx, id.ResourceGroup, id.Name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/compute/tests/image_resource_test.go b/azurerm/internal/services/compute/tests/image_resource_test.go index deea116207b7..4bef5034e409 100644 --- a/azurerm/internal/services/compute/tests/image_resource_test.go +++ b/azurerm/internal/services/compute/tests/image_resource_test.go @@ -485,7 +485,6 @@ func testCheckAzureRMImageDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/compute/tests/linux_virtual_machine_scale_set_disk_data_resource_test.go b/azurerm/internal/services/compute/tests/linux_virtual_machine_scale_set_disk_data_resource_test.go index 9fec76f33a27..9723afec60ac 100644 --- a/azurerm/internal/services/compute/tests/linux_virtual_machine_scale_set_disk_data_resource_test.go +++ b/azurerm/internal/services/compute/tests/linux_virtual_machine_scale_set_disk_data_resource_test.go @@ -45,7 +45,8 @@ func TestAccAzureRMLinuxVirtualMachineScaleSet_disksDataDiskCaching(t *testing.T }, data.ImportStep( "admin_password", - ), { + ), + { Config: testAccAzureRMLinuxVirtualMachineScaleSet_disksDataDiskCaching(data, "ReadOnly"), Check: resource.ComposeTestCheckFunc( testCheckAzureRMLinuxVirtualMachineScaleSetExists(data.ResourceName), diff --git a/azurerm/internal/services/compute/tests/linux_virtual_machine_scale_set_disk_os_resource_test.go b/azurerm/internal/services/compute/tests/linux_virtual_machine_scale_set_disk_os_resource_test.go index a6e3a70329dc..2471b0cb0b3c 100644 --- a/azurerm/internal/services/compute/tests/linux_virtual_machine_scale_set_disk_os_resource_test.go +++ b/azurerm/internal/services/compute/tests/linux_virtual_machine_scale_set_disk_os_resource_test.go @@ -24,7 +24,8 @@ func TestAccAzureRMLinuxVirtualMachineScaleSet_disksOSDiskCaching(t *testing.T) }, data.ImportStep( "admin_password", - ), { + ), + { Config: testAccAzureRMLinuxVirtualMachineScaleSet_disksOSDiskCaching(data, "ReadOnly"), Check: resource.ComposeTestCheckFunc( testCheckAzureRMLinuxVirtualMachineScaleSetExists(data.ResourceName), @@ -32,7 +33,8 @@ func TestAccAzureRMLinuxVirtualMachineScaleSet_disksOSDiskCaching(t *testing.T) }, data.ImportStep( "admin_password", - ), { + ), + { Config: testAccAzureRMLinuxVirtualMachineScaleSet_disksOSDiskCaching(data, "ReadWrite"), Check: resource.ComposeTestCheckFunc( testCheckAzureRMLinuxVirtualMachineScaleSetExists(data.ResourceName), diff --git a/azurerm/internal/services/compute/tests/managed_disk_resource_test.go b/azurerm/internal/services/compute/tests/managed_disk_resource_test.go index 862b2b15853c..79cb0ad959b8 100644 --- a/azurerm/internal/services/compute/tests/managed_disk_resource_test.go +++ b/azurerm/internal/services/compute/tests/managed_disk_resource_test.go @@ -446,7 +446,6 @@ func testCheckAzureRMManagedDiskDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/compute/tests/proximity_placement_group_resource_test.go b/azurerm/internal/services/compute/tests/proximity_placement_group_resource_test.go index 79eebabe24d3..ae7382a4baf0 100644 --- a/azurerm/internal/services/compute/tests/proximity_placement_group_resource_test.go +++ b/azurerm/internal/services/compute/tests/proximity_placement_group_resource_test.go @@ -174,7 +174,6 @@ func testCheckAzureRMProximityPlacementGroupDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name, "") - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/compute/tests/shared_image_gallery_resource_test.go b/azurerm/internal/services/compute/tests/shared_image_gallery_resource_test.go index fd426c3024cc..4f362a0ff5aa 100644 --- a/azurerm/internal/services/compute/tests/shared_image_gallery_resource_test.go +++ b/azurerm/internal/services/compute/tests/shared_image_gallery_resource_test.go @@ -31,6 +31,7 @@ func TestAccAzureRMSharedImageGallery_basic(t *testing.T) { }, }) } + func TestAccAzureRMSharedImageGallery_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_shared_image_gallery", "test") diff --git a/azurerm/internal/services/compute/tests/snapshot_resource_test.go b/azurerm/internal/services/compute/tests/snapshot_resource_test.go index 1a514f48d134..5599bd302876 100644 --- a/azurerm/internal/services/compute/tests/snapshot_resource_test.go +++ b/azurerm/internal/services/compute/tests/snapshot_resource_test.go @@ -61,6 +61,7 @@ func TestSnapshotName_validation(t *testing.T) { } } } + func TestAccAzureRMSnapshot_fromManagedDisk(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_snapshot", "test") @@ -79,6 +80,7 @@ func TestAccAzureRMSnapshot_fromManagedDisk(t *testing.T) { }, }) } + func TestAccAzureRMSnapshot_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_snapshot", "test") diff --git a/azurerm/internal/services/compute/tests/virtual_machine_resource_test.go b/azurerm/internal/services/compute/tests/virtual_machine_resource_test.go index cdf4417ac73d..ad3aa1238af4 100644 --- a/azurerm/internal/services/compute/tests/virtual_machine_resource_test.go +++ b/azurerm/internal/services/compute/tests/virtual_machine_resource_test.go @@ -169,7 +169,6 @@ func testCheckAzureRMVirtualMachineDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name, "") - if err != nil { if resp.StatusCode == http.StatusNotFound { return nil diff --git a/azurerm/internal/services/compute/tests/virtual_machine_scale_set_resource_test.go b/azurerm/internal/services/compute/tests/virtual_machine_scale_set_resource_test.go index b4826fba599d..2bc1d8121556 100644 --- a/azurerm/internal/services/compute/tests/virtual_machine_scale_set_resource_test.go +++ b/azurerm/internal/services/compute/tests/virtual_machine_scale_set_resource_test.go @@ -1105,7 +1105,6 @@ func testCheckAzureRMVirtualMachineScaleSetDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/compute/tests/windows_virtual_machine_scale_set_disk_data_resource_test.go b/azurerm/internal/services/compute/tests/windows_virtual_machine_scale_set_disk_data_resource_test.go index d2d9c00827e6..fb9a2597c9fe 100644 --- a/azurerm/internal/services/compute/tests/windows_virtual_machine_scale_set_disk_data_resource_test.go +++ b/azurerm/internal/services/compute/tests/windows_virtual_machine_scale_set_disk_data_resource_test.go @@ -45,7 +45,8 @@ func TestAccAzureRMWindowsVirtualMachineScaleSet_disksDataDiskCaching(t *testing }, data.ImportStep( "admin_password", - ), { + ), + { Config: testAccAzureRMWindowsVirtualMachineScaleSet_disksDataDiskCaching(data, "ReadOnly"), Check: resource.ComposeTestCheckFunc( testCheckAzureRMWindowsVirtualMachineScaleSetExists(data.ResourceName), diff --git a/azurerm/internal/services/compute/tests/windows_virtual_machine_scale_set_disk_os_resource_test.go b/azurerm/internal/services/compute/tests/windows_virtual_machine_scale_set_disk_os_resource_test.go index 5936e1394901..55c2557c3f0a 100644 --- a/azurerm/internal/services/compute/tests/windows_virtual_machine_scale_set_disk_os_resource_test.go +++ b/azurerm/internal/services/compute/tests/windows_virtual_machine_scale_set_disk_os_resource_test.go @@ -24,7 +24,8 @@ func TestAccAzureRMWindowsVirtualMachineScaleSet_disksOSDiskCaching(t *testing.T }, data.ImportStep( "admin_password", - ), { + ), + { Config: testAccAzureRMWindowsVirtualMachineScaleSet_disksOSDiskCaching(data, "ReadOnly"), Check: resource.ComposeTestCheckFunc( testCheckAzureRMWindowsVirtualMachineScaleSetExists(data.ResourceName), @@ -32,7 +33,8 @@ func TestAccAzureRMWindowsVirtualMachineScaleSet_disksOSDiskCaching(t *testing.T }, data.ImportStep( "admin_password", - ), { + ), + { Config: testAccAzureRMWindowsVirtualMachineScaleSet_disksOSDiskCaching(data, "ReadWrite"), Check: resource.ComposeTestCheckFunc( testCheckAzureRMWindowsVirtualMachineScaleSetExists(data.ResourceName), diff --git a/azurerm/internal/services/compute/virtual_machine_instance_test.go b/azurerm/internal/services/compute/virtual_machine_instance_test.go index df301635ef9d..8ea19bddd440 100644 --- a/azurerm/internal/services/compute/virtual_machine_instance_test.go +++ b/azurerm/internal/services/compute/virtual_machine_instance_test.go @@ -8,7 +8,7 @@ import ( ) func TestVirtualMachineShouldBeStarted(t *testing.T) { - var buildInstanceViewStatus = func(statuses ...string) *[]compute.InstanceViewStatus { + buildInstanceViewStatus := func(statuses ...string) *[]compute.InstanceViewStatus { results := make([]compute.InstanceViewStatus, 0) for _, v := range statuses { diff --git a/azurerm/internal/services/compute/virtual_machine_resource.go b/azurerm/internal/services/compute/virtual_machine_resource.go index ce26bc23ad78..4b4f3cb03331 100644 --- a/azurerm/internal/services/compute/virtual_machine_resource.go +++ b/azurerm/internal/services/compute/virtual_machine_resource.go @@ -1964,6 +1964,7 @@ func resourceArmVirtualMachineGetManagedDiskInfo(d *schema.ResourceData, disk *c return &diskResp, nil } + func determineVirtualMachineIPAddress(ctx context.Context, meta interface{}, props *compute.VirtualMachineProperties) (string, error) { nicClient := meta.(*clients.Client).Network.InterfacesClient pipClient := meta.(*clients.Client).Network.PublicIPsClient diff --git a/azurerm/internal/services/compute/windows_virtual_machine_resource.go b/azurerm/internal/services/compute/windows_virtual_machine_resource.go index dfbced871b96..45a421061ef6 100644 --- a/azurerm/internal/services/compute/windows_virtual_machine_resource.go +++ b/azurerm/internal/services/compute/windows_virtual_machine_resource.go @@ -1181,7 +1181,6 @@ func resourceWindowsVirtualMachineDelete(d *schema.ResourceData, meta interface{ Refresh: func() (interface{}, string, error) { log.Printf("[INFO] checking on state of Windows Virtual Machine %q", id.Name) resp, err := client.Get(ctx, id.ResourceGroup, id.Name, "") - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return resp, strconv.Itoa(resp.StatusCode), nil diff --git a/azurerm/internal/services/containers/container_group_resource.go b/azurerm/internal/services/containers/container_group_resource.go index 6fcee0ba38a0..d100e3a3e7aa 100644 --- a/azurerm/internal/services/containers/container_group_resource.go +++ b/azurerm/internal/services/containers/container_group_resource.go @@ -592,7 +592,6 @@ func resourceArmContainerGroupRead(d *schema.ResourceData, meta interface{}) err name := id.Path["containerGroups"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { log.Printf("[DEBUG] Container Group %q was not found in Resource Group %q - removing from state!", name, resourceGroup) diff --git a/azurerm/internal/services/containers/kubernetes_addons.go b/azurerm/internal/services/containers/kubernetes_addons.go index 2e884b56305f..46dc9fa6d05b 100644 --- a/azurerm/internal/services/containers/kubernetes_addons.go +++ b/azurerm/internal/services/containers/kubernetes_addons.go @@ -248,7 +248,7 @@ func expandKubernetesAddOnProfiles(input []interface{}, env azure.Environment) ( } func filterUnsupportedKubernetesAddOns(input map[string]*containerservice.ManagedClusterAddonProfile, env azure.Environment) (*map[string]*containerservice.ManagedClusterAddonProfile, error) { - var filter = func(input map[string]*containerservice.ManagedClusterAddonProfile, key string) (*map[string]*containerservice.ManagedClusterAddonProfile, error) { + filter := func(input map[string]*containerservice.ManagedClusterAddonProfile, key string) (*map[string]*containerservice.ManagedClusterAddonProfile, error) { output := input if v, ok := output[key]; ok { if v.Enabled != nil && *v.Enabled { diff --git a/azurerm/internal/services/containers/kubernetes_cluster_data_source.go b/azurerm/internal/services/containers/kubernetes_cluster_data_source.go index 61a66bf69580..3d84017497c4 100644 --- a/azurerm/internal/services/containers/kubernetes_cluster_data_source.go +++ b/azurerm/internal/services/containers/kubernetes_cluster_data_source.go @@ -716,7 +716,6 @@ func flattenKubernetesClusterDataSourceAccessProfile(profile containerservice.Ma if strings.Contains(rawConfig, "apiserver-id:") { kubeConfigAAD, err := kubernetes.ParseKubeConfigAAD(rawConfig) - if err != nil { return utils.String(rawConfig), []interface{}{} } @@ -724,7 +723,6 @@ func flattenKubernetesClusterDataSourceAccessProfile(profile containerservice.Ma flattenedKubeConfig = flattenKubernetesClusterDataSourceKubeConfigAAD(*kubeConfigAAD) } else { kubeConfig, err := kubernetes.ParseKubeConfig(rawConfig) - if err != nil { return utils.String(rawConfig), []interface{}{} } diff --git a/azurerm/internal/services/containers/tests/container_group_resource_test.go b/azurerm/internal/services/containers/tests/container_group_resource_test.go index 60dc167bdab9..b5b5a79bb27e 100644 --- a/azurerm/internal/services/containers/tests/container_group_resource_test.go +++ b/azurerm/internal/services/containers/tests/container_group_resource_test.go @@ -1350,7 +1350,6 @@ func testCheckAzureRMContainerGroupDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, name) - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { return fmt.Errorf("Container Group still exists:\n%#v", resp) diff --git a/azurerm/internal/services/containers/tests/container_registry_webhook_resource_test.go b/azurerm/internal/services/containers/tests/container_registry_webhook_resource_test.go index 4949daf8ac43..d4e90c5e61ae 100644 --- a/azurerm/internal/services/containers/tests/container_registry_webhook_resource_test.go +++ b/azurerm/internal/services/containers/tests/container_registry_webhook_resource_test.go @@ -658,7 +658,6 @@ func testCheckAzureRMContainerRegistryWebhookDestroy(s *terraform.State) error { name := rs.Primary.Attributes["name"] resp, err := client.Get(ctx, resourceGroup, registryName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/containers/tests/kubernetes_cluster_node_pool_resource_test.go b/azurerm/internal/services/containers/tests/kubernetes_cluster_node_pool_resource_test.go index 60a8092cf3c2..5de8e730e89a 100644 --- a/azurerm/internal/services/containers/tests/kubernetes_cluster_node_pool_resource_test.go +++ b/azurerm/internal/services/containers/tests/kubernetes_cluster_node_pool_resource_test.go @@ -818,7 +818,6 @@ func testCheckAzureRMKubernetesClusterNodePoolDestroy(s *terraform.State) error } resp, err := client.Get(ctx, parsedK8sId.ResourceGroup, parsedK8sId.ClusterName, parsedK8sId.Name) - if err != nil { return nil } diff --git a/azurerm/internal/services/containers/tests/kubernetes_cluster_resource_test.go b/azurerm/internal/services/containers/tests/kubernetes_cluster_resource_test.go index ba2414ff8830..9040c39261a4 100644 --- a/azurerm/internal/services/containers/tests/kubernetes_cluster_resource_test.go +++ b/azurerm/internal/services/containers/tests/kubernetes_cluster_resource_test.go @@ -12,8 +12,10 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -var olderKubernetesVersion = "1.16.15" -var currentKubernetesVersion = "1.17.11" +var ( + olderKubernetesVersion = "1.16.15" + currentKubernetesVersion = "1.17.11" +) func TestAccAzureRMKubernetes_all(t *testing.T) { // we can conditionally run tests tests individually, or combined @@ -90,7 +92,6 @@ func testCheckAzureRMKubernetesClusterDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/costmanagement/tests/cost_management_export_resource_group_resource_test.go b/azurerm/internal/services/costmanagement/tests/cost_management_export_resource_group_resource_test.go index dc90fbda6ff2..d4f42fffd686 100644 --- a/azurerm/internal/services/costmanagement/tests/cost_management_export_resource_group_resource_test.go +++ b/azurerm/internal/services/costmanagement/tests/cost_management_export_resource_group_resource_test.go @@ -108,7 +108,6 @@ func testCheckAzureRMCostManagementExportResourceGroupDestroy(s *terraform.State return err } resp, err := client.Get(ctx, id.ResourceId, id.Name) - if err != nil { return nil } diff --git a/azurerm/internal/services/customproviders/custom_provider_resource.go b/azurerm/internal/services/customproviders/custom_provider_resource.go index 53979c213176..cabc85afc688 100644 --- a/azurerm/internal/services/customproviders/custom_provider_resource.go +++ b/azurerm/internal/services/customproviders/custom_provider_resource.go @@ -210,6 +210,7 @@ func resourceArmCustomProviderRead(d *schema.ResourceData, meta interface{}) err return tags.FlattenAndSet(d, resp.Tags) } + func resourceArmCustomProviderDelete(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).CustomProviders.CustomProviderClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) diff --git a/azurerm/internal/services/customproviders/tests/custom_provider_resource_test.go b/azurerm/internal/services/customproviders/tests/custom_provider_resource_test.go index 5e3699df5f91..12a6926f5e6b 100644 --- a/azurerm/internal/services/customproviders/tests/custom_provider_resource_test.go +++ b/azurerm/internal/services/customproviders/tests/custom_provider_resource_test.go @@ -141,7 +141,6 @@ func testCheckAzureRMCustomProviderDestroy(s *terraform.State) error { return err } resp, err := client.Get(ctx, id.ResourceGroup, id.Name) - if err != nil { return nil } diff --git a/azurerm/internal/services/databricks/databricks_workspace_resource.go b/azurerm/internal/services/databricks/databricks_workspace_resource.go index 66d375f1d633..532dc07b07c2 100644 --- a/azurerm/internal/services/databricks/databricks_workspace_resource.go +++ b/azurerm/internal/services/databricks/databricks_workspace_resource.go @@ -214,7 +214,6 @@ func resourceArmDatabricksWorkspaceRead(d *schema.ResourceData, meta interface{} } resp, err := client.Get(ctx, id.ResourceGroup, id.Name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { log.Printf("[DEBUG] Databricks Workspace %q was not found in Resource Group %q - removing from state", id.Name, id.ResourceGroup) diff --git a/azurerm/internal/services/databricks/tests/databricks_workspace_resource_test.go b/azurerm/internal/services/databricks/tests/databricks_workspace_resource_test.go index 3e39a1ded1bb..cfdbf0c938b9 100644 --- a/azurerm/internal/services/databricks/tests/databricks_workspace_resource_test.go +++ b/azurerm/internal/services/databricks/tests/databricks_workspace_resource_test.go @@ -247,7 +247,6 @@ func testCheckAzureRMDatabricksWorkspaceDestroy(s *terraform.State) error { } resp, err := conn.Get(ctx, id.ResourceGroup, id.Name) - if err != nil { return nil } diff --git a/azurerm/internal/services/datafactory/data_factory_dataset_azure_blob_resource_test.go b/azurerm/internal/services/datafactory/data_factory_dataset_azure_blob_resource_test.go index 14cdef43dbe8..d611bb751712 100644 --- a/azurerm/internal/services/datafactory/data_factory_dataset_azure_blob_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_dataset_azure_blob_resource_test.go @@ -112,7 +112,6 @@ func testCheckAzureRMDataFactoryDatasetAzureBlobDestroy(s *terraform.State) erro dataFactoryName := rs.Primary.Attributes["data_factory_name"] resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/datafactory/data_factory_dataset_cosmosdb_sqlapi_resource_test.go b/azurerm/internal/services/datafactory/data_factory_dataset_cosmosdb_sqlapi_resource_test.go index 2b66e6dbb147..bc69c1008cae 100644 --- a/azurerm/internal/services/datafactory/data_factory_dataset_cosmosdb_sqlapi_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_dataset_cosmosdb_sqlapi_resource_test.go @@ -112,7 +112,6 @@ func testCheckAzureRMDataFactoryDatasetCosmosDbSQLAPIDestroy(s *terraform.State) dataFactoryName := rs.Primary.Attributes["data_factory_name"] resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/datafactory/data_factory_dataset_delimited_text_resource.go b/azurerm/internal/services/datafactory/data_factory_dataset_delimited_text_resource.go index d90bc1f855c5..12a049dfc288 100644 --- a/azurerm/internal/services/datafactory/data_factory_dataset_delimited_text_resource.go +++ b/azurerm/internal/services/datafactory/data_factory_dataset_delimited_text_resource.go @@ -64,7 +64,7 @@ func resourceArmDataFactoryDatasetDelimitedText() *schema.Resource { Type: schema.TypeList, MaxItems: 1, Optional: true, - //ConflictsWith: []string{"sftp_server_location", "file_server_location", "s3_location", "azure_blob_storage_location"}, + // ConflictsWith: []string{"sftp_server_location", "file_server_location", "s3_location", "azure_blob_storage_location"}, ConflictsWith: []string{"azure_blob_storage_location"}, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -92,7 +92,7 @@ func resourceArmDataFactoryDatasetDelimitedText() *schema.Resource { Type: schema.TypeList, MaxItems: 1, Optional: true, - //ConflictsWith: []string{"sftp_server_location", "file_server_location", "s3_location", "azure_blob_storage_location"}, + // ConflictsWith: []string{"sftp_server_location", "file_server_location", "s3_location", "azure_blob_storage_location"}, ConflictsWith: []string{"http_server_location"}, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -519,6 +519,7 @@ func expandDataFactoryDatasetHttpServerLocation(d *schema.ResourceData) datafact } return httpServerLocation } + func expandDataFactoryDatasetAzureBlobStorageLocation(d *schema.ResourceData) datafactory.BasicDatasetLocation { props := d.Get("azure_blob_storage_location").([]interface{})[0].(map[string]interface{}) container := props["container"].(string) diff --git a/azurerm/internal/services/datafactory/data_factory_dataset_delimited_text_resource_test.go b/azurerm/internal/services/datafactory/data_factory_dataset_delimited_text_resource_test.go index 76d1bc05b94d..92b715f37b1e 100644 --- a/azurerm/internal/services/datafactory/data_factory_dataset_delimited_text_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_dataset_delimited_text_resource_test.go @@ -57,7 +57,6 @@ func testCheckAzureRMDataFactoryDatasetDelimitedTextDestroy(s *terraform.State) dataFactoryName := rs.Primary.Attributes["data_factory_name"] resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/datafactory/data_factory_dataset_http_resource_test.go b/azurerm/internal/services/datafactory/data_factory_dataset_http_resource_test.go index 81fbbc269ddf..1a9c318e1476 100644 --- a/azurerm/internal/services/datafactory/data_factory_dataset_http_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_dataset_http_resource_test.go @@ -112,7 +112,6 @@ func testCheckAzureRMDataFactoryDatasetHTTPDestroy(s *terraform.State) error { dataFactoryName := rs.Primary.Attributes["data_factory_name"] resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/datafactory/data_factory_dataset_json_resource.go b/azurerm/internal/services/datafactory/data_factory_dataset_json_resource.go index ce56aa21a922..20a68d1c798d 100644 --- a/azurerm/internal/services/datafactory/data_factory_dataset_json_resource.go +++ b/azurerm/internal/services/datafactory/data_factory_dataset_json_resource.go @@ -64,7 +64,7 @@ func resourceArmDataFactoryDatasetJSON() *schema.Resource { Type: schema.TypeList, MaxItems: 1, Optional: true, - //ConflictsWith: []string{"sftp_server_location", "file_server_location", "s3_location", "azure_blob_storage_location"}, + // ConflictsWith: []string{"sftp_server_location", "file_server_location", "s3_location", "azure_blob_storage_location"}, ConflictsWith: []string{"azure_blob_storage_location"}, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -92,7 +92,7 @@ func resourceArmDataFactoryDatasetJSON() *schema.Resource { Type: schema.TypeList, MaxItems: 1, Optional: true, - //ConflictsWith: []string{"sftp_server_location", "file_server_location", "s3_location", "azure_blob_storage_location"}, + // ConflictsWith: []string{"sftp_server_location", "file_server_location", "s3_location", "azure_blob_storage_location"}, ConflictsWith: []string{"http_server_location"}, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ diff --git a/azurerm/internal/services/datafactory/data_factory_dataset_json_resource_test.go b/azurerm/internal/services/datafactory/data_factory_dataset_json_resource_test.go index 69c3cd0bc319..4b69d8a65dc9 100644 --- a/azurerm/internal/services/datafactory/data_factory_dataset_json_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_dataset_json_resource_test.go @@ -112,7 +112,6 @@ func testCheckAzureRMDataFactoryDatasetJSONDestroy(s *terraform.State) error { dataFactoryName := rs.Primary.Attributes["data_factory_name"] resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/datafactory/data_factory_dataset_mysql_resource_test.go b/azurerm/internal/services/datafactory/data_factory_dataset_mysql_resource_test.go index d97ffdc5a7e3..23475a3b0da2 100644 --- a/azurerm/internal/services/datafactory/data_factory_dataset_mysql_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_dataset_mysql_resource_test.go @@ -111,7 +111,6 @@ func testCheckAzureRMDataFactoryDatasetMySQLDestroy(s *terraform.State) error { dataFactoryName := rs.Primary.Attributes["data_factory_name"] resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/datafactory/data_factory_dataset_postgresql_resource_test.go b/azurerm/internal/services/datafactory/data_factory_dataset_postgresql_resource_test.go index e7062a6856fa..c3d70f807f01 100644 --- a/azurerm/internal/services/datafactory/data_factory_dataset_postgresql_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_dataset_postgresql_resource_test.go @@ -111,7 +111,6 @@ func testCheckAzureRMDataFactoryDatasetPostgreSQLDestroy(s *terraform.State) err dataFactoryName := rs.Primary.Attributes["data_factory_name"] resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/datafactory/data_factory_dataset_sql_server_table_resource_test.go b/azurerm/internal/services/datafactory/data_factory_dataset_sql_server_table_resource_test.go index 94bb472e5996..bb5eb9b28eda 100644 --- a/azurerm/internal/services/datafactory/data_factory_dataset_sql_server_table_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_dataset_sql_server_table_resource_test.go @@ -111,7 +111,6 @@ func testCheckAzureRMDataFactoryDatasetSQLServerTableDestroy(s *terraform.State) dataFactoryName := rs.Primary.Attributes["data_factory_name"] resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/datafactory/data_factory_integration_runtime_managed_resource_test.go b/azurerm/internal/services/datafactory/data_factory_integration_runtime_managed_resource_test.go index a7b9b573298d..8b1cb62dd445 100644 --- a/azurerm/internal/services/datafactory/data_factory_integration_runtime_managed_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_integration_runtime_managed_resource_test.go @@ -335,7 +335,6 @@ func testCheckAzureRMDataFactoryIntegrationRuntimeManagedDestroy(s *terraform.St resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, factoryName, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/datafactory/data_factory_linked_service_azure_blob_storage_resource_test.go b/azurerm/internal/services/datafactory/data_factory_linked_service_azure_blob_storage_resource_test.go index d89ab5fb43bc..2ded2a686ef1 100644 --- a/azurerm/internal/services/datafactory/data_factory_linked_service_azure_blob_storage_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_linked_service_azure_blob_storage_resource_test.go @@ -110,7 +110,6 @@ func testCheckAzureRMDataFactoryLinkedServiceAzureBlobStorageDestroy(s *terrafor dataFactoryName := rs.Primary.Attributes["data_factory_name"] resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/datafactory/data_factory_linked_service_azure_file_storage_resource_test.go b/azurerm/internal/services/datafactory/data_factory_linked_service_azure_file_storage_resource_test.go index 67d700f45606..6ff06ebde648 100644 --- a/azurerm/internal/services/datafactory/data_factory_linked_service_azure_file_storage_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_linked_service_azure_file_storage_resource_test.go @@ -110,7 +110,6 @@ func testCheckAzureRMDataFactoryLinkedServiceAzureFileStorageDestroy(s *terrafor dataFactoryName := rs.Primary.Attributes["data_factory_name"] resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/datafactory/data_factory_linked_service_azure_function_resource_test.go b/azurerm/internal/services/datafactory/data_factory_linked_service_azure_function_resource_test.go index b018ff9697f7..eddf943b8d16 100644 --- a/azurerm/internal/services/datafactory/data_factory_linked_service_azure_function_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_linked_service_azure_function_resource_test.go @@ -110,7 +110,6 @@ func testCheckAzureRMDataFactoryLinkedServiceAzureFunctionDestroy(s *terraform.S dataFactoryName := rs.Primary.Attributes["data_factory_name"] resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/datafactory/data_factory_linked_service_azure_sql_database_resource_test.go b/azurerm/internal/services/datafactory/data_factory_linked_service_azure_sql_database_resource_test.go index 73e253be2b78..9d39a33ebd26 100644 --- a/azurerm/internal/services/datafactory/data_factory_linked_service_azure_sql_database_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_linked_service_azure_sql_database_resource_test.go @@ -110,7 +110,6 @@ func testCheckAzureRMDataFactoryLinkedServiceAzureSQLDatabaseDestroy(s *terrafor dataFactoryName := rs.Primary.Attributes["data_factory_name"] resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/datafactory/data_factory_linked_service_cosmosdb_resource_test.go b/azurerm/internal/services/datafactory/data_factory_linked_service_cosmosdb_resource_test.go index 7a7c5789be32..cad3a04b180a 100644 --- a/azurerm/internal/services/datafactory/data_factory_linked_service_cosmosdb_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_linked_service_cosmosdb_resource_test.go @@ -30,6 +30,7 @@ func TestAccAzureRMDataFactoryLinkedServiceCosmosDb_basic(t *testing.T) { }, }) } + func TestAccAzureRMDataFactoryLinkedServiceCosmosDb_accountkey(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_data_factory_linked_service_cosmosdb", "test") @@ -48,6 +49,7 @@ func TestAccAzureRMDataFactoryLinkedServiceCosmosDb_accountkey(t *testing.T) { }, }) } + func TestAccAzureRMDataFactoryLinkedServiceCosmosDb_accountkey_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_data_factory_linked_service_cosmosdb", "test") @@ -155,7 +157,6 @@ func testCheckAzureRMDataFactoryLinkedServiceCosmosDbDestroy(s *terraform.State) dataFactoryName := rs.Primary.Attributes["data_factory_name"] resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "") - if err != nil { return nil } @@ -193,6 +194,7 @@ resource "azurerm_data_factory_linked_service_cosmosdb" "test" { } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) } + func testAccAzureRMDataFactoryLinkedServiceCosmosDb_accountkey(data acceptance.TestData) string { return fmt.Sprintf(` provider "azurerm" { @@ -220,6 +222,7 @@ resource "azurerm_data_factory_linked_service_cosmosdb" "test" { } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) } + func testAccAzureRMDataFactoryLinkedServiceCosmosDb_accountkey_update1(data acceptance.TestData) string { return fmt.Sprintf(` provider "azurerm" { diff --git a/azurerm/internal/services/datafactory/data_factory_linked_service_data_lake_storage_gen2_resource_test.go b/azurerm/internal/services/datafactory/data_factory_linked_service_data_lake_storage_gen2_resource_test.go index 190d30a8041f..dc21ebef16ad 100644 --- a/azurerm/internal/services/datafactory/data_factory_linked_service_data_lake_storage_gen2_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_linked_service_data_lake_storage_gen2_resource_test.go @@ -128,7 +128,6 @@ func testCheckAzureRMDataFactoryLinkedServiceDataLakeStorageGen2Destroy(s *terra dataFactoryName := rs.Primary.Attributes["data_factory_name"] resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/datafactory/data_factory_linked_service_key_vault_resource_test.go b/azurerm/internal/services/datafactory/data_factory_linked_service_key_vault_resource_test.go index 8bde9c13f619..e5ab7528ba39 100644 --- a/azurerm/internal/services/datafactory/data_factory_linked_service_key_vault_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_linked_service_key_vault_resource_test.go @@ -109,7 +109,6 @@ func testCheckAzureRMDataFactoryLinkedServiceKeyVaultDestroy(s *terraform.State) dataFactoryName := rs.Primary.Attributes["data_factory_name"] resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/datafactory/data_factory_linked_service_mysql_resource_test.go b/azurerm/internal/services/datafactory/data_factory_linked_service_mysql_resource_test.go index 768a439910a5..751baa5d1c0e 100644 --- a/azurerm/internal/services/datafactory/data_factory_linked_service_mysql_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_linked_service_mysql_resource_test.go @@ -109,7 +109,6 @@ func testCheckAzureRMDataFactoryLinkedServiceMySQLDestroy(s *terraform.State) er dataFactoryName := rs.Primary.Attributes["data_factory_name"] resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/datafactory/data_factory_linked_service_postgresql_resource_test.go b/azurerm/internal/services/datafactory/data_factory_linked_service_postgresql_resource_test.go index 8dc95456f7d4..c6f4bede5484 100644 --- a/azurerm/internal/services/datafactory/data_factory_linked_service_postgresql_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_linked_service_postgresql_resource_test.go @@ -109,7 +109,6 @@ func testCheckAzureRMDataFactoryLinkedServicePostgreSQLDestroy(s *terraform.Stat dataFactoryName := rs.Primary.Attributes["data_factory_name"] resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/datafactory/data_factory_linked_service_sftp_resource_test.go b/azurerm/internal/services/datafactory/data_factory_linked_service_sftp_resource_test.go index be649a8b3e91..866cd938fbe4 100644 --- a/azurerm/internal/services/datafactory/data_factory_linked_service_sftp_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_linked_service_sftp_resource_test.go @@ -110,7 +110,6 @@ func testCheckAzureRMDataFactoryLinkedServiceSFTPDestroy(s *terraform.State) err dataFactoryName := rs.Primary.Attributes["data_factory_name"] resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/datafactory/data_factory_linked_service_sql_server_resource_test.go b/azurerm/internal/services/datafactory/data_factory_linked_service_sql_server_resource_test.go index a52326b68520..01337025ac1d 100644 --- a/azurerm/internal/services/datafactory/data_factory_linked_service_sql_server_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_linked_service_sql_server_resource_test.go @@ -92,7 +92,6 @@ func testCheckAzureRMDataFactoryLinkedServiceSQLServerDestroy(s *terraform.State dataFactoryName := rs.Primary.Attributes["data_factory_name"] resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/datafactory/data_factory_linked_service_web_resource_test.go b/azurerm/internal/services/datafactory/data_factory_linked_service_web_resource_test.go index fff2043b7480..4e3e66ed8f64 100644 --- a/azurerm/internal/services/datafactory/data_factory_linked_service_web_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_linked_service_web_resource_test.go @@ -137,7 +137,6 @@ func testCheckAzureRMDataFactoryLinkedServiceWebDestroy(s *terraform.State) erro dataFactoryName := rs.Primary.Attributes["data_factory_name"] resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/datafactory/data_factory_pipeline_resource_test.go b/azurerm/internal/services/datafactory/data_factory_pipeline_resource_test.go index d49e76f3bed1..f323fe6a25db 100644 --- a/azurerm/internal/services/datafactory/data_factory_pipeline_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_pipeline_resource_test.go @@ -116,7 +116,6 @@ func testCheckAzureRMDataFactoryPipelineDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "") - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { return err diff --git a/azurerm/internal/services/datafactory/data_factory_resource_test.go b/azurerm/internal/services/datafactory/data_factory_resource_test.go index 9e17d3174d5b..ba9c03837811 100644 --- a/azurerm/internal/services/datafactory/data_factory_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_resource_test.go @@ -231,7 +231,6 @@ func testCheckAzureRMDataFactoryDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/datafactory/data_factory_trigger_schedule_resource_test.go b/azurerm/internal/services/datafactory/data_factory_trigger_schedule_resource_test.go index 141d74447dc2..49e851fc3245 100644 --- a/azurerm/internal/services/datafactory/data_factory_trigger_schedule_resource_test.go +++ b/azurerm/internal/services/datafactory/data_factory_trigger_schedule_resource_test.go @@ -105,7 +105,6 @@ func testCheckAzureRMDataFactoryTriggerScheduleDestroy(s *terraform.State) error dataFactoryName := rs.Primary.Attributes["data_factory_name"] resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/datalake/registration.go b/azurerm/internal/services/datalake/registration.go index fda187080739..3f2938ff558b 100644 --- a/azurerm/internal/services/datalake/registration.go +++ b/azurerm/internal/services/datalake/registration.go @@ -21,7 +21,8 @@ func (r Registration) WebsiteCategories() []string { // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ - "azurerm_data_lake_store": dataSourceArmDataLakeStoreAccount()} + "azurerm_data_lake_store": dataSourceArmDataLakeStoreAccount(), + } } // SupportedResources returns the supported Resources supported by this Service @@ -31,5 +32,6 @@ func (r Registration) SupportedResources() map[string]*schema.Resource { "azurerm_data_lake_analytics_firewall_rule": resourceArmDataLakeAnalyticsFirewallRule(), "azurerm_data_lake_store_file": resourceArmDataLakeStoreFile(), "azurerm_data_lake_store_firewall_rule": resourceArmDataLakeStoreFirewallRule(), - "azurerm_data_lake_store": resourceArmDataLakeStore()} + "azurerm_data_lake_store": resourceArmDataLakeStore(), + } } diff --git a/azurerm/internal/services/datalake/tests/data_lake_analytics_firewall_rule_resource_test.go b/azurerm/internal/services/datalake/tests/data_lake_analytics_firewall_rule_resource_test.go index d5e1c1028473..4a87014190a5 100644 --- a/azurerm/internal/services/datalake/tests/data_lake_analytics_firewall_rule_resource_test.go +++ b/azurerm/internal/services/datalake/tests/data_lake_analytics_firewall_rule_resource_test.go @@ -3,9 +3,8 @@ package tests import ( "fmt" "net/http" - "testing" - "strconv" + "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" diff --git a/azurerm/internal/services/datalake/tests/data_lake_store_file_migration_resource_test.go b/azurerm/internal/services/datalake/tests/data_lake_store_file_migration_resource_test.go index b21d2706f00b..471f5397bd74 100644 --- a/azurerm/internal/services/datalake/tests/data_lake_store_file_migration_resource_test.go +++ b/azurerm/internal/services/datalake/tests/data_lake_store_file_migration_resource_test.go @@ -63,7 +63,6 @@ func TestAccAzureRMDataLakeStoreFileMigrateState(t *testing.T) { Attributes: tc.InputAttributes, } is, err := datalake.ResourceDataLakeStoreFileMigrateState(tc.StateVersion, is, client) - if err != nil { t.Fatalf("bad: %s, err: %#v", tn, err) } diff --git a/azurerm/internal/services/datalake/tests/data_lake_store_firewall_rule_resource_test.go b/azurerm/internal/services/datalake/tests/data_lake_store_firewall_rule_resource_test.go index f57d5835c869..106e31fc98e9 100644 --- a/azurerm/internal/services/datalake/tests/data_lake_store_firewall_rule_resource_test.go +++ b/azurerm/internal/services/datalake/tests/data_lake_store_firewall_rule_resource_test.go @@ -3,9 +3,8 @@ package tests import ( "fmt" "net/http" - "testing" - "strconv" + "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" diff --git a/azurerm/internal/services/datalake/tests/data_lake_store_resource_test.go b/azurerm/internal/services/datalake/tests/data_lake_store_resource_test.go index 317e5503d677..de38b4038ddf 100644 --- a/azurerm/internal/services/datalake/tests/data_lake_store_resource_test.go +++ b/azurerm/internal/services/datalake/tests/data_lake_store_resource_test.go @@ -33,6 +33,7 @@ func TestAccAzureRMDataLakeStore_basic(t *testing.T) { }, }) } + func TestAccAzureRMDataLakeStore_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_data_lake_store", "test") diff --git a/azurerm/internal/services/datashare/data_share_account_resource.go b/azurerm/internal/services/datashare/data_share_account_resource.go index c1828cac2c7b..c14821874b9f 100644 --- a/azurerm/internal/services/datashare/data_share_account_resource.go +++ b/azurerm/internal/services/datashare/data_share_account_resource.go @@ -82,6 +82,7 @@ func resourceArmDataShareAccount() *schema.Resource { }, } } + func resourceArmDataShareAccountCreate(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).DataShare.AccountClient ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) diff --git a/azurerm/internal/services/datashare/parse/data_share.go b/azurerm/internal/services/datashare/parse/data_share.go index 449bd78ab038..e2ed86819a5c 100644 --- a/azurerm/internal/services/datashare/parse/data_share.go +++ b/azurerm/internal/services/datashare/parse/data_share.go @@ -26,7 +26,7 @@ func NewDataShareId(resourceGroup, accountName, name string) DataShareId { } func DataShareID(input string) (*DataShareId, error) { - var id, err = azure.ParseAzureResourceID(input) + id, err := azure.ParseAzureResourceID(input) if err != nil { return nil, fmt.Errorf("unable to parse DataShare ID %q: %+v", input, err) } diff --git a/azurerm/internal/services/datashare/resource_arm_data_share.go b/azurerm/internal/services/datashare/resource_arm_data_share.go index 4d8e3813c903..39975b36ce63 100644 --- a/azurerm/internal/services/datashare/resource_arm_data_share.go +++ b/azurerm/internal/services/datashare/resource_arm_data_share.go @@ -106,6 +106,7 @@ func resourceArmDataShare() *schema.Resource { }, } } + func resourceArmDataShareCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).DataShare.SharesClient subscriptionId := meta.(*clients.Client).Account.SubscriptionId diff --git a/azurerm/internal/services/datashare/resource_arm_data_share_dataset_blob_storage.go b/azurerm/internal/services/datashare/resource_arm_data_share_dataset_blob_storage.go index 96785c5d804b..12e2ce790e32 100644 --- a/azurerm/internal/services/datashare/resource_arm_data_share_dataset_blob_storage.go +++ b/azurerm/internal/services/datashare/resource_arm_data_share_dataset_blob_storage.go @@ -110,6 +110,7 @@ func resourceArmDataShareDataSetBlobStorage() *schema.Resource { }, } } + func resourceArmDataShareDataSetBlobStorageCreate(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).DataShare.DataSetClient ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) diff --git a/azurerm/internal/services/datashare/resource_arm_data_share_dataset_data_lake_gen1.go b/azurerm/internal/services/datashare/resource_arm_data_share_dataset_data_lake_gen1.go index 9defca9a1a05..6112bd2c1eb7 100644 --- a/azurerm/internal/services/datashare/resource_arm_data_share_dataset_data_lake_gen1.go +++ b/azurerm/internal/services/datashare/resource_arm_data_share_dataset_data_lake_gen1.go @@ -79,6 +79,7 @@ func resourceArmDataShareDataSetDataLakeGen1() *schema.Resource { }, } } + func resourceArmDataShareDataSetDataLakeGen1Create(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).DataShare.DataSetClient ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) diff --git a/azurerm/internal/services/datashare/resource_arm_data_share_dataset_data_lake_gen2.go b/azurerm/internal/services/datashare/resource_arm_data_share_dataset_data_lake_gen2.go index 83c52e098af0..db408581b3e0 100644 --- a/azurerm/internal/services/datashare/resource_arm_data_share_dataset_data_lake_gen2.go +++ b/azurerm/internal/services/datashare/resource_arm_data_share_dataset_data_lake_gen2.go @@ -88,6 +88,7 @@ func resourceArmDataShareDataSetDataLakeGen2() *schema.Resource { }, } } + func resourceArmDataShareDataSetDataLakeGen2Create(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).DataShare.DataSetClient ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) diff --git a/azurerm/internal/services/datashare/resource_arm_data_share_dataset_kusto_cluster.go b/azurerm/internal/services/datashare/resource_arm_data_share_dataset_kusto_cluster.go index f683d35bc3fb..0e5abac69e81 100644 --- a/azurerm/internal/services/datashare/resource_arm_data_share_dataset_kusto_cluster.go +++ b/azurerm/internal/services/datashare/resource_arm_data_share_dataset_kusto_cluster.go @@ -69,6 +69,7 @@ func resourceArmDataShareDataSetKustoCluster() *schema.Resource { }, } } + func resourceArmDataShareDataSetKustoClusterCreate(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).DataShare.DataSetClient ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) diff --git a/azurerm/internal/services/datashare/tests/resource_arm_data_share_test.go b/azurerm/internal/services/datashare/tests/resource_arm_data_share_test.go index 6829c4fc8c48..f9f140286b8d 100644 --- a/azurerm/internal/services/datashare/tests/resource_arm_data_share_test.go +++ b/azurerm/internal/services/datashare/tests/resource_arm_data_share_test.go @@ -187,6 +187,7 @@ func testCheckAzureRMDataShareDestroy(s *terraform.State) error { } return nil } + func testAccAzureRMDataShare_template(data acceptance.TestData) string { return fmt.Sprintf(` provider "azurerm" { diff --git a/azurerm/internal/services/datashare/validate/data_share_test.go b/azurerm/internal/services/datashare/validate/data_share_test.go index 9542d7bd9401..2726ef92300d 100644 --- a/azurerm/internal/services/datashare/validate/data_share_test.go +++ b/azurerm/internal/services/datashare/validate/data_share_test.go @@ -44,7 +44,7 @@ func TestDataShareAccountName(t *testing.T) { valid: true, }, } - var validationFunction = DataShareAccountName() + validationFunction := DataShareAccountName() for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { _, err := validationFunction(tt.input, "") @@ -83,7 +83,7 @@ func TestDatashareName(t *testing.T) { valid: true, }, } - var validationFunction = DatashareName() + validationFunction := DatashareName() for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { _, err := validationFunction(tt.input, "") @@ -122,7 +122,7 @@ func TestDatashareSyncName(t *testing.T) { valid: false, }, } - var validationFunction = DataShareSyncName() + validationFunction := DataShareSyncName() for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { _, err := validationFunction(tt.input, "") diff --git a/azurerm/internal/services/devtestlabs/dev_test_global_vm_shutdown_schedule_resource.go b/azurerm/internal/services/devtestlabs/dev_test_global_vm_shutdown_schedule_resource.go index e237a5168629..a53252c1873d 100644 --- a/azurerm/internal/services/devtestlabs/dev_test_global_vm_shutdown_schedule_resource.go +++ b/azurerm/internal/services/devtestlabs/dev_test_global_vm_shutdown_schedule_resource.go @@ -187,7 +187,6 @@ func resourceArmDevTestLabGlobalVMShutdownScheduleRead(d *schema.ResourceData, m } resp, err := client.Get(ctx, id.ResourceGroup, id.Name, "") - if err != nil { if utils.ResponseWasNotFound(resp.Response) { d.SetId("") diff --git a/azurerm/internal/services/devtestlabs/dev_test_global_vm_shutdown_schedule_resource_test.go b/azurerm/internal/services/devtestlabs/dev_test_global_vm_shutdown_schedule_resource_test.go index 50c623609568..a493b5d4df49 100644 --- a/azurerm/internal/services/devtestlabs/dev_test_global_vm_shutdown_schedule_resource_test.go +++ b/azurerm/internal/services/devtestlabs/dev_test_global_vm_shutdown_schedule_resource_test.go @@ -119,7 +119,6 @@ func testCheckDevTestLabGlobalVMShutdownScheduleExists(resourceName string) reso targetResourceID := rs.Primary.Attributes["virtual_machine_id"] exists, err := testCheckDevTestLabGlobalVMShutdownScheduleExistsInternal(targetResourceID) - if err != nil { return fmt.Errorf("Error checking if item has been created: %s", err) } @@ -139,7 +138,6 @@ func testCheckDevTestLabGlobalVMShutdownScheduleDestroy(s *terraform.State) erro targetResourceID := rs.Primary.Attributes["virtual_machine_id"] exists, err := testCheckDevTestLabGlobalVMShutdownScheduleExistsInternal(targetResourceID) - if err != nil { return fmt.Errorf("Error checking if item has been destroyed: %s", err) } diff --git a/azurerm/internal/services/devtestlabs/dev_test_lab_resource_test.go b/azurerm/internal/services/devtestlabs/dev_test_lab_resource_test.go index 2435bf6068fb..1fdb24e74c25 100644 --- a/azurerm/internal/services/devtestlabs/dev_test_lab_resource_test.go +++ b/azurerm/internal/services/devtestlabs/dev_test_lab_resource_test.go @@ -119,7 +119,6 @@ func testCheckDevTestLabDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, labName, "") - if err != nil { if resp.StatusCode == http.StatusNotFound { return nil diff --git a/azurerm/internal/services/devtestlabs/dev_test_lab_schedule_resource.go b/azurerm/internal/services/devtestlabs/dev_test_lab_schedule_resource.go index caa329751f4e..7efac3d8b96c 100644 --- a/azurerm/internal/services/devtestlabs/dev_test_lab_schedule_resource.go +++ b/azurerm/internal/services/devtestlabs/dev_test_lab_schedule_resource.go @@ -278,7 +278,6 @@ func resourceArmDevTestLabSchedulesRead(d *schema.ResourceData, meta interface{} name := id.Path["schedules"] resp, err := client.Get(ctx, resGroup, devTestLabName, name, "") - if err != nil { if utils.ResponseWasNotFound(resp.Response) { d.SetId("") diff --git a/azurerm/internal/services/devtestlabs/dev_test_lab_schedule_resource_test.go b/azurerm/internal/services/devtestlabs/dev_test_lab_schedule_resource_test.go index ca1553ea83e1..623abffc5578 100644 --- a/azurerm/internal/services/devtestlabs/dev_test_lab_schedule_resource_test.go +++ b/azurerm/internal/services/devtestlabs/dev_test_lab_schedule_resource_test.go @@ -144,7 +144,6 @@ func testCheckDevTestLabScheduleDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, devTestLabName, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/devtestlabs/dev_test_linux_virtual_machine_resource_test.go b/azurerm/internal/services/devtestlabs/dev_test_linux_virtual_machine_resource_test.go index 1bbaef6c895f..b8f197ef7566 100644 --- a/azurerm/internal/services/devtestlabs/dev_test_linux_virtual_machine_resource_test.go +++ b/azurerm/internal/services/devtestlabs/dev_test_linux_virtual_machine_resource_test.go @@ -187,7 +187,6 @@ func testCheckDevTestLinuxVirtualMachineDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, labName, virtualMachineName, "") - if err != nil { if resp.StatusCode == http.StatusNotFound { return nil diff --git a/azurerm/internal/services/devtestlabs/dev_test_policy_resource_test.go b/azurerm/internal/services/devtestlabs/dev_test_policy_resource_test.go index 6a73ce2460f6..f1b918d10a94 100644 --- a/azurerm/internal/services/devtestlabs/dev_test_policy_resource_test.go +++ b/azurerm/internal/services/devtestlabs/dev_test_policy_resource_test.go @@ -119,7 +119,6 @@ func testCheckDevTestPolicyDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, labName, policySetName, policyName, "") - if err != nil { if resp.StatusCode == http.StatusNotFound { return nil diff --git a/azurerm/internal/services/devtestlabs/dev_test_virtual_network_resource_test.go b/azurerm/internal/services/devtestlabs/dev_test_virtual_network_resource_test.go index 70671ebaefc7..037ec6e51cdc 100644 --- a/azurerm/internal/services/devtestlabs/dev_test_virtual_network_resource_test.go +++ b/azurerm/internal/services/devtestlabs/dev_test_virtual_network_resource_test.go @@ -148,7 +148,6 @@ func testCheckDevTestVirtualNetworkDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, labName, virtualNetworkName, "") - if err != nil { if resp.StatusCode == http.StatusNotFound { return nil diff --git a/azurerm/internal/services/devtestlabs/dev_test_windows_virtual_machine_resource_test.go b/azurerm/internal/services/devtestlabs/dev_test_windows_virtual_machine_resource_test.go index 8156f3fc6b8f..e65b4a3b4365 100644 --- a/azurerm/internal/services/devtestlabs/dev_test_windows_virtual_machine_resource_test.go +++ b/azurerm/internal/services/devtestlabs/dev_test_windows_virtual_machine_resource_test.go @@ -160,7 +160,6 @@ func testCheckDevTestWindowsVirtualMachineDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, labName, virtualMachineName, "") - if err != nil { if resp.StatusCode == http.StatusNotFound { return nil diff --git a/azurerm/internal/services/devtestlabs/registration.go b/azurerm/internal/services/devtestlabs/registration.go index b6a1865944eb..8be98540e688 100644 --- a/azurerm/internal/services/devtestlabs/registration.go +++ b/azurerm/internal/services/devtestlabs/registration.go @@ -22,7 +22,8 @@ func (r Registration) WebsiteCategories() []string { func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ "azurerm_dev_test_lab": dataSourceArmDevTestLab(), - "azurerm_dev_test_virtual_network": dataSourceArmDevTestVirtualNetwork()} + "azurerm_dev_test_virtual_network": dataSourceArmDevTestVirtualNetwork(), + } } // SupportedResources returns the supported Resources supported by this Service @@ -34,5 +35,6 @@ func (r Registration) SupportedResources() map[string]*schema.Resource { "azurerm_dev_test_linux_virtual_machine": resourceArmDevTestLinuxVirtualMachine(), "azurerm_dev_test_policy": resourceArmDevTestPolicy(), "azurerm_dev_test_virtual_network": resourceArmDevTestVirtualNetwork(), - "azurerm_dev_test_windows_virtual_machine": resourceArmDevTestWindowsVirtualMachine()} + "azurerm_dev_test_windows_virtual_machine": resourceArmDevTestWindowsVirtualMachine(), + } } diff --git a/azurerm/internal/services/dns/registration.go b/azurerm/internal/services/dns/registration.go index 841f7e418f26..ca2dd42f011e 100644 --- a/azurerm/internal/services/dns/registration.go +++ b/azurerm/internal/services/dns/registration.go @@ -37,5 +37,6 @@ func (r Registration) SupportedResources() map[string]*schema.Resource { "azurerm_dns_ptr_record": resourceArmDnsPtrRecord(), "azurerm_dns_srv_record": resourceArmDnsSrvRecord(), "azurerm_dns_txt_record": resourceArmDnsTxtRecord(), - "azurerm_dns_zone": resourceArmDnsZone()} + "azurerm_dns_zone": resourceArmDnsZone(), + } } diff --git a/azurerm/internal/services/dns/tests/dns_a_record_resource_test.go b/azurerm/internal/services/dns/tests/dns_a_record_resource_test.go index 8bcddeb71829..4fe3f6708be1 100644 --- a/azurerm/internal/services/dns/tests/dns_a_record_resource_test.go +++ b/azurerm/internal/services/dns/tests/dns_a_record_resource_test.go @@ -238,7 +238,6 @@ func testCheckAzureRMDnsARecordDestroy(s *terraform.State) error { return err } resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.A) - if err != nil { if resp.StatusCode == http.StatusNotFound { return nil diff --git a/azurerm/internal/services/dns/tests/dns_aaaa_record_resource_test.go b/azurerm/internal/services/dns/tests/dns_aaaa_record_resource_test.go index 0cc4b3447e89..a6c106ef0626 100644 --- a/azurerm/internal/services/dns/tests/dns_aaaa_record_resource_test.go +++ b/azurerm/internal/services/dns/tests/dns_aaaa_record_resource_test.go @@ -265,7 +265,6 @@ func testCheckAzureRMDnsAaaaRecordDestroy(s *terraform.State) error { return err } resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.AAAA) - if err != nil { if resp.StatusCode == http.StatusNotFound { return nil diff --git a/azurerm/internal/services/dns/tests/dns_caa_record_resource_test.go b/azurerm/internal/services/dns/tests/dns_caa_record_resource_test.go index 74dff2fc8c15..91bfd8923479 100644 --- a/azurerm/internal/services/dns/tests/dns_caa_record_resource_test.go +++ b/azurerm/internal/services/dns/tests/dns_caa_record_resource_test.go @@ -151,7 +151,6 @@ func testCheckAzureRMDnsCaaRecordDestroy(s *terraform.State) error { return err } resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.CAA) - if err != nil { if resp.StatusCode == http.StatusNotFound { return nil diff --git a/azurerm/internal/services/dns/tests/dns_cname_record_resource_test.go b/azurerm/internal/services/dns/tests/dns_cname_record_resource_test.go index 47de7d244ff2..0ab9de8edb82 100644 --- a/azurerm/internal/services/dns/tests/dns_cname_record_resource_test.go +++ b/azurerm/internal/services/dns/tests/dns_cname_record_resource_test.go @@ -255,7 +255,6 @@ func testCheckAzureRMDnsCNameRecordDestroy(s *terraform.State) error { } resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.CNAME) - if err != nil { if resp.StatusCode == http.StatusNotFound { return nil diff --git a/azurerm/internal/services/dns/tests/dns_mx_record_resource_test.go b/azurerm/internal/services/dns/tests/dns_mx_record_resource_test.go index b4b4e722c465..f43fd927e32c 100644 --- a/azurerm/internal/services/dns/tests/dns_mx_record_resource_test.go +++ b/azurerm/internal/services/dns/tests/dns_mx_record_resource_test.go @@ -172,7 +172,6 @@ func testCheckAzureRMDnsMxRecordDestroy(s *terraform.State) error { } resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.MX) - if err != nil { if resp.StatusCode == http.StatusNotFound { return nil diff --git a/azurerm/internal/services/dns/tests/dns_ns_record_resource_test.go b/azurerm/internal/services/dns/tests/dns_ns_record_resource_test.go index 0fddb70a1ed5..fff3e8a81817 100644 --- a/azurerm/internal/services/dns/tests/dns_ns_record_resource_test.go +++ b/azurerm/internal/services/dns/tests/dns_ns_record_resource_test.go @@ -152,7 +152,6 @@ func testCheckAzureRMDnsNsRecordDestroy(s *terraform.State) error { } resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.NS) - if err != nil { return nil } diff --git a/azurerm/internal/services/dns/tests/dns_ptr_record_resource_test.go b/azurerm/internal/services/dns/tests/dns_ptr_record_resource_test.go index 4be0b93a6f17..c22b7532c219 100644 --- a/azurerm/internal/services/dns/tests/dns_ptr_record_resource_test.go +++ b/azurerm/internal/services/dns/tests/dns_ptr_record_resource_test.go @@ -154,7 +154,6 @@ func testCheckAzureRMDnsPtrRecordDestroy(s *terraform.State) error { } resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.PTR) - if err != nil { if resp.StatusCode == http.StatusNotFound { return nil diff --git a/azurerm/internal/services/dns/tests/dns_srv_record_resource_test.go b/azurerm/internal/services/dns/tests/dns_srv_record_resource_test.go index 0ee7724f46a8..75d4d3963c98 100644 --- a/azurerm/internal/services/dns/tests/dns_srv_record_resource_test.go +++ b/azurerm/internal/services/dns/tests/dns_srv_record_resource_test.go @@ -152,7 +152,6 @@ func testCheckAzureRMDnsSrvRecordDestroy(s *terraform.State) error { } resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.SRV) - if err != nil { if resp.StatusCode == http.StatusNotFound { return nil diff --git a/azurerm/internal/services/dns/tests/dns_txt_record_resource_test.go b/azurerm/internal/services/dns/tests/dns_txt_record_resource_test.go index 29f5d2eb63fc..3c8200c2cb1d 100644 --- a/azurerm/internal/services/dns/tests/dns_txt_record_resource_test.go +++ b/azurerm/internal/services/dns/tests/dns_txt_record_resource_test.go @@ -152,7 +152,6 @@ func testCheckAzureRMDnsTxtRecordDestroy(s *terraform.State) error { } resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.TXT) - if err != nil { if resp.StatusCode == http.StatusNotFound { return nil diff --git a/azurerm/internal/services/eventgrid/eventgrid_event_subscription_resource.go b/azurerm/internal/services/eventgrid/eventgrid_event_subscription_resource.go index dda51470f5b8..9aabd5d657fb 100644 --- a/azurerm/internal/services/eventgrid/eventgrid_event_subscription_resource.go +++ b/azurerm/internal/services/eventgrid/eventgrid_event_subscription_resource.go @@ -337,7 +337,8 @@ func resourceArmEventGridEventSubscription() *schema.Resource { Required: true, }, }, - }}, + }, + }, "number_less_than": { Type: schema.TypeList, Optional: true, diff --git a/azurerm/internal/services/eventhub/eventhub_consumer_group_resource.go b/azurerm/internal/services/eventhub/eventhub_consumer_group_resource.go index da984e9a7c01..4d45d944e209 100644 --- a/azurerm/internal/services/eventhub/eventhub_consumer_group_resource.go +++ b/azurerm/internal/services/eventhub/eventhub_consumer_group_resource.go @@ -103,7 +103,6 @@ func resourceArmEventHubConsumerGroupCreateUpdate(d *schema.ResourceData, meta i } read, err := client.Get(ctx, resGroup, namespaceName, eventHubName, name) - if err != nil { return err } @@ -167,7 +166,6 @@ func resourceArmEventHubConsumerGroupDelete(d *schema.ResourceData, meta interfa name := id.Path["consumergroups"] resp, err := client.Delete(ctx, resGroup, namespaceName, eventHubName, name) - if err != nil { if !utils.ResponseWasNotFound(resp) { return fmt.Errorf("Error issuing Azure ARM delete request of EventHub Consumer Group '%s': %+v", name, err) diff --git a/azurerm/internal/services/eventhub/eventhub_namespace_disaster_recovery_config_resource.go b/azurerm/internal/services/eventhub/eventhub_namespace_disaster_recovery_config_resource.go index 62d6d5d338c9..244907d542ae 100644 --- a/azurerm/internal/services/eventhub/eventhub_namespace_disaster_recovery_config_resource.go +++ b/azurerm/internal/services/eventhub/eventhub_namespace_disaster_recovery_config_resource.go @@ -244,7 +244,6 @@ func resourceArmEventHubNamespaceDisasterRecoveryConfigDelete(d *schema.Resource Timeout: d.Timeout(schema.TimeoutDelete), Refresh: func() (interface{}, string, error) { resp, err := client.Get(ctx, resourceGroup, namespaceName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return resp, strconv.Itoa(resp.StatusCode), nil diff --git a/azurerm/internal/services/eventhub/eventhub_namespace_resource.go b/azurerm/internal/services/eventhub/eventhub_namespace_resource.go index 14137c115e4f..e297a3b3e123 100644 --- a/azurerm/internal/services/eventhub/eventhub_namespace_resource.go +++ b/azurerm/internal/services/eventhub/eventhub_namespace_resource.go @@ -26,8 +26,10 @@ import ( // Default Authorization Rule/Policy created by Azure, used to populate the // default connection strings and keys -var eventHubNamespaceDefaultAuthorizationRule = "RootManageSharedAccessKey" -var eventHubNamespaceResourceName = "azurerm_eventhub_namespace" +var ( + eventHubNamespaceDefaultAuthorizationRule = "RootManageSharedAccessKey" + eventHubNamespaceResourceName = "azurerm_eventhub_namespace" +) func resourceArmEventHubNamespace() *schema.Resource { return &schema.Resource{ diff --git a/azurerm/internal/services/eventhub/eventhub_resource.go b/azurerm/internal/services/eventhub/eventhub_resource.go index 6543a22bd7a9..0965cea9a738 100644 --- a/azurerm/internal/services/eventhub/eventhub_resource.go +++ b/azurerm/internal/services/eventhub/eventhub_resource.go @@ -257,7 +257,6 @@ func resourceArmEventHubDelete(d *schema.ResourceData, meta interface{}) error { namespaceName := id.Path["namespaces"] name := id.Path["eventhubs"] resp, err := client.Delete(ctx, resourceGroup, namespaceName, name) - if err != nil { if utils.ResponseWasNotFound(resp) { return nil diff --git a/azurerm/internal/services/eventhub/registration.go b/azurerm/internal/services/eventhub/registration.go index 9992df41ec4e..3be74091eb55 100644 --- a/azurerm/internal/services/eventhub/registration.go +++ b/azurerm/internal/services/eventhub/registration.go @@ -38,5 +38,6 @@ func (r Registration) SupportedResources() map[string]*schema.Resource { "azurerm_eventhub_namespace_authorization_rule": resourceArmEventHubNamespaceAuthorizationRule(), "azurerm_eventhub_namespace_disaster_recovery_config": resourceArmEventHubNamespaceDisasterRecoveryConfig(), "azurerm_eventhub_namespace": resourceArmEventHubNamespace(), - "azurerm_eventhub": resourceArmEventHub()} + "azurerm_eventhub": resourceArmEventHub(), + } } diff --git a/azurerm/internal/services/eventhub/tests/eventhub_consumer_group_resource_test.go b/azurerm/internal/services/eventhub/tests/eventhub_consumer_group_resource_test.go index 3964098e35c3..8b8d484d65c0 100644 --- a/azurerm/internal/services/eventhub/tests/eventhub_consumer_group_resource_test.go +++ b/azurerm/internal/services/eventhub/tests/eventhub_consumer_group_resource_test.go @@ -112,7 +112,6 @@ func testCheckAzureRMEventHubConsumerGroupDestroy(s *terraform.State) error { eventHubName := rs.Primary.Attributes["eventhub_name"] resp, err := conn.Get(ctx, resourceGroup, namespaceName, eventHubName, name) - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { return err diff --git a/azurerm/internal/services/eventhub/tests/eventhub_namespace_resource_test.go b/azurerm/internal/services/eventhub/tests/eventhub_namespace_resource_test.go index e156104de76a..4ef64188c680 100644 --- a/azurerm/internal/services/eventhub/tests/eventhub_namespace_resource_test.go +++ b/azurerm/internal/services/eventhub/tests/eventhub_namespace_resource_test.go @@ -509,7 +509,6 @@ func testCheckAzureRMEventHubNamespaceDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, name) - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { return err diff --git a/azurerm/internal/services/eventhub/tests/eventhub_resource_test.go b/azurerm/internal/services/eventhub/tests/eventhub_resource_test.go index 5a477fa65984..636fffab6c33 100644 --- a/azurerm/internal/services/eventhub/tests/eventhub_resource_test.go +++ b/azurerm/internal/services/eventhub/tests/eventhub_resource_test.go @@ -3,9 +3,8 @@ package tests import ( "fmt" "net/http" - "testing" - "strconv" + "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" @@ -363,7 +362,6 @@ func testCheckAzureRMEventHubDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, namespaceName, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/frontdoor/frontdoor_custom_https_configuration_resource.go b/azurerm/internal/services/frontdoor/frontdoor_custom_https_configuration_resource.go index 25108385d404..cb50d6fc0d6c 100644 --- a/azurerm/internal/services/frontdoor/frontdoor_custom_https_configuration_resource.go +++ b/azurerm/internal/services/frontdoor/frontdoor_custom_https_configuration_resource.go @@ -260,7 +260,6 @@ func resourceArmFrontDoorFrontendEndpointEnableHttpsProvisioning(ctx context.Con } future, err := client.DisableHTTPS(ctx, id.ResourceGroup, id.FrontDoorName, id.Name) - if err != nil { return fmt.Errorf("disabling Custom Domain HTTPS for Frontend Endpoint: %+v", err) } diff --git a/azurerm/internal/services/frontdoor/registration.go b/azurerm/internal/services/frontdoor/registration.go index e2a62bdc11a6..63d26c62a431 100644 --- a/azurerm/internal/services/frontdoor/registration.go +++ b/azurerm/internal/services/frontdoor/registration.go @@ -30,5 +30,6 @@ func (r Registration) SupportedResources() map[string]*schema.Resource { return map[string]*schema.Resource{ "azurerm_frontdoor": resourceArmFrontDoor(), "azurerm_frontdoor_firewall_policy": resourceArmFrontDoorFirewallPolicy(), - "azurerm_frontdoor_custom_https_configuration": resourceArmFrontDoorCustomHttpsConfiguration()} + "azurerm_frontdoor_custom_https_configuration": resourceArmFrontDoorCustomHttpsConfiguration(), + } } diff --git a/azurerm/internal/services/hdinsight/common_hdinsight.go b/azurerm/internal/services/hdinsight/common_hdinsight.go index 1ac4f659f66d..6bb91a713f91 100644 --- a/azurerm/internal/services/hdinsight/common_hdinsight.go +++ b/azurerm/internal/services/hdinsight/common_hdinsight.go @@ -131,7 +131,6 @@ func hdinsightClusterUpdate(clusterKind string, readFunc schema.ReadFunc) schema UserName: utils.String(username), Password: utils.String(password), }) - if err != nil { return err } @@ -296,7 +295,6 @@ func createHDInsightEdgeNodes(ctx context.Context, client *hdinsight.Application func deleteHDInsightEdgeNodes(ctx context.Context, client *hdinsight.ApplicationsClient, resourceGroup string, name string) error { future, err := client.Delete(ctx, resourceGroup, name, name) - if err != nil { return fmt.Errorf("Error deleting edge nodes for HDInsight Hadoop Cluster %q (Resource Group %q): %+v", name, resourceGroup, err) } @@ -370,7 +368,8 @@ func flattenHDInsightMonitoring(monitor hdinsight.ClusterMonitoringResponse) []i map[string]string{ "log_analytics_workspace_id": *monitor.WorkspaceID, "primary_key": "*****", - }} + }, + } } return nil diff --git a/azurerm/internal/services/hdinsight/hdinsight.go b/azurerm/internal/services/hdinsight/hdinsight.go index 9699373d55f9..061fa3ca8685 100644 --- a/azurerm/internal/services/hdinsight/hdinsight.go +++ b/azurerm/internal/services/hdinsight/hdinsight.go @@ -525,7 +525,6 @@ func ExpandHDInsightsStorageAccounts(storageAccounts []interface{}, gen2storageA isDefault := v["is_default"].(bool) uri, err := url.Parse(storageContainerID) - if err != nil { return nil, nil, fmt.Errorf("Error parsing %q: %s", storageContainerID, err) } diff --git a/azurerm/internal/services/hdinsight/registration.go b/azurerm/internal/services/hdinsight/registration.go index 91804ab3788c..f0fdf35a8f24 100644 --- a/azurerm/internal/services/hdinsight/registration.go +++ b/azurerm/internal/services/hdinsight/registration.go @@ -35,5 +35,6 @@ func (r Registration) SupportedResources() map[string]*schema.Resource { "azurerm_hdinsight_ml_services_cluster": resourceArmHDInsightMLServicesCluster(), "azurerm_hdinsight_rserver_cluster": resourceArmHDInsightRServerCluster(), "azurerm_hdinsight_spark_cluster": resourceArmHDInsightSparkCluster(), - "azurerm_hdinsight_storm_cluster": resourceArmHDInsightStormCluster()} + "azurerm_hdinsight_storm_cluster": resourceArmHDInsightStormCluster(), + } } diff --git a/azurerm/internal/services/hdinsight/tests/common_hdinsight_test.go b/azurerm/internal/services/hdinsight/tests/common_hdinsight_test.go index 2fa5b13752f0..6d073fbe15e0 100644 --- a/azurerm/internal/services/hdinsight/tests/common_hdinsight_test.go +++ b/azurerm/internal/services/hdinsight/tests/common_hdinsight_test.go @@ -23,7 +23,6 @@ func testCheckAzureRMHDInsightClusterDestroy(terraformResourceName string) func( name := rs.Primary.Attributes["name"] resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { return err diff --git a/azurerm/internal/services/healthcare/healthcare_service_resource.go b/azurerm/internal/services/healthcare/healthcare_service_resource.go index c1732076b2f6..02da9523a992 100644 --- a/azurerm/internal/services/healthcare/healthcare_service_resource.go +++ b/azurerm/internal/services/healthcare/healthcare_service_resource.go @@ -137,7 +137,8 @@ func resourceArmHealthcareService() *schema.Resource { "MERGE", "POST", "OPTIONS", - "PUT"}, false), + "PUT", + }, false), }, }, "max_age_in_seconds": { diff --git a/azurerm/internal/services/iotcentral/validate/iotcentral_app_test.go b/azurerm/internal/services/iotcentral/validate/iotcentral_app_test.go index f9ce1cc36bdb..bc059b8f7cd1 100644 --- a/azurerm/internal/services/iotcentral/validate/iotcentral_app_test.go +++ b/azurerm/internal/services/iotcentral/validate/iotcentral_app_test.go @@ -60,7 +60,8 @@ func TestIotCentralAppName(t *testing.T) { { Value: "abcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcde123", Error: false, - }, { + }, + { Value: "a", Error: true, }, diff --git a/azurerm/internal/services/iothub/iothub_consumer_group_resource.go b/azurerm/internal/services/iothub/iothub_consumer_group_resource.go index bc8d9390c0e7..68668f7984b9 100644 --- a/azurerm/internal/services/iothub/iothub_consumer_group_resource.go +++ b/azurerm/internal/services/iothub/iothub_consumer_group_resource.go @@ -152,7 +152,6 @@ func resourceArmIotHubConsumerGroupDelete(d *schema.ResourceData, meta interface defer locks.UnlockByName(iotHubName, IothubResourceName) resp, err := client.DeleteEventHubConsumerGroup(ctx, resourceGroup, iotHubName, endpointName, name) - if err != nil { if !utils.ResponseWasNotFound(resp) { return fmt.Errorf("Error deleting Consumer Group %q (Endpoint %q / IoTHub %q / Resource Group %q): %+v", name, endpointName, iotHubName, resourceGroup, err) diff --git a/azurerm/internal/services/iothub/iothub_endpoint_servicebus_queue_resource.go b/azurerm/internal/services/iothub/iothub_endpoint_servicebus_queue_resource.go index 5f5bf3ba7881..3ccef8381b28 100644 --- a/azurerm/internal/services/iothub/iothub_endpoint_servicebus_queue_resource.go +++ b/azurerm/internal/services/iothub/iothub_endpoint_servicebus_queue_resource.go @@ -156,7 +156,6 @@ func resourceArmIotHubEndpointServiceBusQueueRead(d *schema.ResourceData, meta i defer cancel() parsedIothubEndpointId, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { return err } @@ -197,7 +196,6 @@ func resourceArmIotHubEndpointServiceBusQueueDelete(d *schema.ResourceData, meta defer cancel() parsedIothubEndpointId, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { return err } diff --git a/azurerm/internal/services/iothub/iothub_endpoint_servicebus_topic_resource.go b/azurerm/internal/services/iothub/iothub_endpoint_servicebus_topic_resource.go index b38b3737b7ba..dbb2d3eb90af 100644 --- a/azurerm/internal/services/iothub/iothub_endpoint_servicebus_topic_resource.go +++ b/azurerm/internal/services/iothub/iothub_endpoint_servicebus_topic_resource.go @@ -156,7 +156,6 @@ func resourceArmIotHubEndpointServiceBusTopicRead(d *schema.ResourceData, meta i defer cancel() parsedIothubEndpointId, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { return err } @@ -197,7 +196,6 @@ func resourceArmIotHubEndpointServiceBusTopicDelete(d *schema.ResourceData, meta defer cancel() parsedIothubEndpointId, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { return err } diff --git a/azurerm/internal/services/iothub/iothub_fallback_route_resource.go b/azurerm/internal/services/iothub/iothub_fallback_route_resource.go index d72cbb956915..2f0eabe2c9ef 100644 --- a/azurerm/internal/services/iothub/iothub_fallback_route_resource.go +++ b/azurerm/internal/services/iothub/iothub_fallback_route_resource.go @@ -159,7 +159,6 @@ func resourceArmIotHubFallbackRouteDelete(d *schema.ResourceData, meta interface defer cancel() parsedIothubRouteId, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { return err } diff --git a/azurerm/internal/services/iothub/iothub_resource.go b/azurerm/internal/services/iothub/iothub_resource.go index 48d992a3daa8..767efcce58e2 100644 --- a/azurerm/internal/services/iothub/iothub_resource.go +++ b/azurerm/internal/services/iothub/iothub_resource.go @@ -1139,6 +1139,7 @@ func validateIoTHubFileNameFormat(v interface{}, k string) (warnings []string, e return warnings, errors } + func expandIPFilterRules(d *schema.ResourceData) *[]devices.IPFilterRule { ipFilterRuleList := d.Get("ip_filter_rule").(*schema.Set).List() if len(ipFilterRuleList) == 0 { diff --git a/azurerm/internal/services/iothub/iothub_shared_access_policy_data_source.go b/azurerm/internal/services/iothub/iothub_shared_access_policy_data_source.go index 5482e485016e..15fdd391d88d 100644 --- a/azurerm/internal/services/iothub/iothub_shared_access_policy_data_source.go +++ b/azurerm/internal/services/iothub/iothub_shared_access_policy_data_source.go @@ -64,6 +64,7 @@ func dataSourceArmIotHubSharedAccessPolicy() *schema.Resource { }, } } + func dataSourceArmIotHubSharedAccessPolicyRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).IoTHub.ResourceClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) diff --git a/azurerm/internal/services/iothub/iothub_shared_access_policy_resource.go b/azurerm/internal/services/iothub/iothub_shared_access_policy_resource.go index ec98e5199158..5d2f0cf7407f 100644 --- a/azurerm/internal/services/iothub/iothub_shared_access_policy_resource.go +++ b/azurerm/internal/services/iothub/iothub_shared_access_policy_resource.go @@ -211,7 +211,6 @@ func resourceArmIotHubSharedAccessPolicyRead(d *schema.ResourceData, meta interf defer cancel() parsedIothubSAPId, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { return err } @@ -264,7 +263,6 @@ func resourceArmIotHubSharedAccessPolicyDelete(d *schema.ResourceData, meta inte defer cancel() parsedIothubSAPId, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { return err } @@ -320,7 +318,7 @@ type accessRights struct { } func expandAccessRights(d *schema.ResourceData) string { - var possibleAccessRights = []struct { + possibleAccessRights := []struct { schema string right string }{ diff --git a/azurerm/internal/services/iothub/registration.go b/azurerm/internal/services/iothub/registration.go index b01c1d4d7a93..4e2ef68f33b5 100644 --- a/azurerm/internal/services/iothub/registration.go +++ b/azurerm/internal/services/iothub/registration.go @@ -41,5 +41,6 @@ func (r Registration) SupportedResources() map[string]*schema.Resource { "azurerm_iothub_endpoint_servicebus_queue": resourceArmIotHubEndpointServiceBusQueue(), "azurerm_iothub_endpoint_servicebus_topic": resourceArmIotHubEndpointServiceBusTopic(), "azurerm_iothub_endpoint_storage_container": resourceArmIotHubEndpointStorageContainer(), - "azurerm_iothub_shared_access_policy": resourceArmIotHubSharedAccessPolicy()} + "azurerm_iothub_shared_access_policy": resourceArmIotHubSharedAccessPolicy(), + } } diff --git a/azurerm/internal/services/iothub/tests/iothub_consumer_group_resource_test.go b/azurerm/internal/services/iothub/tests/iothub_consumer_group_resource_test.go index d8b123457560..6e6974cb6a9d 100644 --- a/azurerm/internal/services/iothub/tests/iothub_consumer_group_resource_test.go +++ b/azurerm/internal/services/iothub/tests/iothub_consumer_group_resource_test.go @@ -107,7 +107,6 @@ func testCheckAzureRMIotHubConsumerGroupDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.GetEventHubConsumerGroup(ctx, resourceGroup, iotHubName, endpointName, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/iothub/tests/iothub_dps_certificate_resource_test.go b/azurerm/internal/services/iothub/tests/iothub_dps_certificate_resource_test.go index ceb782fc658c..0744cdda2d3a 100644 --- a/azurerm/internal/services/iothub/tests/iothub_dps_certificate_resource_test.go +++ b/azurerm/internal/services/iothub/tests/iothub_dps_certificate_resource_test.go @@ -92,7 +92,6 @@ func testCheckAzureRMIotHubDPSCertificateDestroy(s *terraform.State) error { iotDPSName := rs.Primary.Attributes["iot_dps_name"] resp, err := client.Get(ctx, name, resourceGroup, iotDPSName, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/iothub/tests/iothub_dps_resource_test.go b/azurerm/internal/services/iothub/tests/iothub_dps_resource_test.go index 8d5c7145a288..71e53a07f21d 100644 --- a/azurerm/internal/services/iothub/tests/iothub_dps_resource_test.go +++ b/azurerm/internal/services/iothub/tests/iothub_dps_resource_test.go @@ -121,7 +121,6 @@ func testCheckAzureRMIotHubDPSDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/iothub/tests/iothub_resource_test.go b/azurerm/internal/services/iothub/tests/iothub_resource_test.go index 42ed6ed521fc..1f9179e70615 100644 --- a/azurerm/internal/services/iothub/tests/iothub_resource_test.go +++ b/azurerm/internal/services/iothub/tests/iothub_resource_test.go @@ -254,7 +254,6 @@ func testCheckAzureRMIotHubDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/iottimeseriesinsights/tests/resource_iot_time_series_insights_access_policy_test.go b/azurerm/internal/services/iottimeseriesinsights/tests/resource_iot_time_series_insights_access_policy_test.go index ddee0ab06387..9a7f05ad6d42 100644 --- a/azurerm/internal/services/iottimeseriesinsights/tests/resource_iot_time_series_insights_access_policy_test.go +++ b/azurerm/internal/services/iottimeseriesinsights/tests/resource_iot_time_series_insights_access_policy_test.go @@ -103,7 +103,6 @@ func testCheckAzureRMIoTTimeSeriesInsightsAccessPolicyDestroy(s *terraform.State return err } resp, err := client.Get(ctx, id.ResourceGroup, id.EnvironmentName, id.Name) - if err != nil { return nil } diff --git a/azurerm/internal/services/iottimeseriesinsights/tests/resource_iot_time_series_insights_reference_data_set_test.go b/azurerm/internal/services/iottimeseriesinsights/tests/resource_iot_time_series_insights_reference_data_set_test.go index f48adf0cc231..aaa7a66318b8 100644 --- a/azurerm/internal/services/iottimeseriesinsights/tests/resource_iot_time_series_insights_reference_data_set_test.go +++ b/azurerm/internal/services/iottimeseriesinsights/tests/resource_iot_time_series_insights_reference_data_set_test.go @@ -108,7 +108,6 @@ func testCheckAzureRMIoTTimeSeriesInsightsReferenceDataSetDestroy(s *terraform.S return err } resp, err := client.Get(ctx, id.ResourceGroup, id.EnvironmentName, id.Name) - if err != nil { return nil } diff --git a/azurerm/internal/services/iottimeseriesinsights/tests/resource_iot_time_series_insights_standard_environment_test.go b/azurerm/internal/services/iottimeseriesinsights/tests/resource_iot_time_series_insights_standard_environment_test.go index 709362d57d8f..90f00a182aca 100644 --- a/azurerm/internal/services/iottimeseriesinsights/tests/resource_iot_time_series_insights_standard_environment_test.go +++ b/azurerm/internal/services/iottimeseriesinsights/tests/resource_iot_time_series_insights_standard_environment_test.go @@ -127,7 +127,6 @@ func testCheckAzureRMIoTTimeSeriesInsightsStandardEnvironmentDestroy(s *terrafor return err } resp, err := client.Get(ctx, id.ResourceGroup, id.Name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/keyvault/key_vault_access_policy_resource.go b/azurerm/internal/services/keyvault/key_vault_access_policy_resource.go index c6125cb48c13..eab5e973bb9a 100644 --- a/azurerm/internal/services/keyvault/key_vault_access_policy_resource.go +++ b/azurerm/internal/services/keyvault/key_vault_access_policy_resource.go @@ -262,7 +262,6 @@ func resourceArmKeyVaultAccessPolicyRead(d *schema.ResourceData, meta interface{ defer cancel() id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { return err } diff --git a/azurerm/internal/services/keyvault/key_vault_migration_test_resource.go b/azurerm/internal/services/keyvault/key_vault_migration_test_resource.go index 34b92ff2b0b8..72fe6ebfff9a 100644 --- a/azurerm/internal/services/keyvault/key_vault_migration_test_resource.go +++ b/azurerm/internal/services/keyvault/key_vault_migration_test_resource.go @@ -366,7 +366,6 @@ func TestKeyVaultMigrateState(t *testing.T) { Attributes: tc.Attributes, } is, err := resourceAzureRMKeyVaultMigrateState(tc.StateVersion, is, tc.Meta) - if err != nil { t.Fatalf("bad: %q, err: %+v", tn, err) } diff --git a/azurerm/internal/services/keyvault/key_vault_resource.go b/azurerm/internal/services/keyvault/key_vault_resource.go index 803ce3587d4b..f4eff6aecd37 100644 --- a/azurerm/internal/services/keyvault/key_vault_resource.go +++ b/azurerm/internal/services/keyvault/key_vault_resource.go @@ -797,7 +797,7 @@ func keyVaultRefreshFunc(vaultUri string) resource.StateRefreshFunc { return func() (interface{}, string, error) { log.Printf("[DEBUG] Checking to see if KeyVault %q is available..", vaultUri) - var PTransport = &http.Transport{Proxy: http.ProxyFromEnvironment} + PTransport := &http.Transport{Proxy: http.ProxyFromEnvironment} client := &http.Client{ Transport: PTransport, diff --git a/azurerm/internal/services/keyvault/key_vault_secret_resource.go b/azurerm/internal/services/keyvault/key_vault_secret_resource.go index 536af3cef9f6..1f65a3c3b75a 100644 --- a/azurerm/internal/services/keyvault/key_vault_secret_resource.go +++ b/azurerm/internal/services/keyvault/key_vault_secret_resource.go @@ -372,7 +372,7 @@ func keyVaultChildItemRefreshFunc(secretUri string) resource.StateRefreshFunc { return func() (interface{}, string, error) { log.Printf("[DEBUG] Checking to see if KeyVault Secret %q is available..", secretUri) - var PTransport = &http.Transport{Proxy: http.ProxyFromEnvironment} + PTransport := &http.Transport{Proxy: http.ProxyFromEnvironment} client := &http.Client{ Transport: PTransport, diff --git a/azurerm/internal/services/keyvault/tests/key_vault_access_policy_resource_test.go b/azurerm/internal/services/keyvault/tests/key_vault_access_policy_resource_test.go index b48161b22b97..ccd8f9d36991 100644 --- a/azurerm/internal/services/keyvault/tests/key_vault_access_policy_resource_test.go +++ b/azurerm/internal/services/keyvault/tests/key_vault_access_policy_resource_test.go @@ -158,7 +158,6 @@ func testCheckAzureRMKeyVaultAccessPolicyExists(resourceName string) resource.Te } id, err := azure.ParseAzureResourceID(rs.Primary.ID) - if err != nil { return err } diff --git a/azurerm/internal/services/kusto/kusto_attached_database_configuration.go b/azurerm/internal/services/kusto/kusto_attached_database_configuration.go index edb5ec3ffb99..9541acf64a9e 100644 --- a/azurerm/internal/services/kusto/kusto_attached_database_configuration.go +++ b/azurerm/internal/services/kusto/kusto_attached_database_configuration.go @@ -152,7 +152,6 @@ func resourceArmKustoAttachedDatabaseConfigurationRead(d *schema.ResourceData, m } configuration, err := client.Get(ctx, id.ResourceGroup, id.Cluster, id.Name) - if err != nil { if utils.ResponseWasNotFound(configuration.Response) { d.SetId("") diff --git a/azurerm/internal/services/kusto/kusto_cluster_resource.go b/azurerm/internal/services/kusto/kusto_cluster_resource.go index a0537a7500ba..155b9d96014b 100644 --- a/azurerm/internal/services/kusto/kusto_cluster_resource.go +++ b/azurerm/internal/services/kusto/kusto_cluster_resource.go @@ -353,7 +353,6 @@ func resourceArmKustoClusterRead(d *schema.ResourceData, meta interface{}) error } clusterResponse, err := client.Get(ctx, id.ResourceGroup, id.Name) - if err != nil { if utils.ResponseWasNotFound(clusterResponse.Response) { d.SetId("") diff --git a/azurerm/internal/services/kusto/kusto_eventhub_data_connection_resource.go b/azurerm/internal/services/kusto/kusto_eventhub_data_connection_resource.go index 0737b046fb88..7400e7db304f 100644 --- a/azurerm/internal/services/kusto/kusto_eventhub_data_connection_resource.go +++ b/azurerm/internal/services/kusto/kusto_eventhub_data_connection_resource.go @@ -194,7 +194,6 @@ func resourceArmKustoEventHubDataConnectionRead(d *schema.ResourceData, meta int } connectionModel, err := client.Get(ctx, id.ResourceGroup, id.Cluster, id.Database, id.Name) - if err != nil { if utils.ResponseWasNotFound(connectionModel.Response) { d.SetId("") diff --git a/azurerm/internal/services/kusto/tests/kusto_attached_database_configuration_resource_test.go b/azurerm/internal/services/kusto/tests/kusto_attached_database_configuration_resource_test.go index 1ea469646761..bda2f3373b4e 100644 --- a/azurerm/internal/services/kusto/tests/kusto_attached_database_configuration_resource_test.go +++ b/azurerm/internal/services/kusto/tests/kusto_attached_database_configuration_resource_test.go @@ -95,7 +95,6 @@ func testCheckAzureRMKustoAttachedDatabaseConfigurationDestroy(s *terraform.Stat name := rs.Primary.Attributes["name"] resp, err := client.Get(ctx, resourceGroup, clusterName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/kusto/tests/kusto_cluster_principal_assignment_resource_test.go b/azurerm/internal/services/kusto/tests/kusto_cluster_principal_assignment_resource_test.go index d716ea614618..f968f3ad8d49 100644 --- a/azurerm/internal/services/kusto/tests/kusto_cluster_principal_assignment_resource_test.go +++ b/azurerm/internal/services/kusto/tests/kusto_cluster_principal_assignment_resource_test.go @@ -44,7 +44,6 @@ func testCheckAzureRMKustoClusterPrincipalAssignmentDestroy(s *terraform.State) name := rs.Primary.Attributes["name"] resp, err := client.Get(ctx, resourceGroup, clusterName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/kusto/tests/kusto_cluster_resource_test.go b/azurerm/internal/services/kusto/tests/kusto_cluster_resource_test.go index 78d8b741e8b1..110b5b49962f 100644 --- a/azurerm/internal/services/kusto/tests/kusto_cluster_resource_test.go +++ b/azurerm/internal/services/kusto/tests/kusto_cluster_resource_test.go @@ -657,7 +657,6 @@ func testCheckAzureRMKustoClusterDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/kusto/tests/kusto_database_principal_assignment_resource_test.go b/azurerm/internal/services/kusto/tests/kusto_database_principal_assignment_resource_test.go index 783eceb75649..7ce1ded29959 100644 --- a/azurerm/internal/services/kusto/tests/kusto_database_principal_assignment_resource_test.go +++ b/azurerm/internal/services/kusto/tests/kusto_database_principal_assignment_resource_test.go @@ -64,7 +64,6 @@ func testCheckAzureRMKustoDatabasePrincipalAssignmentDestroy(s *terraform.State) name := rs.Primary.Attributes["name"] resp, err := client.Get(ctx, resourceGroup, clusterName, databaseName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/kusto/tests/kusto_database_resource_test.go b/azurerm/internal/services/kusto/tests/kusto_database_resource_test.go index 99768244227e..aa3f948cfcda 100644 --- a/azurerm/internal/services/kusto/tests/kusto_database_resource_test.go +++ b/azurerm/internal/services/kusto/tests/kusto_database_resource_test.go @@ -259,7 +259,6 @@ func testCheckAzureRMKustoDatabaseDestroy(s *terraform.State) error { name := rs.Primary.Attributes["name"] resp, err := client.Get(ctx, resourceGroup, clusterName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/kusto/tests/kusto_eventhub_data_connection_resource_test.go b/azurerm/internal/services/kusto/tests/kusto_eventhub_data_connection_resource_test.go index bee728cc7eaf..a6a2f1e8b045 100644 --- a/azurerm/internal/services/kusto/tests/kusto_eventhub_data_connection_resource_test.go +++ b/azurerm/internal/services/kusto/tests/kusto_eventhub_data_connection_resource_test.go @@ -109,7 +109,6 @@ func testCheckAzureRMKustoEventHubDataConnectionDestroy(s *terraform.State) erro name := rs.Primary.Attributes["name"] resp, err := client.Get(ctx, resourceGroup, clusterName, databaseName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/lighthouse/tests/resource_arm_lighthouse_assignment_test.go b/azurerm/internal/services/lighthouse/tests/resource_arm_lighthouse_assignment_test.go index b0113adc7555..62a2c0b616c7 100644 --- a/azurerm/internal/services/lighthouse/tests/resource_arm_lighthouse_assignment_test.go +++ b/azurerm/internal/services/lighthouse/tests/resource_arm_lighthouse_assignment_test.go @@ -100,7 +100,6 @@ func testCheckAzureRMLighthouseAssignmentExists(resourceName string) resource.Te expandLighthouseDefinition := true resp, err := client.Get(ctx, scope, lighthouseAssignmentName, &expandLighthouseDefinition) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return fmt.Errorf("Bad: Lighthouse Assignment %q (Scope: %q) does not exist", lighthouseAssignmentName, scope) @@ -126,7 +125,6 @@ func testCheckAzureRMLighthouseAssignmentDestroy(s *terraform.State) error { expandLighthouseDefinition := true resp, err := client.Get(ctx, scope, lighthouseAssignmentName, &expandLighthouseDefinition) - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { return err diff --git a/azurerm/internal/services/lighthouse/tests/resource_arm_lighthouse_definition_test.go b/azurerm/internal/services/lighthouse/tests/resource_arm_lighthouse_definition_test.go index 75c75fad2263..efa8eb5450f6 100644 --- a/azurerm/internal/services/lighthouse/tests/resource_arm_lighthouse_definition_test.go +++ b/azurerm/internal/services/lighthouse/tests/resource_arm_lighthouse_definition_test.go @@ -158,7 +158,6 @@ func testCheckAzureRMLighthouseDefinitionExists(resourceName string) resource.Te lighthouseDefinitionID := rs.Primary.Attributes["lighthouse_definition_id"] resp, err := client.Get(ctx, scope, lighthouseDefinitionID) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return fmt.Errorf("Bad: Lighthouse Definition %q (Scope: %q) does not exist", lighthouseDefinitionID, scope) @@ -183,7 +182,6 @@ func testCheckAzureRMLighthouseDefinitionDestroy(s *terraform.State) error { lighthouseDefinitionID := rs.Primary.Attributes["lighthouse_definition_id"] resp, err := client.Get(ctx, scope, lighthouseDefinitionID) - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { return err diff --git a/azurerm/internal/services/loganalytics/log_analytics_storage_insights_resource.go b/azurerm/internal/services/loganalytics/log_analytics_storage_insights_resource.go index a715ec81f07b..97f556ea7db9 100644 --- a/azurerm/internal/services/loganalytics/log_analytics_storage_insights_resource.go +++ b/azurerm/internal/services/loganalytics/log_analytics_storage_insights_resource.go @@ -93,6 +93,7 @@ func resourceArmLogAnalyticsStorageInsights() *schema.Resource { }, } } + func resourceArmLogAnalyticsStorageInsightsCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).LogAnalytics.StorageInsightsClient subscriptionId := meta.(*clients.Client).Account.SubscriptionId diff --git a/azurerm/internal/services/loganalytics/registration.go b/azurerm/internal/services/loganalytics/registration.go index 41e329acf8dc..22b39b4c3f07 100644 --- a/azurerm/internal/services/loganalytics/registration.go +++ b/azurerm/internal/services/loganalytics/registration.go @@ -21,7 +21,8 @@ func (r Registration) WebsiteCategories() []string { // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ - "azurerm_log_analytics_workspace": dataSourceLogAnalyticsWorkspace()} + "azurerm_log_analytics_workspace": dataSourceLogAnalyticsWorkspace(), + } } // SupportedResources returns the supported Resources supported by this Service diff --git a/azurerm/internal/services/loganalytics/tests/log_analytics_saved_search_resource_test.go b/azurerm/internal/services/loganalytics/tests/log_analytics_saved_search_resource_test.go index 6a00ff40ca16..ba54b6ea073e 100644 --- a/azurerm/internal/services/loganalytics/tests/log_analytics_saved_search_resource_test.go +++ b/azurerm/internal/services/loganalytics/tests/log_analytics_saved_search_resource_test.go @@ -106,7 +106,6 @@ func testCheckAzureRMLogAnalyticsSavedSearchDestroy(s *terraform.State) error { } resp, err := conn.Get(ctx, id.ResourceGroup, id.WorkspaceName, id.Name) - if err != nil { return nil } diff --git a/azurerm/internal/services/loganalytics/tests/log_analytics_solution_resource_test.go b/azurerm/internal/services/loganalytics/tests/log_analytics_solution_resource_test.go index fdbcdcd69f58..9a4af86f27b9 100644 --- a/azurerm/internal/services/loganalytics/tests/log_analytics_solution_resource_test.go +++ b/azurerm/internal/services/loganalytics/tests/log_analytics_solution_resource_test.go @@ -81,7 +81,6 @@ func testCheckAzureRMLogAnalyticsSolutionDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/loganalytics/tests/log_analytics_workspace_resource_test.go b/azurerm/internal/services/loganalytics/tests/log_analytics_workspace_resource_test.go index 7c5cdc07ee68..22e8e95ec92a 100644 --- a/azurerm/internal/services/loganalytics/tests/log_analytics_workspace_resource_test.go +++ b/azurerm/internal/services/loganalytics/tests/log_analytics_workspace_resource_test.go @@ -266,7 +266,6 @@ func testCheckAzureRMLogAnalyticsWorkspaceDestroy(s *terraform.State) error { } resp, err := conn.Get(ctx, id.ResourceGroup, id.Name) - if err != nil { return nil } @@ -307,6 +306,7 @@ func testCheckAzureRMLogAnalyticsWorkspaceExists(resourceName string) resource.T return nil } } + func testAccAzureRMLogAnalyticsWorkspace_basic(data acceptance.TestData) string { return fmt.Sprintf(` provider "azurerm" { diff --git a/azurerm/internal/services/logic/integration_service_environment.go b/azurerm/internal/services/logic/integration_service_environment.go index fff593f6f048..320f7d0e04ff 100644 --- a/azurerm/internal/services/logic/integration_service_environment.go +++ b/azurerm/internal/services/logic/integration_service_environment.go @@ -457,7 +457,6 @@ func serviceAssociationLinkExists(ctx context.Context, client *network.ServiceAs } resp, err := client.List(ctx, id.ResourceGroup, id.VirtualNetworkName, id.Name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return false, nil @@ -486,7 +485,6 @@ func resourceNavigationLinkExists(ctx context.Context, client *network.ResourceN } resp, err := client.List(ctx, id.ResourceGroup, id.VirtualNetworkName, id.Name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return false, nil diff --git a/azurerm/internal/services/logic/logic_app_integration_account_resource.go b/azurerm/internal/services/logic/logic_app_integration_account_resource.go index 5d6ae6c17889..3d9cae89b5cf 100644 --- a/azurerm/internal/services/logic/logic_app_integration_account_resource.go +++ b/azurerm/internal/services/logic/logic_app_integration_account_resource.go @@ -64,6 +64,7 @@ func resourceArmLogicAppIntegrationAccount() *schema.Resource { }, } } + func resourceArmLogicAppIntegrationAccountCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Logic.IntegrationAccountClient ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) diff --git a/azurerm/internal/services/logic/logic_app_workflow_data_source.go b/azurerm/internal/services/logic/logic_app_workflow_data_source.go index 90bb837f3b29..9f38044a4ee6 100644 --- a/azurerm/internal/services/logic/logic_app_workflow_data_source.go +++ b/azurerm/internal/services/logic/logic_app_workflow_data_source.go @@ -86,6 +86,7 @@ func dataSourceArmLogicAppWorkflow() *schema.Resource { }, } } + func dataSourceArmLogicAppWorkflowRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Logic.WorkflowClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) diff --git a/azurerm/internal/services/logic/logic_apps.go b/azurerm/internal/services/logic/logic_apps.go index 1d4b8f80dc4d..fd9414b98cf6 100644 --- a/azurerm/internal/services/logic/logic_apps.go +++ b/azurerm/internal/services/logic/logic_apps.go @@ -29,6 +29,7 @@ func flattenLogicAppActionRunAfter(input map[string]interface{}) []interface{} { return output } + func expandLogicAppActionRunAfter(input []interface{}) map[string]interface{} { if len(input) == 0 { return nil diff --git a/azurerm/internal/services/logic/tests/logic_app_workflow_resource_test.go b/azurerm/internal/services/logic/tests/logic_app_workflow_resource_test.go index 4e8bddce2a61..05d683de1ce5 100644 --- a/azurerm/internal/services/logic/tests/logic_app_workflow_resource_test.go +++ b/azurerm/internal/services/logic/tests/logic_app_workflow_resource_test.go @@ -190,7 +190,6 @@ func testCheckAzureRMLogicAppWorkflowDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/logic/validate/logic_test.go b/azurerm/internal/services/logic/validate/logic_test.go index 4f31a8b7cd25..b4d103315f42 100644 --- a/azurerm/internal/services/logic/validate/logic_test.go +++ b/azurerm/internal/services/logic/validate/logic_test.go @@ -49,7 +49,7 @@ func TestIntegrationAccountName(t *testing.T) { valid: true, }, } - var validationFunction = IntegrationAccountName() + validationFunction := IntegrationAccountName() for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { _, err := validationFunction(tt.input, "") @@ -118,7 +118,7 @@ func TestIntegrationServiceEnvironmentName(t *testing.T) { valid: true, }, } - var validationFunction = IntegrationServiceEnvironmentName() + validationFunction := IntegrationServiceEnvironmentName() for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { _, err := validationFunction(tt.input, "") diff --git a/azurerm/internal/services/maintenance/maintenance_assignment_dedicated_host_resource.go b/azurerm/internal/services/maintenance/maintenance_assignment_dedicated_host_resource.go index 17e111878a50..80f44160ecf9 100644 --- a/azurerm/internal/services/maintenance/maintenance_assignment_dedicated_host_resource.go +++ b/azurerm/internal/services/maintenance/maintenance_assignment_dedicated_host_resource.go @@ -163,7 +163,6 @@ func resourceArmMaintenanceAssignmentDedicatedHostDelete(d *schema.ResourceData, func getMaintenanceAssignmentDedicatedHost(ctx context.Context, client *maintenance.ConfigurationAssignmentsClient, id *parseCompute.DedicatedHostId, dedicatedHostId string) (result maintenance.ConfigurationAssignment, err error) { resp, err := client.ListParent(ctx, id.ResourceGroup, "Microsoft.Compute", "hostGroups", id.HostGroup, "hosts", id.Name) - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { err = fmt.Errorf("checking for presence of existing Maintenance assignment (Dedicated Host ID %q): %+v", dedicatedHostId, err) diff --git a/azurerm/internal/services/maintenance/maintenance_assignment_virtual_machine_resource.go b/azurerm/internal/services/maintenance/maintenance_assignment_virtual_machine_resource.go index 27ed274b9bd3..5457f36c6feb 100644 --- a/azurerm/internal/services/maintenance/maintenance_assignment_virtual_machine_resource.go +++ b/azurerm/internal/services/maintenance/maintenance_assignment_virtual_machine_resource.go @@ -163,7 +163,6 @@ func resourceArmMaintenanceAssignmentVirtualMachineDelete(d *schema.ResourceData func getMaintenanceAssignmentVirtualMachine(ctx context.Context, client *maintenance.ConfigurationAssignmentsClient, id *parseCompute.VirtualMachineId, virtualMachineId string) (result maintenance.ConfigurationAssignment, err error) { resp, err := client.List(ctx, id.ResourceGroup, "Microsoft.Compute", "virtualMachines", id.Name) - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { err = fmt.Errorf("checking for presence of existing Maintenance assignment (virtual machine ID: %q): %+v", virtualMachineId, err) diff --git a/azurerm/internal/services/managementgroup/tests/management_group_resource_test.go b/azurerm/internal/services/managementgroup/tests/management_group_resource_test.go index 25ab059fcb1c..5e9d116083eb 100644 --- a/azurerm/internal/services/managementgroup/tests/management_group_resource_test.go +++ b/azurerm/internal/services/managementgroup/tests/management_group_resource_test.go @@ -240,7 +240,6 @@ func testCheckAzureRMManagementGroupDestroy(s *terraform.State) error { name := rs.Primary.Attributes["group_id"] recurse := false resp, err := client.Get(ctx, name, "", &recurse, "", "no-cache") - if err != nil { return nil } diff --git a/azurerm/internal/services/mariadb/mariadb_virtual_network_rule_resource.go b/azurerm/internal/services/mariadb/mariadb_virtual_network_rule_resource.go index cf4f586a51d3..e432ccb81a8a 100644 --- a/azurerm/internal/services/mariadb/mariadb_virtual_network_rule_resource.go +++ b/azurerm/internal/services/mariadb/mariadb_virtual_network_rule_resource.go @@ -196,7 +196,6 @@ func resourceArmMariaDbVirtualNetworkRuleDelete(d *schema.ResourceData, meta int func mariaDbVirtualNetworkStateStatusCodeRefreshFunc(ctx context.Context, client *mariadb.VirtualNetworkRulesClient, resourceGroup string, serverName string, name string) resource.StateRefreshFunc { return func() (interface{}, string, error) { resp, err := client.Get(ctx, resourceGroup, serverName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { log.Printf("[DEBUG] Retrieving MariaDb Virtual Network Rule %q (MariaDb Server: %q, Resource Group: %q) returned 404.", resourceGroup, serverName, name) diff --git a/azurerm/internal/services/mariadb/registration.go b/azurerm/internal/services/mariadb/registration.go index 0b7789a86de3..186161389ea2 100644 --- a/azurerm/internal/services/mariadb/registration.go +++ b/azurerm/internal/services/mariadb/registration.go @@ -32,5 +32,6 @@ func (r Registration) SupportedResources() map[string]*schema.Resource { "azurerm_mariadb_database": resourceArmMariaDbDatabase(), "azurerm_mariadb_firewall_rule": resourceArmMariaDBFirewallRule(), "azurerm_mariadb_server": resourceArmMariaDbServer(), - "azurerm_mariadb_virtual_network_rule": resourceArmMariaDbVirtualNetworkRule()} + "azurerm_mariadb_virtual_network_rule": resourceArmMariaDbVirtualNetworkRule(), + } } diff --git a/azurerm/internal/services/mariadb/tests/mariadb_configuration_resource_test.go b/azurerm/internal/services/mariadb/tests/mariadb_configuration_resource_test.go index ac2c0ab8d3ba..f8c77c7ec886 100644 --- a/azurerm/internal/services/mariadb/tests/mariadb_configuration_resource_test.go +++ b/azurerm/internal/services/mariadb/tests/mariadb_configuration_resource_test.go @@ -165,7 +165,6 @@ func testCheckAzureRMMariaDbConfigurationDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, serverName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/mariadb/tests/mariadb_firewall_rule_resource_test.go b/azurerm/internal/services/mariadb/tests/mariadb_firewall_rule_resource_test.go index 4422f8c84f66..db33b06dbf8c 100644 --- a/azurerm/internal/services/mariadb/tests/mariadb_firewall_rule_resource_test.go +++ b/azurerm/internal/services/mariadb/tests/mariadb_firewall_rule_resource_test.go @@ -96,7 +96,6 @@ func testCheckAzureRMMariaDbFirewallRuleDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, serverName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/media/tests/media_services_account_resource_test.go b/azurerm/internal/services/media/tests/media_services_account_resource_test.go index 0ad8c34292a4..927f8429cf5e 100644 --- a/azurerm/internal/services/media/tests/media_services_account_resource_test.go +++ b/azurerm/internal/services/media/tests/media_services_account_resource_test.go @@ -114,7 +114,6 @@ func testCheckAzureRMMediaServicesAccountDestroy(s *terraform.State) error { return err } resp, err := conn.Get(ctx, id.ResourceGroup, id.Name) - if err != nil { return nil } diff --git a/azurerm/internal/services/mixedreality/tests/spatial_anchors_account_resource_test.go b/azurerm/internal/services/mixedreality/tests/spatial_anchors_account_resource_test.go index 0d109a6368e5..c4a240d6949b 100644 --- a/azurerm/internal/services/mixedreality/tests/spatial_anchors_account_resource_test.go +++ b/azurerm/internal/services/mixedreality/tests/spatial_anchors_account_resource_test.go @@ -96,7 +96,6 @@ func testCheckAzureRMSpatialAnchorsAccountDestroy(s *terraform.State) error { return err } resp, err := client.Get(ctx, id.ResourceGroup, id.Name) - if err != nil { return nil } diff --git a/azurerm/internal/services/monitor/registration.go b/azurerm/internal/services/monitor/registration.go index 81c3fa0e8179..b84a39b8704f 100644 --- a/azurerm/internal/services/monitor/registration.go +++ b/azurerm/internal/services/monitor/registration.go @@ -25,7 +25,8 @@ func (r Registration) SupportedDataSources() map[string]*schema.Resource { "azurerm_monitor_diagnostic_categories": dataSourceArmMonitorDiagnosticCategories(), "azurerm_monitor_log_profile": dataSourceArmMonitorLogProfile(), "azurerm_monitor_scheduled_query_rules_alert": dataSourceArmMonitorScheduledQueryRulesAlert(), - "azurerm_monitor_scheduled_query_rules_log": dataSourceArmMonitorScheduledQueryRulesLog()} + "azurerm_monitor_scheduled_query_rules_log": dataSourceArmMonitorScheduledQueryRulesLog(), + } } // SupportedResources returns the supported Resources supported by this Service diff --git a/azurerm/internal/services/monitor/tests/monitor_action_group_resource_test.go b/azurerm/internal/services/monitor/tests/monitor_action_group_resource_test.go index 9e9df93d4195..49d0ca358916 100644 --- a/azurerm/internal/services/monitor/tests/monitor_action_group_resource_test.go +++ b/azurerm/internal/services/monitor/tests/monitor_action_group_resource_test.go @@ -985,7 +985,6 @@ func testCheckAzureRMMonitorActionGroupDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/monitor/tests/monitor_activity_log_alert_resource_test.go b/azurerm/internal/services/monitor/tests/monitor_activity_log_alert_resource_test.go index c21e408af764..b68eb7b78907 100644 --- a/azurerm/internal/services/monitor/tests/monitor_activity_log_alert_resource_test.go +++ b/azurerm/internal/services/monitor/tests/monitor_activity_log_alert_resource_test.go @@ -339,7 +339,6 @@ func testCheckAzureRMMonitorActivityLogAlertDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/monitor/tests/monitor_autoscale_setting_resource_test.go b/azurerm/internal/services/monitor/tests/monitor_autoscale_setting_resource_test.go index 66606edf7c01..5f9028303286 100644 --- a/azurerm/internal/services/monitor/tests/monitor_autoscale_setting_resource_test.go +++ b/azurerm/internal/services/monitor/tests/monitor_autoscale_setting_resource_test.go @@ -324,7 +324,6 @@ func testCheckAzureRMMonitorAutoScaleSettingDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/monitor/tests/monitor_scheduled_query_rules_alert_resource_test.go b/azurerm/internal/services/monitor/tests/monitor_scheduled_query_rules_alert_resource_test.go index f166d9cd4958..c5bd400e6567 100644 --- a/azurerm/internal/services/monitor/tests/monitor_scheduled_query_rules_alert_resource_test.go +++ b/azurerm/internal/services/monitor/tests/monitor_scheduled_query_rules_alert_resource_test.go @@ -332,7 +332,6 @@ func testCheckAzureRMMonitorScheduledQueryRules_AlertDestroy(s *terraform.State) resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/monitor/tests/monitor_scheduled_query_rules_log_resource_test.go b/azurerm/internal/services/monitor/tests/monitor_scheduled_query_rules_log_resource_test.go index 2fdb78e9124e..b359f86ddffe 100644 --- a/azurerm/internal/services/monitor/tests/monitor_scheduled_query_rules_log_resource_test.go +++ b/azurerm/internal/services/monitor/tests/monitor_scheduled_query_rules_log_resource_test.go @@ -219,7 +219,6 @@ func testCheckAzureRMMonitorScheduledQueryRules_LogDestroy(s *terraform.State) e resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/msi/tests/user_assigned_identity_resource_test.go b/azurerm/internal/services/msi/tests/user_assigned_identity_resource_test.go index 6fd5ec555770..010dc09ccbcb 100644 --- a/azurerm/internal/services/msi/tests/user_assigned_identity_resource_test.go +++ b/azurerm/internal/services/msi/tests/user_assigned_identity_resource_test.go @@ -2,9 +2,8 @@ package tests import ( "fmt" - "testing" - "net/http" + "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" @@ -33,6 +32,7 @@ func TestAccAzureRMUserAssignedIdentity_basic(t *testing.T) { }, }) } + func TestAccAzureRMUserAssignedIdentity_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_user_assigned_identity", "test") @@ -100,7 +100,6 @@ func testCheckAzureRMUserAssignedIdentityDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { if resp.StatusCode == http.StatusNotFound { return nil diff --git a/azurerm/internal/services/mssql/mssql_server_resource.go b/azurerm/internal/services/mssql/mssql_server_resource.go index e928ee9f0a94..78ffa8047ed2 100644 --- a/azurerm/internal/services/mssql/mssql_server_resource.go +++ b/azurerm/internal/services/mssql/mssql_server_resource.go @@ -416,6 +416,7 @@ func expandAzureRmSqlServerIdentity(d *schema.ResourceData) *sql.ResourceIdentit Type: identityType, } } + func flattenAzureRmSqlServerIdentity(identity *sql.ResourceIdentity) []interface{} { if identity == nil { return []interface{}{} diff --git a/azurerm/internal/services/mssql/tests/mssql_elasticpool_resource_test.go b/azurerm/internal/services/mssql/tests/mssql_elasticpool_resource_test.go index 2c7b5a1e3ad5..5184b81b87d7 100644 --- a/azurerm/internal/services/mssql/tests/mssql_elasticpool_resource_test.go +++ b/azurerm/internal/services/mssql/tests/mssql_elasticpool_resource_test.go @@ -154,6 +154,7 @@ func TestAccAzureRMMsSqlElasticPool_basic_vCore_MaxSizeBytes(t *testing.T) { }, }) } + func TestAccAzureRMMsSqlElasticPool_disappears(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_mssql_elasticpool", "test") diff --git a/azurerm/internal/services/mssql/tests/mssql_server_resource_test.go b/azurerm/internal/services/mssql/tests/mssql_server_resource_test.go index 615c7ea3f893..37de76dfa9c9 100644 --- a/azurerm/internal/services/mssql/tests/mssql_server_resource_test.go +++ b/azurerm/internal/services/mssql/tests/mssql_server_resource_test.go @@ -291,7 +291,6 @@ func testCheckAzureRMMsSqlServerDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, sqlServerName) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/mssql/validate/mssql_database_test.go b/azurerm/internal/services/mssql/validate/mssql_database_test.go index 96d71079e235..80804e8c9f33 100644 --- a/azurerm/internal/services/mssql/validate/mssql_database_test.go +++ b/azurerm/internal/services/mssql/validate/mssql_database_test.go @@ -134,7 +134,7 @@ func TestMsSqlDBSkuName(t *testing.T) { valid: true, }, } - var validationFunction = MsSqlDBSkuName() + validationFunction := MsSqlDBSkuName() for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { _, err := validationFunction(tt.input, "") @@ -203,7 +203,7 @@ func TestMsSqlDBCollation(t *testing.T) { valid: false, }, } - var validationFunction = MsSqlDBCollation() + validationFunction := MsSqlDBCollation() for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { _, err := validationFunction(tt.input, "") diff --git a/azurerm/internal/services/mysql/mysql_virtual_network_rule_resource.go b/azurerm/internal/services/mysql/mysql_virtual_network_rule_resource.go index 274145e2491c..9e86cffd3412 100644 --- a/azurerm/internal/services/mysql/mysql_virtual_network_rule_resource.go +++ b/azurerm/internal/services/mysql/mysql_virtual_network_rule_resource.go @@ -196,7 +196,6 @@ func resourceArmMySQLVirtualNetworkRuleDelete(d *schema.ResourceData, meta inter func mySQLVirtualNetworkStateStatusCodeRefreshFunc(ctx context.Context, client *mysql.VirtualNetworkRulesClient, resourceGroup string, serverName string, name string) resource.StateRefreshFunc { return func() (interface{}, string, error) { resp, err := client.Get(ctx, resourceGroup, serverName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { log.Printf("[DEBUG] Retrieving MySQL Virtual Network Rule %q (MySQL Server: %q, Resource Group: %q) returned 404.", resourceGroup, serverName, name) diff --git a/azurerm/internal/services/mysql/registration.go b/azurerm/internal/services/mysql/registration.go index 5ca0b516589a..3bda95435623 100644 --- a/azurerm/internal/services/mysql/registration.go +++ b/azurerm/internal/services/mysql/registration.go @@ -34,5 +34,6 @@ func (r Registration) SupportedResources() map[string]*schema.Resource { "azurerm_mysql_server": resourceArmMySqlServer(), "azurerm_mysql_server_key": resourceArmMySQLServerKey(), "azurerm_mysql_virtual_network_rule": resourceArmMySQLVirtualNetworkRule(), - "azurerm_mysql_active_directory_administrator": resourceArmMySQLAdministrator()} + "azurerm_mysql_active_directory_administrator": resourceArmMySQLAdministrator(), + } } diff --git a/azurerm/internal/services/mysql/tests/mysql_administrator_resource_test.go b/azurerm/internal/services/mysql/tests/mysql_administrator_resource_test.go index d3926296f962..2c4a8b6059c2 100644 --- a/azurerm/internal/services/mysql/tests/mysql_administrator_resource_test.go +++ b/azurerm/internal/services/mysql/tests/mysql_administrator_resource_test.go @@ -37,6 +37,7 @@ func TestAccAzureMySqlAdministrator_basic(t *testing.T) { }, }) } + func TestAccAzureMySqlAdministrator_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_mysql_active_directory_administrator", "test") diff --git a/azurerm/internal/services/mysql/tests/mysql_configuration_resource_test.go b/azurerm/internal/services/mysql/tests/mysql_configuration_resource_test.go index 53a55165999f..11a2473d8246 100644 --- a/azurerm/internal/services/mysql/tests/mysql_configuration_resource_test.go +++ b/azurerm/internal/services/mysql/tests/mysql_configuration_resource_test.go @@ -165,7 +165,6 @@ func testCheckAzureRMMySQLConfigurationDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, serverName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/mysql/tests/mysql_firewall_rule_resource_test.go b/azurerm/internal/services/mysql/tests/mysql_firewall_rule_resource_test.go index facf173ae737..9aed1f15676c 100644 --- a/azurerm/internal/services/mysql/tests/mysql_firewall_rule_resource_test.go +++ b/azurerm/internal/services/mysql/tests/mysql_firewall_rule_resource_test.go @@ -96,7 +96,6 @@ func testCheckAzureRMMySQLFirewallRuleDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, serverName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/netapp/netapp_volume_resource.go b/azurerm/internal/services/netapp/netapp_volume_resource.go index 387e5369571d..b7a137a15595 100644 --- a/azurerm/internal/services/netapp/netapp_volume_resource.go +++ b/azurerm/internal/services/netapp/netapp_volume_resource.go @@ -98,12 +98,14 @@ func resourceArmNetAppVolume() *schema.Resource { Optional: true, Computed: true, MaxItems: 2, - Elem: &schema.Schema{Type: schema.TypeString, + Elem: &schema.Schema{ + Type: schema.TypeString, ValidateFunc: validation.StringInSlice([]string{ "NFSv3", "NFSv4.1", "CIFS", - }, false)}, + }, false), + }, }, "storage_quota_in_gb": { @@ -139,12 +141,14 @@ func resourceArmNetAppVolume() *schema.Resource { Computed: true, MaxItems: 1, MinItems: 1, - Elem: &schema.Schema{Type: schema.TypeString, + Elem: &schema.Schema{ + Type: schema.TypeString, ValidateFunc: validation.StringInSlice([]string{ "NFSv3", "NFSv4.1", "CIFS", - }, false)}, + }, false), + }, }, "cifs_enabled": { diff --git a/azurerm/internal/services/netapp/registration.go b/azurerm/internal/services/netapp/registration.go index 981ce6c84912..08ac31d7359a 100644 --- a/azurerm/internal/services/netapp/registration.go +++ b/azurerm/internal/services/netapp/registration.go @@ -24,7 +24,8 @@ func (r Registration) SupportedDataSources() map[string]*schema.Resource { "azurerm_netapp_account": dataSourceArmNetAppAccount(), "azurerm_netapp_pool": dataSourceArmNetAppPool(), "azurerm_netapp_volume": dataSourceArmNetAppVolume(), - "azurerm_netapp_snapshot": dataSourceArmNetAppSnapshot()} + "azurerm_netapp_snapshot": dataSourceArmNetAppSnapshot(), + } } // SupportedResources returns the supported Resources supported by this Service @@ -33,5 +34,6 @@ func (r Registration) SupportedResources() map[string]*schema.Resource { "azurerm_netapp_account": resourceArmNetAppAccount(), "azurerm_netapp_pool": resourceArmNetAppPool(), "azurerm_netapp_volume": resourceArmNetAppVolume(), - "azurerm_netapp_snapshot": resourceArmNetAppSnapshot()} + "azurerm_netapp_snapshot": resourceArmNetAppSnapshot(), + } } diff --git a/azurerm/internal/services/network/network_interface.go b/azurerm/internal/services/network/network_interface.go index a915aebbb92b..742021741dac 100644 --- a/azurerm/internal/services/network/network_interface.go +++ b/azurerm/internal/services/network/network_interface.go @@ -19,7 +19,7 @@ func parseFieldsFromNetworkInterface(input network.InterfacePropertiesFormat) ne networkSecurityGroupId = *input.NetworkSecurityGroup.ID } - var mapToSlice = func(input map[string]struct{}) []string { + mapToSlice := func(input map[string]struct{}) []string { output := make([]string, 0) for id := range input { diff --git a/azurerm/internal/services/network/parse/virtual_hub.go b/azurerm/internal/services/network/parse/virtual_hub.go index bfc7dc392742..9a10a302c3e8 100644 --- a/azurerm/internal/services/network/parse/virtual_hub.go +++ b/azurerm/internal/services/network/parse/virtual_hub.go @@ -17,6 +17,7 @@ func NewVirtualHubID(resourceGroup, name string) VirtualHubId { Name: name, } } + func (id VirtualHubId) ID(subscriptionId string) string { return fmt.Sprintf("/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Network/virtualHubs/%s", subscriptionId, id.ResourceGroup, id.Name) } diff --git a/azurerm/internal/services/network/subnet_network_security_group_association_resource.go b/azurerm/internal/services/network/subnet_network_security_group_association_resource.go index 05ed264cc955..f721d9ff13d9 100644 --- a/azurerm/internal/services/network/subnet_network_security_group_association_resource.go +++ b/azurerm/internal/services/network/subnet_network_security_group_association_resource.go @@ -137,7 +137,6 @@ func resourceArmSubnetNetworkSecurityGroupAssociationRead(d *schema.ResourceData subnetName := id.Path["subnets"] resp, err := client.Get(ctx, resourceGroup, virtualNetworkName, subnetName, "") - if err != nil { if utils.ResponseWasNotFound(resp.Response) { log.Printf("[DEBUG] Subnet %q (Virtual Network %q / Resource Group %q) could not be found - removing from state!", subnetName, virtualNetworkName, resourceGroup) diff --git a/azurerm/internal/services/network/subnet_resource.go b/azurerm/internal/services/network/subnet_resource.go index beae3205cefe..e9ab5d178990 100644 --- a/azurerm/internal/services/network/subnet_resource.go +++ b/azurerm/internal/services/network/subnet_resource.go @@ -335,7 +335,6 @@ func resourceArmSubnetRead(d *schema.ResourceData, meta interface{}) error { name := id.Path["subnets"] resp, err := client.Get(ctx, resourceGroup, networkName, name, "") - if err != nil { if utils.ResponseWasNotFound(resp.Response) { d.SetId("") diff --git a/azurerm/internal/services/network/subnet_route_table_association_resource.go b/azurerm/internal/services/network/subnet_route_table_association_resource.go index 9c5383239c0e..f4d7aa357bd4 100644 --- a/azurerm/internal/services/network/subnet_route_table_association_resource.go +++ b/azurerm/internal/services/network/subnet_route_table_association_resource.go @@ -134,7 +134,6 @@ func resourceArmSubnetRouteTableAssociationRead(d *schema.ResourceData, meta int subnetName := id.Path["subnets"] resp, err := client.Get(ctx, resourceGroup, virtualNetworkName, subnetName, "") - if err != nil { if utils.ResponseWasNotFound(resp.Response) { log.Printf("[DEBUG] Subnet %q (Virtual Network %q / Resource Group %q) could not be found - removing from state!", subnetName, virtualNetworkName, resourceGroup) diff --git a/azurerm/internal/services/network/tests/application_gateway_resource_test.go b/azurerm/internal/services/network/tests/application_gateway_resource_test.go index 8fb0c340d571..3b57ead3fe61 100644 --- a/azurerm/internal/services/network/tests/application_gateway_resource_test.go +++ b/azurerm/internal/services/network/tests/application_gateway_resource_test.go @@ -1147,7 +1147,6 @@ func testCheckAzureRMApplicationGatewayDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, gatewayName) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil @@ -4419,6 +4418,7 @@ resource "azurerm_application_gateway" "test" { } `, template, data.RandomInteger) } + func testAccAzureRMApplicationGateway_webApplicationFirewall_disabledRuleGroups(data acceptance.TestData) string { template := testAccAzureRMApplicationGateway_template(data) return fmt.Sprintf(` @@ -4736,6 +4736,7 @@ resource "azurerm_application_gateway" "test" { } `, template, data.RandomInteger, data.RandomInteger) } + func testAccAzureRMApplicationGateway_webApplicationFirewall_exclusions_one(data acceptance.TestData) string { template := testAccAzureRMApplicationGateway_template(data) return fmt.Sprintf(` diff --git a/azurerm/internal/services/network/tests/application_security_group_resource_test.go b/azurerm/internal/services/network/tests/application_security_group_resource_test.go index 14ab538411f3..90d50309b4da 100644 --- a/azurerm/internal/services/network/tests/application_security_group_resource_test.go +++ b/azurerm/internal/services/network/tests/application_security_group_resource_test.go @@ -112,7 +112,6 @@ func testCheckAzureRMApplicationSecurityGroupDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil @@ -145,7 +144,6 @@ func testCheckAzureRMApplicationSecurityGroupExists(resourceName string) resourc } resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return fmt.Errorf("Application Security Group %q (resource group: %q) was not found: %+v", name, resourceGroup, err) diff --git a/azurerm/internal/services/network/tests/express_route_circuit_authorization_resource_test.go b/azurerm/internal/services/network/tests/express_route_circuit_authorization_resource_test.go index e977f57616cd..4d8bcdfe72dc 100644 --- a/azurerm/internal/services/network/tests/express_route_circuit_authorization_resource_test.go +++ b/azurerm/internal/services/network/tests/express_route_circuit_authorization_resource_test.go @@ -121,7 +121,6 @@ func testCheckAzureRMExpressRouteCircuitAuthorizationDestroy(s *terraform.State) resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, expressRouteCircuitName, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/network/tests/express_route_circuit_peering_resource_test.go b/azurerm/internal/services/network/tests/express_route_circuit_peering_resource_test.go index acb10bc042d2..34e9a053977a 100644 --- a/azurerm/internal/services/network/tests/express_route_circuit_peering_resource_test.go +++ b/azurerm/internal/services/network/tests/express_route_circuit_peering_resource_test.go @@ -191,7 +191,6 @@ func testCheckAzureRMExpressRouteCircuitPeeringDestroy(s *terraform.State) error resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, circuitName, peeringType) - if err != nil { return nil } diff --git a/azurerm/internal/services/network/tests/express_route_circuit_resource_test.go b/azurerm/internal/services/network/tests/express_route_circuit_resource_test.go index 4551ecf9f814..a1928728ff3e 100644 --- a/azurerm/internal/services/network/tests/express_route_circuit_resource_test.go +++ b/azurerm/internal/services/network/tests/express_route_circuit_resource_test.go @@ -346,7 +346,6 @@ func testCheckAzureRMExpressRouteCircuitDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/network/tests/ip_group_resource_test.go b/azurerm/internal/services/network/tests/ip_group_resource_test.go index 60d4ff8607d2..1a7713f719ac 100644 --- a/azurerm/internal/services/network/tests/ip_group_resource_test.go +++ b/azurerm/internal/services/network/tests/ip_group_resource_test.go @@ -166,7 +166,6 @@ func testCheckAzureRMIpGroupDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name, "") - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/network/tests/loadbalancer_backend_address_pool_resource_test.go b/azurerm/internal/services/network/tests/loadbalancer_backend_address_pool_resource_test.go index 9ff6dfce5b1d..39408dbd86f6 100644 --- a/azurerm/internal/services/network/tests/loadbalancer_backend_address_pool_resource_test.go +++ b/azurerm/internal/services/network/tests/loadbalancer_backend_address_pool_resource_test.go @@ -35,6 +35,7 @@ func TestAccAzureRMLoadBalancerBackEndAddressPool_basic(t *testing.T) { }, }) } + func TestAccAzureRMLoadBalancerBackEndAddressPool_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_lb_backend_address_pool", "test") diff --git a/azurerm/internal/services/network/tests/loadbalancer_resource_test.go b/azurerm/internal/services/network/tests/loadbalancer_resource_test.go index a962c628d8a2..0e4c2643a223 100644 --- a/azurerm/internal/services/network/tests/loadbalancer_resource_test.go +++ b/azurerm/internal/services/network/tests/loadbalancer_resource_test.go @@ -82,6 +82,7 @@ func TestAccAzureRMLoadBalancer_standard(t *testing.T) { }, }) } + func TestAccAzureRMLoadBalancer_frontEndConfigPublicIPPrefix(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_lb", "test") var lb network.LoadBalancer @@ -106,6 +107,7 @@ func TestAccAzureRMLoadBalancer_frontEndConfigPublicIPPrefix(t *testing.T) { }, }) } + func TestAccAzureRMLoadBalancer_frontEndConfig(t *testing.T) { var lb network.LoadBalancer data := acceptance.BuildTestData(t, "azurerm_lb", "test") @@ -255,7 +257,6 @@ func testCheckAzureRMLoadBalancerDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/network/tests/local_network_gateway_resource_test.go b/azurerm/internal/services/network/tests/local_network_gateway_resource_test.go index 1b11895dc03a..acefbe73b66e 100644 --- a/azurerm/internal/services/network/tests/local_network_gateway_resource_test.go +++ b/azurerm/internal/services/network/tests/local_network_gateway_resource_test.go @@ -351,7 +351,6 @@ func testCheckAzureRMLocalNetworkGatewayDestroy(s *terraform.State) error { resourceGroup := id.ResourceGroup resp, err := client.Get(ctx, resourceGroup, localNetName) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/network/tests/network_connection_monitor_resource_test.go b/azurerm/internal/services/network/tests/network_connection_monitor_resource_test.go index ae1ccc166b60..0be4e79055fb 100644 --- a/azurerm/internal/services/network/tests/network_connection_monitor_resource_test.go +++ b/azurerm/internal/services/network/tests/network_connection_monitor_resource_test.go @@ -324,7 +324,6 @@ func testCheckAzureRMNetworkConnectionMonitorDestroy(s *terraform.State) error { } resp, err := client.Get(ctx, id.ResourceGroup, id.WatcherName, id.Name) - if err != nil { return nil } diff --git a/azurerm/internal/services/network/tests/network_packet_capture_resource_test.go b/azurerm/internal/services/network/tests/network_packet_capture_resource_test.go index 79323bb48970..6308b3be9782 100644 --- a/azurerm/internal/services/network/tests/network_packet_capture_resource_test.go +++ b/azurerm/internal/services/network/tests/network_packet_capture_resource_test.go @@ -51,6 +51,7 @@ func testAccAzureRMNetworkPacketCapture_requiresImport(t *testing.T) { }, }) } + func testAccAzureRMNetworkPacketCapture_storageAccount(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_packet_capture", "test") @@ -149,7 +150,6 @@ func testCheckAzureRMNetworkPacketCaptureDestroy(s *terraform.State) error { NetworkPacketCaptureName := rs.Primary.Attributes["name"] resp, err := client.Get(ctx, resourceGroup, watcherName, NetworkPacketCaptureName) - if err != nil { return nil } diff --git a/azurerm/internal/services/network/tests/network_security_group_resource_test.go b/azurerm/internal/services/network/tests/network_security_group_resource_test.go index 6ec29d2375b3..f990b44ed7cc 100644 --- a/azurerm/internal/services/network/tests/network_security_group_resource_test.go +++ b/azurerm/internal/services/network/tests/network_security_group_resource_test.go @@ -320,7 +320,6 @@ func testCheckAzureRMNetworkSecurityGroupDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name, "") - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/network/tests/network_security_rule_resource_test.go b/azurerm/internal/services/network/tests/network_security_rule_resource_test.go index 436e1901beed..dc2b78ba8334 100644 --- a/azurerm/internal/services/network/tests/network_security_rule_resource_test.go +++ b/azurerm/internal/services/network/tests/network_security_rule_resource_test.go @@ -205,7 +205,6 @@ func testCheckAzureRMNetworkSecurityRuleDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, sgName, sgrName) - if err != nil { return nil } diff --git a/azurerm/internal/services/network/tests/network_watcher_resource_test.go b/azurerm/internal/services/network/tests/network_watcher_resource_test.go index a7748725dec4..6a72493e9886 100644 --- a/azurerm/internal/services/network/tests/network_watcher_resource_test.go +++ b/azurerm/internal/services/network/tests/network_watcher_resource_test.go @@ -261,7 +261,6 @@ func testCheckAzureRMNetworkWatcherDestroy(s *terraform.State) error { } resp, err := client.Get(ctx, id.ResourceGroup, id.Name) - if err != nil { if !utils.ResponseWasNotFound(resp.Response) { return fmt.Errorf("Network Watcher still exists:\n%#v", resp) diff --git a/azurerm/internal/services/network/tests/packet_capture_resource_test.go b/azurerm/internal/services/network/tests/packet_capture_resource_test.go index a3bd0fad6879..1922d97e1eab 100644 --- a/azurerm/internal/services/network/tests/packet_capture_resource_test.go +++ b/azurerm/internal/services/network/tests/packet_capture_resource_test.go @@ -51,6 +51,7 @@ func testAccAzureRMPacketCapture_requiresImport(t *testing.T) { }, }) } + func testAccAzureRMPacketCapture_storageAccount(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_packet_capture", "test") @@ -149,7 +150,6 @@ func testCheckAzureRMPacketCaptureDestroy(s *terraform.State) error { packetCaptureName := rs.Primary.Attributes["name"] resp, err := client.Get(ctx, resourceGroup, watcherName, packetCaptureName) - if err != nil { return nil } diff --git a/azurerm/internal/services/network/tests/public_ip_prefix_resource_test.go b/azurerm/internal/services/network/tests/public_ip_prefix_resource_test.go index 544527d30370..9467887dafdd 100644 --- a/azurerm/internal/services/network/tests/public_ip_prefix_resource_test.go +++ b/azurerm/internal/services/network/tests/public_ip_prefix_resource_test.go @@ -84,7 +84,6 @@ func testCheckAzureRMPublicIPPrefixDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/network/tests/public_ip_resource_test.go b/azurerm/internal/services/network/tests/public_ip_resource_test.go index b2ae48a31fa2..39500d9f3170 100644 --- a/azurerm/internal/services/network/tests/public_ip_resource_test.go +++ b/azurerm/internal/services/network/tests/public_ip_resource_test.go @@ -484,7 +484,6 @@ func testCheckAzureRMPublicIpDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/network/tests/route_resource_test.go b/azurerm/internal/services/network/tests/route_resource_test.go index da848c4dc19e..79705a2cbf10 100644 --- a/azurerm/internal/services/network/tests/route_resource_test.go +++ b/azurerm/internal/services/network/tests/route_resource_test.go @@ -207,7 +207,6 @@ func testCheckAzureRMRouteDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, rtName, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/network/tests/virtual_network_gateway_connection_resource_test.go b/azurerm/internal/services/network/tests/virtual_network_gateway_connection_resource_test.go index d55a4c1f859d..49d74f3fa94a 100644 --- a/azurerm/internal/services/network/tests/virtual_network_gateway_connection_resource_test.go +++ b/azurerm/internal/services/network/tests/virtual_network_gateway_connection_resource_test.go @@ -227,7 +227,6 @@ func testCheckAzureRMVirtualNetworkGatewayConnectionDestroy(s *terraform.State) resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/network/tests/virtual_network_gateway_resource_test.go b/azurerm/internal/services/network/tests/virtual_network_gateway_resource_test.go index 882a2e672ff8..67676abd22a6 100644 --- a/azurerm/internal/services/network/tests/virtual_network_gateway_resource_test.go +++ b/azurerm/internal/services/network/tests/virtual_network_gateway_resource_test.go @@ -325,7 +325,6 @@ func testCheckAzureRMVirtualNetworkGatewayDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/network/tests/virtual_network_resource_test.go b/azurerm/internal/services/network/tests/virtual_network_resource_test.go index 635d1706ffa8..9b5666a0f1ec 100644 --- a/azurerm/internal/services/network/tests/virtual_network_resource_test.go +++ b/azurerm/internal/services/network/tests/virtual_network_resource_test.go @@ -350,7 +350,6 @@ func testCheckAzureRMVirtualNetworkDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name, "") - if err != nil { return nil } diff --git a/azurerm/internal/services/network/validate/firewall_policy.go b/azurerm/internal/services/network/validate/firewall_policy.go index c8f465f8f7b5..9fdfe8cc3008 100644 --- a/azurerm/internal/services/network/validate/firewall_policy.go +++ b/azurerm/internal/services/network/validate/firewall_policy.go @@ -61,7 +61,7 @@ func FirewallPolicyRulePort(i interface{}, k string) (warnings []string, errors return } - var assertWithinRnage = func(n int) error { + assertWithinRnage := func(n int) error { if n < 0 || n > 64000 { return fmt.Errorf("port %d is out of range (0-64000)", n) } diff --git a/azurerm/internal/services/network/virtual_hub_ip_resource.go b/azurerm/internal/services/network/virtual_hub_ip_resource.go index 92627a791a35..82ec7a3f1121 100644 --- a/azurerm/internal/services/network/virtual_hub_ip_resource.go +++ b/azurerm/internal/services/network/virtual_hub_ip_resource.go @@ -83,6 +83,7 @@ func resourceArmVirtualHubIP() *schema.Resource { }, } } + func resourceArmVirtualHubIPCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Network.VirtualHubIPClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) diff --git a/azurerm/internal/services/network/virtual_hub_security_partner_provider_resource.go b/azurerm/internal/services/network/virtual_hub_security_partner_provider_resource.go index 9ae6220b2c4c..b343b84e9335 100644 --- a/azurerm/internal/services/network/virtual_hub_security_partner_provider_resource.go +++ b/azurerm/internal/services/network/virtual_hub_security_partner_provider_resource.go @@ -72,6 +72,7 @@ func resourceArmVirtualHubSecurityPartnerProvider() *schema.Resource { }, } } + func resourceArmVirtualHubSecurityPartnerProviderCreate(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Network.SecurityPartnerProviderClient ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) diff --git a/azurerm/internal/services/network/virtual_network_resource.go b/azurerm/internal/services/network/virtual_network_resource.go index 27dcce2baa64..db48af799a47 100644 --- a/azurerm/internal/services/network/virtual_network_resource.go +++ b/azurerm/internal/services/network/virtual_network_resource.go @@ -487,7 +487,6 @@ func resourceAzureSubnetHash(v interface{}) int { func getExistingSubnet(ctx context.Context, resGroup string, vnetName string, subnetName string, meta interface{}) (*network.Subnet, error) { subnetClient := meta.(*clients.Client).Network.SubnetsClient resp, err := subnetClient.Get(ctx, resGroup, vnetName, subnetName, "") - if err != nil { if resp.StatusCode == http.StatusNotFound { return &network.Subnet{}, nil diff --git a/azurerm/internal/services/notificationhub/notification_hub_resource.go b/azurerm/internal/services/notificationhub/notification_hub_resource.go index a0a4f661e3fe..8f5ba86e8ba7 100644 --- a/azurerm/internal/services/notificationhub/notification_hub_resource.go +++ b/azurerm/internal/services/notificationhub/notification_hub_resource.go @@ -23,10 +23,12 @@ import ( var notificationHubResourceName = "azurerm_notification_hub" -const apnsProductionName = "Production" -const apnsProductionEndpoint = "https://api.push.apple.com:443/3/device" -const apnsSandboxName = "Sandbox" -const apnsSandboxEndpoint = "https://api.development.push.apple.com:443/3/device" +const ( + apnsProductionName = "Production" + apnsProductionEndpoint = "https://api.push.apple.com:443/3/device" + apnsSandboxName = "Sandbox" + apnsSandboxEndpoint = "https://api.development.push.apple.com:443/3/device" +) func resourceArmNotificationHub() *schema.Resource { return &schema.Resource{ diff --git a/azurerm/internal/services/notificationhub/tests/notification_hub_authorization_rule_resource_test.go b/azurerm/internal/services/notificationhub/tests/notification_hub_authorization_rule_resource_test.go index 0db7fe750fdb..135ffc8c1b2e 100644 --- a/azurerm/internal/services/notificationhub/tests/notification_hub_authorization_rule_resource_test.go +++ b/azurerm/internal/services/notificationhub/tests/notification_hub_authorization_rule_resource_test.go @@ -226,7 +226,6 @@ func testCheckAzureRMNotificationHubAuthorizationRuleDestroy(s *terraform.State) namespaceName := rs.Primary.Attributes["namespace_name"] ruleName := rs.Primary.Attributes["name"] resp, err := client.GetAuthorizationRule(ctx, resourceGroup, namespaceName, notificationHubName, ruleName) - if err != nil { return nil } diff --git a/azurerm/internal/services/notificationhub/tests/notification_hub_namespace_resource_test.go b/azurerm/internal/services/notificationhub/tests/notification_hub_namespace_resource_test.go index a1a18248c21f..49e6b9dcfc42 100644 --- a/azurerm/internal/services/notificationhub/tests/notification_hub_namespace_resource_test.go +++ b/azurerm/internal/services/notificationhub/tests/notification_hub_namespace_resource_test.go @@ -120,7 +120,6 @@ func testCheckAzureRMNotificationHubNamespaceDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] namespaceName := rs.Primary.Attributes["name"] resp, err := client.Get(ctx, resourceGroup, namespaceName) - if err != nil { return nil } diff --git a/azurerm/internal/services/notificationhub/tests/notification_hub_resource_test.go b/azurerm/internal/services/notificationhub/tests/notification_hub_resource_test.go index 084056973972..84df1eb593cc 100644 --- a/azurerm/internal/services/notificationhub/tests/notification_hub_resource_test.go +++ b/azurerm/internal/services/notificationhub/tests/notification_hub_resource_test.go @@ -127,7 +127,6 @@ func testCheckAzureRMNotificationHubDestroy(s *terraform.State) error { hubName := rs.Primary.Attributes["name"] resp, err := client.Get(ctx, resourceGroup, namespaceName, hubName) - if err != nil { return nil } diff --git a/azurerm/internal/services/policy/parse/scope.go b/azurerm/internal/services/policy/parse/scope.go index fe2ac4d4411e..5835309f61a9 100644 --- a/azurerm/internal/services/policy/parse/scope.go +++ b/azurerm/internal/services/policy/parse/scope.go @@ -46,6 +46,7 @@ type ScopeAtManagementGroup struct { func (id ScopeAtManagementGroup) ScopeId() string { return id.scopeId } + func PolicyScopeID(input string) (PolicyScopeId, error) { if input == "" { return nil, fmt.Errorf("unable to parse Remediation Scope ID: ID is empty") diff --git a/azurerm/internal/services/policy/policy_assignment_resource.go b/azurerm/internal/services/policy/policy_assignment_resource.go index ef0d5d13ec87..ae9fa8de589d 100644 --- a/azurerm/internal/services/policy/policy_assignment_resource.go +++ b/azurerm/internal/services/policy/policy_assignment_resource.go @@ -2,14 +2,13 @@ package policy import ( "context" + "encoding/json" "fmt" "log" "reflect" "strconv" "time" - "encoding/json" - "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-09-01/policy" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" diff --git a/azurerm/internal/services/policy/policy_definition_resource.go b/azurerm/internal/services/policy/policy_definition_resource.go index 928445b4132c..6640dffa04ce 100644 --- a/azurerm/internal/services/policy/policy_definition_resource.go +++ b/azurerm/internal/services/policy/policy_definition_resource.go @@ -58,7 +58,8 @@ func resourceArmPolicyDefinition() *schema.Resource { string(policy.Custom), string(policy.NotSpecified), string(policy.Static), - }, true)}, + }, true), + }, "mode": { Type: schema.TypeString, @@ -283,7 +284,6 @@ func resourceArmPolicyDefinitionRead(d *schema.ResourceData, meta interface{}) e } resp, err := getPolicyDefinitionByName(ctx, client, id.Name, managementGroupName) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { log.Printf("[INFO] Error reading Policy Definition %q - removing from state", d.Id()) @@ -359,7 +359,6 @@ func resourceArmPolicyDefinitionDelete(d *schema.ResourceData, meta interface{}) func policyDefinitionRefreshFunc(ctx context.Context, client *policy.DefinitionsClient, name string, managementGroupID string) resource.StateRefreshFunc { return func() (interface{}, string, error) { res, err := getPolicyDefinitionByName(ctx, client, name, managementGroupID) - if err != nil { return nil, strconv.Itoa(res.StatusCode), fmt.Errorf("issuing read request in policyAssignmentRefreshFunc for Policy Assignment %q: %+v", name, err) } diff --git a/azurerm/internal/services/policy/policy_set_definition_resource.go b/azurerm/internal/services/policy/policy_set_definition_resource.go index 84c000c793b0..da0c4b7124a7 100644 --- a/azurerm/internal/services/policy/policy_set_definition_resource.go +++ b/azurerm/internal/services/policy/policy_set_definition_resource.go @@ -432,7 +432,6 @@ func resourceArmPolicySetDefinitionRead(d *schema.ResourceData, meta interface{} } resp, err := getPolicySetDefinitionByName(ctx, client, id.Name, managementGroupName) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { log.Printf("[INFO] Error reading Policy Set Definition %q - removing from state", d.Id()) diff --git a/azurerm/internal/services/policy/tests/policy_assignment_resource_test.go b/azurerm/internal/services/policy/tests/policy_assignment_resource_test.go index 0c3ce37a44d1..3b1bc9b1d42a 100644 --- a/azurerm/internal/services/policy/tests/policy_assignment_resource_test.go +++ b/azurerm/internal/services/policy/tests/policy_assignment_resource_test.go @@ -191,7 +191,6 @@ func testCheckAzureRMPolicyAssignmentDestroy(s *terraform.State) error { id := rs.Primary.ID resp, err := client.GetByID(ctx, id) - if err != nil { return nil } diff --git a/azurerm/internal/services/portal/tests/dashboard_resource_test.go b/azurerm/internal/services/portal/tests/dashboard_resource_test.go index 4c22f36a958e..e7e85e69560c 100644 --- a/azurerm/internal/services/portal/tests/dashboard_resource_test.go +++ b/azurerm/internal/services/portal/tests/dashboard_resource_test.go @@ -72,7 +72,6 @@ func testCheckAzureRMDashboardDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/postgres/postgresql_virtual_network_rule_resource.go b/azurerm/internal/services/postgres/postgresql_virtual_network_rule_resource.go index 95c05c93b0a2..ca3807ccf7d1 100644 --- a/azurerm/internal/services/postgres/postgresql_virtual_network_rule_resource.go +++ b/azurerm/internal/services/postgres/postgresql_virtual_network_rule_resource.go @@ -211,7 +211,6 @@ func resourceArmPostgreSQLVirtualNetworkRuleDelete(d *schema.ResourceData, meta func postgreSQLVirtualNetworkStateStatusCodeRefreshFunc(ctx context.Context, client *postgresql.VirtualNetworkRulesClient, resourceGroup string, serverName string, name string) resource.StateRefreshFunc { return func() (interface{}, string, error) { resp, err := client.Get(ctx, resourceGroup, serverName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { log.Printf("[DEBUG] Retrieving PostgreSQL Virtual Network Rule %q (PostgreSQL Server: %q, Resource Group: %q) returned 404.", resourceGroup, serverName, name) diff --git a/azurerm/internal/services/postgres/tests/postgresql_administrator_resource_test.go b/azurerm/internal/services/postgres/tests/postgresql_administrator_resource_test.go index e2877f874972..4e008be4bcc0 100644 --- a/azurerm/internal/services/postgres/tests/postgresql_administrator_resource_test.go +++ b/azurerm/internal/services/postgres/tests/postgresql_administrator_resource_test.go @@ -37,6 +37,7 @@ func TestAccAzurePostgreSqlAdministrator_basic(t *testing.T) { }, }) } + func TestAccAzurePostgreSqlAdministrator_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_postgresql_active_directory_administrator", "test") diff --git a/azurerm/internal/services/postgres/tests/postgresql_configuration_resource_test.go b/azurerm/internal/services/postgres/tests/postgresql_configuration_resource_test.go index 7fb7c5530ec3..0478a4bde110 100644 --- a/azurerm/internal/services/postgres/tests/postgresql_configuration_resource_test.go +++ b/azurerm/internal/services/postgres/tests/postgresql_configuration_resource_test.go @@ -162,7 +162,6 @@ func testCheckAzureRMPostgreSQLConfigurationDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, serverName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/postgres/tests/postgresql_database_resource_test.go b/azurerm/internal/services/postgres/tests/postgresql_database_resource_test.go index efe6a43264de..ab78948d306c 100644 --- a/azurerm/internal/services/postgres/tests/postgresql_database_resource_test.go +++ b/azurerm/internal/services/postgres/tests/postgresql_database_resource_test.go @@ -151,7 +151,6 @@ func testCheckAzureRMPostgreSQLDatabaseDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, serverName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/postgres/tests/postgresql_firewall_rule_resource_test.go b/azurerm/internal/services/postgres/tests/postgresql_firewall_rule_resource_test.go index cba4acef9b56..85fc8f68a0f2 100644 --- a/azurerm/internal/services/postgres/tests/postgresql_firewall_rule_resource_test.go +++ b/azurerm/internal/services/postgres/tests/postgresql_firewall_rule_resource_test.go @@ -96,7 +96,6 @@ func testCheckAzureRMPostgreSQLFirewallRuleDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, serverName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/postgres/tests/postgresql_server_resource_test.go b/azurerm/internal/services/postgres/tests/postgresql_server_resource_test.go index 9baa0c789502..f0d0f5818beb 100644 --- a/azurerm/internal/services/postgres/tests/postgresql_server_resource_test.go +++ b/azurerm/internal/services/postgres/tests/postgresql_server_resource_test.go @@ -452,7 +452,6 @@ func testCheckAzureRMPostgreSQLServerDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/powerbi/registration.go b/azurerm/internal/services/powerbi/registration.go index cbe82d00dbe0..ccac8954a0cd 100644 --- a/azurerm/internal/services/powerbi/registration.go +++ b/azurerm/internal/services/powerbi/registration.go @@ -26,5 +26,6 @@ func (r Registration) SupportedDataSources() map[string]*schema.Resource { // SupportedResources returns the supported Resources supported by this Service func (r Registration) SupportedResources() map[string]*schema.Resource { return map[string]*schema.Resource{ - "azurerm_powerbi_embedded": resourceArmPowerBIEmbedded()} + "azurerm_powerbi_embedded": resourceArmPowerBIEmbedded(), + } } diff --git a/azurerm/internal/services/privatedns/private_dns_zone_data_source.go b/azurerm/internal/services/privatedns/private_dns_zone_data_source.go index 145f5caa1556..bbf474fbd591 100644 --- a/azurerm/internal/services/privatedns/private_dns_zone_data_source.go +++ b/azurerm/internal/services/privatedns/private_dns_zone_data_source.go @@ -68,9 +68,7 @@ func dataSourceArmPrivateDnsZoneRead(d *schema.ResourceData, meta interface{}) e name := d.Get("name").(string) resourceGroup := d.Get("resource_group_name").(string) - var ( - resp *privatedns.PrivateZone - ) + var resp *privatedns.PrivateZone if resourceGroup != "" { zone, err := client.Get(ctx, resourceGroup, name) if err != nil { @@ -121,7 +119,6 @@ type privateDnsZone struct { func findPrivateZone(ctx context.Context, client *privatedns.PrivateZonesClient, resourcesClient *resources.Client, name string) (*privateDnsZone, error) { filter := fmt.Sprintf("resourceType eq 'Microsoft.Network/privateDnsZones' and name eq '%s'", name) privateZones, err := resourcesClient.List(ctx, filter, "", nil) - if err != nil { return nil, fmt.Errorf("Error listing Private DNS Zones: %+v", err) } @@ -136,13 +133,11 @@ func findPrivateZone(ctx context.Context, client *privatedns.PrivateZonesClient, } id, err := azure.ParseAzureResourceID(*z.ID) - if err != nil { continue } zone, err := client.Get(ctx, id.ResourceGroup, name) - if err != nil { return nil, fmt.Errorf("Error retrieving Private DNS Zone %q in resource group %q: %+v", name, id.ResourceGroup, err) } diff --git a/azurerm/internal/services/privatedns/tests/private_dns_a_record_resource_test.go b/azurerm/internal/services/privatedns/tests/private_dns_a_record_resource_test.go index bab6ad1ce765..1c5d7caaa1c5 100644 --- a/azurerm/internal/services/privatedns/tests/private_dns_a_record_resource_test.go +++ b/azurerm/internal/services/privatedns/tests/private_dns_a_record_resource_test.go @@ -146,7 +146,6 @@ func testCheckAzureRMPrivateDnsARecordDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, zoneName, privatedns.A, aName) - if err != nil { if resp.StatusCode == http.StatusNotFound { return nil diff --git a/azurerm/internal/services/privatedns/tests/private_dns_aaaa_record_resource_test.go b/azurerm/internal/services/privatedns/tests/private_dns_aaaa_record_resource_test.go index eeafc879740a..fcdc7fcc7436 100644 --- a/azurerm/internal/services/privatedns/tests/private_dns_aaaa_record_resource_test.go +++ b/azurerm/internal/services/privatedns/tests/private_dns_aaaa_record_resource_test.go @@ -146,7 +146,6 @@ func testCheckAzureRMPrivateDnsAaaaRecordDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, zoneName, privatedns.AAAA, aaaaName) - if err != nil { if resp.StatusCode == http.StatusNotFound { return nil diff --git a/azurerm/internal/services/privatedns/tests/private_dns_cname_record_resource_test.go b/azurerm/internal/services/privatedns/tests/private_dns_cname_record_resource_test.go index 45a284e6d886..b3ce9d52a087 100644 --- a/azurerm/internal/services/privatedns/tests/private_dns_cname_record_resource_test.go +++ b/azurerm/internal/services/privatedns/tests/private_dns_cname_record_resource_test.go @@ -162,7 +162,6 @@ func testCheckAzureRMPrivateDnsCNameRecordDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, zoneName, privatedns.CNAME, aName) - if err != nil { if resp.StatusCode == http.StatusNotFound { return nil diff --git a/azurerm/internal/services/privatedns/tests/private_dns_mx_record_resource_test.go b/azurerm/internal/services/privatedns/tests/private_dns_mx_record_resource_test.go index 4880e385b2bb..dc5bc3781733 100644 --- a/azurerm/internal/services/privatedns/tests/private_dns_mx_record_resource_test.go +++ b/azurerm/internal/services/privatedns/tests/private_dns_mx_record_resource_test.go @@ -163,7 +163,6 @@ func testCheckAzureRMPrivateDnsMxRecordDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, zoneName, privatedns.MX, mxName) - if err != nil { if resp.StatusCode == http.StatusNotFound { return nil diff --git a/azurerm/internal/services/privatedns/tests/private_dns_ptr_record_resource_test.go b/azurerm/internal/services/privatedns/tests/private_dns_ptr_record_resource_test.go index 251156aade37..3c7b75469c86 100644 --- a/azurerm/internal/services/privatedns/tests/private_dns_ptr_record_resource_test.go +++ b/azurerm/internal/services/privatedns/tests/private_dns_ptr_record_resource_test.go @@ -145,7 +145,6 @@ func testCheckAzureRMPrivateDnsPtrRecordDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, zoneName, privatedns.PTR, ptrName) - if err != nil { if resp.StatusCode == http.StatusNotFound { return nil diff --git a/azurerm/internal/services/privatedns/tests/private_dns_srv_record_resource_test.go b/azurerm/internal/services/privatedns/tests/private_dns_srv_record_resource_test.go index c83d745391f5..ec084d8c6683 100644 --- a/azurerm/internal/services/privatedns/tests/private_dns_srv_record_resource_test.go +++ b/azurerm/internal/services/privatedns/tests/private_dns_srv_record_resource_test.go @@ -145,7 +145,6 @@ func testCheckAzureRMPrivateDnsSrvRecordDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, zoneName, privatedns.SRV, srvName) - if err != nil { if resp.StatusCode == http.StatusNotFound { return nil diff --git a/azurerm/internal/services/privatedns/tests/private_dns_txt_record_resource_test.go b/azurerm/internal/services/privatedns/tests/private_dns_txt_record_resource_test.go index b96326ba0302..3c3b3eda7099 100644 --- a/azurerm/internal/services/privatedns/tests/private_dns_txt_record_resource_test.go +++ b/azurerm/internal/services/privatedns/tests/private_dns_txt_record_resource_test.go @@ -156,7 +156,6 @@ func testCheckAzureRMPrivateDnsTxtRecordDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, zoneName, privatedns.TXT, txtName) - if err != nil { if resp.StatusCode == http.StatusNotFound { return nil diff --git a/azurerm/internal/services/recoveryservices/resource_arm_site_recovery_network_mapping.go b/azurerm/internal/services/recoveryservices/resource_arm_site_recovery_network_mapping.go index 3953ac583ab9..00cc93740853 100644 --- a/azurerm/internal/services/recoveryservices/resource_arm_site_recovery_network_mapping.go +++ b/azurerm/internal/services/recoveryservices/resource_arm_site_recovery_network_mapping.go @@ -119,7 +119,7 @@ func resourceArmSiteRecoveryNetworkMappingCreate(d *schema.ResourceData, meta in } } - var parameters = siterecovery.CreateNetworkMappingInput{ + parameters := siterecovery.CreateNetworkMappingInput{ Properties: &siterecovery.CreateNetworkMappingInputProperties{ RecoveryNetworkID: &targetNetworkId, RecoveryFabricName: &targetFabricName, diff --git a/azurerm/internal/services/recoveryservices/resource_arm_site_recovery_protection_container_mapping.go b/azurerm/internal/services/recoveryservices/resource_arm_site_recovery_protection_container_mapping.go index b341c1de26dd..5b997512ba15 100644 --- a/azurerm/internal/services/recoveryservices/resource_arm_site_recovery_protection_container_mapping.go +++ b/azurerm/internal/services/recoveryservices/resource_arm_site_recovery_protection_container_mapping.go @@ -103,7 +103,7 @@ func resourceArmSiteRecoveryContainerMappingCreate(d *schema.ResourceData, meta } } - var parameters = siterecovery.CreateProtectionContainerMappingInput{ + parameters := siterecovery.CreateProtectionContainerMappingInput{ Properties: &siterecovery.CreateProtectionContainerMappingInputProperties{ TargetProtectionContainerID: &targetContainerId, PolicyID: &policyId, diff --git a/azurerm/internal/services/recoveryservices/resource_arm_site_recovery_replicated_vm.go b/azurerm/internal/services/recoveryservices/resource_arm_site_recovery_replicated_vm.go index 161268f030b2..119fb9658bd2 100644 --- a/azurerm/internal/services/recoveryservices/resource_arm_site_recovery_replicated_vm.go +++ b/azurerm/internal/services/recoveryservices/resource_arm_site_recovery_replicated_vm.go @@ -256,7 +256,7 @@ func resourceArmSiteRecoveryReplicatedItemCreate(d *schema.ResourceData, meta in }) } - var parameters = siterecovery.EnableProtectionInput{ + parameters := siterecovery.EnableProtectionInput{ Properties: &siterecovery.EnableProtectionInputProperties{ PolicyID: &policyId, ProviderSpecificDetails: siterecovery.A2AEnableProtectionInput{ @@ -360,7 +360,7 @@ func resourceArmSiteRecoveryReplicatedItemUpdate(d *schema.ResourceData, meta in } } - var parameters = siterecovery.UpdateReplicationProtectedItemInput{ + parameters := siterecovery.UpdateReplicationProtectedItemInput{ Properties: &siterecovery.UpdateReplicationProtectedItemInputProperties{ RecoveryAzureVMName: &name, SelectedRecoveryAzureNetworkID: &targetNetworkId, diff --git a/azurerm/internal/services/recoveryservices/resource_arm_site_recovery_replication_policy.go b/azurerm/internal/services/recoveryservices/resource_arm_site_recovery_replication_policy.go index 1f0704015765..d3168757d374 100644 --- a/azurerm/internal/services/recoveryservices/resource_arm_site_recovery_replication_policy.go +++ b/azurerm/internal/services/recoveryservices/resource_arm_site_recovery_replication_policy.go @@ -86,7 +86,7 @@ func resourceArmSiteRecoveryReplicationPolicyCreate(d *schema.ResourceData, meta recoveryPoint := int32(d.Get("recovery_point_retention_in_minutes").(int)) appConsitency := int32(d.Get("application_consistent_snapshot_frequency_in_minutes").(int)) - var parameters = siterecovery.CreatePolicyInput{ + parameters := siterecovery.CreatePolicyInput{ Properties: &siterecovery.CreatePolicyInputProperties{ ProviderSpecificInput: &siterecovery.A2APolicyCreationInput{ RecoveryPointHistory: &recoveryPoint, @@ -125,7 +125,7 @@ func resourceArmSiteRecoveryReplicationPolicyUpdate(d *schema.ResourceData, meta recoveryPoint := int32(d.Get("recovery_point_retention_in_minutes").(int)) appConsitency := int32(d.Get("application_consistent_snapshot_frequency_in_minutes").(int)) - var parameters = siterecovery.UpdatePolicyInput{ + parameters := siterecovery.UpdatePolicyInput{ Properties: &siterecovery.UpdatePolicyInputProperties{ ReplicationProviderSettings: &siterecovery.A2APolicyCreationInput{ RecoveryPointHistory: &recoveryPoint, diff --git a/azurerm/internal/services/redis/data_source_redis_cache.go b/azurerm/internal/services/redis/data_source_redis_cache.go index 8e183cd82623..322385a7e0b1 100644 --- a/azurerm/internal/services/redis/data_source_redis_cache.go +++ b/azurerm/internal/services/redis/data_source_redis_cache.go @@ -260,7 +260,6 @@ func dataSourceArmRedisCacheRead(d *schema.ResourceData, meta interface{}) error } redisConfiguration, err := flattenRedisConfiguration(resp.RedisConfiguration) - if err != nil { return fmt.Errorf("Error flattening `redis_configuration`: %+v", err) } diff --git a/azurerm/internal/services/redis/resource_arm_redis_firewall_rule.go b/azurerm/internal/services/redis/resource_arm_redis_firewall_rule.go index 11419e70f000..9b75d012bf01 100644 --- a/azurerm/internal/services/redis/resource_arm_redis_firewall_rule.go +++ b/azurerm/internal/services/redis/resource_arm_redis_firewall_rule.go @@ -136,7 +136,6 @@ func resourceArmRedisFirewallRuleRead(d *schema.ResourceData, meta interface{}) name := id.Path["firewallRules"] resp, err := client.Get(ctx, resourceGroup, cacheName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { log.Printf("[DEBUG] Redis Firewall Rule %q was not found in Cache %q / Resource Group %q - removing from state", name, cacheName, resourceGroup) @@ -172,7 +171,6 @@ func resourceArmRedisFirewallRuleDelete(d *schema.ResourceData, meta interface{} name := id.Path["firewallRules"] resp, err := client.Delete(ctx, resourceGroup, cacheName, name) - if err != nil { if !utils.ResponseWasNotFound(resp) { return fmt.Errorf("Error issuing AzureRM delete request of Redis Firewall Rule %q (cache %q / resource group %q): %+v", name, cacheName, resourceGroup, err) diff --git a/azurerm/internal/services/redis/resource_arm_redis_linked_server.go b/azurerm/internal/services/redis/resource_arm_redis_linked_server.go index 97fa6b9ab187..52813cc681a8 100644 --- a/azurerm/internal/services/redis/resource_arm_redis_linked_server.go +++ b/azurerm/internal/services/redis/resource_arm_redis_linked_server.go @@ -163,7 +163,6 @@ func resourceArmRedisLinkedServerRead(d *schema.ResourceData, meta interface{}) name := id.Path["linkedServers"] resp, err := client.Get(ctx, resourceGroup, redisCacheName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { log.Printf("[DEBUG] Redis Linked Server %q was not found in Cache %q / Resource Group %q - removing from state", name, redisCacheName, resourceGroup) diff --git a/azurerm/internal/services/redis/tests/data_source_redis_cache_test.go b/azurerm/internal/services/redis/tests/data_source_redis_cache_test.go index b2d763652a32..79c493ebcadd 100644 --- a/azurerm/internal/services/redis/tests/data_source_redis_cache_test.go +++ b/azurerm/internal/services/redis/tests/data_source_redis_cache_test.go @@ -2,7 +2,6 @@ package tests import ( "fmt" - "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" diff --git a/azurerm/internal/services/redis/tests/resource_arm_redis_cache_test.go b/azurerm/internal/services/redis/tests/resource_arm_redis_cache_test.go index fb8c4df2f126..c31c43138875 100644 --- a/azurerm/internal/services/redis/tests/resource_arm_redis_cache_test.go +++ b/azurerm/internal/services/redis/tests/resource_arm_redis_cache_test.go @@ -302,6 +302,7 @@ func TestAccAzureRMRedisCache_AOFBackupEnabledDisabled(t *testing.T) { }, }) } + func TestAccAzureRMRedisCache_PatchSchedule(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_redis_cache", "test") @@ -484,7 +485,6 @@ func testCheckAzureRMRedisCacheDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/relay/resource_arm_relay_hybrid_connection.go b/azurerm/internal/services/relay/resource_arm_relay_hybrid_connection.go index e0dafd1ede20..4cbd837c8e31 100644 --- a/azurerm/internal/services/relay/resource_arm_relay_hybrid_connection.go +++ b/azurerm/internal/services/relay/resource_arm_relay_hybrid_connection.go @@ -172,7 +172,6 @@ func resourceArmHybridConnectionDelete(d *schema.ResourceData, meta interface{}) log.Printf("[INFO] Waiting for Relay Hybrid Connection %q (Namespace %q Resource Group %q) to be deleted", name, relayNamespace, resourceGroup) rc, err := client.Delete(ctx, resourceGroup, relayNamespace, name) - if err != nil { if response.WasNotFound(rc.Response) { return nil diff --git a/azurerm/internal/services/resource/tests/resource_arm_management_lock_test.go b/azurerm/internal/services/resource/tests/resource_arm_management_lock_test.go index cf6990b2f2c5..48df39086120 100644 --- a/azurerm/internal/services/resource/tests/resource_arm_management_lock_test.go +++ b/azurerm/internal/services/resource/tests/resource_arm_management_lock_test.go @@ -233,7 +233,6 @@ func testCheckAzureRMManagementLockDestroy(s *terraform.State) error { scope := rs.Primary.Attributes["scope"] resp, err := client.GetByScope(ctx, scope, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/resource/tests/resource_arm_template_deployment_test.go b/azurerm/internal/services/resource/tests/resource_arm_template_deployment_test.go index 6184fc181236..c24d64c44244 100644 --- a/azurerm/internal/services/resource/tests/resource_arm_template_deployment_test.go +++ b/azurerm/internal/services/resource/tests/resource_arm_template_deployment_test.go @@ -267,7 +267,6 @@ func testCheckAzureRMTemplateDeploymentDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/resource/tests/template_deployment_subscription_resource_test.go b/azurerm/internal/services/resource/tests/template_deployment_subscription_resource_test.go index c763d42844aa..4ee9dd5efbab 100644 --- a/azurerm/internal/services/resource/tests/template_deployment_subscription_resource_test.go +++ b/azurerm/internal/services/resource/tests/template_deployment_subscription_resource_test.go @@ -147,7 +147,6 @@ func testCheckSubscriptionTemplateDeploymentDestroyed(s *terraform.State) error name := rs.Primary.Attributes["name"] resp, err := client.GetAtSubscriptionScope(ctx, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/search/resource_arm_search_service.go b/azurerm/internal/services/search/resource_arm_search_service.go index 357b11074607..beaa921b82ca 100644 --- a/azurerm/internal/services/search/resource_arm_search_service.go +++ b/azurerm/internal/services/search/resource_arm_search_service.go @@ -302,7 +302,6 @@ func resourceArmSearchServiceDelete(d *schema.ResourceData, meta interface{}) er } resp, err := client.Delete(ctx, id.ResourceGroup, id.Name, nil) - if err != nil { if utils.ResponseWasNotFound(resp) { return nil diff --git a/azurerm/internal/services/securitycenter/azuresdkhacks/security_center_contact.go b/azurerm/internal/services/securitycenter/azuresdkhacks/security_center_contact.go index fcb02ca0a57d..a1fb668f11dd 100644 --- a/azurerm/internal/services/securitycenter/azuresdkhacks/security_center_contact.go +++ b/azurerm/internal/services/securitycenter/azuresdkhacks/security_center_contact.go @@ -12,11 +12,18 @@ import ( func CreateSecurityCenterContact(client *security.ContactsClient, ctx context.Context, securityContactName string, securityContact security.Contact) (result security.Contact, err error) { if err := validation.Validate([]validation.Validation{ - {TargetValue: client.SubscriptionID, - Constraints: []validation.Constraint{{Target: "client.SubscriptionID", Name: validation.Pattern, Rule: `^[0-9A-Fa-f]{8}-([0-9A-Fa-f]{4}-){3}[0-9A-Fa-f]{12}$`, Chain: nil}}}, - {TargetValue: securityContact, - Constraints: []validation.Constraint{{Target: "securityContact.ContactProperties", Name: validation.Null, Rule: false, - Chain: []validation.Constraint{{Target: "securityContact.ContactProperties.Email", Name: validation.Null, Rule: true, Chain: nil}}}}}}); err != nil { + { + TargetValue: client.SubscriptionID, + Constraints: []validation.Constraint{{Target: "client.SubscriptionID", Name: validation.Pattern, Rule: `^[0-9A-Fa-f]{8}-([0-9A-Fa-f]{4}-){3}[0-9A-Fa-f]{12}$`, Chain: nil}}, + }, + { + TargetValue: securityContact, + Constraints: []validation.Constraint{{ + Target: "securityContact.ContactProperties", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "securityContact.ContactProperties.Email", Name: validation.Null, Rule: true, Chain: nil}}, + }}, + }, + }); err != nil { return result, validation.NewError("security.ContactsClient", "Create", err.Error()) } diff --git a/azurerm/internal/services/securitycenter/resource_arm_security_center_workspace.go b/azurerm/internal/services/securitycenter/resource_arm_security_center_workspace.go index ef9bdd78fc73..1ef8303ab12e 100644 --- a/azurerm/internal/services/securitycenter/resource_arm_security_center_workspace.go +++ b/azurerm/internal/services/securitycenter/resource_arm_security_center_workspace.go @@ -79,7 +79,6 @@ func resourceArmSecurityCenterWorkspaceCreateUpdate(d *schema.ResourceData, meta // get pricing tier, workspace can only be configured when tier is not Free. // API does not error, it just doesn't set the workspace scope isPricingStandard, err := isPricingStandard(ctx, priceClient) - if err != nil { return fmt.Errorf("Checking Security Center Subscription pricing tier %v", err) } diff --git a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_namespace_authorization_rule_test.go b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_namespace_authorization_rule_test.go index b7005d0369a2..a23465fd4da5 100644 --- a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_namespace_authorization_rule_test.go +++ b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_namespace_authorization_rule_test.go @@ -93,6 +93,7 @@ func TestAccAzureRMServiceBusNamespaceAuthorizationRule_rightsUpdate(t *testing. }, }) } + func TestAccAzureRMServiceBusNamespaceAuthorizationRule_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_servicebus_namespace_authorization_rule", "test") diff --git a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_namespace_migration_test.go b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_namespace_migration_test.go index ea4e95b31672..b3e3be3cf4eb 100644 --- a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_namespace_migration_test.go +++ b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_namespace_migration_test.go @@ -106,7 +106,6 @@ func TestAccAzureRMServiceBusNamespaceMigrateState(t *testing.T) { Attributes: tc.Attributes, } is, err := servicebus.ResourceAzureRMServiceBusNamespaceMigrateState(tc.StateVersion, is, nil) - if err != nil { t.Fatalf("bad: %q, err: %#v", tn, err) } diff --git a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_namespace_test.go b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_namespace_test.go index 4251764579d2..e0904623a82f 100644 --- a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_namespace_test.go +++ b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_namespace_test.go @@ -29,6 +29,7 @@ func TestAccAzureRMServiceBusNamespace_basic(t *testing.T) { }, }) } + func TestAccAzureRMServiceBusNamespace_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_servicebus_namespace", "test") @@ -177,7 +178,6 @@ func testCheckAzureRMServiceBusNamespaceDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { return nil } diff --git a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_queue_authorization_rule_test.go b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_queue_authorization_rule_test.go index e726f659d55b..6ecaa61992e3 100644 --- a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_queue_authorization_rule_test.go +++ b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_queue_authorization_rule_test.go @@ -93,6 +93,7 @@ func TestAccAzureRMServiceBusQueueAuthorizationRule_rightsUpdate(t *testing.T) { }, }) } + func TestAccAzureRMServiceBusQueueAuthorizationRule_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_servicebus_queue_authorization_rule", "test") diff --git a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_queue_test.go b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_queue_test.go index 87f1e81296b9..c700e4ac1ea3 100644 --- a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_queue_test.go +++ b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_queue_test.go @@ -31,6 +31,7 @@ func TestAccAzureRMServiceBusQueue_basic(t *testing.T) { }, }) } + func TestAccAzureRMServiceBusQueue_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_servicebus_queue", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_subscription_rule_test.go b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_subscription_rule_test.go index 8ef96dbd54c3..4af6ee0d598e 100644 --- a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_subscription_rule_test.go +++ b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_subscription_rule_test.go @@ -28,6 +28,7 @@ func TestAccAzureRMServiceBusSubscriptionRule_basicSqlFilter(t *testing.T) { }, }) } + func TestAccAzureRMServiceBusSubscriptionRule_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_servicebus_subscription_rule", "test") diff --git a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_topic_test.go b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_topic_test.go index 61253cb1162e..c8a86be92c05 100644 --- a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_topic_test.go +++ b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_topic_test.go @@ -30,6 +30,7 @@ func TestAccAzureRMServiceBusTopic_basic(t *testing.T) { }, }) } + func TestAccAzureRMServiceBusTopic_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_servicebus_topic", "test") diff --git a/azurerm/internal/services/servicefabric/tests/resource_arm_service_fabric_cluster_test.go b/azurerm/internal/services/servicefabric/tests/resource_arm_service_fabric_cluster_test.go index 08719913987d..2b741d9f7427 100644 --- a/azurerm/internal/services/servicefabric/tests/resource_arm_service_fabric_cluster_test.go +++ b/azurerm/internal/services/servicefabric/tests/resource_arm_service_fabric_cluster_test.go @@ -784,7 +784,6 @@ func testCheckAzureRMServiceFabricClusterDestroy(s *terraform.State) error { } resp, err := client.Get(ctx, id.ResourceGroup, id.Name) - if err != nil { return nil } diff --git a/azurerm/internal/services/servicefabricmesh/tests/service_fabric_mesh_application_resource_test.go b/azurerm/internal/services/servicefabricmesh/tests/service_fabric_mesh_application_resource_test.go index c71af5821e2d..94eb0d8860d0 100644 --- a/azurerm/internal/services/servicefabricmesh/tests/service_fabric_mesh_application_resource_test.go +++ b/azurerm/internal/services/servicefabricmesh/tests/service_fabric_mesh_application_resource_test.go @@ -79,7 +79,6 @@ func testCheckAzureRMServiceFabricMeshApplicationDestroy(s *terraform.State) err } resp, err := client.Get(ctx, id.ResourceGroup, id.Name) - if err != nil { return nil } diff --git a/azurerm/internal/services/servicefabricmesh/tests/service_fabric_mesh_local_network_resource_test.go b/azurerm/internal/services/servicefabricmesh/tests/service_fabric_mesh_local_network_resource_test.go index c4a1a74d2aff..6609000d966a 100644 --- a/azurerm/internal/services/servicefabricmesh/tests/service_fabric_mesh_local_network_resource_test.go +++ b/azurerm/internal/services/servicefabricmesh/tests/service_fabric_mesh_local_network_resource_test.go @@ -79,7 +79,6 @@ func testCheckAzureRMServiceFabricMeshLocalNetworkDestroy(s *terraform.State) er } resp, err := client.Get(ctx, id.ResourceGroup, id.Name) - if err != nil { return nil } diff --git a/azurerm/internal/services/servicefabricmesh/tests/service_fabric_mesh_secret_resource_test.go b/azurerm/internal/services/servicefabricmesh/tests/service_fabric_mesh_secret_resource_test.go index 51812c5e74a0..c4ff04f99c2b 100644 --- a/azurerm/internal/services/servicefabricmesh/tests/service_fabric_mesh_secret_resource_test.go +++ b/azurerm/internal/services/servicefabricmesh/tests/service_fabric_mesh_secret_resource_test.go @@ -79,7 +79,6 @@ func testCheckAzureRMServiceFabricMeshSecretDestroy(s *terraform.State) error { } resp, err := client.Get(ctx, id.ResourceGroup, id.Name) - if err != nil { return nil } diff --git a/azurerm/internal/services/servicefabricmesh/tests/service_fabric_mesh_secret_value_resource_test.go b/azurerm/internal/services/servicefabricmesh/tests/service_fabric_mesh_secret_value_resource_test.go index 4a139ceb72a9..b53f504a9e91 100644 --- a/azurerm/internal/services/servicefabricmesh/tests/service_fabric_mesh_secret_value_resource_test.go +++ b/azurerm/internal/services/servicefabricmesh/tests/service_fabric_mesh_secret_value_resource_test.go @@ -65,7 +65,6 @@ func testCheckAzureRMServiceFabricMeshSecretValueDestroy(s *terraform.State) err } resp, err := client.Get(ctx, id.ResourceGroup, id.SecretName, id.Name) - if err != nil { return nil } diff --git a/azurerm/internal/services/sql/resource_arm_sql_server.go b/azurerm/internal/services/sql/resource_arm_sql_server.go index fa22994b56da..c34415003c5e 100644 --- a/azurerm/internal/services/sql/resource_arm_sql_server.go +++ b/azurerm/internal/services/sql/resource_arm_sql_server.go @@ -300,6 +300,7 @@ func expandAzureRmSqlServerIdentity(d *schema.ResourceData) *sql.ResourceIdentit Type: identityType, } } + func flattenAzureRmSqlServerIdentity(identity *sql.ResourceIdentity) []interface{} { if identity == nil { return []interface{}{} diff --git a/azurerm/internal/services/sql/resource_arm_sql_virtual_network_rule.go b/azurerm/internal/services/sql/resource_arm_sql_virtual_network_rule.go index ec4b95dacc23..bfc5ab55b5c5 100644 --- a/azurerm/internal/services/sql/resource_arm_sql_virtual_network_rule.go +++ b/azurerm/internal/services/sql/resource_arm_sql_virtual_network_rule.go @@ -272,7 +272,6 @@ func ValidateSqlVirtualNetworkRuleName(v interface{}, k string) (warnings []stri func sqlVirtualNetworkStateStatusCodeRefreshFunc(ctx context.Context, client *sql.VirtualNetworkRulesClient, resourceGroup string, serverName string, name string) resource.StateRefreshFunc { return func() (interface{}, string, error) { resp, err := client.Get(ctx, resourceGroup, serverName, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { log.Printf("[DEBUG] Retrieving SQL Virtual Network Rule %q (SQL Server: %q, Resource Group: %q) returned 404.", resourceGroup, serverName, name) diff --git a/azurerm/internal/services/sql/tests/resource_arm_sql_administrator_test.go b/azurerm/internal/services/sql/tests/resource_arm_sql_administrator_test.go index 8d62199ebcff..b0bb64c4d937 100644 --- a/azurerm/internal/services/sql/tests/resource_arm_sql_administrator_test.go +++ b/azurerm/internal/services/sql/tests/resource_arm_sql_administrator_test.go @@ -37,6 +37,7 @@ func TestAccAzureRMSqlAdministrator_basic(t *testing.T) { }, }) } + func TestAccAzureRMSqlAdministrator_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_sql_active_directory_administrator", "test") diff --git a/azurerm/internal/services/sql/tests/resource_arm_sql_database_test.go b/azurerm/internal/services/sql/tests/resource_arm_sql_database_test.go index 27c0353e6bef..a01537e22b56 100644 --- a/azurerm/internal/services/sql/tests/resource_arm_sql_database_test.go +++ b/azurerm/internal/services/sql/tests/resource_arm_sql_database_test.go @@ -35,6 +35,7 @@ func TestAccAzureRMSqlDatabase_basic(t *testing.T) { }, }) } + func TestAccAzureRMSqlDatabase_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_sql_database", "test") diff --git a/azurerm/internal/services/sql/tests/resource_arm_sql_elasticpool_test.go b/azurerm/internal/services/sql/tests/resource_arm_sql_elasticpool_test.go index 6d6796fb3ade..052fe39db5a4 100644 --- a/azurerm/internal/services/sql/tests/resource_arm_sql_elasticpool_test.go +++ b/azurerm/internal/services/sql/tests/resource_arm_sql_elasticpool_test.go @@ -29,6 +29,7 @@ func TestAccAzureRMSqlElasticPool_basic(t *testing.T) { }, }) } + func TestAccAzureRMSqlElasticPool_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_sql_elasticpool", "test") @@ -137,7 +138,6 @@ func testCheckAzureRMSqlElasticPoolDestroy(s *terraform.State) error { poolName := rs.Primary.Attributes["name"] resp, err := client.Get(ctx, resourceGroup, serverName, poolName) - if err != nil { return nil } diff --git a/azurerm/internal/services/sql/tests/resource_arm_sql_firewall_rule_test.go b/azurerm/internal/services/sql/tests/resource_arm_sql_firewall_rule_test.go index 0c61b44b0f5e..f9afb3324206 100644 --- a/azurerm/internal/services/sql/tests/resource_arm_sql_firewall_rule_test.go +++ b/azurerm/internal/services/sql/tests/resource_arm_sql_firewall_rule_test.go @@ -39,6 +39,7 @@ func TestAccAzureRMSqlFirewallRule_basic(t *testing.T) { }, }) } + func TestAccAzureRMSqlFirewallRule_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_sql_firewall_rule", "test") diff --git a/azurerm/internal/services/sql/tests/resource_arm_sql_server_test.go b/azurerm/internal/services/sql/tests/resource_arm_sql_server_test.go index 454118c4731b..084afba16302 100644 --- a/azurerm/internal/services/sql/tests/resource_arm_sql_server_test.go +++ b/azurerm/internal/services/sql/tests/resource_arm_sql_server_test.go @@ -35,6 +35,7 @@ func TestAccAzureRMSqlServer_basic(t *testing.T) { }, }) } + func TestAccAzureRMSqlServer_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_sql_server", "test") @@ -238,7 +239,6 @@ func testCheckAzureRMSqlServerDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, sqlServerName) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/sql/tests/resource_arm_sql_virtual_network_rule_test.go b/azurerm/internal/services/sql/tests/resource_arm_sql_virtual_network_rule_test.go index ca7d873374e6..1ca6173c1a8b 100644 --- a/azurerm/internal/services/sql/tests/resource_arm_sql_virtual_network_rule_test.go +++ b/azurerm/internal/services/sql/tests/resource_arm_sql_virtual_network_rule_test.go @@ -521,6 +521,7 @@ resource "azurerm_sql_virtual_network_rule" "test" { } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) } + func testAccAzureRMSqlVirtualNetworkRule_requiresImport(data acceptance.TestData) string { return fmt.Sprintf(` %s diff --git a/azurerm/internal/services/storage/data_source_storage_account_blob_container_sas.go b/azurerm/internal/services/storage/data_source_storage_account_blob_container_sas.go index 875bd72caf1b..6bbdd882704f 100644 --- a/azurerm/internal/services/storage/data_source_storage_account_blob_container_sas.go +++ b/azurerm/internal/services/storage/data_source_storage_account_blob_container_sas.go @@ -157,7 +157,7 @@ func dataSourceArmStorageContainerSasRead(d *schema.ResourceData, _ interface{}) // Create the string to sign with the key... accountName := kvp[connStringAccountNameKey] accountKey := kvp[connStringAccountKeyKey] - var signedProtocol = "https,http" + signedProtocol := "https,http" if httpsOnly { signedProtocol = "https" } diff --git a/azurerm/internal/services/storage/data_source_storage_account_sas.go b/azurerm/internal/services/storage/data_source_storage_account_sas.go index c6b07059a55f..cd0ecde9ec93 100644 --- a/azurerm/internal/services/storage/data_source_storage_account_sas.go +++ b/azurerm/internal/services/storage/data_source_storage_account_sas.go @@ -196,7 +196,7 @@ func dataSourceArmStorageAccountSasRead(d *schema.ResourceData, _ interface{}) e // https://docs.microsoft.com/en-us/rest/api/storageservices/Constructing-an-Account-SAS accountName := kvp[connStringAccountNameKey] accountKey := kvp[connStringAccountKeyKey] - var signedProtocol = "https,http" + signedProtocol := "https,http" if httpsOnly { signedProtocol = "https" } diff --git a/azurerm/internal/services/storage/resource_arm_storage_share.go b/azurerm/internal/services/storage/resource_arm_storage_share.go index 4e00d522f08c..35b8f3a7a321 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_share.go +++ b/azurerm/internal/services/storage/resource_arm_storage_share.go @@ -120,6 +120,7 @@ func resourceArmStorageShare() *schema.Resource { }, } } + func resourceArmStorageShareCreate(d *schema.ResourceData, meta interface{}) error { ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/storage/resource_arm_storage_sync.go b/azurerm/internal/services/storage/resource_arm_storage_sync.go index 849a8d147d3e..2aeb29bd9ce9 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_sync.go +++ b/azurerm/internal/services/storage/resource_arm_storage_sync.go @@ -57,7 +57,8 @@ func resourceArmStorageSync() *schema.Resource { Default: string(storagesync.AllowAllTraffic), ValidateFunc: validation.StringInSlice([]string{ string(storagesync.AllowAllTraffic), - string(storagesync.AllowVirtualNetworksOnly)}, false), + string(storagesync.AllowVirtualNetworksOnly), + }, false), }, "tags": tags.Schema(), diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_migration_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_migration_test.go index c2993c108e05..04bb0a38512b 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_account_migration_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_account_migration_test.go @@ -53,7 +53,6 @@ func TestAzureRMStorageAccountMigrateState(t *testing.T) { Attributes: tc.InputAttributes, } is, err := storage.ResourceStorageAccountMigrateState(tc.StateVersion, is, tc.Meta) - if err != nil { t.Fatalf("bad: %s, err: %#v", tn, err) } diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_blob_migration_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_blob_migration_test.go index 1b956c96f4b2..45cd86449e00 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_blob_migration_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_blob_migration_test.go @@ -64,7 +64,6 @@ func TestAccAzureRMStorageBlobMigrateState(t *testing.T) { Attributes: tc.InputAttributes, } is, err := storage.ResourceStorageBlobMigrateState(tc.StateVersion, is, client) - if err != nil { t.Fatalf("bad: %s, err: %#v", tn, err) } diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_container_migration_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_container_migration_test.go index adfaf0b7f1d0..bae087bfd3fb 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_container_migration_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_container_migration_test.go @@ -63,7 +63,6 @@ func TestAccAzureRMStorageContainerMigrateState(t *testing.T) { Attributes: tc.InputAttributes, } is, err := storage.ResourceStorageContainerMigrateState(tc.StateVersion, is, client) - if err != nil { t.Fatalf("bad: %s, err: %#v", tn, err) } diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_queue_migration_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_queue_migration_test.go index 1035c8e36f27..3c5ca645f857 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_queue_migration_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_queue_migration_test.go @@ -63,7 +63,6 @@ func TestAccAzureRMStorageQueueMigrateState(t *testing.T) { Attributes: tc.InputAttributes, } is, err := storage.ResourceStorageQueueMigrateState(tc.StateVersion, is, client) - if err != nil { t.Fatalf("bad: %s, err: %#v", tn, err) } diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_share_directory_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_share_directory_test.go index 69e0a9cc4b0e..7477faedc9e0 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_share_directory_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_share_directory_test.go @@ -112,6 +112,7 @@ func TestAccAzureRMStorageShareDirectory_update(t *testing.T) { }, }) } + func TestAccAzureRMStorageShareDirectory_nested(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_storage_share_directory", "parent") diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_share_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_share_test.go index bcc10a965aac..0ec760f27697 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_share_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_share_test.go @@ -444,6 +444,7 @@ resource "azurerm_storage_share" "test" { } `, template, data.RandomString) } + func testAccAzureRMStorageShare_requiresImport(data acceptance.TestData) string { template := testAccAzureRMStorageShare_basic(data) return fmt.Sprintf(` diff --git a/azurerm/internal/services/trafficmanager/tests/resource_arm_traffic_manager_endpoint_test.go b/azurerm/internal/services/trafficmanager/tests/resource_arm_traffic_manager_endpoint_test.go index a19fb0a77c51..80cf59a85b4e 100644 --- a/azurerm/internal/services/trafficmanager/tests/resource_arm_traffic_manager_endpoint_test.go +++ b/azurerm/internal/services/trafficmanager/tests/resource_arm_traffic_manager_endpoint_test.go @@ -34,6 +34,7 @@ func TestAccAzureRMTrafficManagerEndpoint_basic(t *testing.T) { }, }) } + func TestAccAzureRMTrafficManagerEndpoint_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_traffic_manager_endpoint", "testAzure") externalResourceName := "azurerm_traffic_manager_endpoint.testExternal" @@ -634,6 +635,7 @@ resource "azurerm_traffic_manager_endpoint" "testExternalNew" { } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) } + func testAccAzureRMTrafficManagerEndpoint_priority(data acceptance.TestData) string { return fmt.Sprintf(` provider "azurerm" { diff --git a/azurerm/internal/services/web/data_source_app_service.go b/azurerm/internal/services/web/data_source_app_service.go index eeeae1115726..96fa732dc355 100644 --- a/azurerm/internal/services/web/data_source_app_service.go +++ b/azurerm/internal/services/web/data_source_app_service.go @@ -126,6 +126,7 @@ func dataSourceArmAppService() *schema.Resource { }, } } + func dataSourceArmAppServiceRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Web.AppServicesClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) diff --git a/azurerm/internal/services/web/data_source_function_app_host_keys.go b/azurerm/internal/services/web/data_source_function_app_host_keys.go index 6828417b78eb..a6f8ed139eb2 100644 --- a/azurerm/internal/services/web/data_source_function_app_host_keys.go +++ b/azurerm/internal/services/web/data_source_function_app_host_keys.go @@ -71,7 +71,6 @@ func dataSourceArmFunctionAppHostKeysRead(d *schema.ResourceData, meta interface d.SetId(*functionSettings.ID) res, err := client.ListHostKeys(ctx, resourceGroup, name) - if err != nil { if utils.ResponseWasNotFound(res.Response) { return fmt.Errorf("Error: AzureRM Function App %q (Resource Group %q) was not found", name, resourceGroup) diff --git a/azurerm/internal/services/web/resource_arm_app_service.go b/azurerm/internal/services/web/resource_arm_app_service.go index 70fd48e3122e..53eb3567a751 100644 --- a/azurerm/internal/services/web/resource_arm_app_service.go +++ b/azurerm/internal/services/web/resource_arm_app_service.go @@ -306,7 +306,8 @@ func resourceArmAppServiceCreate(d *schema.ResourceData, meta interface{}) error auth := web.SiteAuthSettings{ ID: read.ID, - SiteAuthSettingsProperties: &authSettings} + SiteAuthSettingsProperties: &authSettings, + } if _, err := client.UpdateAuthSettings(ctx, resourceGroup, name, auth); err != nil { return fmt.Errorf("Error updating auth settings for App Service %q (Resource Group %q): %+v", name, resourceGroup, err) @@ -316,7 +317,8 @@ func resourceArmAppServiceCreate(d *schema.ResourceData, meta interface{}) error logs := web.SiteLogsConfig{ ID: read.ID, - SiteLogsConfigProperties: &logsConfig} + SiteLogsConfigProperties: &logsConfig, + } if _, err := client.UpdateDiagnosticLogsConfig(ctx, resourceGroup, name, logs); err != nil { return fmt.Errorf("Error updating diagnostic logs config for App Service %q (Resource Group %q): %+v", name, resourceGroup, err) @@ -533,7 +535,6 @@ func resourceArmAppServiceUpdate(d *schema.ResourceData, meta interface{}) error site.Identity = appServiceIdentity future, err := client.CreateOrUpdate(ctx, id.ResourceGroup, id.Name, site) - if err != nil { return fmt.Errorf("Error updating Managed Service Identity for App Service %q: %+v", id.Name, err) } diff --git a/azurerm/internal/services/web/resource_arm_function_app.go b/azurerm/internal/services/web/resource_arm_function_app.go index b7e3cab6679e..626ed477c8b7 100644 --- a/azurerm/internal/services/web/resource_arm_function_app.go +++ b/azurerm/internal/services/web/resource_arm_function_app.go @@ -362,7 +362,8 @@ func resourceArmFunctionAppCreate(d *schema.ResourceData, meta interface{}) erro auth := web.SiteAuthSettings{ ID: read.ID, - SiteAuthSettingsProperties: &authSettings} + SiteAuthSettingsProperties: &authSettings, + } if _, err := client.UpdateAuthSettings(ctx, resourceGroup, name, auth); err != nil { return fmt.Errorf("Error updating auth settings for Function App %q (resource group %q): %+v", name, resourceGroup, err) diff --git a/azurerm/internal/services/web/resource_arm_function_app_slot.go b/azurerm/internal/services/web/resource_arm_function_app_slot.go index 21243d5a09c9..d115f8122307 100644 --- a/azurerm/internal/services/web/resource_arm_function_app_slot.go +++ b/azurerm/internal/services/web/resource_arm_function_app_slot.go @@ -318,7 +318,8 @@ func resourceArmFunctionAppSlotCreate(d *schema.ResourceData, meta interface{}) auth := web.SiteAuthSettings{ ID: read.ID, - SiteAuthSettingsProperties: &authSettings} + SiteAuthSettingsProperties: &authSettings, + } if _, err := client.UpdateAuthSettingsSlot(ctx, resourceGroup, functionAppName, auth, slot); err != nil { return fmt.Errorf("Error updating auth settings for Slot %q (Function App Slot %q / Resource Group %q): %+s", slot, functionAppName, resourceGroup, err) diff --git a/azurerm/internal/services/web/tests/app_service_environment_resource_test.go b/azurerm/internal/services/web/tests/app_service_environment_resource_test.go index 33d42cd46280..619e504a2594 100644 --- a/azurerm/internal/services/web/tests/app_service_environment_resource_test.go +++ b/azurerm/internal/services/web/tests/app_service_environment_resource_test.go @@ -259,7 +259,6 @@ func testCheckAzureRMAppServiceEnvironmentDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/web/tests/app_service_hybrid_connection_resource_test.go b/azurerm/internal/services/web/tests/app_service_hybrid_connection_resource_test.go index eb8c6ebb6a50..52a092dbd8c1 100644 --- a/azurerm/internal/services/web/tests/app_service_hybrid_connection_resource_test.go +++ b/azurerm/internal/services/web/tests/app_service_hybrid_connection_resource_test.go @@ -107,7 +107,6 @@ func testCheckAzureRMAppServiceHybridConnectionDestroy(s *terraform.State) error relayName := rs.Primary.Attributes["relay_name"] ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext resp, err := client.GetHybridConnection(ctx, resGroup, name, namespaceName, relayName) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/web/tests/data_source_app_service_plan_test.go b/azurerm/internal/services/web/tests/data_source_app_service_plan_test.go index 4929524792df..4128d2a858b2 100644 --- a/azurerm/internal/services/web/tests/data_source_app_service_plan_test.go +++ b/azurerm/internal/services/web/tests/data_source_app_service_plan_test.go @@ -2,7 +2,6 @@ package tests import ( "fmt" - "testing" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" diff --git a/azurerm/internal/services/web/tests/resource_arm_app_service_certificate_order_test.go b/azurerm/internal/services/web/tests/resource_arm_app_service_certificate_order_test.go index ed5155639789..e4349df8148a 100644 --- a/azurerm/internal/services/web/tests/resource_arm_app_service_certificate_order_test.go +++ b/azurerm/internal/services/web/tests/resource_arm_app_service_certificate_order_test.go @@ -179,7 +179,6 @@ func testCheckAzureRMAppServiceCertificateOrderDestroy(s *terraform.State) error resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/web/tests/resource_arm_app_service_custom_hostname_binding_test.go b/azurerm/internal/services/web/tests/resource_arm_app_service_custom_hostname_binding_test.go index 944b74a52cfc..f9768b8122d4 100644 --- a/azurerm/internal/services/web/tests/resource_arm_app_service_custom_hostname_binding_test.go +++ b/azurerm/internal/services/web/tests/resource_arm_app_service_custom_hostname_binding_test.go @@ -146,7 +146,6 @@ func testCheckAzureRMAppServiceCustomHostnameBindingDestroy(s *terraform.State) hostname := rs.Primary.Attributes["hostname"] resp, err := client.GetHostNameBinding(ctx, resourceGroup, appServiceName, hostname) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/web/tests/resource_arm_app_service_plan_test.go b/azurerm/internal/services/web/tests/resource_arm_app_service_plan_test.go index b47388c636de..f73899e58437 100644 --- a/azurerm/internal/services/web/tests/resource_arm_app_service_plan_test.go +++ b/azurerm/internal/services/web/tests/resource_arm_app_service_plan_test.go @@ -273,7 +273,6 @@ func testCheckAzureRMAppServicePlanDestroy(s *terraform.State) error { name := rs.Primary.Attributes["name"] resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := conn.Get(ctx, resourceGroup, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/web/tests/resource_arm_app_service_slot_test.go b/azurerm/internal/services/web/tests/resource_arm_app_service_slot_test.go index a7d6b900be20..7a03ad65731e 100644 --- a/azurerm/internal/services/web/tests/resource_arm_app_service_slot_test.go +++ b/azurerm/internal/services/web/tests/resource_arm_app_service_slot_test.go @@ -1384,7 +1384,6 @@ func testCheckAzureRMAppServiceSlotDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.GetSlot(ctx, resourceGroup, appServiceName, slot) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/web/tests/resource_arm_app_service_slot_virtual_network_association_test.go b/azurerm/internal/services/web/tests/resource_arm_app_service_slot_virtual_network_association_test.go index 2bcdc3f4aefd..174525094f02 100644 --- a/azurerm/internal/services/web/tests/resource_arm_app_service_slot_virtual_network_association_test.go +++ b/azurerm/internal/services/web/tests/resource_arm_app_service_slot_virtual_network_association_test.go @@ -169,7 +169,6 @@ func testCheckAzureRMAppServiceSlotVirtualNetworkSwiftConnectionDestroy(s *terra } resp, err := client.GetSwiftVirtualNetworkConnectionSlot(ctx, id.ResourceGroup, id.SiteName, id.SiteName) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/web/tests/resource_arm_app_service_test.go b/azurerm/internal/services/web/tests/resource_arm_app_service_test.go index bcfca14c4026..707c3261fd43 100644 --- a/azurerm/internal/services/web/tests/resource_arm_app_service_test.go +++ b/azurerm/internal/services/web/tests/resource_arm_app_service_test.go @@ -1161,6 +1161,7 @@ func TestAccAzureRMAppService_windowsJava8Java(t *testing.T) { }, }) } + func TestAccAzureRMAppService_windowsJava11Java(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_app_service", "test") resource.ParallelTest(t, resource.TestCase{ @@ -1223,6 +1224,7 @@ func TestAccAzureRMAppService_windowsJava8Jetty(t *testing.T) { }, }) } + func TestAccAzureRMAppService_windowsJava11Jetty(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_app_service", "test") resource.ParallelTest(t, resource.TestCase{ @@ -1243,6 +1245,7 @@ func TestAccAzureRMAppService_windowsJava11Jetty(t *testing.T) { }, }) } + func TestAccAzureRMAppService_windowsJava7Tomcat(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_app_service", "test") resource.ParallelTest(t, resource.TestCase{ @@ -1284,6 +1287,7 @@ func TestAccAzureRMAppService_windowsJava8Tomcat(t *testing.T) { }, }) } + func TestAccAzureRMAppService_windowsJava11Tomcat(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_app_service", "test") resource.ParallelTest(t, resource.TestCase{ @@ -1566,7 +1570,8 @@ func TestAccAzureRMAppService_corsSettings(t *testing.T) { resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.cors.#", "1"), resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.cors.0.support_credentials", "true"), resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.cors.0.allowed_origins.#", "3"), - )}, + ), + }, data.ImportStep(), }, }) @@ -1932,7 +1937,6 @@ func testCheckAzureRMAppServiceDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/web/tests/resource_arm_app_service_virtual_network_association_test.go b/azurerm/internal/services/web/tests/resource_arm_app_service_virtual_network_association_test.go index 3883bb55cb7f..794dba170162 100644 --- a/azurerm/internal/services/web/tests/resource_arm_app_service_virtual_network_association_test.go +++ b/azurerm/internal/services/web/tests/resource_arm_app_service_virtual_network_association_test.go @@ -169,7 +169,6 @@ func testCheckAzureRMAppServiceVirtualNetworkSwiftConnectionDestroy(s *terraform } resp, err := client.GetSwiftVirtualNetworkConnection(ctx, id.ResourceGroup, id.SiteName) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/web/tests/resource_arm_function_app_slot_test.go b/azurerm/internal/services/web/tests/resource_arm_function_app_slot_test.go index a5044073f6c8..b8589a5a1a7f 100644 --- a/azurerm/internal/services/web/tests/resource_arm_function_app_slot_test.go +++ b/azurerm/internal/services/web/tests/resource_arm_function_app_slot_test.go @@ -711,7 +711,6 @@ func testCheckAzureRMFunctionAppSlotDestroy(s *terraform.State) error { resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.GetSlot(ctx, resourceGroup, FunctionAppName, slot) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/services/web/tests/resource_arm_function_app_test.go b/azurerm/internal/services/web/tests/resource_arm_function_app_test.go index 9061b6eb6bc2..76095f23b371 100644 --- a/azurerm/internal/services/web/tests/resource_arm_function_app_test.go +++ b/azurerm/internal/services/web/tests/resource_arm_function_app_test.go @@ -986,7 +986,6 @@ func testCheckAzureRMFunctionAppDestroy(s *terraform.State) error { name := rs.Primary.Attributes["name"] resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { if utils.ResponseWasNotFound(resp.Response) { return nil diff --git a/azurerm/internal/tools/generator-services/main.go b/azurerm/internal/tools/generator-services/main.go index 1ca4ca33db68..6a5337c390a4 100644 --- a/azurerm/internal/tools/generator-services/main.go +++ b/azurerm/internal/tools/generator-services/main.go @@ -45,6 +45,7 @@ type teamCityServicesListGenerator struct{} func (teamCityServicesListGenerator) outputPath(rootDirectory string) string { return fmt.Sprintf("%s/.teamcity/components/generated/services.kt", rootDirectory) } + func (teamCityServicesListGenerator) run(outputFileName string) error { template := `// NOTE: this is Generated from the Service Definitions - manual changes will be lost // to re-generate this file, run 'make generate' in the root of the repository diff --git a/azurerm/internal/tools/website-scaffold/main.go b/azurerm/internal/tools/website-scaffold/main.go index 59769b6a222e..f4069a4ad571 100644 --- a/azurerm/internal/tools/website-scaffold/main.go +++ b/azurerm/internal/tools/website-scaffold/main.go @@ -29,7 +29,7 @@ func main() { _ = f.Parse(os.Args[1:]) - var quitWithError = func(message string) { + quitWithError := func(message string) { log.Print(message) os.Exit(1) } @@ -204,7 +204,7 @@ func (gen documentationGenerator) generate() string { // blocks func (gen documentationGenerator) argumentsBlock() string { - var documentationForArguments = func(input map[string]*schema.Schema, onlyRequired, onlyOptional bool, blockName string) string { + documentationForArguments := func(input map[string]*schema.Schema, onlyRequired, onlyOptional bool, blockName string) string { fields := "" for _, fieldName := range gen.sortFields(input) { @@ -283,7 +283,7 @@ The following arguments are supported: } func (gen documentationGenerator) attributesBlock() string { - var documentationForAttributes = func(input map[string]*schema.Schema, onlyComputed bool, blockName string) string { + documentationForAttributes := func(input map[string]*schema.Schema, onlyComputed bool, blockName string) string { fields := "" // now list all of the top-level fields / blocks alphabetically @@ -409,7 +409,7 @@ func (gen documentationGenerator) timeoutsBlock() string { timeoutsBlurb := "The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions:" - var timeoutToFriendlyText = func(duration time.Duration) string { + timeoutToFriendlyText := func(duration time.Duration) string { hours := int(math.Floor(duration.Hours())) if hours > 0 { var hoursText string @@ -714,7 +714,7 @@ func (gen documentationGenerator) requiredFieldsForExampleBlock(fields map[strin indent := gen.buildIndentForExample(indentLevel) output := "" - var processField = func(name string, field *schema.Schema) string { + processField := func(name string, field *schema.Schema) string { value := gen.determineDefaultValueForExample(name, field) return fmt.Sprintf("%s%s = %s\n", indent, name, value) } diff --git a/azurerm/internal/tools/website-scaffold/main_test.go b/azurerm/internal/tools/website-scaffold/main_test.go index f50126a4b482..ccf7505852fe 100644 --- a/azurerm/internal/tools/website-scaffold/main_test.go +++ b/azurerm/internal/tools/website-scaffold/main_test.go @@ -173,7 +173,7 @@ func runTest(t *testing.T, expected, actual string) { } func setupDocGen(isDataSource bool, resource *schema.Resource) documentationGenerator { - var toStrPtr = func(input string) *string { + toStrPtr := func(input string) *string { return &input } return documentationGenerator{ diff --git a/azurerm/utils/response_test.go b/azurerm/utils/response_test.go index f86098b2f210..4c22070383c8 100644 --- a/azurerm/utils/response_test.go +++ b/azurerm/utils/response_test.go @@ -61,9 +61,11 @@ func TestResponseErrorIsRetryable(t *testing.T) { {"Temporary errors are retryable", testNetError{false, true}, true}, {"net.Errors that are neither temporary nor timeouts are not retryable", testNetError{false, false}, false}, {"Retryable error nested in autorest.DetailedError is retryable", autorest.DetailedError{ - Original: testNetError{true, true}}, true}, + Original: testNetError{true, true}, + }, true}, {"Unhandled error nested in autorest.DetailedError is not retryable", autorest.DetailedError{ - Original: fmt.Errorf("Some other error")}, false}, + Original: fmt.Errorf("Some other error"), + }, false}, {"nil is handled as non-retryable", nil, false}, }