Merge pull request hashicorp#4212 from terraform-providers/tests/tfli…

…nt_rchecks tests: add tf linting R checks & fix errors
digipost · Sep 3, 2019 · d9deab4 · d9deab4
2 parents e00cf1c + 84b2da4
commit d9deab4
Show file tree

Hide file tree

Showing 27 changed files with 223 additions and 276 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,6 +29,8 @@ matrix:
   include:
     - name: "make lint"
       script: GOGC=20 make lint
+    - name: "make tflint"
+      script: make tflint
     - name: "make test"
       script: make test
     - name: "make website-lint"

diff --git a/GNUmakefile b/GNUmakefile
@@ -12,8 +12,9 @@ default: build
 tools:
 	@echo "==> installing required tooling..."
 	@sh "$(CURDIR)/scripts/gogetcookie.sh"
-	GO111MODULE=off go get -u github.com/client9/misspell/cmd/misspell
-	GO111MODULE=off go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
+	GO111MODULE=on go install github.com/client9/misspell/cmd/misspell
+	GO111MODULE=on go install github.com/golangci/golangci-lint/cmd/golangci-lint
+	GO111MODULE=on go install github.com/bflad/tfproviderlint/cmd/tfproviderlint
 
 build: fmtcheck
 	go install
@@ -39,6 +40,12 @@ lint:
 	@echo "==> Checking source code against linters..."
 	golangci-lint run ./...
 
+tflint:
+	@echo "==> Checking source code against terraform provider linters..."
+	@tfproviderlint \
+        -R001 -R002 -R003 -R004\
+        ./$(PKG_NAME)
+
 test-docker:
 	docker run --rm -v $$(pwd):/go/src/github.com/terraform-providers/terraform-provider-azurerm -w /go/src/github.com/terraform-providers/terraform-provider-azurerm golang:1.12 make test
 
@@ -61,17 +68,17 @@ testacc: fmtcheck
 debugacc: fmtcheck
 	TF_ACC=1 dlv test $(TEST) --headless --listen=:2345 --api-version=2 -- -test.v $(TESTARGS)
 
+website-lint:
+	@echo "==> Checking website against linters..."
+	@misspell -error -source=text -i hdinsight website/
+
 website:
 ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
 	echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), get-ting..."
 	git clone https://$(WEBSITE_REPO) $(GOPATH)/src/$(WEBSITE_REPO)
 endif
 	@$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME)
 
-website-lint:
-	@echo "==> Checking website against linters..."
-	@misspell -error -source=text -i hdinsight website/
-
 website-test:
 ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
 	echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), get-ting..."

diff --git a/azurerm/data_source_azuread_application.go b/azurerm/data_source_azuread_application.go
@@ -132,16 +132,12 @@ func dataSourceArmAzureADApplicationRead(d *schema.ResourceData, meta interface{
 	d.Set("available_to_other_tenants", application.AvailableToOtherTenants)
 	d.Set("oauth2_allow_implicit_flow", application.Oauth2AllowImplicitFlow)
 
-	if s := application.IdentifierUris; s != nil {
-		if err := d.Set("identifier_uris", *s); err != nil {
-			return fmt.Errorf("Error setting `identifier_uris`: %+v", err)
-		}
+	if err := d.Set("identifier_uris", application.IdentifierUris); err != nil {
+		return fmt.Errorf("Error setting `identifier_uris`: %+v", err)
 	}
 
-	if s := application.ReplyUrls; s != nil {
-		if err := d.Set("reply_urls", *s); err != nil {
-			return fmt.Errorf("Error setting `reply_urls`: %+v", err)
-		}
+	if err := d.Set("reply_urls", application.ReplyUrls); err != nil {
+		return fmt.Errorf("Error setting `reply_urls`: %+v", err)
 	}
 
 	return nil

diff --git a/azurerm/data_source_managed_disk.go b/azurerm/data_source_managed_disk.go
@@ -80,9 +80,9 @@ func dataSourceArmManagedDiskRead(d *schema.ResourceData, meta interface{}) erro
 	}
 
 	if props := resp.DiskProperties; props != nil {
-		if diskSize := props.DiskSizeGB; diskSize != nil {
-			d.Set("disk_size_gb", *diskSize)
-		}
+
+		d.Set("disk_size_gb", props.DiskSizeGB)
+
 		if osType := props.OsType; osType != "" {
 			d.Set("os_type", string(osType))
 		}

diff --git a/azurerm/data_source_maps_account_test.go b/azurerm/data_source_maps_account_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
 )
 
-func TestAccDataSourceAzureRMMapsAccount(t *testing.T) {
+func TestAccDataSourceAzureRMMapsAccount_basic(t *testing.T) {
 	dataSourceName := "data.azurerm_maps_account.test"
 	rInt := tf.AccRandTimeInt()
 	location := testLocation()
@@ -18,7 +18,7 @@ func TestAccDataSourceAzureRMMapsAccount(t *testing.T) {
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccDataSourceAzureRMMapsAccount(rInt, location),
+				Config: testAccDataSourceAzureRMMapsAccount_basic(rInt, location),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet(dataSourceName, "id"),
 					resource.TestCheckResourceAttrSet(dataSourceName, "name"),
@@ -35,7 +35,7 @@ func TestAccDataSourceAzureRMMapsAccount(t *testing.T) {
 	})
 }
 
-func testAccDataSourceAzureRMMapsAccount(rInt int, location string) string {
+func testAccDataSourceAzureRMMapsAccount_basic(rInt int, location string) string {
 	template := testAccAzureRMMapsAccount_tags(rInt, location)
 	return fmt.Sprintf(`
 %s

diff --git a/azurerm/data_source_network_interface.go b/azurerm/data_source_network_interface.go
@@ -198,15 +198,12 @@ func dataSourceArmNetworkInterfaceRead(d *schema.ResourceData, meta interface{})
 	if iface.IPConfigurations != nil && len(*iface.IPConfigurations) > 0 {
 		configs := *iface.IPConfigurations
 
-		if configs[0].InterfaceIPConfigurationPropertiesFormat != nil {
-			privateIPAddress := configs[0].InterfaceIPConfigurationPropertiesFormat.PrivateIPAddress
-			d.Set("private_ip_address", *privateIPAddress)
-		}
+		d.Set("private_ip_address", configs[0].InterfaceIPConfigurationPropertiesFormat.PrivateIPAddress)
 
 		addresses := make([]interface{}, 0)
 		for _, config := range configs {
 			if config.InterfaceIPConfigurationPropertiesFormat != nil {
-				addresses = append(addresses, *config.InterfaceIPConfigurationPropertiesFormat.PrivateIPAddress)
+				addresses = append(addresses, config.InterfaceIPConfigurationPropertiesFormat.PrivateIPAddress)
 			}
 		}
 
@@ -220,7 +217,7 @@ func dataSourceArmNetworkInterfaceRead(d *schema.ResourceData, meta interface{})
 	}
 
 	if iface.VirtualMachine != nil {
-		d.Set("virtual_machine_id", *iface.VirtualMachine.ID)
+		d.Set("virtual_machine_id", iface.VirtualMachine.ID)
 	} else {
 		d.Set("virtual_machine_id", "")
 	}

diff --git a/azurerm/data_source_snapshot.go b/azurerm/data_source_snapshot.go
@@ -131,15 +131,9 @@ func dataSourceArmSnapshotRead(d *schema.ResourceData, meta interface{}) error {
 
 	if data := resp.CreationData; data != nil {
 		d.Set("creation_option", string(data.CreateOption))
-		if data.SourceURI != nil {
-			d.Set("source_uri", *data.SourceURI)
-		}
-		if data.SourceResourceID != nil {
-			d.Set("source_resource_id", *data.SourceResourceID)
-		}
-		if data.StorageAccountID != nil {
-			d.Set("storage_account_id", *data.StorageAccountID)
-		}
+		d.Set("source_uri", data.SourceURI)
+		d.Set("source_resource_id", data.SourceResourceID)
+		d.Set("storage_account_id", data.StorageAccountID)
 	}
 
 	return nil

diff --git a/azurerm/resource_arm_analysis_services_server.go b/azurerm/resource_arm_analysis_services_server.go
@@ -195,10 +195,10 @@ func resourceArmAnalysisServicesServerRead(d *schema.ResourceData, meta interfac
 	}
 
 	if serverProps := server.ServerProperties; serverProps != nil {
-		if serverProps.AsAdministrators == nil || serverProps.AsAdministrators.Members == nil {
+		if serverProps.AsAdministrators == nil {
 			d.Set("admin_users", []string{})
 		} else {
-			d.Set("admin_users", *serverProps.AsAdministrators.Members)
+			d.Set("admin_users", serverProps.AsAdministrators.Members)
 		}
 
 		enablePowerBi, fwRules := flattenAnalysisServicesServerFirewallSettings(serverProps)

diff --git a/azurerm/resource_arm_data_factory_linked_service_mysql.go b/azurerm/resource_arm_data_factory_linked_service_mysql.go
@@ -197,10 +197,7 @@ func resourceArmDataFactoryLinkedServiceMySQLRead(d *schema.ResourceData, meta i
 	}
 
 	d.Set("additional_properties", mysql.AdditionalProperties)
-
-	if mysql.Description != nil {
-		d.Set("description", *mysql.Description)
-	}
+	d.Set("description", mysql.Description)
 
 	annotations := flattenDataFactoryAnnotations(mysql.Annotations)
 	if err := d.Set("annotations", annotations); err != nil {

diff --git a/azurerm/resource_arm_data_factory_linked_service_postgresql.go b/azurerm/resource_arm_data_factory_linked_service_postgresql.go
@@ -197,10 +197,7 @@ func resourceArmDataFactoryLinkedServicePostgreSQLRead(d *schema.ResourceData, m
 	}
 
 	d.Set("additional_properties", postgresql.AdditionalProperties)
-
-	if postgresql.Description != nil {
-		d.Set("description", *postgresql.Description)
-	}
+	d.Set("description", postgresql.Description)
 
 	annotations := flattenDataFactoryAnnotations(postgresql.Annotations)
 	if err := d.Set("annotations", annotations); err != nil {

diff --git a/azurerm/resource_arm_data_factory_linked_service_sql_server.go b/azurerm/resource_arm_data_factory_linked_service_sql_server.go
@@ -192,10 +192,7 @@ func resourceArmDataFactoryLinkedServiceSQLServerRead(d *schema.ResourceData, me
 	}
 
 	d.Set("additional_properties", sqlServer.AdditionalProperties)
-
-	if sqlServer.Description != nil {
-		d.Set("description", *sqlServer.Description)
-	}
+	d.Set("description", sqlServer.Description)
 
 	annotations := flattenDataFactoryAnnotations(sqlServer.Annotations)
 	if err := d.Set("annotations", annotations); err != nil {

diff --git a/azurerm/resource_arm_eventgrid_event_subscription.go b/azurerm/resource_arm_eventgrid_event_subscription.go
@@ -306,7 +306,7 @@ func resourceArmEventGridEventSubscriptionRead(d *schema.ResourceData, meta inte
 		d.Set("event_delivery_schema", string(props.EventDeliverySchema))
 
 		if props.Topic != nil && *props.Topic != "" {
-			d.Set("topic_name", *props.Topic)
+			d.Set("topic_name", props.Topic)
 		}
 
 		if storageQueueEndpoint, ok := props.Destination.AsStorageQueueEventSubscriptionDestination(); ok {
@@ -355,10 +355,8 @@ func resourceArmEventGridEventSubscriptionRead(d *schema.ResourceData, meta inte
 			}
 		}
 
-		if labels := props.Labels; labels != nil {
-			if err := d.Set("labels", *labels); err != nil {
-				return fmt.Errorf("Error setting `labels` for EventGrid Event Subscription %q (Scope %q): %s", name, scope, err)
-			}
+		if err := d.Set("labels", props.Labels); err != nil {
+			return fmt.Errorf("Error setting `labels` for EventGrid Event Subscription %q (Scope %q): %s", name, scope, err)
 		}
 	}
 

diff --git a/azurerm/resource_arm_function_app.go b/azurerm/resource_arm_function_app.go
@@ -205,7 +205,6 @@ func resourceArmFunctionApp() *schema.Resource {
 						"virtual_network_name": {
 							Type:     schema.TypeString,
 							Optional: true,
-							Computed: false,
 						},
 						"cors": azure.SchemaWebCorsSettings(),
 					},

diff --git a/azurerm/resource_arm_local_network_gateway.go b/azurerm/resource_arm_local_network_gateway.go
@@ -173,9 +173,7 @@ func resourceArmLocalNetworkGatewayRead(d *schema.ResourceData, meta interface{}
 		d.Set("gateway_address", props.GatewayIPAddress)
 
 		if lnas := props.LocalNetworkAddressSpace; lnas != nil {
-			if prefixes := lnas.AddressPrefixes; prefixes != nil {
-				d.Set("address_space", *prefixes)
-			}
+			d.Set("address_space", lnas.AddressPrefixes)
 		}
 		flattenedSettings := flattenLocalNetworkGatewayBGPSettings(props.BgpSettings)
 		if err := d.Set("bgp_settings", flattenedSettings); err != nil {

diff --git a/azurerm/resource_arm_managed_disk.go b/azurerm/resource_arm_managed_disk.go
@@ -263,9 +263,7 @@ func resourceArmManagedDiskRead(d *schema.ResourceData, meta interface{}) error
 	}
 
 	if props := resp.DiskProperties; props != nil {
-		if diskSize := props.DiskSizeGB; diskSize != nil {
-			d.Set("disk_size_gb", *diskSize)
-		}
+		d.Set("disk_size_gb", props.DiskSizeGB)
 		if osType := props.OsType; osType != "" {
 			d.Set("os_type", string(osType))
 		}
@@ -314,13 +312,9 @@ func resourceArmManagedDiskDelete(d *schema.ResourceData, meta interface{}) erro
 
 func flattenAzureRmManagedDiskCreationData(d *schema.ResourceData, creationData *compute.CreationData) {
 	d.Set("create_option", string(creationData.CreateOption))
+	d.Set("source_resource_id", creationData.SourceResourceID)
+	d.Set("source_uri", creationData.SourceURI)
 	if ref := creationData.ImageReference; ref != nil {
-		d.Set("image_reference_id", *ref.ID)
-	}
-	if id := creationData.SourceResourceID; id != nil {
-		d.Set("source_resource_id", *id)
-	}
-	if creationData.SourceURI != nil {
-		d.Set("source_uri", *creationData.SourceURI)
+		d.Set("image_reference_id", ref.ID)
 	}
 }
diff --git a/azurerm/resource_arm_metric_alertrule.go b/azurerm/resource_arm_metric_alertrule.go
@@ -251,7 +251,7 @@ func resourceArmMetricAlertRuleRead(d *schema.ResourceData, meta interface{}) er
 		if ruleCondition != nil {
 			if thresholdRuleCondition, ok := ruleCondition.AsThresholdRuleCondition(); ok && thresholdRuleCondition != nil {
 				d.Set("operator", string(thresholdRuleCondition.Operator))
-				d.Set("threshold", *thresholdRuleCondition.Threshold)
+				d.Set("threshold", thresholdRuleCondition.Threshold)
 				d.Set("period", thresholdRuleCondition.WindowSize)
 				d.Set("aggregation", string(thresholdRuleCondition.TimeAggregation))
 

diff --git a/azurerm/resource_arm_monitor_metric_alertrule.go b/azurerm/resource_arm_monitor_metric_alertrule.go
@@ -246,7 +246,7 @@ func resourceArmMonitorMetricAlertRuleRead(d *schema.ResourceData, meta interfac
 		if ruleCondition != nil {
 			if thresholdRuleCondition, ok := ruleCondition.AsThresholdRuleCondition(); ok && thresholdRuleCondition != nil {
 				d.Set("operator", string(thresholdRuleCondition.Operator))
-				d.Set("threshold", *thresholdRuleCondition.Threshold)
+				d.Set("threshold", thresholdRuleCondition.Threshold)
 				d.Set("period", thresholdRuleCondition.WindowSize)
 				d.Set("aggregation", string(thresholdRuleCondition.TimeAggregation))
 

diff --git a/azurerm/resource_arm_network_interface.go b/azurerm/resource_arm_network_interface.go
@@ -400,7 +400,7 @@ func resourceArmNetworkInterfaceRead(d *schema.ResourceData, meta interface{}) e
 				if ipProps := config.InterfaceIPConfigurationPropertiesFormat; ipProps != nil {
 					if v := ipProps.PrivateIPAddress; v != nil {
 						if i == 0 {
-							d.Set("private_ip_address", *v)
+							d.Set("private_ip_address", v)
 						}
 						addresses = append(addresses, *v)
 					}

diff --git a/azurerm/resource_arm_network_interface_application_gateway_association.go b/azurerm/resource_arm_network_interface_application_gateway_association.go
@@ -212,9 +212,7 @@ func resourceArmNetworkInterfaceApplicationGatewayBackendAddressPoolAssociationR
 
 	d.Set("backend_address_pool_id", backendAddressPoolId)
 	d.Set("ip_configuration_name", ipConfigurationName)
-	if id := read.ID; id != nil {
-		d.Set("network_interface_id", *id)
-	}
+	d.Set("network_interface_id", read.ID)
 
 	return nil
 }

diff --git a/azurerm/resource_arm_network_interface_application_security_group_association.go b/azurerm/resource_arm_network_interface_application_security_group_association.go
@@ -212,9 +212,7 @@ func resourceArmNetworkInterfaceApplicationSecurityGroupAssociationRead(d *schem
 
 	d.Set("application_security_group_id", applicationSecurityGroupId)
 	d.Set("ip_configuration_name", ipConfigurationName)
-	if id := read.ID; id != nil {
-		d.Set("network_interface_id", *id)
-	}
+	d.Set("network_interface_id", read.ID)
 
 	return nil
 }

diff --git a/azurerm/resource_arm_network_interface_backend_address_pool_association.go b/azurerm/resource_arm_network_interface_backend_address_pool_association.go
@@ -212,9 +212,7 @@ func resourceArmNetworkInterfaceBackendAddressPoolAssociationRead(d *schema.Reso
 
 	d.Set("backend_address_pool_id", backendAddressPoolId)
 	d.Set("ip_configuration_name", ipConfigurationName)
-	if id := read.ID; id != nil {
-		d.Set("network_interface_id", *id)
-	}
+	d.Set("network_interface_id", read.ID)
 
 	return nil
 }

diff --git a/azurerm/resource_arm_network_interface_nat_rule_association.go b/azurerm/resource_arm_network_interface_nat_rule_association.go
@@ -212,9 +212,7 @@ func resourceArmNetworkInterfaceNatRuleAssociationRead(d *schema.ResourceData, m
 
 	d.Set("ip_configuration_name", ipConfigurationName)
 	d.Set("nat_rule_id", natRuleId)
-	if id := read.ID; id != nil {
-		d.Set("network_interface_id", *id)
-	}
+	d.Set("network_interface_id", read.ID)
 
 	return nil
 }

diff --git a/azurerm/resource_arm_relay_namespace.go b/azurerm/resource_arm_relay_namespace.go
@@ -219,7 +219,7 @@ func resourceArmRelayNamespaceRead(d *schema.ResourceData, meta interface{}) err
 			return fmt.Errorf("Error setting 'sku': %+v", err)
 		}
 
-		if err := d.Set("sku_name", *sku.Name); err != nil {
+		if err := d.Set("sku_name", sku.Name); err != nil {
 			return fmt.Errorf("Error setting 'sku_name': %+v", err)
 		}
 	} else {

diff --git a/azurerm/resource_arm_resource_group.go b/azurerm/resource_arm_resource_group.go
@@ -20,7 +20,6 @@ func resourceArmResourceGroup() *schema.Resource {
 		Create: resourceArmResourceGroupCreateUpdate,
 		Read:   resourceArmResourceGroupRead,
 		Update: resourceArmResourceGroupCreateUpdate,
-		Exists: resourceArmResourceGroupExists,
 		Delete: resourceArmResourceGroupDelete,
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
@@ -105,29 +104,6 @@ func resourceArmResourceGroupRead(d *schema.ResourceData, meta interface{}) erro
 	return tags.FlattenAndSet(d, resp.Tags)
 }
 
-func resourceArmResourceGroupExists(d *schema.ResourceData, meta interface{}) (bool, error) {
-	client := meta.(*ArmClient).resource.GroupsClient
-	ctx := meta.(*ArmClient).StopContext
-
-	id, err := azure.ParseAzureResourceID(d.Id())
-	if err != nil {
-		return false, fmt.Errorf("Error parsing Azure Resource ID %q: %+v", d.Id(), err)
-	}
-
-	name := id.ResourceGroup
-
-	resp, err := client.Get(ctx, name)
-	if err != nil {
-		if utils.ResponseWasNotFound(resp.Response) {
-			return false, nil
-		}
-
-		return false, fmt.Errorf("Error reading resource group: %+v", err)
-	}
-
-	return true, nil
-}
-
 func resourceArmResourceGroupDelete(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*ArmClient).resource.GroupsClient
 	ctx := meta.(*ArmClient).StopContext