Remove property

hashicorp · Oct 2, 2019 · d538c85 · d538c85
1 parent 5959707
commit d538c85
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 25 deletions.
diff --git a/azurerm/data_source_storage_management_policy.go b/azurerm/data_source_storage_management_policy.go
@@ -29,10 +29,6 @@ func dataSourceArmStorageManagementPolicy() *schema.Resource {
 							Type:     schema.TypeBool,
 							Computed: true,
 						},
-						"type": {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
 						"filters": {
 							Type:     schema.TypeList,
 							Computed: true,

diff --git a/azurerm/data_source_storage_management_policy_test.go b/azurerm/data_source_storage_management_policy_test.go
@@ -27,7 +27,6 @@ func TestAccDataSourceAzureRMStorageManagementPolicy_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(dataSourceName, "rule.#", "1"),
 					resource.TestCheckResourceAttr(dataSourceName, "rule.0.name", "rule1"),
 					resource.TestCheckResourceAttr(dataSourceName, "rule.0.enabled", "true"),
-					resource.TestCheckResourceAttr(dataSourceName, "rule.0.type", "Lifecycle"),
 					resource.TestCheckResourceAttr(dataSourceName, "rule.0.filters.#", "1"),
 					resource.TestCheckResourceAttr(dataSourceName, "rule.0.filters.0.prefix_match.#", "1"),
 					resource.TestCheckResourceAttr(dataSourceName, "rule.0.filters.0.prefix_match.3439697764", "container1/prefix1"),
@@ -69,7 +68,6 @@ resource "azurerm_storage_management_policy" "testpolicy" {
   rule {
 	name    = "rule1"
 	enabled = true
-	type    = "Lifecycle"
 	filters {
 	  prefix_match = [ "container1/prefix1" ]
 	  blob_types   = [ "blockBlob" ]

diff --git a/azurerm/resource_arm_storage_management_policy.go b/azurerm/resource_arm_storage_management_policy.go
@@ -47,11 +47,6 @@ func resourceArmStorageManagementPolicy() *schema.Resource {
 							Type:     schema.TypeBool,
 							Required: true,
 						},
-						"type": {
-							Type:         schema.TypeString,
-							Required:     true,
-							ValidateFunc: validation.StringInSlice([]string{"Lifecycle"}, false),
-						},
 						"filters": {
 							Type:     schema.TypeList,
 							Optional: true,
@@ -239,7 +234,7 @@ func expandStorageManagementPolicyRule(ref map[string]interface{}) (*storage.Man
 
 	name := ref["name"].(string)
 	enabled := ref["enabled"].(bool)
-	typeVal := ref["type"].(string)
+	typeVal := "Lifecycle"
 
 	definition := storage.ManagementPolicyDefinition{
 		Filters: &storage.ManagementPolicyFilter{},
@@ -320,9 +315,6 @@ func flattenStorageManagementPolicyRules(armRules *[]storage.ManagementPolicyRul
 		if armRule.Name != nil {
 			rule["name"] = *armRule.Name
 		}
-		if armRule.Type != nil {
-			rule["type"] = *armRule.Type
-		}
 		if armRule.Enabled != nil {
 			rule["enabled"] = *armRule.Enabled
 		}

diff --git a/azurerm/resource_arm_storage_management_policy_test.go b/azurerm/resource_arm_storage_management_policy_test.go
@@ -27,7 +27,6 @@ func TestAccAzureRMStorageManagementPolicy_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "rule.#", "1"),
 					resource.TestCheckResourceAttr(resourceName, "rule.0.name", "rule1"),
 					resource.TestCheckResourceAttr(resourceName, "rule.0.enabled", "true"),
-					resource.TestCheckResourceAttr(resourceName, "rule.0.type", "Lifecycle"),
 					resource.TestCheckResourceAttr(resourceName, "rule.0.filters.#", "1"),
 					resource.TestCheckResourceAttr(resourceName, "rule.0.filters.0.prefix_match.#", "1"),
 					resource.TestCheckResourceAttr(resourceName, "rule.0.filters.0.prefix_match.3439697764", "container1/prefix1"),
@@ -65,7 +64,6 @@ func TestAccAzureRMStorageManagementPolicy_multipleRule(t *testing.T) {
 					// Rule1
 					resource.TestCheckResourceAttr(resourceName, "rule.0.name", "rule1"),
 					resource.TestCheckResourceAttr(resourceName, "rule.0.enabled", "true"),
-					resource.TestCheckResourceAttr(resourceName, "rule.0.type", "Lifecycle"),
 					resource.TestCheckResourceAttr(resourceName, "rule.0.filters.#", "1"),
 					resource.TestCheckResourceAttr(resourceName, "rule.0.filters.0.prefix_match.#", "1"),
 					resource.TestCheckResourceAttr(resourceName, "rule.0.filters.0.prefix_match.3439697764", "container1/prefix1"),
@@ -82,7 +80,6 @@ func TestAccAzureRMStorageManagementPolicy_multipleRule(t *testing.T) {
 					// Rule2
 					resource.TestCheckResourceAttr(resourceName, "rule.1.name", "rule2"),
 					resource.TestCheckResourceAttr(resourceName, "rule.1.enabled", "false"),
-					resource.TestCheckResourceAttr(resourceName, "rule.1.type", "Lifecycle"),
 					resource.TestCheckResourceAttr(resourceName, "rule.1.filters.#", "1"),
 					resource.TestCheckResourceAttr(resourceName, "rule.1.filters.0.prefix_match.#", "2"),
 					resource.TestCheckResourceAttr(resourceName, "rule.1.filters.0.prefix_match.4102595489", "container2/prefix1"),
@@ -124,7 +121,6 @@ resource "azurerm_storage_management_policy" "testpolicy" {
 	rule {
 		name    = "rule1"
 		enabled = true
-		type    = "Lifecycle"
 		filters {
 			prefix_match = [ "container1/prefix1" ]
 			blob_types   = [ "blockBlob" ]
@@ -167,7 +163,6 @@ resource "azurerm_storage_management_policy" "testpolicy" {
 	rule {
 		name    = "rule1"
 		enabled = true
-		type    = "Lifecycle"
 		filters {
 			prefix_match = [ "container1/prefix1" ]
 			blob_types   = [ "blockBlob" ]
@@ -186,7 +181,6 @@ resource "azurerm_storage_management_policy" "testpolicy" {
 	rule {
 		name    = "rule2"
 		enabled = false
-		type    = "Lifecycle"
 		filters {
 		  prefix_match = [ "container2/prefix1", "container2/prefix2" ]
 		  blob_types   = [ "blockBlob" ]

diff --git a/website/docs/d/storage_management_policy.html.markdown b/website/docs/d/storage_management_policy.html.markdown
@@ -41,7 +41,6 @@ The following arguments are supported:
 
 * `name` - (Required) A rule name can contain any combination of alpha numeric characters. Rule name is case-sensitive. It must be unique within a policy.
 * `enabled` - (Required)  Boolean to specify whether the rule is enabled.
-* `type` - (Required) Must be set to `Lifecycle`.
 * `filters` - A `filter` block as documented below.
 * `actions` - An `actions` block as documented below.
 

diff --git a/website/docs/r/storage_management_policy.html.markdown b/website/docs/r/storage_management_policy.html.markdown
@@ -34,7 +34,6 @@ resource "azurerm_storage_management_policy" "testpolicy" {
   rule {
     name    = "rule1"
     enabled = true
-    type    = "Lifecycle"
     filters {
       prefix_match = [ "container1/prefix1" ]
       blob_types   = [ "blockBlob" ]
@@ -53,7 +52,6 @@ resource "azurerm_storage_management_policy" "testpolicy" {
   rule {
     name    = "rule2"
     enabled = false
-    type    = "Lifecycle"
     filters {
       prefix_match = [ "container2/prefix1", "container2/prefix2" ]
       blob_types  = [ "blockBlob" ]
@@ -86,7 +84,6 @@ The following arguments are supported:
 
 * `name` - (Required) A rule name can contain any combination of alpha numeric characters. Rule name is case-sensitive. It must be unique within a policy.
 * `enabled` - (Required)  Boolean to specify whether the rule is enabled.
-* `type` - (Required) Must be set to `Lifecycle`.
 * `filters` - A `filter` block as documented below.
 * `actions` - An `actions` block as documented below.