ignoring deprecations of d.Partial

hashicorp · May 7, 2020 · 3542cb0 · 3542cb0
1 parent b6c6fbf
commit 3542cb0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/azurerm/internal/services/apimanagement/api_management_resource.go b/azurerm/internal/services/apimanagement/api_management_resource.go
@@ -268,14 +268,14 @@ func resourceArmApiManagementService() *schema.Resource {
 							Type:     schema.TypeList,
 							Optional: true,
 							Elem: &schema.Resource{
-								Schema: apiManagementResourceHostnameSchema("management"),
+								Schema: apiManagementResourceHostnameSchema(),
 							},
 						},
 						"portal": {
 							Type:     schema.TypeList,
 							Optional: true,
 							Elem: &schema.Resource{
-								Schema: apiManagementResourceHostnameSchema("portal"),
+								Schema: apiManagementResourceHostnameSchema(),
 							},
 						},
 						"proxy": {
@@ -289,7 +289,7 @@ func resourceArmApiManagementService() *schema.Resource {
 							Type:     schema.TypeList,
 							Optional: true,
 							Elem: &schema.Resource{
-								Schema: apiManagementResourceHostnameSchema("scm"),
+								Schema: apiManagementResourceHostnameSchema(),
 							},
 						},
 					},
@@ -989,6 +989,7 @@ func expandApiManagementCustomProperties(d *schema.ResourceData) map[string]*str
 	}
 
 	if vp := d.Get("protocols").([]interface{}); len(vp) > 0 {
+		// lintignore:SA1019 - this is a valid usage
 		if p, ok := d.GetOkExists("protocols.0.enable_http2"); ok {
 			customProperties[apimHttp2Protocol] = utils.String(strconv.FormatBool(p.(bool)))
 		}
@@ -1047,7 +1048,7 @@ func flattenApiManagementVirtualNetworkConfiguration(input *apimanagement.Virtua
 	return []interface{}{virtualNetworkConfiguration}
 }
 
-func apiManagementResourceHostnameSchema(schemaName string) map[string]*schema.Schema {
+func apiManagementResourceHostnameSchema() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
 		"host_name": {
 			Type:         schema.TypeString,
@@ -1084,7 +1085,7 @@ func apiManagementResourceHostnameSchema(schemaName string) map[string]*schema.S
 }
 
 func apiManagementResourceHostnameProxySchema() map[string]*schema.Schema {
-	hostnameSchema := apiManagementResourceHostnameSchema("proxy")
+	hostnameSchema := apiManagementResourceHostnameSchema()
 
 	hostnameSchema["default_ssl_binding"] = &schema.Schema{
 		Type:     schema.TypeBool,

diff --git a/azurerm/internal/services/containers/kubernetes_cluster_node_pool_resource.go b/azurerm/internal/services/containers/kubernetes_cluster_node_pool_resource.go
@@ -319,6 +319,7 @@ func resourceArmKubernetesClusterNodePoolUpdate(d *schema.ResourceData, meta int
 		return err
 	}
 
+	// lintignore:SA1019 - necessary due to partial updates
 	d.Partial(true)
 
 	log.Printf("[DEBUG] Retrieving existing Node Pool %q (Kubernetes Cluster %q / Resource Group %q)..", id.Name, id.ClusterName, id.ResourceGroup)
@@ -424,6 +425,7 @@ func resourceArmKubernetesClusterNodePoolUpdate(d *schema.ResourceData, meta int
 		return fmt.Errorf("waiting for update of Node Pool %q (Kubernetes Cluster %q / Resource Group %q): %+v", id.Name, id.ClusterName, id.ResourceGroup, err)
 	}
 
+	// lintignore:SA1019 - necessary due to partial updates
 	d.Partial(false)
 
 	return resourceArmKubernetesClusterNodePoolRead(d, meta)

diff --git a/azurerm/internal/services/containers/kubernetes_cluster_resource.go b/azurerm/internal/services/containers/kubernetes_cluster_resource.go
@@ -688,6 +688,7 @@ func resourceArmKubernetesClusterUpdate(d *schema.ResourceData, meta interface{}
 		return err
 	}
 
+	// lintignore:SA1019 - necessary due to partial updates
 	d.Partial(true)
 
 	// we need to conditionally update the cluster
@@ -904,6 +905,7 @@ func resourceArmKubernetesClusterUpdate(d *schema.ResourceData, meta interface{}
 		log.Printf("[DEBUG] Upgraded the version of Kubernetes to %q..", kubernetesVersion)
 	}
 
+	// lintignore:SA1019 - necessary due to partial updates
 	d.Partial(false)
 
 	return resourceArmKubernetesClusterRead(d, meta)

diff --git a/azurerm/internal/services/keyvault/key_vault_resource.go b/azurerm/internal/services/keyvault/key_vault_resource.go
@@ -350,6 +350,7 @@ func resourceArmKeyVaultUpdate(d *schema.ResourceData, meta interface{}) error {
 	locks.ByName(name, keyVaultResourceName)
 	defer locks.UnlockByName(name, keyVaultResourceName)
 
+	// lintignore:SA1019
 	d.Partial(true)
 
 	// first pull the existing key vault since we need to lock on several bits of it's information
@@ -501,6 +502,7 @@ func resourceArmKeyVaultUpdate(d *schema.ResourceData, meta interface{}) error {
 		return fmt.Errorf("Error updating Key Vault %q (Resource Group %q): %+v", name, resourceGroup, err)
 	}
 
+	// lintignore:SA1019
 	d.Partial(false)
 
 	return resourceArmKeyVaultRead(d, meta)

diff --git a/azurerm/internal/services/storage/resource_arm_storage_account.go b/azurerm/internal/services/storage/resource_arm_storage_account.go
@@ -769,6 +769,7 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e
 		}
 	}
 
+	// lintignore:SA1019 - necessary due to partial updates
 	d.Partial(true)
 
 	if d.HasChange("account_replication_type") {
@@ -941,6 +942,7 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e
 		d.SetPartial("static_website")
 	}
 
+	// lintignore:SA1019 - necessary due to partial updates
 	d.Partial(false)
 	return resourceArmStorageAccountRead(d, meta)
 }