Merge pull request #8672 from terraform-providers/f/template-deployment-resources

New Resources: `azurerm_(resource_group|subscription)_template_deployment`

Author: tombuildsstuff

azurerm/internal/features/three_point_oh.go

@@ -0,0 +1,26 @@
+package features
+
+// DeprecatedInThreePointOh returns the deprecation message if the provider
+// is running in 3.0 mode - otherwise is returns an empty string (such that
+// this deprecation should be ignored).
+//
+// This will be used to signify resources which will be Deprecated in 3.0,
+// but not Removed (which will happen in a later, presumably 4.x release).
+func DeprecatedInThreePointOh(deprecationMessage string) string {
+	if !ThreePointOh() {
+		return ""
+	}
+
+	return deprecationMessage
+}
+
+// ThreePointOh returns whether this provider is running in 3.0 mode
+// that is to say - that functionality which requires/changes in 3.0
+// should be conditionally toggled on
+//
+// At this point in time this exists just to be able to place this
+// infrastructure as required - but in time we'll flip this through
+// a Beta and then GA at 3.0 release.
+func ThreePointOh() bool {
+	return false
+}

azurerm/internal/features/user_flags.go

@@ -5,6 +5,7 @@ type UserFeatures struct {
 	VirtualMachineScaleSet VirtualMachineScaleSetFeatures
 	KeyVault               KeyVaultFeatures
 	Network                NetworkFeatures
+	TemplateDeployment     TemplateDeploymentFeatures
 }
 
 type VirtualMachineFeatures struct {
@@ -23,3 +24,7 @@ type KeyVaultFeatures struct {
 type NetworkFeatures struct {
 	RelaxedLocking bool
 }
+
+type TemplateDeploymentFeatures struct {
+	DeleteNestedItemsDuringDeletion bool
+}

azurerm/internal/provider/features.go

@@ -9,63 +9,76 @@ func schemaFeatures(supportLegacyTestSuite bool) *schema.Schema {
 	// NOTE: if there's only one nested field these want to be Required (since there's no point
 	//       specifying the block otherwise) - however for 2+ they should be optional
 	features := map[string]*schema.Schema{
-		"virtual_machine": {
+		"key_vault": {
 			Type:     schema.TypeList,
 			Optional: true,
 			MaxItems: 1,
 			Elem: &schema.Resource{
 				Schema: map[string]*schema.Schema{
-					"delete_os_disk_on_deletion": {
+					"recover_soft_deleted_key_vaults": {
 						Type:     schema.TypeBool,
-						Required: true,
+						Optional: true,
+					},
+
+					"purge_soft_delete_on_destroy": {
+						Type:     schema.TypeBool,
+						Optional: true,
 					},
 				},
 			},
 		},
 
-		"virtual_machine_scale_set": {
+		"network": {
 			Type:     schema.TypeList,
 			Optional: true,
 			MaxItems: 1,
 			Elem: &schema.Resource{
 				Schema: map[string]*schema.Schema{
-					"roll_instances_when_required": {
+					"relaxed_locking": {
 						Type:     schema.TypeBool,
 						Required: true,
 					},
 				},
 			},
 		},
 
-		"key_vault": {
+		"template_deployment": {
 			Type:     schema.TypeList,
 			Optional: true,
 			MaxItems: 1,
 			Elem: &schema.Resource{
 				Schema: map[string]*schema.Schema{
-					"recover_soft_deleted_key_vaults": {
+					"delete_nested_items_during_deletion": {
 						Type:     schema.TypeBool,
-						Optional: true,
+						Required: true,
 					},
+				},
+			},
+		},
 
-					"purge_soft_delete_on_destroy": {
+		"virtual_machine": {
+			Type:     schema.TypeList,
+			Optional: true,
+			MaxItems: 1,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"delete_os_disk_on_deletion": {
 						Type:     schema.TypeBool,
-						Optional: true,
+						Required: true,
 					},
 				},
 			},
 		},
 
-		"network": {
+		"virtual_machine_scale_set": {
 			Type:     schema.TypeList,
 			Optional: true,
 			MaxItems: 1,
 			Elem: &schema.Resource{
 				Schema: map[string]*schema.Schema{
-					"relaxed_locking": {
+					"roll_instances_when_required": {
 						Type:     schema.TypeBool,
-						Optional: true,
-						Default:  false,
+						Required: true,
 					},
 				},
 			},
@@ -99,19 +112,22 @@ func expandFeatures(input []interface{}) features.UserFeatures {
 	// these are the defaults if omitted from the config
 	features := features.UserFeatures{
 		// NOTE: ensure all nested objects are fully populated
-		VirtualMachine: features.VirtualMachineFeatures{
-			DeleteOSDiskOnDeletion: true,
-		},
-		VirtualMachineScaleSet: features.VirtualMachineScaleSetFeatures{
-			RollInstancesWhenRequired: true,
-		},
 		KeyVault: features.KeyVaultFeatures{
 			PurgeSoftDeleteOnDestroy:    true,
 			RecoverSoftDeletedKeyVaults: true,
 		},
 		Network: features.NetworkFeatures{
 			RelaxedLocking: false,
 		},
+		TemplateDeployment: features.TemplateDeploymentFeatures{
+			DeleteNestedItemsDuringDeletion: true,
+		},
+		VirtualMachine: features.VirtualMachineFeatures{
+			DeleteOSDiskOnDeletion: true,
+		},
+		VirtualMachineScaleSet: features.VirtualMachineScaleSetFeatures{
+			RollInstancesWhenRequired: true,
+		},
 	}
 
 	if len(input) == 0 || input[0] == nil {
@@ -133,6 +149,26 @@ func expandFeatures(input []interface{}) features.UserFeatures {
 		}
 	}
 
+	if raw, ok := val["network"]; ok {
+		items := raw.([]interface{})
+		if len(items) > 0 {
+			networkRaw := items[0].(map[string]interface{})
+			if v, ok := networkRaw["relaxed_locking"]; ok {
+				features.Network.RelaxedLocking = v.(bool)
+			}
+		}
+	}
+
+	if raw, ok := val["template_deployment"]; ok {
+		items := raw.([]interface{})
+		if len(items) > 0 {
+			networkRaw := items[0].(map[string]interface{})
+			if v, ok := networkRaw["delete_nested_items_during_deletion"]; ok {
+				features.TemplateDeployment.DeleteNestedItemsDuringDeletion = v.(bool)
+			}
+		}
+	}
+
 	if raw, ok := val["virtual_machine"]; ok {
 		items := raw.([]interface{})
 		if len(items) > 0 {
@@ -153,15 +189,5 @@ func expandFeatures(input []interface{}) features.UserFeatures {
 		}
 	}
 
-	if raw, ok := val["network"]; ok {
-		items := raw.([]interface{})
-		if len(items) > 0 {
-			networkRaw := items[0].(map[string]interface{})
-			if v, ok := networkRaw["relaxed_locking"]; ok {
-				features.Network.RelaxedLocking = v.(bool)
-			}
-		}
-	}
-
 	return features
 }