From 81f2521293e0481641d72e20310653b731f23735 Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Fri, 27 Sep 2019 22:40:29 -0500 Subject: [PATCH 001/498] New Resource: `azurerm_monitor_scheduled_query_rules` --- ...ta_source_monitor_scheduled_query_rules.go | 265 +++++++ ...urce_monitor_scheduled_query_rules_test.go | 243 +++++++ azurerm/internal/services/monitor/client.go | 5 + azurerm/provider.go | 2 + ...ource_arm_monitor_scheduled_query_rules.go | 685 ++++++++++++++++++ ..._arm_monitor_scheduled_query_rules_test.go | 320 ++++++++ ...onitor_scheduled_query_rules.html.markdown | 88 +++ ...onitor_scheduled_query_rules.html.markdown | 193 +++++ 8 files changed, 1801 insertions(+) create mode 100644 azurerm/data_source_monitor_scheduled_query_rules.go create mode 100644 azurerm/data_source_monitor_scheduled_query_rules_test.go create mode 100644 azurerm/resource_arm_monitor_scheduled_query_rules.go create mode 100644 azurerm/resource_arm_monitor_scheduled_query_rules_test.go create mode 100644 website/docs/d/monitor_scheduled_query_rules.html.markdown create mode 100644 website/docs/r/monitor_scheduled_query_rules.html.markdown diff --git a/azurerm/data_source_monitor_scheduled_query_rules.go b/azurerm/data_source_monitor_scheduled_query_rules.go new file mode 100644 index 0000000000000..7d551ed10437b --- /dev/null +++ b/azurerm/data_source_monitor_scheduled_query_rules.go @@ -0,0 +1,265 @@ +package azurerm + +import ( + "fmt" + "strconv" + "time" + + "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func dataSourceArmMonitorScheduledQueryRules() *schema.Resource { + return &schema.Resource{ + Read: dataSourceArmMonitorScheduledQueryRulesRead, + + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(5 * time.Minute), + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + }, + + "resource_group_name": azure.SchemaResourceGroupNameForDataSource(), + + "location": azure.SchemaLocationForDataSource(), + + "action_type": { + Type: schema.TypeString, + Computed: true, + }, + "authorized_resources": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "azns_action": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "action_group": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "custom_webhook_payload": { + Type: schema.TypeString, + Computed: true, + }, + "email_subject": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "criteria": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "dimension": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Computed: true, + Elem: schema.TypeString, + }, + "operator": { + Type: schema.TypeString, + Computed: true, + }, + "values": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "metric_name": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "data_source_id": { + Type: schema.TypeString, + Computed: true, + }, + "description": { + Type: schema.TypeString, + Computed: true, + }, + "enabled": { + Type: schema.TypeBool, + Computed: true, + }, + "frequency": { + Type: schema.TypeInt, + Computed: true, + }, + "last_updated_time": { + Type: schema.TypeString, + Computed: true, + }, + "provisioning_state": { + Type: schema.TypeString, + Computed: true, + }, + "query": { + Type: schema.TypeString, + Computed: true, + }, + "query_type": { + Type: schema.TypeString, + Computed: true, + }, + "severity": { + Type: schema.TypeInt, + Computed: true, + }, + "throttling": { + Type: schema.TypeInt, + Computed: true, + }, + "time_window": { + Type: schema.TypeInt, + Computed: true, + }, + "trigger": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "metric_trigger": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "metric_column": { + Type: schema.TypeString, + Computed: true, + }, + "metric_trigger_type": { + Type: schema.TypeString, + Computed: true, + }, + "operator": { + Type: schema.TypeString, + Computed: true, + }, + "threshold": { + Type: schema.TypeFloat, + Computed: true, + }, + }, + }, + }, + "operator": { + Type: schema.TypeString, + Computed: true, + }, + "threshold": { + Type: schema.TypeFloat, + Computed: true, + }, + }, + }, + }, + + "tags": tags.SchemaDataSource(), + }, + } +} + +func dataSourceArmMonitorScheduledQueryRulesRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).Monitor.ScheduledQueryRulesClient + ctx, cancel := timeouts.ForRead(meta.(*ArmClient).StopContext, d) + defer cancel() + + name := d.Get("name").(string) + resourceGroup := d.Get("resource_group_name").(string) + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Error: Scheduled Query Rule %q was not found", name) + } + return fmt.Errorf("Error reading Scheduled Query Rule: %+v", err) + } + + d.SetId(*resp.ID) + d.Set("resource_group_name", resourceGroup) + if location := resp.Location; location != nil { + d.Set("location", azure.NormalizeLocation(*location)) + } + + d.Set("description", *resp.Description) + if resp.Enabled == insights.True { + d.Set("enabled", true) + } else { + d.Set("enabled", false) + } + + switch action := resp.Action.(type) { + case insights.AlertingAction: + d.Set("action_type", "Alerting") + d.Set("azns_action", *action.AznsAction) + severity, err := strconv.Atoi(string(action.Severity)) + if err != nil { + return fmt.Errorf("Error converting action.Severity %q in query rule %q to int (resource group %q): %+v", action.Severity, name, resourceGroup, err) + } + d.Set("severity", severity) + d.Set("throttling", *action.ThrottlingInMin) + d.Set("trigger", *action.Trigger) + case insights.LogToMetricAction: + d.Set("action_type", "LogToMetric") + d.Set("criteria", *action.Criteria) + default: + return fmt.Errorf("Unknown action type in scheduled query rule %q (resource group %q): %T", name, resourceGroup, resp.Action) + } + + if schedule := resp.Schedule; schedule != nil { + if schedule.FrequencyInMinutes != nil { + d.Set("frequency", *schedule.FrequencyInMinutes) + } + if schedule.TimeWindowInMinutes != nil { + d.Set("time_window", *schedule.TimeWindowInMinutes) + } + } + + if source := resp.Source; source != nil { + if source.AuthorizedResources != nil { + d.Set("authorized_resources", *source.AuthorizedResources) + } + if source.DataSourceID != nil { + d.Set("data_source_id", *source.DataSourceID) + } + if source.Query != nil { + d.Set("query", *source.Query) + } + d.Set("query_type", string(source.QueryType)) + } + + // read-only props + d.Set("last_updated_time", *resp.LastUpdatedTime) + d.Set("provisioning_state", resp.ProvisioningState) + + return tags.FlattenAndSet(d, resp.Tags) +} diff --git a/azurerm/data_source_monitor_scheduled_query_rules_test.go b/azurerm/data_source_monitor_scheduled_query_rules_test.go new file mode 100644 index 0000000000000..5aed5d9797329 --- /dev/null +++ b/azurerm/data_source_monitor_scheduled_query_rules_test.go @@ -0,0 +1,243 @@ +package azurerm + +import ( + "fmt" + "testing" + "time" + + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" +) + +func TestAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricAction(t *testing.T) { + dataSourceName := "data.azurerm_monitor_scheduled_query_rules.test" + ri := tf.AccRandTimeInt() + rs := acctest.RandString(10) + location := testLocation() + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricActionConfig(ri, rs, location), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrSet(dataSourceName, "id"), + resource.TestCheckResourceAttr(dataSourceName, "enabled", "true"), + ), + }, + }, + }) +} + +func TestAccDataSourceAzureRMMonitorScheduledQueryRules_alertingAction(t *testing.T) { + dataSourceName := "data.azurerm_monitor_scheduled_query_rules.test" + ri := tf.AccRandTimeInt() + rs := acctest.RandString(10) + location := testLocation() + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionConfig(ri, rs, location), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrSet(dataSourceName, "id"), + ), + }, + }, + }) +} + +func TestAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResource(t *testing.T) { + dataSourceName := "data.azurerm_monitor_scheduled_query_rules.test" + ri := tf.AccRandTimeInt() + rs := acctest.RandString(10) + location := testLocation() + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResourceConfig(ri, rs, location), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrSet(dataSourceName, "id"), + ), + }, + }, + }) +} + +func testAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricActionConfig(rInt int, rString string, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_application_insights" "test" { + name = "acctestAppInsights-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + application_type = "web" +} + +resource "azurerm_monitor_action_group" "test" { + name = "acctestActionGroup-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + short_name = "acctestag" +} + +resource "azurerm_monitor_scheduled_query_rules" "test" { + name = "acctestsqr-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + description = "test log to metric action" + enabled = true + action_type = "LogToMetric" + + data_source_id = "${azurerm_application_insights.test.id}" + + criteria { + metric_name = "Average_percent Idle Time" + dimension { + name = "dimension" + operator = "Include" + values = ["latency"] + } + } +} + +data "azurerm_monitor_scheduled_query_rules" "test" { + name = "${azurerm_monitor_scheduled_query_rules.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" +} +`, rInt, location, rInt, rInt, rInt) +} + +func testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionConfig(rInt int, rString string, location string) string { + ts := time.Now().Format(time.RFC3339) + + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_log_analytics_workspace" "test" { + name = "acctestWorkspace-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku = "PerGB2018" + retention_in_days = 30 +} + +resource "azurerm_monitor_action_group" "test" { + name = "acctestActionGroup-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + short_name = "acctestag" +} + +resource "azurerm_monitor_scheduled_query_rules" "test" { + name = "acctestSqr-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + description = "test alerting action" + enabled = true + action_type = "Alerting" + + query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h" + data_source_id = "${azurerm_log_analytics_workspace.test.id}" + query_type = "ResultCount" + + frequency = 60 + time_window = 60 + + + severity = 3 + azns_action { + action_group = ["${azurerm_monitor_action_group.test.id}"] + email_subject = "Custom alert email subject" + } + + trigger { + operator = "GreaterThan" + threshold = 5000 + } +} + +data "azurerm_monitor_scheduled_query_rules" "test" { + name = "${azurerm_monitor_scheduled_query_rules.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" +} +`, rInt, location, rInt, rInt, rInt, ts, ts) +} + +func testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResourceConfig(rInt int, rString string, location string) string { + ts := time.Now().Format(time.RFC3339) + + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_log_analytics_workspace" "test" { + name = "acctestWorkspace-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku = "PerGB2018" + retention_in_days = 30 +} + +resource "azurerm_log_analytics_workspace" "test2" { + name = "acctestWorkspace2-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku = "PerGB2018" + retention_in_days = 30 +} + +resource "azurerm_monitor_action_group" "test" { + name = "acctestActionGroup-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + short_name = "acctestag" +} + +resource "azurerm_monitor_scheduled_query_rules" "test" { + name = "acctestSqr-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + description = "test alerting action" + enabled = true + action_type = "Alerting" + + query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" + data_source_id = "${azurerm_log_analytics_workspace.test.id}" + query_type = "ResultCount" + authorized_resources = ["${azurerm_log_analytics_workspace.test.id}", "${azurerm_log_analytics_workspace.test2.id}"] + + frequency = 60 + time_window = 60 + + severity = 3 + azns_action { + action_group = ["${azurerm_monitor_action_group.test.id}"] + email_subject = "Custom alert email subject" + } + + trigger { + operator = "GreaterThan" + threshold = 5000 + } +} + +data "azurerm_monitor_scheduled_query_rules" "test" { + name = "${azurerm_monitor_scheduled_query_rules.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" +} +`, rInt, location, rInt, rInt, rInt, rInt, ts, ts) +} diff --git a/azurerm/internal/services/monitor/client.go b/azurerm/internal/services/monitor/client.go index accb35d792cd9..137284ec756ca 100644 --- a/azurerm/internal/services/monitor/client.go +++ b/azurerm/internal/services/monitor/client.go @@ -17,6 +17,7 @@ type Client struct { DiagnosticSettingsCategoryClient *insights.DiagnosticSettingsCategoryClient LogProfilesClient *insights.LogProfilesClient MetricAlertsClient *insights.MetricAlertsClient + ScheduledQueryRulesClient *insights.ScheduledQueryRulesClient } func BuildClient(o *common.ClientOptions) *Client { @@ -44,6 +45,9 @@ func BuildClient(o *common.ClientOptions) *Client { MetricAlertsClient := insights.NewMetricAlertsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&MetricAlertsClient.Client, o.ResourceManagerAuthorizer) + ScheduledQueryRulesClient := insights.NewScheduledQueryRulesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) + o.ConfigureClient(&ScheduledQueryRulesClient.Client, o.ResourceManagerAuthorizer) + return &Client{ AutoscaleSettingsClient: &AutoscaleSettingsClient, ActionGroupsClient: &ActionGroupsClient, @@ -53,5 +57,6 @@ func BuildClient(o *common.ClientOptions) *Client { DiagnosticSettingsCategoryClient: &DiagnosticSettingsCategoryClient, LogProfilesClient: &LogProfilesClient, MetricAlertsClient: &MetricAlertsClient, + ScheduledQueryRulesClient: &ScheduledQueryRulesClient, } } diff --git a/azurerm/provider.go b/azurerm/provider.go index 535d670e026ca..e28a2929189d2 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -106,6 +106,7 @@ func Provider() terraform.ResourceProvider { "azurerm_monitor_action_group": dataSourceArmMonitorActionGroup(), "azurerm_monitor_diagnostic_categories": dataSourceArmMonitorDiagnosticCategories(), "azurerm_monitor_log_profile": dataSourceArmMonitorLogProfile(), + "azurerm_monitor_scheduled_query_rules": dataSourceArmMonitorScheduledQueryRules(), "azurerm_mssql_elasticpool": dataSourceArmMsSqlElasticpool(), "azurerm_netapp_account": dataSourceArmNetAppAccount(), "azurerm_netapp_pool": dataSourceArmNetAppPool(), @@ -361,6 +362,7 @@ func Provider() terraform.ResourceProvider { "azurerm_monitor_log_profile": resourceArmMonitorLogProfile(), "azurerm_monitor_metric_alert": resourceArmMonitorMetricAlert(), "azurerm_monitor_metric_alertrule": resourceArmMonitorMetricAlertRule(), + "azurerm_monitor_scheduled_query_rules": resourceArmMonitorScheduledQueryRules(), "azurerm_mssql_elasticpool": resourceArmMsSqlElasticPool(), "azurerm_mysql_configuration": resourceArmMySQLConfiguration(), "azurerm_mysql_database": resourceArmMySqlDatabase(), diff --git a/azurerm/resource_arm_monitor_scheduled_query_rules.go b/azurerm/resource_arm_monitor_scheduled_query_rules.go new file mode 100644 index 0000000000000..ab85d9837572a --- /dev/null +++ b/azurerm/resource_arm_monitor_scheduled_query_rules.go @@ -0,0 +1,685 @@ +package azurerm + +import ( + "fmt" + "log" + "strconv" + "time" + + "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmMonitorScheduledQueryRules() *schema.Resource { + return &schema.Resource{ + Create: resourceArmMonitorScheduledQueryRulesCreateUpdate, + Read: resourceArmMonitorScheduledQueryRulesRead, + Update: resourceArmMonitorScheduledQueryRulesCreateUpdate, + Delete: resourceArmMonitorScheduledQueryRulesDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(30 * time.Minute), + Read: schema.DefaultTimeout(5 * time.Minute), + Update: schema.DefaultTimeout(30 * time.Minute), + Delete: schema.DefaultTimeout(30 * time.Minute), + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validate.NoEmptyStrings, + }, + + "resource_group_name": azure.SchemaResourceGroupName(), + + "location": azure.SchemaLocation(), + + "action_type": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + "Alerting", + "LogToMetric", + }, false), + }, + "authorized_resources": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "azns_action": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "action_group": { + Type: schema.TypeSet, + Required: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "custom_webhook_payload": { + Type: schema.TypeString, + Optional: true, + Default: "{}", + ValidateFunc: validation.ValidateJsonString, + }, + "email_subject": { + Type: schema.TypeString, + Optional: true, + }, + }, + }, + }, + "criteria": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "dimension": { + Type: schema.TypeSet, + Required: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + }, + "operator": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + "Include", + }, false), + }, + "values": { + Type: schema.TypeList, + Required: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + }, + }, + }, + "metric_name": { + Type: schema.TypeString, + Required: true, + }, + }, + }, + }, + "data_source_id": { + Type: schema.TypeString, + Required: true, + ValidateFunc: azure.ValidateResourceID, + }, + "description": { + Type: schema.TypeString, + Optional: true, + }, + "enabled": { + Type: schema.TypeBool, + Optional: true, + Default: true, + }, + "frequency": { + Type: schema.TypeInt, + Optional: true, + }, + "last_updated_time": { + Type: schema.TypeString, + Computed: true, + }, + "provisioning_state": { + Type: schema.TypeString, + Computed: true, + }, + "query": { + Type: schema.TypeString, + Optional: true, + }, + "query_type": { + Type: schema.TypeString, + Optional: true, + Default: "ResultCount", + ValidateFunc: validation.StringInSlice([]string{ + "ResultCount", + }, false), + }, + "severity": { + Type: schema.TypeInt, + Optional: true, + ValidateFunc: validation.IntInSlice([]int{ + 0, + 1, + 2, + 3, + 4, + }), + }, + "throttling": { + Type: schema.TypeInt, + Optional: true, + }, + "time_window": { + Type: schema.TypeInt, + Optional: true, + }, + "trigger": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "metric_trigger": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "metric_column": { + Type: schema.TypeString, + Required: true, + }, + "metric_trigger_type": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + "Consecutive", + "Total", + }, false), + }, + "operator": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + "GreaterThan", + "LessThan", + "Equal", + }, false), + }, + "threshold": { + Type: schema.TypeFloat, + Required: true, + }, + }, + }, + }, + "operator": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + "GreaterThan", + "LessThan", + "Equal", + }, false), + }, + "threshold": { + Type: schema.TypeFloat, + Required: true, + }, + }, + }, + }, + + "tags": tags.Schema(), + }, + } +} + +func resourceArmMonitorScheduledQueryRulesCreateUpdate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).Monitor.ScheduledQueryRulesClient + ctx, cancel := timeouts.ForCreateUpdate(meta.(*ArmClient).StopContext, d) + defer cancel() + + name := d.Get("name").(string) + resourceGroup := d.Get("resource_group_name").(string) + + if features.ShouldResourcesBeImported() && d.IsNewResource() { + existing, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if !utils.ResponseWasNotFound(existing.Response) { + return fmt.Errorf("Error checking for presence of existing Monitor Scheduled Query Rules %q (Resource Group %q): %s", name, resourceGroup, err) + } + } + + if existing.ID != nil && *existing.ID != "" { + return tf.ImportAsExistsError("azurerm_monitor_scheduled_query_rules", *existing.ID) + } + } + + actionType := d.Get("action_type").(string) + description := d.Get("description").(string) + enabledRaw := d.Get("enabled").(bool) + + enabled := insights.True + if enabledRaw == false { + enabled = insights.False + } + + location := azure.NormalizeLocation(d.Get("location")) + + var action insights.BasicAction + switch actionType { + case "Alerting": + action = expandMonitorScheduledQueryRulesAlertingAction(d) + case "LogToMetric": + action = expandMonitorScheduledQueryRulesLogToMetricAction(d) + default: + return fmt.Errorf("Invalid action_type %q. Value must be either 'Alerting' or 'LogToMetric'", actionType) + } + + source := expandMonitorScheduledQueryRulesSource(d) + schedule := expandMonitorScheduledQueryRulesSchedule(d) + + t := d.Get("tags").(map[string]interface{}) + expandedTags := tags.Expand(t) + + parameters := insights.LogSearchRuleResource{ + Location: utils.String(location), + LogSearchRule: &insights.LogSearchRule{ + Description: utils.String(description), + Enabled: enabled, + Source: source, + Schedule: schedule, + Action: action, + }, + Tags: expandedTags, + } + + if _, err := client.CreateOrUpdate(ctx, resourceGroup, name, parameters); err != nil { + return fmt.Errorf("Error creating or updating scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) + } + + read, err := client.Get(ctx, resourceGroup, name) + if err != nil { + return err + } + if read.ID == nil { + return fmt.Errorf("Scheduled query rule %q (resource group %q) ID is empty", name, resourceGroup) + } + d.SetId(*read.ID) + + return resourceArmMonitorScheduledQueryRulesRead(d, meta) +} + +func resourceArmMonitorScheduledQueryRulesRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).Monitor.ScheduledQueryRulesClient + ctx, cancel := timeouts.ForRead(meta.(*ArmClient).StopContext, d) + defer cancel() + + id, err := azure.ParseAzureResourceID(d.Id()) + if err != nil { + return err + } + resourceGroup := id.ResourceGroup + name := id.Path["scheduledqueryrules"] + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + log.Printf("[DEBUG] Scheduled Query Rule %q was not found in Resource Group %q - removing from state!", name, resourceGroup) + d.SetId("") + return nil + } + return fmt.Errorf("Error getting scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) + } + + d.Set("name", name) + d.Set("resource_group_name", resourceGroup) + if location := resp.Location; location != nil { + d.Set("location", azure.NormalizeLocation(*location)) + } + + if resp.Enabled == insights.True { + d.Set("enabled", true) + } else { + d.Set("enabled", false) + } + + d.Set("description", *resp.Description) + + switch action := resp.Action.(type) { + case insights.AlertingAction: + d.Set("action_type", "Alerting") + d.Set("azns_action", flattenAzureRmScheduledQueryRulesAznsAction(action.AznsAction)) + severity, err := strconv.Atoi(string(action.Severity)) + if err != nil { + return fmt.Errorf("Error converting action.Severity %q in query rule %q to int (resource group %q): %+v", action.Severity, name, resourceGroup, err) + } + d.Set("severity", severity) + d.Set("throttling", *action.ThrottlingInMin) + d.Set("trigger", flattenAzureRmScheduledQueryRulesTrigger(action.Trigger)) + case insights.LogToMetricAction: + d.Set("action_type", "LogToMetric") + d.Set("criteria", flattenAzureRmScheduledQueryRulesCriteria(action.Criteria)) + default: + return fmt.Errorf("Unknown action type in scheduled query rule %q (resource group %q): %T", name, resourceGroup, resp.Action) + } + + if schedule := resp.Schedule; schedule != nil { + if schedule.FrequencyInMinutes != nil { + d.Set("frequency", *schedule.FrequencyInMinutes) + } + if schedule.TimeWindowInMinutes != nil { + d.Set("time_window", *schedule.TimeWindowInMinutes) + } + } + + if source := resp.Source; source != nil { + if source.AuthorizedResources != nil { + d.Set("authorized_resources", *source.AuthorizedResources) + } + if source.DataSourceID != nil { + d.Set("data_source_id", *source.DataSourceID) + } + if source.Query != nil { + d.Set("query", *source.Query) + } + d.Set("query_type", string(source.QueryType)) + } + + // read-only props + d.Set("last_updated_time", *resp.LastUpdatedTime) + d.Set("provisioning_state", resp.ProvisioningState) + + return tags.FlattenAndSet(d, resp.Tags) +} + +func resourceArmMonitorScheduledQueryRulesDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).Monitor.ScheduledQueryRulesClient + ctx, cancel := timeouts.ForDelete(meta.(*ArmClient).StopContext, d) + defer cancel() + + id, err := azure.ParseAzureResourceID(d.Id()) + if err != nil { + return err + } + resourceGroup := id.ResourceGroup + name := id.Path["scheduledqueryrules"] + + if resp, err := client.Delete(ctx, resourceGroup, name); err != nil { + if !response.WasNotFound(resp.Response) { + return fmt.Errorf("Error deleting scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) + } + } + + return nil +} + +func expandMonitorScheduledQueryRulesAlertingAction(d *schema.ResourceData) *insights.AlertingAction { + aznsActionRaw := d.Get("azns_action").(*schema.Set).List() + aznsAction := expandMonitorScheduledQueryRulesAznsAction(aznsActionRaw) + severityRaw := d.Get("severity").(int) + severity := strconv.Itoa(severityRaw) + throttling := d.Get("throttling").(int) + + triggerRaw := d.Get("trigger").(*schema.Set).List() + trigger := expandMonitorScheduledQueryRulesTrigger(triggerRaw) + + action := insights.AlertingAction{ + AznsAction: aznsAction, + Severity: insights.AlertSeverity(severity), + ThrottlingInMin: utils.Int32(int32(throttling)), + Trigger: trigger, + OdataType: insights.OdataTypeMicrosoftWindowsAzureManagementMonitoringAlertsModelsMicrosoftAppInsightsNexusDataContractsResourcesScheduledQueryRulesAlertingAction, + } + + return &action +} + +func expandMonitorScheduledQueryRulesAznsAction(input []interface{}) *insights.AzNsActionGroup { + result := insights.AzNsActionGroup{} + + for _, item := range input { + v := item.(map[string]interface{}) + actionGroups := v["action_group"].(*schema.Set).List() + + result.ActionGroup = utils.ExpandStringSlice(actionGroups) + result.EmailSubject = utils.String(v["email_subject"].(string)) + result.CustomWebhookPayload = utils.String(v["custom_webhook_payload"].(string)) + } + + return &result +} + +func expandMonitorScheduledQueryRulesCriteria(input []interface{}) *[]insights.Criteria { + criteria := make([]insights.Criteria, 0) + for _, item := range input { + v := item.(map[string]interface{}) + + dimensions := make([]insights.Dimension, 0) + for _, dimension := range v["dimension"].(*schema.Set).List() { + dVal := dimension.(map[string]interface{}) + dimensions = append(dimensions, insights.Dimension{ + Name: utils.String(dVal["name"].(string)), + Operator: utils.String(dVal["operator"].(string)), + Values: utils.ExpandStringSlice(dVal["values"].([]interface{})), + }) + } + + criteria = append(criteria, insights.Criteria{ + MetricName: utils.String(v["metric_name"].(string)), + Dimensions: &dimensions, + }) + } + return &criteria +} + +func expandMonitorScheduledQueryRulesLogToMetricAction(d *schema.ResourceData) *insights.LogToMetricAction { + criteriaRaw := d.Get("criteria").(*schema.Set).List() + criteria := expandMonitorScheduledQueryRulesCriteria(criteriaRaw) + + action := insights.LogToMetricAction{ + Criteria: criteria, + OdataType: insights.OdataTypeMicrosoftWindowsAzureManagementMonitoringAlertsModelsMicrosoftAppInsightsNexusDataContractsResourcesScheduledQueryRulesLogToMetricAction, + } + + return &action +} + +func expandMonitorScheduledQueryRulesSchedule(d *schema.ResourceData) *insights.Schedule { + frequency := d.Get("frequency").(int) + timeWindow := d.Get("time_window").(int) + + schedule := insights.Schedule{ + FrequencyInMinutes: utils.Int32(int32(frequency)), + TimeWindowInMinutes: utils.Int32(int32(timeWindow)), + } + + return &schedule +} + +func expandMonitorScheduledQueryRulesMetricTrigger(input []interface{}) *insights.LogMetricTrigger { + result := insights.LogMetricTrigger{} + + for _, item := range input { + v := item.(map[string]interface{}) + result.ThresholdOperator = insights.ConditionalOperator(v["operator"].(string)) + result.Threshold = utils.Float(v["threshold"].(float64)) + result.MetricTriggerType = insights.MetricTriggerType(v["metric_trigger_type"].(string)) + result.MetricColumn = utils.String(v["metric_column"].(string)) + } + + return &result +} + +func expandMonitorScheduledQueryRulesSource(d *schema.ResourceData) *insights.Source { + authorizedResources := d.Get("authorized_resources").(*schema.Set).List() + dataSourceID := d.Get("data_source_id").(string) + query := d.Get("query").(string) + + source := insights.Source{ + AuthorizedResources: utils.ExpandStringSlice(authorizedResources), + DataSourceID: utils.String(dataSourceID), + Query: utils.String(query), + QueryType: insights.ResultCount, + } + + return &source +} + +func expandMonitorScheduledQueryRulesTrigger(input []interface{}) *insights.TriggerCondition { + result := insights.TriggerCondition{} + + for _, item := range input { + v := item.(map[string]interface{}) + metricTriggerRaw := v["metric_trigger"].(*schema.Set).List() + + result.ThresholdOperator = insights.ConditionalOperator(v["operator"].(string)) + result.Threshold = utils.Float(v["threshold"].(float64)) + result.MetricTrigger = expandMonitorScheduledQueryRulesMetricTrigger(metricTriggerRaw) + } + + return &result +} + +func flattenAzureRmScheduledQueryRulesAznsAction(input *insights.AzNsActionGroup) []interface{} { + result := make([]interface{}, 0) + v := make(map[string]interface{}) + + if input != nil { + if input.ActionGroup != nil { + v["action_group"] = *input.ActionGroup + } + v["email_subject"] = input.EmailSubject + v["custom_webhook_payload"] = input.CustomWebhookPayload + } + result = append(result, v) + + return result +} + +func flattenAzureRmScheduledQueryRulesCriteria(input *[]insights.Criteria) []interface{} { + result := make([]interface{}, 0) + + if input != nil { + for _, criteria := range *input { + v := make(map[string]interface{}) + + /*if err = d.Set("azure_function_receiver", flattenMonitorActionGroupAzureFunctionReceiver(group.AzureFunctionReceivers)); err != nil { + return fmt.Errorf("Error setting `azure_function_receiver`: %+v", err) + }*/ + v["dimension"] = flattenAzureRmScheduledQueryRulesDimension(criteria.Dimensions) + v["metric_name"] = *criteria.MetricName + + result = append(result, v) + } + } + + return result +} + +func flattenAzureRmScheduledQueryRulesDimension(input *[]insights.Dimension) []interface{} { + result := make([]interface{}, 0) + + if input != nil { + for _, dimension := range *input { + v := make(map[string]interface{}) + + if dimension.Name != nil { + v["name"] = *dimension.Name + } + + if dimension.Operator != nil { + v["operator"] = *dimension.Operator + } + + if dimension.Values != nil { + v["values"] = *dimension.Values + } + + result = append(result, v) + } + } + + return result +} + +func flattenAzureRmScheduledQueryRulesMetricTrigger(input *insights.LogMetricTrigger) []interface{} { + result := make(map[string]interface{}) + + if input == nil { + return []interface{}{} + } + + result["operator"] = string(input.ThresholdOperator) + + if input.Threshold != nil { + result["threshold"] = *input.Threshold + } + + result["metric_trigger_type"] = string(input.MetricTriggerType) + + if input.MetricColumn != nil { + result["metric_column"] = *input.MetricColumn + } + return []interface{}{result} +} + +func flattenAzureRmScheduledQueryRulesSchedule(input *insights.Schedule) []interface{} { + result := make(map[string]interface{}) + + if input == nil { + return []interface{}{} + } + + if input.FrequencyInMinutes != nil { + result["frequency_in_minutes"] = int(*input.FrequencyInMinutes) + } + + if input.TimeWindowInMinutes != nil { + result["time_window_in_minutes"] = int(*input.TimeWindowInMinutes) + } + + return []interface{}{result} +} + +func flattenAzureRmScheduledQueryRulesSource(input *insights.Source) []interface{} { + result := make(map[string]interface{}) + + if input.AuthorizedResources != nil { + result["authorized_resources"] = *input.AuthorizedResources + } + if input.DataSourceID != nil { + result["data_source_id"] = *input.DataSourceID + } + if input.Query != nil { + result["query"] = *input.Query + } + result["query_type"] = string(input.QueryType) + + return []interface{}{result} +} + +func flattenAzureRmScheduledQueryRulesTrigger(input *insights.TriggerCondition) []interface{} { + result := make(map[string]interface{}) + + result["operator"] = string(input.ThresholdOperator) + + if input.Threshold != nil { + result["threshold"] = *input.Threshold + } + + if input.MetricTrigger != nil { + result["metric_trigger"] = flattenAzureRmScheduledQueryRulesMetricTrigger(input.MetricTrigger) + } + + return []interface{}{result} +} diff --git a/azurerm/resource_arm_monitor_scheduled_query_rules_test.go b/azurerm/resource_arm_monitor_scheduled_query_rules_test.go new file mode 100644 index 0000000000000..fa371118723fb --- /dev/null +++ b/azurerm/resource_arm_monitor_scheduled_query_rules_test.go @@ -0,0 +1,320 @@ +package azurerm + +import ( + "fmt" + "net/http" + "strings" + "testing" + "time" + + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" +) + +func TestAccAzureRMMonitorScheduledQueryRules_AlertingAction(t *testing.T) { + resourceName := "azurerm_monitor_scheduled_query_rules.test" + ri := tf.AccRandTimeInt() + rs := strings.ToLower(acctest.RandString(11)) + location := testLocation() + config := testAccAzureRMMonitorScheduledQueryRules_alertingAction(ri, rs, location) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMonitorScheduledQueryRulesExists(resourceName), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) + return +} + +func TestAccAzureRMMonitorScheduledQueryRules_AlertingActionCrossResource(t *testing.T) { + resourceName := "azurerm_monitor_scheduled_query_rules.test" + ri := tf.AccRandTimeInt() + rs := strings.ToLower(acctest.RandString(11)) + location := testLocation() + config := testAccAzureRMMonitorScheduledQueryRules_alertingActionCrossResource(ri, rs, location) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMonitorScheduledQueryRulesExists(resourceName), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) + return +} + +func TestAccAzureRMMonitorScheduledQueryRules_LogToMetricAction(t *testing.T) { + resourceName := "azurerm_monitor_scheduled_query_rules.test" + ri := tf.AccRandTimeInt() + rs := strings.ToLower(acctest.RandString(11)) + location := testLocation() + config := testAccAzureRMMonitorScheduledQueryRules_logToMetricAction(ri, rs, location) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMonitorScheduledQueryRulesExists(resourceName), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) + return +} + +func testAccAzureRMMonitorScheduledQueryRules_alertingAction(rInt int, rString, location string) string { + ts := time.Now().Format(time.RFC3339) + + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_application_insights" "test" { + name = "acctestAppInsights-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + application_type = "web" +} + +resource "azurerm_monitor_action_group" "test" { + name = "acctestActionGroup-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + short_name = "acctestag" +} + +resource "azurerm_monitor_scheduled_query_rules" "test" { + name = "acctestsqr-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + description = "test log to metric action" + enabled = true + action_type = "Alerting" + + data_source_id = "${azurerm_application_insights.test.id}" + query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h" + query_type = "ResultCount" + + frequency = 60 + time_window = 60 + + severity = 3 + azns_action { + action_group = ["${azurerm_monitor_action_group.test.id}"] + email_subject = "Custom alert email subject" + custom_webhook_payload = "{}" + } + + trigger { + operator = "GreaterThan" + threshold = 5000 + metric_trigger { + operator = "GreaterThan" + threshold = 5 + metric_trigger_type = "Consecutive" + metric_column = "Computer" + } + } +} +`, rInt, location, rInt, rInt, rInt, ts, ts) +} + +func testAccAzureRMMonitorScheduledQueryRules_alertingActionCrossResource(rInt int, rString, location string) string { + ts := time.Now().Format(time.RFC3339) + + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_application_insights" "test" { + name = "acctestAppInsights-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + application_type = "web" +} + +resource "azurerm_log_analytics_workspace" "test" { + name = "acctestWorkspace-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + sku = "PerGB2018" + retention_in_days = 30 +} + +resource "azurerm_monitor_action_group" "test" { + name = "acctestActionGroup-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + short_name = "acctestag" +} + +resource "azurerm_monitor_scheduled_query_rules" "test" { + name = "acctestsqr-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + description = "test log to metric action" + enabled = true + action_type = "Alerting" + + authorized_resources = ["${azurerm_application_insights.test.id}", "${azurerm_log_analytics_workspace.test.id}"] + data_source_id = "${azurerm_application_insights.test.id}" + query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h" + query_type = "ResultCount" + + frequency = 60 + time_window = 60 + + severity = 3 + azns_action { + action_group = ["${azurerm_monitor_action_group.test.id}"] + email_subject = "Custom alert email subject" + } + + trigger { + operator = "GreaterThan" + threshold = 5000 + metric_trigger { + operator = "GreaterThan" + threshold = 5 + metric_trigger_type = "Consecutive" + metric_column = "Computer" + } + } +} +`, rInt, location, rInt, rInt, rInt, rInt, ts, ts) +} + +func testAccAzureRMMonitorScheduledQueryRules_logToMetricAction(rInt int, rString, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_application_insights" "test" { + name = "acctestAppInsights-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + application_type = "web" +} + +resource "azurerm_monitor_action_group" "test" { + name = "acctestActionGroup-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + short_name = "acctestag" +} + +resource "azurerm_monitor_scheduled_query_rules" "test" { + name = "acctestsqr-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + description = "test log to metric action" + enabled = true + action_type = "LogToMetric" + + data_source_id = "${azurerm_application_insights.test.id}" + + criteria { + metric_name = "Average_percent Idle Time" + dimension { + name = "dimension" + operator = "Include" + values = ["latency"] + } + } +} +`, rInt, location, rInt, rInt, rInt) +} + +func testCheckAzureRMMonitorScheduledQueryRulesDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*ArmClient).Monitor.ScheduledQueryRulesClient + ctx := testAccProvider.Meta().(*ArmClient).StopContext + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_monitor_scheduled_query_rules" { + continue + } + + name := rs.Primary.Attributes["name"] + resourceGroup := rs.Primary.Attributes["resource_group_name"] + + resp, err := conn.Get(ctx, resourceGroup, name) + + if err != nil { + return nil + } + + if resp.StatusCode != http.StatusNotFound { + return fmt.Errorf("Activity log alert still exists:\n%#v", resp) + } + } + + return nil +} + +func testCheckAzureRMMonitorScheduledQueryRulesExists(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + // Ensure we have enough information in state to look up in API + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("Not found: %s", resourceName) + } + + name := rs.Primary.Attributes["name"] + resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] + if !hasResourceGroup { + return fmt.Errorf("Bad: no resource group found in state for Activity Log Alert Instance: %s", name) + } + + conn := testAccProvider.Meta().(*ArmClient).Monitor.ScheduledQueryRulesClient + ctx := testAccProvider.Meta().(*ArmClient).StopContext + + resp, err := conn.Get(ctx, resourceGroup, name) + if err != nil { + return fmt.Errorf("Bad: Get on monitorScheduledQueryRulesClient: %+v", err) + } + + if resp.StatusCode == http.StatusNotFound { + return fmt.Errorf("Bad: Activity Log Alert Instance %q (resource group: %q) does not exist", name, resourceGroup) + } + + return nil + } +} diff --git a/website/docs/d/monitor_scheduled_query_rules.html.markdown b/website/docs/d/monitor_scheduled_query_rules.html.markdown new file mode 100644 index 0000000000000..804ec3e2606c8 --- /dev/null +++ b/website/docs/d/monitor_scheduled_query_rules.html.markdown @@ -0,0 +1,88 @@ +--- +subcategory: "" +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_monitor_scheduled_query_rules" +sidebar_current: "docs-azurerm-datasource-monitor-scheduled-query-rules" +description: |- + Get information about the specified Scheduled Query Rule. +--- + +# Data Source: azurerm_monitor_scheduled_query_rules + +Use this data source to access the properties of a Scheduled Query Rule. + +## Example Usage + +```hcl +data "azurerm_monitor_scheduled_query_rules" "example" { + resource_group_name = "terraform-example-rg" + name = "tfex-queryrule" +} + +output "query_rule_id" { + value = "${data.azurerm_monitor_scheduled_query_rules.example.id}" +} +``` + +## Argument Reference + +* `name` - (Required) Specifies the name of the Scheduled Query Rule. +* `resource_group_name` - (Required) Specifies the name of the resource group the Scheduled Query Rule is located in. + +## Attributes Reference + +* `id` - The ID of the Scheduled Query Rule. +* `azns_action` - An `azns_action` block as defined below. +* `action_type` - Must equal ether `AlertingAction` or `LogToMetricAction`. +* `authorized_resources` - List of Resource IDs referred into query. +* `criteria` - A `criteria` block as defined below. +* `data_source_id` - The resource uri over which log search query is to be run. +* `description` - The description of the Scheduled Query Rule. +* `enabled` - Whether this scheduled query rule is enabled. +* `frequency` - Frequency (in minutes) at which rule condition should be evaluated. +* `query` - Log search query. Required for action type - `alerting_action`. +* `query_type` - Must equal "ResultCount". +* `time_window` - Time window for which data needs to be fetched for query (should be greater than or equal to frequency_in_minutes). +* `severity` - Severity of the alert. Possible values include: 0, 1, 2, 3, or 4. +* `throttling` - Time (in minutes) for which Alerts should be throttled or suppressed. +* `trigger` - A `trigger` block as defined below. The condition that results in the alert rule being run. + +--- + +* `azns_action` supports the following: + +* `action_group` - (Optional) List of action group reference resource IDs. +* `custom_webhook_payload` - Custom payload to be sent for all webhook URI in Azure action group. +* `email_subject` - Custom subject override for all email ids in Azure action group. + +--- + +`criteria` supports the following: + +* `dimension` - (Required) A `dimension` block as defined below. +* `metric_name` - (Required) Name of the metric. + +--- + +`dimension` supports the following: + +* `name` - (Required) Name of the dimension. +* `operator` - (Required) Operator for dimension values, - 'Include'. +* `values` - (Required) List of dimension values. + +--- + +`metricTrigger` supports the following: + +* `metricColumn` - (Required) Evaluation of metric on a particular column. +* `metricTriggerType` - (Required) Metric Trigger Type - 'Consecutive' or 'Total'. +* `operator` - (Required) Evaluation operation for rule - 'Equal', 'GreaterThan' or 'LessThan'. +* `threshold` - (Required) The threshold of the metric trigger. + +--- + +`trigger` supports the following: + +* `metricTrigger` - (Optional) A `metricTrigger` block as defined above. Trigger condition for metric query rule. +* `operator` - (Required) Evaluation operation for rule - 'Equal', 'GreaterThan' or 'LessThan'. +* `threshold` - (Required) Result or count threshold based on which rule should be triggered. diff --git a/website/docs/r/monitor_scheduled_query_rules.html.markdown b/website/docs/r/monitor_scheduled_query_rules.html.markdown new file mode 100644 index 0000000000000..439981bc06a5b --- /dev/null +++ b/website/docs/r/monitor_scheduled_query_rules.html.markdown @@ -0,0 +1,193 @@ +--- +subcategory: "Monitor" +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_monitor_scheduled_query_rules" +sidebar_current: "docs-azurerm-resource-monitor-scheduled-query-rules" +description: |- + Manages a Scheduled Query Rule within Azure Monitor +--- + +# azurerm_monitor_action_group + +Manages a Scheduled Query Rule within Azure Monitor. + +## Example Usage + +```hcl +resource "azurerm_resource_group" "example" { + name = "monitoring-resources" + location = "West US" +} + +resource "azurerm_application_insights" "example" { + name = "appinsights" + location = var.location + resource_group_name = azurerm_resource_group.example.name + application_type = "web" +} + +resource "azurerm_log_analytics_workspace" "example" { + name = "loganalytics" + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name + sku = "PerGB2018" + retention_in_days = 30 +} + +# Example: AlertingAction +resource "azurerm_scheduled_query_rule" "example" { + name = format("%s-queryrule", var.prefix) + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name + + action_type = "AlertingAction" + azns_action = { + action_group = [] + email_subject = "Email Header" + custom_webhook_payload = {} + } + data_source_id = azurerm_application_insights.example.id + description = "Scheduled query rule AlertingAction example" + enabled = true + frequency = 5 + query = "requests | where status_code >= 500 | summarize AggregatedValue = count() by bin(timestamp, 5m)" + query_type = "ResultCount" + severity = "1" + time_window = 30 + trigger = { + threshold_operator = "GreaterThan" + threshold = 3 + } +} + +# Example: AlertingAction Cross-Resource +resource "azurerm_scheduled_query_rule" "example2" { + name = format("%s-queryrule2", var.prefix) + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name + + action_type = "AlertingAction" + authorized_resources = [azurerm_application_insights.example.id, + azurerm_log_analytics_workspace.example.id] + azns_action = { + action_group = [] + email_subject = "Email Header" + custom_webhook_payload = {} + } + data_source_id = azurerm_application_insights.example.id + description = "Scheduled query rule AlertingAction cross-resource example" + enabled = true + frequency = 5 + query = "union requests, workspace(\"loganalytics\").Heartbeat" + query_type = "ResultCount" + severity = "1" + time_window = 30 + trigger = { + threshold_operator = "GreaterThan" + threshold = 3 + } +} + +# Example: LogToMetricAction +resource "azurerm_scheduled_query_rule" "example3" { + name = format("%s-queryrule3", var.prefix) + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name + + action_type = "LogToMetricAction" + criteria = [{ + metric_name = "Average_% Idle Time" + dimensions = [{ + name = "dimension" + operator = "GreaterThan" + values = ["latency"] + }] + }] + data_source_id = azurerm_application_insights.example.id + description = "Scheduled query rule LogToMetric example" + enabled = true +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) The name of the Scheduled Query Rule. Changing this forces a new resource to be created. +* `resource_group_name` - (Required) The name of the resource group in which to create the Scheduled Query Rule instance. +* `action_type` - (Required) Must equal ether `AlertingAction` or `LogToMetricAction`. +* `authorized_resources` - (Optional) List of Resource IDs referred into query. +* `data_source_id` - (Required) The resource uri over which log search query is to be run. +* `description` - (Optional) The description of the Scheduled Query Rule. +* `enabled` - (Optional) Whether this scheduled query rule is enabled. Default is `true`. +* `throttling` - (Optional) Time (in minutes) for which Alerts should be throttled or suppressed. + +The following arguments are only supported when `action_type` is `AlertingAction`: + +* `azns_action` - (Optional) An `azns_action` block as defined below. +* `frequency` - (Optional) Frequency (in minutes) at which rule condition should be evaluated. Required when `action_type` is `AlertingAction`. +* `query` - (Optional) Log search query. Required when `action_type` is `AlertingAction`. +* `query_type` - (Optional) Must equal "ResultCount" for now. Required when `action_type` is `AlertingAction`. +* `severity` - (Optional) Severity of the alert. Possible values include: 0, 1, 2, 3, or 4. +* `time_window` - (Optional) Time window for which data needs to be fetched for query (should be greater than or equal to `frequency`). Required when `action_type` is `AlertingAction`. +* `trigger` - (Optional) The condition that results in the alert rule being run. Required when `action_type` is `AlertingAction`. + +The following arguments are only supported when `action_type` is `LogToMetricAction`: + +* `criteria` - (Optional) A `criteria` block as defined below. Required when `action_type` is `LogToMetricAction`. + +--- + +* `azns_action` supports the following: + +* `action_group` - (Optional) List of action group reference resource IDs. +* `custom_webhook_payload` - (Optional) Custom payload to be sent for all webhook payloads in alerting action. +* `email_subject` - (Optional) Custom subject override for all email ids in Azure action group. + +--- + +`criteria` supports the following: + +* `dimension` - (Required) A `dimension` block as defined below. +* `metric_name` - (Required) Name of the metric. + +--- + +`dimension` supports the following: + +* `name` - (Required) Name of the dimension. +* `operator` - (Required) Operator for dimension values, - 'Include'. +* `values` - (Required) List of dimension values. + +--- + +`metricTrigger` supports the following: + +* `metricColumn` - (Required) Evaluation of metric on a particular column. +* `metricTriggerType` - (Required) Metric Trigger Type - 'Consecutive' or 'Total'. +* `operator` - (Required) Evaluation operation for rule - 'Equal', 'GreaterThan' or 'LessThan'. +* `threshold` - (Required) The threshold of the metric trigger. + +--- + +`trigger` supports the following: + +* `metricTrigger` - (Optional) A `metricTrigger` block as defined above. Trigger condition for metric query rule. +* `operator` - (Required) Evaluation operation for rule - 'Equal', 'GreaterThan' or 'LessThan'. +* `threshold` - (Required) Result or count threshold based on which rule should be triggered. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The ID of the Scheduled Query Rule. +* `last_updated_time` - Last time the rule was updated in IS08601 format. +* `provisioning_state` - Provisioning state of the scheduled query rule. Possible values include: 'Succeeded', 'Deploying', 'Canceled', 'Failed' + +## Import + +Scheduled Query Rules can be imported using the `resource id`, e.g. + +```shell +terraform import azurerm_monitor_scheduled_query_rules.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.Insights/scheduledQueryRules/myrulename +``` From 5303ecd0bc242d24e1d3d46dd52238105950ef0c Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Mon, 2 Dec 2019 21:25:12 -0600 Subject: [PATCH 002/498] Acceptance tests passing --- ...ta_source_monitor_scheduled_query_rules.go | 19 ++++++++----- ...urce_monitor_scheduled_query_rules_test.go | 27 ++++++++++++++----- ...ource_arm_monitor_scheduled_query_rules.go | 10 +++---- ..._arm_monitor_scheduled_query_rules_test.go | 24 ++++++++--------- 4 files changed, 50 insertions(+), 30 deletions(-) diff --git a/azurerm/data_source_monitor_scheduled_query_rules.go b/azurerm/data_source_monitor_scheduled_query_rules.go index 7d551ed10437b..5d9c5bbbadb6a 100644 --- a/azurerm/data_source_monitor_scheduled_query_rules.go +++ b/azurerm/data_source_monitor_scheduled_query_rules.go @@ -85,8 +85,11 @@ func dataSourceArmMonitorScheduledQueryRules() *schema.Resource { Computed: true, }, "values": { - Type: schema.TypeString, + Type: schema.TypeList, Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, }, }, }, @@ -220,17 +223,20 @@ func dataSourceArmMonitorScheduledQueryRulesRead(d *schema.ResourceData, meta in switch action := resp.Action.(type) { case insights.AlertingAction: d.Set("action_type", "Alerting") - d.Set("azns_action", *action.AznsAction) + + aznsAction := flattenAzureRmScheduledQueryRulesAznsAction(action.AznsAction) + d.Set("azns_action", aznsAction) + severity, err := strconv.Atoi(string(action.Severity)) if err != nil { return fmt.Errorf("Error converting action.Severity %q in query rule %q to int (resource group %q): %+v", action.Severity, name, resourceGroup, err) } d.Set("severity", severity) d.Set("throttling", *action.ThrottlingInMin) - d.Set("trigger", *action.Trigger) + d.Set("trigger", flattenAzureRmScheduledQueryRulesTrigger(action.Trigger)) case insights.LogToMetricAction: d.Set("action_type", "LogToMetric") - d.Set("criteria", *action.Criteria) + d.Set("criteria", flattenAzureRmScheduledQueryRulesCriteria(action.Criteria)) default: return fmt.Errorf("Unknown action type in scheduled query rule %q (resource group %q): %T", name, resourceGroup, resp.Action) } @@ -257,8 +263,9 @@ func dataSourceArmMonitorScheduledQueryRulesRead(d *schema.ResourceData, meta in d.Set("query_type", string(source.QueryType)) } - // read-only props - d.Set("last_updated_time", *resp.LastUpdatedTime) + if lastUpdated := resp.LastUpdatedTime; lastUpdated != nil { + d.Set("last_updated_time", *lastUpdated) + } d.Set("provisioning_state", resp.ProvisioningState) return tags.FlattenAndSet(d, resp.Tags) diff --git a/azurerm/data_source_monitor_scheduled_query_rules_test.go b/azurerm/data_source_monitor_scheduled_query_rules_test.go index 5aed5d9797329..2642ac2652a9c 100644 --- a/azurerm/data_source_monitor_scheduled_query_rules_test.go +++ b/azurerm/data_source_monitor_scheduled_query_rules_test.go @@ -15,16 +15,16 @@ func TestAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricAction(t *tes ri := tf.AccRandTimeInt() rs := acctest.RandString(10) location := testLocation() + config := testAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricActionConfig(ri, rs, location) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricActionConfig(ri, rs, location), + Config: config, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(dataSourceName, "id"), - resource.TestCheckResourceAttr(dataSourceName, "enabled", "true"), ), }, }, @@ -36,13 +36,14 @@ func TestAccDataSourceAzureRMMonitorScheduledQueryRules_alertingAction(t *testin ri := tf.AccRandTimeInt() rs := acctest.RandString(10) location := testLocation() + config := testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionConfig(ri, rs, location) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionConfig(ri, rs, location), + Config: config, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(dataSourceName, "id"), ), @@ -56,13 +57,14 @@ func TestAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResou ri := tf.AccRandTimeInt() rs := acctest.RandString(10) location := testLocation() + config := testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResourceConfig(ri, rs, location) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResourceConfig(ri, rs, location), + Config: config, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(dataSourceName, "id"), ), @@ -142,21 +144,20 @@ resource "azurerm_monitor_action_group" "test" { } resource "azurerm_monitor_scheduled_query_rules" "test" { - name = "acctestSqr-%d" + name = "acctestsqr-%d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" description = "test alerting action" enabled = true action_type = "Alerting" - query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h" + query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" data_source_id = "${azurerm_log_analytics_workspace.test.id}" query_type = "ResultCount" frequency = 60 time_window = 60 - severity = 3 azns_action { action_group = ["${azurerm_monitor_action_group.test.id}"] @@ -166,6 +167,12 @@ resource "azurerm_monitor_scheduled_query_rules" "test" { trigger { operator = "GreaterThan" threshold = 5000 + metric_trigger { + operator = "GreaterThan" + threshold = 1 + metric_trigger_type = "Total" + metric_column = "TimeGenerated" + } } } @@ -232,6 +239,12 @@ resource "azurerm_monitor_scheduled_query_rules" "test" { trigger { operator = "GreaterThan" threshold = 5000 + metric_trigger { + operator = "GreaterThan" + threshold = 1 + metric_trigger_type = "Total" + metric_column = "TimeGenerated" + } } } diff --git a/azurerm/resource_arm_monitor_scheduled_query_rules.go b/azurerm/resource_arm_monitor_scheduled_query_rules.go index ab85d9837572a..650cd33b995bf 100644 --- a/azurerm/resource_arm_monitor_scheduled_query_rules.go +++ b/azurerm/resource_arm_monitor_scheduled_query_rules.go @@ -346,6 +346,10 @@ func resourceArmMonitorScheduledQueryRulesRead(d *schema.ResourceData, meta inte if location := resp.Location; location != nil { d.Set("location", azure.NormalizeLocation(*location)) } + if lastUpdated := resp.LastUpdatedTime; lastUpdated != nil { + d.Set("last_updated_time", *lastUpdated) + } + d.Set("provisioning_state", resp.ProvisioningState) if resp.Enabled == insights.True { d.Set("enabled", true) @@ -395,17 +399,13 @@ func resourceArmMonitorScheduledQueryRulesRead(d *schema.ResourceData, meta inte d.Set("query_type", string(source.QueryType)) } - // read-only props - d.Set("last_updated_time", *resp.LastUpdatedTime) - d.Set("provisioning_state", resp.ProvisioningState) - return tags.FlattenAndSet(d, resp.Tags) } func resourceArmMonitorScheduledQueryRulesDelete(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).Monitor.ScheduledQueryRulesClient ctx, cancel := timeouts.ForDelete(meta.(*ArmClient).StopContext, d) - defer cancel() + defer cancel() id, err := azure.ParseAzureResourceID(d.Id()) if err != nil { diff --git a/azurerm/resource_arm_monitor_scheduled_query_rules_test.go b/azurerm/resource_arm_monitor_scheduled_query_rules_test.go index fa371118723fb..7d7c2d2fdce13 100644 --- a/azurerm/resource_arm_monitor_scheduled_query_rules_test.go +++ b/azurerm/resource_arm_monitor_scheduled_query_rules_test.go @@ -123,12 +123,12 @@ resource "azurerm_monitor_scheduled_query_rules" "test" { name = "acctestsqr-%d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" - description = "test log to metric action" + description = "test alerting action" enabled = true action_type = "Alerting" data_source_id = "${azurerm_application_insights.test.id}" - query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h" + query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" query_type = "ResultCount" frequency = 60 @@ -142,13 +142,13 @@ resource "azurerm_monitor_scheduled_query_rules" "test" { } trigger { - operator = "GreaterThan" - threshold = 5000 + operator = "GreaterThan" + threshold = 5000 metric_trigger { operator = "GreaterThan" - threshold = 5 - metric_trigger_type = "Consecutive" - metric_column = "Computer" + threshold = 1 + metric_trigger_type = "Total" + metric_column = "TimeGenerated" } } } @@ -189,13 +189,13 @@ resource "azurerm_monitor_scheduled_query_rules" "test" { name = "acctestsqr-%d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" - description = "test log to metric action" + description = "test alerting action cross-resource" enabled = true action_type = "Alerting" authorized_resources = ["${azurerm_application_insights.test.id}", "${azurerm_log_analytics_workspace.test.id}"] data_source_id = "${azurerm_application_insights.test.id}" - query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h" + query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" query_type = "ResultCount" frequency = 60 @@ -212,9 +212,9 @@ resource "azurerm_monitor_scheduled_query_rules" "test" { threshold = 5000 metric_trigger { operator = "GreaterThan" - threshold = 5 - metric_trigger_type = "Consecutive" - metric_column = "Computer" + threshold = 1 + metric_trigger_type = "Total" + metric_column = "TimeGenerated" } } } From 607a00d86b40fbb0f92c9e384851ff86caaa6d54 Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Tue, 3 Dec 2019 09:19:32 -0600 Subject: [PATCH 003/498] Fix linting errors; minor cleanup --- ...ta_source_monitor_scheduled_query_rules.go | 31 ++++---- ...ource_arm_monitor_scheduled_query_rules.go | 75 ++++--------------- ..._arm_monitor_scheduled_query_rules_test.go | 3 - 3 files changed, 32 insertions(+), 77 deletions(-) diff --git a/azurerm/data_source_monitor_scheduled_query_rules.go b/azurerm/data_source_monitor_scheduled_query_rules.go index 5d9c5bbbadb6a..6e12d24266485 100644 --- a/azurerm/data_source_monitor_scheduled_query_rules.go +++ b/azurerm/data_source_monitor_scheduled_query_rules.go @@ -213,7 +213,7 @@ func dataSourceArmMonitorScheduledQueryRulesRead(d *schema.ResourceData, meta in d.Set("location", azure.NormalizeLocation(*location)) } - d.Set("description", *resp.Description) + d.Set("description", resp.Description) if resp.Enabled == insights.True { d.Set("enabled", true) } else { @@ -223,48 +223,51 @@ func dataSourceArmMonitorScheduledQueryRulesRead(d *schema.ResourceData, meta in switch action := resp.Action.(type) { case insights.AlertingAction: d.Set("action_type", "Alerting") - - aznsAction := flattenAzureRmScheduledQueryRulesAznsAction(action.AznsAction) - d.Set("azns_action", aznsAction) - + if err = d.Set("azns_action", flattenAzureRmScheduledQueryRulesAznsAction(action.AznsAction)); err != nil { + return fmt.Errorf("Error setting `azns_action`: %+v", err) + } severity, err := strconv.Atoi(string(action.Severity)) if err != nil { return fmt.Errorf("Error converting action.Severity %q in query rule %q to int (resource group %q): %+v", action.Severity, name, resourceGroup, err) } d.Set("severity", severity) - d.Set("throttling", *action.ThrottlingInMin) - d.Set("trigger", flattenAzureRmScheduledQueryRulesTrigger(action.Trigger)) + d.Set("throttling", action.ThrottlingInMin) + if err = d.Set("trigger", flattenAzureRmScheduledQueryRulesTrigger(action.Trigger)); err != nil { + return fmt.Errorf("Error setting `trigger`: %+v", err) + } case insights.LogToMetricAction: d.Set("action_type", "LogToMetric") - d.Set("criteria", flattenAzureRmScheduledQueryRulesCriteria(action.Criteria)) + if err = d.Set("criteria", flattenAzureRmScheduledQueryRulesCriteria(action.Criteria)); err != nil { + return fmt.Errorf("Error setting `criteria`: %+v", err) + } default: return fmt.Errorf("Unknown action type in scheduled query rule %q (resource group %q): %T", name, resourceGroup, resp.Action) } if schedule := resp.Schedule; schedule != nil { if schedule.FrequencyInMinutes != nil { - d.Set("frequency", *schedule.FrequencyInMinutes) + d.Set("frequency", schedule.FrequencyInMinutes) } if schedule.TimeWindowInMinutes != nil { - d.Set("time_window", *schedule.TimeWindowInMinutes) + d.Set("time_window", schedule.TimeWindowInMinutes) } } if source := resp.Source; source != nil { if source.AuthorizedResources != nil { - d.Set("authorized_resources", *source.AuthorizedResources) + d.Set("authorized_resources", source.AuthorizedResources) } if source.DataSourceID != nil { - d.Set("data_source_id", *source.DataSourceID) + d.Set("data_source_id", source.DataSourceID) } if source.Query != nil { - d.Set("query", *source.Query) + d.Set("query", source.Query) } d.Set("query_type", string(source.QueryType)) } if lastUpdated := resp.LastUpdatedTime; lastUpdated != nil { - d.Set("last_updated_time", *lastUpdated) + d.Set("last_updated_time", lastUpdated.Format(time.RFC3339)) } d.Set("provisioning_state", resp.ProvisioningState) diff --git a/azurerm/resource_arm_monitor_scheduled_query_rules.go b/azurerm/resource_arm_monitor_scheduled_query_rules.go index 650cd33b995bf..0f9d720f31a9f 100644 --- a/azurerm/resource_arm_monitor_scheduled_query_rules.go +++ b/azurerm/resource_arm_monitor_scheduled_query_rules.go @@ -269,7 +269,7 @@ func resourceArmMonitorScheduledQueryRulesCreateUpdate(d *schema.ResourceData, m enabledRaw := d.Get("enabled").(bool) enabled := insights.True - if enabledRaw == false { + if !enabledRaw { enabled = insights.False } @@ -347,7 +347,7 @@ func resourceArmMonitorScheduledQueryRulesRead(d *schema.ResourceData, meta inte d.Set("location", azure.NormalizeLocation(*location)) } if lastUpdated := resp.LastUpdatedTime; lastUpdated != nil { - d.Set("last_updated_time", *lastUpdated) + d.Set("last_updated_time", lastUpdated.Format(time.RFC3339)) } d.Set("provisioning_state", resp.ProvisioningState) @@ -357,46 +357,39 @@ func resourceArmMonitorScheduledQueryRulesRead(d *schema.ResourceData, meta inte d.Set("enabled", false) } - d.Set("description", *resp.Description) + d.Set("description", resp.Description) switch action := resp.Action.(type) { case insights.AlertingAction: d.Set("action_type", "Alerting") - d.Set("azns_action", flattenAzureRmScheduledQueryRulesAznsAction(action.AznsAction)) + if err = d.Set("azns_action", flattenAzureRmScheduledQueryRulesAznsAction(action.AznsAction)); err != nil { + return fmt.Errorf("Error setting `azns_action`: %+v", err) + } severity, err := strconv.Atoi(string(action.Severity)) if err != nil { return fmt.Errorf("Error converting action.Severity %q in query rule %q to int (resource group %q): %+v", action.Severity, name, resourceGroup, err) } d.Set("severity", severity) - d.Set("throttling", *action.ThrottlingInMin) - d.Set("trigger", flattenAzureRmScheduledQueryRulesTrigger(action.Trigger)) + d.Set("throttling", action.ThrottlingInMin) + if err = d.Set("trigger", flattenAzureRmScheduledQueryRulesTrigger(action.Trigger)); err != nil { + return fmt.Errorf("Error setting `trigger`: %+v", err) + } case insights.LogToMetricAction: d.Set("action_type", "LogToMetric") - d.Set("criteria", flattenAzureRmScheduledQueryRulesCriteria(action.Criteria)) + if err = d.Set("criteria", flattenAzureRmScheduledQueryRulesCriteria(action.Criteria)); err != nil { + return fmt.Errorf("Error setting `criteria`: %+v", err) + } default: return fmt.Errorf("Unknown action type in scheduled query rule %q (resource group %q): %T", name, resourceGroup, resp.Action) } if schedule := resp.Schedule; schedule != nil { if schedule.FrequencyInMinutes != nil { - d.Set("frequency", *schedule.FrequencyInMinutes) + d.Set("frequency", schedule.FrequencyInMinutes) } if schedule.TimeWindowInMinutes != nil { - d.Set("time_window", *schedule.TimeWindowInMinutes) - } - } - - if source := resp.Source; source != nil { - if source.AuthorizedResources != nil { - d.Set("authorized_resources", *source.AuthorizedResources) - } - if source.DataSourceID != nil { - d.Set("data_source_id", *source.DataSourceID) - } - if source.Query != nil { - d.Set("query", *source.Query) + d.Set("time_window", schedule.TimeWindowInMinutes) } - d.Set("query_type", string(source.QueryType)) } return tags.FlattenAndSet(d, resp.Tags) @@ -573,9 +566,6 @@ func flattenAzureRmScheduledQueryRulesCriteria(input *[]insights.Criteria) []int for _, criteria := range *input { v := make(map[string]interface{}) - /*if err = d.Set("azure_function_receiver", flattenMonitorActionGroupAzureFunctionReceiver(group.AzureFunctionReceivers)); err != nil { - return fmt.Errorf("Error setting `azure_function_receiver`: %+v", err) - }*/ v["dimension"] = flattenAzureRmScheduledQueryRulesDimension(criteria.Dimensions) v["metric_name"] = *criteria.MetricName @@ -633,41 +623,6 @@ func flattenAzureRmScheduledQueryRulesMetricTrigger(input *insights.LogMetricTri return []interface{}{result} } -func flattenAzureRmScheduledQueryRulesSchedule(input *insights.Schedule) []interface{} { - result := make(map[string]interface{}) - - if input == nil { - return []interface{}{} - } - - if input.FrequencyInMinutes != nil { - result["frequency_in_minutes"] = int(*input.FrequencyInMinutes) - } - - if input.TimeWindowInMinutes != nil { - result["time_window_in_minutes"] = int(*input.TimeWindowInMinutes) - } - - return []interface{}{result} -} - -func flattenAzureRmScheduledQueryRulesSource(input *insights.Source) []interface{} { - result := make(map[string]interface{}) - - if input.AuthorizedResources != nil { - result["authorized_resources"] = *input.AuthorizedResources - } - if input.DataSourceID != nil { - result["data_source_id"] = *input.DataSourceID - } - if input.Query != nil { - result["query"] = *input.Query - } - result["query_type"] = string(input.QueryType) - - return []interface{}{result} -} - func flattenAzureRmScheduledQueryRulesTrigger(input *insights.TriggerCondition) []interface{} { result := make(map[string]interface{}) diff --git a/azurerm/resource_arm_monitor_scheduled_query_rules_test.go b/azurerm/resource_arm_monitor_scheduled_query_rules_test.go index 7d7c2d2fdce13..b426231b251cb 100644 --- a/azurerm/resource_arm_monitor_scheduled_query_rules_test.go +++ b/azurerm/resource_arm_monitor_scheduled_query_rules_test.go @@ -38,7 +38,6 @@ func TestAccAzureRMMonitorScheduledQueryRules_AlertingAction(t *testing.T) { }, }, }) - return } func TestAccAzureRMMonitorScheduledQueryRules_AlertingActionCrossResource(t *testing.T) { @@ -66,7 +65,6 @@ func TestAccAzureRMMonitorScheduledQueryRules_AlertingActionCrossResource(t *tes }, }, }) - return } func TestAccAzureRMMonitorScheduledQueryRules_LogToMetricAction(t *testing.T) { @@ -94,7 +92,6 @@ func TestAccAzureRMMonitorScheduledQueryRules_LogToMetricAction(t *testing.T) { }, }, }) - return } func testAccAzureRMMonitorScheduledQueryRules_alertingAction(rInt int, rString, location string) string { From ebf84e9fa0ea474bb2d330c73977fa5d43315f4a Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Thu, 5 Dec 2019 13:19:21 -0600 Subject: [PATCH 004/498] Minor updates and bug fixes - Fix some sprintf formatting - Improve documentation for cross-resource query - Don't create an empty metric_trigger {} if user doesn't specify block --- ...ta_source_monitor_scheduled_query_rules.go | 2 +- ...urce_monitor_scheduled_query_rules_test.go | 6 +- ...ource_arm_monitor_scheduled_query_rules.go | 23 +++++++- ..._arm_monitor_scheduled_query_rules_test.go | 24 +++----- ...onitor_scheduled_query_rules.html.markdown | 57 +++++++++++-------- 5 files changed, 66 insertions(+), 46 deletions(-) diff --git a/azurerm/data_source_monitor_scheduled_query_rules.go b/azurerm/data_source_monitor_scheduled_query_rules.go index 6e12d24266485..6f74ed992cf9b 100644 --- a/azurerm/data_source_monitor_scheduled_query_rules.go +++ b/azurerm/data_source_monitor_scheduled_query_rules.go @@ -255,7 +255,7 @@ func dataSourceArmMonitorScheduledQueryRulesRead(d *schema.ResourceData, meta in if source := resp.Source; source != nil { if source.AuthorizedResources != nil { - d.Set("authorized_resources", source.AuthorizedResources) + d.Set("authorized_resources", utils.FlattenStringSlice(source.AuthorizedResources)) } if source.DataSourceID != nil { d.Set("data_source_id", source.DataSourceID) diff --git a/azurerm/data_source_monitor_scheduled_query_rules_test.go b/azurerm/data_source_monitor_scheduled_query_rules_test.go index 2642ac2652a9c..b8090d408463d 100644 --- a/azurerm/data_source_monitor_scheduled_query_rules_test.go +++ b/azurerm/data_source_monitor_scheduled_query_rules_test.go @@ -104,11 +104,11 @@ resource "azurerm_monitor_scheduled_query_rules" "test" { data_source_id = "${azurerm_application_insights.test.id}" criteria { - metric_name = "Average_percent Idle Time" + metric_name = "Average_%% Idle Time" dimension { - name = "dimension" + name = "InstanceName" operator = "Include" - values = ["latency"] + values = [""] } } } diff --git a/azurerm/resource_arm_monitor_scheduled_query_rules.go b/azurerm/resource_arm_monitor_scheduled_query_rules.go index 0f9d720f31a9f..a3e2e48dd468f 100644 --- a/azurerm/resource_arm_monitor_scheduled_query_rules.go +++ b/azurerm/resource_arm_monitor_scheduled_query_rules.go @@ -215,8 +215,9 @@ func resourceArmMonitorScheduledQueryRules() *schema.Resource { }, false), }, "threshold": { - Type: schema.TypeFloat, - Required: true, + Type: schema.TypeFloat, + Required: true, + ValidateFunc: validation.NoZeroValues, }, }, }, @@ -392,6 +393,19 @@ func resourceArmMonitorScheduledQueryRulesRead(d *schema.ResourceData, meta inte } } + if source := resp.Source; source != nil { + if source.AuthorizedResources != nil { + d.Set("authorized_resources", utils.FlattenStringSlice(source.AuthorizedResources)) + } + if source.DataSourceID != nil { + d.Set("data_source_id", source.DataSourceID) + } + if source.Query != nil { + d.Set("query", source.Query) + } + d.Set("query_type", string(source.QueryType)) + } + return tags.FlattenAndSet(d, resp.Tags) } @@ -500,8 +514,11 @@ func expandMonitorScheduledQueryRulesSchedule(d *schema.ResourceData) *insights. } func expandMonitorScheduledQueryRulesMetricTrigger(input []interface{}) *insights.LogMetricTrigger { - result := insights.LogMetricTrigger{} + if len(input) == 0 { + return nil + } + result := insights.LogMetricTrigger{} for _, item := range input { v := item.(map[string]interface{}) result.ThresholdOperator = insights.ConditionalOperator(v["operator"].(string)) diff --git a/azurerm/resource_arm_monitor_scheduled_query_rules_test.go b/azurerm/resource_arm_monitor_scheduled_query_rules_test.go index b426231b251cb..e5de80da1288f 100644 --- a/azurerm/resource_arm_monitor_scheduled_query_rules_test.go +++ b/azurerm/resource_arm_monitor_scheduled_query_rules_test.go @@ -153,8 +153,6 @@ resource "azurerm_monitor_scheduled_query_rules" "test" { } func testAccAzureRMMonitorScheduledQueryRules_alertingActionCrossResource(rInt int, rString, location string) string { - ts := time.Now().Format(time.RFC3339) - return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" @@ -192,11 +190,11 @@ resource "azurerm_monitor_scheduled_query_rules" "test" { authorized_resources = ["${azurerm_application_insights.test.id}", "${azurerm_log_analytics_workspace.test.id}"] data_source_id = "${azurerm_application_insights.test.id}" - query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" + query = format("let a=workspace('%%s').Perf | where Computer='dependency' and TimeGenerated > ago(1h) | where ObjectName == 'Processor' and CounterName == '%%%% Processor Time' | summarize cpu=avg(CounterValue) by bin(TimeGenerated, 1m) | extend ts=tostring(TimeGenerated); let b=requests | where resultCode == '200' and timestamp > ago(1h) | summarize reqs=count() by bin(timestamp, 1m) | extend ts = tostring(timestamp); a | join b on $left.ts == $right.ts | where cpu > 50 and reqs > 5", azurerm_log_analytics_workspace.test.id) query_type = "ResultCount" frequency = 60 - time_window = 60 + time_window = 60 severity = 3 azns_action { @@ -205,17 +203,11 @@ resource "azurerm_monitor_scheduled_query_rules" "test" { } trigger { - operator = "GreaterThan" - threshold = 5000 - metric_trigger { - operator = "GreaterThan" - threshold = 1 - metric_trigger_type = "Total" - metric_column = "TimeGenerated" - } + operator = "GreaterThan" + threshold = 5000 } } -`, rInt, location, rInt, rInt, rInt, rInt, ts, ts) +`, rInt, location, rInt, rInt, rInt, rInt) } func testAccAzureRMMonitorScheduledQueryRules_logToMetricAction(rInt int, rString, location string) string { @@ -249,11 +241,11 @@ resource "azurerm_monitor_scheduled_query_rules" "test" { data_source_id = "${azurerm_application_insights.test.id}" criteria { - metric_name = "Average_percent Idle Time" + metric_name = "Average_%% Idle Time" dimension { - name = "dimension" + name = "InstanceName" operator = "Include" - values = ["latency"] + values = [""] } } } diff --git a/website/docs/r/monitor_scheduled_query_rules.html.markdown b/website/docs/r/monitor_scheduled_query_rules.html.markdown index 439981bc06a5b..dfcb7279a4f76 100644 --- a/website/docs/r/monitor_scheduled_query_rules.html.markdown +++ b/website/docs/r/monitor_scheduled_query_rules.html.markdown @@ -34,75 +34,86 @@ resource "azurerm_log_analytics_workspace" "example" { retention_in_days = 30 } -# Example: AlertingAction +# Example: Alerting Action resource "azurerm_scheduled_query_rule" "example" { name = format("%s-queryrule", var.prefix) location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name - action_type = "AlertingAction" - azns_action = { + action_type = "Alerting" + azns_action { action_group = [] email_subject = "Email Header" - custom_webhook_payload = {} + custom_webhook_payload = "{}" } data_source_id = azurerm_application_insights.example.id - description = "Scheduled query rule AlertingAction example" + description = "Scheduled query rule Alerting Action example" enabled = true frequency = 5 query = "requests | where status_code >= 500 | summarize AggregatedValue = count() by bin(timestamp, 5m)" query_type = "ResultCount" - severity = "1" + severity = 1 time_window = 30 - trigger = { + trigger { threshold_operator = "GreaterThan" threshold = 3 + metric_trigger { + operator = "GreaterThan" + threshold = 1 + metric_trigger_type = "Total" + metric_column = "timestamp" + } } } -# Example: AlertingAction Cross-Resource +# Example: Alerting Action Cross-Resource resource "azurerm_scheduled_query_rule" "example2" { name = format("%s-queryrule2", var.prefix) location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name - action_type = "AlertingAction" + action_type = "Alerting" authorized_resources = [azurerm_application_insights.example.id, azurerm_log_analytics_workspace.example.id] - azns_action = { + azns_action { action_group = [] email_subject = "Email Header" - custom_webhook_payload = {} + custom_webhook_payload = "{}" } data_source_id = azurerm_application_insights.example.id - description = "Scheduled query rule AlertingAction cross-resource example" + description = "Scheduled query rule Alerting Action cross-resource example" enabled = true frequency = 5 - query = "union requests, workspace(\"loganalytics\").Heartbeat" + query = format(< ago(1h) | where ObjectName == "Processor" and CounterName == "%% Processor Time" | summarize cpu=avg(CounterValue) by bin(TimeGenerated, 1m) | extend ts=tostring(TimeGenerated); +let b=requests | where resultCode == "200" and timestamp > ago(1h) | summarize reqs=count() by bin(timestamp, 1m) | extend ts = tostring(timestamp); +a | join b on $left.ts == $right.ts | where cpu > 50 and reqs > 5 +QUERY + , azurerm_log_analytics_workspace.example.id) query_type = "ResultCount" severity = "1" time_window = 30 - trigger = { + trigger { threshold_operator = "GreaterThan" threshold = 3 } } -# Example: LogToMetricAction +# Example: LogToMetric Action resource "azurerm_scheduled_query_rule" "example3" { name = format("%s-queryrule3", var.prefix) location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name - action_type = "LogToMetricAction" - criteria = [{ + action_type = "LogToMetric" + criteria { metric_name = "Average_% Idle Time" - dimensions = [{ - name = "dimension" - operator = "GreaterThan" - values = ["latency"] - }] - }] + dimensions { + name = "InstanceName" + operator = "Include" + values = [""] + } + } data_source_id = azurerm_application_insights.example.id description = "Scheduled query rule LogToMetric example" enabled = true From ce59b1af4f98d5a74d502539dd5dfef135d04b91 Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Thu, 5 Dec 2019 13:26:08 -0600 Subject: [PATCH 005/498] Remove heredoc in docs example --- website/docs/r/monitor_scheduled_query_rules.html.markdown | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/website/docs/r/monitor_scheduled_query_rules.html.markdown b/website/docs/r/monitor_scheduled_query_rules.html.markdown index dfcb7279a4f76..8d18bebe2327c 100644 --- a/website/docs/r/monitor_scheduled_query_rules.html.markdown +++ b/website/docs/r/monitor_scheduled_query_rules.html.markdown @@ -84,12 +84,7 @@ resource "azurerm_scheduled_query_rule" "example2" { description = "Scheduled query rule Alerting Action cross-resource example" enabled = true frequency = 5 - query = format(< ago(1h) | where ObjectName == "Processor" and CounterName == "%% Processor Time" | summarize cpu=avg(CounterValue) by bin(TimeGenerated, 1m) | extend ts=tostring(TimeGenerated); -let b=requests | where resultCode == "200" and timestamp > ago(1h) | summarize reqs=count() by bin(timestamp, 1m) | extend ts = tostring(timestamp); -a | join b on $left.ts == $right.ts | where cpu > 50 and reqs > 5 -QUERY - , azurerm_log_analytics_workspace.example.id) + query = format("let a=workspace('%s').Perf | where Computer='dependency' and TimeGenerated > ago(1h) | where ObjectName == 'Processor' and CounterName == '%% Processor Time' | summarize cpu=avg(CounterValue) by bin(TimeGenerated, 1m) | extend ts=tostring(TimeGenerated); let b=requests | where resultCode == '200' and timestamp > ago(1h) | summarize reqs=count() by bin(timestamp, 1m) | extend ts = tostring(timestamp); a | join b on $left.ts == $right.ts | where cpu > 50 and reqs > 5", azurerm_log_analytics_workspace.test.id) query_type = "ResultCount" severity = "1" time_window = 30 From a1bf9bacb68a0699b66722cc605236f07ca81f0a Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Wed, 11 Dec 2019 01:35:23 -0600 Subject: [PATCH 006/498] fix response import --- azurerm/resource_arm_monitor_scheduled_query_rules.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/resource_arm_monitor_scheduled_query_rules.go b/azurerm/resource_arm_monitor_scheduled_query_rules.go index a3e2e48dd468f..0a6e2ff31caca 100644 --- a/azurerm/resource_arm_monitor_scheduled_query_rules.go +++ b/azurerm/resource_arm_monitor_scheduled_query_rules.go @@ -7,10 +7,10 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" + "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" From 8acb500d31c30f5af44d694a9c250a440e9c7534 Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Fri, 27 Dec 2019 17:51:08 -0600 Subject: [PATCH 007/498] Update tests and docs to pass checks --- ...urce_monitor_scheduled_query_rules_test.go | 60 ++++++-------- ..._arm_monitor_scheduled_query_rules_test.go | 79 ++++++++----------- ...onitor_scheduled_query_rules.html.markdown | 2 +- 3 files changed, 57 insertions(+), 84 deletions(-) rename azurerm/internal/services/monitor/{ => tests}/data_source_monitor_scheduled_query_rules_test.go (78%) rename azurerm/internal/services/monitor/{ => tests}/resource_arm_monitor_scheduled_query_rules_test.go (77%) diff --git a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_test.go b/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_test.go similarity index 78% rename from azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_test.go rename to azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_test.go index 089835482e1e3..875fdaa762026 100644 --- a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_test.go +++ b/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_test.go @@ -1,31 +1,25 @@ -package monitor +package tests import ( "fmt" "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" ) func TestAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricAction(t *testing.T) { - dataSourceName := "data.azurerm_monitor_scheduled_query_rules.test" - ri := tf.AccRandTimeInt() - rs := acctest.RandString(10) - location := testLocation() - config := testAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricActionConfig(ri, rs, location) + data := acceptance.BuildTestData(t, "data.azurerm_monitor_scheduled_query_rules", "test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, Steps: []resource.TestStep{ { - Config: config, + Config: testAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricActionConfig(data), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttrSet(dataSourceName, "id"), + resource.TestCheckResourceAttrSet(data.ResourceName, "id"), ), }, }, @@ -33,20 +27,16 @@ func TestAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricAction(t *tes } func TestAccDataSourceAzureRMMonitorScheduledQueryRules_alertingAction(t *testing.T) { - dataSourceName := "data.azurerm_monitor_scheduled_query_rules.test" - ri := tf.AccRandTimeInt() - rs := acctest.RandString(10) - location := testLocation() - config := testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionConfig(ri, rs, location) + data := acceptance.BuildTestData(t, "data.azurerm_monitor_scheduled_query_rules", "test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, Steps: []resource.TestStep{ { - Config: config, + Config: testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionConfig(data), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttrSet(dataSourceName, "id"), + resource.TestCheckResourceAttrSet(data.ResourceName, "id"), ), }, }, @@ -54,27 +44,23 @@ func TestAccDataSourceAzureRMMonitorScheduledQueryRules_alertingAction(t *testin } func TestAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResource(t *testing.T) { - dataSourceName := "data.azurerm_monitor_scheduled_query_rules.test" - ri := tf.AccRandTimeInt() - rs := acctest.RandString(10) - location := testLocation() - config := testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResourceConfig(ri, rs, location) + data := acceptance.BuildTestData(t, "data.azurerm_monitor_scheduled_query_rules", "test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, Steps: []resource.TestStep{ { - Config: config, + Config: testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResourceConfig(data), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttrSet(dataSourceName, "id"), + resource.TestCheckResourceAttrSet(data.ResourceName, "id"), ), }, }, }) } -func testAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricActionConfig(rInt int, rString string, location string) string { +func testAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricActionConfig(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" @@ -118,10 +104,10 @@ data "azurerm_monitor_scheduled_query_rules" "test" { name = "${azurerm_monitor_scheduled_query_rules.test.name}" resource_group_name = "${azurerm_resource_group.test.name}" } -`, rInt, location, rInt, rInt, rInt) +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) } -func testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionConfig(rInt int, rString string, location string) string { +func testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionConfig(data acceptance.TestData) string { ts := time.Now().Format(time.RFC3339) return fmt.Sprintf(` @@ -181,10 +167,10 @@ data "azurerm_monitor_scheduled_query_rules" "test" { name = "${azurerm_monitor_scheduled_query_rules.test.name}" resource_group_name = "${azurerm_resource_group.test.name}" } -`, rInt, location, rInt, rInt, rInt, ts, ts) +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, ts, ts) } -func testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResourceConfig(rInt int, rString string, location string) string { +func testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResourceConfig(data acceptance.TestData) string { ts := time.Now().Format(time.RFC3339) return fmt.Sprintf(` @@ -253,5 +239,5 @@ data "azurerm_monitor_scheduled_query_rules" "test" { name = "${azurerm_monitor_scheduled_query_rules.test.name}" resource_group_name = "${azurerm_resource_group.test.name}" } -`, rInt, location, rInt, rInt, rInt, rInt, ts, ts) +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, ts, ts) } diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_test.go similarity index 77% rename from azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_test.go rename to azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_test.go index 559bcacf3b43d..357a8ba2b0f94 100644 --- a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_test.go @@ -1,38 +1,33 @@ -package monitor +package tests import ( "fmt" "net/http" - "strings" "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" ) func TestAccAzureRMMonitorScheduledQueryRules_AlertingAction(t *testing.T) { - resourceName := "azurerm_monitor_scheduled_query_rules.test" - ri := tf.AccRandTimeInt() - rs := strings.ToLower(acctest.RandString(11)) - location := testLocation() - config := testAccAzureRMMonitorScheduledQueryRules_alertingAction(ri, rs, location) + data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules", "test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesDestroy, Steps: []resource.TestStep{ { - Config: config, + Config: testAccAzureRMMonitorScheduledQueryRules_alertingAction(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMonitorScheduledQueryRulesExists(resourceName), + testCheckAzureRMMonitorScheduledQueryRulesExists(data.ResourceName), ), }, { - ResourceName: resourceName, + ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, }, @@ -41,25 +36,21 @@ func TestAccAzureRMMonitorScheduledQueryRules_AlertingAction(t *testing.T) { } func TestAccAzureRMMonitorScheduledQueryRules_AlertingActionCrossResource(t *testing.T) { - resourceName := "azurerm_monitor_scheduled_query_rules.test" - ri := tf.AccRandTimeInt() - rs := strings.ToLower(acctest.RandString(11)) - location := testLocation() - config := testAccAzureRMMonitorScheduledQueryRules_alertingActionCrossResource(ri, rs, location) + data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules", "test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesDestroy, Steps: []resource.TestStep{ { - Config: config, + Config: testAccAzureRMMonitorScheduledQueryRules_alertingActionCrossResource(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMonitorScheduledQueryRulesExists(resourceName), + testCheckAzureRMMonitorScheduledQueryRulesExists(data.ResourceName), ), }, { - ResourceName: resourceName, + ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, }, @@ -68,25 +59,21 @@ func TestAccAzureRMMonitorScheduledQueryRules_AlertingActionCrossResource(t *tes } func TestAccAzureRMMonitorScheduledQueryRules_LogToMetricAction(t *testing.T) { - resourceName := "azurerm_monitor_scheduled_query_rules.test" - ri := tf.AccRandTimeInt() - rs := strings.ToLower(acctest.RandString(11)) - location := testLocation() - config := testAccAzureRMMonitorScheduledQueryRules_logToMetricAction(ri, rs, location) + data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules", "test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesDestroy, Steps: []resource.TestStep{ { - Config: config, + Config: testAccAzureRMMonitorScheduledQueryRules_logToMetricAction(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMonitorScheduledQueryRulesExists(resourceName), + testCheckAzureRMMonitorScheduledQueryRulesExists(data.ResourceName), ), }, { - ResourceName: resourceName, + ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, }, @@ -94,7 +81,7 @@ func TestAccAzureRMMonitorScheduledQueryRules_LogToMetricAction(t *testing.T) { }) } -func testAccAzureRMMonitorScheduledQueryRules_alertingAction(rInt int, rString, location string) string { +func testAccAzureRMMonitorScheduledQueryRules_alertingAction(data acceptance.TestData) string { ts := time.Now().Format(time.RFC3339) return fmt.Sprintf(` @@ -149,10 +136,10 @@ resource "azurerm_monitor_scheduled_query_rules" "test" { } } } -`, rInt, location, rInt, rInt, rInt, ts, ts) +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, ts, ts) } -func testAccAzureRMMonitorScheduledQueryRules_alertingActionCrossResource(rInt int, rString, location string) string { +func testAccAzureRMMonitorScheduledQueryRules_alertingActionCrossResource(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" @@ -207,10 +194,10 @@ resource "azurerm_monitor_scheduled_query_rules" "test" { threshold = 5000 } } -`, rInt, location, rInt, rInt, rInt, rInt) +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) } -func testAccAzureRMMonitorScheduledQueryRules_logToMetricAction(rInt int, rString, location string) string { +func testAccAzureRMMonitorScheduledQueryRules_logToMetricAction(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" @@ -249,12 +236,12 @@ resource "azurerm_monitor_scheduled_query_rules" "test" { } } } -`, rInt, location, rInt, rInt, rInt) +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) } func testCheckAzureRMMonitorScheduledQueryRulesDestroy(s *terraform.State) error { - conn := testAccProvider.Meta().(*ArmClient).Monitor.ScheduledQueryRulesClient - ctx := testAccProvider.Meta().(*ArmClient).StopContext + client := acceptance.AzureProvider.Meta().(*clients.Client).Monitor.ScheduledQueryRulesClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext for _, rs := range s.RootModule().Resources { if rs.Type != "azurerm_monitor_scheduled_query_rules" { @@ -264,7 +251,7 @@ func testCheckAzureRMMonitorScheduledQueryRulesDestroy(s *terraform.State) error name := rs.Primary.Attributes["name"] resourceGroup := rs.Primary.Attributes["resource_group_name"] - resp, err := conn.Get(ctx, resourceGroup, name) + resp, err := client.Get(ctx, resourceGroup, name) if err != nil { return nil @@ -292,10 +279,10 @@ func testCheckAzureRMMonitorScheduledQueryRulesExists(resourceName string) resou return fmt.Errorf("Bad: no resource group found in state for Activity Log Alert Instance: %s", name) } - conn := testAccProvider.Meta().(*ArmClient).Monitor.ScheduledQueryRulesClient - ctx := testAccProvider.Meta().(*ArmClient).StopContext + client := acceptance.AzureProvider.Meta().(*clients.Client).Monitor.ScheduledQueryRulesClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - resp, err := conn.Get(ctx, resourceGroup, name) + resp, err := client.Get(ctx, resourceGroup, name) if err != nil { return fmt.Errorf("Bad: Get on monitorScheduledQueryRulesClient: %+v", err) } diff --git a/website/docs/d/monitor_scheduled_query_rules.html.markdown b/website/docs/d/monitor_scheduled_query_rules.html.markdown index 804ec3e2606c8..d6651611d15b6 100644 --- a/website/docs/d/monitor_scheduled_query_rules.html.markdown +++ b/website/docs/d/monitor_scheduled_query_rules.html.markdown @@ -1,5 +1,5 @@ --- -subcategory: "" +subcategory: "Monitor" layout: "azurerm" page_title: "Azure Resource Manager: azurerm_monitor_scheduled_query_rules" sidebar_current: "docs-azurerm-datasource-monitor-scheduled-query-rules" From 7b25b377e643117ac99d36e4d128ae7596316614 Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Fri, 27 Dec 2019 19:23:26 -0600 Subject: [PATCH 008/498] Add moved tests to registration --- .../internal/services/monitor/registration.go | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/azurerm/internal/services/monitor/registration.go b/azurerm/internal/services/monitor/registration.go index dfc09bd0b42dd..366450fc514f1 100644 --- a/azurerm/internal/services/monitor/registration.go +++ b/azurerm/internal/services/monitor/registration.go @@ -16,19 +16,21 @@ func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ "azurerm_monitor_action_group": dataSourceArmMonitorActionGroup(), "azurerm_monitor_diagnostic_categories": dataSourceArmMonitorDiagnosticCategories(), - "azurerm_monitor_log_profile": dataSourceArmMonitorLogProfile()} + "azurerm_monitor_log_profile": dataSourceArmMonitorLogProfile(), + "azurerm_monitor_scheduled_query_rules": dataSourceArmMonitorScheduledQueryRules()} } // SupportedResources returns the supported Resources supported by this Service func (r Registration) SupportedResources() map[string]*schema.Resource { return map[string]*schema.Resource{ - "azurerm_autoscale_setting": resourceArmAutoScaleSetting(), - "azurerm_metric_alertrule": resourceArmMetricAlertRule(), - "azurerm_monitor_autoscale_setting": resourceArmMonitorAutoScaleSetting(), - "azurerm_monitor_action_group": resourceArmMonitorActionGroup(), - "azurerm_monitor_activity_log_alert": resourceArmMonitorActivityLogAlert(), - "azurerm_monitor_diagnostic_setting": resourceArmMonitorDiagnosticSetting(), - "azurerm_monitor_log_profile": resourceArmMonitorLogProfile(), - "azurerm_monitor_metric_alert": resourceArmMonitorMetricAlert(), - "azurerm_monitor_metric_alertrule": resourceArmMonitorMetricAlertRule()} + "azurerm_autoscale_setting": resourceArmAutoScaleSetting(), + "azurerm_metric_alertrule": resourceArmMetricAlertRule(), + "azurerm_monitor_autoscale_setting": resourceArmMonitorAutoScaleSetting(), + "azurerm_monitor_action_group": resourceArmMonitorActionGroup(), + "azurerm_monitor_activity_log_alert": resourceArmMonitorActivityLogAlert(), + "azurerm_monitor_diagnostic_setting": resourceArmMonitorDiagnosticSetting(), + "azurerm_monitor_log_profile": resourceArmMonitorLogProfile(), + "azurerm_monitor_metric_alert": resourceArmMonitorMetricAlert(), + "azurerm_monitor_metric_alertrule": resourceArmMonitorMetricAlertRule(), + "azurerm_monitor_scheduled_query_rules": resourceArmMonitorScheduledQueryRules()} } From 39fb80f2e4e1d12a714e61dadc8b1523337f5962 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Wed, 8 Jan 2020 12:33:01 -0800 Subject: [PATCH 009/498] Key Vault: support for soft delete --- azurerm/helpers/validate/bool.go | 23 ++++ azurerm/helpers/validate/bool_test.go | 37 ++++++ .../keyvault/data_source_key_vault.go | 12 ++ .../keyvault/resource_arm_key_vault.go | 49 ++++++++ .../tests/data_source_key_vault_test.go | 32 ++++++ .../tests/resource_arm_key_vault_test.go | 106 ++++++++++++++++++ website/docs/d/key_vault.html.markdown | 4 + website/docs/r/key_vault.html.markdown | 6 + 8 files changed, 269 insertions(+) create mode 100644 azurerm/helpers/validate/bool.go create mode 100644 azurerm/helpers/validate/bool_test.go diff --git a/azurerm/helpers/validate/bool.go b/azurerm/helpers/validate/bool.go new file mode 100644 index 0000000000000..3c7901b3636c7 --- /dev/null +++ b/azurerm/helpers/validate/bool.go @@ -0,0 +1,23 @@ +package validate + +import ( + "fmt" + + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" +) + +func BoolIsTrue() schema.SchemaValidateFunc { + return func(i interface{}, k string) (_ []string, errors []error) { + v, ok := i.(bool) + if !ok { + errors = append(errors, fmt.Errorf("expected type of %q to be bool", k)) + return + } + + if !v { + errors = append(errors, fmt.Errorf("%q can only be set to true, if not required remove key", k)) + return + } + return + } +} diff --git a/azurerm/helpers/validate/bool_test.go b/azurerm/helpers/validate/bool_test.go new file mode 100644 index 0000000000000..d9ba6b9627a93 --- /dev/null +++ b/azurerm/helpers/validate/bool_test.go @@ -0,0 +1,37 @@ +package validate + +import "testing" + +func TestBoolIsTrue(t *testing.T) { + + testCases := []struct { + Value bool + ShouldHaveError bool + }{ + { + Value: true, + ShouldHaveError: false, + }, { + Value: false, + ShouldHaveError: true, + }, + } + + t.Run("TestBoolIsTrue", func(t *testing.T) { + for _, value := range testCases { + _, errors := BoolIsTrue()(value.Value, "dummy") + hasErrors := len(errors) > 0 + + if value.ShouldHaveError && !hasErrors { + t.Fatalf("Expected an error but didn't get one for %t", value.Value) + return + } + + if !value.ShouldHaveError && hasErrors { + t.Fatalf("Expected %t to return no errors, but got some %+v", value.Value, errors) + return + } + + } + }) +} \ No newline at end of file diff --git a/azurerm/internal/services/keyvault/data_source_key_vault.go b/azurerm/internal/services/keyvault/data_source_key_vault.go index ef5bf1b85f549..6117855e4e12e 100644 --- a/azurerm/internal/services/keyvault/data_source_key_vault.go +++ b/azurerm/internal/services/keyvault/data_source_key_vault.go @@ -156,6 +156,16 @@ func dataSourceArmKeyVault() *schema.Resource { }, }, + "enabled_for_soft_delete": { + Type: schema.TypeBool, + Computed: true, + }, + + "enabled_for_purge_protection": { + Type: schema.TypeBool, + Computed: true, + }, + "tags": tags.SchemaDataSource(), }, } @@ -190,6 +200,8 @@ func dataSourceArmKeyVaultRead(d *schema.ResourceData, meta interface{}) error { d.Set("enabled_for_deployment", props.EnabledForDeployment) d.Set("enabled_for_disk_encryption", props.EnabledForDiskEncryption) d.Set("enabled_for_template_deployment", props.EnabledForTemplateDeployment) + d.Set("enabled_for_soft_delete", props.EnableSoftDelete) + d.Set("enabled_for_purge_protection", props.EnablePurgeProtection) d.Set("vault_uri", props.VaultURI) if sku := props.Sku; sku != nil { diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault.go b/azurerm/internal/services/keyvault/resource_arm_key_vault.go index a8dee0b0b0fa9..2b6cbf0ffbc01 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault.go @@ -157,6 +157,25 @@ func resourceArmKeyVault() *schema.Resource { Optional: true, }, + "enabled_for_soft_delete": { + Type: schema.TypeBool, + Optional: true, + ValidateFunc: validate.BoolIsTrue(), + }, + + "enabled_for_purge_protection": { + Type: schema.TypeBool, + Optional: true, + ValidateFunc: validate.BoolIsTrue(), + }, + + "purge_on_delete": { + Type: schema.TypeBool, + Optional: true, + Default: false, + ConflictsWith: []string{"enabled_for_purge_protection"}, + }, + "network_acls": { Type: schema.TypeList, Optional: true, @@ -252,6 +271,8 @@ func resourceArmKeyVaultCreateUpdate(d *schema.ResourceData, meta interface{}) e enabledForDeployment := d.Get("enabled_for_deployment").(bool) enabledForDiskEncryption := d.Get("enabled_for_disk_encryption").(bool) enabledForTemplateDeployment := d.Get("enabled_for_template_deployment").(bool) + enabledForSoftDelete := d.Get("enabled_for_soft_delete").(bool) + enabledForPurgeProtection := d.Get("enabled_for_purge_protection").(bool) t := d.Get("tags").(map[string]interface{}) networkAclsRaw := d.Get("network_acls").([]interface{}) @@ -277,6 +298,16 @@ func resourceArmKeyVaultCreateUpdate(d *schema.ResourceData, meta interface{}) e Tags: tags.Expand(t), } + // This setting can only be set if it is true, if set when value is false API returns errors + if enabledForSoftDelete { + parameters.Properties.EnableSoftDelete = &enabledForSoftDelete + } + + // This setting can only be set if it is true, if set when value is false API returns errors + if enabledForPurgeProtection { + parameters.Properties.EnablePurgeProtection = &enabledForPurgeProtection + } + // Locking this resource so we don't make modifications to it at the same time if there is a // key vault access policy trying to update it as well locks.ByName(name, keyVaultResourceName) @@ -375,6 +406,8 @@ func resourceArmKeyVaultRead(d *schema.ResourceData, meta interface{}) error { d.Set("enabled_for_deployment", props.EnabledForDeployment) d.Set("enabled_for_disk_encryption", props.EnabledForDiskEncryption) d.Set("enabled_for_template_deployment", props.EnabledForTemplateDeployment) + d.Set("enabled_for_soft_delete", props.EnableSoftDelete) + d.Set("enabled_for_purge_protection", props.EnablePurgeProtection) d.Set("vault_uri", props.VaultURI) if sku := props.Sku; sku != nil { @@ -461,6 +494,22 @@ func resourceArmKeyVaultDelete(d *schema.ResourceData, meta interface{}) error { } } + if d.Get("purge_on_delete").(bool) && d.Get("enabled_for_soft_delete").(bool) && err == nil { + log.Printf("[DEBUG] KeyVault %s marked for purge, executing purge", name) + location := d.Get("location").(string) + + future, err := client.PurgeDeleted(ctx, name, location) + if err != nil { + return err + } + + log.Printf("[DEBUG] Waiting for purge of KeyVault %s", name) + err = future.WaitForCompletionRef(ctx, client.Client) + if err != nil { + return fmt.Errorf("Error purging Key Vault %q (Resource Group %q): %+v", name, resourceGroup, err) + } + } + return nil } diff --git a/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go b/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go index 8953c5d82eff8..9b33dc5a66bea 100644 --- a/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go @@ -111,6 +111,26 @@ func TestAccDataSourceAzureRMKeyVault_networkAcls(t *testing.T) { }) } +func TestAccDataSourceAzureRMKeyVault_enable_soft_delete(t *testing.T) { + data := acceptance.BuildTestData(t, "data.azurerm_key_vault", "test") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMKeyVaultDestroy, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAzureRMKeyVault_enable_soft_delete(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKeyVaultExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "enabled_for_soft_delete", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "enabled_for_purge_protection", "false"), + ), + }, + }, + }) +} + func testAccDataSourceAzureRMKeyVault_basic(data acceptance.TestData) string { r := testAccAzureRMKeyVault_basic(data) return fmt.Sprintf(` @@ -146,3 +166,15 @@ data "azurerm_key_vault" "test" { } `, r) } + +func testAccDataSourceAzureRMKeyVault_enable_soft_delete(data acceptance.TestData) string { + r := testAccAzureRMKeyVault_enable_soft_delete(data) + return fmt.Sprintf(` +%s + +data "azurerm_key_vault" "test" { + name = "${azurerm_key_vault.test.name}" + resource_group_name = "${azurerm_key_vault.test.resource_group_name}" +} +`, r) +} diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go index e492e07ba1e3f..2bc04b0b1b12d 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go @@ -331,6 +331,55 @@ func TestAccAzureRMKeyVault_justCert(t *testing.T) { }) } +func TestAccAzureRMKeyVault_soft_delete(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_key_vault", "test") + expectedError := fmt.Sprintf("^Check failed: Check 1/1 error: Not found: %s", data.ResourceName) + errorRegEx, _ := regexp.Compile(expectedError) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMKeyVaultDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMKeyVault_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKeyVaultExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "access_policy.0.key_permissions.0", "create"), + resource.TestCheckResourceAttr(data.ResourceName, "access_policy.0.secret_permissions.0", "set"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.environment", "Production"), + ), + }, + { + Config: testAccAzureRMKeyVault_enable_soft_delete(data), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(data.ResourceName, "access_policy.0.key_permissions.0", "get"), + resource.TestCheckResourceAttr(data.ResourceName, "access_policy.0.secret_permissions.0", "get"), + resource.TestCheckResourceAttr(data.ResourceName, "enabled_for_soft_delete", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "enabled_for_purge_protection", "false"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.environment", "Production"), + ), + }, + { + Config: testAccAzureRMKeyVault_purge_vault(data), + ExpectError: errorRegEx, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKeyVaultExists(data.ResourceName), + ), + }, + { + Config: testAccAzureRMKeyVault_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKeyVaultExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "access_policy.0.key_permissions.0", "create"), + resource.TestCheckResourceAttr(data.ResourceName, "access_policy.0.secret_permissions.0", "set"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.environment", "Production"), + ), + }, + }, + }) +} + func testCheckAzureRMKeyVaultDestroy(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext @@ -446,6 +495,10 @@ resource "azurerm_key_vault" "test" { "set", ] } + + tags = { + environment = "Production" + } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } @@ -787,6 +840,59 @@ resource "azurerm_key_vault" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } +func testAccAzureRMKeyVault_enable_soft_delete(data acceptance.TestData) string { + return fmt.Sprintf(` +data "azurerm_client_config" "current" {} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_key_vault" "test" { + name = "vault%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + tenant_id = "${data.azurerm_client_config.current.tenant_id}" + + sku { + name = "premium" + } + + access_policy { + tenant_id = "${data.azurerm_client_config.current.tenant_id}" + object_id = "${data.azurerm_client_config.current.client_id}" + + key_permissions = [ + "get", + ] + + secret_permissions = [ + "get", + ] + } + + enabled_for_soft_delete = true + purge_on_delete = true + + tags = { + environment = "Production" + } +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) +} + +func testAccAzureRMKeyVault_purge_vault(data acceptance.TestData) string { + return fmt.Sprintf(` +data "azurerm_client_config" "current" {} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} +`, data.RandomInteger, data.Locations.Primary) +} + func testAccAzureRMKeyVault_complete(data acceptance.TestData) string { return fmt.Sprintf(` data "azurerm_client_config" "current" {} diff --git a/website/docs/d/key_vault.html.markdown b/website/docs/d/key_vault.html.markdown index 26314d2081299..cdb96e02f290d 100644 --- a/website/docs/d/key_vault.html.markdown +++ b/website/docs/d/key_vault.html.markdown @@ -54,6 +54,10 @@ The following attributes are exported: * `enabled_for_template_deployment` - Can Azure Resource Manager retrieve secrets from the Key Vault? +* `enabled_for_soft_delete` - Is soft delete enabled on this Key Vault? + +* `enabled_for_purge_protection` - Is purge protection enabled on this Key Vault? + * `tags` - A mapping of tags assigned to the Key Vault. A `sku` block exports the following: diff --git a/website/docs/r/key_vault.html.markdown b/website/docs/r/key_vault.html.markdown index 6d257aa5ad834..ed02b1c1903b4 100644 --- a/website/docs/r/key_vault.html.markdown +++ b/website/docs/r/key_vault.html.markdown @@ -84,6 +84,12 @@ The following arguments are supported: * `enabled_for_template_deployment` - (Optional) Boolean flag to specify whether Azure Resource Manager is permitted to retrieve secrets from the key vault. Defaults to `false`. +* `enabled_for_soft_delete` - (Optional) Boolean flag to specify whether the key vault is enabled for soft delete. Once enabled you can not disable this setting. + +* `purge_on_delete` - (Optional) Boolean flag to specify if the KeyVault should be purged on delete. This purges KeyVaults enabled for soft delete on resource deletition. + +* `enabled_for_purge_protection` - (Optional) Boolean flag to specify whether the key vault is enabled for purge protection, this conflicts with `purge_on_delete`. Once enabled you can not disable this setting. + * `network_acls` - (Optional) A `network_acls` block as defined below. * `tags` - (Optional) A mapping of tags to assign to the resource. From beafb4c57f0159bcb929024384f7ed21c7fe652d Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Wed, 8 Jan 2020 14:06:07 -0800 Subject: [PATCH 010/498] fix lint errors --- azurerm/helpers/validate/bool_test.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/azurerm/helpers/validate/bool_test.go b/azurerm/helpers/validate/bool_test.go index d9ba6b9627a93..d378dafc41b0d 100644 --- a/azurerm/helpers/validate/bool_test.go +++ b/azurerm/helpers/validate/bool_test.go @@ -3,7 +3,6 @@ package validate import "testing" func TestBoolIsTrue(t *testing.T) { - testCases := []struct { Value bool ShouldHaveError bool @@ -31,7 +30,6 @@ func TestBoolIsTrue(t *testing.T) { t.Fatalf("Expected %t to return no errors, but got some %+v", value.Value, errors) return } - } }) -} \ No newline at end of file +} From f874617e737b931d9d99096a65dbbfb21f77d9a8 Mon Sep 17 00:00:00 2001 From: john Date: Mon, 20 Jan 2020 16:47:41 +1100 Subject: [PATCH 011/498] Add Directline --- azurerm/internal/services/bot/registration.go | 1 + .../resource_arm_bot_channel_directline.go | 322 ++++++++++++++++++ ...esource_arm_bot_channel_directline_test.go | 142 ++++++++ ...urce_arm_bot_channels_registration_test.go | 10 +- .../docs/r/bot_channel_directline.markdown | 67 ++++ 5 files changed, 538 insertions(+), 4 deletions(-) create mode 100644 azurerm/internal/services/bot/resource_arm_bot_channel_directline.go create mode 100644 azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go create mode 100644 website/docs/r/bot_channel_directline.markdown diff --git a/azurerm/internal/services/bot/registration.go b/azurerm/internal/services/bot/registration.go index a0eadf437cad2..67ee57b061c48 100644 --- a/azurerm/internal/services/bot/registration.go +++ b/azurerm/internal/services/bot/registration.go @@ -22,6 +22,7 @@ func (r Registration) SupportedResources() map[string]*schema.Resource { "azurerm_bot_channel_email": resourceArmBotChannelEmail(), "azurerm_bot_channel_slack": resourceArmBotChannelSlack(), "azurerm_bot_channel_ms_teams": resourceArmBotChannelMsTeams(), + "azurerm_bot_channel_directline": resourceArmBotChannelDirectline(), "azurerm_bot_channels_registration": resourceArmBotChannelsRegistration(), "azurerm_bot_connection": resourceArmBotConnection(), "azurerm_bot_web_app": resourceArmBotWebApp(), diff --git a/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go b/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go new file mode 100644 index 0000000000000..eda31f60573c2 --- /dev/null +++ b/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go @@ -0,0 +1,322 @@ +package bot + +import ( + "fmt" + "log" + "time" + + "github.com/Azure/azure-sdk-for-go/services/preview/botservice/mgmt/2018-07-12/botservice" + "github.com/hashicorp/go-azure-helpers/response" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmBotChannelDirectline() *schema.Resource { + return &schema.Resource{ + Create: resourceArmBotChannelDirectlineCreate, + Read: resourceArmBotChannelDirectlineRead, + Delete: resourceArmBotChannelDirectlineDelete, + Update: resourceArmBotChannelDirectlineUpdate, + + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(30 * time.Minute), + Read: schema.DefaultTimeout(5 * time.Minute), + Update: schema.DefaultTimeout(30 * time.Minute), + Delete: schema.DefaultTimeout(30 * time.Minute), + }, + + Schema: map[string]*schema.Schema{ + "resource_group_name": azure.SchemaResourceGroupName(), + + "location": azure.SchemaLocation(), + + "bot_name": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validate.NoEmptyStrings, + }, + + "site": { + Type: schema.TypeSet, + Required: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + + "site_name": { + Type: schema.TypeString, + Required: true, + }, + + "site_id": { + Type: schema.TypeString, + Computed: true, + }, + + "key": { + Type: schema.TypeString, + Computed: true, + }, + + "key2": { + Type: schema.TypeString, + Computed: true, + }, + + "is_enabled": { + Type: schema.TypeBool, + Optional: true, + Default: true, + }, + + "is_v1_enabled": { + Type: schema.TypeBool, + Optional: true, + Default: true, + }, + + "is_v3_enabled": { + Type: schema.TypeBool, + Optional: true, + Default: true, + }, + + "is_secure_site_enabled": { + Type: schema.TypeBool, + Default: false, + Optional: true, + }, + + "trusted_origins": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + }, + }, + }, + }, + } +} + +func expandSites(input []interface{}) (*[]botservice.DirectLineSite, error) { + + sites := make([]botservice.DirectLineSite, len(input)) + + for i, element := range input { + + site := element.(map[string]interface{}) + if v, ok := site["site_name"]; ok { + siteName := v.(string) + sites[i].SiteName = &siteName + } + if v, ok := site["is_enabled"]; ok { + isEnabled := v.(bool) + sites[i].IsEnabled = &isEnabled + } + if v, ok := site["is_v1_enabled"]; ok { + isV1Enabled := v.(bool) + sites[i].IsV1Enabled = &isV1Enabled + } + if v, ok := site["is_v3_enabled"]; ok { + isV3Enabled := v.(bool) + sites[i].IsV3Enabled = &isV3Enabled + } + if v, ok := site["is_secure_site_enabled"]; ok { + isSecureSiteEnabled := v.(bool) + sites[i].IsSecureSiteEnabled = &isSecureSiteEnabled + } + if v, ok := site["trusted_origins"]; ok { + trustedOrigins := v.([]interface{}) + items := make([]string, len(trustedOrigins)) + for i, raw := range trustedOrigins { + items[i] = raw.(string) + } + sites[i].TrustedOrigins = &items + } + + } + + return &sites, nil +} + +func unExpandSites(input []botservice.DirectLineSite) []interface{} { + + sites := make([]interface{}, len(input)) + + for i, element := range input { + site := make(map[string]interface{}) + site["site_name"] = element.SiteName + site["key"] = element.Key + site["key2"] = element.Key2 + site["is_enabled"] = element.IsEnabled + site["is_v1_enabled"] = element.IsV1Enabled + site["is_v3_enabled"] = element.IsV3Enabled + site["is_secure_site_enabled"] = element.IsSecureSiteEnabled + site["trusted_origins"] = element.TrustedOrigins + + sites[i] = site + } + + return sites +} + +func resourceArmBotChannelDirectlineCreate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Bot.ChannelClient + ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) + defer cancel() + + resourceGroup := d.Get("resource_group_name").(string) + botName := d.Get("bot_name").(string) + + if features.ShouldResourcesBeImported() && d.IsNewResource() { + existing, err := client.Get(ctx, resourceGroup, string(botservice.ChannelNameDirectLineChannel1), botName) + if err != nil { + if !utils.ResponseWasNotFound(existing.Response) { + return fmt.Errorf("Error checking for presence of creating Channel Directline for Bot %q (Resource Group %q): %+v", resourceGroup, botName, err) + } + } + if existing.ID != nil && *existing.ID != "" { + return tf.ImportAsExistsError("azurerm_bot_channel_directline", *existing.ID) + } + } + + sites, err := expandSites(d.Get("site").(*schema.Set).List()) + + channel := botservice.BotChannel{ + Properties: botservice.DirectLineChannel{ + Properties: &botservice.DirectLineChannelProperties{ + Sites: sites, + }, + ChannelName: botservice.ChannelNameDirectLineChannel1, + }, + Location: utils.String(azure.NormalizeLocation(d.Get("location").(string))), + Kind: botservice.KindBot, + } + + if _, err := client.Create(ctx, resourceGroup, botName, botservice.ChannelNameDirectLineChannel, channel); err != nil { + return fmt.Errorf("Error issuing create request for Channel Directline for Bot %q (Resource Group %q): %+v", resourceGroup, botName, err) + } + + resp, err := client.Get(ctx, resourceGroup, botName, string(botservice.ChannelNameDirectLineChannel1)) + if err != nil { + return fmt.Errorf("Error making get request for Channel Directline for Bot %q (Resource Group %q): %+v", resourceGroup, botName, err) + } + + if resp.ID == nil { + return fmt.Errorf("Cannot read Channel Directline for Bot %q (Resource Group %q): %+v", resourceGroup, botName, err) + } + + d.SetId(*resp.ID) + + return resourceArmBotChannelDirectlineRead(d, meta) +} + +func resourceArmBotChannelDirectlineRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Bot.ChannelClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := azure.ParseAzureResourceID(d.Id()) + if err != nil { + return err + } + + botName := id.Path["botServices"] + resp, err := client.Get(ctx, id.ResourceGroup, botName, string(botservice.ChannelNameDirectLineChannel1)) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + log.Printf("[INFO] Channel Directline for Bot %q (Resource Group %q) was not found - removing from state!", id.ResourceGroup, botName) + d.SetId("") + return nil + } + + return fmt.Errorf("Error reading Channel Directline for Bot %q (Resource Group %q): %+v", id.ResourceGroup, botName, err) + } + + d.Set("resource_group_name", id.ResourceGroup) + d.Set("location", resp.Location) + d.Set("bot_name", botName) + + channelsResp, err := client.ListWithKeys(ctx, id.ResourceGroup, botName, botservice.ChannelNameDirectLineChannel) + if props := channelsResp.Properties; props != nil { + if channel, ok := props.AsDirectLineChannel(); ok { + if channelProps := channel.Properties; channelProps != nil { + d.Set("site", unExpandSites(*channelProps.Sites)) + } + } + } + + return nil +} + +func resourceArmBotChannelDirectlineUpdate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Bot.ChannelClient + ctx, cancel := timeouts.ForUpdate(meta.(*clients.Client).StopContext, d) + defer cancel() + + botName := d.Get("bot_name").(string) + resourceGroup := d.Get("resource_group_name").(string) + sites, err := expandSites(d.Get("site").(*schema.Set).List()) + + channel := botservice.BotChannel{ + Properties: botservice.DirectLineChannel{ + Properties: &botservice.DirectLineChannelProperties{ + Sites: sites, + }, + ChannelName: botservice.ChannelNameDirectLineChannel1, + }, + Location: utils.String(azure.NormalizeLocation(d.Get("location").(string))), + Kind: botservice.KindBot, + } + + if _, err := client.Update(ctx, resourceGroup, botName, botservice.ChannelNameDirectLineChannel, channel); err != nil { + return fmt.Errorf("Error issuing create request for Channel Directline for Bot %q (Resource Group %q): %+v", resourceGroup, botName, err) + } + + resp, err := client.Get(ctx, resourceGroup, botName, string(botservice.ChannelNameDirectLineChannel1)) + if err != nil { + return fmt.Errorf("Error making get request for Channel Directline for Bot %q (Resource Group %q): %+v", resourceGroup, botName, err) + } + + if resp.ID == nil { + return fmt.Errorf("Cannot read Channel Directline for Bot %q (Resource Group %q): %+v", resourceGroup, botName, err) + } + + d.SetId(*resp.ID) + + return resourceArmBotChannelDirectlineRead(d, meta) +} + +func resourceArmBotChannelDirectlineDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Bot.ChannelClient + ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := azure.ParseAzureResourceID(d.Id()) + if err != nil { + return err + } + + botName := id.Path["botServices"] + + resp, err := client.Delete(ctx, id.ResourceGroup, botName, string(botservice.ChannelNameDirectLineChannel1)) + if err != nil { + if !response.WasNotFound(resp.Response) { + return fmt.Errorf("Error deleting Channel Directline for Bot %q (Resource Group %q): %+v", id.ResourceGroup, botName, err) + } + } + + return nil +} diff --git a/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go b/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go new file mode 100644 index 0000000000000..42a83fabf8974 --- /dev/null +++ b/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go @@ -0,0 +1,142 @@ +package tests + +import ( + "fmt" + "net/http" + "testing" + + "github.com/Azure/azure-sdk-for-go/services/preview/botservice/mgmt/2018-07-12/botservice" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func testAccAzureRMBotChannelDirectline_basic(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_bot_channel_directline", "test") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMBotChannelDirectlineDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMBotChannelDirectline_basicConfig(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMBotChannelDirectlineExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + +func testAccAzureRMBotChannelDirectline_update(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_bot_channel_directline", "test") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMBotChannelDirectlineDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMBotChannelDirectline_basicConfig(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMBotChannelDirectlineExists(data.ResourceName), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMBotChannelDirectline_basicUpdate(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMBotChannelDirectlineExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + +func testCheckAzureRMBotChannelDirectlineExists(name string) resource.TestCheckFunc { + return func(s *terraform.State) error { + client := acceptance.AzureProvider.Meta().(*clients.Client).Bot.ChannelClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + // Ensure we have enough information in state to look up in API + rs, ok := s.RootModule().Resources[name] + if !ok { + return fmt.Errorf("Not found: %s", name) + } + + botName := rs.Primary.Attributes["bot_name"] + resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] + if !hasResourceGroup { + return fmt.Errorf("Bad: no resource group found in state for Bot Channel Directline") + } + + resp, err := client.Get(ctx, resourceGroup, botName, string(botservice.ChannelNameDirectLineChannel1)) + if err != nil { + return fmt.Errorf("Bad: Get on botChannelClient: %+v", err) + } + + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Bad: Bot Channel Directline %q (resource group: %q / bot: %q) does not exist", name, resourceGroup, botName) + } + + return nil + } +} + +func testCheckAzureRMBotChannelDirectlineDestroy(s *terraform.State) error { + client := acceptance.AzureProvider.Meta().(*clients.Client).Bot.ChannelClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_bot_channel_directline" { + continue + } + + botName := rs.Primary.Attributes["bot_name"] + resourceGroup := rs.Primary.Attributes["resource_group_name"] + + resp, err := client.Get(ctx, resourceGroup, botName, string(botservice.ChannelNameDirectLineChannel1)) + + if err != nil { + return nil + } + + if resp.StatusCode != http.StatusNotFound { + return fmt.Errorf("Bot Channel Directline still exists:\n%#v", resp.Properties) + } + } + + return nil +} + +func testAccAzureRMBotChannelDirectline_basicConfig(data acceptance.TestData) string { + template := testAccAzureRMBotChannelsRegistration_basicConfig(data) + return fmt.Sprintf(` +%s + +resource "azurerm_bot_channel_directline" "test" { + bot_name = "${azurerm_bot_channels_registration.test.name}" + location = "${azurerm_bot_channels_registration.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" +} +`, template) +} + +func testAccAzureRMBotChannelDirectline_basicUpdate(data acceptance.TestData) string { + template := testAccAzureRMBotChannelsRegistration_basicConfig(data) + return fmt.Sprintf(` +%s + +resource "azurerm_bot_channel_directline" "test" { + bot_name = "${azurerm_bot_channels_registration.test.name}" + location = "${azurerm_bot_channels_registration.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + is_enabled = false +} +`, template) +} diff --git a/azurerm/internal/services/bot/tests/resource_arm_bot_channels_registration_test.go b/azurerm/internal/services/bot/tests/resource_arm_bot_channels_registration_test.go index 3ac73f98663a0..de8ef94f9e298 100644 --- a/azurerm/internal/services/bot/tests/resource_arm_bot_channels_registration_test.go +++ b/azurerm/internal/services/bot/tests/resource_arm_bot_channels_registration_test.go @@ -26,10 +26,12 @@ func TestAccAzureRMBotChannelsRegistration(t *testing.T) { "complete": testAccAzureRMBotConnection_complete, }, "channel": { - "slackBasic": testAccAzureRMBotChannelSlack_basic, - "slackUpdate": testAccAzureRMBotChannelSlack_update, - "msteamsBasic": testAccAzureRMBotChannelMsTeams_basic, - "msteamsUpdate": testAccAzureRMBotChannelMsTeams_update, + "slackBasic": testAccAzureRMBotChannelSlack_basic, + "slackUpdate": testAccAzureRMBotChannelSlack_update, + "msteamsBasic": testAccAzureRMBotChannelMsTeams_basic, + "msteamsUpdate": testAccAzureRMBotChannelMsTeams_update, + "directlineBasic": testAccAzureRMBotChannelDirectline_basic, + "directlineUpdate": testAccAzureRMBotChannelDirectline_update, }, "web_app": { "basic": testAccAzureRMBotWebApp_basic, diff --git a/website/docs/r/bot_channel_directline.markdown b/website/docs/r/bot_channel_directline.markdown new file mode 100644 index 0000000000000..9218cc30e98ac --- /dev/null +++ b/website/docs/r/bot_channel_directline.markdown @@ -0,0 +1,67 @@ +--- +subcategory: "Bot" +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_bot_channel_directline" +description: |- + Manages an Directline integration for a Bot Channel +--- + +# azurerm_bot_connection + +Manages a Directline integration for a Bot Channel + +## Example Usage + +```hcl +data "azurerm_client_config" "current" {} + +resource "azurerm_resource_group" "example" { + name = "example-resources" + location = "northeurope" +} + +resource "azurerm_bot_channels_registration" "example" { + name = "example" + location = "global" + resource_group_name = "${azurerm_resource_group.example.name}" + sku = "F0" + microsoft_app_id = "${data.azurerm_client_config.current.service_principal_application_id}" +} + +resource "azurerm_bot_channel_directline" "example" { + bot_name = "${azurerm_bot_channels_registration.example.name}" + location = "${azurerm_bot_channels_registration.example.location}" + resource_group_name = "${azurerm_resource_group.example.name}" + + site { + site_name = "default" + is_enabled = true + } +} +``` + +## Argument Reference + +The following arguments are supported: + +- `resource_group_name` - (Required) The name of the resource group in which to create the Bot Channel. Changing this forces a new resource to be created. + +- `location` - (Required) The supported Azure location where the resource exists. Changing this forces a new resource to be created. + +- `bot_name` - (Required) The name of the Bot Resource this channel will be associated with. Changing this forces a new resource to be created. + +- `site` - (Optional) The sites that belong to this channel. + +## Attributes Reference + +The following attributes are exported: + +- `id` - The Bot Channel ID. + +## Import + +The Microsoft Teams Channel for a Bot can be imported using the `resource id`, e.g. + +```shell +terraform import azurerm_bot_channel_ms_teams.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/example/providers/Microsoft.BotService/botServices/example/channels/MsTeamsChannel +``` From 9c08648867e7f022a31296d50b7e3692ea0baf2d Mon Sep 17 00:00:00 2001 From: john Date: Mon, 20 Jan 2020 17:40:10 +1100 Subject: [PATCH 012/498] fix tflint errors --- ...resource_arm_bot_channel_directline_test.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go b/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go index 42a83fabf8974..fddc3bf6f246a 100644 --- a/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go +++ b/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go @@ -116,27 +116,27 @@ func testCheckAzureRMBotChannelDirectlineDestroy(s *terraform.State) error { func testAccAzureRMBotChannelDirectline_basicConfig(data acceptance.TestData) string { template := testAccAzureRMBotChannelsRegistration_basicConfig(data) - return fmt.Sprintf(` + return fmt.Sprintf(` %s resource "azurerm_bot_channel_directline" "test" { - bot_name = "${azurerm_bot_channels_registration.test.name}" - location = "${azurerm_bot_channels_registration.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + bot_name = "${azurerm_bot_channels_registration.test.name}" + location = "${azurerm_bot_channels_registration.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" } `, template) } func testAccAzureRMBotChannelDirectline_basicUpdate(data acceptance.TestData) string { template := testAccAzureRMBotChannelsRegistration_basicConfig(data) - return fmt.Sprintf(` + return fmt.Sprintf(` %s resource "azurerm_bot_channel_directline" "test" { - bot_name = "${azurerm_bot_channels_registration.test.name}" - location = "${azurerm_bot_channels_registration.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - is_enabled = false + bot_name = "${azurerm_bot_channels_registration.test.name}" + location = "${azurerm_bot_channels_registration.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + is_enabled = false } `, template) } From eaa2039f8f647c3f2a215a68f4701aa9d55be826 Mon Sep 17 00:00:00 2001 From: John Kendall Date: Mon, 20 Jan 2020 20:01:43 +1100 Subject: [PATCH 013/498] Fix linting errors --- .../bot/resource_arm_bot_channel_directline.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go b/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go index eda31f60573c2..bada6a69cfadd 100644 --- a/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go +++ b/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go @@ -111,11 +111,9 @@ func resourceArmBotChannelDirectline() *schema.Resource { } func expandSites(input []interface{}) (*[]botservice.DirectLineSite, error) { - sites := make([]botservice.DirectLineSite, len(input)) for i, element := range input { - site := element.(map[string]interface{}) if v, ok := site["site_name"]; ok { siteName := v.(string) @@ -145,14 +143,12 @@ func expandSites(input []interface{}) (*[]botservice.DirectLineSite, error) { } sites[i].TrustedOrigins = &items } - } return &sites, nil } func unExpandSites(input []botservice.DirectLineSite) []interface{} { - sites := make([]interface{}, len(input)) for i, element := range input { @@ -192,7 +188,7 @@ func resourceArmBotChannelDirectlineCreate(d *schema.ResourceData, meta interfac } } - sites, err := expandSites(d.Get("site").(*schema.Set).List()) + sites, _ := expandSites(d.Get("site").(*schema.Set).List()) channel := botservice.BotChannel{ Properties: botservice.DirectLineChannel{ @@ -249,7 +245,7 @@ func resourceArmBotChannelDirectlineRead(d *schema.ResourceData, meta interface{ d.Set("location", resp.Location) d.Set("bot_name", botName) - channelsResp, err := client.ListWithKeys(ctx, id.ResourceGroup, botName, botservice.ChannelNameDirectLineChannel) + channelsResp, _ := client.ListWithKeys(ctx, id.ResourceGroup, botName, botservice.ChannelNameDirectLineChannel) if props := channelsResp.Properties; props != nil { if channel, ok := props.AsDirectLineChannel(); ok { if channelProps := channel.Properties; channelProps != nil { @@ -268,7 +264,7 @@ func resourceArmBotChannelDirectlineUpdate(d *schema.ResourceData, meta interfac botName := d.Get("bot_name").(string) resourceGroup := d.Get("resource_group_name").(string) - sites, err := expandSites(d.Get("site").(*schema.Set).List()) + sites, _ := expandSites(d.Get("site").(*schema.Set).List()) channel := botservice.BotChannel{ Properties: botservice.DirectLineChannel{ From cbba6c0037c05090e3719da9343534f1086c4fae Mon Sep 17 00:00:00 2001 From: John Kendall Date: Mon, 20 Jan 2020 20:59:41 +1100 Subject: [PATCH 014/498] Add sensitive flags to keys --- .../bot/resource_arm_bot_channel_directline.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go b/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go index bada6a69cfadd..a08cd5dd76daa 100644 --- a/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go +++ b/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go @@ -63,13 +63,15 @@ func resourceArmBotChannelDirectline() *schema.Resource { }, "key": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "key2": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, + Sensitive: true, }, "is_enabled": { From 70a6a1815e7168be3c8a3e4be59f2e43e1fef880 Mon Sep 17 00:00:00 2001 From: WS <20408400+WodansSon@users.noreply.github.com> Date: Thu, 23 Jan 2020 14:16:44 -0800 Subject: [PATCH 015/498] Update website/docs/r/key_vault.html.markdown Co-Authored-By: Tom Harvey --- website/docs/r/key_vault.html.markdown | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/docs/r/key_vault.html.markdown b/website/docs/r/key_vault.html.markdown index ed02b1c1903b4..c4089524fc731 100644 --- a/website/docs/r/key_vault.html.markdown +++ b/website/docs/r/key_vault.html.markdown @@ -88,7 +88,9 @@ The following arguments are supported: * `purge_on_delete` - (Optional) Boolean flag to specify if the KeyVault should be purged on delete. This purges KeyVaults enabled for soft delete on resource deletition. -* `enabled_for_purge_protection` - (Optional) Boolean flag to specify whether the key vault is enabled for purge protection, this conflicts with `purge_on_delete`. Once enabled you can not disable this setting. +* `enabled_for_purge_protection` - (Optional) Is Purge Protection enabled for this Key Vault? + +-> **NOTE:** Once Purge Protection has been Enabled there's currently no way to Disable it - [support for this is being tracked in this Azure API issue](https://github.com/Azure/azure-rest-api-specs/issues/8075) * `network_acls` - (Optional) A `network_acls` block as defined below. From 22701db8ce57618d3f8a0f7834e779afc2f19764 Mon Sep 17 00:00:00 2001 From: WS <20408400+WodansSon@users.noreply.github.com> Date: Thu, 23 Jan 2020 14:17:10 -0800 Subject: [PATCH 016/498] Update website/docs/r/key_vault.html.markdown Co-Authored-By: Tom Harvey --- website/docs/r/key_vault.html.markdown | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/docs/r/key_vault.html.markdown b/website/docs/r/key_vault.html.markdown index c4089524fc731..b9b1364f5d90a 100644 --- a/website/docs/r/key_vault.html.markdown +++ b/website/docs/r/key_vault.html.markdown @@ -84,7 +84,9 @@ The following arguments are supported: * `enabled_for_template_deployment` - (Optional) Boolean flag to specify whether Azure Resource Manager is permitted to retrieve secrets from the key vault. Defaults to `false`. -* `enabled_for_soft_delete` - (Optional) Boolean flag to specify whether the key vault is enabled for soft delete. Once enabled you can not disable this setting. +* `enabled_for_soft_delete` - (Optional) Should Soft Delete be enabled for items in this Key Vault? + +-> **NOTE:** Once enabled you can not disable this setting. * `purge_on_delete` - (Optional) Boolean flag to specify if the KeyVault should be purged on delete. This purges KeyVaults enabled for soft delete on resource deletition. From 50563f8546f9cbff7908d31e885c924256420c7e Mon Sep 17 00:00:00 2001 From: WS <20408400+WodansSon@users.noreply.github.com> Date: Thu, 23 Jan 2020 14:22:24 -0800 Subject: [PATCH 017/498] Update azurerm/internal/services/keyvault/resource_arm_key_vault.go Co-Authored-By: Tom Harvey --- azurerm/internal/services/keyvault/resource_arm_key_vault.go | 1 - 1 file changed, 1 deletion(-) diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault.go b/azurerm/internal/services/keyvault/resource_arm_key_vault.go index 2b6cbf0ffbc01..ff00aa44c20ce 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault.go @@ -160,7 +160,6 @@ func resourceArmKeyVault() *schema.Resource { "enabled_for_soft_delete": { Type: schema.TypeBool, Optional: true, - ValidateFunc: validate.BoolIsTrue(), }, "enabled_for_purge_protection": { From 20e187610ca777e7824c9fde0096491ce6dabc8a Mon Sep 17 00:00:00 2001 From: Brent Harrison Date: Sat, 25 Jan 2020 13:52:58 -0500 Subject: [PATCH 018/498] Add ExpressRoute Gateway resource and tests --- .../services/network/client/client.go | 5 + .../internal/services/network/registration.go | 1 + .../resource_arm_express_route_gateway.go | 206 +++++++++++++++ ...resource_arm_express_route_gateway_test.go | 234 ++++++++++++++++++ 4 files changed, 446 insertions(+) create mode 100644 azurerm/internal/services/network/resource_arm_express_route_gateway.go create mode 100644 azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go diff --git a/azurerm/internal/services/network/client/client.go b/azurerm/internal/services/network/client/client.go index 2788d928b6a77..9794b251ef663 100644 --- a/azurerm/internal/services/network/client/client.go +++ b/azurerm/internal/services/network/client/client.go @@ -14,6 +14,7 @@ type Client struct { DDOSProtectionPlansClient *network.DdosProtectionPlansClient ExpressRouteAuthsClient *network.ExpressRouteCircuitAuthorizationsClient ExpressRouteCircuitsClient *network.ExpressRouteCircuitsClient + ExpressRouteGatewaysClient *network.ExpressRouteGatewaysClient ExpressRoutePeeringsClient *network.ExpressRouteCircuitPeeringsClient InterfacesClient *network.InterfacesClient LoadBalancersClient *network.LoadBalancersClient @@ -68,6 +69,9 @@ func NewClient(o *common.ClientOptions) *Client { ExpressRouteCircuitsClient := network.NewExpressRouteCircuitsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&ExpressRouteCircuitsClient.Client, o.ResourceManagerAuthorizer) + ExpressRouteGatewaysClient := network.NewExpressRouteGatewaysClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) + o.ConfigureClient(&ExpressRouteGatewaysClient.Client, o.ResourceManagerAuthorizer) + ExpressRoutePeeringsClient := network.NewExpressRouteCircuitPeeringsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&ExpressRoutePeeringsClient.Client, o.ResourceManagerAuthorizer) @@ -158,6 +162,7 @@ func NewClient(o *common.ClientOptions) *Client { DDOSProtectionPlansClient: &DDOSProtectionPlansClient, ExpressRouteAuthsClient: &ExpressRouteAuthsClient, ExpressRouteCircuitsClient: &ExpressRouteCircuitsClient, + ExpressRouteGatewaysClient: &ExpressRouteGatewaysClient, ExpressRoutePeeringsClient: &ExpressRoutePeeringsClient, InterfacesClient: &InterfacesClient, LoadBalancersClient: &LoadBalancersClient, diff --git a/azurerm/internal/services/network/registration.go b/azurerm/internal/services/network/registration.go index fc30e925d99b7..2603c9b651e18 100644 --- a/azurerm/internal/services/network/registration.go +++ b/azurerm/internal/services/network/registration.go @@ -51,6 +51,7 @@ func (r Registration) SupportedResources() map[string]*schema.Resource { "azurerm_express_route_circuit_authorization": resourceArmExpressRouteCircuitAuthorization(), "azurerm_express_route_circuit_peering": resourceArmExpressRouteCircuitPeering(), "azurerm_express_route_circuit": resourceArmExpressRouteCircuit(), + "azurerm_express_route_gateway": resourceArmExpressRouteGateway(), "azurerm_firewall_application_rule_collection": resourceArmFirewallApplicationRuleCollection(), "azurerm_firewall_nat_rule_collection": resourceArmFirewallNatRuleCollection(), "azurerm_firewall_network_rule_collection": resourceArmFirewallNetworkRuleCollection(), diff --git a/azurerm/internal/services/network/resource_arm_express_route_gateway.go b/azurerm/internal/services/network/resource_arm_express_route_gateway.go new file mode 100644 index 0000000000000..b179e79b3e6be --- /dev/null +++ b/azurerm/internal/services/network/resource_arm_express_route_gateway.go @@ -0,0 +1,206 @@ +package network + +import ( + "fmt" + "log" + "time" + + "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-09-01/network" + "github.com/hashicorp/go-azure-helpers/response" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +var expressRouteGatewayResourceName = "azurerm_express_route_gateway" + +func resourceArmExpressRouteGateway() *schema.Resource { + return &schema.Resource{ + Create: resourceArmExpressRouteGatewayCreateUpdate, + Read: resourceArmExpressRouteGatewayRead, + Update: resourceArmExpressRouteGatewayCreateUpdate, + Delete: resourceArmExpressRouteGatewayDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(60 * time.Minute), + Read: schema.DefaultTimeout(5 * time.Minute), + Update: schema.DefaultTimeout(60 * time.Minute), + Delete: schema.DefaultTimeout(60 * time.Minute), + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validate.NoEmptyStrings, + }, + + "location": azure.SchemaLocation(), + + "resource_group_name": azure.SchemaResourceGroupName(), + + "virtual_hub_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: azure.ValidateResourceID, + }, + + "scale_units": { + Type: schema.TypeInt, + Required: true, + ValidateFunc: validation.IntBetween(1, 6), + }, + + "tags": tags.Schema(), + }, + } +} + +func resourceArmExpressRouteGatewayCreateUpdate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Network.ExpressRouteGatewaysClient + ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) + defer cancel() + + log.Println("[INFO] preparing arguments for ExpressRoute Gateway creation.") + + name := d.Get("name").(string) + resourceGroup := d.Get("resource_group_name").(string) + + if features.ShouldResourcesBeImported() && d.IsNewResource() { + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if !utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Error checking for present of existing ExpressRoute Gateway %q (Resource Group %q): %+v", name, resourceGroup, err) + } + } + if resp.ID != nil && *resp.ID != "" { + return tf.ImportAsExistsError("azurerm_express_route_gateway", *resp.ID) + } + } + + location := azure.NormalizeLocation(d.Get("location").(string)) + virtualHubId := d.Get("virtual_hub_id").(string) + t := d.Get("tags").(map[string]interface{}) + + parameters := network.ExpressRouteGateway{ + Location: utils.String(location), + ExpressRouteGatewayProperties: &network.ExpressRouteGatewayProperties{ + AutoScaleConfiguration: &network.ExpressRouteGatewayPropertiesAutoScaleConfiguration{ + Bounds: expandExpressRouteGatewayAutoScaleConfigurationBounds(d), + }, + VirtualHub: &network.VirtualHubID{ + ID: &virtualHubId, + }, + }, + Tags: tags.Expand(t), + } + + future, err := client.CreateOrUpdate(ctx, resourceGroup, name, parameters) + if err != nil { + return fmt.Errorf("Error creating ExpressRoute Gateway %q (Resource Group %q): %+v", name, resourceGroup, err) + } + if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { + return fmt.Errorf("Error waiting for creation of ExpressRoute Gateway %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + return fmt.Errorf("Error retrieving ExpressRoute Gateway %q (Resource Group %q): %+v", name, resourceGroup, err) + } + if resp.ID == nil || *resp.ID == "" { + return fmt.Errorf("Cannot read ExpressRoute Gateway %q (Resource Group %q) ID", name, resourceGroup) + } + d.SetId(*resp.ID) + + return resourceArmExpressRouteGatewayRead(d, meta) +} + +func resourceArmExpressRouteGatewayRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Network.ExpressRouteGatewaysClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := azure.ParseAzureResourceID(d.Id()) + if err != nil { + return err + } + resourceGroup := id.ResourceGroup + name := id.Path["expressRouteGateways"] + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + log.Printf("[INFO] ExpressRoute Gateway %q does not exist - removing from state", d.Id()) + d.SetId("") + return nil + } + return fmt.Errorf("Error reading ExpressRoute Gateway %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + d.Set("name", resp.Name) + d.Set("resource_group_name", resourceGroup) + if location := resp.Location; location != nil { + d.Set("location", azure.NormalizeLocation(*location)) + } + + if props := resp.ExpressRouteGatewayProperties; props != nil { + d.Set("virtual_hub_id", props.VirtualHub.ID) + + if setErr := d.Set("scale_units", props.AutoScaleConfiguration.Bounds.Min); setErr != nil { + return fmt.Errorf("Error setting `scale_units`: %+v", setErr) + } + } + + return tags.FlattenAndSet(d, resp.Tags) +} + +func resourceArmExpressRouteGatewayDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Network.ExpressRouteGatewaysClient + ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := azure.ParseAzureResourceID(d.Id()) + if err != nil { + return err + } + resourceGroup := id.ResourceGroup + name := id.Path["expressRouteGateways"] + + future, err := client.Delete(ctx, resourceGroup, name) + if err != nil { + if response.WasNotFound(future.Response()) { + return nil + } + return fmt.Errorf("Error deleting ExpressRoute Gateway %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { + if !response.WasNotFound(future.Response()) { + return fmt.Errorf("Error waiting for deleting ExpressRoute Gateway %q (Resource Group %q): %+v", name, resourceGroup, err) + } + } + + return nil +} + +func expandExpressRouteGatewayAutoScaleConfigurationBounds(d *schema.ResourceData) *network.ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds { + + minScaleUnits := int32(d.Get("scale_units").(int)) + configuration := network.ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds{ + Min: &minScaleUnits, + } + + return &configuration +} \ No newline at end of file diff --git a/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go new file mode 100644 index 0000000000000..7c04aaaf32c95 --- /dev/null +++ b/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go @@ -0,0 +1,234 @@ +package tests + +import ( + "fmt" + //"net/http" + "testing" + + //"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-09-01/network" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func TestAccAzureRMExpressRouteGateway_basic(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_express_route_gateway", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMExpressRouteGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMExpressRouteGateway_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMExpressRouteGatewayExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMExpressRouteGateway_requiresImport(t *testing.T) { + if !features.ShouldResourcesBeImported() { + t.Skip("Skipping since resources aren't required to be imported") + return + } + + data := acceptance.BuildTestData(t, "azurerm_express_route_gateway", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMExpressRouteGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMExpressRouteGateway_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMExpressRouteGatewayExists(data.ResourceName), + ), + }, + { + Config: testAccAzureRMExpressRouteGateway_requiresImport(data), + ExpectError: acceptance.RequiresImportError("azurerm_express_route_gateway"), + }, + }, + }) +} + +func TestAccAzureRMExpressRouteGateway_update(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_express_route_gateway", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMExpressRouteGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMExpressRouteGateway_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMExpressRouteGatewayExists(data.ResourceName), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMExpressRouteGateway_updateScaleUnits(data, 2), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMExpressRouteGatewayExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "scale_units", "2"), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMExpressRouteGateway_tags(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_express_route_gateway", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMExpressRouteGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMExpressRouteGateway_tags(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMExpressRouteGatewayExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + +func testCheckAzureRMExpressRouteGatewayExists(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + client := acceptance.AzureProvider.Meta().(*clients.Client).Network.ExpressRouteGatewaysClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("ExpressRoute Gateway not found: %s", resourceName) + } + + name := rs.Primary.Attributes["name"] + resourceGroup := rs.Primary.Attributes["resource_group_name"] + + if resp, err := client.Get(ctx, resourceGroup, name); err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Bad: ExpressRoute Gateway %q (Resource Group %q) does not exist", name, resourceGroup) + } + return fmt.Errorf("Bad: Get on network.ExpressRouteGatewaysClient: %+v", err) + } + + return nil + } +} + +func testCheckAzureRMExpressRouteGatewayDestroy(s *terraform.State) error { + client := acceptance.AzureProvider.Meta().(*clients.Client).Network.ExpressRouteGatewaysClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_express_route_gateway" { + continue + } + + name := rs.Primary.Attributes["name"] + resourceGroup := rs.Primary.Attributes["resource_group_name"] + + if resp, err := client.Get(ctx, resourceGroup, name); err != nil { + if !utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Bad: Get on network.ExpressRouteGatewaysClient: %+v", err) + } + } + + return nil + } + + return nil +} + +func testAccAzureRMExpressRouteGateway_basic(data acceptance.TestData) string { + template := testAccAzureRMExpressRouteGateway_template(data) + return fmt.Sprintf(` +%s +resource "azurerm_express_route_gateway" "test" { + name = "acctestER-gateway-%d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + virtual_hub_id = azurerm_virtual_hub.test.id + scale_units = 1 +} +`, template, data.RandomInteger) +} + +func testAccAzureRMExpressRouteGateway_requiresImport(data acceptance.TestData) string { + template := testAccAzureRMExpressRouteGateway_basic(data) + return fmt.Sprintf(` +%s +resource "azurerm_express_route_gateway" "test" { + name = azurerm_express_route_gateway.test.name + resource_group_name = azurerm_express_route_gateway.test.name + location = azurerm_express_route_gateway.test.location + scale_units = 1 +} +`, template) +} + +func testAccAzureRMExpressRouteGateway_updateScaleUnits(data acceptance.TestData, scaleUnits int) string { + template := testAccAzureRMExpressRouteGateway_template(data) + return fmt.Sprintf(` +%s +resource "azurerm_express_route_gateway" "test" { + name = "acctestER-gateway-%d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + virtual_hub_id = azurerm_virtual_hub.test.id + scale_units = %d +} +`, template, data.RandomInteger, scaleUnits) +} + +func testAccAzureRMExpressRouteGateway_tags(data acceptance.TestData) string { + template := testAccAzureRMExpressRouteGateway_template(data) + return fmt.Sprintf(` +%s +resource "azurerm_express_route_gateway" "test" { + name = "acctestER-gateway-%d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + virtual_hub_id = azurerm_virtual_hub.test.id + scale_units = 1 + tags = { + Hello = "World" + } +} +`, template, data.RandomInteger) +} + +func testAccAzureRMExpressRouteGateway_template(data acceptance.TestData) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} +resource "azurerm_virtual_wan" "test" { + name = "acctestvwan-%d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location +} +resource "azurerm_virtual_hub" "test" { + name = "acctestvhub-%d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + virtual_wan_id = azurerm_virtual_wan.test.id + address_prefix = "10.0.1.0/24" +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) +} \ No newline at end of file From a791cc17a7bf6fd17cd0c56fbf4b63d50d6690ef Mon Sep 17 00:00:00 2001 From: Brent Harrison Date: Sat, 25 Jan 2020 13:55:07 -0500 Subject: [PATCH 019/498] gofmt changes --- .../services/network/resource_arm_express_route_gateway.go | 2 +- .../network/tests/resource_arm_express_route_gateway_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/network/resource_arm_express_route_gateway.go b/azurerm/internal/services/network/resource_arm_express_route_gateway.go index b179e79b3e6be..84d60e5b832ba 100644 --- a/azurerm/internal/services/network/resource_arm_express_route_gateway.go +++ b/azurerm/internal/services/network/resource_arm_express_route_gateway.go @@ -203,4 +203,4 @@ func expandExpressRouteGatewayAutoScaleConfigurationBounds(d *schema.ResourceDat } return &configuration -} \ No newline at end of file +} diff --git a/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go index 7c04aaaf32c95..1dfcfe4ec8bda 100644 --- a/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go @@ -231,4 +231,4 @@ resource "azurerm_virtual_hub" "test" { address_prefix = "10.0.1.0/24" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) -} \ No newline at end of file +} From f0f39781efeacf9df159965583bd2937da5c07b9 Mon Sep 17 00:00:00 2001 From: Brent Harrison Date: Sat, 25 Jan 2020 14:09:54 -0500 Subject: [PATCH 020/498] Add documentation --- .../r/express_route_gateway.html.markdown | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 website/docs/r/express_route_gateway.html.markdown diff --git a/website/docs/r/express_route_gateway.html.markdown b/website/docs/r/express_route_gateway.html.markdown new file mode 100644 index 0000000000000..ad3c41fe427bc --- /dev/null +++ b/website/docs/r/express_route_gateway.html.markdown @@ -0,0 +1,76 @@ +--- +subcategory: "Network" +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_express_route_gateway" +description: |- + Manages an ExpressRoute gateway. +--- + +# azurerm_express_route_gateway + +Manages an ExpressRoute gateway. + +## Example Usage + +```hcl +resource "azurerm_resource_group" "example" { + name = "exprtTest" + location = "West US" +} + +resource "azurerm_virtual_wan" "example" { + name = "example-virtualwan" + resource_group_name = azurerm_resource_group.example.name + location = azurerm_resource_group.example.location +} + +resource "azurerm_virtual_hub" "example" { + name = "example-virtualhub" + resource_group_name = azurerm_resource_group.example.name + location = azurerm_resource_group.example.location + virtual_wan_id = azurerm_virtual_wan.example.id + address_prefix = "10.0.1.0/24" +} + +resource "azurerm_express_route_gateway" "example" { + name = "expressRoute1" + resource_group_name = azurerm_resource_group.example.name + location = azurerm_resource_group.example.location + virtual_hub_id = azurerm_virtual_hub.example.id + scale_unts = 1 + + tags = { + environment = "Production" + } +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) The name of the ExpressRoute circuit. Changing this forces a new resource to be created. + +* `resource_group_name` - (Required) The name of the resource group in which to create the ExpressRoute circuit. Changing this forces a new resource to be created. + +* `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. + +* `virtual_hub_id` - (Required) The ID of a Virtual WAN within which the Virtual Hub should be created. + +* `scale_units` - (Required) The name of the peering location and **not** the Azure resource location. + +* `tags` - (Optional) A mapping of tags to assign to the resource. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The Resource ID of the ExpressRoute gateway. + +## Import + +ExpressRoute gateways can be imported using the `resource id`, e.g. + +```shell +terraform import azurerm_express_route_gateway.myExpressRouteGateway /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.Network/expressRouteGateways/myExpressRouteGateway +``` From 790752dde503059d7d501758a47bc70fc349f1ef Mon Sep 17 00:00:00 2001 From: Brent Harrison Date: Sat, 25 Jan 2020 15:25:45 -0500 Subject: [PATCH 021/498] Resolve linting errors --- .../network/resource_arm_express_route_gateway.go | 3 --- .../tests/resource_arm_express_route_gateway_test.go | 2 +- website/docs/r/express_route_gateway.html.markdown | 10 +++++----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/azurerm/internal/services/network/resource_arm_express_route_gateway.go b/azurerm/internal/services/network/resource_arm_express_route_gateway.go index 84d60e5b832ba..789babfb476b7 100644 --- a/azurerm/internal/services/network/resource_arm_express_route_gateway.go +++ b/azurerm/internal/services/network/resource_arm_express_route_gateway.go @@ -19,8 +19,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -var expressRouteGatewayResourceName = "azurerm_express_route_gateway" - func resourceArmExpressRouteGateway() *schema.Resource { return &schema.Resource{ Create: resourceArmExpressRouteGatewayCreateUpdate, @@ -196,7 +194,6 @@ func resourceArmExpressRouteGatewayDelete(d *schema.ResourceData, meta interface } func expandExpressRouteGatewayAutoScaleConfigurationBounds(d *schema.ResourceData) *network.ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds { - minScaleUnits := int32(d.Get("scale_units").(int)) configuration := network.ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds{ Min: &minScaleUnits, diff --git a/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go index 1dfcfe4ec8bda..26e34f8e44dec 100644 --- a/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go @@ -227,7 +227,7 @@ resource "azurerm_virtual_hub" "test" { name = "acctestvhub-%d" resource_group_name = azurerm_resource_group.test.name location = azurerm_resource_group.test.location - virtual_wan_id = azurerm_virtual_wan.test.id + virtual_wan_id = azurerm_virtual_wan.test.id address_prefix = "10.0.1.0/24" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) diff --git a/website/docs/r/express_route_gateway.html.markdown b/website/docs/r/express_route_gateway.html.markdown index ad3c41fe427bc..fba48c292c7e0 100644 --- a/website/docs/r/express_route_gateway.html.markdown +++ b/website/docs/r/express_route_gateway.html.markdown @@ -33,11 +33,11 @@ resource "azurerm_virtual_hub" "example" { } resource "azurerm_express_route_gateway" "example" { - name = "expressRoute1" - resource_group_name = azurerm_resource_group.example.name - location = azurerm_resource_group.example.location - virtual_hub_id = azurerm_virtual_hub.example.id - scale_unts = 1 + name = "expressRoute1" + resource_group_name = azurerm_resource_group.example.name + location = azurerm_resource_group.example.location + virtual_hub_id = azurerm_virtual_hub.example.id + scale_unts = 1 tags = { environment = "Production" From 0069b65095ed48d24a95cec09612e31b574b5549 Mon Sep 17 00:00:00 2001 From: Brent Harrison Date: Sat, 25 Jan 2020 16:36:28 -0500 Subject: [PATCH 022/498] tflint fixes --- ...resource_arm_express_route_gateway_test.go | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go index 26e34f8e44dec..15a4f1e57052a 100644 --- a/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go @@ -2,10 +2,8 @@ package tests import ( "fmt" - //"net/http" "testing" - //"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-09-01/network" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" @@ -158,12 +156,13 @@ func testAccAzureRMExpressRouteGateway_basic(data acceptance.TestData) string { template := testAccAzureRMExpressRouteGateway_template(data) return fmt.Sprintf(` %s + resource "azurerm_express_route_gateway" "test" { name = "acctestER-gateway-%d" resource_group_name = azurerm_resource_group.test.name location = azurerm_resource_group.test.location - virtual_hub_id = azurerm_virtual_hub.test.id - scale_units = 1 + virtual_hub_id = azurerm_virtual_hub.test.id + scale_units = 1 } `, template, data.RandomInteger) } @@ -172,11 +171,12 @@ func testAccAzureRMExpressRouteGateway_requiresImport(data acceptance.TestData) template := testAccAzureRMExpressRouteGateway_basic(data) return fmt.Sprintf(` %s + resource "azurerm_express_route_gateway" "test" { name = azurerm_express_route_gateway.test.name resource_group_name = azurerm_express_route_gateway.test.name location = azurerm_express_route_gateway.test.location - scale_units = 1 + scale_units = 1 } `, template) } @@ -185,12 +185,13 @@ func testAccAzureRMExpressRouteGateway_updateScaleUnits(data acceptance.TestData template := testAccAzureRMExpressRouteGateway_template(data) return fmt.Sprintf(` %s + resource "azurerm_express_route_gateway" "test" { name = "acctestER-gateway-%d" resource_group_name = azurerm_resource_group.test.name location = azurerm_resource_group.test.location - virtual_hub_id = azurerm_virtual_hub.test.id - scale_units = %d + virtual_hub_id = azurerm_virtual_hub.test.id + scale_units = %d } `, template, data.RandomInteger, scaleUnits) } @@ -199,12 +200,13 @@ func testAccAzureRMExpressRouteGateway_tags(data acceptance.TestData) string { template := testAccAzureRMExpressRouteGateway_template(data) return fmt.Sprintf(` %s + resource "azurerm_express_route_gateway" "test" { name = "acctestER-gateway-%d" resource_group_name = azurerm_resource_group.test.name location = azurerm_resource_group.test.location - virtual_hub_id = azurerm_virtual_hub.test.id - scale_units = 1 + virtual_hub_id = azurerm_virtual_hub.test.id + scale_units = 1 tags = { Hello = "World" } @@ -218,11 +220,13 @@ resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" } + resource "azurerm_virtual_wan" "test" { name = "acctestvwan-%d" resource_group_name = azurerm_resource_group.test.name location = azurerm_resource_group.test.location } + resource "azurerm_virtual_hub" "test" { name = "acctestvhub-%d" resource_group_name = azurerm_resource_group.test.name From fef651def293da9bcb08ae1f9775d1c70261676b Mon Sep 17 00:00:00 2001 From: John Kendall Date: Sun, 26 Jan 2020 22:48:36 +1100 Subject: [PATCH 023/498] review feedback response --- .../resource_arm_bot_channel_directline.go | 177 ++++++++++-------- ...esource_arm_bot_channel_directline_test.go | 47 +++++ ...urce_arm_bot_channels_registration_test.go | 13 +- .../docs/r/bot_channel_directline.markdown | 16 +- 4 files changed, 168 insertions(+), 85 deletions(-) diff --git a/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go b/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go index a08cd5dd76daa..219ab81122913 100644 --- a/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go +++ b/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go @@ -53,25 +53,9 @@ func resourceArmBotChannelDirectline() *schema.Resource { Schema: map[string]*schema.Schema{ "site_name": { - Type: schema.TypeString, - Required: true, - }, - - "site_id": { - Type: schema.TypeString, - Computed: true, - }, - - "key": { - Type: schema.TypeString, - Computed: true, - Sensitive: true, - }, - - "key2": { - Type: schema.TypeString, - Computed: true, - Sensitive: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: validate.NoEmptyStrings, }, "is_enabled": { @@ -102,9 +86,27 @@ func resourceArmBotChannelDirectline() *schema.Resource { Type: schema.TypeList, Optional: true, Elem: &schema.Schema{ - Type: schema.TypeString, + Type: schema.TypeString, + ValidateFunc: validate.NoEmptyStrings, }, }, + + "key": { + Type: schema.TypeString, + Computed: true, + Sensitive: true, + }, + + "key2": { + Type: schema.TypeString, + Computed: true, + Sensitive: true, + }, + + "site_id": { + Type: schema.TypeString, + Computed: true, + }, }, }, }, @@ -112,64 +114,6 @@ func resourceArmBotChannelDirectline() *schema.Resource { } } -func expandSites(input []interface{}) (*[]botservice.DirectLineSite, error) { - sites := make([]botservice.DirectLineSite, len(input)) - - for i, element := range input { - site := element.(map[string]interface{}) - if v, ok := site["site_name"]; ok { - siteName := v.(string) - sites[i].SiteName = &siteName - } - if v, ok := site["is_enabled"]; ok { - isEnabled := v.(bool) - sites[i].IsEnabled = &isEnabled - } - if v, ok := site["is_v1_enabled"]; ok { - isV1Enabled := v.(bool) - sites[i].IsV1Enabled = &isV1Enabled - } - if v, ok := site["is_v3_enabled"]; ok { - isV3Enabled := v.(bool) - sites[i].IsV3Enabled = &isV3Enabled - } - if v, ok := site["is_secure_site_enabled"]; ok { - isSecureSiteEnabled := v.(bool) - sites[i].IsSecureSiteEnabled = &isSecureSiteEnabled - } - if v, ok := site["trusted_origins"]; ok { - trustedOrigins := v.([]interface{}) - items := make([]string, len(trustedOrigins)) - for i, raw := range trustedOrigins { - items[i] = raw.(string) - } - sites[i].TrustedOrigins = &items - } - } - - return &sites, nil -} - -func unExpandSites(input []botservice.DirectLineSite) []interface{} { - sites := make([]interface{}, len(input)) - - for i, element := range input { - site := make(map[string]interface{}) - site["site_name"] = element.SiteName - site["key"] = element.Key - site["key2"] = element.Key2 - site["is_enabled"] = element.IsEnabled - site["is_v1_enabled"] = element.IsV1Enabled - site["is_v3_enabled"] = element.IsV3Enabled - site["is_secure_site_enabled"] = element.IsSecureSiteEnabled - site["trusted_origins"] = element.TrustedOrigins - - sites[i] = site - } - - return sites -} - func resourceArmBotChannelDirectlineCreate(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Bot.ChannelClient ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) @@ -318,3 +262,80 @@ func resourceArmBotChannelDirectlineDelete(d *schema.ResourceData, meta interfac return nil } + +func expandSites(input []interface{}) (*[]botservice.DirectLineSite, error) { + sites := make([]botservice.DirectLineSite, len(input)) + + for i, element := range input { + site := element.(map[string]interface{}) + + if v, ok := site["site_name"].(string); ok { + sites[i].SiteName = &v + } + if v, ok := site["is_enabled"].(bool); ok { + sites[i].IsEnabled = &v + } + if v, ok := site["is_v1_enabled"].(bool); ok { + sites[i].IsV1Enabled = &v + } + if v, ok := site["is_v3_enabled"].(bool); ok { + sites[i].IsV3Enabled = &v + } + if v, ok := site["is_secure_site_enabled"].(bool); ok { + sites[i].IsSecureSiteEnabled = &v + } + if v, ok := site["trusted_origins"].([]interface{}); ok { + items := make([]string, len(v)) + for i, raw := range v { + items[i] = raw.(string) + } + sites[i].TrustedOrigins = &items + } + } + + return &sites, nil +} + +func unExpandSites(input []botservice.DirectLineSite) []interface{} { + sites := make([]interface{}, len(input)) + + for i, element := range input { + site := make(map[string]interface{}) + + if element.SiteName != nil { + site["site_name"] = *element.SiteName + } + + if element.Key != nil { + site["key"] = *element.Key + } + + if element.Key2 != nil { + site["key2"] = *element.Key2 + } + + if element.IsEnabled != nil { + site["is_enabled"] = *element.IsEnabled + } + + if element.IsV1Enabled != nil { + site["is_v1_enabled"] = *element.IsV1Enabled + } + + if element.IsV3Enabled != nil { + site["is_v3_enabled"] = *element.IsV3Enabled + } + + if element.IsSecureSiteEnabled != nil { + site["is_secure_site_enabled"] = *element.IsSecureSiteEnabled + } + + if element.TrustedOrigins != nil { + site["trusted_origins"] = *element.TrustedOrigins + } + + sites[i] = site + } + + return sites +} diff --git a/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go b/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go index fddc3bf6f246a..0bce701508ff2 100644 --- a/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go +++ b/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go @@ -32,6 +32,25 @@ func testAccAzureRMBotChannelDirectline_basic(t *testing.T) { }) } +func testAccAzureRMBotChannelDirectline_complete(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_bot_channel_directline", "test") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMBotChannelDirectlineDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMBotChannelDirectline_completeConfig(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMBotChannelDirectlineExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + func testAccAzureRMBotChannelDirectline_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_bot_channel_directline", "test") @@ -47,6 +66,13 @@ func testAccAzureRMBotChannelDirectline_update(t *testing.T) { ), }, data.ImportStep(), + { + Config: testAccAzureRMBotChannelDirectline_completeConfig(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMBotChannelDirectlineExists(data.ResourceName), + ), + }, + data.ImportStep(), { Config: testAccAzureRMBotChannelDirectline_basicUpdate(data), Check: resource.ComposeTestCheckFunc( @@ -127,6 +153,27 @@ resource "azurerm_bot_channel_directline" "test" { `, template) } +func testAccAzureRMBotChannelDirectline_completeConfig(data acceptance.TestData) string { + template := testAccAzureRMBotChannelsRegistration_basicConfig(data) + return fmt.Sprintf(` +%s + +resource "azurerm_bot_channel_directline" "test" { + bot_name = "${azurerm_bot_channels_registration.test.name}" + location = "${azurerm_bot_channels_registration.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + site { + site_name = "test" + is_enabled = true + is_v1_enabled = true + is_v3_enabled = true + is_secure_site_enabled = true + trusted_origins = ["https://example.com"] + } +} +`, template) +} + func testAccAzureRMBotChannelDirectline_basicUpdate(data acceptance.TestData) string { template := testAccAzureRMBotChannelsRegistration_basicConfig(data) return fmt.Sprintf(` diff --git a/azurerm/internal/services/bot/tests/resource_arm_bot_channels_registration_test.go b/azurerm/internal/services/bot/tests/resource_arm_bot_channels_registration_test.go index de8ef94f9e298..ff03fc069d7eb 100644 --- a/azurerm/internal/services/bot/tests/resource_arm_bot_channels_registration_test.go +++ b/azurerm/internal/services/bot/tests/resource_arm_bot_channels_registration_test.go @@ -26,12 +26,13 @@ func TestAccAzureRMBotChannelsRegistration(t *testing.T) { "complete": testAccAzureRMBotConnection_complete, }, "channel": { - "slackBasic": testAccAzureRMBotChannelSlack_basic, - "slackUpdate": testAccAzureRMBotChannelSlack_update, - "msteamsBasic": testAccAzureRMBotChannelMsTeams_basic, - "msteamsUpdate": testAccAzureRMBotChannelMsTeams_update, - "directlineBasic": testAccAzureRMBotChannelDirectline_basic, - "directlineUpdate": testAccAzureRMBotChannelDirectline_update, + "slackBasic": testAccAzureRMBotChannelSlack_basic, + "slackUpdate": testAccAzureRMBotChannelSlack_update, + "msteamsBasic": testAccAzureRMBotChannelMsTeams_basic, + "msteamsUpdate": testAccAzureRMBotChannelMsTeams_update, + "directlineBasic": testAccAzureRMBotChannelDirectline_basic, + "directlineComplete": testAccAzureRMBotChannelDirectline_complete, + "directlineUpdate": testAccAzureRMBotChannelDirectline_update, }, "web_app": { "basic": testAccAzureRMBotWebApp_basic, diff --git a/website/docs/r/bot_channel_directline.markdown b/website/docs/r/bot_channel_directline.markdown index 9218cc30e98ac..450ea6df254f8 100644 --- a/website/docs/r/bot_channel_directline.markdown +++ b/website/docs/r/bot_channel_directline.markdown @@ -50,7 +50,21 @@ The following arguments are supported: - `bot_name` - (Required) The name of the Bot Resource this channel will be associated with. Changing this forces a new resource to be created. -- `site` - (Optional) The sites that belong to this channel. +- `site` - (Optional) A site represents a client application that you want to connect to your bot. Multiple `site` blocks may be defined as below + +A `site` block as the following properties: + +- `site_name` - (Required) The name of the site + +- `is_enabled` - (Optional) Enables/Disables this site. Enabled by default + +- `is_v1_enabled` - (Optional) Enables v1 of the Directline protocol for this site. Enabled by default + +- `is_v3_enabled` - (Optional) Enables v3 of the Directline protocol for this site. Enabled by default + +- `is_secure_site_enabled` - (Optional) Enables additional security measures for this site, see [Enhanced Directline Authentication Features](https://blog.botframework.com/2018/09/25/enhanced-direct-line-authentication-features). Disabled by default. + +- `trusted_origins` - (Optional) This field is required when `is_secure_site_enabled` is enabled. Determines which origins can establish a Directline conversation for this site. ## Attributes Reference From 0cf5e60c6bfdddc1e6ec44686c71cfae16990b38 Mon Sep 17 00:00:00 2001 From: Brent Harrison Date: Sun, 26 Jan 2020 22:53:31 +0000 Subject: [PATCH 024/498] Resolve PR feedback --- .../resource_arm_express_route_gateway.go | 2 +- ...resource_arm_express_route_gateway_test.go | 62 ++++++------------- .../r/express_route_gateway.html.markdown | 12 ++-- 3 files changed, 25 insertions(+), 51 deletions(-) diff --git a/azurerm/internal/services/network/resource_arm_express_route_gateway.go b/azurerm/internal/services/network/resource_arm_express_route_gateway.go index 789babfb476b7..e883985637eaa 100644 --- a/azurerm/internal/services/network/resource_arm_express_route_gateway.go +++ b/azurerm/internal/services/network/resource_arm_express_route_gateway.go @@ -58,7 +58,7 @@ func resourceArmExpressRouteGateway() *schema.Resource { "scale_units": { Type: schema.TypeInt, Required: true, - ValidateFunc: validation.IntBetween(1, 6), + ValidateFunc: validation.IntBetween(1, 10), }, "tags": tags.Schema(), diff --git a/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go index 15a4f1e57052a..3455c5a922ad2 100644 --- a/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go @@ -74,27 +74,15 @@ func TestAccAzureRMExpressRouteGateway_update(t *testing.T) { }, data.ImportStep(), { - Config: testAccAzureRMExpressRouteGateway_updateScaleUnits(data, 2), + Config: testAccAzureRMExpressRouteGateway_complete(data, 10), Check: resource.ComposeTestCheckFunc( testCheckAzureRMExpressRouteGatewayExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "scale_units", "2"), + resource.TestCheckResourceAttr(data.ResourceName, "scale_units", "10"), ), }, data.ImportStep(), - }, - }) -} - -func TestAccAzureRMExpressRouteGateway_tags(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_express_route_gateway", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMExpressRouteGatewayDestroy, - Steps: []resource.TestStep{ { - Config: testAccAzureRMExpressRouteGateway_tags(data), + Config: testAccAzureRMExpressRouteGateway_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMExpressRouteGatewayExists(data.ResourceName), ), @@ -167,21 +155,7 @@ resource "azurerm_express_route_gateway" "test" { `, template, data.RandomInteger) } -func testAccAzureRMExpressRouteGateway_requiresImport(data acceptance.TestData) string { - template := testAccAzureRMExpressRouteGateway_basic(data) - return fmt.Sprintf(` -%s - -resource "azurerm_express_route_gateway" "test" { - name = azurerm_express_route_gateway.test.name - resource_group_name = azurerm_express_route_gateway.test.name - location = azurerm_express_route_gateway.test.location - scale_units = 1 -} -`, template) -} - -func testAccAzureRMExpressRouteGateway_updateScaleUnits(data acceptance.TestData, scaleUnits int) string { +func testAccAzureRMExpressRouteGateway_complete(data acceptance.TestData, scaleUnits int) string { template := testAccAzureRMExpressRouteGateway_template(data) return fmt.Sprintf(` %s @@ -192,43 +166,43 @@ resource "azurerm_express_route_gateway" "test" { location = azurerm_resource_group.test.location virtual_hub_id = azurerm_virtual_hub.test.id scale_units = %d + + tags = { + Hello = "World" + } } `, template, data.RandomInteger, scaleUnits) } -func testAccAzureRMExpressRouteGateway_tags(data acceptance.TestData) string { - template := testAccAzureRMExpressRouteGateway_template(data) +func testAccAzureRMExpressRouteGateway_requiresImport(data acceptance.TestData) string { + template := testAccAzureRMExpressRouteGateway_basic(data) return fmt.Sprintf(` %s resource "azurerm_express_route_gateway" "test" { - name = "acctestER-gateway-%d" - resource_group_name = azurerm_resource_group.test.name - location = azurerm_resource_group.test.location - virtual_hub_id = azurerm_virtual_hub.test.id - scale_units = 1 - tags = { - Hello = "World" - } + name = azurerm_express_route_gateway.test.name + resource_group_name = azurerm_express_route_gateway.test.name + location = azurerm_express_route_gateway.test.location + scale_units = azurerm_express_route_gateway.test.scale_units } -`, template, data.RandomInteger) +`, template) } func testAccAzureRMExpressRouteGateway_template(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" + name = "acctestRG-express-%d" location = "%s" } resource "azurerm_virtual_wan" "test" { - name = "acctestvwan-%d" + name = "acctest-VWAN-%d" resource_group_name = azurerm_resource_group.test.name location = azurerm_resource_group.test.location } resource "azurerm_virtual_hub" "test" { - name = "acctestvhub-%d" + name = "acctest-VHUB-%d" resource_group_name = azurerm_resource_group.test.name location = azurerm_resource_group.test.location virtual_wan_id = azurerm_virtual_wan.test.id diff --git a/website/docs/r/express_route_gateway.html.markdown b/website/docs/r/express_route_gateway.html.markdown index fba48c292c7e0..a40ae80de023f 100644 --- a/website/docs/r/express_route_gateway.html.markdown +++ b/website/docs/r/express_route_gateway.html.markdown @@ -14,7 +14,7 @@ Manages an ExpressRoute gateway. ```hcl resource "azurerm_resource_group" "example" { - name = "exprtTest" + name = "example-resources" location = "West US" } @@ -49,15 +49,15 @@ resource "azurerm_express_route_gateway" "example" { The following arguments are supported: -* `name` - (Required) The name of the ExpressRoute circuit. Changing this forces a new resource to be created. +* `name` - (Required) The name of the ExpressRoute gateway. Changing this forces a new resource to be created. -* `resource_group_name` - (Required) The name of the resource group in which to create the ExpressRoute circuit. Changing this forces a new resource to be created. +* `resource_group_name` - (Required) The name of the resource group in which to create the ExpressRoute gateway. Changing this forces a new resource to be created. * `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. -* `virtual_hub_id` - (Required) The ID of a Virtual WAN within which the Virtual Hub should be created. +* `virtual_hub_id` - (Required) The ID of a Virtual HUB within which the ExpressRoute gateway should be created. -* `scale_units` - (Required) The name of the peering location and **not** the Azure resource location. +* `scale_units` - (Required) The number of scale units with which to provision the ExpressRoute gateway. Each scale unit is equal to 2Gbps, with support for up to 10 scale units (20Gbps). * `tags` - (Optional) A mapping of tags to assign to the resource. @@ -72,5 +72,5 @@ The following attributes are exported: ExpressRoute gateways can be imported using the `resource id`, e.g. ```shell -terraform import azurerm_express_route_gateway.myExpressRouteGateway /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.Network/expressRouteGateways/myExpressRouteGateway +terraform import azurerm_express_route_gateway.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.Network/expressRouteGateways/myExpressRouteGateway ``` From 26c7fa123e82d305720cad768bb21481473cf932 Mon Sep 17 00:00:00 2001 From: Brent Harrison Date: Sun, 26 Jan 2020 22:56:56 +0000 Subject: [PATCH 025/498] Resize test to reasonable size --- .../network/tests/resource_arm_express_route_gateway_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go index 3455c5a922ad2..155337c6743fa 100644 --- a/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go @@ -74,10 +74,10 @@ func TestAccAzureRMExpressRouteGateway_update(t *testing.T) { }, data.ImportStep(), { - Config: testAccAzureRMExpressRouteGateway_complete(data, 10), + Config: testAccAzureRMExpressRouteGateway_complete(data, 2), Check: resource.ComposeTestCheckFunc( testCheckAzureRMExpressRouteGatewayExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "scale_units", "10"), + resource.TestCheckResourceAttr(data.ResourceName, "scale_units", "2"), ), }, data.ImportStep(), From 88a2788596c79f43f0cd77c4919c483b1a266e0b Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Tue, 28 Jan 2020 08:54:06 -0600 Subject: [PATCH 026/498] First pass update docs post-review --- ...cheduled_query_rules_action.html.markdown} | 29 ++---- ...or_scheduled_query_rules_log.html.markdown | 54 +++++++++++ ...cheduled_query_rules_action.html.markdown} | 75 ++++------------ ...or_scheduled_query_rules_log.html.markdown | 89 +++++++++++++++++++ 4 files changed, 164 insertions(+), 83 deletions(-) rename website/docs/d/{monitor_scheduled_query_rules.html.markdown => monitor_scheduled_query_rules_action.html.markdown} (77%) create mode 100644 website/docs/d/monitor_scheduled_query_rules_log.html.markdown rename website/docs/r/{monitor_scheduled_query_rules.html.markdown => monitor_scheduled_query_rules_action.html.markdown} (69%) create mode 100644 website/docs/r/monitor_scheduled_query_rules_log.html.markdown diff --git a/website/docs/d/monitor_scheduled_query_rules.html.markdown b/website/docs/d/monitor_scheduled_query_rules_action.html.markdown similarity index 77% rename from website/docs/d/monitor_scheduled_query_rules.html.markdown rename to website/docs/d/monitor_scheduled_query_rules_action.html.markdown index d6651611d15b6..e66a2c7ff0c6b 100644 --- a/website/docs/d/monitor_scheduled_query_rules.html.markdown +++ b/website/docs/d/monitor_scheduled_query_rules_action.html.markdown @@ -1,26 +1,26 @@ --- subcategory: "Monitor" layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_monitor_scheduled_query_rules" -sidebar_current: "docs-azurerm-datasource-monitor-scheduled-query-rules" +page_title: "Azure Resource Manager: azurerm_monitor_scheduled_query_rules_action" +sidebar_current: "docs-azurerm-datasource-monitor-scheduled-query-rules-action" description: |- - Get information about the specified Scheduled Query Rule. + Get information about the specified AlertingAction Scheduled Query Rule. --- # Data Source: azurerm_monitor_scheduled_query_rules -Use this data source to access the properties of a Scheduled Query Rule. +Use this data source to access the properties of an AlertingAction Scheduled Query Rule. ## Example Usage ```hcl -data "azurerm_monitor_scheduled_query_rules" "example" { +data "azurerm_monitor_scheduled_query_rules_action" "example" { resource_group_name = "terraform-example-rg" name = "tfex-queryrule" } output "query_rule_id" { - value = "${data.azurerm_monitor_scheduled_query_rules.example.id}" + value = "${data.azurerm_monitor_scheduled_query_rules_action.example.id}" } ``` @@ -33,9 +33,7 @@ output "query_rule_id" { * `id` - The ID of the Scheduled Query Rule. * `azns_action` - An `azns_action` block as defined below. -* `action_type` - Must equal ether `AlertingAction` or `LogToMetricAction`. * `authorized_resources` - List of Resource IDs referred into query. -* `criteria` - A `criteria` block as defined below. * `data_source_id` - The resource uri over which log search query is to be run. * `description` - The description of the Scheduled Query Rule. * `enabled` - Whether this scheduled query rule is enabled. @@ -57,21 +55,6 @@ output "query_rule_id" { --- -`criteria` supports the following: - -* `dimension` - (Required) A `dimension` block as defined below. -* `metric_name` - (Required) Name of the metric. - ---- - -`dimension` supports the following: - -* `name` - (Required) Name of the dimension. -* `operator` - (Required) Operator for dimension values, - 'Include'. -* `values` - (Required) List of dimension values. - ---- - `metricTrigger` supports the following: * `metricColumn` - (Required) Evaluation of metric on a particular column. diff --git a/website/docs/d/monitor_scheduled_query_rules_log.html.markdown b/website/docs/d/monitor_scheduled_query_rules_log.html.markdown new file mode 100644 index 0000000000000..a29912472b688 --- /dev/null +++ b/website/docs/d/monitor_scheduled_query_rules_log.html.markdown @@ -0,0 +1,54 @@ +--- +subcategory: "Monitor" +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_monitor_scheduled_query_rules_log" +sidebar_current: "docs-azurerm-datasource-monitor-scheduled-query-rules-log" +description: |- + Get information about the specified LogToMetricAction Scheduled Query Rule. +--- + +# Data Source: azurerm_monitor_scheduled_query_rules_log + +Use this data source to access the properties of a LogToMetricAction Scheduled Query Rule. + +## Example Usage + +```hcl +data "azurerm_monitor_scheduled_query_rules_log" "example" { + resource_group_name = "terraform-example-rg" + name = "tfex-queryrule" +} + +output "query_rule_id" { + value = "${data.azurerm_monitor_scheduled_query_rules_log.example.id}" +} +``` + +## Argument Reference + +* `name` - (Required) Specifies the name of the Scheduled Query Rule. +* `resource_group_name` - (Required) Specifies the name of the resource group the Scheduled Query Rule is located in. + +## Attributes Reference + +* `id` - The ID of the Scheduled Query Rule. +* `criteria` - A `criteria` block as defined below. +* `data_source_id` - The resource uri over which log search query is to be run. +* `description` - The description of the Scheduled Query Rule. +* `enabled` - Whether this scheduled query rule is enabled. +* `throttling` - Time (in minutes) for which Alerts should be throttled or suppressed. + +--- + +`criteria` supports the following: + +* `dimension` - (Required) A `dimension` block as defined below. +* `metric_name` - (Required) Name of the metric. + +--- + +`dimension` supports the following: + +* `name` - (Required) Name of the dimension. +* `operator` - (Required) Operator for dimension values, - 'Include'. +* `values` - (Required) List of dimension values. diff --git a/website/docs/r/monitor_scheduled_query_rules.html.markdown b/website/docs/r/monitor_scheduled_query_rules_action.html.markdown similarity index 69% rename from website/docs/r/monitor_scheduled_query_rules.html.markdown rename to website/docs/r/monitor_scheduled_query_rules_action.html.markdown index 8d18bebe2327c..5bd69d7d22e53 100644 --- a/website/docs/r/monitor_scheduled_query_rules.html.markdown +++ b/website/docs/r/monitor_scheduled_query_rules_action.html.markdown @@ -1,15 +1,15 @@ --- subcategory: "Monitor" layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_monitor_scheduled_query_rules" -sidebar_current: "docs-azurerm-resource-monitor-scheduled-query-rules" +page_title: "Azure Resource Manager: azurerm_monitor_scheduled_query_rules_action" +sidebar_current: "docs-azurerm-resource-monitor-scheduled-query-rules-action" description: |- - Manages a Scheduled Query Rule within Azure Monitor + Manages an AlertingAction Scheduled Query Rule within Azure Monitor --- -# azurerm_monitor_action_group +# azurerm_monitor_scheduled_query_rules_action -Manages a Scheduled Query Rule within Azure Monitor. +Manages an AlertingAction Scheduled Query Rule within Azure Monitor. ## Example Usage @@ -35,12 +35,11 @@ resource "azurerm_log_analytics_workspace" "example" { } # Example: Alerting Action -resource "azurerm_scheduled_query_rule" "example" { +resource "azurerm_scheduled_query_rule_action" "example" { name = format("%s-queryrule", var.prefix) location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name - action_type = "Alerting" azns_action { action_group = [] email_subject = "Email Header" @@ -67,12 +66,11 @@ resource "azurerm_scheduled_query_rule" "example" { } # Example: Alerting Action Cross-Resource -resource "azurerm_scheduled_query_rule" "example2" { +resource "azurerm_scheduled_query_rule_action" "example2" { name = format("%s-queryrule2", var.prefix) location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name - action_type = "Alerting" authorized_resources = [azurerm_application_insights.example.id, azurerm_log_analytics_workspace.example.id] azns_action { @@ -93,26 +91,6 @@ resource "azurerm_scheduled_query_rule" "example2" { threshold = 3 } } - -# Example: LogToMetric Action -resource "azurerm_scheduled_query_rule" "example3" { - name = format("%s-queryrule3", var.prefix) - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name - - action_type = "LogToMetric" - criteria { - metric_name = "Average_% Idle Time" - dimensions { - name = "InstanceName" - operator = "Include" - values = [""] - } - } - data_source_id = azurerm_application_insights.example.id - description = "Scheduled query rule LogToMetric example" - enabled = true -} ``` ## Argument Reference @@ -121,26 +99,18 @@ The following arguments are supported: * `name` - (Required) The name of the Scheduled Query Rule. Changing this forces a new resource to be created. * `resource_group_name` - (Required) The name of the resource group in which to create the Scheduled Query Rule instance. -* `action_type` - (Required) Must equal ether `AlertingAction` or `LogToMetricAction`. * `authorized_resources` - (Optional) List of Resource IDs referred into query. +* `azns_action` - (Optional) An `azns_action` block as defined below. * `data_source_id` - (Required) The resource uri over which log search query is to be run. * `description` - (Optional) The description of the Scheduled Query Rule. * `enabled` - (Optional) Whether this scheduled query rule is enabled. Default is `true`. -* `throttling` - (Optional) Time (in minutes) for which Alerts should be throttled or suppressed. - -The following arguments are only supported when `action_type` is `AlertingAction`: - -* `azns_action` - (Optional) An `azns_action` block as defined below. -* `frequency` - (Optional) Frequency (in minutes) at which rule condition should be evaluated. Required when `action_type` is `AlertingAction`. -* `query` - (Optional) Log search query. Required when `action_type` is `AlertingAction`. -* `query_type` - (Optional) Must equal "ResultCount" for now. Required when `action_type` is `AlertingAction`. +* `frequency` - (Required) Frequency (in minutes) at which rule condition should be evaluated. +* `query` - (Required) Log search query. +* `query_type` - (Required) Must equal "ResultCount" for now. * `severity` - (Optional) Severity of the alert. Possible values include: 0, 1, 2, 3, or 4. -* `time_window` - (Optional) Time window for which data needs to be fetched for query (should be greater than or equal to `frequency`). Required when `action_type` is `AlertingAction`. -* `trigger` - (Optional) The condition that results in the alert rule being run. Required when `action_type` is `AlertingAction`. - -The following arguments are only supported when `action_type` is `LogToMetricAction`: - -* `criteria` - (Optional) A `criteria` block as defined below. Required when `action_type` is `LogToMetricAction`. +* `time_window` - (Required) Time window for which data needs to be fetched for query (should be greater than or equal to `frequency`). +* `throttling` - (Optional) Time (in minutes) for which Alerts should be throttled or suppressed. +* `trigger` - (Required) The condition that results in the alert rule being run. --- @@ -152,21 +122,6 @@ The following arguments are only supported when `action_type` is `LogToMetricAct --- -`criteria` supports the following: - -* `dimension` - (Required) A `dimension` block as defined below. -* `metric_name` - (Required) Name of the metric. - ---- - -`dimension` supports the following: - -* `name` - (Required) Name of the dimension. -* `operator` - (Required) Operator for dimension values, - 'Include'. -* `values` - (Required) List of dimension values. - ---- - `metricTrigger` supports the following: * `metricColumn` - (Required) Evaluation of metric on a particular column. @@ -195,5 +150,5 @@ The following attributes are exported: Scheduled Query Rules can be imported using the `resource id`, e.g. ```shell -terraform import azurerm_monitor_scheduled_query_rules.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.Insights/scheduledQueryRules/myrulename +terraform import azurerm_monitor_scheduled_query_rules_action.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.Insights/scheduledQueryRules/myrulename ``` diff --git a/website/docs/r/monitor_scheduled_query_rules_log.html.markdown b/website/docs/r/monitor_scheduled_query_rules_log.html.markdown new file mode 100644 index 0000000000000..a5d6895fb301c --- /dev/null +++ b/website/docs/r/monitor_scheduled_query_rules_log.html.markdown @@ -0,0 +1,89 @@ +--- +subcategory: "Monitor" +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_monitor_scheduled_query_rules_log" +sidebar_current: "docs-azurerm-resource-monitor-scheduled-query-rules-log" +description: |- + Manages a LogToMetricAction Scheduled Query Rule within Azure Monitor +--- + +# azurerm_monitor_scheduled_query_rules_log + +Manages a LogToMetricAction Scheduled Query Rule within Azure Monitor. + +## Example Usage + +```hcl +resource "azurerm_resource_group" "example" { + name = "monitoring-resources" + location = "West US" +} + +resource "azurerm_application_insights" "example" { + name = "appinsights" + location = var.location + resource_group_name = azurerm_resource_group.example.name + application_type = "web" +} + +resource "azurerm_scheduled_query_rule_log" "example3" { + name = format("%s-queryrule3", var.prefix) + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name + + criteria { + metric_name = "Average_% Idle Time" + dimensions { + name = "InstanceName" + operator = "Include" + values = [""] + } + } + data_source_id = azurerm_application_insights.example.id + description = "Scheduled query rule LogToMetric example" + enabled = true +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) The name of the Scheduled Query Rule. Changing this forces a new resource to be created. +* `resource_group_name` - (Required) The name of the resource group in which to create the Scheduled Query Rule instance. +* `criteria` - (Required) A `criteria` block as defined below. +* `data_source_id` - (Required) The resource uri over which log search query is to be run. +* `description` - (Optional) The description of the Scheduled Query Rule. +* `enabled` - (Optional) Whether this scheduled query rule is enabled. Default is `true`. +* `throttling` - (Optional) Time (in minutes) for which Alerts should be throttled or suppressed. + +--- + +`criteria` supports the following: + +* `dimension` - (Required) A `dimension` block as defined below. +* `metric_name` - (Required) Name of the metric. + +--- + +`dimension` supports the following: + +* `name` - (Required) Name of the dimension. +* `operator` - (Required) Operator for dimension values, - 'Include'. +* `values` - (Required) List of dimension values. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The ID of the Scheduled Query Rule. +* `last_updated_time` - Last time the rule was updated in IS08601 format. +* `provisioning_state` - Provisioning state of the scheduled query rule. Possible values include: 'Succeeded', 'Deploying', 'Canceled', 'Failed' + +## Import + +Scheduled Query Rules can be imported using the `resource id`, e.g. + +```shell +terraform import azurerm_monitor_scheduled_query_rules_log.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.Insights/scheduledQueryRules/myrulename +``` From 3dcea9c3a267bc4492042266973d10e99b7b1907 Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Tue, 28 Jan 2020 09:25:34 -0600 Subject: [PATCH 027/498] First pass at separating into two resources --- ...e_monitor_scheduled_query_rules_action.go} | 44 +- ...ource_monitor_scheduled_query_rules_log.go | 252 +++++++++ .../internal/services/monitor/registration.go | 30 +- ...m_monitor_scheduled_query_rules_action.go} | 185 +------ ...e_arm_monitor_scheduled_query_rules_log.go | 477 ++++++++++++++++++ ...itor_scheduled_query_rules_action_test.go} | 0 ..._monitor_scheduled_query_rules_log_test.go | 243 +++++++++ ...itor_scheduled_query_rules_action_test.go} | 75 +-- ..._monitor_scheduled_query_rules_log_test.go | 133 +++++ 9 files changed, 1164 insertions(+), 275 deletions(-) rename azurerm/internal/services/monitor/{data_source_monitor_scheduled_query_rules.go => data_source_monitor_scheduled_query_rules_action.go} (80%) create mode 100644 azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go rename azurerm/internal/services/monitor/{resource_arm_monitor_scheduled_query_rules.go => resource_arm_monitor_scheduled_query_rules_action.go} (71%) create mode 100644 azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go rename azurerm/internal/services/monitor/tests/{data_source_monitor_scheduled_query_rules_test.go => data_source_monitor_scheduled_query_rules_action_test.go} (100%) create mode 100644 azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_log_test.go rename azurerm/internal/services/monitor/tests/{resource_arm_monitor_scheduled_query_rules_test.go => resource_arm_monitor_scheduled_query_rules_action_test.go} (77%) create mode 100644 azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go diff --git a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules.go b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_action.go similarity index 80% rename from azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules.go rename to azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_action.go index 49e77b42c4398..675173520cc9f 100644 --- a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules.go +++ b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_action.go @@ -14,9 +14,9 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func dataSourceArmMonitorScheduledQueryRules() *schema.Resource { +func dataSourceArmMonitorScheduledQueryRulesAction() *schema.Resource { return &schema.Resource{ - Read: dataSourceArmMonitorScheduledQueryRulesRead, + Read: dataSourceArmMonitorScheduledQueryRulesActionRead, Timeouts: &schema.ResourceTimeout{ Read: schema.DefaultTimeout(5 * time.Minute), @@ -32,10 +32,6 @@ func dataSourceArmMonitorScheduledQueryRules() *schema.Resource { "location": azure.SchemaLocationForDataSource(), - "action_type": { - Type: schema.TypeString, - Computed: true, - }, "authorized_resources": { Type: schema.TypeSet, Computed: true, @@ -192,7 +188,7 @@ func dataSourceArmMonitorScheduledQueryRules() *schema.Resource { } } -func dataSourceArmMonitorScheduledQueryRulesRead(d *schema.ResourceData, meta interface{}) error { +func dataSourceArmMonitorScheduledQueryRulesActionRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -221,28 +217,18 @@ func dataSourceArmMonitorScheduledQueryRulesRead(d *schema.ResourceData, meta in d.Set("enabled", false) } - switch action := resp.Action.(type) { - case insights.AlertingAction: - d.Set("action_type", "Alerting") - if err = d.Set("azns_action", flattenAzureRmScheduledQueryRulesAznsAction(action.AznsAction)); err != nil { - return fmt.Errorf("Error setting `azns_action`: %+v", err) - } - severity, err := strconv.Atoi(string(action.Severity)) - if err != nil { - return fmt.Errorf("Error converting action.Severity %q in query rule %q to int (resource group %q): %+v", action.Severity, name, resourceGroup, err) - } - d.Set("severity", severity) - d.Set("throttling", action.ThrottlingInMin) - if err = d.Set("trigger", flattenAzureRmScheduledQueryRulesTrigger(action.Trigger)); err != nil { - return fmt.Errorf("Error setting `trigger`: %+v", err) - } - case insights.LogToMetricAction: - d.Set("action_type", "LogToMetric") - if err = d.Set("criteria", flattenAzureRmScheduledQueryRulesCriteria(action.Criteria)); err != nil { - return fmt.Errorf("Error setting `criteria`: %+v", err) - } - default: - return fmt.Errorf("Unknown action type in scheduled query rule %q (resource group %q): %T", name, resourceGroup, resp.Action) + var action insights.AlertingAction + if err = d.Set("azns_action", flattenAzureRmScheduledQueryRulesActionAznsAction(action.AznsAction)); err != nil { + return fmt.Errorf("Error setting `azns_action`: %+v", err) + } + severity, err := strconv.Atoi(string(action.Severity)) + if err != nil { + return fmt.Errorf("Error converting action.Severity %q in query rule %q to int (resource group %q): %+v", action.Severity, name, resourceGroup, err) + } + d.Set("severity", severity) + d.Set("throttling", action.ThrottlingInMin) + if err = d.Set("trigger", flattenAzureRmScheduledQueryRulesActionTrigger(action.Trigger)); err != nil { + return fmt.Errorf("Error setting `trigger`: %+v", err) } if schedule := resp.Schedule; schedule != nil { diff --git a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go new file mode 100644 index 0000000000000..ff14ae0516ea7 --- /dev/null +++ b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go @@ -0,0 +1,252 @@ +package monitor + +import ( + "fmt" + "time" + + "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func dataSourceArmMonitorScheduledQueryRulesLog() *schema.Resource { + return &schema.Resource{ + Read: dataSourceArmMonitorScheduledQueryRulesLogRead, + + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(5 * time.Minute), + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + }, + + "resource_group_name": azure.SchemaResourceGroupNameForDataSource(), + + "location": azure.SchemaLocationForDataSource(), + + "authorized_resources": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "azns_action": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "action_group": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "custom_webhook_payload": { + Type: schema.TypeString, + Computed: true, + }, + "email_subject": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "criteria": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "dimension": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Computed: true, + Elem: schema.TypeString, + }, + "operator": { + Type: schema.TypeString, + Computed: true, + }, + "values": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + }, + }, + }, + "metric_name": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "data_source_id": { + Type: schema.TypeString, + Computed: true, + }, + "description": { + Type: schema.TypeString, + Computed: true, + }, + "enabled": { + Type: schema.TypeBool, + Computed: true, + }, + "frequency": { + Type: schema.TypeInt, + Computed: true, + }, + "last_updated_time": { + Type: schema.TypeString, + Computed: true, + }, + "provisioning_state": { + Type: schema.TypeString, + Computed: true, + }, + "query": { + Type: schema.TypeString, + Computed: true, + }, + "query_type": { + Type: schema.TypeString, + Computed: true, + }, + "severity": { + Type: schema.TypeInt, + Computed: true, + }, + "throttling": { + Type: schema.TypeInt, + Computed: true, + }, + "time_window": { + Type: schema.TypeInt, + Computed: true, + }, + "trigger": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "metric_trigger": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "metric_column": { + Type: schema.TypeString, + Computed: true, + }, + "metric_trigger_type": { + Type: schema.TypeString, + Computed: true, + }, + "operator": { + Type: schema.TypeString, + Computed: true, + }, + "threshold": { + Type: schema.TypeFloat, + Computed: true, + }, + }, + }, + }, + "operator": { + Type: schema.TypeString, + Computed: true, + }, + "threshold": { + Type: schema.TypeFloat, + Computed: true, + }, + }, + }, + }, + + "tags": tags.SchemaDataSource(), + }, + } +} + +func dataSourceArmMonitorScheduledQueryRulesLogRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + name := d.Get("name").(string) + resourceGroup := d.Get("resource_group_name").(string) + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Error: Scheduled Query Rule %q was not found", name) + } + return fmt.Errorf("Error reading Scheduled Query Rule: %+v", err) + } + + d.SetId(*resp.ID) + d.Set("resource_group_name", resourceGroup) + if location := resp.Location; location != nil { + d.Set("location", azure.NormalizeLocation(*location)) + } + + d.Set("description", resp.Description) + if resp.Enabled == insights.True { + d.Set("enabled", true) + } else { + d.Set("enabled", false) + } + + var action insights.LogToMetricAction + if err = d.Set("criteria", flattenAzureRmScheduledQueryRulesLogCriteria(action.Criteria)); err != nil { + return fmt.Errorf("Error setting `criteria`: %+v", err) + } + + if schedule := resp.Schedule; schedule != nil { + if schedule.FrequencyInMinutes != nil { + d.Set("frequency", schedule.FrequencyInMinutes) + } + if schedule.TimeWindowInMinutes != nil { + d.Set("time_window", schedule.TimeWindowInMinutes) + } + } + + if source := resp.Source; source != nil { + if source.AuthorizedResources != nil { + d.Set("authorized_resources", utils.FlattenStringSlice(source.AuthorizedResources)) + } + if source.DataSourceID != nil { + d.Set("data_source_id", source.DataSourceID) + } + if source.Query != nil { + d.Set("query", source.Query) + } + d.Set("query_type", string(source.QueryType)) + } + + if lastUpdated := resp.LastUpdatedTime; lastUpdated != nil { + d.Set("last_updated_time", lastUpdated.Format(time.RFC3339)) + } + d.Set("provisioning_state", resp.ProvisioningState) + + return tags.FlattenAndSet(d, resp.Tags) +} diff --git a/azurerm/internal/services/monitor/registration.go b/azurerm/internal/services/monitor/registration.go index 366450fc514f1..d4aeb8e971231 100644 --- a/azurerm/internal/services/monitor/registration.go +++ b/azurerm/internal/services/monitor/registration.go @@ -14,23 +14,25 @@ func (r Registration) Name() 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_monitor_action_group": dataSourceArmMonitorActionGroup(), - "azurerm_monitor_diagnostic_categories": dataSourceArmMonitorDiagnosticCategories(), - "azurerm_monitor_log_profile": dataSourceArmMonitorLogProfile(), - "azurerm_monitor_scheduled_query_rules": dataSourceArmMonitorScheduledQueryRules()} + "azurerm_monitor_action_group": dataSourceArmMonitorActionGroup(), + "azurerm_monitor_diagnostic_categories": dataSourceArmMonitorDiagnosticCategories(), + "azurerm_monitor_log_profile": dataSourceArmMonitorLogProfile(), + "azurerm_monitor_scheduled_query_rules_action": dataSourceArmMonitorScheduledQueryRulesAction(), + "azurerm_monitor_scheduled_query_rules_log": dataSourceArmMonitorScheduledQueryRulesLog()} } // SupportedResources returns the supported Resources supported by this Service func (r Registration) SupportedResources() map[string]*schema.Resource { return map[string]*schema.Resource{ - "azurerm_autoscale_setting": resourceArmAutoScaleSetting(), - "azurerm_metric_alertrule": resourceArmMetricAlertRule(), - "azurerm_monitor_autoscale_setting": resourceArmMonitorAutoScaleSetting(), - "azurerm_monitor_action_group": resourceArmMonitorActionGroup(), - "azurerm_monitor_activity_log_alert": resourceArmMonitorActivityLogAlert(), - "azurerm_monitor_diagnostic_setting": resourceArmMonitorDiagnosticSetting(), - "azurerm_monitor_log_profile": resourceArmMonitorLogProfile(), - "azurerm_monitor_metric_alert": resourceArmMonitorMetricAlert(), - "azurerm_monitor_metric_alertrule": resourceArmMonitorMetricAlertRule(), - "azurerm_monitor_scheduled_query_rules": resourceArmMonitorScheduledQueryRules()} + "azurerm_autoscale_setting": resourceArmAutoScaleSetting(), + "azurerm_metric_alertrule": resourceArmMetricAlertRule(), + "azurerm_monitor_autoscale_setting": resourceArmMonitorAutoScaleSetting(), + "azurerm_monitor_action_group": resourceArmMonitorActionGroup(), + "azurerm_monitor_activity_log_alert": resourceArmMonitorActivityLogAlert(), + "azurerm_monitor_diagnostic_setting": resourceArmMonitorDiagnosticSetting(), + "azurerm_monitor_log_profile": resourceArmMonitorLogProfile(), + "azurerm_monitor_metric_alert": resourceArmMonitorMetricAlert(), + "azurerm_monitor_metric_alertrule": resourceArmMonitorMetricAlertRule(), + "azurerm_monitor_scheduled_query_rules_action": resourceArmMonitorScheduledQueryRulesAction(), + "azurerm_monitor_scheduled_query_rules_log": resourceArmMonitorScheduledQueryRulesLog()} } diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules.go b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_action.go similarity index 71% rename from azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules.go rename to azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_action.go index 7a924f78ac16c..ff774f53231fd 100644 --- a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules.go +++ b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_action.go @@ -20,12 +20,12 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceArmMonitorScheduledQueryRules() *schema.Resource { +func resourceArmMonitorScheduledQueryRulesAction() *schema.Resource { return &schema.Resource{ - Create: resourceArmMonitorScheduledQueryRulesCreateUpdate, - Read: resourceArmMonitorScheduledQueryRulesRead, - Update: resourceArmMonitorScheduledQueryRulesCreateUpdate, - Delete: resourceArmMonitorScheduledQueryRulesDelete, + Create: resourceArmMonitorScheduledQueryRulesActionCreateUpdate, + Read: resourceArmMonitorScheduledQueryRulesActionRead, + Update: resourceArmMonitorScheduledQueryRulesActionCreateUpdate, + Delete: resourceArmMonitorScheduledQueryRulesActionDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, }, @@ -49,14 +49,6 @@ func resourceArmMonitorScheduledQueryRules() *schema.Resource { "location": azure.SchemaLocation(), - "action_type": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - "Alerting", - "LogToMetric", - }, false), - }, "authorized_resources": { Type: schema.TypeSet, Optional: true, @@ -89,44 +81,6 @@ func resourceArmMonitorScheduledQueryRules() *schema.Resource { }, }, }, - "criteria": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "dimension": { - Type: schema.TypeSet, - Required: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - }, - "operator": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - "Include", - }, false), - }, - "values": { - Type: schema.TypeList, - Required: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - }, - }, - }, - "metric_name": { - Type: schema.TypeString, - Required: true, - }, - }, - }, - }, "data_source_id": { Type: schema.TypeString, Required: true, @@ -245,7 +199,7 @@ func resourceArmMonitorScheduledQueryRules() *schema.Resource { } } -func resourceArmMonitorScheduledQueryRulesCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceArmMonitorScheduledQueryRulesActionCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -262,11 +216,10 @@ func resourceArmMonitorScheduledQueryRulesCreateUpdate(d *schema.ResourceData, m } if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_monitor_scheduled_query_rules", *existing.ID) + return tf.ImportAsExistsError("azurerm_monitor_scheduled_query_rules_action", *existing.ID) } } - actionType := d.Get("action_type").(string) description := d.Get("description").(string) enabledRaw := d.Get("enabled").(bool) @@ -278,15 +231,7 @@ func resourceArmMonitorScheduledQueryRulesCreateUpdate(d *schema.ResourceData, m location := azure.NormalizeLocation(d.Get("location")) var action insights.BasicAction - switch actionType { - case "Alerting": - action = expandMonitorScheduledQueryRulesAlertingAction(d) - case "LogToMetric": - action = expandMonitorScheduledQueryRulesLogToMetricAction(d) - default: - return fmt.Errorf("Invalid action_type %q. Value must be either 'Alerting' or 'LogToMetric'", actionType) - } - + action = expandMonitorScheduledQueryRulesAlertingAction(d) source := expandMonitorScheduledQueryRulesSource(d) schedule := expandMonitorScheduledQueryRulesSchedule(d) @@ -318,10 +263,10 @@ func resourceArmMonitorScheduledQueryRulesCreateUpdate(d *schema.ResourceData, m } d.SetId(*read.ID) - return resourceArmMonitorScheduledQueryRulesRead(d, meta) + return resourceArmMonitorScheduledQueryRulesActionRead(d, meta) } -func resourceArmMonitorScheduledQueryRulesRead(d *schema.ResourceData, meta interface{}) error { +func resourceArmMonitorScheduledQueryRulesActionRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -363,8 +308,7 @@ func resourceArmMonitorScheduledQueryRulesRead(d *schema.ResourceData, meta inte switch action := resp.Action.(type) { case insights.AlertingAction: - d.Set("action_type", "Alerting") - if err = d.Set("azns_action", flattenAzureRmScheduledQueryRulesAznsAction(action.AznsAction)); err != nil { + if err = d.Set("azns_action", flattenAzureRmScheduledQueryRulesActionAznsAction(action.AznsAction)); err != nil { return fmt.Errorf("Error setting `azns_action`: %+v", err) } severity, err := strconv.Atoi(string(action.Severity)) @@ -373,14 +317,9 @@ func resourceArmMonitorScheduledQueryRulesRead(d *schema.ResourceData, meta inte } d.Set("severity", severity) d.Set("throttling", action.ThrottlingInMin) - if err = d.Set("trigger", flattenAzureRmScheduledQueryRulesTrigger(action.Trigger)); err != nil { + if err = d.Set("trigger", flattenAzureRmScheduledQueryRulesActionTrigger(action.Trigger)); err != nil { return fmt.Errorf("Error setting `trigger`: %+v", err) } - case insights.LogToMetricAction: - d.Set("action_type", "LogToMetric") - if err = d.Set("criteria", flattenAzureRmScheduledQueryRulesCriteria(action.Criteria)); err != nil { - return fmt.Errorf("Error setting `criteria`: %+v", err) - } default: return fmt.Errorf("Unknown action type in scheduled query rule %q (resource group %q): %T", name, resourceGroup, resp.Action) } @@ -410,7 +349,7 @@ func resourceArmMonitorScheduledQueryRulesRead(d *schema.ResourceData, meta inte return tags.FlattenAndSet(d, resp.Tags) } -func resourceArmMonitorScheduledQueryRulesDelete(d *schema.ResourceData, meta interface{}) error { +func resourceArmMonitorScheduledQueryRulesActionDelete(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() @@ -433,13 +372,13 @@ func resourceArmMonitorScheduledQueryRulesDelete(d *schema.ResourceData, meta in func expandMonitorScheduledQueryRulesAlertingAction(d *schema.ResourceData) *insights.AlertingAction { aznsActionRaw := d.Get("azns_action").(*schema.Set).List() - aznsAction := expandMonitorScheduledQueryRulesAznsAction(aznsActionRaw) + aznsAction := expandMonitorScheduledQueryRulesActionAznsAction(aznsActionRaw) severityRaw := d.Get("severity").(int) severity := strconv.Itoa(severityRaw) throttling := d.Get("throttling").(int) triggerRaw := d.Get("trigger").(*schema.Set).List() - trigger := expandMonitorScheduledQueryRulesTrigger(triggerRaw) + trigger := expandMonitorScheduledQueryRulesActionTrigger(triggerRaw) action := insights.AlertingAction{ AznsAction: aznsAction, @@ -452,7 +391,7 @@ func expandMonitorScheduledQueryRulesAlertingAction(d *schema.ResourceData) *ins return &action } -func expandMonitorScheduledQueryRulesAznsAction(input []interface{}) *insights.AzNsActionGroup { +func expandMonitorScheduledQueryRulesActionAznsAction(input []interface{}) *insights.AzNsActionGroup { result := insights.AzNsActionGroup{} for _, item := range input { @@ -467,41 +406,6 @@ func expandMonitorScheduledQueryRulesAznsAction(input []interface{}) *insights.A return &result } -func expandMonitorScheduledQueryRulesCriteria(input []interface{}) *[]insights.Criteria { - criteria := make([]insights.Criteria, 0) - for _, item := range input { - v := item.(map[string]interface{}) - - dimensions := make([]insights.Dimension, 0) - for _, dimension := range v["dimension"].(*schema.Set).List() { - dVal := dimension.(map[string]interface{}) - dimensions = append(dimensions, insights.Dimension{ - Name: utils.String(dVal["name"].(string)), - Operator: utils.String(dVal["operator"].(string)), - Values: utils.ExpandStringSlice(dVal["values"].([]interface{})), - }) - } - - criteria = append(criteria, insights.Criteria{ - MetricName: utils.String(v["metric_name"].(string)), - Dimensions: &dimensions, - }) - } - return &criteria -} - -func expandMonitorScheduledQueryRulesLogToMetricAction(d *schema.ResourceData) *insights.LogToMetricAction { - criteriaRaw := d.Get("criteria").(*schema.Set).List() - criteria := expandMonitorScheduledQueryRulesCriteria(criteriaRaw) - - action := insights.LogToMetricAction{ - Criteria: criteria, - OdataType: insights.OdataTypeMicrosoftWindowsAzureManagementMonitoringAlertsModelsMicrosoftAppInsightsNexusDataContractsResourcesScheduledQueryRulesLogToMetricAction, - } - - return &action -} - func expandMonitorScheduledQueryRulesSchedule(d *schema.ResourceData) *insights.Schedule { frequency := d.Get("frequency").(int) timeWindow := d.Get("time_window").(int) @@ -514,7 +418,7 @@ func expandMonitorScheduledQueryRulesSchedule(d *schema.ResourceData) *insights. return &schedule } -func expandMonitorScheduledQueryRulesMetricTrigger(input []interface{}) *insights.LogMetricTrigger { +func expandMonitorScheduledQueryRulesActionMetricTrigger(input []interface{}) *insights.LogMetricTrigger { if len(input) == 0 { return nil } @@ -546,7 +450,7 @@ func expandMonitorScheduledQueryRulesSource(d *schema.ResourceData) *insights.So return &source } -func expandMonitorScheduledQueryRulesTrigger(input []interface{}) *insights.TriggerCondition { +func expandMonitorScheduledQueryRulesActionTrigger(input []interface{}) *insights.TriggerCondition { result := insights.TriggerCondition{} for _, item := range input { @@ -555,13 +459,13 @@ func expandMonitorScheduledQueryRulesTrigger(input []interface{}) *insights.Trig result.ThresholdOperator = insights.ConditionalOperator(v["operator"].(string)) result.Threshold = utils.Float(v["threshold"].(float64)) - result.MetricTrigger = expandMonitorScheduledQueryRulesMetricTrigger(metricTriggerRaw) + result.MetricTrigger = expandMonitorScheduledQueryRulesActionMetricTrigger(metricTriggerRaw) } return &result } -func flattenAzureRmScheduledQueryRulesAznsAction(input *insights.AzNsActionGroup) []interface{} { +func flattenAzureRmScheduledQueryRulesActionAznsAction(input *insights.AzNsActionGroup) []interface{} { result := make([]interface{}, 0) v := make(map[string]interface{}) @@ -577,50 +481,7 @@ func flattenAzureRmScheduledQueryRulesAznsAction(input *insights.AzNsActionGroup return result } -func flattenAzureRmScheduledQueryRulesCriteria(input *[]insights.Criteria) []interface{} { - result := make([]interface{}, 0) - - if input != nil { - for _, criteria := range *input { - v := make(map[string]interface{}) - - v["dimension"] = flattenAzureRmScheduledQueryRulesDimension(criteria.Dimensions) - v["metric_name"] = *criteria.MetricName - - result = append(result, v) - } - } - - return result -} - -func flattenAzureRmScheduledQueryRulesDimension(input *[]insights.Dimension) []interface{} { - result := make([]interface{}, 0) - - if input != nil { - for _, dimension := range *input { - v := make(map[string]interface{}) - - if dimension.Name != nil { - v["name"] = *dimension.Name - } - - if dimension.Operator != nil { - v["operator"] = *dimension.Operator - } - - if dimension.Values != nil { - v["values"] = *dimension.Values - } - - result = append(result, v) - } - } - - return result -} - -func flattenAzureRmScheduledQueryRulesMetricTrigger(input *insights.LogMetricTrigger) []interface{} { +func flattenAzureRmScheduledQueryRulesActionMetricTrigger(input *insights.LogMetricTrigger) []interface{} { result := make(map[string]interface{}) if input == nil { @@ -641,7 +502,7 @@ func flattenAzureRmScheduledQueryRulesMetricTrigger(input *insights.LogMetricTri return []interface{}{result} } -func flattenAzureRmScheduledQueryRulesTrigger(input *insights.TriggerCondition) []interface{} { +func flattenAzureRmScheduledQueryRulesActionTrigger(input *insights.TriggerCondition) []interface{} { result := make(map[string]interface{}) result["operator"] = string(input.ThresholdOperator) @@ -651,7 +512,7 @@ func flattenAzureRmScheduledQueryRulesTrigger(input *insights.TriggerCondition) } if input.MetricTrigger != nil { - result["metric_trigger"] = flattenAzureRmScheduledQueryRulesMetricTrigger(input.MetricTrigger) + result["metric_trigger"] = flattenAzureRmScheduledQueryRulesActionMetricTrigger(input.MetricTrigger) } return []interface{}{result} diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go new file mode 100644 index 0000000000000..1167d81da80e2 --- /dev/null +++ b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go @@ -0,0 +1,477 @@ +package monitor + +import ( + "fmt" + "log" + "time" + + "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" + "github.com/hashicorp/go-azure-helpers/response" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmMonitorScheduledQueryRulesLog() *schema.Resource { + return &schema.Resource{ + Create: resourceArmMonitorScheduledQueryRulesLogCreateUpdate, + Read: resourceArmMonitorScheduledQueryRulesLogRead, + Update: resourceArmMonitorScheduledQueryRulesLogCreateUpdate, + Delete: resourceArmMonitorScheduledQueryRulesLogDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(30 * time.Minute), + Read: schema.DefaultTimeout(5 * time.Minute), + Update: schema.DefaultTimeout(30 * time.Minute), + Delete: schema.DefaultTimeout(30 * time.Minute), + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validate.NoEmptyStrings, + }, + + "resource_group_name": azure.SchemaResourceGroupName(), + + "location": azure.SchemaLocation(), + + "authorized_resources": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "azns_action": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "action_group": { + Type: schema.TypeSet, + Required: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "custom_webhook_payload": { + Type: schema.TypeString, + Optional: true, + Default: "{}", + ValidateFunc: validation.ValidateJsonString, + }, + "email_subject": { + Type: schema.TypeString, + Optional: true, + }, + }, + }, + }, + "criteria": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "dimension": { + Type: schema.TypeSet, + Required: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + }, + "operator": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + "Include", + }, false), + }, + "values": { + Type: schema.TypeList, + Required: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + }, + }, + }, + "metric_name": { + Type: schema.TypeString, + Required: true, + }, + }, + }, + }, + "data_source_id": { + Type: schema.TypeString, + Required: true, + ValidateFunc: azure.ValidateResourceID, + }, + "description": { + Type: schema.TypeString, + Optional: true, + }, + "enabled": { + Type: schema.TypeBool, + Optional: true, + Default: true, + }, + "frequency": { + Type: schema.TypeInt, + Optional: true, + }, + "last_updated_time": { + Type: schema.TypeString, + Computed: true, + }, + "provisioning_state": { + Type: schema.TypeString, + Computed: true, + }, + "query": { + Type: schema.TypeString, + Optional: true, + }, + "query_type": { + Type: schema.TypeString, + Optional: true, + Default: "ResultCount", + ValidateFunc: validation.StringInSlice([]string{ + "ResultCount", + }, false), + }, + "severity": { + Type: schema.TypeInt, + Optional: true, + ValidateFunc: validation.IntInSlice([]int{ + 0, + 1, + 2, + 3, + 4, + }), + }, + "throttling": { + Type: schema.TypeInt, + Optional: true, + }, + "time_window": { + Type: schema.TypeInt, + Optional: true, + }, + "trigger": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "metric_trigger": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "metric_column": { + Type: schema.TypeString, + Required: true, + }, + "metric_trigger_type": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + "Consecutive", + "Total", + }, false), + }, + "operator": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + "GreaterThan", + "LessThan", + "Equal", + }, false), + }, + "threshold": { + Type: schema.TypeFloat, + Required: true, + ValidateFunc: validation.NoZeroValues, + }, + }, + }, + }, + "operator": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + "GreaterThan", + "LessThan", + "Equal", + }, false), + }, + "threshold": { + Type: schema.TypeFloat, + Required: true, + }, + }, + }, + }, + + "tags": tags.Schema(), + }, + } +} + +func resourceArmMonitorScheduledQueryRulesLogCreateUpdate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient + ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) + defer cancel() + + name := d.Get("name").(string) + resourceGroup := d.Get("resource_group_name").(string) + + if features.ShouldResourcesBeImported() && d.IsNewResource() { + existing, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if !utils.ResponseWasNotFound(existing.Response) { + return fmt.Errorf("Error checking for presence of existing Monitor Scheduled Query Rules %q (Resource Group %q): %s", name, resourceGroup, err) + } + } + + if existing.ID != nil && *existing.ID != "" { + return tf.ImportAsExistsError("azurerm_monitor_scheduled_query_rules_log", *existing.ID) + } + } + + description := d.Get("description").(string) + enabledRaw := d.Get("enabled").(bool) + + enabled := insights.True + if !enabledRaw { + enabled = insights.False + } + + location := azure.NormalizeLocation(d.Get("location")) + + var action insights.BasicAction + action = expandMonitorScheduledQueryRulesLogToMetricAction(d) + source := expandMonitorScheduledQueryRulesSource(d) + schedule := expandMonitorScheduledQueryRulesSchedule(d) + + t := d.Get("tags").(map[string]interface{}) + expandedTags := tags.Expand(t) + + parameters := insights.LogSearchRuleResource{ + Location: utils.String(location), + LogSearchRule: &insights.LogSearchRule{ + Description: utils.String(description), + Enabled: enabled, + Source: source, + Schedule: schedule, + Action: action, + }, + Tags: expandedTags, + } + + if _, err := client.CreateOrUpdate(ctx, resourceGroup, name, parameters); err != nil { + return fmt.Errorf("Error creating or updating scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) + } + + read, err := client.Get(ctx, resourceGroup, name) + if err != nil { + return err + } + if read.ID == nil { + return fmt.Errorf("Scheduled query rule %q (resource group %q) ID is empty", name, resourceGroup) + } + d.SetId(*read.ID) + + return resourceArmMonitorScheduledQueryRulesLogRead(d, meta) +} + +func resourceArmMonitorScheduledQueryRulesLogRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := azure.ParseAzureResourceID(d.Id()) + if err != nil { + return err + } + resourceGroup := id.ResourceGroup + name := id.Path["scheduledqueryrules"] + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + log.Printf("[DEBUG] Scheduled Query Rule %q was not found in Resource Group %q - removing from state!", name, resourceGroup) + d.SetId("") + return nil + } + return fmt.Errorf("Error getting scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) + } + + d.Set("name", name) + d.Set("resource_group_name", resourceGroup) + if location := resp.Location; location != nil { + d.Set("location", azure.NormalizeLocation(*location)) + } + if lastUpdated := resp.LastUpdatedTime; lastUpdated != nil { + d.Set("last_updated_time", lastUpdated.Format(time.RFC3339)) + } + d.Set("provisioning_state", resp.ProvisioningState) + + if resp.Enabled == insights.True { + d.Set("enabled", true) + } else { + d.Set("enabled", false) + } + + d.Set("description", resp.Description) + + switch action := resp.Action.(type) { + case insights.LogToMetricAction: + if err = d.Set("criteria", flattenAzureRmScheduledQueryRulesLogCriteria(action.Criteria)); err != nil { + return fmt.Errorf("Error setting `criteria`: %+v", err) + } + default: + return fmt.Errorf("Unknown action type in scheduled query rule %q (resource group %q): %T", name, resourceGroup, resp.Action) + } + + if schedule := resp.Schedule; schedule != nil { + if schedule.FrequencyInMinutes != nil { + d.Set("frequency", schedule.FrequencyInMinutes) + } + if schedule.TimeWindowInMinutes != nil { + d.Set("time_window", schedule.TimeWindowInMinutes) + } + } + + if source := resp.Source; source != nil { + if source.AuthorizedResources != nil { + d.Set("authorized_resources", utils.FlattenStringSlice(source.AuthorizedResources)) + } + if source.DataSourceID != nil { + d.Set("data_source_id", source.DataSourceID) + } + if source.Query != nil { + d.Set("query", source.Query) + } + d.Set("query_type", string(source.QueryType)) + } + + return tags.FlattenAndSet(d, resp.Tags) +} + +func resourceArmMonitorScheduledQueryRulesLogDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient + ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := azure.ParseAzureResourceID(d.Id()) + if err != nil { + return err + } + resourceGroup := id.ResourceGroup + name := id.Path["scheduledqueryrules"] + + if resp, err := client.Delete(ctx, resourceGroup, name); err != nil { + if !response.WasNotFound(resp.Response) { + return fmt.Errorf("Error deleting scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) + } + } + + return nil +} + +func expandMonitorScheduledQueryRulesLogCriteria(input []interface{}) *[]insights.Criteria { + criteria := make([]insights.Criteria, 0) + for _, item := range input { + v := item.(map[string]interface{}) + + dimensions := make([]insights.Dimension, 0) + for _, dimension := range v["dimension"].(*schema.Set).List() { + dVal := dimension.(map[string]interface{}) + dimensions = append(dimensions, insights.Dimension{ + Name: utils.String(dVal["name"].(string)), + Operator: utils.String(dVal["operator"].(string)), + Values: utils.ExpandStringSlice(dVal["values"].([]interface{})), + }) + } + + criteria = append(criteria, insights.Criteria{ + MetricName: utils.String(v["metric_name"].(string)), + Dimensions: &dimensions, + }) + } + return &criteria +} + +func expandMonitorScheduledQueryRulesLogToMetricAction(d *schema.ResourceData) *insights.LogToMetricAction { + criteriaRaw := d.Get("criteria").(*schema.Set).List() + criteria := expandMonitorScheduledQueryRulesLogCriteria(criteriaRaw) + + action := insights.LogToMetricAction{ + Criteria: criteria, + OdataType: insights.OdataTypeMicrosoftWindowsAzureManagementMonitoringAlertsModelsMicrosoftAppInsightsNexusDataContractsResourcesScheduledQueryRulesLogToMetricAction, + } + + return &action +} + +func flattenAzureRmScheduledQueryRulesLogCriteria(input *[]insights.Criteria) []interface{} { + result := make([]interface{}, 0) + + if input != nil { + for _, criteria := range *input { + v := make(map[string]interface{}) + + v["dimension"] = flattenAzureRmScheduledQueryRulesLogDimension(criteria.Dimensions) + v["metric_name"] = *criteria.MetricName + + result = append(result, v) + } + } + + return result +} + +func flattenAzureRmScheduledQueryRulesLogDimension(input *[]insights.Dimension) []interface{} { + result := make([]interface{}, 0) + + if input != nil { + for _, dimension := range *input { + v := make(map[string]interface{}) + + if dimension.Name != nil { + v["name"] = *dimension.Name + } + + if dimension.Operator != nil { + v["operator"] = *dimension.Operator + } + + if dimension.Values != nil { + v["values"] = *dimension.Values + } + + result = append(result, v) + } + } + + return result +} diff --git a/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_test.go b/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_action_test.go similarity index 100% rename from azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_test.go rename to azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_action_test.go diff --git a/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_log_test.go b/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_log_test.go new file mode 100644 index 0000000000000..875fdaa762026 --- /dev/null +++ b/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_log_test.go @@ -0,0 +1,243 @@ +package tests + +import ( + "fmt" + "testing" + "time" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" +) + +func TestAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricAction(t *testing.T) { + data := acceptance.BuildTestData(t, "data.azurerm_monitor_scheduled_query_rules", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricActionConfig(data), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrSet(data.ResourceName, "id"), + ), + }, + }, + }) +} + +func TestAccDataSourceAzureRMMonitorScheduledQueryRules_alertingAction(t *testing.T) { + data := acceptance.BuildTestData(t, "data.azurerm_monitor_scheduled_query_rules", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionConfig(data), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrSet(data.ResourceName, "id"), + ), + }, + }, + }) +} + +func TestAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResource(t *testing.T) { + data := acceptance.BuildTestData(t, "data.azurerm_monitor_scheduled_query_rules", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResourceConfig(data), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrSet(data.ResourceName, "id"), + ), + }, + }, + }) +} + +func testAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricActionConfig(data acceptance.TestData) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_application_insights" "test" { + name = "acctestAppInsights-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + application_type = "web" +} + +resource "azurerm_monitor_action_group" "test" { + name = "acctestActionGroup-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + short_name = "acctestag" +} + +resource "azurerm_monitor_scheduled_query_rules" "test" { + name = "acctestsqr-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + description = "test log to metric action" + enabled = true + action_type = "LogToMetric" + + data_source_id = "${azurerm_application_insights.test.id}" + + criteria { + metric_name = "Average_%% Idle Time" + dimension { + name = "InstanceName" + operator = "Include" + values = [""] + } + } +} + +data "azurerm_monitor_scheduled_query_rules" "test" { + name = "${azurerm_monitor_scheduled_query_rules.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) +} + +func testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionConfig(data acceptance.TestData) string { + ts := time.Now().Format(time.RFC3339) + + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_log_analytics_workspace" "test" { + name = "acctestWorkspace-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku = "PerGB2018" + retention_in_days = 30 +} + +resource "azurerm_monitor_action_group" "test" { + name = "acctestActionGroup-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + short_name = "acctestag" +} + +resource "azurerm_monitor_scheduled_query_rules" "test" { + name = "acctestsqr-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + description = "test alerting action" + enabled = true + action_type = "Alerting" + + query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" + data_source_id = "${azurerm_log_analytics_workspace.test.id}" + query_type = "ResultCount" + + frequency = 60 + time_window = 60 + + severity = 3 + azns_action { + action_group = ["${azurerm_monitor_action_group.test.id}"] + email_subject = "Custom alert email subject" + } + + trigger { + operator = "GreaterThan" + threshold = 5000 + metric_trigger { + operator = "GreaterThan" + threshold = 1 + metric_trigger_type = "Total" + metric_column = "TimeGenerated" + } + } +} + +data "azurerm_monitor_scheduled_query_rules" "test" { + name = "${azurerm_monitor_scheduled_query_rules.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, ts, ts) +} + +func testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResourceConfig(data acceptance.TestData) string { + ts := time.Now().Format(time.RFC3339) + + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_log_analytics_workspace" "test" { + name = "acctestWorkspace-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku = "PerGB2018" + retention_in_days = 30 +} + +resource "azurerm_log_analytics_workspace" "test2" { + name = "acctestWorkspace2-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku = "PerGB2018" + retention_in_days = 30 +} + +resource "azurerm_monitor_action_group" "test" { + name = "acctestActionGroup-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + short_name = "acctestag" +} + +resource "azurerm_monitor_scheduled_query_rules" "test" { + name = "acctestSqr-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + description = "test alerting action" + enabled = true + action_type = "Alerting" + + query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" + data_source_id = "${azurerm_log_analytics_workspace.test.id}" + query_type = "ResultCount" + authorized_resources = ["${azurerm_log_analytics_workspace.test.id}", "${azurerm_log_analytics_workspace.test2.id}"] + + frequency = 60 + time_window = 60 + + severity = 3 + azns_action { + action_group = ["${azurerm_monitor_action_group.test.id}"] + email_subject = "Custom alert email subject" + } + + trigger { + operator = "GreaterThan" + threshold = 5000 + metric_trigger { + operator = "GreaterThan" + threshold = 1 + metric_trigger_type = "Total" + metric_column = "TimeGenerated" + } + } +} + +data "azurerm_monitor_scheduled_query_rules" "test" { + name = "${azurerm_monitor_scheduled_query_rules.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, ts, ts) +} diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_action_test.go similarity index 77% rename from azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_test.go rename to azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_action_test.go index 357a8ba2b0f94..1bb822ff80a20 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_action_test.go @@ -13,7 +13,7 @@ import ( ) func TestAccAzureRMMonitorScheduledQueryRules_AlertingAction(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules", "test") + data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules_action", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -36,7 +36,7 @@ func TestAccAzureRMMonitorScheduledQueryRules_AlertingAction(t *testing.T) { } func TestAccAzureRMMonitorScheduledQueryRules_AlertingActionCrossResource(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules", "test") + data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules_action", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -58,29 +58,6 @@ func TestAccAzureRMMonitorScheduledQueryRules_AlertingActionCrossResource(t *tes }) } -func TestAccAzureRMMonitorScheduledQueryRules_LogToMetricAction(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMMonitorScheduledQueryRules_logToMetricAction(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMonitorScheduledQueryRulesExists(data.ResourceName), - ), - }, - { - ResourceName: data.ResourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - func testAccAzureRMMonitorScheduledQueryRules_alertingAction(data acceptance.TestData) string { ts := time.Now().Format(time.RFC3339) @@ -103,7 +80,7 @@ resource "azurerm_monitor_action_group" "test" { short_name = "acctestag" } -resource "azurerm_monitor_scheduled_query_rules" "test" { +resource "azurerm_monitor_scheduled_query_rules_action" "test" { name = "acctestsqr-%d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" @@ -167,7 +144,7 @@ resource "azurerm_monitor_action_group" "test" { short_name = "acctestag" } -resource "azurerm_monitor_scheduled_query_rules" "test" { +resource "azurerm_monitor_scheduled_query_rules_action" "test" { name = "acctestsqr-%d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" @@ -197,54 +174,12 @@ resource "azurerm_monitor_scheduled_query_rules" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) } -func testAccAzureRMMonitorScheduledQueryRules_logToMetricAction(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_application_insights" "test" { - name = "acctestAppInsights-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - application_type = "web" -} - -resource "azurerm_monitor_action_group" "test" { - name = "acctestActionGroup-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - short_name = "acctestag" -} - -resource "azurerm_monitor_scheduled_query_rules" "test" { - name = "acctestsqr-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - description = "test log to metric action" - enabled = true - action_type = "LogToMetric" - - data_source_id = "${azurerm_application_insights.test.id}" - - criteria { - metric_name = "Average_%% Idle Time" - dimension { - name = "InstanceName" - operator = "Include" - values = [""] - } - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - func testCheckAzureRMMonitorScheduledQueryRulesDestroy(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).Monitor.ScheduledQueryRulesClient ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_monitor_scheduled_query_rules" { + if rs.Type != "azurerm_monitor_scheduled_query_rules_action" { continue } diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go new file mode 100644 index 0000000000000..069f41ae89e72 --- /dev/null +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go @@ -0,0 +1,133 @@ +package tests + +import ( + "fmt" + "net/http" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" +) + +func TestAccAzureRMMonitorScheduledQueryRules_LogToMetricAction(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules_log", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMMonitorScheduledQueryRules_logToMetricAction(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMonitorScheduledQueryRulesExists(data.ResourceName), + ), + }, + { + ResourceName: data.ResourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccAzureRMMonitorScheduledQueryRules_logToMetricAction(data acceptance.TestData) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_application_insights" "test" { + name = "acctestAppInsights-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + application_type = "web" +} + +resource "azurerm_monitor_action_group" "test" { + name = "acctestActionGroup-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + short_name = "acctestag" +} + +resource "azurerm_monitor_scheduled_query_rules_log" "test" { + name = "acctestsqr-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + description = "test log to metric action" + enabled = true + action_type = "LogToMetric" + + data_source_id = "${azurerm_application_insights.test.id}" + + criteria { + metric_name = "Average_%% Idle Time" + dimension { + name = "InstanceName" + operator = "Include" + values = [""] + } + } +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) +} + +func testCheckAzureRMMonitorScheduledQueryRulesDestroy(s *terraform.State) error { + client := acceptance.AzureProvider.Meta().(*clients.Client).Monitor.ScheduledQueryRulesClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_monitor_scheduled_query_rules_log" { + continue + } + + name := rs.Primary.Attributes["name"] + resourceGroup := rs.Primary.Attributes["resource_group_name"] + + resp, err := client.Get(ctx, resourceGroup, name) + + if err != nil { + return nil + } + + if resp.StatusCode != http.StatusNotFound { + return fmt.Errorf("Activity log alert still exists:\n%#v", resp) + } + } + + return nil +} + +func testCheckAzureRMMonitorScheduledQueryRulesExists(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + // Ensure we have enough information in state to look up in API + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("Not found: %s", resourceName) + } + + name := rs.Primary.Attributes["name"] + resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] + if !hasResourceGroup { + return fmt.Errorf("Bad: no resource group found in state for Activity Log Alert Instance: %s", name) + } + + client := acceptance.AzureProvider.Meta().(*clients.Client).Monitor.ScheduledQueryRulesClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + return fmt.Errorf("Bad: Get on monitorScheduledQueryRulesClient: %+v", err) + } + + if resp.StatusCode == http.StatusNotFound { + return fmt.Errorf("Bad: Activity Log Alert Instance %q (resource group: %q) does not exist", name, resourceGroup) + } + + return nil + } +} From 27f7f4fa0ccd45f6d6a6a19bd133f02c2b2c86d3 Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Wed, 29 Jan 2020 08:45:43 -0600 Subject: [PATCH 028/498] Rename action to alert in docs --- ...onitor_scheduled_query_rules_alert.html.markdown} | 10 +++++----- ...onitor_scheduled_query_rules_alert.html.markdown} | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) rename website/docs/d/{monitor_scheduled_query_rules_action.html.markdown => monitor_scheduled_query_rules_alert.html.markdown} (92%) rename website/docs/r/{monitor_scheduled_query_rules_action.html.markdown => monitor_scheduled_query_rules_alert.html.markdown} (93%) diff --git a/website/docs/d/monitor_scheduled_query_rules_action.html.markdown b/website/docs/d/monitor_scheduled_query_rules_alert.html.markdown similarity index 92% rename from website/docs/d/monitor_scheduled_query_rules_action.html.markdown rename to website/docs/d/monitor_scheduled_query_rules_alert.html.markdown index e66a2c7ff0c6b..4d92728a89842 100644 --- a/website/docs/d/monitor_scheduled_query_rules_action.html.markdown +++ b/website/docs/d/monitor_scheduled_query_rules_alert.html.markdown @@ -1,26 +1,26 @@ --- subcategory: "Monitor" layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_monitor_scheduled_query_rules_action" -sidebar_current: "docs-azurerm-datasource-monitor-scheduled-query-rules-action" +page_title: "Azure Resource Manager: azurerm_monitor_scheduled_query_rules_alert" +sidebar_current: "docs-azurerm-datasource-monitor-scheduled-query-rules-alert" description: |- Get information about the specified AlertingAction Scheduled Query Rule. --- -# Data Source: azurerm_monitor_scheduled_query_rules +# Data Source: azurerm_monitor_scheduled_query_rules_alert Use this data source to access the properties of an AlertingAction Scheduled Query Rule. ## Example Usage ```hcl -data "azurerm_monitor_scheduled_query_rules_action" "example" { +data "azurerm_monitor_scheduled_query_rules_alert" "example" { resource_group_name = "terraform-example-rg" name = "tfex-queryrule" } output "query_rule_id" { - value = "${data.azurerm_monitor_scheduled_query_rules_action.example.id}" + value = "${data.azurerm_monitor_scheduled_query_rules_alert.example.id}" } ``` diff --git a/website/docs/r/monitor_scheduled_query_rules_action.html.markdown b/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown similarity index 93% rename from website/docs/r/monitor_scheduled_query_rules_action.html.markdown rename to website/docs/r/monitor_scheduled_query_rules_alert.html.markdown index 5bd69d7d22e53..d78cbf5c4eec9 100644 --- a/website/docs/r/monitor_scheduled_query_rules_action.html.markdown +++ b/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown @@ -1,13 +1,13 @@ --- subcategory: "Monitor" layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_monitor_scheduled_query_rules_action" -sidebar_current: "docs-azurerm-resource-monitor-scheduled-query-rules-action" +page_title: "Azure Resource Manager: azurerm_monitor_scheduled_query_rules_alert" +sidebar_current: "docs-azurerm-resource-monitor-scheduled-query-rules-alert" description: |- Manages an AlertingAction Scheduled Query Rule within Azure Monitor --- -# azurerm_monitor_scheduled_query_rules_action +# azurerm_monitor_scheduled_query_rules_alert Manages an AlertingAction Scheduled Query Rule within Azure Monitor. @@ -35,7 +35,7 @@ resource "azurerm_log_analytics_workspace" "example" { } # Example: Alerting Action -resource "azurerm_scheduled_query_rule_action" "example" { +resource "azurerm_scheduled_query_rule_alert" "example" { name = format("%s-queryrule", var.prefix) location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name @@ -66,7 +66,7 @@ resource "azurerm_scheduled_query_rule_action" "example" { } # Example: Alerting Action Cross-Resource -resource "azurerm_scheduled_query_rule_action" "example2" { +resource "azurerm_scheduled_query_rule_alert" "example2" { name = format("%s-queryrule2", var.prefix) location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name @@ -150,5 +150,5 @@ The following attributes are exported: Scheduled Query Rules can be imported using the `resource id`, e.g. ```shell -terraform import azurerm_monitor_scheduled_query_rules_action.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.Insights/scheduledQueryRules/myrulename +terraform import azurerm_monitor_scheduled_query_rules_alert.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.Insights/scheduledQueryRules/myrulename ``` From 68f55a9f71ce98fd658a3a201df293c07bd8d79b Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Fri, 31 Jan 2020 19:01:28 -0800 Subject: [PATCH 029/498] WIP Get value from provider --- azurerm/internal/features/user_flags.go | 19 +++ azurerm/internal/provider/features.go | 116 ++++++++++++++++++ azurerm/internal/provider/provider.go | 3 + .../keyvault/resource_arm_key_vault.go | 98 +++------------ 4 files changed, 156 insertions(+), 80 deletions(-) create mode 100644 azurerm/internal/features/user_flags.go create mode 100644 azurerm/internal/provider/features.go diff --git a/azurerm/internal/features/user_flags.go b/azurerm/internal/features/user_flags.go new file mode 100644 index 0000000000000..834b6bc903c37 --- /dev/null +++ b/azurerm/internal/features/user_flags.go @@ -0,0 +1,19 @@ +package features + +type UserFeatures struct { + VirtualMachine VirtualMachineFeatures + VirtualMachineScaleSet VirtualMachineScaleSetFeatures + KeyVault KeyVaultFeatures +} + +type VirtualMachineFeatures struct { + DeleteOSDiskOnDeletion bool +} + +type VirtualMachineScaleSetFeatures struct { + RollInstancesWhenRequired bool +} + +type KeyVaultFeatures struct { + PurgeSoftDeleteOnDestroy bool +} diff --git a/azurerm/internal/provider/features.go b/azurerm/internal/provider/features.go new file mode 100644 index 0000000000000..b2fc42cb05366 --- /dev/null +++ b/azurerm/internal/provider/features.go @@ -0,0 +1,116 @@ +package provider + +import ( + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" +) + +func schemaFeatures() *schema.Schema { + return &schema.Schema{ + Type: schema.TypeList, + // TODO: make this Required in 2.0 + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "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, + Required: true, + }, + }, + }, + }, + + "virtual_machine_scale_set": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "roll_instances_when_required": { + Type: schema.TypeBool, + Required: true, + }, + }, + }, + }, + + "key_vault": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "purge_soft_delete_on_destroy": { + Type: schema.TypeBool, + Required: true, + }, + }, + }, + }, + }, + }, + } +} + +func expandFeatures(input []interface{}) features.UserFeatures { + // TODO: in 2.0 when Required this can become: + //val := input[0].(map[string]interface{}) + + var val map[string]interface{} + if len(input) > 0 { + val = input[0].(map[string]interface{}) + } + + // 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: false, + }, + } + + if raw, ok := val["virtual_machine"]; ok { + items := raw.([]interface{}) + if len(items) > 0 { + virtualMachinesRaw := items[0].(map[string]interface{}) + if v, ok := virtualMachinesRaw["delete_os_disk_on_deletion"]; ok { + features.VirtualMachine.DeleteOSDiskOnDeletion = v.(bool) + } + } + } + + if raw, ok := val["virtual_machine_scale_set"]; ok { + items := raw.([]interface{}) + if len(items) > 0 { + scaleSetRaw := items[0].(map[string]interface{}) + if v, ok := scaleSetRaw["roll_instances_when_required"]; ok { + features.VirtualMachineScaleSet.RollInstancesWhenRequired = v.(bool) + } + } + } + + if raw, ok := val["key_vault"]; ok { + items := raw.([]interface{}) + if len(items) > 0 { + keyVaultRaw := items[0].(map[string]interface{}) + if v, ok := keyVaultRaw["purge_soft_delete_on_destroy"]; ok { + features.KeyVault.PurgeSoftDeleteOnDestroy = v.(bool) + } + } + } + + return features +} diff --git a/azurerm/internal/provider/provider.go b/azurerm/internal/provider/provider.go index 6b3f8e263a1f1..44d4c8056f3d5 100644 --- a/azurerm/internal/provider/provider.go +++ b/azurerm/internal/provider/provider.go @@ -159,6 +159,8 @@ func AzureProvider() terraform.ResourceProvider { Description: "This will disable the Terraform Partner ID which is used if a custom `partner_id` isn't specified.", }, + "features": schemaFeatures(), + // Advanced feature flags "skip_credentials_validation": { Type: schema.TypeBool, @@ -282,6 +284,7 @@ func providerConfigure(p *schema.Provider) schema.ConfigureFunc { } } + const resourceProviderRegistrationErrorFmt = `Error ensuring Resource Providers are registered. Terraform automatically attempts to register the Resource Providers it supports to diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault.go b/azurerm/internal/services/keyvault/resource_arm_key_vault.go index ff00aa44c20ce..d0376f4717f1c 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault.go @@ -67,28 +67,6 @@ func resourceArmKeyVault() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), - // Remove in 2.0 - "sku": { - Type: schema.TypeList, - Optional: true, - Computed: true, - Deprecated: "This property has been deprecated in favour of the 'sku_name' property and will be removed in version 2.0 of the provider", - ConflictsWith: []string{"sku_name"}, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringInSlice([]string{ - string(keyvault.Standard), - string(keyvault.Premium), - }, false), - }, - }, - }, - }, - "sku_name": { Type: schema.TypeString, Optional: true, @@ -96,8 +74,7 @@ func resourceArmKeyVault() *schema.Resource { ValidateFunc: validation.StringInSlice([]string{ string(keyvault.Standard), string(keyvault.Premium), - // TODO: revert this in 2.0 - }, true), + }, false), }, "vault_uri": { @@ -157,22 +134,9 @@ func resourceArmKeyVault() *schema.Resource { Optional: true, }, - "enabled_for_soft_delete": { - Type: schema.TypeBool, - Optional: true, - }, - - "enabled_for_purge_protection": { - Type: schema.TypeBool, - Optional: true, - ValidateFunc: validate.BoolIsTrue(), - }, - - "purge_on_delete": { - Type: schema.TypeBool, - Optional: true, - Default: false, - ConflictsWith: []string{"enabled_for_purge_protection"}, + "soft_delete_enabled": { + Type: schema.TypeBool, + Optional: true, }, "network_acls": { @@ -224,29 +188,6 @@ func resourceArmKeyVaultCreateUpdate(d *schema.ResourceData, meta interface{}) e ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() - // Remove in 2.0 - var sku keyvault.Sku - - if inputs := d.Get("sku").([]interface{}); len(inputs) != 0 { - input := inputs[0].(map[string]interface{}) - v := input["name"].(string) - - sku = keyvault.Sku{ - Family: &armKeyVaultSkuFamily, - Name: keyvault.SkuName(v), - } - } else { - // Keep in 2.0 - sku = keyvault.Sku{ - Family: &armKeyVaultSkuFamily, - Name: keyvault.SkuName(d.Get("sku_name").(string)), - } - } - - if sku.Name == "" { - return fmt.Errorf("either 'sku_name' or 'sku' must be defined in the configuration file") - } - log.Printf("[INFO] preparing arguments for Azure ARM KeyVault creation.") name := d.Get("name").(string) @@ -265,12 +206,18 @@ func resourceArmKeyVaultCreateUpdate(d *schema.ResourceData, meta interface{}) e } } + purgeSoftDeleteOnDestroy := meta.(*clients.Client).Features.KeyVault.PurgeSoftDeleteOnDestroy + + if purgeSoftDeleteOnDestroy { + log.Printf("[INFO] purgeSoftDeleteOnDestroy is true") + } + location := azure.NormalizeLocation(d.Get("location").(string)) tenantUUID := uuid.FromStringOrNil(d.Get("tenant_id").(string)) enabledForDeployment := d.Get("enabled_for_deployment").(bool) enabledForDiskEncryption := d.Get("enabled_for_disk_encryption").(bool) enabledForTemplateDeployment := d.Get("enabled_for_template_deployment").(bool) - enabledForSoftDelete := d.Get("enabled_for_soft_delete").(bool) + enabledForSoftDelete := d.Get("soft_delete_enabled").(bool) enabledForPurgeProtection := d.Get("enabled_for_purge_protection").(bool) t := d.Get("tags").(map[string]interface{}) @@ -283,6 +230,11 @@ func resourceArmKeyVaultCreateUpdate(d *schema.ResourceData, meta interface{}) e return fmt.Errorf("Error expanding `access_policy`: %+v", policies) } + sku := keyvault.Sku{ + Family: &armKeyVaultSkuFamily, + Name: keyvault.SkuName(d.Get("sku_name").(string)), + } + parameters := keyvault.VaultCreateOrUpdateParameters{ Location: &location, Properties: &keyvault.VaultProperties{ @@ -405,16 +357,11 @@ func resourceArmKeyVaultRead(d *schema.ResourceData, meta interface{}) error { d.Set("enabled_for_deployment", props.EnabledForDeployment) d.Set("enabled_for_disk_encryption", props.EnabledForDiskEncryption) d.Set("enabled_for_template_deployment", props.EnabledForTemplateDeployment) - d.Set("enabled_for_soft_delete", props.EnableSoftDelete) + d.Set("soft_delete_enabled", props.EnableSoftDelete) d.Set("enabled_for_purge_protection", props.EnablePurgeProtection) d.Set("vault_uri", props.VaultURI) if sku := props.Sku; sku != nil { - // Remove in 2.0 - if err := d.Set("sku", flattenKeyVaultSku(sku)); err != nil { - return fmt.Errorf("Error setting 'sku' for KeyVault %q: %+v", *resp.Name, err) - } - if err := d.Set("sku_name", string(sku.Name)); err != nil { return fmt.Errorf("Error setting 'sku_name' for KeyVault %q: %+v", *resp.Name, err) } @@ -493,7 +440,7 @@ func resourceArmKeyVaultDelete(d *schema.ResourceData, meta interface{}) error { } } - if d.Get("purge_on_delete").(bool) && d.Get("enabled_for_soft_delete").(bool) && err == nil { + if d.Get("purge_on_delete").(bool) && d.Get("soft_delete_enabled").(bool) && err == nil { log.Printf("[DEBUG] KeyVault %s marked for purge, executing purge", name) location := d.Get("location").(string) @@ -512,15 +459,6 @@ func resourceArmKeyVaultDelete(d *schema.ResourceData, meta interface{}) error { return nil } -// Remove in 2.0 -func flattenKeyVaultSku(sku *keyvault.Sku) []interface{} { - result := map[string]interface{}{ - "name": string(sku.Name), - } - - return []interface{}{result} -} - func flattenKeyVaultNetworkAcls(input *keyvault.NetworkRuleSet) []interface{} { if input == nil { return []interface{}{ From 7dfdeb34ae35c43c571db2a16c8f7f39d7fb75eb Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Sat, 1 Feb 2020 11:31:08 -0600 Subject: [PATCH 030/498] Fix code review items --- ...ta_source_monitor_scheduled_query_rules.go | 96 ++++ ...ce_monitor_scheduled_query_rules_action.go | 262 --------- ...rce_monitor_scheduled_query_rules_alert.go | 147 +++++ ...ource_monitor_scheduled_query_rules_log.go | 152 +---- .../internal/services/monitor/registration.go | 32 +- ...ource_arm_monitor_scheduled_query_rules.go | 207 +++++++ ...rm_monitor_scheduled_query_rules_action.go | 519 ------------------ ...arm_monitor_scheduled_query_rules_alert.go | 336 ++++++++++++ ...e_arm_monitor_scheduled_query_rules_log.go | 323 ++--------- ...nitor_scheduled_query_rules_alert_test.go} | 92 +--- ..._monitor_scheduled_query_rules_log_test.go | 185 +------ ...nitor_scheduled_query_rules_alert_test.go} | 28 +- ..._monitor_scheduled_query_rules_log_test.go | 7 +- ..._scheduled_query_rules_alert.html.markdown | 22 +- ...or_scheduled_query_rules_log.html.markdown | 10 +- ..._scheduled_query_rules_alert.html.markdown | 14 +- 16 files changed, 895 insertions(+), 1537 deletions(-) create mode 100644 azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules.go delete mode 100644 azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_action.go create mode 100644 azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_alert.go create mode 100644 azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules.go delete mode 100644 azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_action.go create mode 100644 azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go rename azurerm/internal/services/monitor/tests/{data_source_monitor_scheduled_query_rules_action_test.go => data_source_monitor_scheduled_query_rules_alert_test.go} (65%) rename azurerm/internal/services/monitor/tests/{resource_arm_monitor_scheduled_query_rules_action_test.go => resource_arm_monitor_scheduled_query_rules_alert_test.go} (84%) diff --git a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules.go b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules.go new file mode 100644 index 0000000000000..72380eedcbd34 --- /dev/null +++ b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules.go @@ -0,0 +1,96 @@ +package monitor + +import ( + "fmt" + "strconv" + "time" + + "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func dataSourceArmMonitorScheduledQueryRulesRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + name := d.Get("name").(string) + resourceGroup := d.Get("resource_group_name").(string) + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Error: Scheduled Query Rule %q was not found", name) + } + return fmt.Errorf("Error reading Scheduled Query Rule: %+v", err) + } + + d.SetId(*resp.ID) + d.Set("resource_group_name", resourceGroup) + if location := resp.Location; location != nil { + d.Set("location", azure.NormalizeLocation(*location)) + } + + d.Set("description", resp.Description) + if resp.Enabled == insights.True { + d.Set("enabled", true) + } else { + d.Set("enabled", false) + } + + switch action := resp.Action.(type) { + case insights.AlertingAction: + if err = d.Set("action", flattenAzureRmScheduledQueryRulesAlertAction(action.AznsAction)); err != nil { + return fmt.Errorf("Error setting `action`: %+v", err) + } + severity, err := strconv.Atoi(string(action.Severity)) + if err != nil { + return fmt.Errorf("Error converting action.Severity %q in query rule %q to int (resource group %q): %+v", action.Severity, name, resourceGroup, err) + } + d.Set("severity", severity) + d.Set("throttling", action.ThrottlingInMin) + if err = d.Set("trigger", flattenAzureRmScheduledQueryRulesAlertTrigger(action.Trigger)); err != nil { + return fmt.Errorf("Error setting `trigger`: %+v", err) + } + case insights.LogToMetricAction: + if err = d.Set("criteria", flattenAzureRmScheduledQueryRulesLogCriteria(action.Criteria)); err != nil { + return fmt.Errorf("Error setting `criteria`: %+v", err) + } + default: + return fmt.Errorf("Unknown action type in scheduled query rule %q (resource group %q): %T", name, resourceGroup, resp.Action) + } + + if schedule := resp.Schedule; schedule != nil { + if schedule.FrequencyInMinutes != nil { + d.Set("frequency", schedule.FrequencyInMinutes) + } + if schedule.TimeWindowInMinutes != nil { + d.Set("time_window", schedule.TimeWindowInMinutes) + } + } + + if source := resp.Source; source != nil { + if source.AuthorizedResources != nil { + d.Set("authorized_resource_ids", utils.FlattenStringSlice(source.AuthorizedResources)) + } + if source.DataSourceID != nil { + d.Set("data_source_id", source.DataSourceID) + } + if source.Query != nil { + d.Set("query", source.Query) + } + d.Set("query_type", string(source.QueryType)) + } + + if lastUpdated := resp.LastUpdatedTime; lastUpdated != nil { + d.Set("last_updated_time", lastUpdated.Format(time.RFC3339)) + } + d.Set("provisioning_state", resp.ProvisioningState) + + return tags.FlattenAndSet(d, resp.Tags) +} diff --git a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_action.go b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_action.go deleted file mode 100644 index 675173520cc9f..0000000000000 --- a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_action.go +++ /dev/null @@ -1,262 +0,0 @@ -package monitor - -import ( - "fmt" - "strconv" - "time" - - "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func dataSourceArmMonitorScheduledQueryRulesAction() *schema.Resource { - return &schema.Resource{ - Read: dataSourceArmMonitorScheduledQueryRulesActionRead, - - Timeouts: &schema.ResourceTimeout{ - Read: schema.DefaultTimeout(5 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - }, - - "resource_group_name": azure.SchemaResourceGroupNameForDataSource(), - - "location": azure.SchemaLocationForDataSource(), - - "authorized_resources": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - "azns_action": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "action_group": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - "custom_webhook_payload": { - Type: schema.TypeString, - Computed: true, - }, - "email_subject": { - Type: schema.TypeString, - Computed: true, - }, - }, - }, - }, - "criteria": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "dimension": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Computed: true, - Elem: schema.TypeString, - }, - "operator": { - Type: schema.TypeString, - Computed: true, - }, - "values": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - }, - }, - }, - "metric_name": { - Type: schema.TypeString, - Computed: true, - }, - }, - }, - }, - "data_source_id": { - Type: schema.TypeString, - Computed: true, - }, - "description": { - Type: schema.TypeString, - Computed: true, - }, - "enabled": { - Type: schema.TypeBool, - Computed: true, - }, - "frequency": { - Type: schema.TypeInt, - Computed: true, - }, - "last_updated_time": { - Type: schema.TypeString, - Computed: true, - }, - "provisioning_state": { - Type: schema.TypeString, - Computed: true, - }, - "query": { - Type: schema.TypeString, - Computed: true, - }, - "query_type": { - Type: schema.TypeString, - Computed: true, - }, - "severity": { - Type: schema.TypeInt, - Computed: true, - }, - "throttling": { - Type: schema.TypeInt, - Computed: true, - }, - "time_window": { - Type: schema.TypeInt, - Computed: true, - }, - "trigger": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "metric_trigger": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "metric_column": { - Type: schema.TypeString, - Computed: true, - }, - "metric_trigger_type": { - Type: schema.TypeString, - Computed: true, - }, - "operator": { - Type: schema.TypeString, - Computed: true, - }, - "threshold": { - Type: schema.TypeFloat, - Computed: true, - }, - }, - }, - }, - "operator": { - Type: schema.TypeString, - Computed: true, - }, - "threshold": { - Type: schema.TypeFloat, - Computed: true, - }, - }, - }, - }, - - "tags": tags.SchemaDataSource(), - }, - } -} - -func dataSourceArmMonitorScheduledQueryRulesActionRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - name := d.Get("name").(string) - resourceGroup := d.Get("resource_group_name").(string) - - resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - return fmt.Errorf("Error: Scheduled Query Rule %q was not found", name) - } - return fmt.Errorf("Error reading Scheduled Query Rule: %+v", err) - } - - d.SetId(*resp.ID) - d.Set("resource_group_name", resourceGroup) - if location := resp.Location; location != nil { - d.Set("location", azure.NormalizeLocation(*location)) - } - - d.Set("description", resp.Description) - if resp.Enabled == insights.True { - d.Set("enabled", true) - } else { - d.Set("enabled", false) - } - - var action insights.AlertingAction - if err = d.Set("azns_action", flattenAzureRmScheduledQueryRulesActionAznsAction(action.AznsAction)); err != nil { - return fmt.Errorf("Error setting `azns_action`: %+v", err) - } - severity, err := strconv.Atoi(string(action.Severity)) - if err != nil { - return fmt.Errorf("Error converting action.Severity %q in query rule %q to int (resource group %q): %+v", action.Severity, name, resourceGroup, err) - } - d.Set("severity", severity) - d.Set("throttling", action.ThrottlingInMin) - if err = d.Set("trigger", flattenAzureRmScheduledQueryRulesActionTrigger(action.Trigger)); err != nil { - return fmt.Errorf("Error setting `trigger`: %+v", err) - } - - if schedule := resp.Schedule; schedule != nil { - if schedule.FrequencyInMinutes != nil { - d.Set("frequency", schedule.FrequencyInMinutes) - } - if schedule.TimeWindowInMinutes != nil { - d.Set("time_window", schedule.TimeWindowInMinutes) - } - } - - if source := resp.Source; source != nil { - if source.AuthorizedResources != nil { - d.Set("authorized_resources", utils.FlattenStringSlice(source.AuthorizedResources)) - } - if source.DataSourceID != nil { - d.Set("data_source_id", source.DataSourceID) - } - if source.Query != nil { - d.Set("query", source.Query) - } - d.Set("query_type", string(source.QueryType)) - } - - if lastUpdated := resp.LastUpdatedTime; lastUpdated != nil { - d.Set("last_updated_time", lastUpdated.Format(time.RFC3339)) - } - d.Set("provisioning_state", resp.ProvisioningState) - - return tags.FlattenAndSet(d, resp.Tags) -} diff --git a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_alert.go b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_alert.go new file mode 100644 index 0000000000000..c7dc42763af8b --- /dev/null +++ b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_alert.go @@ -0,0 +1,147 @@ +package monitor + +import ( + "time" + + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" +) + +func dataSourceArmMonitorScheduledQueryRulesAlert() *schema.Resource { + return &schema.Resource{ + Read: dataSourceArmMonitorScheduledQueryRulesRead, + + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(5 * time.Minute), + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + }, + + "resource_group_name": azure.SchemaResourceGroupNameForDataSource(), + + "location": azure.SchemaLocationForDataSource(), + + "authorized_resource_ids": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "action": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "action_group": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "custom_webhook_payload": { + Type: schema.TypeString, + Computed: true, + }, + "email_subject": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "data_source_id": { + Type: schema.TypeString, + Computed: true, + }, + "description": { + Type: schema.TypeString, + Computed: true, + }, + "enabled": { + Type: schema.TypeBool, + Computed: true, + }, + "frequency": { + Type: schema.TypeInt, + Computed: true, + }, + "last_updated_time": { + Type: schema.TypeString, + Computed: true, + }, + "provisioning_state": { + Type: schema.TypeString, + Computed: true, + }, + "query": { + Type: schema.TypeString, + Computed: true, + }, + "query_type": { + Type: schema.TypeString, + Computed: true, + }, + "severity": { + Type: schema.TypeInt, + Computed: true, + }, + "throttling": { + Type: schema.TypeInt, + Computed: true, + }, + "time_window": { + Type: schema.TypeInt, + Computed: true, + }, + "trigger": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "metric_trigger": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "metric_column": { + Type: schema.TypeString, + Computed: true, + }, + "metric_trigger_type": { + Type: schema.TypeString, + Computed: true, + }, + "operator": { + Type: schema.TypeString, + Computed: true, + }, + "threshold": { + Type: schema.TypeFloat, + Computed: true, + }, + }, + }, + }, + "operator": { + Type: schema.TypeString, + Computed: true, + }, + "threshold": { + Type: schema.TypeFloat, + Computed: true, + }, + }, + }, + }, + + "tags": tags.SchemaDataSource(), + }, + } +} diff --git a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go index ff14ae0516ea7..cd0853c6dc728 100644 --- a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go +++ b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go @@ -1,21 +1,16 @@ package monitor import ( - "fmt" "time" - "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func dataSourceArmMonitorScheduledQueryRulesLog() *schema.Resource { return &schema.Resource{ - Read: dataSourceArmMonitorScheduledQueryRulesLogRead, + Read: dataSourceArmMonitorScheduledQueryRulesRead, Timeouts: &schema.ResourceTimeout{ Read: schema.DefaultTimeout(5 * time.Minute), @@ -31,36 +26,13 @@ func dataSourceArmMonitorScheduledQueryRulesLog() *schema.Resource { "location": azure.SchemaLocationForDataSource(), - "authorized_resources": { + "authorized_resource_ids": { Type: schema.TypeSet, Computed: true, Elem: &schema.Schema{ Type: schema.TypeString, }, }, - "azns_action": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "action_group": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - "custom_webhook_payload": { - Type: schema.TypeString, - Computed: true, - }, - "email_subject": { - Type: schema.TypeString, - Computed: true, - }, - }, - }, - }, "criteria": { Type: schema.TypeSet, Computed: true, @@ -109,10 +81,6 @@ func dataSourceArmMonitorScheduledQueryRulesLog() *schema.Resource { Type: schema.TypeBool, Computed: true, }, - "frequency": { - Type: schema.TypeInt, - Computed: true, - }, "last_updated_time": { Type: schema.TypeString, Computed: true, @@ -129,124 +97,8 @@ func dataSourceArmMonitorScheduledQueryRulesLog() *schema.Resource { Type: schema.TypeString, Computed: true, }, - "severity": { - Type: schema.TypeInt, - Computed: true, - }, - "throttling": { - Type: schema.TypeInt, - Computed: true, - }, - "time_window": { - Type: schema.TypeInt, - Computed: true, - }, - "trigger": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "metric_trigger": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "metric_column": { - Type: schema.TypeString, - Computed: true, - }, - "metric_trigger_type": { - Type: schema.TypeString, - Computed: true, - }, - "operator": { - Type: schema.TypeString, - Computed: true, - }, - "threshold": { - Type: schema.TypeFloat, - Computed: true, - }, - }, - }, - }, - "operator": { - Type: schema.TypeString, - Computed: true, - }, - "threshold": { - Type: schema.TypeFloat, - Computed: true, - }, - }, - }, - }, "tags": tags.SchemaDataSource(), }, } } - -func dataSourceArmMonitorScheduledQueryRulesLogRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - name := d.Get("name").(string) - resourceGroup := d.Get("resource_group_name").(string) - - resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - return fmt.Errorf("Error: Scheduled Query Rule %q was not found", name) - } - return fmt.Errorf("Error reading Scheduled Query Rule: %+v", err) - } - - d.SetId(*resp.ID) - d.Set("resource_group_name", resourceGroup) - if location := resp.Location; location != nil { - d.Set("location", azure.NormalizeLocation(*location)) - } - - d.Set("description", resp.Description) - if resp.Enabled == insights.True { - d.Set("enabled", true) - } else { - d.Set("enabled", false) - } - - var action insights.LogToMetricAction - if err = d.Set("criteria", flattenAzureRmScheduledQueryRulesLogCriteria(action.Criteria)); err != nil { - return fmt.Errorf("Error setting `criteria`: %+v", err) - } - - if schedule := resp.Schedule; schedule != nil { - if schedule.FrequencyInMinutes != nil { - d.Set("frequency", schedule.FrequencyInMinutes) - } - if schedule.TimeWindowInMinutes != nil { - d.Set("time_window", schedule.TimeWindowInMinutes) - } - } - - if source := resp.Source; source != nil { - if source.AuthorizedResources != nil { - d.Set("authorized_resources", utils.FlattenStringSlice(source.AuthorizedResources)) - } - if source.DataSourceID != nil { - d.Set("data_source_id", source.DataSourceID) - } - if source.Query != nil { - d.Set("query", source.Query) - } - d.Set("query_type", string(source.QueryType)) - } - - if lastUpdated := resp.LastUpdatedTime; lastUpdated != nil { - d.Set("last_updated_time", lastUpdated.Format(time.RFC3339)) - } - d.Set("provisioning_state", resp.ProvisioningState) - - return tags.FlattenAndSet(d, resp.Tags) -} diff --git a/azurerm/internal/services/monitor/registration.go b/azurerm/internal/services/monitor/registration.go index d4aeb8e971231..495c3fbb4d4a8 100644 --- a/azurerm/internal/services/monitor/registration.go +++ b/azurerm/internal/services/monitor/registration.go @@ -14,25 +14,25 @@ func (r Registration) Name() 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_monitor_action_group": dataSourceArmMonitorActionGroup(), - "azurerm_monitor_diagnostic_categories": dataSourceArmMonitorDiagnosticCategories(), - "azurerm_monitor_log_profile": dataSourceArmMonitorLogProfile(), - "azurerm_monitor_scheduled_query_rules_action": dataSourceArmMonitorScheduledQueryRulesAction(), - "azurerm_monitor_scheduled_query_rules_log": dataSourceArmMonitorScheduledQueryRulesLog()} + "azurerm_monitor_action_group": dataSourceArmMonitorActionGroup(), + "azurerm_monitor_diagnostic_categories": dataSourceArmMonitorDiagnosticCategories(), + "azurerm_monitor_log_profile": dataSourceArmMonitorLogProfile(), + "azurerm_monitor_scheduled_query_rules_alert": dataSourceArmMonitorScheduledQueryRulesAlert(), + "azurerm_monitor_scheduled_query_rules_log": dataSourceArmMonitorScheduledQueryRulesLog()} } // SupportedResources returns the supported Resources supported by this Service func (r Registration) SupportedResources() map[string]*schema.Resource { return map[string]*schema.Resource{ - "azurerm_autoscale_setting": resourceArmAutoScaleSetting(), - "azurerm_metric_alertrule": resourceArmMetricAlertRule(), - "azurerm_monitor_autoscale_setting": resourceArmMonitorAutoScaleSetting(), - "azurerm_monitor_action_group": resourceArmMonitorActionGroup(), - "azurerm_monitor_activity_log_alert": resourceArmMonitorActivityLogAlert(), - "azurerm_monitor_diagnostic_setting": resourceArmMonitorDiagnosticSetting(), - "azurerm_monitor_log_profile": resourceArmMonitorLogProfile(), - "azurerm_monitor_metric_alert": resourceArmMonitorMetricAlert(), - "azurerm_monitor_metric_alertrule": resourceArmMonitorMetricAlertRule(), - "azurerm_monitor_scheduled_query_rules_action": resourceArmMonitorScheduledQueryRulesAction(), - "azurerm_monitor_scheduled_query_rules_log": resourceArmMonitorScheduledQueryRulesLog()} + "azurerm_autoscale_setting": resourceArmAutoScaleSetting(), + "azurerm_metric_alertrule": resourceArmMetricAlertRule(), + "azurerm_monitor_autoscale_setting": resourceArmMonitorAutoScaleSetting(), + "azurerm_monitor_action_group": resourceArmMonitorActionGroup(), + "azurerm_monitor_activity_log_alert": resourceArmMonitorActivityLogAlert(), + "azurerm_monitor_diagnostic_setting": resourceArmMonitorDiagnosticSetting(), + "azurerm_monitor_log_profile": resourceArmMonitorLogProfile(), + "azurerm_monitor_metric_alert": resourceArmMonitorMetricAlert(), + "azurerm_monitor_metric_alertrule": resourceArmMonitorMetricAlertRule(), + "azurerm_monitor_scheduled_query_rules_alert": resourceArmMonitorScheduledQueryRulesAlert(), + "azurerm_monitor_scheduled_query_rules_log": resourceArmMonitorScheduledQueryRulesLog()} } diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules.go b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules.go new file mode 100644 index 0000000000000..b7661870314a0 --- /dev/null +++ b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules.go @@ -0,0 +1,207 @@ +package monitor + +import ( + "fmt" + "log" + "strconv" + "time" + + "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" + "github.com/hashicorp/go-azure-helpers/response" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmMonitorScheduledQueryRulesCreateUpdate(d *schema.ResourceData, meta interface{}, action insights.BasicAction, schedule *insights.Schedule) error { + client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient + ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) + defer cancel() + + name := d.Get("name").(string) + resourceGroup := d.Get("resource_group_name").(string) + + if features.ShouldResourcesBeImported() && d.IsNewResource() { + existing, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if !utils.ResponseWasNotFound(existing.Response) { + return fmt.Errorf("Error checking for presence of existing Monitor Scheduled Query Rules %q (Resource Group %q): %s", name, resourceGroup, err) + } + } + + if existing.ID != nil && *existing.ID != "" { + return tf.ImportAsExistsError("azurerm_monitor_scheduled_query_rules_alert", *existing.ID) + } + } + + description := d.Get("description").(string) + enabledRaw := d.Get("enabled").(bool) + + enabled := insights.True + if !enabledRaw { + enabled = insights.False + } + + location := azure.NormalizeLocation(d.Get("location")) + + source := expandMonitorScheduledQueryRulesSource(d) + + t := d.Get("tags").(map[string]interface{}) + expandedTags := tags.Expand(t) + + parameters := insights.LogSearchRuleResource{ + Location: utils.String(location), + LogSearchRule: &insights.LogSearchRule{ + Description: utils.String(description), + Enabled: enabled, + Source: source, + Schedule: schedule, + Action: action, + }, + Tags: expandedTags, + } + + if _, err := client.CreateOrUpdate(ctx, resourceGroup, name, parameters); err != nil { + return fmt.Errorf("Error creating or updating scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) + } + + read, err := client.Get(ctx, resourceGroup, name) + if err != nil { + return err + } + if read.ID == nil { + return fmt.Errorf("Scheduled query rule %q (resource group %q) ID is empty", name, resourceGroup) + } + d.SetId(*read.ID) + + return resourceArmMonitorScheduledQueryRulesRead(d, meta) +} + +func resourceArmMonitorScheduledQueryRulesRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := azure.ParseAzureResourceID(d.Id()) + if err != nil { + return err + } + resourceGroup := id.ResourceGroup + name := id.Path["scheduledqueryrules"] + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + log.Printf("[DEBUG] Scheduled Query Rule %q was not found in Resource Group %q - removing from state!", name, resourceGroup) + d.SetId("") + return nil + } + return fmt.Errorf("Error getting scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) + } + + d.Set("name", name) + d.Set("resource_group_name", resourceGroup) + if location := resp.Location; location != nil { + d.Set("location", azure.NormalizeLocation(*location)) + } + if lastUpdated := resp.LastUpdatedTime; lastUpdated != nil { + d.Set("last_updated_time", lastUpdated.Format(time.RFC3339)) + } + d.Set("provisioning_state", resp.ProvisioningState) + + if resp.Enabled == insights.True { + d.Set("enabled", true) + } else { + d.Set("enabled", false) + } + + d.Set("description", resp.Description) + + switch action := resp.Action.(type) { + case insights.AlertingAction: + if err = d.Set("action", flattenAzureRmScheduledQueryRulesAlertAction(action.AznsAction)); err != nil { + return fmt.Errorf("Error setting `action`: %+v", err) + } + severity, err := strconv.Atoi(string(action.Severity)) + if err != nil { + return fmt.Errorf("Error converting action.Severity %q in query rule %q to int (resource group %q): %+v", action.Severity, name, resourceGroup, err) + } + d.Set("severity", severity) + d.Set("throttling", action.ThrottlingInMin) + if err = d.Set("trigger", flattenAzureRmScheduledQueryRulesAlertTrigger(action.Trigger)); err != nil { + return fmt.Errorf("Error setting `trigger`: %+v", err) + } + case insights.LogToMetricAction: + if err = d.Set("criteria", flattenAzureRmScheduledQueryRulesLogCriteria(action.Criteria)); err != nil { + return fmt.Errorf("Error setting `criteria`: %+v", err) + } + default: + return fmt.Errorf("Unknown action type in scheduled query rule %q (resource group %q): %T", name, resourceGroup, resp.Action) + } + + if schedule := resp.Schedule; schedule != nil { + if schedule.FrequencyInMinutes != nil { + d.Set("frequency", schedule.FrequencyInMinutes) + } + if schedule.TimeWindowInMinutes != nil { + d.Set("time_window", schedule.TimeWindowInMinutes) + } + } + + if source := resp.Source; source != nil { + if source.AuthorizedResources != nil { + d.Set("authorized_resource_ids", utils.FlattenStringSlice(source.AuthorizedResources)) + } + if source.DataSourceID != nil { + d.Set("data_source_id", source.DataSourceID) + } + if source.Query != nil { + d.Set("query", source.Query) + } + d.Set("query_type", string(source.QueryType)) + } + + return tags.FlattenAndSet(d, resp.Tags) +} + +func resourceArmMonitorScheduledQueryRulesDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient + ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := azure.ParseAzureResourceID(d.Id()) + if err != nil { + return err + } + resourceGroup := id.ResourceGroup + name := id.Path["scheduledqueryrules"] + + if resp, err := client.Delete(ctx, resourceGroup, name); err != nil { + if !response.WasNotFound(resp.Response) { + return fmt.Errorf("Error deleting scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) + } + } + + return nil +} + +func expandMonitorScheduledQueryRulesSource(d *schema.ResourceData) *insights.Source { + authorizedResourceIDs := d.Get("authorized_resource_ids").(*schema.Set).List() + dataSourceID := d.Get("data_source_id").(string) + query, ok := d.Get("query").(string) + source := insights.Source{ + AuthorizedResources: utils.ExpandStringSlice(authorizedResourceIDs), + DataSourceID: utils.String(dataSourceID), + QueryType: insights.ResultCount, + } + if ok { + source.Query = utils.String(query) + } + + return &source +} diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_action.go b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_action.go deleted file mode 100644 index ff774f53231fd..0000000000000 --- a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_action.go +++ /dev/null @@ -1,519 +0,0 @@ -package monitor - -import ( - "fmt" - "log" - "strconv" - "time" - - "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" - "github.com/hashicorp/go-azure-helpers/response" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmMonitorScheduledQueryRulesAction() *schema.Resource { - return &schema.Resource{ - Create: resourceArmMonitorScheduledQueryRulesActionCreateUpdate, - Read: resourceArmMonitorScheduledQueryRulesActionRead, - Update: resourceArmMonitorScheduledQueryRulesActionCreateUpdate, - Delete: resourceArmMonitorScheduledQueryRulesActionDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validate.NoEmptyStrings, - }, - - "resource_group_name": azure.SchemaResourceGroupName(), - - "location": azure.SchemaLocation(), - - "authorized_resources": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - "azns_action": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "action_group": { - Type: schema.TypeSet, - Required: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - "custom_webhook_payload": { - Type: schema.TypeString, - Optional: true, - Default: "{}", - ValidateFunc: validation.ValidateJsonString, - }, - "email_subject": { - Type: schema.TypeString, - Optional: true, - }, - }, - }, - }, - "data_source_id": { - Type: schema.TypeString, - Required: true, - ValidateFunc: azure.ValidateResourceID, - }, - "description": { - Type: schema.TypeString, - Optional: true, - }, - "enabled": { - Type: schema.TypeBool, - Optional: true, - Default: true, - }, - "frequency": { - Type: schema.TypeInt, - Optional: true, - }, - "last_updated_time": { - Type: schema.TypeString, - Computed: true, - }, - "provisioning_state": { - Type: schema.TypeString, - Computed: true, - }, - "query": { - Type: schema.TypeString, - Optional: true, - }, - "query_type": { - Type: schema.TypeString, - Optional: true, - Default: "ResultCount", - ValidateFunc: validation.StringInSlice([]string{ - "ResultCount", - }, false), - }, - "severity": { - Type: schema.TypeInt, - Optional: true, - ValidateFunc: validation.IntInSlice([]int{ - 0, - 1, - 2, - 3, - 4, - }), - }, - "throttling": { - Type: schema.TypeInt, - Optional: true, - }, - "time_window": { - Type: schema.TypeInt, - Optional: true, - }, - "trigger": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "metric_trigger": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "metric_column": { - Type: schema.TypeString, - Required: true, - }, - "metric_trigger_type": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - "Consecutive", - "Total", - }, false), - }, - "operator": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - "GreaterThan", - "LessThan", - "Equal", - }, false), - }, - "threshold": { - Type: schema.TypeFloat, - Required: true, - ValidateFunc: validation.NoZeroValues, - }, - }, - }, - }, - "operator": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - "GreaterThan", - "LessThan", - "Equal", - }, false), - }, - "threshold": { - Type: schema.TypeFloat, - Required: true, - }, - }, - }, - }, - - "tags": tags.Schema(), - }, - } -} - -func resourceArmMonitorScheduledQueryRulesActionCreateUpdate(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient - ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) - defer cancel() - - name := d.Get("name").(string) - resourceGroup := d.Get("resource_group_name").(string) - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, resourceGroup, name) - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing Monitor Scheduled Query Rules %q (Resource Group %q): %s", name, resourceGroup, err) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_monitor_scheduled_query_rules_action", *existing.ID) - } - } - - description := d.Get("description").(string) - enabledRaw := d.Get("enabled").(bool) - - enabled := insights.True - if !enabledRaw { - enabled = insights.False - } - - location := azure.NormalizeLocation(d.Get("location")) - - var action insights.BasicAction - action = expandMonitorScheduledQueryRulesAlertingAction(d) - source := expandMonitorScheduledQueryRulesSource(d) - schedule := expandMonitorScheduledQueryRulesSchedule(d) - - t := d.Get("tags").(map[string]interface{}) - expandedTags := tags.Expand(t) - - parameters := insights.LogSearchRuleResource{ - Location: utils.String(location), - LogSearchRule: &insights.LogSearchRule{ - Description: utils.String(description), - Enabled: enabled, - Source: source, - Schedule: schedule, - Action: action, - }, - Tags: expandedTags, - } - - if _, err := client.CreateOrUpdate(ctx, resourceGroup, name, parameters); err != nil { - return fmt.Errorf("Error creating or updating scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) - } - - read, err := client.Get(ctx, resourceGroup, name) - if err != nil { - return err - } - if read.ID == nil { - return fmt.Errorf("Scheduled query rule %q (resource group %q) ID is empty", name, resourceGroup) - } - d.SetId(*read.ID) - - return resourceArmMonitorScheduledQueryRulesActionRead(d, meta) -} - -func resourceArmMonitorScheduledQueryRulesActionRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - resourceGroup := id.ResourceGroup - name := id.Path["scheduledqueryrules"] - - resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - log.Printf("[DEBUG] Scheduled Query Rule %q was not found in Resource Group %q - removing from state!", name, resourceGroup) - d.SetId("") - return nil - } - return fmt.Errorf("Error getting scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) - } - - d.Set("name", name) - d.Set("resource_group_name", resourceGroup) - if location := resp.Location; location != nil { - d.Set("location", azure.NormalizeLocation(*location)) - } - if lastUpdated := resp.LastUpdatedTime; lastUpdated != nil { - d.Set("last_updated_time", lastUpdated.Format(time.RFC3339)) - } - d.Set("provisioning_state", resp.ProvisioningState) - - if resp.Enabled == insights.True { - d.Set("enabled", true) - } else { - d.Set("enabled", false) - } - - d.Set("description", resp.Description) - - switch action := resp.Action.(type) { - case insights.AlertingAction: - if err = d.Set("azns_action", flattenAzureRmScheduledQueryRulesActionAznsAction(action.AznsAction)); err != nil { - return fmt.Errorf("Error setting `azns_action`: %+v", err) - } - severity, err := strconv.Atoi(string(action.Severity)) - if err != nil { - return fmt.Errorf("Error converting action.Severity %q in query rule %q to int (resource group %q): %+v", action.Severity, name, resourceGroup, err) - } - d.Set("severity", severity) - d.Set("throttling", action.ThrottlingInMin) - if err = d.Set("trigger", flattenAzureRmScheduledQueryRulesActionTrigger(action.Trigger)); err != nil { - return fmt.Errorf("Error setting `trigger`: %+v", err) - } - default: - return fmt.Errorf("Unknown action type in scheduled query rule %q (resource group %q): %T", name, resourceGroup, resp.Action) - } - - if schedule := resp.Schedule; schedule != nil { - if schedule.FrequencyInMinutes != nil { - d.Set("frequency", schedule.FrequencyInMinutes) - } - if schedule.TimeWindowInMinutes != nil { - d.Set("time_window", schedule.TimeWindowInMinutes) - } - } - - if source := resp.Source; source != nil { - if source.AuthorizedResources != nil { - d.Set("authorized_resources", utils.FlattenStringSlice(source.AuthorizedResources)) - } - if source.DataSourceID != nil { - d.Set("data_source_id", source.DataSourceID) - } - if source.Query != nil { - d.Set("query", source.Query) - } - d.Set("query_type", string(source.QueryType)) - } - - return tags.FlattenAndSet(d, resp.Tags) -} - -func resourceArmMonitorScheduledQueryRulesActionDelete(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - resourceGroup := id.ResourceGroup - name := id.Path["scheduledqueryrules"] - - if resp, err := client.Delete(ctx, resourceGroup, name); err != nil { - if !response.WasNotFound(resp.Response) { - return fmt.Errorf("Error deleting scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) - } - } - - return nil -} - -func expandMonitorScheduledQueryRulesAlertingAction(d *schema.ResourceData) *insights.AlertingAction { - aznsActionRaw := d.Get("azns_action").(*schema.Set).List() - aznsAction := expandMonitorScheduledQueryRulesActionAznsAction(aznsActionRaw) - severityRaw := d.Get("severity").(int) - severity := strconv.Itoa(severityRaw) - throttling := d.Get("throttling").(int) - - triggerRaw := d.Get("trigger").(*schema.Set).List() - trigger := expandMonitorScheduledQueryRulesActionTrigger(triggerRaw) - - action := insights.AlertingAction{ - AznsAction: aznsAction, - Severity: insights.AlertSeverity(severity), - ThrottlingInMin: utils.Int32(int32(throttling)), - Trigger: trigger, - OdataType: insights.OdataTypeMicrosoftWindowsAzureManagementMonitoringAlertsModelsMicrosoftAppInsightsNexusDataContractsResourcesScheduledQueryRulesAlertingAction, - } - - return &action -} - -func expandMonitorScheduledQueryRulesActionAznsAction(input []interface{}) *insights.AzNsActionGroup { - result := insights.AzNsActionGroup{} - - for _, item := range input { - v := item.(map[string]interface{}) - actionGroups := v["action_group"].(*schema.Set).List() - - result.ActionGroup = utils.ExpandStringSlice(actionGroups) - result.EmailSubject = utils.String(v["email_subject"].(string)) - result.CustomWebhookPayload = utils.String(v["custom_webhook_payload"].(string)) - } - - return &result -} - -func expandMonitorScheduledQueryRulesSchedule(d *schema.ResourceData) *insights.Schedule { - frequency := d.Get("frequency").(int) - timeWindow := d.Get("time_window").(int) - - schedule := insights.Schedule{ - FrequencyInMinutes: utils.Int32(int32(frequency)), - TimeWindowInMinutes: utils.Int32(int32(timeWindow)), - } - - return &schedule -} - -func expandMonitorScheduledQueryRulesActionMetricTrigger(input []interface{}) *insights.LogMetricTrigger { - if len(input) == 0 { - return nil - } - - result := insights.LogMetricTrigger{} - for _, item := range input { - v := item.(map[string]interface{}) - result.ThresholdOperator = insights.ConditionalOperator(v["operator"].(string)) - result.Threshold = utils.Float(v["threshold"].(float64)) - result.MetricTriggerType = insights.MetricTriggerType(v["metric_trigger_type"].(string)) - result.MetricColumn = utils.String(v["metric_column"].(string)) - } - - return &result -} - -func expandMonitorScheduledQueryRulesSource(d *schema.ResourceData) *insights.Source { - authorizedResources := d.Get("authorized_resources").(*schema.Set).List() - dataSourceID := d.Get("data_source_id").(string) - query := d.Get("query").(string) - - source := insights.Source{ - AuthorizedResources: utils.ExpandStringSlice(authorizedResources), - DataSourceID: utils.String(dataSourceID), - Query: utils.String(query), - QueryType: insights.ResultCount, - } - - return &source -} - -func expandMonitorScheduledQueryRulesActionTrigger(input []interface{}) *insights.TriggerCondition { - result := insights.TriggerCondition{} - - for _, item := range input { - v := item.(map[string]interface{}) - metricTriggerRaw := v["metric_trigger"].(*schema.Set).List() - - result.ThresholdOperator = insights.ConditionalOperator(v["operator"].(string)) - result.Threshold = utils.Float(v["threshold"].(float64)) - result.MetricTrigger = expandMonitorScheduledQueryRulesActionMetricTrigger(metricTriggerRaw) - } - - return &result -} - -func flattenAzureRmScheduledQueryRulesActionAznsAction(input *insights.AzNsActionGroup) []interface{} { - result := make([]interface{}, 0) - v := make(map[string]interface{}) - - if input != nil { - if input.ActionGroup != nil { - v["action_group"] = *input.ActionGroup - } - v["email_subject"] = input.EmailSubject - v["custom_webhook_payload"] = input.CustomWebhookPayload - } - result = append(result, v) - - return result -} - -func flattenAzureRmScheduledQueryRulesActionMetricTrigger(input *insights.LogMetricTrigger) []interface{} { - result := make(map[string]interface{}) - - if input == nil { - return []interface{}{} - } - - result["operator"] = string(input.ThresholdOperator) - - if input.Threshold != nil { - result["threshold"] = *input.Threshold - } - - result["metric_trigger_type"] = string(input.MetricTriggerType) - - if input.MetricColumn != nil { - result["metric_column"] = *input.MetricColumn - } - return []interface{}{result} -} - -func flattenAzureRmScheduledQueryRulesActionTrigger(input *insights.TriggerCondition) []interface{} { - result := make(map[string]interface{}) - - result["operator"] = string(input.ThresholdOperator) - - if input.Threshold != nil { - result["threshold"] = *input.Threshold - } - - if input.MetricTrigger != nil { - result["metric_trigger"] = flattenAzureRmScheduledQueryRulesActionMetricTrigger(input.MetricTrigger) - } - - return []interface{}{result} -} diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go new file mode 100644 index 0000000000000..1a66e95f8ef03 --- /dev/null +++ b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go @@ -0,0 +1,336 @@ +package monitor + +import ( + "strconv" + "time" + + "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmMonitorScheduledQueryRulesAlert() *schema.Resource { + return &schema.Resource{ + Create: resourceArmMonitorScheduledQueryRulesAlertCreateUpdate, + Read: resourceArmMonitorScheduledQueryRulesRead, + Update: resourceArmMonitorScheduledQueryRulesAlertCreateUpdate, + Delete: resourceArmMonitorScheduledQueryRulesDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(30 * time.Minute), + Read: schema.DefaultTimeout(5 * time.Minute), + Update: schema.DefaultTimeout(30 * time.Minute), + Delete: schema.DefaultTimeout(30 * time.Minute), + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validate.NoEmptyStrings, + }, + + "resource_group_name": azure.SchemaResourceGroupName(), + + "location": azure.SchemaLocation(), + + "authorized_resource_ids": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + ValidateFunc: azure.ValidateResourceID, + }, + }, + "action": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "action_group": { + Type: schema.TypeSet, + Required: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + ValidateFunc: azure.ValidateResourceID, + }, + }, + "custom_webhook_payload": { + Type: schema.TypeString, + Optional: true, + Default: "{}", + ValidateFunc: validation.ValidateJsonString, + }, + "email_subject": { + Type: schema.TypeString, + Optional: true, + }, + }, + }, + }, + "data_source_id": { + Type: schema.TypeString, + Required: true, + ValidateFunc: azure.ValidateResourceID, + }, + "description": { + Type: schema.TypeString, + Optional: true, + }, + "enabled": { + Type: schema.TypeBool, + Optional: true, + Default: true, + }, + "frequency": { + Type: schema.TypeInt, + Optional: true, + }, + "last_updated_time": { + Type: schema.TypeString, + Computed: true, + }, + "provisioning_state": { + Type: schema.TypeString, + Computed: true, + }, + "query": { + Type: schema.TypeString, + Optional: true, + }, + "query_type": { + Type: schema.TypeString, + Optional: true, + Default: "ResultCount", + ValidateFunc: validation.StringInSlice([]string{ + "ResultCount", + }, false), + }, + "severity": { + Type: schema.TypeInt, + Optional: true, + ValidateFunc: validation.IntInSlice([]int{ + 0, + 1, + 2, + 3, + 4, + }), + }, + "throttling": { + Type: schema.TypeInt, + Optional: true, + }, + "time_window": { + Type: schema.TypeInt, + Optional: true, + }, + "trigger": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "metric_trigger": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "metric_column": { + Type: schema.TypeString, + Required: true, + }, + "metric_trigger_type": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + "Consecutive", + "Total", + }, false), + }, + "operator": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + "GreaterThan", + "LessThan", + "Equal", + }, false), + }, + "threshold": { + Type: schema.TypeFloat, + Required: true, + ValidateFunc: validation.NoZeroValues, + }, + }, + }, + }, + "operator": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice([]string{ + "GreaterThan", + "LessThan", + "Equal", + }, false), + }, + "threshold": { + Type: schema.TypeFloat, + Required: true, + }, + }, + }, + }, + + "tags": tags.Schema(), + }, + } +} + +func resourceArmMonitorScheduledQueryRulesAlertCreateUpdate(d *schema.ResourceData, meta interface{}) error { + var action insights.BasicAction + action = expandMonitorScheduledQueryRulesAlertingAction(d) + schedule := expandMonitorScheduledQueryRulesAlertSchedule(d) + + return resourceArmMonitorScheduledQueryRulesCreateUpdate(d, meta, action, schedule) +} + +func expandMonitorScheduledQueryRulesAlertingAction(d *schema.ResourceData) *insights.AlertingAction { + alertActionRaw := d.Get("action").(*schema.Set).List() + alertAction := expandMonitorScheduledQueryRulesAlertAction(alertActionRaw) + severityRaw := d.Get("severity").(int) + severity := strconv.Itoa(severityRaw) + throttling := d.Get("throttling").(int) + + triggerRaw := d.Get("trigger").(*schema.Set).List() + trigger := expandMonitorScheduledQueryRulesAlertTrigger(triggerRaw) + + action := insights.AlertingAction{ + AznsAction: alertAction, + Severity: insights.AlertSeverity(severity), + ThrottlingInMin: utils.Int32(int32(throttling)), + Trigger: trigger, + OdataType: insights.OdataTypeMicrosoftWindowsAzureManagementMonitoringAlertsModelsMicrosoftAppInsightsNexusDataContractsResourcesScheduledQueryRulesAlertingAction, + } + + return &action +} + +func expandMonitorScheduledQueryRulesAlertAction(input []interface{}) *insights.AzNsActionGroup { + result := insights.AzNsActionGroup{} + + for _, item := range input { + v := item.(map[string]interface{}) + actionGroups := v["action_group"].(*schema.Set).List() + + result.ActionGroup = utils.ExpandStringSlice(actionGroups) + result.EmailSubject = utils.String(v["email_subject"].(string)) + result.CustomWebhookPayload = utils.String(v["custom_webhook_payload"].(string)) + } + + return &result +} + +func expandMonitorScheduledQueryRulesAlertMetricTrigger(input []interface{}) *insights.LogMetricTrigger { + if len(input) == 0 { + return nil + } + + result := insights.LogMetricTrigger{} + for _, item := range input { + v := item.(map[string]interface{}) + result.ThresholdOperator = insights.ConditionalOperator(v["operator"].(string)) + result.Threshold = utils.Float(v["threshold"].(float64)) + result.MetricTriggerType = insights.MetricTriggerType(v["metric_trigger_type"].(string)) + result.MetricColumn = utils.String(v["metric_column"].(string)) + } + + return &result +} + +func expandMonitorScheduledQueryRulesAlertSchedule(d *schema.ResourceData) *insights.Schedule { + frequency := d.Get("frequency").(int) + timeWindow := d.Get("time_window").(int) + + schedule := insights.Schedule{ + FrequencyInMinutes: utils.Int32(int32(frequency)), + TimeWindowInMinutes: utils.Int32(int32(timeWindow)), + } + + return &schedule +} + +func expandMonitorScheduledQueryRulesAlertTrigger(input []interface{}) *insights.TriggerCondition { + result := insights.TriggerCondition{} + + for _, item := range input { + v := item.(map[string]interface{}) + metricTriggerRaw := v["metric_trigger"].(*schema.Set).List() + + result.ThresholdOperator = insights.ConditionalOperator(v["operator"].(string)) + result.Threshold = utils.Float(v["threshold"].(float64)) + result.MetricTrigger = expandMonitorScheduledQueryRulesAlertMetricTrigger(metricTriggerRaw) + } + + return &result +} + +func flattenAzureRmScheduledQueryRulesAlertAction(input *insights.AzNsActionGroup) []interface{} { + result := make([]interface{}, 0) + v := make(map[string]interface{}) + + if input != nil { + if input.ActionGroup != nil { + v["action_group"] = *input.ActionGroup + } + v["email_subject"] = input.EmailSubject + v["custom_webhook_payload"] = input.CustomWebhookPayload + } + result = append(result, v) + + return result +} + +func flattenAzureRmScheduledQueryRulesAlertMetricTrigger(input *insights.LogMetricTrigger) []interface{} { + result := make(map[string]interface{}) + + if input == nil { + return []interface{}{} + } + + result["operator"] = string(input.ThresholdOperator) + + if input.Threshold != nil { + result["threshold"] = *input.Threshold + } + + result["metric_trigger_type"] = string(input.MetricTriggerType) + + if input.MetricColumn != nil { + result["metric_column"] = *input.MetricColumn + } + return []interface{}{result} +} + +func flattenAzureRmScheduledQueryRulesAlertTrigger(input *insights.TriggerCondition) []interface{} { + result := make(map[string]interface{}) + + result["operator"] = string(input.ThresholdOperator) + + if input.Threshold != nil { + result["threshold"] = *input.Threshold + } + + if input.MetricTrigger != nil { + result["metric_trigger"] = flattenAzureRmScheduledQueryRulesAlertMetricTrigger(input.MetricTrigger) + } + + return []interface{}{result} +} diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go index 1167d81da80e2..a25ee0535b20d 100644 --- a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go +++ b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go @@ -1,30 +1,23 @@ package monitor import ( - "fmt" - "log" "time" "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" - "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func resourceArmMonitorScheduledQueryRulesLog() *schema.Resource { return &schema.Resource{ Create: resourceArmMonitorScheduledQueryRulesLogCreateUpdate, - Read: resourceArmMonitorScheduledQueryRulesLogRead, + Read: resourceArmMonitorScheduledQueryRulesRead, Update: resourceArmMonitorScheduledQueryRulesLogCreateUpdate, - Delete: resourceArmMonitorScheduledQueryRulesLogDelete, + Delete: resourceArmMonitorScheduledQueryRulesDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, }, @@ -48,41 +41,18 @@ func resourceArmMonitorScheduledQueryRulesLog() *schema.Resource { "location": azure.SchemaLocation(), - "authorized_resources": { + "authorized_resource_ids": { Type: schema.TypeSet, Optional: true, Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - "azns_action": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "action_group": { - Type: schema.TypeSet, - Required: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - "custom_webhook_payload": { - Type: schema.TypeString, - Optional: true, - Default: "{}", - ValidateFunc: validation.ValidateJsonString, - }, - "email_subject": { - Type: schema.TypeString, - Optional: true, - }, - }, + Type: schema.TypeString, + ValidateFunc: azure.ValidateResourceID, }, }, + "criteria": { Type: schema.TypeSet, - Optional: true, + Required: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "dimension": { @@ -91,12 +61,14 @@ func resourceArmMonitorScheduledQueryRulesLog() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "name": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: validate.NoEmptyStrings, }, "operator": { Type: schema.TypeString, - Required: true, + Optional: true, + Default: "Include", ValidateFunc: validation.StringInSlice([]string{ "Include", }, false), @@ -105,15 +77,17 @@ func resourceArmMonitorScheduledQueryRulesLog() *schema.Resource { Type: schema.TypeList, Required: true, Elem: &schema.Schema{ - Type: schema.TypeString, + Type: schema.TypeString, + ValidateFunc: validate.NoEmptyStrings, }, }, }, }, }, "metric_name": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: validate.NoEmptyStrings, }, }, }, @@ -132,10 +106,6 @@ func resourceArmMonitorScheduledQueryRulesLog() *schema.Resource { Optional: true, Default: true, }, - "frequency": { - Type: schema.TypeInt, - Optional: true, - }, "last_updated_time": { Type: schema.TypeString, Computed: true, @@ -144,92 +114,6 @@ func resourceArmMonitorScheduledQueryRulesLog() *schema.Resource { Type: schema.TypeString, Computed: true, }, - "query": { - Type: schema.TypeString, - Optional: true, - }, - "query_type": { - Type: schema.TypeString, - Optional: true, - Default: "ResultCount", - ValidateFunc: validation.StringInSlice([]string{ - "ResultCount", - }, false), - }, - "severity": { - Type: schema.TypeInt, - Optional: true, - ValidateFunc: validation.IntInSlice([]int{ - 0, - 1, - 2, - 3, - 4, - }), - }, - "throttling": { - Type: schema.TypeInt, - Optional: true, - }, - "time_window": { - Type: schema.TypeInt, - Optional: true, - }, - "trigger": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "metric_trigger": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "metric_column": { - Type: schema.TypeString, - Required: true, - }, - "metric_trigger_type": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - "Consecutive", - "Total", - }, false), - }, - "operator": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - "GreaterThan", - "LessThan", - "Equal", - }, false), - }, - "threshold": { - Type: schema.TypeFloat, - Required: true, - ValidateFunc: validation.NoZeroValues, - }, - }, - }, - }, - "operator": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - "GreaterThan", - "LessThan", - "Equal", - }, false), - }, - "threshold": { - Type: schema.TypeFloat, - Required: true, - }, - }, - }, - }, "tags": tags.Schema(), }, @@ -237,165 +121,9 @@ func resourceArmMonitorScheduledQueryRulesLog() *schema.Resource { } func resourceArmMonitorScheduledQueryRulesLogCreateUpdate(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient - ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) - defer cancel() - - name := d.Get("name").(string) - resourceGroup := d.Get("resource_group_name").(string) - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, resourceGroup, name) - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing Monitor Scheduled Query Rules %q (Resource Group %q): %s", name, resourceGroup, err) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_monitor_scheduled_query_rules_log", *existing.ID) - } - } - - description := d.Get("description").(string) - enabledRaw := d.Get("enabled").(bool) - - enabled := insights.True - if !enabledRaw { - enabled = insights.False - } - - location := azure.NormalizeLocation(d.Get("location")) - - var action insights.BasicAction - action = expandMonitorScheduledQueryRulesLogToMetricAction(d) - source := expandMonitorScheduledQueryRulesSource(d) - schedule := expandMonitorScheduledQueryRulesSchedule(d) + action := expandMonitorScheduledQueryRulesLogToMetricAction(d) - t := d.Get("tags").(map[string]interface{}) - expandedTags := tags.Expand(t) - - parameters := insights.LogSearchRuleResource{ - Location: utils.String(location), - LogSearchRule: &insights.LogSearchRule{ - Description: utils.String(description), - Enabled: enabled, - Source: source, - Schedule: schedule, - Action: action, - }, - Tags: expandedTags, - } - - if _, err := client.CreateOrUpdate(ctx, resourceGroup, name, parameters); err != nil { - return fmt.Errorf("Error creating or updating scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) - } - - read, err := client.Get(ctx, resourceGroup, name) - if err != nil { - return err - } - if read.ID == nil { - return fmt.Errorf("Scheduled query rule %q (resource group %q) ID is empty", name, resourceGroup) - } - d.SetId(*read.ID) - - return resourceArmMonitorScheduledQueryRulesLogRead(d, meta) -} - -func resourceArmMonitorScheduledQueryRulesLogRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - resourceGroup := id.ResourceGroup - name := id.Path["scheduledqueryrules"] - - resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - log.Printf("[DEBUG] Scheduled Query Rule %q was not found in Resource Group %q - removing from state!", name, resourceGroup) - d.SetId("") - return nil - } - return fmt.Errorf("Error getting scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) - } - - d.Set("name", name) - d.Set("resource_group_name", resourceGroup) - if location := resp.Location; location != nil { - d.Set("location", azure.NormalizeLocation(*location)) - } - if lastUpdated := resp.LastUpdatedTime; lastUpdated != nil { - d.Set("last_updated_time", lastUpdated.Format(time.RFC3339)) - } - d.Set("provisioning_state", resp.ProvisioningState) - - if resp.Enabled == insights.True { - d.Set("enabled", true) - } else { - d.Set("enabled", false) - } - - d.Set("description", resp.Description) - - switch action := resp.Action.(type) { - case insights.LogToMetricAction: - if err = d.Set("criteria", flattenAzureRmScheduledQueryRulesLogCriteria(action.Criteria)); err != nil { - return fmt.Errorf("Error setting `criteria`: %+v", err) - } - default: - return fmt.Errorf("Unknown action type in scheduled query rule %q (resource group %q): %T", name, resourceGroup, resp.Action) - } - - if schedule := resp.Schedule; schedule != nil { - if schedule.FrequencyInMinutes != nil { - d.Set("frequency", schedule.FrequencyInMinutes) - } - if schedule.TimeWindowInMinutes != nil { - d.Set("time_window", schedule.TimeWindowInMinutes) - } - } - - if source := resp.Source; source != nil { - if source.AuthorizedResources != nil { - d.Set("authorized_resources", utils.FlattenStringSlice(source.AuthorizedResources)) - } - if source.DataSourceID != nil { - d.Set("data_source_id", source.DataSourceID) - } - if source.Query != nil { - d.Set("query", source.Query) - } - d.Set("query_type", string(source.QueryType)) - } - - return tags.FlattenAndSet(d, resp.Tags) -} - -func resourceArmMonitorScheduledQueryRulesLogDelete(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - resourceGroup := id.ResourceGroup - name := id.Path["scheduledqueryrules"] - - if resp, err := client.Delete(ctx, resourceGroup, name); err != nil { - if !response.WasNotFound(resp.Response) { - return fmt.Errorf("Error deleting scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) - } - } - - return nil + return resourceArmMonitorScheduledQueryRulesCreateUpdate(d, meta, action, nil) } func expandMonitorScheduledQueryRulesLogCriteria(input []interface{}) *[]insights.Criteria { @@ -421,6 +149,19 @@ func expandMonitorScheduledQueryRulesLogCriteria(input []interface{}) *[]insight return &criteria } +func expandMonitorScheduledQueryRulesLogSource(d *schema.ResourceData) *insights.Source { + authorizedResourceIDs := d.Get("authorized_resource_ids").(*schema.Set).List() + dataSourceID := d.Get("data_source_id").(string) + + source := insights.Source{ + AuthorizedResources: utils.ExpandStringSlice(authorizedResourceIDs), + DataSourceID: utils.String(dataSourceID), + QueryType: insights.ResultCount, + } + + return &source +} + func expandMonitorScheduledQueryRulesLogToMetricAction(d *schema.ResourceData) *insights.LogToMetricAction { criteriaRaw := d.Get("criteria").(*schema.Set).List() criteria := expandMonitorScheduledQueryRulesLogCriteria(criteriaRaw) diff --git a/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_action_test.go b/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_alert_test.go similarity index 65% rename from azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_action_test.go rename to azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_alert_test.go index 875fdaa762026..8e9109393791a 100644 --- a/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_action_test.go +++ b/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_alert_test.go @@ -9,25 +9,8 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" ) -func TestAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricAction(t *testing.T) { - data := acceptance.BuildTestData(t, "data.azurerm_monitor_scheduled_query_rules", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - Steps: []resource.TestStep{ - { - Config: testAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricActionConfig(data), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttrSet(data.ResourceName, "id"), - ), - }, - }, - }) -} - func TestAccDataSourceAzureRMMonitorScheduledQueryRules_alertingAction(t *testing.T) { - data := acceptance.BuildTestData(t, "data.azurerm_monitor_scheduled_query_rules", "test") + data := acceptance.BuildTestData(t, "data.azurerm_monitor_scheduled_query_rules_alert", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -44,7 +27,7 @@ func TestAccDataSourceAzureRMMonitorScheduledQueryRules_alertingAction(t *testin } func TestAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResource(t *testing.T) { - data := acceptance.BuildTestData(t, "data.azurerm_monitor_scheduled_query_rules", "test") + data := acceptance.BuildTestData(t, "data.azurerm_monitor_scheduled_query_rules_alert", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -60,59 +43,12 @@ func TestAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResou }) } -func testAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricActionConfig(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_application_insights" "test" { - name = "acctestAppInsights-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - application_type = "web" -} - -resource "azurerm_monitor_action_group" "test" { - name = "acctestActionGroup-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - short_name = "acctestag" -} - -resource "azurerm_monitor_scheduled_query_rules" "test" { - name = "acctestsqr-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - description = "test log to metric action" - enabled = true - action_type = "LogToMetric" - - data_source_id = "${azurerm_application_insights.test.id}" - - criteria { - metric_name = "Average_%% Idle Time" - dimension { - name = "InstanceName" - operator = "Include" - values = [""] - } - } -} - -data "azurerm_monitor_scheduled_query_rules" "test" { - name = "${azurerm_monitor_scheduled_query_rules.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - func testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionConfig(data acceptance.TestData) string { ts := time.Now().Format(time.RFC3339) return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" + name = "acctestRG-monitor-%d" location = "%s" } @@ -130,13 +66,12 @@ resource "azurerm_monitor_action_group" "test" { short_name = "acctestag" } -resource "azurerm_monitor_scheduled_query_rules" "test" { +resource "azurerm_monitor_scheduled_query_rules_alert" "test" { name = "acctestsqr-%d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" description = "test alerting action" enabled = true - action_type = "Alerting" query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" data_source_id = "${azurerm_log_analytics_workspace.test.id}" @@ -146,7 +81,7 @@ resource "azurerm_monitor_scheduled_query_rules" "test" { time_window = 60 severity = 3 - azns_action { + action { action_group = ["${azurerm_monitor_action_group.test.id}"] email_subject = "Custom alert email subject" } @@ -163,8 +98,8 @@ resource "azurerm_monitor_scheduled_query_rules" "test" { } } -data "azurerm_monitor_scheduled_query_rules" "test" { - name = "${azurerm_monitor_scheduled_query_rules.test.name}" +data "azurerm_monitor_scheduled_query_rules_alert" "test" { + name = "${azurerm_monitor_scheduled_query_rules_alert.test.name}" resource_group_name = "${azurerm_resource_group.test.name}" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, ts, ts) @@ -175,7 +110,7 @@ func testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResou return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" + name = "acctestRG-monitor-%d" location = "%s" } @@ -201,24 +136,23 @@ resource "azurerm_monitor_action_group" "test" { short_name = "acctestag" } -resource "azurerm_monitor_scheduled_query_rules" "test" { +resource "azurerm_monitor_scheduled_query_rules_alert" "test" { name = "acctestSqr-%d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" description = "test alerting action" enabled = true - action_type = "Alerting" query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" data_source_id = "${azurerm_log_analytics_workspace.test.id}" query_type = "ResultCount" - authorized_resources = ["${azurerm_log_analytics_workspace.test.id}", "${azurerm_log_analytics_workspace.test2.id}"] + authorized_resource_ids = ["${azurerm_log_analytics_workspace.test.id}", "${azurerm_log_analytics_workspace.test2.id}"] frequency = 60 time_window = 60 severity = 3 - azns_action { + action { action_group = ["${azurerm_monitor_action_group.test.id}"] email_subject = "Custom alert email subject" } @@ -235,8 +169,8 @@ resource "azurerm_monitor_scheduled_query_rules" "test" { } } -data "azurerm_monitor_scheduled_query_rules" "test" { - name = "${azurerm_monitor_scheduled_query_rules.test.name}" +data "azurerm_monitor_scheduled_query_rules_alert" "test" { + name = "${azurerm_monitor_scheduled_query_rules_alert.test.name}" resource_group_name = "${azurerm_resource_group.test.name}" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, ts, ts) diff --git a/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_log_test.go b/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_log_test.go index 875fdaa762026..bb4b7e3c04c07 100644 --- a/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_log_test.go +++ b/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_log_test.go @@ -3,14 +3,13 @@ package tests import ( "fmt" "testing" - "time" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" ) func TestAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricAction(t *testing.T) { - data := acceptance.BuildTestData(t, "data.azurerm_monitor_scheduled_query_rules", "test") + data := acceptance.BuildTestData(t, "data.azurerm_monitor_scheduled_query_rules_log", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -26,44 +25,10 @@ func TestAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricAction(t *tes }) } -func TestAccDataSourceAzureRMMonitorScheduledQueryRules_alertingAction(t *testing.T) { - data := acceptance.BuildTestData(t, "data.azurerm_monitor_scheduled_query_rules", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - Steps: []resource.TestStep{ - { - Config: testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionConfig(data), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttrSet(data.ResourceName, "id"), - ), - }, - }, - }) -} - -func TestAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResource(t *testing.T) { - data := acceptance.BuildTestData(t, "data.azurerm_monitor_scheduled_query_rules", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - Steps: []resource.TestStep{ - { - Config: testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResourceConfig(data), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttrSet(data.ResourceName, "id"), - ), - }, - }, - }) -} - func testAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricActionConfig(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" + name = "acctestRG-monitor-%d" location = "%s" } @@ -80,13 +45,12 @@ resource "azurerm_monitor_action_group" "test" { short_name = "acctestag" } -resource "azurerm_monitor_scheduled_query_rules" "test" { +resource "azurerm_monitor_scheduled_query_rules_log" "test" { name = "acctestsqr-%d" resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" + location = "${azurerm_resource_group.test.location}" description = "test log to metric action" enabled = true - action_type = "LogToMetric" data_source_id = "${azurerm_application_insights.test.id}" @@ -95,149 +59,14 @@ resource "azurerm_monitor_scheduled_query_rules" "test" { dimension { name = "InstanceName" operator = "Include" - values = [""] + values = ["50"] } } } -data "azurerm_monitor_scheduled_query_rules" "test" { - name = "${azurerm_monitor_scheduled_query_rules.test.name}" +data "azurerm_monitor_scheduled_query_rules_log" "test" { + name = "${azurerm_monitor_scheduled_query_rules_log.test.name}" resource_group_name = "${azurerm_resource_group.test.name}" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) } - -func testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionConfig(data acceptance.TestData) string { - ts := time.Now().Format(time.RFC3339) - - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_log_analytics_workspace" "test" { - name = "acctestWorkspace-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku = "PerGB2018" - retention_in_days = 30 -} - -resource "azurerm_monitor_action_group" "test" { - name = "acctestActionGroup-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - short_name = "acctestag" -} - -resource "azurerm_monitor_scheduled_query_rules" "test" { - name = "acctestsqr-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - description = "test alerting action" - enabled = true - action_type = "Alerting" - - query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" - data_source_id = "${azurerm_log_analytics_workspace.test.id}" - query_type = "ResultCount" - - frequency = 60 - time_window = 60 - - severity = 3 - azns_action { - action_group = ["${azurerm_monitor_action_group.test.id}"] - email_subject = "Custom alert email subject" - } - - trigger { - operator = "GreaterThan" - threshold = 5000 - metric_trigger { - operator = "GreaterThan" - threshold = 1 - metric_trigger_type = "Total" - metric_column = "TimeGenerated" - } - } -} - -data "azurerm_monitor_scheduled_query_rules" "test" { - name = "${azurerm_monitor_scheduled_query_rules.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, ts, ts) -} - -func testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResourceConfig(data acceptance.TestData) string { - ts := time.Now().Format(time.RFC3339) - - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_log_analytics_workspace" "test" { - name = "acctestWorkspace-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku = "PerGB2018" - retention_in_days = 30 -} - -resource "azurerm_log_analytics_workspace" "test2" { - name = "acctestWorkspace2-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku = "PerGB2018" - retention_in_days = 30 -} - -resource "azurerm_monitor_action_group" "test" { - name = "acctestActionGroup-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - short_name = "acctestag" -} - -resource "azurerm_monitor_scheduled_query_rules" "test" { - name = "acctestSqr-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - description = "test alerting action" - enabled = true - action_type = "Alerting" - - query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" - data_source_id = "${azurerm_log_analytics_workspace.test.id}" - query_type = "ResultCount" - authorized_resources = ["${azurerm_log_analytics_workspace.test.id}", "${azurerm_log_analytics_workspace.test2.id}"] - - frequency = 60 - time_window = 60 - - severity = 3 - azns_action { - action_group = ["${azurerm_monitor_action_group.test.id}"] - email_subject = "Custom alert email subject" - } - - trigger { - operator = "GreaterThan" - threshold = 5000 - metric_trigger { - operator = "GreaterThan" - threshold = 1 - metric_trigger_type = "Total" - metric_column = "TimeGenerated" - } - } -} - -data "azurerm_monitor_scheduled_query_rules" "test" { - name = "${azurerm_monitor_scheduled_query_rules.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, ts, ts) -} diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_action_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go similarity index 84% rename from azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_action_test.go rename to azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go index 1bb822ff80a20..2947388733a5f 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_action_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go @@ -13,7 +13,7 @@ import ( ) func TestAccAzureRMMonitorScheduledQueryRules_AlertingAction(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules_action", "test") + data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules_alert", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -36,7 +36,7 @@ func TestAccAzureRMMonitorScheduledQueryRules_AlertingAction(t *testing.T) { } func TestAccAzureRMMonitorScheduledQueryRules_AlertingActionCrossResource(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules_action", "test") + data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules_alert", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -63,7 +63,7 @@ func testAccAzureRMMonitorScheduledQueryRules_alertingAction(data acceptance.Tes return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" + name = "acctestRG-monitor-%d" location = "%s" } @@ -80,13 +80,12 @@ resource "azurerm_monitor_action_group" "test" { short_name = "acctestag" } -resource "azurerm_monitor_scheduled_query_rules_action" "test" { +resource "azurerm_monitor_scheduled_query_rules_alert" "test" { name = "acctestsqr-%d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" description = "test alerting action" enabled = true - action_type = "Alerting" data_source_id = "${azurerm_application_insights.test.id}" query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" @@ -96,7 +95,7 @@ resource "azurerm_monitor_scheduled_query_rules_action" "test" { time_window = 60 severity = 3 - azns_action { + action { action_group = ["${azurerm_monitor_action_group.test.id}"] email_subject = "Custom alert email subject" custom_webhook_payload = "{}" @@ -119,7 +118,7 @@ resource "azurerm_monitor_scheduled_query_rules_action" "test" { func testAccAzureRMMonitorScheduledQueryRules_alertingActionCrossResource(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" + name = "acctestRG-monitor-%d" location = "%s" } @@ -144,24 +143,23 @@ resource "azurerm_monitor_action_group" "test" { short_name = "acctestag" } -resource "azurerm_monitor_scheduled_query_rules_action" "test" { +resource "azurerm_monitor_scheduled_query_rules_alert" "test" { name = "acctestsqr-%d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" description = "test alerting action cross-resource" enabled = true - action_type = "Alerting" - authorized_resources = ["${azurerm_application_insights.test.id}", "${azurerm_log_analytics_workspace.test.id}"] - data_source_id = "${azurerm_application_insights.test.id}" - query = format("let a=workspace('%%s').Perf | where Computer='dependency' and TimeGenerated > ago(1h) | where ObjectName == 'Processor' and CounterName == '%%%% Processor Time' | summarize cpu=avg(CounterValue) by bin(TimeGenerated, 1m) | extend ts=tostring(TimeGenerated); let b=requests | where resultCode == '200' and timestamp > ago(1h) | summarize reqs=count() by bin(timestamp, 1m) | extend ts = tostring(timestamp); a | join b on $left.ts == $right.ts | where cpu > 50 and reqs > 5", azurerm_log_analytics_workspace.test.id) + authorized_resource_ids = ["${azurerm_application_insights.test.id}", "${azurerm_log_analytics_workspace.test.id}"] + data_source_id = "${azurerm_application_insights.test.id}" + query = format("let a=workspace('%%s').Perf | where Computer='dependency' and TimeGenerated > ago(1h) | where ObjectName == 'Processor' and CounterName == '%%%% Processor Time' | summarize cpu=avg(CounterValue) by bin(TimeGenerated, 1m) | extend ts=tostring(TimeGenerated); let b=requests | where resultCode == '200' and timestamp > ago(1h) | summarize reqs=count() by bin(timestamp, 1m) | extend ts = tostring(timestamp); a | join b on $left.ts == $right.ts | where cpu > 50 and reqs > 5", azurerm_log_analytics_workspace.test.id) query_type = "ResultCount" frequency = 60 time_window = 60 severity = 3 - azns_action { + action { action_group = ["${azurerm_monitor_action_group.test.id}"] email_subject = "Custom alert email subject" } @@ -179,7 +177,7 @@ func testCheckAzureRMMonitorScheduledQueryRulesDestroy(s *terraform.State) error ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_monitor_scheduled_query_rules_action" { + if rs.Type != "azurerm_monitor_scheduled_query_rules_alert" { continue } @@ -200,7 +198,7 @@ func testCheckAzureRMMonitorScheduledQueryRulesDestroy(s *terraform.State) error return nil } -func testCheckAzureRMMonitorScheduledQueryRulesExists(resourceName string) resource.TestCheckFunc { +func testCheckAzureRMMonitorScheduledQueryRulesAlertExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { // Ensure we have enough information in state to look up in API rs, ok := s.RootModule().Resources[resourceName] diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go index 069f41ae89e72..91e751dcf4b0c 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go @@ -37,7 +37,7 @@ func TestAccAzureRMMonitorScheduledQueryRules_LogToMetricAction(t *testing.T) { func testAccAzureRMMonitorScheduledQueryRules_logToMetricAction(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" + name = "acctestRG-monitor-%d" location = "%s" } @@ -60,7 +60,6 @@ resource "azurerm_monitor_scheduled_query_rules_log" "test" { location = "${azurerm_resource_group.test.location}" description = "test log to metric action" enabled = true - action_type = "LogToMetric" data_source_id = "${azurerm_application_insights.test.id}" @@ -69,14 +68,14 @@ resource "azurerm_monitor_scheduled_query_rules_log" "test" { dimension { name = "InstanceName" operator = "Include" - values = [""] + values = ["50"] } } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) } -func testCheckAzureRMMonitorScheduledQueryRulesDestroy(s *terraform.State) error { +func testCheckAzureRMMonitorScheduledQueryRulesLogDestroy(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).Monitor.ScheduledQueryRulesClient ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext diff --git a/website/docs/d/monitor_scheduled_query_rules_alert.html.markdown b/website/docs/d/monitor_scheduled_query_rules_alert.html.markdown index 4d92728a89842..f44dbf8b87507 100644 --- a/website/docs/d/monitor_scheduled_query_rules_alert.html.markdown +++ b/website/docs/d/monitor_scheduled_query_rules_alert.html.markdown @@ -32,8 +32,8 @@ output "query_rule_id" { ## Attributes Reference * `id` - The ID of the Scheduled Query Rule. -* `azns_action` - An `azns_action` block as defined below. -* `authorized_resources` - List of Resource IDs referred into query. +* `action` - An `action` block as defined below. +* `authorized_resource_ids` - List of Resource IDs referred into query. * `data_source_id` - The resource uri over which log search query is to be run. * `description` - The description of the Scheduled Query Rule. * `enabled` - Whether this scheduled query rule is enabled. @@ -47,9 +47,9 @@ output "query_rule_id" { --- -* `azns_action` supports the following: +* `action` supports the following: -* `action_group` - (Optional) List of action group reference resource IDs. +* `action_group` - List of action group reference resource IDs. * `custom_webhook_payload` - Custom payload to be sent for all webhook URI in Azure action group. * `email_subject` - Custom subject override for all email ids in Azure action group. @@ -57,15 +57,15 @@ output "query_rule_id" { `metricTrigger` supports the following: -* `metricColumn` - (Required) Evaluation of metric on a particular column. -* `metricTriggerType` - (Required) Metric Trigger Type - 'Consecutive' or 'Total'. -* `operator` - (Required) Evaluation operation for rule - 'Equal', 'GreaterThan' or 'LessThan'. -* `threshold` - (Required) The threshold of the metric trigger. +* `metricColumn` - Evaluation of metric on a particular column. +* `metricTriggerType` - Metric Trigger Type - 'Consecutive' or 'Total'. +* `operator` - Evaluation operation for rule - 'Equal', 'GreaterThan' or 'LessThan'. +* `threshold` - The threshold of the metric trigger. --- `trigger` supports the following: -* `metricTrigger` - (Optional) A `metricTrigger` block as defined above. Trigger condition for metric query rule. -* `operator` - (Required) Evaluation operation for rule - 'Equal', 'GreaterThan' or 'LessThan'. -* `threshold` - (Required) Result or count threshold based on which rule should be triggered. +* `metricTrigger` - A `metricTrigger` block as defined above. Trigger condition for metric query rule. +* `operator` - Evaluation operation for rule - 'Equal', 'GreaterThan' or 'LessThan'. +* `threshold` - Result or count threshold based on which rule should be triggered. diff --git a/website/docs/d/monitor_scheduled_query_rules_log.html.markdown b/website/docs/d/monitor_scheduled_query_rules_log.html.markdown index a29912472b688..a16f97be51e5a 100644 --- a/website/docs/d/monitor_scheduled_query_rules_log.html.markdown +++ b/website/docs/d/monitor_scheduled_query_rules_log.html.markdown @@ -42,13 +42,13 @@ output "query_rule_id" { `criteria` supports the following: -* `dimension` - (Required) A `dimension` block as defined below. -* `metric_name` - (Required) Name of the metric. +* `dimension` - A `dimension` block as defined below. +* `metric_name` - Name of the metric. --- `dimension` supports the following: -* `name` - (Required) Name of the dimension. -* `operator` - (Required) Operator for dimension values, - 'Include'. -* `values` - (Required) List of dimension values. +* `name` - Name of the dimension. +* `operator` - Operator for dimension values, - 'Include'. +* `values` - List of dimension values. diff --git a/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown b/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown index d78cbf5c4eec9..ff4487816ae6c 100644 --- a/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown +++ b/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown @@ -40,7 +40,7 @@ resource "azurerm_scheduled_query_rule_alert" "example" { location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name - azns_action { + action { action_group = [] email_subject = "Email Header" custom_webhook_payload = "{}" @@ -71,9 +71,9 @@ resource "azurerm_scheduled_query_rule_alert" "example2" { location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name - authorized_resources = [azurerm_application_insights.example.id, + authorized_resource_ids = [azurerm_application_insights.example.id, azurerm_log_analytics_workspace.example.id] - azns_action { + action { action_group = [] email_subject = "Email Header" custom_webhook_payload = "{}" @@ -99,8 +99,8 @@ The following arguments are supported: * `name` - (Required) The name of the Scheduled Query Rule. Changing this forces a new resource to be created. * `resource_group_name` - (Required) The name of the resource group in which to create the Scheduled Query Rule instance. -* `authorized_resources` - (Optional) List of Resource IDs referred into query. -* `azns_action` - (Optional) An `azns_action` block as defined below. +* `authorized_resource_ids` - (Optional) List of Resource IDs referred into query. +* `action` - (Optional) An `action` block as defined below. * `data_source_id` - (Required) The resource uri over which log search query is to be run. * `description` - (Optional) The description of the Scheduled Query Rule. * `enabled` - (Optional) Whether this scheduled query rule is enabled. Default is `true`. @@ -114,9 +114,9 @@ The following arguments are supported: --- -* `azns_action` supports the following: +* `action` supports the following: -* `action_group` - (Optional) List of action group reference resource IDs. +* `action_group` - (Required) List of action group reference resource IDs. * `custom_webhook_payload` - (Optional) Custom payload to be sent for all webhook payloads in alerting action. * `email_subject` - (Optional) Custom subject override for all email ids in Azure action group. From 7220ba410f7ac07de3ff450d10e9803a79dbfa79 Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Sat, 1 Feb 2020 11:58:20 -0600 Subject: [PATCH 031/498] Fix lint issues and minor typos --- ...ce_arm_monitor_scheduled_query_rules_alert.go | 3 +-- ...urce_arm_monitor_scheduled_query_rules_log.go | 13 ------------- ...m_monitor_scheduled_query_rules_alert_test.go | 16 ++++++++-------- ...arm_monitor_scheduled_query_rules_log_test.go | 12 ++++++------ 4 files changed, 15 insertions(+), 29 deletions(-) diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go index 1a66e95f8ef03..98bda4dbcd17e 100644 --- a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go +++ b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go @@ -195,8 +195,7 @@ func resourceArmMonitorScheduledQueryRulesAlert() *schema.Resource { } func resourceArmMonitorScheduledQueryRulesAlertCreateUpdate(d *schema.ResourceData, meta interface{}) error { - var action insights.BasicAction - action = expandMonitorScheduledQueryRulesAlertingAction(d) + action := expandMonitorScheduledQueryRulesAlertingAction(d) schedule := expandMonitorScheduledQueryRulesAlertSchedule(d) return resourceArmMonitorScheduledQueryRulesCreateUpdate(d, meta, action, schedule) diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go index a25ee0535b20d..65c464e01f3ae 100644 --- a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go +++ b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go @@ -149,19 +149,6 @@ func expandMonitorScheduledQueryRulesLogCriteria(input []interface{}) *[]insight return &criteria } -func expandMonitorScheduledQueryRulesLogSource(d *schema.ResourceData) *insights.Source { - authorizedResourceIDs := d.Get("authorized_resource_ids").(*schema.Set).List() - dataSourceID := d.Get("data_source_id").(string) - - source := insights.Source{ - AuthorizedResources: utils.ExpandStringSlice(authorizedResourceIDs), - DataSourceID: utils.String(dataSourceID), - QueryType: insights.ResultCount, - } - - return &source -} - func expandMonitorScheduledQueryRulesLogToMetricAction(d *schema.ResourceData) *insights.LogToMetricAction { criteriaRaw := d.Get("criteria").(*schema.Set).List() criteria := expandMonitorScheduledQueryRulesLogCriteria(criteriaRaw) diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go index 2947388733a5f..a16c0b8a5c533 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go @@ -18,12 +18,12 @@ func TestAccAzureRMMonitorScheduledQueryRules_AlertingAction(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesDestroy, + CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesAlertDestroy, Steps: []resource.TestStep{ { Config: testAccAzureRMMonitorScheduledQueryRules_alertingAction(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMonitorScheduledQueryRulesExists(data.ResourceName), + testCheckAzureRMMonitorScheduledQueryRulesAlertExists(data.ResourceName), ), }, { @@ -41,12 +41,12 @@ func TestAccAzureRMMonitorScheduledQueryRules_AlertingActionCrossResource(t *tes resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesDestroy, + CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesAlertDestroy, Steps: []resource.TestStep{ { Config: testAccAzureRMMonitorScheduledQueryRules_alertingActionCrossResource(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMonitorScheduledQueryRulesExists(data.ResourceName), + testCheckAzureRMMonitorScheduledQueryRulesAlertExists(data.ResourceName), ), }, { @@ -172,7 +172,7 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) } -func testCheckAzureRMMonitorScheduledQueryRulesDestroy(s *terraform.State) error { +func testCheckAzureRMMonitorScheduledQueryRulesAlertDestroy(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).Monitor.ScheduledQueryRulesClient ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext @@ -191,7 +191,7 @@ func testCheckAzureRMMonitorScheduledQueryRulesDestroy(s *terraform.State) error } if resp.StatusCode != http.StatusNotFound { - return fmt.Errorf("Activity log alert still exists:\n%#v", resp) + return fmt.Errorf("Scheduled Query Rule still exists:\n%#v", resp) } } @@ -209,7 +209,7 @@ func testCheckAzureRMMonitorScheduledQueryRulesAlertExists(resourceName string) name := rs.Primary.Attributes["name"] resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for Activity Log Alert Instance: %s", name) + return fmt.Errorf("Bad: no resource group found in state for Scheduled Query Rule Instance: %s", name) } client := acceptance.AzureProvider.Meta().(*clients.Client).Monitor.ScheduledQueryRulesClient @@ -221,7 +221,7 @@ func testCheckAzureRMMonitorScheduledQueryRulesAlertExists(resourceName string) } if resp.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: Activity Log Alert Instance %q (resource group: %q) does not exist", name, resourceGroup) + return fmt.Errorf("Bad: Scheduled Query Rule Instance %q (resource group: %q) does not exist", name, resourceGroup) } return nil diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go index 91e751dcf4b0c..8dd720c71463e 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go @@ -17,12 +17,12 @@ func TestAccAzureRMMonitorScheduledQueryRules_LogToMetricAction(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesDestroy, + CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesLogDestroy, Steps: []resource.TestStep{ { Config: testAccAzureRMMonitorScheduledQueryRules_logToMetricAction(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMonitorScheduledQueryRulesExists(data.ResourceName), + testCheckAzureRMMonitorScheduledQueryRulesLogExists(data.ResourceName), ), }, { @@ -94,14 +94,14 @@ func testCheckAzureRMMonitorScheduledQueryRulesLogDestroy(s *terraform.State) er } if resp.StatusCode != http.StatusNotFound { - return fmt.Errorf("Activity log alert still exists:\n%#v", resp) + return fmt.Errorf("Scheduled Query Rule still exists:\n%#v", resp) } } return nil } -func testCheckAzureRMMonitorScheduledQueryRulesExists(resourceName string) resource.TestCheckFunc { +func testCheckAzureRMMonitorScheduledQueryRulesLogExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { // Ensure we have enough information in state to look up in API rs, ok := s.RootModule().Resources[resourceName] @@ -112,7 +112,7 @@ func testCheckAzureRMMonitorScheduledQueryRulesExists(resourceName string) resou name := rs.Primary.Attributes["name"] resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for Activity Log Alert Instance: %s", name) + return fmt.Errorf("Bad: no resource group found in state for Scheduled Query Rule Instance: %s", name) } client := acceptance.AzureProvider.Meta().(*clients.Client).Monitor.ScheduledQueryRulesClient @@ -124,7 +124,7 @@ func testCheckAzureRMMonitorScheduledQueryRulesExists(resourceName string) resou } if resp.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: Activity Log Alert Instance %q (resource group: %q) does not exist", name, resourceGroup) + return fmt.Errorf("Bad: Scheduled Query Rule Instance %q (resource group: %q) does not exist", name, resourceGroup) } return nil From 3fa8441c0e0c0588574c3ad0eeff7e2383c09ca1 Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Sat, 1 Feb 2020 12:44:44 -0600 Subject: [PATCH 032/498] Fix lint issues #2 --- ...onitor_scheduled_query_rules_alert_test.go | 100 +++++++++--------- ..._monitor_scheduled_query_rules_log_test.go | 32 +++--- ...onitor_scheduled_query_rules_alert_test.go | 84 +++++++-------- ..._monitor_scheduled_query_rules_log_test.go | 28 ++--- ..._scheduled_query_rules_alert.html.markdown | 1 - ...or_scheduled_query_rules_log.html.markdown | 1 - ..._scheduled_query_rules_alert.html.markdown | 1 - ...or_scheduled_query_rules_log.html.markdown | 1 - 8 files changed, 122 insertions(+), 126 deletions(-) diff --git a/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_alert_test.go b/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_alert_test.go index 8e9109393791a..4f41939128074 100644 --- a/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_alert_test.go +++ b/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_alert_test.go @@ -68,39 +68,39 @@ resource "azurerm_monitor_action_group" "test" { resource "azurerm_monitor_scheduled_query_rules_alert" "test" { name = "acctestsqr-%d" - resource_group_name = "${azurerm_resource_group.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" - description = "test alerting action" - enabled = true + description = "test alerting action" + enabled = true - query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" - data_source_id = "${azurerm_log_analytics_workspace.test.id}" - query_type = "ResultCount" + query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" + data_source_id = "${azurerm_log_analytics_workspace.test.id}" + query_type = "ResultCount" - frequency = 60 + frequency = 60 time_window = 60 - severity = 3 - action { - action_group = ["${azurerm_monitor_action_group.test.id}"] - email_subject = "Custom alert email subject" - } - - trigger { - operator = "GreaterThan" - threshold = 5000 - metric_trigger { - operator = "GreaterThan" - threshold = 1 - metric_trigger_type = "Total" - metric_column = "TimeGenerated" - } - } + severity = 3 + action { + action_group = ["${azurerm_monitor_action_group.test.id}"] + email_subject = "Custom alert email subject" + } + + trigger { + operator = "GreaterThan" + threshold = 5000 + metric_trigger { + operator = "GreaterThan" + threshold = 1 + metric_trigger_type = "Total" + metric_column = "TimeGenerated" + } + } } data "azurerm_monitor_scheduled_query_rules_alert" "test" { - name = "${azurerm_monitor_scheduled_query_rules_alert.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + name = "${azurerm_monitor_scheduled_query_rules_alert.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, ts, ts) } @@ -140,38 +140,38 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "test" { name = "acctestSqr-%d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" - description = "test alerting action" - enabled = true + description = "test alerting action" + enabled = true - query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" - data_source_id = "${azurerm_log_analytics_workspace.test.id}" - query_type = "ResultCount" - authorized_resource_ids = ["${azurerm_log_analytics_workspace.test.id}", "${azurerm_log_analytics_workspace.test2.id}"] + query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" + data_source_id = "${azurerm_log_analytics_workspace.test.id}" + query_type = "ResultCount" + authorized_resource_ids = ["${azurerm_log_analytics_workspace.test.id}", "${azurerm_log_analytics_workspace.test2.id}"] - frequency = 60 + frequency = 60 time_window = 60 - severity = 3 - action { - action_group = ["${azurerm_monitor_action_group.test.id}"] - email_subject = "Custom alert email subject" - } - - trigger { - operator = "GreaterThan" - threshold = 5000 - metric_trigger { - operator = "GreaterThan" - threshold = 1 - metric_trigger_type = "Total" - metric_column = "TimeGenerated" - } - } + severity = 3 + action { + action_group = ["${azurerm_monitor_action_group.test.id}"] + email_subject = "Custom alert email subject" + } + + trigger { + operator = "GreaterThan" + threshold = 5000 + metric_trigger { + operator = "GreaterThan" + threshold = 1 + metric_trigger_type = "Total" + metric_column = "TimeGenerated" + } + } } data "azurerm_monitor_scheduled_query_rules_alert" "test" { - name = "${azurerm_monitor_scheduled_query_rules_alert.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + name = "${azurerm_monitor_scheduled_query_rules_alert.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, ts, ts) } diff --git a/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_log_test.go b/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_log_test.go index bb4b7e3c04c07..d25c6a7de3558 100644 --- a/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_log_test.go +++ b/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_log_test.go @@ -46,27 +46,27 @@ resource "azurerm_monitor_action_group" "test" { } resource "azurerm_monitor_scheduled_query_rules_log" "test" { - name = "acctestsqr-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - description = "test log to metric action" - enabled = true + name = "acctestsqr-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + description = "test log to metric action" + enabled = true - data_source_id = "${azurerm_application_insights.test.id}" + data_source_id = "${azurerm_application_insights.test.id}" - criteria { - metric_name = "Average_%% Idle Time" - dimension { - name = "InstanceName" - operator = "Include" - values = ["50"] - } - } + criteria { + metric_name = "Average_%% Idle Time" + dimension { + name = "InstanceName" + operator = "Include" + values = ["50"] + } + } } data "azurerm_monitor_scheduled_query_rules_log" "test" { - name = "${azurerm_monitor_scheduled_query_rules_log.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + name = "${azurerm_monitor_scheduled_query_rules_log.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) } diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go index a16c0b8a5c533..bedb59a884560 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go @@ -75,42 +75,42 @@ resource "azurerm_application_insights" "test" { } resource "azurerm_monitor_action_group" "test" { - name = "acctestActionGroup-%d" + name = "acctestActionGroup-%d" resource_group_name = "${azurerm_resource_group.test.name}" short_name = "acctestag" } resource "azurerm_monitor_scheduled_query_rules_alert" "test" { name = "acctestsqr-%d" - resource_group_name = "${azurerm_resource_group.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" - description = "test alerting action" - enabled = true + description = "test alerting action" + enabled = true - data_source_id = "${azurerm_application_insights.test.id}" + data_source_id = "${azurerm_application_insights.test.id}" query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" - query_type = "ResultCount" + query_type = "ResultCount" - frequency = 60 + frequency = 60 time_window = 60 - severity = 3 - action { - action_group = ["${azurerm_monitor_action_group.test.id}"] - email_subject = "Custom alert email subject" - custom_webhook_payload = "{}" - } - - trigger { - operator = "GreaterThan" - threshold = 5000 - metric_trigger { - operator = "GreaterThan" - threshold = 1 - metric_trigger_type = "Total" - metric_column = "TimeGenerated" - } - } + severity = 3 + action { + action_group = ["${azurerm_monitor_action_group.test.id}"] + email_subject = "Custom alert email subject" + custom_webhook_payload = "{}" + } + + trigger { + operator = "GreaterThan" + threshold = 5000 + metric_trigger { + operator = "GreaterThan" + threshold = 1 + metric_trigger_type = "Total" + metric_column = "TimeGenerated" + } + } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, ts, ts) } @@ -145,29 +145,29 @@ resource "azurerm_monitor_action_group" "test" { resource "azurerm_monitor_scheduled_query_rules_alert" "test" { name = "acctestsqr-%d" - resource_group_name = "${azurerm_resource_group.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" - description = "test alerting action cross-resource" - enabled = true + description = "test alerting action cross-resource" + enabled = true - authorized_resource_ids = ["${azurerm_application_insights.test.id}", "${azurerm_log_analytics_workspace.test.id}"] - data_source_id = "${azurerm_application_insights.test.id}" - query = format("let a=workspace('%%s').Perf | where Computer='dependency' and TimeGenerated > ago(1h) | where ObjectName == 'Processor' and CounterName == '%%%% Processor Time' | summarize cpu=avg(CounterValue) by bin(TimeGenerated, 1m) | extend ts=tostring(TimeGenerated); let b=requests | where resultCode == '200' and timestamp > ago(1h) | summarize reqs=count() by bin(timestamp, 1m) | extend ts = tostring(timestamp); a | join b on $left.ts == $right.ts | where cpu > 50 and reqs > 5", azurerm_log_analytics_workspace.test.id) - query_type = "ResultCount" + authorized_resource_ids = ["${azurerm_application_insights.test.id}", "${azurerm_log_analytics_workspace.test.id}"] + data_source_id = "${azurerm_application_insights.test.id}" + query = format("let a=workspace('%%s').Perf | where Computer='dependency' and TimeGenerated > ago(1h) | where ObjectName == 'Processor' and CounterName == '%%%% Processor Time' | summarize cpu=avg(CounterValue) by bin(TimeGenerated, 1m) | extend ts=tostring(TimeGenerated); let b=requests | where resultCode == '200' and timestamp > ago(1h) | summarize reqs=count() by bin(timestamp, 1m) | extend ts = tostring(timestamp); a | join b on $left.ts == $right.ts | where cpu > 50 and reqs > 5", azurerm_log_analytics_workspace.test.id) + query_type = "ResultCount" - frequency = 60 - time_window = 60 + frequency = 60 + time_window = 60 - severity = 3 - action { - action_group = ["${azurerm_monitor_action_group.test.id}"] - email_subject = "Custom alert email subject" - } + severity = 3 + action { + action_group = ["${azurerm_monitor_action_group.test.id}"] + email_subject = "Custom alert email subject" + } - trigger { - operator = "GreaterThan" - threshold = 5000 - } + trigger { + operator = "GreaterThan" + threshold = 5000 + } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) } diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go index 8dd720c71463e..2fc2efdd82f98 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go @@ -49,7 +49,7 @@ resource "azurerm_application_insights" "test" { } resource "azurerm_monitor_action_group" "test" { - name = "acctestActionGroup-%d" + name = "acctestActionGroup-%d" resource_group_name = "${azurerm_resource_group.test.name}" short_name = "acctestag" } @@ -58,19 +58,19 @@ resource "azurerm_monitor_scheduled_query_rules_log" "test" { name = "acctestsqr-%d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" - description = "test log to metric action" - enabled = true - - data_source_id = "${azurerm_application_insights.test.id}" - - criteria { - metric_name = "Average_%% Idle Time" - dimension { - name = "InstanceName" - operator = "Include" - values = ["50"] - } - } + description = "test log to metric action" + enabled = true + + data_source_id = "${azurerm_application_insights.test.id}" + + criteria { + metric_name = "Average_%% Idle Time" + dimension { + name = "InstanceName" + operator = "Include" + values = ["50"] + } + } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) } diff --git a/website/docs/d/monitor_scheduled_query_rules_alert.html.markdown b/website/docs/d/monitor_scheduled_query_rules_alert.html.markdown index f44dbf8b87507..1998f0670646c 100644 --- a/website/docs/d/monitor_scheduled_query_rules_alert.html.markdown +++ b/website/docs/d/monitor_scheduled_query_rules_alert.html.markdown @@ -2,7 +2,6 @@ subcategory: "Monitor" layout: "azurerm" page_title: "Azure Resource Manager: azurerm_monitor_scheduled_query_rules_alert" -sidebar_current: "docs-azurerm-datasource-monitor-scheduled-query-rules-alert" description: |- Get information about the specified AlertingAction Scheduled Query Rule. --- diff --git a/website/docs/d/monitor_scheduled_query_rules_log.html.markdown b/website/docs/d/monitor_scheduled_query_rules_log.html.markdown index a16f97be51e5a..3633ba24d57f5 100644 --- a/website/docs/d/monitor_scheduled_query_rules_log.html.markdown +++ b/website/docs/d/monitor_scheduled_query_rules_log.html.markdown @@ -2,7 +2,6 @@ subcategory: "Monitor" layout: "azurerm" page_title: "Azure Resource Manager: azurerm_monitor_scheduled_query_rules_log" -sidebar_current: "docs-azurerm-datasource-monitor-scheduled-query-rules-log" description: |- Get information about the specified LogToMetricAction Scheduled Query Rule. --- diff --git a/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown b/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown index ff4487816ae6c..54324cbadc21a 100644 --- a/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown +++ b/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown @@ -2,7 +2,6 @@ subcategory: "Monitor" layout: "azurerm" page_title: "Azure Resource Manager: azurerm_monitor_scheduled_query_rules_alert" -sidebar_current: "docs-azurerm-resource-monitor-scheduled-query-rules-alert" description: |- Manages an AlertingAction Scheduled Query Rule within Azure Monitor --- diff --git a/website/docs/r/monitor_scheduled_query_rules_log.html.markdown b/website/docs/r/monitor_scheduled_query_rules_log.html.markdown index a5d6895fb301c..29f6e8291c19d 100644 --- a/website/docs/r/monitor_scheduled_query_rules_log.html.markdown +++ b/website/docs/r/monitor_scheduled_query_rules_log.html.markdown @@ -2,7 +2,6 @@ subcategory: "Monitor" layout: "azurerm" page_title: "Azure Resource Manager: azurerm_monitor_scheduled_query_rules_log" -sidebar_current: "docs-azurerm-resource-monitor-scheduled-query-rules-log" description: |- Manages a LogToMetricAction Scheduled Query Rule within Azure Monitor --- From d2a15de9c2b14b1e3c08bc7b3caa600cf03b2254 Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Sat, 1 Feb 2020 13:12:41 -0600 Subject: [PATCH 033/498] Fix lint issues #3 --- ...ource_monitor_scheduled_query_rules_log.go | 1 - ...arm_monitor_scheduled_query_rules_alert.go | 2 +- ..._scheduled_query_rules_alert.html.markdown | 54 +++++++++---------- ...or_scheduled_query_rules_log.html.markdown | 24 ++++----- 4 files changed, 40 insertions(+), 41 deletions(-) diff --git a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go index cd0853c6dc728..4a864f0f19f26 100644 --- a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go +++ b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go @@ -46,7 +46,6 @@ func dataSourceArmMonitorScheduledQueryRulesLog() *schema.Resource { "name": { Type: schema.TypeString, Computed: true, - Elem: schema.TypeString, }, "operator": { Type: schema.TypeString, diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go index 98bda4dbcd17e..cee4212d9823b 100644 --- a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go +++ b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go @@ -67,7 +67,7 @@ func resourceArmMonitorScheduledQueryRulesAlert() *schema.Resource { Type: schema.TypeString, Optional: true, Default: "{}", - ValidateFunc: validation.ValidateJsonString, + ValidateFunc: validation.StringIsJSON, }, "email_subject": { Type: schema.TypeString, diff --git a/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown b/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown index 54324cbadc21a..19cdc7ee01488 100644 --- a/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown +++ b/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown @@ -35,26 +35,26 @@ resource "azurerm_log_analytics_workspace" "example" { # Example: Alerting Action resource "azurerm_scheduled_query_rule_alert" "example" { - name = format("%s-queryrule", var.prefix) - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name + name = format("%s-queryrule", var.prefix) + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name action { action_group = [] email_subject = "Email Header" custom_webhook_payload = "{}" } - data_source_id = azurerm_application_insights.example.id - description = "Scheduled query rule Alerting Action example" - enabled = true - frequency = 5 - query = "requests | where status_code >= 500 | summarize AggregatedValue = count() by bin(timestamp, 5m)" - query_type = "ResultCount" - severity = 1 - time_window = 30 + data_source_id = azurerm_application_insights.example.id + description = "Scheduled query rule Alerting Action example" + enabled = true + frequency = 5 + query = "requests | where status_code >= 500 | summarize AggregatedValue = count() by bin(timestamp, 5m)" + query_type = "ResultCount" + severity = 1 + time_window = 30 trigger { - threshold_operator = "GreaterThan" - threshold = 3 + threshold_operator = "GreaterThan" + threshold = 3 metric_trigger { operator = "GreaterThan" threshold = 1 @@ -66,28 +66,28 @@ resource "azurerm_scheduled_query_rule_alert" "example" { # Example: Alerting Action Cross-Resource resource "azurerm_scheduled_query_rule_alert" "example2" { - name = format("%s-queryrule2", var.prefix) - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name + name = format("%s-queryrule2", var.prefix) + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name authorized_resource_ids = [azurerm_application_insights.example.id, - azurerm_log_analytics_workspace.example.id] + azurerm_log_analytics_workspace.example.id] action { action_group = [] email_subject = "Email Header" custom_webhook_payload = "{}" } - data_source_id = azurerm_application_insights.example.id - description = "Scheduled query rule Alerting Action cross-resource example" - enabled = true - frequency = 5 - query = format("let a=workspace('%s').Perf | where Computer='dependency' and TimeGenerated > ago(1h) | where ObjectName == 'Processor' and CounterName == '%% Processor Time' | summarize cpu=avg(CounterValue) by bin(TimeGenerated, 1m) | extend ts=tostring(TimeGenerated); let b=requests | where resultCode == '200' and timestamp > ago(1h) | summarize reqs=count() by bin(timestamp, 1m) | extend ts = tostring(timestamp); a | join b on $left.ts == $right.ts | where cpu > 50 and reqs > 5", azurerm_log_analytics_workspace.test.id) - query_type = "ResultCount" - severity = "1" - time_window = 30 + data_source_id = azurerm_application_insights.example.id + description = "Scheduled query rule Alerting Action cross-resource example" + enabled = true + frequency = 5 + query = format("let a=workspace('%s').Perf | where Computer='dependency' and TimeGenerated > ago(1h) | where ObjectName == 'Processor' and CounterName == '%% Processor Time' | summarize cpu=avg(CounterValue) by bin(TimeGenerated, 1m) | extend ts=tostring(TimeGenerated); let b=requests | where resultCode == '200' and timestamp > ago(1h) | summarize reqs=count() by bin(timestamp, 1m) | extend ts = tostring(timestamp); a | join b on $left.ts == $right.ts | where cpu > 50 and reqs > 5", azurerm_log_analytics_workspace.test.id) + query_type = "ResultCount" + severity = "1" + time_window = 30 trigger { - threshold_operator = "GreaterThan" - threshold = 3 + threshold_operator = "GreaterThan" + threshold = 3 } } ``` diff --git a/website/docs/r/monitor_scheduled_query_rules_log.html.markdown b/website/docs/r/monitor_scheduled_query_rules_log.html.markdown index 29f6e8291c19d..7870b2c8d436e 100644 --- a/website/docs/r/monitor_scheduled_query_rules_log.html.markdown +++ b/website/docs/r/monitor_scheduled_query_rules_log.html.markdown @@ -26,21 +26,21 @@ resource "azurerm_application_insights" "example" { } resource "azurerm_scheduled_query_rule_log" "example3" { - name = format("%s-queryrule3", var.prefix) - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name + name = format("%s-queryrule3", var.prefix) + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name criteria { - metric_name = "Average_% Idle Time" - dimensions { - name = "InstanceName" - operator = "Include" - values = [""] - } + metric_name = "Average_% Idle Time" + dimensions { + name = "InstanceName" + operator = "Include" + values = [""] + } } - data_source_id = azurerm_application_insights.example.id - description = "Scheduled query rule LogToMetric example" - enabled = true + data_source_id = azurerm_application_insights.example.id + description = "Scheduled query rule LogToMetric example" + enabled = true } ``` From 635e2c2cee5ddd8b008d89d1e0a3e4318350c3ec Mon Sep 17 00:00:00 2001 From: John Kendall Date: Mon, 3 Feb 2020 15:43:16 +1100 Subject: [PATCH 034/498] review fixes --- .../resource_arm_bot_channel_directline.go | 50 +++++++++---------- ...esource_arm_bot_channel_directline_test.go | 12 ++--- .../docs/r/bot_channel_directline.markdown | 27 ++++++---- 3 files changed, 47 insertions(+), 42 deletions(-) diff --git a/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go b/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go index 219ab81122913..8678b9340873f 100644 --- a/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go +++ b/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go @@ -52,38 +52,38 @@ func resourceArmBotChannelDirectline() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ - "site_name": { + "name": { Type: schema.TypeString, Required: true, ValidateFunc: validate.NoEmptyStrings, }, - "is_enabled": { + "enabled": { Type: schema.TypeBool, Optional: true, Default: true, }, - "is_v1_enabled": { + "v1_allowed": { Type: schema.TypeBool, Optional: true, Default: true, }, - "is_v3_enabled": { + "v3_allowed": { Type: schema.TypeBool, Optional: true, Default: true, }, - "is_secure_site_enabled": { + "enhanced_authentication_enabled": { Type: schema.TypeBool, Default: false, Optional: true, }, "trusted_origins": { - Type: schema.TypeList, + Type: schema.TypeSet, Optional: true, Elem: &schema.Schema{ Type: schema.TypeString, @@ -103,7 +103,7 @@ func resourceArmBotChannelDirectline() *schema.Resource { Sensitive: true, }, - "site_id": { + "id": { Type: schema.TypeString, Computed: true, }, @@ -134,12 +134,10 @@ func resourceArmBotChannelDirectlineCreate(d *schema.ResourceData, meta interfac } } - sites, _ := expandSites(d.Get("site").(*schema.Set).List()) - channel := botservice.BotChannel{ Properties: botservice.DirectLineChannel{ Properties: &botservice.DirectLineChannelProperties{ - Sites: sites, + Sites: expandDirectlineSites(d.Get("site").(*schema.Set).List()), }, ChannelName: botservice.ChannelNameDirectLineChannel1, }, @@ -195,7 +193,7 @@ func resourceArmBotChannelDirectlineRead(d *schema.ResourceData, meta interface{ if props := channelsResp.Properties; props != nil { if channel, ok := props.AsDirectLineChannel(); ok { if channelProps := channel.Properties; channelProps != nil { - d.Set("site", unExpandSites(*channelProps.Sites)) + d.Set("site", flattenDirectlineSites(*channelProps.Sites)) } } } @@ -210,7 +208,7 @@ func resourceArmBotChannelDirectlineUpdate(d *schema.ResourceData, meta interfac botName := d.Get("bot_name").(string) resourceGroup := d.Get("resource_group_name").(string) - sites, _ := expandSites(d.Get("site").(*schema.Set).List()) + sites := expandDirectlineSites(d.Get("site").(*schema.Set).List()) channel := botservice.BotChannel{ Properties: botservice.DirectLineChannel{ @@ -263,25 +261,25 @@ func resourceArmBotChannelDirectlineDelete(d *schema.ResourceData, meta interfac return nil } -func expandSites(input []interface{}) (*[]botservice.DirectLineSite, error) { +func expandDirectlineSites(input []interface{}) *[]botservice.DirectLineSite { sites := make([]botservice.DirectLineSite, len(input)) for i, element := range input { site := element.(map[string]interface{}) - if v, ok := site["site_name"].(string); ok { + if v, ok := site["name"].(string); ok { sites[i].SiteName = &v } - if v, ok := site["is_enabled"].(bool); ok { + if v, ok := site["enabled"].(bool); ok { sites[i].IsEnabled = &v } - if v, ok := site["is_v1_enabled"].(bool); ok { + if v, ok := site["v1_allowed"].(bool); ok { sites[i].IsV1Enabled = &v } - if v, ok := site["is_v3_enabled"].(bool); ok { + if v, ok := site["v3_allowed"].(bool); ok { sites[i].IsV3Enabled = &v } - if v, ok := site["is_secure_site_enabled"].(bool); ok { + if v, ok := site["enhanced_authentication_enabled"].(bool); ok { sites[i].IsSecureSiteEnabled = &v } if v, ok := site["trusted_origins"].([]interface{}); ok { @@ -293,17 +291,17 @@ func expandSites(input []interface{}) (*[]botservice.DirectLineSite, error) { } } - return &sites, nil + return &sites } -func unExpandSites(input []botservice.DirectLineSite) []interface{} { +func flattenDirectlineSites(input []botservice.DirectLineSite) []interface{} { sites := make([]interface{}, len(input)) for i, element := range input { site := make(map[string]interface{}) - if element.SiteName != nil { - site["site_name"] = *element.SiteName + if v := element.SiteName; v != nil { + site["name"] = *v } if element.Key != nil { @@ -315,19 +313,19 @@ func unExpandSites(input []botservice.DirectLineSite) []interface{} { } if element.IsEnabled != nil { - site["is_enabled"] = *element.IsEnabled + site["enabled"] = *element.IsEnabled } if element.IsV1Enabled != nil { - site["is_v1_enabled"] = *element.IsV1Enabled + site["v1_allowed"] = *element.IsV1Enabled } if element.IsV3Enabled != nil { - site["is_v3_enabled"] = *element.IsV3Enabled + site["v3_allowed"] = *element.IsV3Enabled } if element.IsSecureSiteEnabled != nil { - site["is_secure_site_enabled"] = *element.IsSecureSiteEnabled + site["enhanced_authentication_enabled"] = *element.IsSecureSiteEnabled } if element.TrustedOrigins != nil { diff --git a/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go b/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go index 0bce701508ff2..b6f6bbc68df19 100644 --- a/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go +++ b/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go @@ -163,11 +163,11 @@ resource "azurerm_bot_channel_directline" "test" { location = "${azurerm_bot_channels_registration.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" site { - site_name = "test" - is_enabled = true - is_v1_enabled = true - is_v3_enabled = true - is_secure_site_enabled = true + name = "test" + enabled = true + v1_allowed = true + v3_allowed = true + enhanced_authentication_enabled = true trusted_origins = ["https://example.com"] } } @@ -183,7 +183,7 @@ resource "azurerm_bot_channel_directline" "test" { bot_name = "${azurerm_bot_channels_registration.test.name}" location = "${azurerm_bot_channels_registration.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - is_enabled = false + enabled = false } `, template) } diff --git a/website/docs/r/bot_channel_directline.markdown b/website/docs/r/bot_channel_directline.markdown index 450ea6df254f8..241054e3d7027 100644 --- a/website/docs/r/bot_channel_directline.markdown +++ b/website/docs/r/bot_channel_directline.markdown @@ -34,8 +34,8 @@ resource "azurerm_bot_channel_directline" "example" { resource_group_name = "${azurerm_resource_group.example.name}" site { - site_name = "default" - is_enabled = true + name = "default" + enabled = true } } ``` @@ -52,20 +52,27 @@ The following arguments are supported: - `site` - (Optional) A site represents a client application that you want to connect to your bot. Multiple `site` blocks may be defined as below -A `site` block as the following properties: +A `site` block has the following properties: -- `site_name` - (Required) The name of the site +- `name` - (Required) The name of the site -- `is_enabled` - (Optional) Enables/Disables this site. Enabled by default +- `enabled` - (Optional) Enables/Disables this site. Enabled by default -- `is_v1_enabled` - (Optional) Enables v1 of the Directline protocol for this site. Enabled by default +- `v1_allowed` - (Optional) Enables v1 of the Directline protocol for this site. Enabled by default -- `is_v3_enabled` - (Optional) Enables v3 of the Directline protocol for this site. Enabled by default +- `v3_allowed` - (Optional) Enables v3 of the Directline protocol for this site. Enabled by default -- `is_secure_site_enabled` - (Optional) Enables additional security measures for this site, see [Enhanced Directline Authentication Features](https://blog.botframework.com/2018/09/25/enhanced-direct-line-authentication-features). Disabled by default. +- `enhanced_authentication_enabled` - (Optional) Enables additional security measures for this site, see [Enhanced Directline Authentication Features](https://blog.botframework.com/2018/09/25/enhanced-direct-line-authentication-features). Disabled by default. - `trusted_origins` - (Optional) This field is required when `is_secure_site_enabled` is enabled. Determines which origins can establish a Directline conversation for this site. +- `key` - (Computed) Primary key for accessing this site + +- `key2` - (Computed) Secondary key for accessing this site + +- `id` - (Computed) Id for the site + + ## Attributes Reference The following attributes are exported: @@ -74,8 +81,8 @@ The following attributes are exported: ## Import -The Microsoft Teams Channel for a Bot can be imported using the `resource id`, e.g. +The Directline Channel for a Bot can be imported using the `resource id`, e.g. ```shell -terraform import azurerm_bot_channel_ms_teams.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/example/providers/Microsoft.BotService/botServices/example/channels/MsTeamsChannel +terraform import azurerm_bot_channel_directline.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/example/providers/Microsoft.BotService/botServices/example/channels/DirectlineChannel ``` From d23b08421b52689e565db07bbe578539c2735183 Mon Sep 17 00:00:00 2001 From: John Kendall Date: Mon, 3 Feb 2020 22:01:23 +1100 Subject: [PATCH 035/498] minor fix to directline tests --- .../bot/tests/resource_arm_bot_channel_directline_test.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go b/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go index b6f6bbc68df19..1b1db1aba6ce7 100644 --- a/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go +++ b/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go @@ -164,7 +164,7 @@ resource "azurerm_bot_channel_directline" "test" { resource_group_name = "${azurerm_resource_group.test.name}" site { name = "test" - enabled = true + enabled = true v1_allowed = true v3_allowed = true enhanced_authentication_enabled = true @@ -183,7 +183,10 @@ resource "azurerm_bot_channel_directline" "test" { bot_name = "${azurerm_bot_channels_registration.test.name}" location = "${azurerm_bot_channels_registration.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - enabled = false + site { + name = "test" + enabled = false + } } `, template) } From 4ea7ed13973492873d9e7606771dea0ec207b459 Mon Sep 17 00:00:00 2001 From: John Kendall Date: Tue, 4 Feb 2020 12:30:53 +1100 Subject: [PATCH 036/498] fix acc test --- .../bot/tests/resource_arm_bot_channel_directline_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go b/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go index 1b1db1aba6ce7..ccbe57ea5b31a 100644 --- a/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go +++ b/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go @@ -149,6 +149,10 @@ resource "azurerm_bot_channel_directline" "test" { bot_name = "${azurerm_bot_channels_registration.test.name}" location = "${azurerm_bot_channels_registration.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" + site { + name = "test" + enabled = true + } } `, template) } From 924c38a465038e6762fd97f4ce3cf8d5c3fdba07 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Mon, 3 Feb 2020 18:21:32 -0800 Subject: [PATCH 037/498] Done except for purge on destroy --- azurerm/helpers/azure/key_vault.go | 17 ++++++++++ .../keyvault/resource_arm_key_vault.go | 33 +++++++++---------- 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/azurerm/helpers/azure/key_vault.go b/azurerm/helpers/azure/key_vault.go index 7957380bb5946..3ab6c2340fe8b 100644 --- a/azurerm/helpers/azure/key_vault.go +++ b/azurerm/helpers/azure/key_vault.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2018-02-14/keyvault" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -118,3 +119,19 @@ func KeyVaultExists(ctx context.Context, client *keyvault.VaultsClient, keyVault return true, nil } + +func KeyVaultCustomizeDiff(d *schema.ResourceDiff, _ interface{}) error { + if d.HasChange("soft_delete_enabled") { + if old, new := d.GetChange("soft_delete_enabled"); old.(bool) && !new.(bool) { + return fmt.Errorf("the property 'soft_delete_enabled' cannot be set to false, enabling the soft delete for a vault is an irreversible action") + } + } + + if d.HasChange("purge_protection_enabled") { + if old, new := d.GetChange("purge_protection_enabled"); old.(bool) && !new.(bool) { + return fmt.Errorf("the property 'purge_protection_enabled' cannot be set to false, enabling the purge protection for a vault is an irreversible action") + } + } + + return nil +} diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault.go b/azurerm/internal/services/keyvault/resource_arm_key_vault.go index 8d6448d1b456e..736a66d8eb955 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault.go @@ -138,6 +138,11 @@ func resourceArmKeyVault() *schema.Resource { Optional: true, }, + "purge_protection_enabled": { + Type: schema.TypeBool, + Optional: true, + }, + "network_acls": { Type: schema.TypeList, Optional: true, @@ -179,6 +184,8 @@ func resourceArmKeyVault() *schema.Resource { "tags": tags.Schema(), }, + + CustomizeDiff: azure.KeyVaultCustomizeDiff, } } @@ -204,20 +211,14 @@ func resourceArmKeyVaultCreateUpdate(d *schema.ResourceData, meta interface{}) e return tf.ImportAsExistsError("azurerm_key_vault", *existing.ID) } } - - purgeSoftDeleteOnDestroy := meta.(*clients.Client).Features.KeyVault.PurgeSoftDeleteOnDestroy - - if purgeSoftDeleteOnDestroy { - log.Printf("[INFO] purgeSoftDeleteOnDestroy is true") - } - location := azure.NormalizeLocation(d.Get("location").(string)) tenantUUID := uuid.FromStringOrNil(d.Get("tenant_id").(string)) enabledForDeployment := d.Get("enabled_for_deployment").(bool) enabledForDiskEncryption := d.Get("enabled_for_disk_encryption").(bool) enabledForTemplateDeployment := d.Get("enabled_for_template_deployment").(bool) - enabledForSoftDelete := d.Get("soft_delete_enabled").(bool) - enabledForPurgeProtection := d.Get("enabled_for_purge_protection").(bool) + softDeleteEnabled := d.Get("soft_delete_enabled").(bool) + purgeProtectionEnabled := d.Get("purge_protection_enabled").(bool) + t := d.Get("tags").(map[string]interface{}) networkAclsRaw := d.Get("network_acls").([]interface{}) @@ -248,14 +249,12 @@ func resourceArmKeyVaultCreateUpdate(d *schema.ResourceData, meta interface{}) e Tags: tags.Expand(t), } - // This setting can only be set if it is true, if set when value is false API returns errors - if enabledForSoftDelete { - parameters.Properties.EnableSoftDelete = &enabledForSoftDelete + // This settings can only be set if it is true, if set when value is false API returns errors + if softDeleteEnabled { + parameters.Properties.EnableSoftDelete = &softDeleteEnabled } - - // This setting can only be set if it is true, if set when value is false API returns errors - if enabledForPurgeProtection { - parameters.Properties.EnablePurgeProtection = &enabledForPurgeProtection + if purgeProtectionEnabled { + parameters.Properties.EnablePurgeProtection = &purgeProtectionEnabled } // Locking this resource so we don't make modifications to it at the same time if there is a @@ -357,7 +356,7 @@ func resourceArmKeyVaultRead(d *schema.ResourceData, meta interface{}) error { d.Set("enabled_for_disk_encryption", props.EnabledForDiskEncryption) d.Set("enabled_for_template_deployment", props.EnabledForTemplateDeployment) d.Set("soft_delete_enabled", props.EnableSoftDelete) - d.Set("enabled_for_purge_protection", props.EnablePurgeProtection) + d.Set("purge_protection_enabled", props.EnablePurgeProtection) d.Set("vault_uri", props.VaultURI) if sku := props.Sku; sku != nil { From 04d4a12ae4639e2411b4c87bf53120266a2d58ad Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Wed, 5 Feb 2020 06:58:37 -0600 Subject: [PATCH 038/498] Fix documentation error --- .../r/monitor_scheduled_query_rules_alert.html.markdown | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown b/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown index 19cdc7ee01488..138e4fc9b472f 100644 --- a/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown +++ b/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown @@ -53,8 +53,8 @@ resource "azurerm_scheduled_query_rule_alert" "example" { severity = 1 time_window = 30 trigger { - threshold_operator = "GreaterThan" - threshold = 3 + operator = "GreaterThan" + threshold = 3 metric_trigger { operator = "GreaterThan" threshold = 1 @@ -86,8 +86,8 @@ resource "azurerm_scheduled_query_rule_alert" "example2" { severity = "1" time_window = 30 trigger { - threshold_operator = "GreaterThan" - threshold = 3 + operator = "GreaterThan" + threshold = 3 } } ``` From 0f89dbde8fa1aa78bd8560fcdfaf6fb26d64e9ee Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Wed, 5 Feb 2020 16:24:10 -0800 Subject: [PATCH 039/498] Working soft delete and purge --- .../keyvault/data_source_key_vault.go | 8 ++--- .../keyvault/resource_arm_key_vault.go | 35 +++++++++++++------ 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/azurerm/internal/services/keyvault/data_source_key_vault.go b/azurerm/internal/services/keyvault/data_source_key_vault.go index 6117855e4e12e..82ecb8e5f06ee 100644 --- a/azurerm/internal/services/keyvault/data_source_key_vault.go +++ b/azurerm/internal/services/keyvault/data_source_key_vault.go @@ -156,12 +156,12 @@ func dataSourceArmKeyVault() *schema.Resource { }, }, - "enabled_for_soft_delete": { + "purge_protection_enabled": { Type: schema.TypeBool, Computed: true, }, - "enabled_for_purge_protection": { + "soft_delete_enabled": { Type: schema.TypeBool, Computed: true, }, @@ -200,8 +200,8 @@ func dataSourceArmKeyVaultRead(d *schema.ResourceData, meta interface{}) error { d.Set("enabled_for_deployment", props.EnabledForDeployment) d.Set("enabled_for_disk_encryption", props.EnabledForDiskEncryption) d.Set("enabled_for_template_deployment", props.EnabledForTemplateDeployment) - d.Set("enabled_for_soft_delete", props.EnableSoftDelete) - d.Set("enabled_for_purge_protection", props.EnablePurgeProtection) + d.Set("soft_delete_enabled", props.EnableSoftDelete) + d.Set("purge_protection_enabled", props.EnablePurgeProtection) d.Set("vault_uri", props.VaultURI) if sku := props.Sku; sku != nil { diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault.go b/azurerm/internal/services/keyvault/resource_arm_key_vault.go index 736a66d8eb955..eb7207f76fbc0 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault.go @@ -133,16 +133,6 @@ func resourceArmKeyVault() *schema.Resource { Optional: true, }, - "soft_delete_enabled": { - Type: schema.TypeBool, - Optional: true, - }, - - "purge_protection_enabled": { - Type: schema.TypeBool, - Optional: true, - }, - "network_acls": { Type: schema.TypeList, Optional: true, @@ -182,6 +172,16 @@ func resourceArmKeyVault() *schema.Resource { }, }, + "purge_protection_enabled": { + Type: schema.TypeBool, + Optional: true, + }, + + "soft_delete_enabled": { + Type: schema.TypeBool, + Optional: true, + }, + "tags": tags.Schema(), }, @@ -211,7 +211,20 @@ func resourceArmKeyVaultCreateUpdate(d *schema.ResourceData, meta interface{}) e return tf.ImportAsExistsError("azurerm_key_vault", *existing.ID) } } + + // before creating check to see if the key vault exists in the soft delete state location := azure.NormalizeLocation(d.Get("location").(string)) + softDel, err := client.GetDeleted(ctx, name, location) + if err != nil && !utils.ResponseWasNotFound(softDel.Response) { + return fmt.Errorf("Error retrieving soft deleted Key Vault %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + if props := softDel.Properties; props != nil { + delDate := (*props.DeletionDate).Format(time.RFC3339) + purgeDate := (*props.ScheduledPurgeDate).Format(time.RFC3339) + return fmt.Errorf("unable to create Key Vault %q (Resource Group %q) becauese it already exists in the soft delete state. The key vault was soft deleted on %s and is scheduled to be purged on %s", name, resourceGroup, delDate, purgeDate) + } + tenantUUID := uuid.FromStringOrNil(d.Get("tenant_id").(string)) enabledForDeployment := d.Get("enabled_for_deployment").(bool) enabledForDiskEncryption := d.Get("enabled_for_disk_encryption").(bool) @@ -438,7 +451,7 @@ func resourceArmKeyVaultDelete(d *schema.ResourceData, meta interface{}) error { } } - if d.Get("purge_on_delete").(bool) && d.Get("soft_delete_enabled").(bool) && err == nil { + if meta.(*clients.Client).Features.KeyVault.PurgeSoftDeleteOnDestroy { log.Printf("[DEBUG] KeyVault %s marked for purge, executing purge", name) location := d.Get("location").(string) From eab1f69d01f174a5e289f8a1c6d818674d7ad966 Mon Sep 17 00:00:00 2001 From: v-cheye Date: Thu, 6 Feb 2020 09:42:09 +0800 Subject: [PATCH 040/498] Add name validation for azurerm_role_assignment --- .../authorization/resource_arm_role_assignment.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/azurerm/internal/services/authorization/resource_arm_role_assignment.go b/azurerm/internal/services/authorization/resource_arm_role_assignment.go index 7afbdb0edc2cb..f11016a66c8c7 100644 --- a/azurerm/internal/services/authorization/resource_arm_role_assignment.go +++ b/azurerm/internal/services/authorization/resource_arm_role_assignment.go @@ -12,6 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" @@ -36,10 +37,11 @@ func resourceArmRoleAssignment() *schema.Resource { Schema: map[string]*schema.Schema{ "name": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ForceNew: true, + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + ValidateFunc: validate.GUID, }, "scope": { From 023aa56a2bfaac84ff642f09216314c3b7b5c5f6 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Thu, 6 Feb 2020 16:53:48 -0800 Subject: [PATCH 041/498] Complete --- azurerm/helpers/azure/key_vault.go | 28 ++++ azurerm/internal/provider/features.go | 2 +- azurerm/internal/provider/provider.go | 1 - .../keyvault/resource_arm_key_vault.go | 37 +++-- .../tests/data_source_key_vault_test.go | 11 +- .../tests/resource_arm_key_vault_test.go | 142 ++++++++---------- website/docs/d/key_vault.html.markdown | 4 +- website/docs/index.html.markdown | 10 ++ website/docs/r/key_vault.html.markdown | 23 ++- 9 files changed, 157 insertions(+), 101 deletions(-) diff --git a/azurerm/helpers/azure/key_vault.go b/azurerm/helpers/azure/key_vault.go index 3ab6c2340fe8b..f75368e5d2374 100644 --- a/azurerm/helpers/azure/key_vault.go +++ b/azurerm/helpers/azure/key_vault.go @@ -3,6 +3,7 @@ package azure import ( "context" "fmt" + "time" "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2018-02-14/keyvault" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -135,3 +136,30 @@ func KeyVaultCustomizeDiff(d *schema.ResourceDiff, _ interface{}) error { return nil } + +func KeyVaultGetSoftDeletedState(ctx context.Context, client *keyvault.VaultsClient, name string, location string) (deleteDate interface{}, purgeDate interface{}, err error) { + softDel, err := client.GetDeleted(ctx, name, location) + if err != nil { + return nil, nil, fmt.Errorf("unable to get soft delete state information: %+v", err) + } + + // the logic is this way because the GetDeleted call will return an existing key vault + // that is not soft deleted, but the Deleted Vault properties will be nil + if props := softDel.Properties; props != nil { + var delDate interface{} + var purgeDate interface{} + + if dd := props.DeletionDate; dd != nil { + delDate = (*dd).Format(time.RFC3339) + } + if pg := props.ScheduledPurgeDate; pg != nil { + purgeDate = (*pg).Format(time.RFC3339) + } + if delDate != nil && purgeDate != nil { + return delDate, purgeDate, nil + } + } + + // this means we found an existing key vault that is not soft deleted + return nil, nil, nil +} diff --git a/azurerm/internal/provider/features.go b/azurerm/internal/provider/features.go index 9c0321188939b..458d6d9b35153 100644 --- a/azurerm/internal/provider/features.go +++ b/azurerm/internal/provider/features.go @@ -78,7 +78,7 @@ func expandFeatures(input []interface{}) features.UserFeatures { RollInstancesWhenRequired: true, }, KeyVault: features.KeyVaultFeatures{ - PurgeSoftDeleteOnDestroy: false, + PurgeSoftDeleteOnDestroy: true, }, } diff --git a/azurerm/internal/provider/provider.go b/azurerm/internal/provider/provider.go index 77dc218e51405..b59f0af295a3c 100644 --- a/azurerm/internal/provider/provider.go +++ b/azurerm/internal/provider/provider.go @@ -285,7 +285,6 @@ func providerConfigure(p *schema.Provider) schema.ConfigureFunc { } } - const resourceProviderRegistrationErrorFmt = `Error ensuring Resource Providers are registered. Terraform automatically attempts to register the Resource Providers it supports to diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault.go b/azurerm/internal/services/keyvault/resource_arm_key_vault.go index eb7207f76fbc0..6d1772756f0bc 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault.go @@ -198,6 +198,7 @@ func resourceArmKeyVaultCreateUpdate(d *schema.ResourceData, meta interface{}) e name := d.Get("name").(string) resourceGroup := d.Get("resource_group_name").(string) + purgeProtectionEnabled := d.Get("purge_protection_enabled").(bool) if features.ShouldResourcesBeImported() && d.IsNewResource() { existing, err := client.Get(ctx, resourceGroup, name) @@ -214,15 +215,17 @@ func resourceArmKeyVaultCreateUpdate(d *schema.ResourceData, meta interface{}) e // before creating check to see if the key vault exists in the soft delete state location := azure.NormalizeLocation(d.Get("location").(string)) - softDel, err := client.GetDeleted(ctx, name, location) - if err != nil && !utils.ResponseWasNotFound(softDel.Response) { - return fmt.Errorf("Error retrieving soft deleted Key Vault %q (Resource Group %q): %+v", name, resourceGroup, err) + delDate, purgeDate, err := azure.KeyVaultGetSoftDeletedState(ctx, client, name, location) + if err == nil { + if delDate != nil || purgeDate != nil { + return fmt.Errorf("unable to create Key Vault %q (Resource Group %q) becauese it already exists in the soft delete state. The key vault was soft deleted on %s and is scheduled to be purged on %s, please use the Azure CLI tool to recover this Key Vault", name, resourceGroup, delDate.(string), purgeDate.(string)) + } + return fmt.Errorf("unable to create Key Vault %q (Resource Group %q) becauese it already exists", name, resourceGroup) } - if props := softDel.Properties; props != nil { - delDate := (*props.DeletionDate).Format(time.RFC3339) - purgeDate := (*props.ScheduledPurgeDate).Format(time.RFC3339) - return fmt.Errorf("unable to create Key Vault %q (Resource Group %q) becauese it already exists in the soft delete state. The key vault was soft deleted on %s and is scheduled to be purged on %s", name, resourceGroup, delDate, purgeDate) + // check to see if they enabled purge protection and purge on destroy + if purgeProtectionEnabled && meta.(*clients.Client).Features.KeyVault.PurgeSoftDeleteOnDestroy { + return fmt.Errorf("conflicting properties 'purge_protection_enabled' and 'purge_soft_delete_on_destroy' are both enabled for Key Vault %q (Resource Group %q). Please disable one of these paroperties and re-apply", name, resourceGroup) } tenantUUID := uuid.FromStringOrNil(d.Get("tenant_id").(string)) @@ -230,7 +233,6 @@ func resourceArmKeyVaultCreateUpdate(d *schema.ResourceData, meta interface{}) e enabledForDiskEncryption := d.Get("enabled_for_disk_encryption").(bool) enabledForTemplateDeployment := d.Get("enabled_for_template_deployment").(bool) softDeleteEnabled := d.Get("soft_delete_enabled").(bool) - purgeProtectionEnabled := d.Get("purge_protection_enabled").(bool) t := d.Get("tags").(map[string]interface{}) @@ -417,6 +419,12 @@ func resourceArmKeyVaultDelete(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("Error retrieving Key Vault %q (Resource Group %q): %+v", name, resourceGroup, err) } + // Check to see if purge protection is enabled or not... + purgeProtectionEnabled := false + if ppe := read.Properties.EnablePurgeProtection; ppe != nil { + purgeProtectionEnabled = *ppe + } + // ensure we lock on the latest network names, to ensure we handle Azure's networking layer being limited to one change at a time virtualNetworkNames := make([]string, 0) if props := read.Properties; props != nil { @@ -452,9 +460,20 @@ func resourceArmKeyVaultDelete(d *schema.ResourceData, meta interface{}) error { } if meta.(*clients.Client).Features.KeyVault.PurgeSoftDeleteOnDestroy { - log.Printf("[DEBUG] KeyVault %s marked for purge, executing purge", name) location := d.Get("location").(string) + // check to see if purge protection is enabled or not + if purgeProtectionEnabled { + delDate, purgeDate, err := azure.KeyVaultGetSoftDeletedState(ctx, client, name, location) + if err == nil { + if delDate != nil && purgeDate != nil { + return fmt.Errorf("unable to purge Key Vault %q (Resource Group %q) because it has purge protection enabled. The key vault was soft deleted on %s and is scheduled to be purged on %s", name, resourceGroup, delDate.(string), purgeDate.(string)) + } + return fmt.Errorf("unable to purge Key Vault %q (Resource Group %q) because it has purge protection enabled", name, resourceGroup) + } + } + + log.Printf("[DEBUG] KeyVault %s marked for purge, executing purge", name) future, err := client.PurgeDeleted(ctx, name, location) if err != nil { return err diff --git a/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go b/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go index 9b33dc5a66bea..18e6526a428de 100644 --- a/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go @@ -111,7 +111,7 @@ func TestAccDataSourceAzureRMKeyVault_networkAcls(t *testing.T) { }) } -func TestAccDataSourceAzureRMKeyVault_enable_soft_delete(t *testing.T) { +func TestAccDataSourceAzureRMKeyVault_softDelete(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_key_vault", "test") resource.Test(t, resource.TestCase{ @@ -123,10 +123,13 @@ func TestAccDataSourceAzureRMKeyVault_enable_soft_delete(t *testing.T) { Config: testAccDataSourceAzureRMKeyVault_enable_soft_delete(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMKeyVaultExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "enabled_for_soft_delete", "true"), - resource.TestCheckResourceAttr(data.ResourceName, "enabled_for_purge_protection", "false"), + resource.TestCheckResourceAttr(data.ResourceName, "soft_delete_enabled", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "purge_protection_enabled", "false"), ), }, + { + Config: testAccAzureRMKeyVault_softDeletePurge(data), + }, }, }) } @@ -168,7 +171,7 @@ data "azurerm_key_vault" "test" { } func testAccDataSourceAzureRMKeyVault_enable_soft_delete(data acceptance.TestData) string { - r := testAccAzureRMKeyVault_enable_soft_delete(data) + r := testAccAzureRMKeyVault_softDelete(data) return fmt.Sprintf(` %s diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go index 94912adf292a5..087882a0fe7fb 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go @@ -331,50 +331,35 @@ func TestAccAzureRMKeyVault_justCert(t *testing.T) { }) } -func TestAccAzureRMKeyVault_soft_delete(t *testing.T) { +func TestAccAzureRMKeyVault_softDelete(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_key_vault", "test") - expectedError := fmt.Sprintf("^Check failed: Check 1/1 error: Not found: %s", data.ResourceName) - errorRegEx, _ := regexp.Compile(expectedError) - resource.Test(t, resource.TestCase{ + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, CheckDestroy: testCheckAzureRMKeyVaultDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMKeyVault_basic(data), + Config: testAccAzureRMKeyVault_softDelete(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMKeyVaultExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "access_policy.0.key_permissions.0", "create"), - resource.TestCheckResourceAttr(data.ResourceName, "access_policy.0.secret_permissions.0", "set"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.environment", "Production"), + resource.TestCheckResourceAttr(data.ResourceName, "soft_delete_enabled", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "purge_protection_enabled", "false"), ), }, { - Config: testAccAzureRMKeyVault_enable_soft_delete(data), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(data.ResourceName, "access_policy.0.key_permissions.0", "get"), - resource.TestCheckResourceAttr(data.ResourceName, "access_policy.0.secret_permissions.0", "get"), - resource.TestCheckResourceAttr(data.ResourceName, "enabled_for_soft_delete", "true"), - resource.TestCheckResourceAttr(data.ResourceName, "enabled_for_purge_protection", "false"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.environment", "Production"), - ), + Config: testAccAzureRMKeyVault_softDeletePurge(data), }, { - Config: testAccAzureRMKeyVault_purge_vault(data), - ExpectError: errorRegEx, + Config: testAccAzureRMKeyVault_softDelete(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMKeyVaultExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "soft_delete_enabled", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "purge_protection_enabled", "false"), ), }, { - Config: testAccAzureRMKeyVault_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMKeyVaultExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "access_policy.0.key_permissions.0", "create"), - resource.TestCheckResourceAttr(data.ResourceName, "access_policy.0.secret_permissions.0", "set"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.environment", "Production"), - ), + Config: testAccAzureRMKeyVault_softDeletePurge(data), }, }, }) @@ -840,59 +825,6 @@ resource "azurerm_key_vault" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } -func testAccAzureRMKeyVault_enable_soft_delete(data acceptance.TestData) string { - return fmt.Sprintf(` -data "azurerm_client_config" "current" {} - -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_key_vault" "test" { - name = "vault%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - tenant_id = "${data.azurerm_client_config.current.tenant_id}" - - sku { - name = "premium" - } - - access_policy { - tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.client_id}" - - key_permissions = [ - "get", - ] - - secret_permissions = [ - "get", - ] - } - - enabled_for_soft_delete = true - purge_on_delete = true - - tags = { - environment = "Production" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - -func testAccAzureRMKeyVault_purge_vault(data acceptance.TestData) string { - return fmt.Sprintf(` -data "azurerm_client_config" "current" {} - -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} -`, data.RandomInteger, data.Locations.Primary) -} - func testAccAzureRMKeyVault_complete(data acceptance.TestData) string { return fmt.Sprintf(` data "azurerm_client_config" "current" {} @@ -1036,3 +968,57 @@ access_policy { } `, oid) } + +func testAccAzureRMKeyVault_softDelete(data acceptance.TestData) string { + return fmt.Sprintf(` +data "azurerm_client_config" "current" {} + +provider "azurerm" { + alias = "keyVault" + + features { + key_vault { + purge_soft_delete_on_destroy = true + } + } +} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_key_vault" "test" { + name = "vault%d" + provider = azurerm.keyVault + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + tenant_id = "${data.azurerm_client_config.current.tenant_id}" + soft_delete_enabled = true + purge_protection_enabled = false + + sku_name = "premium" +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) +} + +func testAccAzureRMKeyVault_softDeletePurge(data acceptance.TestData) string { + return fmt.Sprintf(` +data "azurerm_client_config" "current" {} + +provider "azurerm" { + alias = "keyVault" + + features { + key_vault { + purge_soft_delete_on_destroy = true + } + } +} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} +`, data.RandomInteger, data.Locations.Primary) +} diff --git a/website/docs/d/key_vault.html.markdown b/website/docs/d/key_vault.html.markdown index 73bb65e0f4236..40cf255b27446 100644 --- a/website/docs/d/key_vault.html.markdown +++ b/website/docs/d/key_vault.html.markdown @@ -53,9 +53,9 @@ The following attributes are exported: * `enabled_for_template_deployment` - Can Azure Resource Manager retrieve secrets from the Key Vault? -* `enabled_for_soft_delete` - Is soft delete enabled on this Key Vault? +* `soft_delete_enabled` - Is soft delete enabled on this Key Vault? -* `enabled_for_purge_protection` - Is purge protection enabled on this Key Vault? +* `purge_protection_enabled` - Is purge protection enabled on this Key Vault? * `tags` - A mapping of tags assigned to the Key Vault. diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown index 5732fa2caeac2..310b2c4def1b0 100644 --- a/website/docs/index.html.markdown +++ b/website/docs/index.html.markdown @@ -149,12 +149,22 @@ It's possible to customise the behaviour of certain Azure Provider resources usi The `features` block supports the following: +* `key_vault` - (Optional) A `key_vault` block as defined below. + * `virtual_machine` - (Optional) A `virtual_machine` block as defined below. * `virtual_machine_scale_set` - (Optional) A `virtual_machine_scale_set` block as defined below. --- +The `key_vault` block supports the following: + +* `purge_soft_delete_on_destroy` - (Optional) Should the `azurerm_key_vault` resource be permanently deleted (e.g. purged) when destroyed? Defaults to `true`. + +~> **Note:** When purge protection is enabled, a vault or an object in the deleted state cannot be purged until the retention period has passed. + +--- + The `virtual_machine` block supports the following: * `delete_os_disk_on_deletion` - (Optional) Should the `azurerm_linux_virtual_machine` and `azurerm_windows_virtual_machine` resources delete the OS Disk attached to the Virtual Machine when the Virtual Machine is destroyed? Defaults to `true`. diff --git a/website/docs/r/key_vault.html.markdown b/website/docs/r/key_vault.html.markdown index 9bf8807beb993..4a97eac0e3d73 100644 --- a/website/docs/r/key_vault.html.markdown +++ b/website/docs/r/key_vault.html.markdown @@ -15,6 +15,16 @@ Manages a Key Vault. ## Example Usage ```hcl +provider "azurerm" { + alias = "keyVault" + + features { + key_vault { + purge_soft_delete_on_destroy = true + } + } +} + resource "azurerm_resource_group" "example" { name = "resourceGroup1" location = "West US" @@ -22,10 +32,13 @@ resource "azurerm_resource_group" "example" { resource "azurerm_key_vault" "example" { name = "testvault" + provider = azurerm.keyVault location = "${azurerm_resource_group.example.location}" resource_group_name = "${azurerm_resource_group.example.name}" enabled_for_disk_encryption = true tenant_id = "d6e396d0-5584-41dc-9fc0-268df99bc610" + soft_delete_enabled = true + purge_protection_enabled = false sku_name = "standard" @@ -83,15 +96,13 @@ The following arguments are supported: * `enabled_for_template_deployment` - (Optional) Boolean flag to specify whether Azure Resource Manager is permitted to retrieve secrets from the key vault. Defaults to `false`. -* `enabled_for_soft_delete` - (Optional) Should Soft Delete be enabled for items in this Key Vault? - --> **NOTE:** Once enabled you can not disable this setting. +* `soft_delete_enabled` - (Optional) Should Soft Delete be enabled for this Key Vault? -* `purge_on_delete` - (Optional) Boolean flag to specify if the KeyVault should be purged on delete. This purges KeyVaults enabled for soft delete on resource deletition. +-> **NOTE:** Once `soft_delete_enabled` has been enabled it is an **irreversible** action. If you want to destroy this key vault before the 90 day purge policy expires you must set the `purge_soft_delete_on_destroy` to **true** in the `key_vault` section of the azure provider `features` block. -* `enabled_for_purge_protection` - (Optional) Is Purge Protection enabled for this Key Vault? +* `purge_protection_enabled` - (Optional) Is Purge Protection enabled for this Key Vault? --> **NOTE:** Once Purge Protection has been Enabled there's currently no way to Disable it - [support for this is being tracked in this Azure API issue](https://github.com/Azure/azure-rest-api-specs/issues/8075) +-> **NOTE:** Once `purge_protection_enabled` has been enabled it is an **irreversible** action. - [support for this is being tracked in this Azure API issue](https://github.com/Azure/azure-rest-api-specs/issues/8075) * `network_acls` - (Optional) A `network_acls` block as defined below. From 7b9909c21d2e675a21ea074d90b3f308ecff139b Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Thu, 6 Feb 2020 16:59:06 -0800 Subject: [PATCH 042/498] updated or to and --- azurerm/internal/services/keyvault/resource_arm_key_vault.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault.go b/azurerm/internal/services/keyvault/resource_arm_key_vault.go index 6d1772756f0bc..2b6429646558d 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault.go @@ -217,7 +217,7 @@ func resourceArmKeyVaultCreateUpdate(d *schema.ResourceData, meta interface{}) e location := azure.NormalizeLocation(d.Get("location").(string)) delDate, purgeDate, err := azure.KeyVaultGetSoftDeletedState(ctx, client, name, location) if err == nil { - if delDate != nil || purgeDate != nil { + if delDate != nil && purgeDate != nil { return fmt.Errorf("unable to create Key Vault %q (Resource Group %q) becauese it already exists in the soft delete state. The key vault was soft deleted on %s and is scheduled to be purged on %s, please use the Azure CLI tool to recover this Key Vault", name, resourceGroup, delDate.(string), purgeDate.(string)) } return fmt.Errorf("unable to create Key Vault %q (Resource Group %q) becauese it already exists", name, resourceGroup) From 96a36df0b80f1ea75638635f60e5fde6c15ce3ee Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Thu, 6 Feb 2020 18:45:24 -0800 Subject: [PATCH 043/498] Fix features test cases --- azurerm/internal/provider/features_test.go | 111 ++++++++++++++++++++- 1 file changed, 110 insertions(+), 1 deletion(-) diff --git a/azurerm/internal/provider/features_test.go b/azurerm/internal/provider/features_test.go index 09be0cd828f3f..41041e6d1e342 100644 --- a/azurerm/internal/provider/features_test.go +++ b/azurerm/internal/provider/features_test.go @@ -24,10 +24,13 @@ func TestExpandFeatures(t *testing.T) { VirtualMachineScaleSet: features.VirtualMachineScaleSetFeatures{ RollInstancesWhenRequired: true, }, + KeyVault: features.KeyVaultFeatures{ + PurgeSoftDeleteOnDestroy: true, + }, }, }, { - Name: "Complete", + Name: "Complete Enabled", Input: []interface{}{ map[string]interface{}{ "virtual_machine": []interface{}{ @@ -40,6 +43,11 @@ func TestExpandFeatures(t *testing.T) { "roll_instances_when_required": true, }, }, + "key_vault": []interface{}{ + map[string]interface{}{ + "purge_soft_delete_on_destroy": true, + }, + }, }, }, Expected: features.UserFeatures{ @@ -49,6 +57,42 @@ func TestExpandFeatures(t *testing.T) { VirtualMachineScaleSet: features.VirtualMachineScaleSetFeatures{ RollInstancesWhenRequired: true, }, + KeyVault: features.KeyVaultFeatures{ + PurgeSoftDeleteOnDestroy: true, + }, + }, + }, + { + Name: "Complete Disabled", + Input: []interface{}{ + map[string]interface{}{ + "virtual_machine": []interface{}{ + map[string]interface{}{ + "delete_os_disk_on_deletion": false, + }, + }, + "virtual_machine_scale_set": []interface{}{ + map[string]interface{}{ + "roll_instances_when_required": false, + }, + }, + "key_vault": []interface{}{ + map[string]interface{}{ + "purge_soft_delete_on_destroy": false, + }, + }, + }, + }, + Expected: features.UserFeatures{ + VirtualMachine: features.VirtualMachineFeatures{ + DeleteOSDiskOnDeletion: false, + }, + VirtualMachineScaleSet: features.VirtualMachineScaleSetFeatures{ + RollInstancesWhenRequired: false, + }, + KeyVault: features.KeyVaultFeatures{ + PurgeSoftDeleteOnDestroy: false, + }, }, }, } @@ -62,6 +106,71 @@ func TestExpandFeatures(t *testing.T) { } } +func TestExpandFeaturesKeyVault(t *testing.T) { + testData := []struct { + Name string + Input []interface{} + EnvVars map[string]interface{} + Expected features.UserFeatures + }{ + { + Name: "Empty Block", + Input: []interface{}{ + map[string]interface{}{ + "key_vault": []interface{}{}, + }, + }, + Expected: features.UserFeatures{ + KeyVault: features.KeyVaultFeatures{ + PurgeSoftDeleteOnDestroy: true, + }, + }, + }, + { + Name: "Purge Soft Delete On Destroy Enabled", + Input: []interface{}{ + map[string]interface{}{ + "key_vault": []interface{}{ + map[string]interface{}{ + "purge_soft_delete_on_destroy": true, + }, + }, + }, + }, + Expected: features.UserFeatures{ + KeyVault: features.KeyVaultFeatures{ + PurgeSoftDeleteOnDestroy: true, + }, + }, + }, + { + Name: "Purge Soft Delete On Destroy Disabled", + Input: []interface{}{ + map[string]interface{}{ + "key_vault": []interface{}{ + map[string]interface{}{ + "purge_soft_delete_on_destroy": false, + }, + }, + }, + }, + Expected: features.UserFeatures{ + KeyVault: features.KeyVaultFeatures{ + PurgeSoftDeleteOnDestroy: false, + }, + }, + }, + } + + for _, testCase := range testData { + t.Logf("[DEBUG] Test Case: %q", testCase.Name) + result := expandFeatures(testCase.Input) + if !reflect.DeepEqual(result.KeyVault, testCase.Expected.KeyVault) { + t.Fatalf("Expected %+v but got %+v", result.KeyVault, testCase.Expected.KeyVault) + } + } +} + func TestExpandFeaturesVirtualMachine(t *testing.T) { testData := []struct { Name string From 3912093b6bc472adb627d6d92905366a1bceef42 Mon Sep 17 00:00:00 2001 From: WS <20408400+WodansSon@users.noreply.github.com> Date: Thu, 6 Feb 2020 22:05:13 -0800 Subject: [PATCH 044/498] Removed sku support from datasource --- .../keyvault/data_source_key_vault.go | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/azurerm/internal/services/keyvault/data_source_key_vault.go b/azurerm/internal/services/keyvault/data_source_key_vault.go index 82ecb8e5f06ee..e940f74ebc078 100644 --- a/azurerm/internal/services/keyvault/data_source_key_vault.go +++ b/azurerm/internal/services/keyvault/data_source_key_vault.go @@ -34,20 +34,6 @@ func dataSourceArmKeyVault() *schema.Resource { "location": azure.SchemaLocationForDataSource(), - // Remove in 2.0 - "sku": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Computed: true, - }, - }, - }, - }, - "sku_name": { Type: schema.TypeString, Computed: true, @@ -205,11 +191,6 @@ func dataSourceArmKeyVaultRead(d *schema.ResourceData, meta interface{}) error { d.Set("vault_uri", props.VaultURI) if sku := props.Sku; sku != nil { - // Remove in 2.0 - if err := d.Set("sku", flattenKeyVaultDataSourceSku(sku)); err != nil { - return fmt.Errorf("Error setting `sku` for KeyVault %q: %+v", *resp.Name, err) - } - if err := d.Set("sku_name", string(sku.Name)); err != nil { return fmt.Errorf("Error setting `sku_name` for KeyVault %q: %+v", *resp.Name, err) } @@ -230,15 +211,6 @@ func dataSourceArmKeyVaultRead(d *schema.ResourceData, meta interface{}) error { return tags.FlattenAndSet(d, resp.Tags) } -// Remove in 2.0 -func flattenKeyVaultDataSourceSku(sku *keyvault.Sku) []interface{} { - result := map[string]interface{}{ - "name": string(sku.Name), - } - - return []interface{}{result} -} - func flattenKeyVaultDataSourceNetworkAcls(input *keyvault.NetworkRuleSet) []interface{} { if input == nil { return []interface{}{} From b02dd08ce513cf50b51d1bef4f01195c5511bdf9 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Fri, 7 Feb 2020 15:51:31 -0800 Subject: [PATCH 045/498] Add code to skip purge if not soft deleted --- .../internal/services/keyvault/resource_arm_key_vault.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault.go b/azurerm/internal/services/keyvault/resource_arm_key_vault.go index 2b6429646558d..110bd66bebe6b 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault.go @@ -421,9 +421,13 @@ func resourceArmKeyVaultDelete(d *schema.ResourceData, meta interface{}) error { // Check to see if purge protection is enabled or not... purgeProtectionEnabled := false + softDeleteEnabled := false if ppe := read.Properties.EnablePurgeProtection; ppe != nil { purgeProtectionEnabled = *ppe } + if sde := read.Properties.EnableSoftDelete; sde != nil { + softDeleteEnabled = *sde + } // ensure we lock on the latest network names, to ensure we handle Azure's networking layer being limited to one change at a time virtualNetworkNames := make([]string, 0) @@ -459,10 +463,10 @@ func resourceArmKeyVaultDelete(d *schema.ResourceData, meta interface{}) error { } } - if meta.(*clients.Client).Features.KeyVault.PurgeSoftDeleteOnDestroy { + if meta.(*clients.Client).Features.KeyVault.PurgeSoftDeleteOnDestroy && softDeleteEnabled { location := d.Get("location").(string) - // check to see if purge protection is enabled or not + // raise an error if the key vault is in the soft delete state and purge protection is enabled if purgeProtectionEnabled { delDate, purgeDate, err := azure.KeyVaultGetSoftDeletedState(ctx, client, name, location) if err == nil { From 96f858a4757a97f3b4607f61703e315ec4dadf93 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Fri, 7 Feb 2020 16:16:13 -0800 Subject: [PATCH 046/498] Remove depricated sku from tests --- .../tests/data_source_key_vault_test.go | 6 +- .../tests/resource_arm_key_vault_key_test.go | 10 +- .../tests/resource_arm_key_vault_test.go | 113 +----------------- 3 files changed, 8 insertions(+), 121 deletions(-) diff --git a/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go b/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go index 18e6526a428de..5105111f4a35e 100644 --- a/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go @@ -46,7 +46,7 @@ func TestAccDataSourceAzureRMKeyVault_basicClassic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMKeyVaultExists(data.ResourceName), resource.TestCheckResourceAttrSet(data.ResourceName, "tenant_id"), - resource.TestCheckResourceAttrSet(data.ResourceName, "sku.0.name"), + resource.TestCheckResourceAttrSet(data.ResourceName, "sku_name"), resource.TestCheckResourceAttrSet(data.ResourceName, "access_policy.0.tenant_id"), resource.TestCheckResourceAttrSet(data.ResourceName, "access_policy.0.object_id"), resource.TestCheckResourceAttr(data.ResourceName, "access_policy.0.key_permissions.0", "create"), @@ -71,7 +71,7 @@ func TestAccDataSourceAzureRMKeyVault_complete(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMKeyVaultExists(data.ResourceName), resource.TestCheckResourceAttrSet(data.ResourceName, "tenant_id"), - resource.TestCheckResourceAttrSet(data.ResourceName, "sku.0.name"), + resource.TestCheckResourceAttrSet(data.ResourceName, "sku_name"), resource.TestCheckResourceAttrSet(data.ResourceName, "access_policy.0.tenant_id"), resource.TestCheckResourceAttrSet(data.ResourceName, "access_policy.0.object_id"), resource.TestCheckResourceAttr(data.ResourceName, "access_policy.0.key_permissions.0", "get"), @@ -97,7 +97,7 @@ func TestAccDataSourceAzureRMKeyVault_networkAcls(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMKeyVaultExists(data.ResourceName), resource.TestCheckResourceAttrSet(data.ResourceName, "tenant_id"), - resource.TestCheckResourceAttrSet(data.ResourceName, "sku.0.name"), + resource.TestCheckResourceAttrSet(data.ResourceName, "sku_name"), resource.TestCheckResourceAttrSet(data.ResourceName, "access_policy.0.tenant_id"), resource.TestCheckResourceAttrSet(data.ResourceName, "access_policy.0.object_id"), resource.TestCheckResourceAttr(data.ResourceName, "access_policy.0.key_permissions.0", "create"), diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go index b8bbcf8b3969f..345f95e0b5b9a 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go @@ -727,9 +727,7 @@ resource "azurerm_key_vault" "test" { resource_group_name = "${azurerm_resource_group.test.name}" tenant_id = "${data.azurerm_client_config.current.tenant_id}" - sku { - name = "premium" - } + sku_name = "premium" access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" @@ -782,10 +780,8 @@ resource "azurerm_key_vault" "test" { resource_group_name = "${azurerm_resource_group.test.name}" tenant_id = "${data.azurerm_client_config.current.tenant_id}" - sku { - name = "premium" - } - + sku_name = "premium" + access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" object_id = "${data.azurerm_client_config.current.service_principal_object_id}" diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go index 087882a0fe7fb..2a7c4ba816fbe 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go @@ -2,7 +2,6 @@ package tests import ( "fmt" - "regexp" "testing" "github.com/hashicorp/go-azure-helpers/response" @@ -92,44 +91,6 @@ func TestAccAzureRMKeyVault_basic(t *testing.T) { }) } -// Remove in 2.0 -func TestAccAzureRMKeyVault_basicNotDefined(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_key_vault", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMKeyVaultDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMKeyVault_basicNotDefined(data), - ExpectError: regexp.MustCompile("either 'sku_name' or 'sku' must be defined in the configuration file"), - }, - }, - }) -} - -// Remove in 2.0 -func TestAccAzureRMKeyVault_basicClassic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_key_vault", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMKeyVaultDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMKeyVault_basicClassic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMKeyVaultExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.name", "premium"), - ), - }, - data.ImportStep(), - }, - }) -} - func TestAccAzureRMKeyVault_requiresImport(t *testing.T) { if !features.ShouldResourcesBeImported() { t.Skip("Skipping since resources aren't required to be imported") @@ -488,72 +449,6 @@ resource "azurerm_key_vault" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } -func testAccAzureRMKeyVault_basicNotDefined(data acceptance.TestData) string { - return fmt.Sprintf(` -data "azurerm_client_config" "current" {} - -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_key_vault" "test" { - name = "vault%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - tenant_id = "${data.azurerm_client_config.current.tenant_id}" - - access_policy { - tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.client_id}" - - key_permissions = [ - "create", - ] - - secret_permissions = [ - "set", - ] - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - -func testAccAzureRMKeyVault_basicClassic(data acceptance.TestData) string { - return fmt.Sprintf(` -data "azurerm_client_config" "current" {} - -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_key_vault" "test" { - name = "vault%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - tenant_id = "${data.azurerm_client_config.current.tenant_id}" - - sku { - name = "premium" - } - - access_policy { - tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.client_id}" - - key_permissions = [ - "create", - ] - - secret_permissions = [ - "set", - ] - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - func testAccAzureRMKeyVault_requiresImport(data acceptance.TestData) string { template := testAccAzureRMKeyVault_basic(data) return fmt.Sprintf(` @@ -778,9 +673,7 @@ resource "azurerm_key_vault" "test" { resource_group_name = "${azurerm_resource_group.test.name}" tenant_id = "${data.azurerm_client_config.current.tenant_id}" - sku { - name = "premium" - } + sku_name = "premium" enabled_for_deployment = true enabled_for_disk_encryption = true @@ -808,9 +701,7 @@ resource "azurerm_key_vault" "test" { resource_group_name = "${azurerm_resource_group.test.name}" tenant_id = "${data.azurerm_client_config.current.tenant_id}" - sku { - name = "premium" - } + sku_name = "premium" access_policy = [] From b8c1418dae86a76cd404a6c5cf1bafa0ae1ddd97 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Fri, 7 Feb 2020 16:46:57 -0800 Subject: [PATCH 047/498] Fix basic test --- .../tests/data_source_key_vault_test.go | 25 ------------------- .../tests/resource_arm_key_vault_test.go | 4 --- 2 files changed, 29 deletions(-) diff --git a/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go b/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go index 5105111f4a35e..cb53ca59a88bc 100644 --- a/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go @@ -33,31 +33,6 @@ func TestAccDataSourceAzureRMKeyVault_basic(t *testing.T) { }) } -func TestAccDataSourceAzureRMKeyVault_basicClassic(t *testing.T) { - data := acceptance.BuildTestData(t, "data.azurerm_key_vault", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMKeyVaultDestroy, - Steps: []resource.TestStep{ - { - Config: testAccDataSourceAzureRMKeyVault_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMKeyVaultExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "tenant_id"), - resource.TestCheckResourceAttrSet(data.ResourceName, "sku_name"), - resource.TestCheckResourceAttrSet(data.ResourceName, "access_policy.0.tenant_id"), - resource.TestCheckResourceAttrSet(data.ResourceName, "access_policy.0.object_id"), - resource.TestCheckResourceAttr(data.ResourceName, "access_policy.0.key_permissions.0", "create"), - resource.TestCheckResourceAttr(data.ResourceName, "access_policy.0.secret_permissions.0", "set"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "0"), - ), - }, - }, - }) -} - func TestAccDataSourceAzureRMKeyVault_complete(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_key_vault", "test") diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go index 2a7c4ba816fbe..0e5eb626b83d8 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go @@ -441,10 +441,6 @@ resource "azurerm_key_vault" "test" { "set", ] } - - tags = { - environment = "Production" - } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } From abd8429b996d9ea471b8aa76e7ebb94482c32def Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Fri, 7 Feb 2020 16:56:13 -0800 Subject: [PATCH 048/498] Fix test case lint issue --- .../services/keyvault/tests/resource_arm_key_vault_key_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go index 345f95e0b5b9a..154db1d273b46 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go @@ -781,7 +781,7 @@ resource "azurerm_key_vault" "test" { tenant_id = "${data.azurerm_client_config.current.tenant_id}" sku_name = "premium" - + access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" object_id = "${data.azurerm_client_config.current.service_principal_object_id}" From 8b74c722c3105305f40aa1556bf620bbb48fdbec Mon Sep 17 00:00:00 2001 From: Austin Cheung Date: Fri, 7 Feb 2020 23:31:02 -0800 Subject: [PATCH 049/498] add support for static website to azurerm_storage_account --- .../services/storage/client/client.go | 6 + .../storage/resource_arm_storage_account.go | 157 ++++++++++++++++++ .../resource_arm_storage_account_test.go | 80 +++++++++ .../2018-11-09/blob/accounts/README.md | 57 +++++++ .../2018-11-09/blob/accounts/client.go | 25 +++ .../blob/accounts/get_service_properties.go | 83 +++++++++ .../2018-11-09/blob/accounts/models.go | 55 ++++++ .../blob/accounts/set_service_properties.go | 76 +++++++++ .../2018-11-09/blob/accounts/version.go | 14 ++ vendor/modules.txt | 1 + website/docs/r/storage_account.html.markdown | 20 +++ 11 files changed, 574 insertions(+) create mode 100644 vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/README.md create mode 100644 vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/client.go create mode 100644 vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/get_service_properties.go create mode 100644 vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/models.go create mode 100644 vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/set_service_properties.go create mode 100644 vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/version.go diff --git a/azurerm/internal/services/storage/client/client.go b/azurerm/internal/services/storage/client/client.go index 9e0af9c918bfb..204e6f9f39ce1 100644 --- a/azurerm/internal/services/storage/client/client.go +++ b/azurerm/internal/services/storage/client/client.go @@ -10,6 +10,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-04-01/storage" az "github.com/Azure/go-autorest/autorest/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common" + "github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts" "github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/blobs" "github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/containers" "github.com/tombuildsstuff/giovanni/storage/2018-11-09/file/directories" @@ -24,6 +25,7 @@ type Client struct { FileSystemsClient *filesystems.Client ManagementPoliciesClient storage.ManagementPoliciesClient BlobServicesClient storage.BlobServicesClient + BlobAccountsClient *accounts.Client environment az.Environment } @@ -40,6 +42,9 @@ func NewClient(options *common.ClientOptions) *Client { blobServicesClient := storage.NewBlobServicesClientWithBaseURI(options.ResourceManagerEndpoint, options.SubscriptionId) options.ConfigureClient(&blobServicesClient.Client, options.ResourceManagerAuthorizer) + blobAccountsClient := accounts.NewWithEnvironment(options.Environment) + blobAccountsClient.Authorizer = options.StorageAuthorizer + // TODO: switch Storage Containers to using the storage.BlobContainersClient // (which should fix #2977) when the storage clients have been moved in here return &Client{ @@ -47,6 +52,7 @@ func NewClient(options *common.ClientOptions) *Client { FileSystemsClient: &fileSystemsClient, ManagementPoliciesClient: managementPoliciesClient, BlobServicesClient: blobServicesClient, + BlobAccountsClient: &blobAccountsClient, environment: options.Environment, } } diff --git a/azurerm/internal/services/storage/resource_arm_storage_account.go b/azurerm/internal/services/storage/resource_arm_storage_account.go index dda85e0d247f6..3e3d5de99f642 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account.go @@ -27,6 +27,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" + "github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts" "github.com/tombuildsstuff/giovanni/storage/2018-11-09/queue/queues" ) @@ -452,6 +453,40 @@ func resourceArmStorageAccount() *schema.Resource { }, }, + "blob_account_properties": { + Type: schema.TypeList, + Optional: true, + Computed: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "static_website": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "enabled": { + Type: schema.TypeBool, + Required: true, + }, + "index_document": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringIsNotEmpty, + }, + "error_document_404_path": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringIsNotEmpty, + }, + }, + }, + }, + }, + }, + }, + "primary_location": { Type: schema.TypeString, Computed: true, @@ -822,6 +857,24 @@ func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) e } } + if val, ok := d.GetOk("blob_account_properties"); ok { + // static website only supported on Storage V2 + if accountKind == string(storage.StorageV2) { + blobAccountClient := meta.(*clients.Client).Storage.BlobAccountsClient + + blobAccountProperties, err := expandBlobAccountProperties(val.([]interface{})) + if err != nil { + return fmt.Errorf("Error expanding `blob_account_properties` for Azure Storage Account %q: %+v", storageAccountName, err) + } + + if _, err = blobAccountClient.SetServiceProperties(ctx, storageAccountName, blobAccountProperties); err != nil { + return fmt.Errorf("Error updating Azure Storage Account `blob_account_properties` %q: %+v", storageAccountName, err) + } + } else { + return fmt.Errorf("`blob_account_properties` are only supported for Storage V2.") + } + } + return resourceArmStorageAccountRead(d, meta) } @@ -1046,6 +1099,26 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e d.SetPartial("queue_properties") } + if d.HasChange("blob_account_properties") { + // static website only supported on Storage V2 + if accountKind == string(storage.StorageV2) { + blobAccountClient := meta.(*clients.Client).Storage.BlobAccountsClient + + blobAccounProperties, err := expandBlobAccountProperties(d.Get("blob_account_properties").([]interface{})) + if err != nil { + return fmt.Errorf("Error expanding `blob_account_properties` for Azure Storage Account %q: %+v", storageAccountName, err) + } + + if _, err = blobAccountClient.SetServiceProperties(ctx, storageAccountName, blobAccounProperties); err != nil { + return fmt.Errorf("Error updating Azure Storage Account `blob_account_properties` %q: %+v", storageAccountName, err) + } + } else { + return fmt.Errorf("`blob_account_properties` are only supported for Storage V2.") + } + + d.SetPartial("blob_account_properties") + } + d.Partial(false) return resourceArmStorageAccountRead(d, meta) } @@ -1260,6 +1333,22 @@ func resourceArmStorageAccountRead(d *schema.ResourceData, meta interface{}) err } } + // static website only supported on Storage V2 + if resp.Kind == storage.StorageV2 { + blobAccountClient := storageClient.BlobAccountsClient + + blobAccountProps, err := blobAccountClient.GetServiceProperties(ctx, name) + if err != nil { + if blobAccountProps.Response.Response != nil && !utils.ResponseWasNotFound(blobAccountProps.Response) { + return fmt.Errorf("Error reading blob account properties for AzureRM Storage Account %q: %+v", name, err) + } + } + + if err := d.Set("blob_account_properties", flattenBlobAccountProperties(blobAccountProps)); err != nil { + return fmt.Errorf("Error setting `blob_account_properties `for AzureRM Storage Account %q: %+v", name, err) + } + } + return tags.FlattenAndSet(d, resp.Tags) } @@ -1553,6 +1642,45 @@ func expandQueuePropertiesCors(input []interface{}) *queues.Cors { return cors } +func expandBlobAccountProperties(input []interface{}) (accounts.StorageServiceProperties, error) { + var err error + properties := accounts.StorageServiceProperties{} + if len(input) == 0 { + return properties, nil + } + + attrs := input[0].(map[string]interface{}) + + properties.StaticWebsite, err = expandBlobAccountPropertiesStaticWebsite(attrs["static_website"].([]interface{})) + if err != nil { + return properties, fmt.Errorf("Error expanding `static_website`: %+v", err) + } + + return properties, nil +} + +func expandBlobAccountPropertiesStaticWebsite(input []interface{}) (*accounts.StaticWebsite, error) { + if len(input) == 0 { + return &accounts.StaticWebsite{}, nil + } + + staticWebsiteAttr := input[0].(map[string]interface{}) + + staticWebsite := &accounts.StaticWebsite{ + Enabled: staticWebsiteAttr["enabled"].(bool), + } + + if v, ok := staticWebsiteAttr["index_document"]; ok { + staticWebsite.IndexDocument = v.(string) + } + + if v, ok := staticWebsiteAttr["error_document_404_path"]; ok { + staticWebsite.ErrorDocument404Path = v.(string) + } + + return staticWebsite, nil +} + func flattenStorageAccountNetworkRules(input *storage.NetworkRuleSet) []interface{} { if input == nil { return []interface{}{} @@ -1729,6 +1857,35 @@ func flattenCorsProperty(input string) []interface{} { return results } +func flattenBlobAccountProperties(input accounts.GetServicePropertiesResult) []interface{} { + if input.Response.Response == nil { + return []interface{}{} + } + + blobAccountProperties := make(map[string]interface{}) + + if storageServiceProps := input.StorageServiceProperties; storageServiceProps != nil { + if staticWebsite := storageServiceProps.StaticWebsite; staticWebsite != nil { + blobAccountProperties["static_website"] = flattenBlobAccountPropertiesStaticWebsite(*staticWebsite) + } + } + + if len(blobAccountProperties) == 0 { + return []interface{}{} + } + return []interface{}{blobAccountProperties} +} + +func flattenBlobAccountPropertiesStaticWebsite(input accounts.StaticWebsite) []interface{} { + staticWebsite := make(map[string]interface{}) + + staticWebsite["enabled"] = input.Enabled + staticWebsite["index_document"] = input.IndexDocument + staticWebsite["error_document_404_path"] = input.ErrorDocument404Path + + return []interface{}{staticWebsite} +} + func flattenStorageAccountBypass(input storage.Bypass) []interface{} { bypassValues := strings.Split(string(input), ", ") bypass := make([]interface{}, len(bypassValues)) diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go index 24f8b1618d89e..a3a6bbf12130b 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go @@ -653,6 +653,32 @@ func TestAccAzureRMStorageAccount_queueProperties(t *testing.T) { }) } +func TestAccAzureRMStorageAccount_blobAccountProperties(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_storage_account", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMStorageAccountDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMStorageAccount_blobAccountProperties(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMStorageAccountExists(data.ResourceName), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMStorageAccount_blobAccountPropertiesUpdated(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMStorageAccountExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + func testCheckAzureRMStorageAccountExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { // Ensure resource group exists in API @@ -1525,3 +1551,57 @@ resource "azurerm_storage_account" "test" { } `, data.RandomInteger, data.Locations.Primary, data.RandomString) } + +func testAccAzureRMStorageAccount_blobAccountProperties(data acceptance.TestData) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-storage-%d" + location = "%s" +} + +resource "azurerm_storage_account" "test" { + name = "unlikely23exst2acct%s" + resource_group_name = "${azurerm_resource_group.test.name}" + + location = "${azurerm_resource_group.test.location}" + account_kind = "StorageV2" + account_tier = "Standard" + account_replication_type = "LRS" + + blob_account_properties { + static_website { + enabled = true + index_document = "index.html" + error_document_404_path = "404.html" + } + } +} +`, data.RandomInteger, data.Locations.Primary, data.RandomString) +} + +func testAccAzureRMStorageAccount_blobAccountPropertiesUpdated(data acceptance.TestData) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-storage-%d" + location = "%s" +} + +resource "azurerm_storage_account" "test" { + name = "unlikely23exst2acct%s" + resource_group_name = "${azurerm_resource_group.test.name}" + + location = "${azurerm_resource_group.test.location}" + account_kind = "StorageV2" + account_tier = "Standard" + account_replication_type = "LRS" + + blob_account_properties { + static_website { + enabled = true + index_document = "index-2.html" + error_document_404_path = "404-2.html" + } + } +} +`, data.RandomInteger, data.Locations.Primary, data.RandomString) +} diff --git a/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/README.md b/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/README.md new file mode 100644 index 0000000000000..a2ec7bfa9567e --- /dev/null +++ b/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/README.md @@ -0,0 +1,57 @@ +## Blob Storage Account SDK for API version 2018-11-09 + +This package allows you to interact with the Accounts Blob Storage API + +### Supported Authorizers + +* Azure Active Directory + +### Example Usage + +```go +package main + +import ( + "context" + "fmt" + "time" + + "github.com/Azure/go-autorest/autorest" + "github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts" +) + +func Example() error { + accountName := "storageaccount1" + + // e.g. https://github.com/tombuildsstuff/giovanni/blob/76f5f686c99ecdcc3fa533a0330d0e1aacb1c327/example/azuread-auth/main.go#L54 + client, err := buildClient() + if err != nil { + return fmt.Errorf("error building client: %s", err) + } + + ctx := context.TODO() + + input := StorageServiceProperties{ + StaticWebsite: &StaticWebsite{ + Enabled: true, + IndexDocument: index, + ErrorDocument404Path: errorDocument, + }, + } + + _, err = client.SetServiceProperties(ctx, accountName, input) + if err != nil { + return fmt.Errorf("error setting properties: %s", err) + } + + time.Sleep(2 * time.Second) + + _, err = accountsClient.GetServiceProperties(ctx, accountName) + if err != nil { + return fmt.Errorf("error getting properties: %s", err) + } + + return nil +} + +``` \ No newline at end of file diff --git a/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/client.go b/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/client.go new file mode 100644 index 0000000000000..0162ebbb0c331 --- /dev/null +++ b/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/client.go @@ -0,0 +1,25 @@ +package accounts + +import ( + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" +) + +// Client is the base client for Blob Storage Blobs. +type Client struct { + autorest.Client + BaseURI string +} + +// New creates an instance of the Client client. +func New() Client { + return NewWithEnvironment(azure.PublicCloud) +} + +// NewWithBaseURI creates an instance of the Client client. +func NewWithEnvironment(environment azure.Environment) Client { + return Client{ + Client: autorest.NewClientWithUserAgent(UserAgent()), + BaseURI: environment.StorageEndpointSuffix, + } +} diff --git a/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/get_service_properties.go b/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/get_service_properties.go new file mode 100644 index 0000000000000..0ce98e04bceb1 --- /dev/null +++ b/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/get_service_properties.go @@ -0,0 +1,83 @@ +package accounts + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "github.com/tombuildsstuff/giovanni/storage/internal/endpoints" + "net/http" +) + +type GetServicePropertiesResult struct { + autorest.Response + + ContentType string + StorageServiceProperties *StorageServiceProperties +} + +// GetServicePropertiesPreparer prepares the GetServiceProperties request. +func (client Client) GetServicePropertiesPreparer(ctx context.Context, accountName string) (*http.Request, error) { + queryParameters := map[string]interface{}{ + "restype": "service", + "comp": "properties", + } + + headers := map[string]interface{}{ + "x-ms-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(endpoints.GetBlobEndpoint(client.BaseURI, accountName)), + autorest.WithHeaders(headers), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +func (client Client) GetServicePropertiesSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +func (client Client) GetServicePropertiesResponder(resp *http.Response) (result GetServicePropertiesResult, err error) { + if resp != nil && resp.Header != nil { + result.ContentType = resp.Header.Get("Content-Type") + } + + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingXML(&result.StorageServiceProperties), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +func (client Client) GetServiceProperties(ctx context.Context, accountName string) (result GetServicePropertiesResult, err error) { + if accountName == "" { + return result, validation.NewError("accounts.Client", "GetServiceProperties", "`accountName` cannot be an empty string.") + } + + req, err := client.GetServicePropertiesPreparer(ctx, accountName) + if err != nil { + err = autorest.NewErrorWithError(err, "accounts.Client", "GetServiceProperties", nil, "Failure preparing request") + return + } + + resp, err := client.GetServicePropertiesSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "accounts.Client", "GetServiceProperties", resp, "Failure sending request") + return + } + + result, err = client.GetServicePropertiesResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "accounts.Client", "GetServiceProperties", resp, "Failure responding to request") + return + } + + return +} diff --git a/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/models.go b/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/models.go new file mode 100644 index 0000000000000..f53b68c7e254e --- /dev/null +++ b/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/models.go @@ -0,0 +1,55 @@ +package accounts + +import "github.com/Azure/go-autorest/autorest" + +type SetServicePropertiesResult struct { + autorest.Response +} + +type StorageServiceProperties struct { + // Cors - Specifies CORS rules for the Blob service. You can include up to five CorsRule elements in the request. If no CorsRule elements are included in the request body, all CORS rules will be deleted, and CORS will be disabled for the Blob service. + Cors *CorsRules `xml:"Cors,omitempty"` + // DefaultServiceVersion - DefaultServiceVersion indicates the default version to use for requests to the Blob service if an incoming request’s version is not specified. Possible values include version 2008-10-27 and all more recent versions. + DefaultServiceVersion *string `xml:"DefaultServiceVersion,omitempty"` + // DeleteRetentionPolicy - The blob service properties for soft delete. + DeleteRetentionPolicy *DeleteRetentionPolicy `xml:"DeleteRetentionPolicy,omitempty"` + // StaticWebsite - Optional + StaticWebsite *StaticWebsite `xml:"StaticWebsite,omitempty"` +} + +type StaticWebsite struct { + // Enabled - Required. Indicates whether static website support is enabled for the given account. + Enabled bool `xml:"Enabled,omitempty"` + // IndexDocument - Optional. The webpage that Azure Storage serves for requests to the root of a website or any subfolder. For example, index.html. The value is case-sensitive. + IndexDocument string `xml:"IndexDocument,omitempty"` + // ErrorDocument404Path - Optional. The absolute path to a webpage that Azure Storage serves for requests that do not correspond to an existing file. For example, error/404.html. Only a single custom 404 page is supported in each static website. The value is case-sensitive. + ErrorDocument404Path string `xml:"ErrorDocument404Path,omitempty"` +} + +// CorsRules sets the CORS rules. You can include up to five CorsRule elements in the request. +type CorsRules struct { + // CorsRules - The List of CORS rules. You can include up to five CorsRule elements in the request. + CorsRules []CorsRule `xml:"CorsRules,omitempty"` +} + +// DeleteRetentionPolicy the blob service properties for soft delete. +type DeleteRetentionPolicy struct { + // Enabled - Indicates whether DeleteRetentionPolicy is enabled for the Blob service. + Enabled bool `xml:"Enabled,omitempty"` + // Days - Indicates the number of days that the deleted blob should be retained. The minimum specified value can be 1 and the maximum value can be 365. + Days int32 `xml:"Days,omitempty"` +} + +// CorsRule specifies a CORS rule for the Blob service. +type CorsRule struct { + // AllowedOrigins - Required if CorsRule element is present. A list of origin domains that will be allowed via CORS, or "" to allow all domains + AllowedOrigins []string `xml:"AllowedOrigins,omitempty"` + // AllowedMethods - Required if CorsRule element is present. A list of HTTP methods that are allowed to be executed by the origin. + AllowedMethods []string `xml:"AllowedMethods,omitempty"` + // MaxAgeInSeconds - Required if CorsRule element is present. The number of seconds that the client/browser should cache a preflight response. + MaxAgeInSeconds int32 `xml:"MaxAgeInSeconds,omitempty"` + // ExposedHeaders - Required if CorsRule element is present. A list of response headers to expose to CORS clients. + ExposedHeaders []string `xml:"ExposedHeaders,omitempty"` + // AllowedHeaders - Required if CorsRule element is present. A list of headers allowed to be part of the cross-origin request. + AllowedHeaders []string `xml:"AllowedHeaders,omitempty"` +} diff --git a/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/set_service_properties.go b/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/set_service_properties.go new file mode 100644 index 0000000000000..a11178c6b7ca9 --- /dev/null +++ b/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/set_service_properties.go @@ -0,0 +1,76 @@ +package accounts + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "github.com/tombuildsstuff/giovanni/storage/internal/endpoints" + "net/http" +) + +// SetServicePropertiesSender sends the SetServiceProperties request. The method will close the +// http.Response Body if it receives an error. +func (client Client) SetServicePropertiesSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + azure.DoRetryWithRegistration(client.Client)) +} + +// SetServicePropertiesPreparer prepares the SetServiceProperties request. +func (client Client) SetServicePropertiesPreparer(ctx context.Context, accountName string, input StorageServiceProperties) (*http.Request, error) { + queryParameters := map[string]interface{}{ + "restype": "service", + "comp": "properties", + } + + headers := map[string]interface{}{ + "x-ms-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsPut(), + autorest.WithBaseURL(endpoints.GetBlobEndpoint(client.BaseURI, accountName)), + autorest.WithHeaders(headers), + autorest.WithXML(input), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// SetServicePropertiesResponder handles the response to the SetServiceProperties request. The method always +// closes the http.Response Body. +func (client Client) SetServicePropertiesResponder(resp *http.Response) (result SetServicePropertiesResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusAccepted), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +func (client Client) SetServiceProperties(ctx context.Context, accountName string, input StorageServiceProperties) (result SetServicePropertiesResult, err error) { + if accountName == "" { + return result, validation.NewError("accounts.Client", "SetServiceProperties", "`accountName` cannot be an empty string.") + } + + req, err := client.SetServicePropertiesPreparer(ctx, accountName, input) + if err != nil { + err = autorest.NewErrorWithError(err, "accounts.Client", "SetServiceProperties", nil, "Failure preparing request") + return + } + + resp, err := client.SetServicePropertiesSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "accounts.Client", "SetServiceProperties", resp, "Failure sending request") + return + } + + result, err = client.SetServicePropertiesResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "accounts.Client", "SetServiceProperties", resp, "Failure responding to request") + return + } + + return +} diff --git a/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/version.go b/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/version.go new file mode 100644 index 0000000000000..a097015cc6516 --- /dev/null +++ b/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts/version.go @@ -0,0 +1,14 @@ +package accounts + +import ( + "fmt" + + "github.com/tombuildsstuff/giovanni/version" +) + +// APIVersion is the version of the API used for all Storage API Operations +const APIVersion = "2018-11-09" + +func UserAgent() string { + return fmt.Sprintf("tombuildsstuff/giovanni/%s storage/%s", version.Number, APIVersion) +} diff --git a/vendor/modules.txt b/vendor/modules.txt index f56e6c6c869f4..1b3cfc4f959fa 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -328,6 +328,7 @@ github.com/terraform-providers/terraform-provider-azuread/azuread/helpers/tf github.com/terraform-providers/terraform-provider-azuread/azuread/helpers/validate github.com/terraform-providers/terraform-provider-azuread/version # github.com/tombuildsstuff/giovanni v0.7.1 +github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/blobs github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/containers github.com/tombuildsstuff/giovanni/storage/2018-11-09/datalakestore/filesystems diff --git a/website/docs/r/storage_account.html.markdown b/website/docs/r/storage_account.html.markdown index b62d07a008e06..1230f62201362 100644 --- a/website/docs/r/storage_account.html.markdown +++ b/website/docs/r/storage_account.html.markdown @@ -117,6 +117,10 @@ The following arguments are supported: ~> **NOTE:** `queue_properties` cannot be set when the `access_tier` is set to `BlobStorage` +* `blob_account_properties` - (Optional) A `blob_account_properties` block as defined below. + +~> **NOTE:** `blob_account_properties` can only be set when the `account_kind` is set to `StorageV2` + * `network_rules` - (Optional) A `network_rules` block as documented below. * `tags` - (Optional) A mapping of tags to assign to the resource. @@ -229,6 +233,22 @@ A `queue_properties` block supports the following: * `hour_metrics` - (Optional) A `hour_metrics` block as defined below. +--- + +A `blob_account_properties` block supports the following: + +* `static_website` - (Optional) A `static_website` block as defined below. + +--- + +A `static_website` block supports the following: + +* `enabled` - (Required) Indicates whether static website support is enabled for the given account. + +* `index_document` - (Optional) The webpage that Azure Storage serves for requests to the root of a website or any subfolder. For example, index.html. The value is case-sensitive. + +* `error_document_404_path` - (Optional) The absolute path to a webpage that Azure Storage serves for requests that do not correspond to an existing file. For example, error/404.html. Only a single custom 404 page is supported in each static website. The value is case-sensitive. + ## Attributes Reference The following attributes are exported in addition to the arguments listed above: From 1ec60bbb746e6c60490b7bc390f8312b6df7b453 Mon Sep 17 00:00:00 2001 From: Austin Cheung Date: Sat, 8 Feb 2020 12:18:22 -0800 Subject: [PATCH 050/498] update storage account static website docs --- website/docs/r/storage_account.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/r/storage_account.html.markdown b/website/docs/r/storage_account.html.markdown index 1230f62201362..6dddfe6e71bc8 100644 --- a/website/docs/r/storage_account.html.markdown +++ b/website/docs/r/storage_account.html.markdown @@ -243,11 +243,11 @@ A `blob_account_properties` block supports the following: A `static_website` block supports the following: -* `enabled` - (Required) Indicates whether static website support is enabled for the given account. +* `enabled` - (Required) Indicates whether static website support is enabled for the given account. If a blob storage container named $web doesn't already exist in the account, one is created for you. Add the files of your site to this container. * `index_document` - (Optional) The webpage that Azure Storage serves for requests to the root of a website or any subfolder. For example, index.html. The value is case-sensitive. -* `error_document_404_path` - (Optional) The absolute path to a webpage that Azure Storage serves for requests that do not correspond to an existing file. For example, error/404.html. Only a single custom 404 page is supported in each static website. The value is case-sensitive. +* `error_document_404_path` - (Optional) The absolute path to a webpage that Azure Storage serves for requests that do not correspond to an existing file. For example, error/404.html. Only a single custom 404 page is supported in each static website. The value is case-sensitive. If the server returns a 404 error, and you have not specified an error document, then a default 404 page is returned to the user. ## Attributes Reference From 78ddff0e1414137012469a749202ec2032b9b6d8 Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Sat, 8 Feb 2020 22:40:43 -0600 Subject: [PATCH 051/498] Add monitor helpers --- azurerm/helpers/azure/monitor.go | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 azurerm/helpers/azure/monitor.go diff --git a/azurerm/helpers/azure/monitor.go b/azurerm/helpers/azure/monitor.go new file mode 100644 index 0000000000000..7303e4d52ded7 --- /dev/null +++ b/azurerm/helpers/azure/monitor.go @@ -0,0 +1,32 @@ +package azure + +import ( + "fmt" + "strings" + + "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +// ValidateThreshold checks that a threshold value is between 0 and 10000 +// and is a whole number. The azure-sdk-for-go expects this value to be a float64 +// but the user validation rules want an integer. +func ValidateThreshold(i interface{}, k string) (warnings []string, errors []error) { + v, ok := i.(float64) + if !ok { + errors = append(errors, fmt.Errorf("expected type of %q to be float64", k)) + } + + if v != float64(int64(v)) { + errors = append(errors, fmt.Errorf("%q must be a whole number", k)) + } + + if v < 0 || v > 10000 { + errors = append(errors, fmt.Errorf("%q must be between 0 and 10000 inclusive", k)) + } + + return warnings, errors +} From e9ce2439140c8b164a832cecfad1e7de18e488c5 Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Sun, 9 Feb 2020 21:16:30 -0600 Subject: [PATCH 052/498] First pass address latest review --- azurerm/helpers/azure/monitor.go | 11 +- ...ta_source_monitor_scheduled_query_rules.go | 96 ------ ...rce_monitor_scheduled_query_rules_alert.go | 87 +++++- ...ource_monitor_scheduled_query_rules_log.go | 78 ++++- ...ource_arm_monitor_scheduled_query_rules.go | 207 ------------- ...arm_monitor_scheduled_query_rules_alert.go | 288 +++++++++++++++--- ...e_arm_monitor_scheduled_query_rules_log.go | 203 ++++++++++-- ...onitor_scheduled_query_rules_alert_test.go | 12 +- ..._monitor_scheduled_query_rules_log_test.go | 6 +- website/azurerm.erb | 16 + ..._scheduled_query_rules_alert.html.markdown | 26 +- ...or_scheduled_query_rules_log.html.markdown | 10 +- ..._scheduled_query_rules_alert.html.markdown | 20 +- ...or_scheduled_query_rules_log.html.markdown | 7 +- 14 files changed, 619 insertions(+), 448 deletions(-) delete mode 100644 azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules.go delete mode 100644 azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules.go diff --git a/azurerm/helpers/azure/monitor.go b/azurerm/helpers/azure/monitor.go index 7303e4d52ded7..f5bf82a5bcf26 100644 --- a/azurerm/helpers/azure/monitor.go +++ b/azurerm/helpers/azure/monitor.go @@ -2,19 +2,12 @@ package azure import ( "fmt" - "strings" - - "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) // ValidateThreshold checks that a threshold value is between 0 and 10000 // and is a whole number. The azure-sdk-for-go expects this value to be a float64 // but the user validation rules want an integer. -func ValidateThreshold(i interface{}, k string) (warnings []string, errors []error) { +func ValidateMonitorScheduledQueryRulesAlertThreshold(i interface{}, k string) (warnings []string, errors []error) { v, ok := i.(float64) if !ok { errors = append(errors, fmt.Errorf("expected type of %q to be float64", k)) @@ -25,7 +18,7 @@ func ValidateThreshold(i interface{}, k string) (warnings []string, errors []err } if v < 0 || v > 10000 { - errors = append(errors, fmt.Errorf("%q must be between 0 and 10000 inclusive", k)) + errors = append(errors, fmt.Errorf("%q must be between 0 and 10000 (inclusive)", k)) } return warnings, errors diff --git a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules.go b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules.go deleted file mode 100644 index 72380eedcbd34..0000000000000 --- a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules.go +++ /dev/null @@ -1,96 +0,0 @@ -package monitor - -import ( - "fmt" - "strconv" - "time" - - "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func dataSourceArmMonitorScheduledQueryRulesRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - name := d.Get("name").(string) - resourceGroup := d.Get("resource_group_name").(string) - - resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - return fmt.Errorf("Error: Scheduled Query Rule %q was not found", name) - } - return fmt.Errorf("Error reading Scheduled Query Rule: %+v", err) - } - - d.SetId(*resp.ID) - d.Set("resource_group_name", resourceGroup) - if location := resp.Location; location != nil { - d.Set("location", azure.NormalizeLocation(*location)) - } - - d.Set("description", resp.Description) - if resp.Enabled == insights.True { - d.Set("enabled", true) - } else { - d.Set("enabled", false) - } - - switch action := resp.Action.(type) { - case insights.AlertingAction: - if err = d.Set("action", flattenAzureRmScheduledQueryRulesAlertAction(action.AznsAction)); err != nil { - return fmt.Errorf("Error setting `action`: %+v", err) - } - severity, err := strconv.Atoi(string(action.Severity)) - if err != nil { - return fmt.Errorf("Error converting action.Severity %q in query rule %q to int (resource group %q): %+v", action.Severity, name, resourceGroup, err) - } - d.Set("severity", severity) - d.Set("throttling", action.ThrottlingInMin) - if err = d.Set("trigger", flattenAzureRmScheduledQueryRulesAlertTrigger(action.Trigger)); err != nil { - return fmt.Errorf("Error setting `trigger`: %+v", err) - } - case insights.LogToMetricAction: - if err = d.Set("criteria", flattenAzureRmScheduledQueryRulesLogCriteria(action.Criteria)); err != nil { - return fmt.Errorf("Error setting `criteria`: %+v", err) - } - default: - return fmt.Errorf("Unknown action type in scheduled query rule %q (resource group %q): %T", name, resourceGroup, resp.Action) - } - - if schedule := resp.Schedule; schedule != nil { - if schedule.FrequencyInMinutes != nil { - d.Set("frequency", schedule.FrequencyInMinutes) - } - if schedule.TimeWindowInMinutes != nil { - d.Set("time_window", schedule.TimeWindowInMinutes) - } - } - - if source := resp.Source; source != nil { - if source.AuthorizedResources != nil { - d.Set("authorized_resource_ids", utils.FlattenStringSlice(source.AuthorizedResources)) - } - if source.DataSourceID != nil { - d.Set("data_source_id", source.DataSourceID) - } - if source.Query != nil { - d.Set("query", source.Query) - } - d.Set("query_type", string(source.QueryType)) - } - - if lastUpdated := resp.LastUpdatedTime; lastUpdated != nil { - d.Set("last_updated_time", lastUpdated.Format(time.RFC3339)) - } - d.Set("provisioning_state", resp.ProvisioningState) - - return tags.FlattenAndSet(d, resp.Tags) -} diff --git a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_alert.go b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_alert.go index c7dc42763af8b..cc535fed14527 100644 --- a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_alert.go +++ b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_alert.go @@ -1,16 +1,22 @@ package monitor import ( + "fmt" + "strconv" "time" + "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func dataSourceArmMonitorScheduledQueryRulesAlert() *schema.Resource { return &schema.Resource{ - Read: dataSourceArmMonitorScheduledQueryRulesRead, + Read: dataSourceArmMonitorScheduledQueryRulesAlertRead, Timeouts: &schema.ResourceTimeout{ Read: schema.DefaultTimeout(5 * time.Minute), @@ -72,14 +78,6 @@ func dataSourceArmMonitorScheduledQueryRulesAlert() *schema.Resource { Type: schema.TypeInt, Computed: true, }, - "last_updated_time": { - Type: schema.TypeString, - Computed: true, - }, - "provisioning_state": { - Type: schema.TypeString, - Computed: true, - }, "query": { Type: schema.TypeString, Computed: true, @@ -145,3 +143,74 @@ func dataSourceArmMonitorScheduledQueryRulesAlert() *schema.Resource { }, } } + +func dataSourceArmMonitorScheduledQueryRulesAlertRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + name := d.Get("name").(string) + resourceGroup := d.Get("resource_group_name").(string) + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Error: Scheduled Query Rule %q was not found", name) + } + return fmt.Errorf("Error reading Scheduled Query Rule: %+v", err) + } + + d.SetId(*resp.ID) + d.Set("resource_group_name", resourceGroup) + if location := resp.Location; location != nil { + d.Set("location", azure.NormalizeLocation(*location)) + } + + d.Set("description", resp.Description) + if resp.Enabled == insights.True { + d.Set("enabled", true) + } else { + d.Set("enabled", false) + } + + action, ok := resp.Action.(insights.AlertingAction) + if !ok { + return fmt.Errorf("Wrong action type in scheduled query rule %q (resource group %q): %T", name, resourceGroup, resp.Action) + } + if err = d.Set("action", flattenAzureRmScheduledQueryRulesAlertAction(action.AznsAction)); err != nil { + return fmt.Errorf("Error setting `action`: %+v", err) + } + severity, err := strconv.Atoi(string(action.Severity)) + if err != nil { + return fmt.Errorf("Error converting action.Severity %q in query rule %q to int (resource group %q): %+v", action.Severity, name, resourceGroup, err) + } + d.Set("severity", severity) + d.Set("throttling", action.ThrottlingInMin) + if err = d.Set("trigger", flattenAzureRmScheduledQueryRulesAlertTrigger(action.Trigger)); err != nil { + return fmt.Errorf("Error setting `trigger`: %+v", err) + } + + if schedule := resp.Schedule; schedule != nil { + if schedule.FrequencyInMinutes != nil { + d.Set("frequency", schedule.FrequencyInMinutes) + } + if schedule.TimeWindowInMinutes != nil { + d.Set("time_window", schedule.TimeWindowInMinutes) + } + } + + if source := resp.Source; source != nil { + if source.AuthorizedResources != nil { + d.Set("authorized_resource_ids", utils.FlattenStringSlice(source.AuthorizedResources)) + } + if source.DataSourceID != nil { + d.Set("data_source_id", source.DataSourceID) + } + if source.Query != nil { + d.Set("query", source.Query) + } + d.Set("query_type", string(source.QueryType)) + } + + return tags.FlattenAndSet(d, resp.Tags) +} diff --git a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go index 4a864f0f19f26..bad7e1f79797b 100644 --- a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go +++ b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go @@ -1,16 +1,21 @@ package monitor import ( + "fmt" "time" + "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func dataSourceArmMonitorScheduledQueryRulesLog() *schema.Resource { return &schema.Resource{ - Read: dataSourceArmMonitorScheduledQueryRulesRead, + Read: dataSourceArmMonitorScheduledQueryRulesLogRead, Timeouts: &schema.ResourceTimeout{ Read: schema.DefaultTimeout(5 * time.Minute), @@ -80,18 +85,6 @@ func dataSourceArmMonitorScheduledQueryRulesLog() *schema.Resource { Type: schema.TypeBool, Computed: true, }, - "last_updated_time": { - Type: schema.TypeString, - Computed: true, - }, - "provisioning_state": { - Type: schema.TypeString, - Computed: true, - }, - "query": { - Type: schema.TypeString, - Computed: true, - }, "query_type": { Type: schema.TypeString, Computed: true, @@ -101,3 +94,62 @@ func dataSourceArmMonitorScheduledQueryRulesLog() *schema.Resource { }, } } + +func dataSourceArmMonitorScheduledQueryRulesLogRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + name := d.Get("name").(string) + resourceGroup := d.Get("resource_group_name").(string) + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Error: Scheduled Query Rule %q was not found", name) + } + return fmt.Errorf("Error reading Scheduled Query Rule: %+v", err) + } + + d.SetId(*resp.ID) + d.Set("resource_group_name", resourceGroup) + if location := resp.Location; location != nil { + d.Set("location", azure.NormalizeLocation(*location)) + } + + d.Set("description", resp.Description) + if resp.Enabled == insights.True { + d.Set("enabled", true) + } else { + d.Set("enabled", false) + } + + action, ok := resp.Action.(insights.LogToMetricAction) + if !ok { + return fmt.Errorf("Wrong action type in scheduled query rule %q (resource group %q): %T", name, resourceGroup, resp.Action) + } + if err = d.Set("criteria", flattenAzureRmScheduledQueryRulesLogCriteria(action.Criteria)); err != nil { + return fmt.Errorf("Error setting `criteria`: %+v", err) + } + + if schedule := resp.Schedule; schedule != nil { + if schedule.FrequencyInMinutes != nil { + d.Set("frequency", schedule.FrequencyInMinutes) + } + if schedule.TimeWindowInMinutes != nil { + d.Set("time_window", schedule.TimeWindowInMinutes) + } + } + + if source := resp.Source; source != nil { + if source.AuthorizedResources != nil { + d.Set("authorized_resource_ids", utils.FlattenStringSlice(source.AuthorizedResources)) + } + if source.DataSourceID != nil { + d.Set("data_source_id", source.DataSourceID) + } + d.Set("query_type", string(source.QueryType)) + } + + return tags.FlattenAndSet(d, resp.Tags) +} diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules.go b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules.go deleted file mode 100644 index b7661870314a0..0000000000000 --- a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules.go +++ /dev/null @@ -1,207 +0,0 @@ -package monitor - -import ( - "fmt" - "log" - "strconv" - "time" - - "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" - "github.com/hashicorp/go-azure-helpers/response" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmMonitorScheduledQueryRulesCreateUpdate(d *schema.ResourceData, meta interface{}, action insights.BasicAction, schedule *insights.Schedule) error { - client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient - ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) - defer cancel() - - name := d.Get("name").(string) - resourceGroup := d.Get("resource_group_name").(string) - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, resourceGroup, name) - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing Monitor Scheduled Query Rules %q (Resource Group %q): %s", name, resourceGroup, err) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_monitor_scheduled_query_rules_alert", *existing.ID) - } - } - - description := d.Get("description").(string) - enabledRaw := d.Get("enabled").(bool) - - enabled := insights.True - if !enabledRaw { - enabled = insights.False - } - - location := azure.NormalizeLocation(d.Get("location")) - - source := expandMonitorScheduledQueryRulesSource(d) - - t := d.Get("tags").(map[string]interface{}) - expandedTags := tags.Expand(t) - - parameters := insights.LogSearchRuleResource{ - Location: utils.String(location), - LogSearchRule: &insights.LogSearchRule{ - Description: utils.String(description), - Enabled: enabled, - Source: source, - Schedule: schedule, - Action: action, - }, - Tags: expandedTags, - } - - if _, err := client.CreateOrUpdate(ctx, resourceGroup, name, parameters); err != nil { - return fmt.Errorf("Error creating or updating scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) - } - - read, err := client.Get(ctx, resourceGroup, name) - if err != nil { - return err - } - if read.ID == nil { - return fmt.Errorf("Scheduled query rule %q (resource group %q) ID is empty", name, resourceGroup) - } - d.SetId(*read.ID) - - return resourceArmMonitorScheduledQueryRulesRead(d, meta) -} - -func resourceArmMonitorScheduledQueryRulesRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - resourceGroup := id.ResourceGroup - name := id.Path["scheduledqueryrules"] - - resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - log.Printf("[DEBUG] Scheduled Query Rule %q was not found in Resource Group %q - removing from state!", name, resourceGroup) - d.SetId("") - return nil - } - return fmt.Errorf("Error getting scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) - } - - d.Set("name", name) - d.Set("resource_group_name", resourceGroup) - if location := resp.Location; location != nil { - d.Set("location", azure.NormalizeLocation(*location)) - } - if lastUpdated := resp.LastUpdatedTime; lastUpdated != nil { - d.Set("last_updated_time", lastUpdated.Format(time.RFC3339)) - } - d.Set("provisioning_state", resp.ProvisioningState) - - if resp.Enabled == insights.True { - d.Set("enabled", true) - } else { - d.Set("enabled", false) - } - - d.Set("description", resp.Description) - - switch action := resp.Action.(type) { - case insights.AlertingAction: - if err = d.Set("action", flattenAzureRmScheduledQueryRulesAlertAction(action.AznsAction)); err != nil { - return fmt.Errorf("Error setting `action`: %+v", err) - } - severity, err := strconv.Atoi(string(action.Severity)) - if err != nil { - return fmt.Errorf("Error converting action.Severity %q in query rule %q to int (resource group %q): %+v", action.Severity, name, resourceGroup, err) - } - d.Set("severity", severity) - d.Set("throttling", action.ThrottlingInMin) - if err = d.Set("trigger", flattenAzureRmScheduledQueryRulesAlertTrigger(action.Trigger)); err != nil { - return fmt.Errorf("Error setting `trigger`: %+v", err) - } - case insights.LogToMetricAction: - if err = d.Set("criteria", flattenAzureRmScheduledQueryRulesLogCriteria(action.Criteria)); err != nil { - return fmt.Errorf("Error setting `criteria`: %+v", err) - } - default: - return fmt.Errorf("Unknown action type in scheduled query rule %q (resource group %q): %T", name, resourceGroup, resp.Action) - } - - if schedule := resp.Schedule; schedule != nil { - if schedule.FrequencyInMinutes != nil { - d.Set("frequency", schedule.FrequencyInMinutes) - } - if schedule.TimeWindowInMinutes != nil { - d.Set("time_window", schedule.TimeWindowInMinutes) - } - } - - if source := resp.Source; source != nil { - if source.AuthorizedResources != nil { - d.Set("authorized_resource_ids", utils.FlattenStringSlice(source.AuthorizedResources)) - } - if source.DataSourceID != nil { - d.Set("data_source_id", source.DataSourceID) - } - if source.Query != nil { - d.Set("query", source.Query) - } - d.Set("query_type", string(source.QueryType)) - } - - return tags.FlattenAndSet(d, resp.Tags) -} - -func resourceArmMonitorScheduledQueryRulesDelete(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - resourceGroup := id.ResourceGroup - name := id.Path["scheduledqueryrules"] - - if resp, err := client.Delete(ctx, resourceGroup, name); err != nil { - if !response.WasNotFound(resp.Response) { - return fmt.Errorf("Error deleting scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) - } - } - - return nil -} - -func expandMonitorScheduledQueryRulesSource(d *schema.ResourceData) *insights.Source { - authorizedResourceIDs := d.Get("authorized_resource_ids").(*schema.Set).List() - dataSourceID := d.Get("data_source_id").(string) - query, ok := d.Get("query").(string) - source := insights.Source{ - AuthorizedResources: utils.ExpandStringSlice(authorizedResourceIDs), - DataSourceID: utils.String(dataSourceID), - QueryType: insights.ResultCount, - } - if ok { - source.Query = utils.String(query) - } - - return &source -} diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go index cee4212d9823b..3fb0fa6c8317d 100644 --- a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go +++ b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go @@ -1,24 +1,30 @@ package monitor import ( + "fmt" + "log" "strconv" "time" "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" + "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func resourceArmMonitorScheduledQueryRulesAlert() *schema.Resource { return &schema.Resource{ Create: resourceArmMonitorScheduledQueryRulesAlertCreateUpdate, - Read: resourceArmMonitorScheduledQueryRulesRead, + Read: resourceArmMonitorScheduledQueryRulesAlertRead, Update: resourceArmMonitorScheduledQueryRulesAlertCreateUpdate, - Delete: resourceArmMonitorScheduledQueryRulesDelete, + Delete: resourceArmMonitorScheduledQueryRulesAlertDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, }, @@ -35,7 +41,7 @@ func resourceArmMonitorScheduledQueryRulesAlert() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: validate.NoEmptyStrings, + ValidateFunc: validation.StringDoesNotContainAny("<>*%&:\\?+/"), }, "resource_group_name": azure.SchemaResourceGroupName(), @@ -70,8 +76,9 @@ func resourceArmMonitorScheduledQueryRulesAlert() *schema.Resource { ValidateFunc: validation.StringIsJSON, }, "email_subject": { - Type: schema.TypeString, - Optional: true, + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringIsNotEmpty, }, }, }, @@ -82,8 +89,9 @@ func resourceArmMonitorScheduledQueryRulesAlert() *schema.Resource { ValidateFunc: azure.ValidateResourceID, }, "description": { - Type: schema.TypeString, - Optional: true, + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringLenBetween(1, 4096), }, "enabled": { Type: schema.TypeBool, @@ -91,20 +99,14 @@ func resourceArmMonitorScheduledQueryRulesAlert() *schema.Resource { Default: true, }, "frequency": { - Type: schema.TypeInt, - Optional: true, - }, - "last_updated_time": { - Type: schema.TypeString, - Computed: true, - }, - "provisioning_state": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeInt, + Required: true, + ValidateFunc: validation.IntBetween(5, 1440), }, "query": { - Type: schema.TypeString, - Optional: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringIsNotEmpty, }, "query_type": { Type: schema.TypeString, @@ -115,27 +117,23 @@ func resourceArmMonitorScheduledQueryRulesAlert() *schema.Resource { }, false), }, "severity": { - Type: schema.TypeInt, - Optional: true, - ValidateFunc: validation.IntInSlice([]int{ - 0, - 1, - 2, - 3, - 4, - }), + Type: schema.TypeInt, + Optional: true, + ValidateFunc: validation.IntBetween(0, 4), }, "throttling": { - Type: schema.TypeInt, - Optional: true, + Type: schema.TypeInt, + Optional: true, + ValidateFunc: validation.IntBetween(0, 10000), }, "time_window": { - Type: schema.TypeInt, - Optional: true, + Type: schema.TypeInt, + Required: true, + ValidateFunc: validation.IntBetween(5, 2880), }, "trigger": { Type: schema.TypeSet, - Optional: true, + Required: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "metric_trigger": { @@ -144,8 +142,9 @@ func resourceArmMonitorScheduledQueryRulesAlert() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "metric_column": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringIsNotEmpty, }, "metric_trigger_type": { Type: schema.TypeString, @@ -167,7 +166,7 @@ func resourceArmMonitorScheduledQueryRulesAlert() *schema.Resource { "threshold": { Type: schema.TypeFloat, Required: true, - ValidateFunc: validation.NoZeroValues, + ValidateFunc: azure.ValidateMonitorScheduledQueryRulesAlertThreshold, }, }, }, @@ -182,8 +181,9 @@ func resourceArmMonitorScheduledQueryRulesAlert() *schema.Resource { }, false), }, "threshold": { - Type: schema.TypeFloat, - Required: true, + Type: schema.TypeFloat, + Required: true, + ValidateFunc: azure.ValidateMonitorScheduledQueryRulesAlertThreshold, }, }, }, @@ -197,8 +197,170 @@ func resourceArmMonitorScheduledQueryRulesAlert() *schema.Resource { func resourceArmMonitorScheduledQueryRulesAlertCreateUpdate(d *schema.ResourceData, meta interface{}) error { action := expandMonitorScheduledQueryRulesAlertingAction(d) schedule := expandMonitorScheduledQueryRulesAlertSchedule(d) + client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient + ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) + defer cancel() + + name := d.Get("name").(string) + resourceGroup := d.Get("resource_group_name").(string) + + if *schedule.TimeWindowInMinutes < *schedule.FrequencyInMinutes { + return fmt.Errorf("Error in parameter values for Scheduled Query Rules %q (Resource Group %q): time_window must be greater than or equal to frequency", name, resourceGroup) + } + + if features.ShouldResourcesBeImported() && d.IsNewResource() { + existing, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if !utils.ResponseWasNotFound(existing.Response) { + return fmt.Errorf("Error checking for presence of existing Monitor Scheduled Query Rules %q (Resource Group %q): %s", name, resourceGroup, err) + } + } + + if existing.ID != nil && *existing.ID != "" { + return tf.ImportAsExistsError("azurerm_monitor_scheduled_query_rules_alert", *existing.ID) + } + } + + description := d.Get("description").(string) + enabledRaw := d.Get("enabled").(bool) + + enabled := insights.True + if !enabledRaw { + enabled = insights.False + } + + location := azure.NormalizeLocation(d.Get("location")) + + source := expandMonitorScheduledQueryRulesAlertSource(d) + + t := d.Get("tags").(map[string]interface{}) + expandedTags := tags.Expand(t) + + parameters := insights.LogSearchRuleResource{ + Location: utils.String(location), + LogSearchRule: &insights.LogSearchRule{ + Description: utils.String(description), + Enabled: enabled, + Source: source, + Schedule: schedule, + Action: action, + }, + Tags: expandedTags, + } + + if _, err := client.CreateOrUpdate(ctx, resourceGroup, name, parameters); err != nil { + return fmt.Errorf("Error creating or updating scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) + } + + read, err := client.Get(ctx, resourceGroup, name) + if err != nil { + return err + } + if read.ID == nil { + return fmt.Errorf("Scheduled query rule %q (resource group %q) ID is empty", name, resourceGroup) + } + d.SetId(*read.ID) + + return resourceArmMonitorScheduledQueryRulesAlertRead(d, meta) +} + +func resourceArmMonitorScheduledQueryRulesAlertRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := azure.ParseAzureResourceID(d.Id()) + if err != nil { + return err + } + resourceGroup := id.ResourceGroup + name := id.Path["scheduledqueryrules"] + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + log.Printf("[DEBUG] Scheduled Query Rule %q was not found in Resource Group %q - removing from state!", name, resourceGroup) + d.SetId("") + return nil + } + return fmt.Errorf("Error getting scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) + } + + d.Set("name", name) + d.Set("resource_group_name", resourceGroup) + if location := resp.Location; location != nil { + d.Set("location", azure.NormalizeLocation(*location)) + } + + if resp.Enabled == insights.True { + d.Set("enabled", true) + } else { + d.Set("enabled", false) + } + + d.Set("description", resp.Description) + + action, ok := resp.Action.(insights.AlertingAction) + if !ok { + return fmt.Errorf("Wrong action type in scheduled query rule %q (resource group %q): %T", name, resourceGroup, resp.Action) + } + if err = d.Set("action", flattenAzureRmScheduledQueryRulesAlertAction(action.AznsAction)); err != nil { + return fmt.Errorf("Error setting `action`: %+v", err) + } + severity, err := strconv.Atoi(string(action.Severity)) + if err != nil { + return fmt.Errorf("Error converting action.Severity %q in query rule %q to int (resource group %q): %+v", action.Severity, name, resourceGroup, err) + } + d.Set("severity", severity) + d.Set("throttling", action.ThrottlingInMin) + if err = d.Set("trigger", flattenAzureRmScheduledQueryRulesAlertTrigger(action.Trigger)); err != nil { + return fmt.Errorf("Error setting `trigger`: %+v", err) + } + + if schedule := resp.Schedule; schedule != nil { + if schedule.FrequencyInMinutes != nil { + d.Set("frequency", schedule.FrequencyInMinutes) + } + if schedule.TimeWindowInMinutes != nil { + d.Set("time_window", schedule.TimeWindowInMinutes) + } + } + + if source := resp.Source; source != nil { + if source.AuthorizedResources != nil { + d.Set("authorized_resource_ids", utils.FlattenStringSlice(source.AuthorizedResources)) + } + if source.DataSourceID != nil { + d.Set("data_source_id", source.DataSourceID) + } + if source.Query != nil { + d.Set("query", source.Query) + } + d.Set("query_type", string(source.QueryType)) + } - return resourceArmMonitorScheduledQueryRulesCreateUpdate(d, meta, action, schedule) + return tags.FlattenAndSet(d, resp.Tags) +} + +func resourceArmMonitorScheduledQueryRulesAlertDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient + ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := azure.ParseAzureResourceID(d.Id()) + if err != nil { + return err + } + resourceGroup := id.ResourceGroup + name := id.Path["scheduledqueryrules"] + + if resp, err := client.Delete(ctx, resourceGroup, name); err != nil { + if !response.WasNotFound(resp.Response) { + return fmt.Errorf("Error deleting scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) + } + } + + return nil } func expandMonitorScheduledQueryRulesAlertingAction(d *schema.ResourceData) *insights.AlertingAction { @@ -225,10 +387,19 @@ func expandMonitorScheduledQueryRulesAlertingAction(d *schema.ResourceData) *ins func expandMonitorScheduledQueryRulesAlertAction(input []interface{}) *insights.AzNsActionGroup { result := insights.AzNsActionGroup{} + if len(input) == 0 { + return &result + } for _, item := range input { - v := item.(map[string]interface{}) - actionGroups := v["action_group"].(*schema.Set).List() + if item == nil { + continue + } + v, ok := item.(map[string]interface{}) + if !ok { + continue + } + actionGroups := v["action_group"].(*schema.Set).List() result.ActionGroup = utils.ExpandStringSlice(actionGroups) result.EmailSubject = utils.String(v["email_subject"].(string)) result.CustomWebhookPayload = utils.String(v["custom_webhook_payload"].(string)) @@ -244,7 +415,13 @@ func expandMonitorScheduledQueryRulesAlertMetricTrigger(input []interface{}) *in result := insights.LogMetricTrigger{} for _, item := range input { - v := item.(map[string]interface{}) + if item == nil { + continue + } + v, ok := item.(map[string]interface{}) + if !ok { + continue + } result.ThresholdOperator = insights.ConditionalOperator(v["operator"].(string)) result.Threshold = utils.Float(v["threshold"].(float64)) result.MetricTriggerType = insights.MetricTriggerType(v["metric_trigger_type"].(string)) @@ -266,11 +443,34 @@ func expandMonitorScheduledQueryRulesAlertSchedule(d *schema.ResourceData) *insi return &schedule } +func expandMonitorScheduledQueryRulesAlertSource(d *schema.ResourceData) *insights.Source { + authorizedResourceIDs := d.Get("authorized_resource_ids").(*schema.Set).List() + dataSourceID := d.Get("data_source_id").(string) + query := d.Get("query").(string) + source := insights.Source{ + AuthorizedResources: utils.ExpandStringSlice(authorizedResourceIDs), + DataSourceID: utils.String(dataSourceID), + Query: utils.String(query), + QueryType: insights.ResultCount, + } + + return &source +} + func expandMonitorScheduledQueryRulesAlertTrigger(input []interface{}) *insights.TriggerCondition { result := insights.TriggerCondition{} + if len(input) == 0 { + return &result + } for _, item := range input { - v := item.(map[string]interface{}) + if item == nil { + continue + } + v, ok := item.(map[string]interface{}) + if !ok { + continue + } metricTriggerRaw := v["metric_trigger"].(*schema.Set).List() result.ThresholdOperator = insights.ConditionalOperator(v["operator"].(string)) diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go index 65c464e01f3ae..f9537f6a7306e 100644 --- a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go +++ b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go @@ -1,23 +1,29 @@ package monitor import ( + "fmt" + "log" "time" "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" + "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func resourceArmMonitorScheduledQueryRulesLog() *schema.Resource { return &schema.Resource{ Create: resourceArmMonitorScheduledQueryRulesLogCreateUpdate, - Read: resourceArmMonitorScheduledQueryRulesRead, + Read: resourceArmMonitorScheduledQueryRulesLogRead, Update: resourceArmMonitorScheduledQueryRulesLogCreateUpdate, - Delete: resourceArmMonitorScheduledQueryRulesDelete, + Delete: resourceArmMonitorScheduledQueryRulesLogDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, }, @@ -34,7 +40,7 @@ func resourceArmMonitorScheduledQueryRulesLog() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: validate.NoEmptyStrings, + ValidateFunc: validation.StringDoesNotContainAny("<>*%&:\\?+/"), }, "resource_group_name": azure.SchemaResourceGroupName(), @@ -63,7 +69,7 @@ func resourceArmMonitorScheduledQueryRulesLog() *schema.Resource { "name": { Type: schema.TypeString, Required: true, - ValidateFunc: validate.NoEmptyStrings, + ValidateFunc: validation.StringIsNotEmpty, }, "operator": { Type: schema.TypeString, @@ -78,7 +84,7 @@ func resourceArmMonitorScheduledQueryRulesLog() *schema.Resource { Required: true, Elem: &schema.Schema{ Type: schema.TypeString, - ValidateFunc: validate.NoEmptyStrings, + ValidateFunc: validation.StringIsNotEmpty, }, }, }, @@ -87,7 +93,7 @@ func resourceArmMonitorScheduledQueryRulesLog() *schema.Resource { "metric_name": { Type: schema.TypeString, Required: true, - ValidateFunc: validate.NoEmptyStrings, + ValidateFunc: validation.StringIsNotEmpty, }, }, }, @@ -98,22 +104,15 @@ func resourceArmMonitorScheduledQueryRulesLog() *schema.Resource { ValidateFunc: azure.ValidateResourceID, }, "description": { - Type: schema.TypeString, - Optional: true, + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringLenBetween(1, 4096), }, "enabled": { Type: schema.TypeBool, Optional: true, Default: true, }, - "last_updated_time": { - Type: schema.TypeString, - Computed: true, - }, - "provisioning_state": { - Type: schema.TypeString, - Computed: true, - }, "tags": tags.Schema(), }, @@ -123,17 +122,169 @@ func resourceArmMonitorScheduledQueryRulesLog() *schema.Resource { func resourceArmMonitorScheduledQueryRulesLogCreateUpdate(d *schema.ResourceData, meta interface{}) error { action := expandMonitorScheduledQueryRulesLogToMetricAction(d) - return resourceArmMonitorScheduledQueryRulesCreateUpdate(d, meta, action, nil) + client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient + ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) + defer cancel() + + name := d.Get("name").(string) + resourceGroup := d.Get("resource_group_name").(string) + + if features.ShouldResourcesBeImported() && d.IsNewResource() { + existing, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if !utils.ResponseWasNotFound(existing.Response) { + return fmt.Errorf("Error checking for presence of existing Monitor Scheduled Query Rules %q (Resource Group %q): %s", name, resourceGroup, err) + } + } + + if existing.ID != nil && *existing.ID != "" { + return tf.ImportAsExistsError("azurerm_monitor_scheduled_query_rules_alert", *existing.ID) + } + } + + description := d.Get("description").(string) + enabledRaw := d.Get("enabled").(bool) + + enabled := insights.True + if !enabledRaw { + enabled = insights.False + } + + location := azure.NormalizeLocation(d.Get("location")) + + source := expandMonitorScheduledQueryRulesLogSource(d) + + t := d.Get("tags").(map[string]interface{}) + expandedTags := tags.Expand(t) + + parameters := insights.LogSearchRuleResource{ + Location: utils.String(location), + LogSearchRule: &insights.LogSearchRule{ + Description: utils.String(description), + Enabled: enabled, + Source: source, + Action: action, + }, + Tags: expandedTags, + } + + if _, err := client.CreateOrUpdate(ctx, resourceGroup, name, parameters); err != nil { + return fmt.Errorf("Error creating or updating scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) + } + + read, err := client.Get(ctx, resourceGroup, name) + if err != nil { + return err + } + if read.ID == nil { + return fmt.Errorf("Scheduled query rule %q (resource group %q) ID is empty", name, resourceGroup) + } + d.SetId(*read.ID) + + return resourceArmMonitorScheduledQueryRulesLogRead(d, meta) +} + +func resourceArmMonitorScheduledQueryRulesLogRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := azure.ParseAzureResourceID(d.Id()) + if err != nil { + return err + } + resourceGroup := id.ResourceGroup + name := id.Path["scheduledqueryrules"] + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + log.Printf("[DEBUG] Scheduled Query Rule %q was not found in Resource Group %q - removing from state!", name, resourceGroup) + d.SetId("") + return nil + } + return fmt.Errorf("Error getting scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) + } + + d.Set("name", name) + d.Set("resource_group_name", resourceGroup) + if location := resp.Location; location != nil { + d.Set("location", azure.NormalizeLocation(*location)) + } + + if resp.Enabled == insights.True { + d.Set("enabled", true) + } else { + d.Set("enabled", false) + } + + d.Set("description", resp.Description) + + action, ok := resp.Action.(insights.LogToMetricAction) + if !ok { + return fmt.Errorf("Wrong action type in scheduled query rule %q (resource group %q): %T", name, resourceGroup, resp.Action) + } + if err = d.Set("criteria", flattenAzureRmScheduledQueryRulesLogCriteria(action.Criteria)); err != nil { + return fmt.Errorf("Error setting `criteria`: %+v", err) + } + + if source := resp.Source; source != nil { + if source.AuthorizedResources != nil { + d.Set("authorized_resource_ids", utils.FlattenStringSlice(source.AuthorizedResources)) + } + if source.DataSourceID != nil { + d.Set("data_source_id", source.DataSourceID) + } + } + + return tags.FlattenAndSet(d, resp.Tags) +} + +func resourceArmMonitorScheduledQueryRulesLogDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Monitor.ScheduledQueryRulesClient + ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := azure.ParseAzureResourceID(d.Id()) + if err != nil { + return err + } + resourceGroup := id.ResourceGroup + name := id.Path["scheduledqueryrules"] + + if resp, err := client.Delete(ctx, resourceGroup, name); err != nil { + if !response.WasNotFound(resp.Response) { + return fmt.Errorf("Error deleting scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) + } + } + + return nil } func expandMonitorScheduledQueryRulesLogCriteria(input []interface{}) *[]insights.Criteria { criteria := make([]insights.Criteria, 0) + if len(input) == 0 { + return &criteria + } + for _, item := range input { - v := item.(map[string]interface{}) + if item == nil { + continue + } + v, ok := item.(map[string]interface{}) + if !ok { + continue + } dimensions := make([]insights.Dimension, 0) for _, dimension := range v["dimension"].(*schema.Set).List() { - dVal := dimension.(map[string]interface{}) + if dimension == nil { + continue + } + dVal, ok := dimension.(map[string]interface{}) + if !ok { + continue + } dimensions = append(dimensions, insights.Dimension{ Name: utils.String(dVal["name"].(string)), Operator: utils.String(dVal["operator"].(string)), @@ -161,6 +312,18 @@ func expandMonitorScheduledQueryRulesLogToMetricAction(d *schema.ResourceData) * return &action } +func expandMonitorScheduledQueryRulesLogSource(d *schema.ResourceData) *insights.Source { + authorizedResourceIDs := d.Get("authorized_resource_ids").(*schema.Set).List() + dataSourceID := d.Get("data_source_id").(string) + source := insights.Source{ + AuthorizedResources: utils.ExpandStringSlice(authorizedResourceIDs), + DataSourceID: utils.String(dataSourceID), + QueryType: insights.ResultCount, + } + + return &source +} + func flattenAzureRmScheduledQueryRulesLogCriteria(input *[]insights.Criteria) []interface{} { result := make([]interface{}, 0) diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go index bedb59a884560..a558a53593667 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go @@ -26,11 +26,7 @@ func TestAccAzureRMMonitorScheduledQueryRules_AlertingAction(t *testing.T) { testCheckAzureRMMonitorScheduledQueryRulesAlertExists(data.ResourceName), ), }, - { - ResourceName: data.ResourceName, - ImportState: true, - ImportStateVerify: true, - }, + data.ImportStep(), }, }) } @@ -49,11 +45,7 @@ func TestAccAzureRMMonitorScheduledQueryRules_AlertingActionCrossResource(t *tes testCheckAzureRMMonitorScheduledQueryRulesAlertExists(data.ResourceName), ), }, - { - ResourceName: data.ResourceName, - ImportState: true, - ImportStateVerify: true, - }, + data.ImportStep(), }, }) } diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go index 2fc2efdd82f98..0706ca5810786 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go @@ -25,11 +25,7 @@ func TestAccAzureRMMonitorScheduledQueryRules_LogToMetricAction(t *testing.T) { testCheckAzureRMMonitorScheduledQueryRulesLogExists(data.ResourceName), ), }, - { - ResourceName: data.ResourceName, - ImportState: true, - ImportStateVerify: true, - }, + data.ImportStep(), }, }) } diff --git a/website/azurerm.erb b/website/azurerm.erb index f9251797f18bc..7553baf65cf40 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -298,6 +298,14 @@ azurerm_monitor_log_profile +
  • + azurerm_monitor_scheduled_query_rules_alert +
    • + +
  • + azurerm_monitor_scheduled_query_rules_log +
    • +
  • azurerm_mssql_elasticpool
    • @@ -1703,6 +1711,14 @@
  • azurerm_metric_alertrule
    • + +
  • + azurerm_monitor_scheduled_query_rules_alert +
    • + +
  • + azurerm_monitor_scheduled_query_rules_log +
    • diff --git a/website/docs/d/monitor_scheduled_query_rules_alert.html.markdown b/website/docs/d/monitor_scheduled_query_rules_alert.html.markdown index 1998f0670646c..7e513bf3c885a 100644 --- a/website/docs/d/monitor_scheduled_query_rules_alert.html.markdown +++ b/website/docs/d/monitor_scheduled_query_rules_alert.html.markdown @@ -26,23 +26,23 @@ output "query_rule_id" { ## Argument Reference * `name` - (Required) Specifies the name of the Scheduled Query Rule. -* `resource_group_name` - (Required) Specifies the name of the resource group the Scheduled Query Rule is located in. +* `resource_group_name` - (Required) Specifies the name of the resource group where the Scheduled Query Rule is located. ## Attributes Reference * `id` - The ID of the Scheduled Query Rule. * `action` - An `action` block as defined below. * `authorized_resource_ids` - List of Resource IDs referred into query. -* `data_source_id` - The resource uri over which log search query is to be run. +* `data_source_id` - The resource URI over which log search query is to be run. * `description` - The description of the Scheduled Query Rule. * `enabled` - Whether this scheduled query rule is enabled. -* `frequency` - Frequency (in minutes) at which rule condition should be evaluated. -* `query` - Log search query. Required for action type - `alerting_action`. +* `frequency` - Frequency at which rule condition should be evaluated. +* `query` - Log search query. * `query_type` - Must equal "ResultCount". -* `time_window` - Time window for which data needs to be fetched for query (should be greater than or equal to frequency_in_minutes). -* `severity` - Severity of the alert. Possible values include: 0, 1, 2, 3, or 4. -* `throttling` - Time (in minutes) for which Alerts should be throttled or suppressed. -* `trigger` - A `trigger` block as defined below. The condition that results in the alert rule being run. +* `time_window` - Time window for which data needs to be fetched for query. +* `severity` - Severity of the alert. +* `throttling` - Time for which alerts should be throttled or suppressed. +* `trigger` - A `trigger` block as defined below. --- @@ -50,21 +50,21 @@ output "query_rule_id" { * `action_group` - List of action group reference resource IDs. * `custom_webhook_payload` - Custom payload to be sent for all webhook URI in Azure action group. -* `email_subject` - Custom subject override for all email ids in Azure action group. +* `email_subject` - Custom subject override for all email IDs in Azure action group. --- `metricTrigger` supports the following: * `metricColumn` - Evaluation of metric on a particular column. -* `metricTriggerType` - Metric Trigger Type - 'Consecutive' or 'Total'. -* `operator` - Evaluation operation for rule - 'Equal', 'GreaterThan' or 'LessThan'. +* `metricTriggerType` - The metric trigger type. +* `operator` - Evaluation operation for rule. * `threshold` - The threshold of the metric trigger. --- `trigger` supports the following: -* `metricTrigger` - A `metricTrigger` block as defined above. Trigger condition for metric query rule. -* `operator` - Evaluation operation for rule - 'Equal', 'GreaterThan' or 'LessThan'. +* `metricTrigger` - A `metricTrigger` block as defined above. +* `operator` - Evaluation operation for rule. * `threshold` - Result or count threshold based on which rule should be triggered. diff --git a/website/docs/d/monitor_scheduled_query_rules_log.html.markdown b/website/docs/d/monitor_scheduled_query_rules_log.html.markdown index 3633ba24d57f5..af8890e478d20 100644 --- a/website/docs/d/monitor_scheduled_query_rules_log.html.markdown +++ b/website/docs/d/monitor_scheduled_query_rules_log.html.markdown @@ -26,16 +26,16 @@ output "query_rule_id" { ## Argument Reference * `name` - (Required) Specifies the name of the Scheduled Query Rule. -* `resource_group_name` - (Required) Specifies the name of the resource group the Scheduled Query Rule is located in. +* `resource_group_name` - (Required) Specifies the name of the resource group where the Scheduled Query Rule is located. ## Attributes Reference * `id` - The ID of the Scheduled Query Rule. * `criteria` - A `criteria` block as defined below. -* `data_source_id` - The resource uri over which log search query is to be run. +* `data_source_id` - The resource URI over which log search query is to be run. * `description` - The description of the Scheduled Query Rule. -* `enabled` - Whether this scheduled query rule is enabled. -* `throttling` - Time (in minutes) for which Alerts should be throttled or suppressed. +* `enabled` - Whether this Scheduled Query Rule is enabled. +* `throttling` - Time for which alerts should be throttled or suppressed. --- @@ -49,5 +49,5 @@ output "query_rule_id" { `dimension` supports the following: * `name` - Name of the dimension. -* `operator` - Operator for dimension values, - 'Include'. +* `operator` - Operator for dimension values. * `values` - List of dimension values. diff --git a/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown b/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown index 138e4fc9b472f..647252ecd1e2a 100644 --- a/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown +++ b/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown @@ -49,7 +49,6 @@ resource "azurerm_scheduled_query_rule_alert" "example" { enabled = true frequency = 5 query = "requests | where status_code >= 500 | summarize AggregatedValue = count() by bin(timestamp, 5m)" - query_type = "ResultCount" severity = 1 time_window = 30 trigger { @@ -82,7 +81,6 @@ resource "azurerm_scheduled_query_rule_alert" "example2" { enabled = true frequency = 5 query = format("let a=workspace('%s').Perf | where Computer='dependency' and TimeGenerated > ago(1h) | where ObjectName == 'Processor' and CounterName == '%% Processor Time' | summarize cpu=avg(CounterValue) by bin(TimeGenerated, 1m) | extend ts=tostring(TimeGenerated); let b=requests | where resultCode == '200' and timestamp > ago(1h) | summarize reqs=count() by bin(timestamp, 1m) | extend ts = tostring(timestamp); a | join b on $left.ts == $right.ts | where cpu > 50 and reqs > 5", azurerm_log_analytics_workspace.test.id) - query_type = "ResultCount" severity = "1" time_window = 30 trigger { @@ -98,18 +96,16 @@ The following arguments are supported: * `name` - (Required) The name of the Scheduled Query Rule. Changing this forces a new resource to be created. * `resource_group_name` - (Required) The name of the resource group in which to create the Scheduled Query Rule instance. +* `data_source_id` - (Required) The resource URI over which log search query is to be run. +* `frequency` - (Required) Frequency (in minutes) at which rule condition should be evaluated. Values must be between 5 and 1440 (inclusive). +* `time_window` - (Required) Time window for which data needs to be fetched for query (must be greater than or equal to `frequency`). Values must be between 5 and 2880 (inclusive). +* `trigger` - (Required) The condition that results in the alert rule being run. * `authorized_resource_ids` - (Optional) List of Resource IDs referred into query. * `action` - (Optional) An `action` block as defined below. -* `data_source_id` - (Required) The resource uri over which log search query is to be run. * `description` - (Optional) The description of the Scheduled Query Rule. * `enabled` - (Optional) Whether this scheduled query rule is enabled. Default is `true`. -* `frequency` - (Required) Frequency (in minutes) at which rule condition should be evaluated. -* `query` - (Required) Log search query. -* `query_type` - (Required) Must equal "ResultCount" for now. * `severity` - (Optional) Severity of the alert. Possible values include: 0, 1, 2, 3, or 4. -* `time_window` - (Required) Time window for which data needs to be fetched for query (should be greater than or equal to `frequency`). -* `throttling` - (Optional) Time (in minutes) for which Alerts should be throttled or suppressed. -* `trigger` - (Required) The condition that results in the alert rule being run. +* `throttling` - (Optional) Time (in minutes) for which Alerts should be throttled or suppressed. Values must be between 0 and 10000 (inclusive). --- @@ -126,7 +122,7 @@ The following arguments are supported: * `metricColumn` - (Required) Evaluation of metric on a particular column. * `metricTriggerType` - (Required) Metric Trigger Type - 'Consecutive' or 'Total'. * `operator` - (Required) Evaluation operation for rule - 'Equal', 'GreaterThan' or 'LessThan'. -* `threshold` - (Required) The threshold of the metric trigger. +* `threshold` - (Required) The threshold of the metric trigger. Values must be between 0 and 10000 inclusive. --- @@ -134,15 +130,13 @@ The following arguments are supported: * `metricTrigger` - (Optional) A `metricTrigger` block as defined above. Trigger condition for metric query rule. * `operator` - (Required) Evaluation operation for rule - 'Equal', 'GreaterThan' or 'LessThan'. -* `threshold` - (Required) Result or count threshold based on which rule should be triggered. +* `threshold` - (Required) Result or count threshold based on which rule should be triggered. Values must be between 0 and 10000 inclusive. ## Attributes Reference The following attributes are exported: * `id` - The ID of the Scheduled Query Rule. -* `last_updated_time` - Last time the rule was updated in IS08601 format. -* `provisioning_state` - Provisioning state of the scheduled query rule. Possible values include: 'Succeeded', 'Deploying', 'Canceled', 'Failed' ## Import diff --git a/website/docs/r/monitor_scheduled_query_rules_log.html.markdown b/website/docs/r/monitor_scheduled_query_rules_log.html.markdown index 7870b2c8d436e..48beb3b33359c 100644 --- a/website/docs/r/monitor_scheduled_query_rules_log.html.markdown +++ b/website/docs/r/monitor_scheduled_query_rules_log.html.markdown @@ -54,14 +54,15 @@ The following arguments are supported: * `data_source_id` - (Required) The resource uri over which log search query is to be run. * `description` - (Optional) The description of the Scheduled Query Rule. * `enabled` - (Optional) Whether this scheduled query rule is enabled. Default is `true`. -* `throttling` - (Optional) Time (in minutes) for which Alerts should be throttled or suppressed. +* `throttling` - (Optional) Time (in minutes) for which Alerts should be throttled or suppressed. Values must be between 0 and 10000 ( +inclusive). --- `criteria` supports the following: * `dimension` - (Required) A `dimension` block as defined below. -* `metric_name` - (Required) Name of the metric. +* `metric_name` - (Required) Name of the metric. Supported metrics are listed in the Azure Monitor [Microsoft.OperationalInsights/workspaces](https://docs.microsoft.com/en-us/azure/azure-monitor/platform/metrics-supported#microsoftoperationalinsightsworkspaces) metrics namespace. --- @@ -76,8 +77,6 @@ The following arguments are supported: The following attributes are exported: * `id` - The ID of the Scheduled Query Rule. -* `last_updated_time` - Last time the rule was updated in IS08601 format. -* `provisioning_state` - Provisioning state of the scheduled query rule. Possible values include: 'Succeeded', 'Deploying', 'Canceled', 'Failed' ## Import From 6be137739e53937b60323d83141bc7255263195f Mon Sep 17 00:00:00 2001 From: John Date: Mon, 10 Feb 2020 14:31:25 -0600 Subject: [PATCH 053/498] Updated to include TRIAL as a SKU Referencing PR 5652 https://github.com/terraform-providers/terraform-provider-azurerm/pull/5652 --- website/docs/r/databricks_workspace.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/databricks_workspace.html.markdown b/website/docs/r/databricks_workspace.html.markdown index c200849e8574b..51b169e76dea1 100644 --- a/website/docs/r/databricks_workspace.html.markdown +++ b/website/docs/r/databricks_workspace.html.markdown @@ -40,7 +40,7 @@ The following arguments are supported: * `location` - (Required) Specifies the supported Azure location where the resource has to be created. Changing this forces a new resource to be created. -* `sku` - (Required) The `sku` to use for the Databricks Workspace. Possible values are `standard` or `premium`. Changing this forces a new resource to be created. +* `sku` - (Required) The `sku` to use for the Databricks Workspace. Possible values are `standard`, `premium`, or `trial`. Changing this forces a new resource to be created. * `managed_resource_group_name` - (Optional) The name of the resource group where Azure should place the managed Databricks resources. Changing this forces a new resource to be created. From d1cf0b73d3e95f3c1c1191dca109f3f2d27dedac Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Mon, 10 Feb 2020 13:58:39 -0800 Subject: [PATCH 054/498] Initial port to new code base --- .../storage/data_source_storage_account.go | 27 -- .../storage/resource_arm_storage_account.go | 76 ---- ...arm_storage_account_encryption_settings.go | 327 +++++++++++++++++ ...torage_account_encryption_settings_test.go | 341 ++++++++++++++++++ .../resource_arm_storage_account_test.go | 155 -------- website/docs/r/storage_account.html.markdown | 6 - ..._account_encryption_settings.html.markdown | 133 +++++++ 7 files changed, 801 insertions(+), 264 deletions(-) create mode 100644 azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go create mode 100644 azurerm/internal/services/storage/tests/resource_arm_storage_account_encryption_settings_test.go create mode 100644 website/docs/r/storage_account_encryption_settings.html.markdown diff --git a/azurerm/internal/services/storage/data_source_storage_account.go b/azurerm/internal/services/storage/data_source_storage_account.go index ba8d8770769eb..6239a3385a1df 100644 --- a/azurerm/internal/services/storage/data_source_storage_account.go +++ b/azurerm/internal/services/storage/data_source_storage_account.go @@ -54,11 +54,6 @@ func dataSourceArmStorageAccount() *schema.Resource { Computed: true, }, - "account_encryption_source": { - Type: schema.TypeString, - Computed: true, - }, - "custom_domain": { Type: schema.TypeList, Computed: true, @@ -73,16 +68,6 @@ func dataSourceArmStorageAccount() *schema.Resource { }, }, - "enable_blob_encryption": { - Type: schema.TypeBool, - Computed: true, - }, - - "enable_file_encryption": { - Type: schema.TypeBool, - Computed: true, - }, - "enable_https_traffic_only": { Type: schema.TypeBool, Computed: true, @@ -330,18 +315,6 @@ func dataSourceArmStorageAccountRead(d *schema.ResourceData, meta interface{}) e } } - if encryption := props.Encryption; encryption != nil { - if services := encryption.Services; services != nil { - if blob := services.Blob; blob != nil { - d.Set("enable_blob_encryption", blob.Enabled) - } - if file := services.File; file != nil { - d.Set("enable_file_encryption", file.Enabled) - } - } - d.Set("account_encryption_source", string(encryption.KeySource)) - } - // Computed d.Set("primary_location", props.PrimaryLocation) d.Set("secondary_location", props.SecondaryLocation) diff --git a/azurerm/internal/services/storage/resource_arm_storage_account.go b/azurerm/internal/services/storage/resource_arm_storage_account.go index dda85e0d247f6..c6a48bd2caacb 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account.go @@ -122,17 +122,6 @@ func resourceArmStorageAccount() *schema.Resource { }, true), }, - "account_encryption_source": { - Type: schema.TypeString, - Optional: true, - Default: string(storage.MicrosoftStorage), - ValidateFunc: validation.StringInSlice([]string{ - string(storage.MicrosoftKeyvault), - string(storage.MicrosoftStorage), - }, true), - DiffSuppressFunc: suppress.CaseDifference, - }, - "custom_domain": { Type: schema.TypeList, Optional: true, @@ -153,18 +142,6 @@ func resourceArmStorageAccount() *schema.Resource { }, }, - "enable_blob_encryption": { - Type: schema.TypeBool, - Optional: true, - Default: true, - }, - - "enable_file_encryption": { - Type: schema.TypeBool, - Optional: true, - Default: true, - }, - "enable_https_traffic_only": { Type: schema.TypeBool, Optional: true, @@ -672,15 +649,12 @@ func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) e accountKind := d.Get("account_kind").(string) location := azure.NormalizeLocation(d.Get("location").(string)) t := d.Get("tags").(map[string]interface{}) - enableBlobEncryption := d.Get("enable_blob_encryption").(bool) - enableFileEncryption := d.Get("enable_file_encryption").(bool) enableHTTPSTrafficOnly := d.Get("enable_https_traffic_only").(bool) isHnsEnabled := d.Get("is_hns_enabled").(bool) accountTier := d.Get("account_tier").(string) replicationType := d.Get("account_replication_type").(string) storageType := fmt.Sprintf("%s_%s", accountTier, replicationType) - storageAccountEncryptionSource := d.Get("account_encryption_source").(string) parameters := storage.AccountCreateParameters{ Location: &location, @@ -691,15 +665,6 @@ func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) e Kind: storage.Kind(accountKind), AccountPropertiesCreateParameters: &storage.AccountPropertiesCreateParameters{ Encryption: &storage.Encryption{ - Services: &storage.EncryptionServices{ - Blob: &storage.EncryptionService{ - Enabled: utils.Bool(enableBlobEncryption), - }, - File: &storage.EncryptionService{ - Enabled: utils.Bool(enableFileEncryption), - }}, - KeySource: storage.KeySource(storageAccountEncryptionSource), - }, EnableHTTPSTrafficOnly: &enableHTTPSTrafficOnly, NetworkRuleSet: expandStorageAccountNetworkRules(d), IsHnsEnabled: &isHnsEnabled, @@ -903,35 +868,6 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e d.SetPartial("tags") } - if d.HasChange("enable_blob_encryption") || d.HasChange("enable_file_encryption") { - encryptionSource := d.Get("account_encryption_source").(string) - - opts := storage.AccountUpdateParameters{ - AccountPropertiesUpdateParameters: &storage.AccountPropertiesUpdateParameters{ - Encryption: &storage.Encryption{ - Services: &storage.EncryptionServices{}, - KeySource: storage.KeySource(encryptionSource), - }, - }, - } - - if d.HasChange("enable_blob_encryption") { - enableEncryption := d.Get("enable_blob_encryption").(bool) - opts.Encryption.Services.Blob = &storage.EncryptionService{ - Enabled: utils.Bool(enableEncryption), - } - - d.SetPartial("enable_blob_encryption") - } - - if d.HasChange("enable_file_encryption") { - enableEncryption := d.Get("enable_file_encryption").(bool) - opts.Encryption.Services.File = &storage.EncryptionService{ - Enabled: utils.Bool(enableEncryption), - } - d.SetPartial("enable_file_encryption") - } - if _, err := client.Update(ctx, resourceGroupName, storageAccountName, opts); err != nil { return fmt.Errorf("Error updating Azure Storage Account Encryption %q: %+v", storageAccountName, err) } @@ -1122,18 +1058,6 @@ func resourceArmStorageAccountRead(d *schema.ResourceData, meta interface{}) err } } - if encryption := props.Encryption; encryption != nil { - if services := encryption.Services; services != nil { - if blob := services.Blob; blob != nil { - d.Set("enable_blob_encryption", blob.Enabled) - } - if file := services.File; file != nil { - d.Set("enable_file_encryption", file.Enabled) - } - } - d.Set("account_encryption_source", string(encryption.KeySource)) - } - // Computed d.Set("primary_location", props.PrimaryLocation) d.Set("secondary_location", props.SecondaryLocation) diff --git a/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go b/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go new file mode 100644 index 0000000000000..d536707a7398e --- /dev/null +++ b/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go @@ -0,0 +1,327 @@ +package azurerm + +import ( + "fmt" + + "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage" + "github.com/hashicorp/terraform/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmStorageAccountEncryptionSettings() *schema.Resource { + return &schema.Resource{ + Read: resourceArmStorageAccountEncryptionSettingsRead, + Create: resourceArmStorageAccountEncryptionSettingsCreateUpdate, + Update: resourceArmStorageAccountEncryptionSettingsCreateUpdate, + Delete: resourceArmStorageAccountEncryptionSettingsDelete, + + Importer: &schema.ResourceImporter{ + State: resourceArmStorageAccountEncryptionSettingsImportState, + }, + SchemaVersion: 2, + + Schema: map[string]*schema.Schema{ + "storage_account_id": { + Type: schema.TypeString, + Required: true, + ValidateFunc: azure.ValidateResourceID, + }, + "enable_blob_encryption": { + Type: schema.TypeBool, + Optional: true, + Default: true, + }, + + "enable_file_encryption": { + Type: schema.TypeBool, + Optional: true, + Default: true, + }, + + "key_vault": { + Type: schema.TypeList, + MaxItems: 1, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + // This attribute is not used, it was only added + // to create a dependency between this resource + // and the key vault policy + "key_vault_policy_id": { + Type: schema.TypeString, + Required: true, + ValidateFunc: azure.ValidateResourceID, + }, + + "key_vault_id": { + Type: schema.TypeString, + Required: true, + ValidateFunc: azure.ValidateResourceID, + }, + + "key_name": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validate.NoEmptyStrings, + }, + "key_version": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validate.NoEmptyStrings, + }, + "key_vault_uri": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + }, + } +} + +func resourceArmStorageAccountEncryptionSettingsCreateUpdate(d *schema.ResourceData, meta interface{}) error { + ctx := meta.(*ArmClient).StopContext + vaultClient := meta.(*ArmClient).keyVaultClient + client := meta.(*ArmClient).storageServiceClient + + storageAccountId := d.Get("storage_account_id").(string) + + id, err := azure.ParseAzureResourceID(storageAccountId) + if err != nil { + return err + } + + storageAccountName := id.Path["storageAccounts"] + resourceGroupName := id.ResourceGroup + + // set default values for the attributes + enableBlobEncryption := true + enableFileEncryption := true + + // create the update object with the default values + opts := storage.AccountUpdateParameters{ + AccountPropertiesUpdateParameters: &storage.AccountPropertiesUpdateParameters{ + Encryption: &storage.Encryption{ + Services: &storage.EncryptionServices{ + Blob: &storage.EncryptionService{ + Enabled: utils.Bool(enableBlobEncryption), + }, + File: &storage.EncryptionService{ + Enabled: utils.Bool(enableFileEncryption), + }}, + KeySource: storage.MicrosoftStorage, + KeyVaultProperties: &storage.KeyVaultProperties{}, + }, + }, + } + + if d.HasChange("enable_blob_encryption") || d.HasChange("enable_file_encryption") { + opts.Encryption.Services.Blob.Enabled = utils.Bool(d.Get("enable_blob_encryption").(bool)) + opts.Encryption.Services.File.Enabled = utils.Bool(d.Get("enable_file_encryption").(bool)) + } + + if keyVaultProperties := expandAzureRmStorageAccountKeyVaultProperties(d); keyVaultProperties.KeyName != utils.String("") { + if v, ok := d.GetOk("key_vault.0.key_vault_id"); ok { + // Get the key vault base URL from the key vault + keyVaultId := v.(string) + pKeyVaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) + + if err != nil { + return fmt.Errorf("Error looking up Key Vault URI from id %q: %+v", keyVaultId, err) + } + + keyVaultProperties.KeyVaultURI = utils.String(pKeyVaultBaseUrl) + opts.Encryption.KeyVaultProperties = keyVaultProperties + opts.Encryption.KeySource = storage.MicrosoftKeyvault + } + } + + _, err = client.Update(ctx, resourceGroupName, storageAccountName, opts) + if err != nil { + return fmt.Errorf("Error updating Azure Storage Account Encryption %q: %+v", storageAccountName, err) + } + + resourceId := fmt.Sprintf("%s/encryptionSettings", storageAccountId) + d.SetId(resourceId) + + return resourceArmStorageAccountEncryptionSettingsRead(d, meta) +} + +func resourceArmStorageAccountEncryptionSettingsRead(d *schema.ResourceData, meta interface{}) error { + ctx := meta.(*ArmClient).StopContext + client := meta.(*ArmClient).storageServiceClient + + storageAccountId := d.Get("storage_account_id").(string) + + id, err := parseAzureResourceID(storageAccountId) + if err != nil { + return err + } + name := id.Path["storageAccounts"] + resGroup := id.ResourceGroup + + resp, err := client.GetProperties(ctx, resGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + d.SetId("") + return nil + } + return fmt.Errorf("Error reading the state of AzureRM Storage Account %q: %+v", name, err) + } + + if props := resp.AccountProperties; props != nil { + if encryption := props.Encryption; encryption != nil { + if services := encryption.Services; services != nil { + if blob := services.Blob; blob != nil { + d.Set("enable_blob_encryption", blob.Enabled) + } + if file := services.File; file != nil { + d.Set("enable_file_encryption", file.Enabled) + } + } + + if keyVaultProperties := encryption.KeyVaultProperties; keyVaultProperties != nil { + keyVaultId := d.Get("key_vault.0.key_vault_id").(string) + keyVaultPolicyId := d.Get("key_vault.0.key_vault_policy_id").(string) + + if err := d.Set("key_vault", flattenAzureRmStorageAccountKeyVaultProperties(keyVaultProperties, keyVaultId, keyVaultPolicyId)); err != nil { + return fmt.Errorf("Error flattening `key_vault_properties`: %+v", err) + } + } + } + } + + return nil +} + +func resourceArmStorageAccountEncryptionSettingsDelete(d *schema.ResourceData, meta interface{}) error { + ctx := meta.(*ArmClient).StopContext + client := meta.(*ArmClient).storageServiceClient + + storageAccountId := d.Get("storage_account_id").(string) + + id, err := azure.ParseAzureResourceID(storageAccountId) + if err != nil { + return err + } + + storageAccountName := id.Path["storageAccounts"] + resourceGroupName := id.ResourceGroup + + // Since this isn't a real object, just modifying an existing object + // "Delete" doesn't really make sense it should really be a "Revert to Default" + // So instead of the Delete func actually deleting the Storage Account I am + // making it reset the Storage Account to it's default state + opts := storage.AccountUpdateParameters{ + AccountPropertiesUpdateParameters: &storage.AccountPropertiesUpdateParameters{ + Encryption: &storage.Encryption{ + KeySource: storage.MicrosoftStorage, + }, + }, + } + + _, err = client.Update(ctx, resourceGroupName, storageAccountName, opts) + if err != nil { + return fmt.Errorf("Error updating Azure Storage Account Encryption %q: %+v", storageAccountName, err) + } + + return nil +} + +func resourceArmStorageAccountEncryptionSettingsImportState(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + ctx := meta.(*ArmClient).StopContext + client := meta.(*ArmClient).storageServiceClient + + id := d.Id() + + d.Set("storage_account_id", id) + + saId, err := parseAzureResourceID(id) + if err != nil { + return nil, err + } + name := saId.Path["storageAccounts"] + resGroup := saId.ResourceGroup + + resp, err := client.GetProperties(ctx, resGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + d.SetId("") + return nil, nil + } + return nil, fmt.Errorf("Error importing the state of AzureRM Storage Account %q: %+v", name, err) + } + + if props := resp.AccountProperties; props != nil { + if encryption := props.Encryption; encryption != nil { + if services := encryption.Services; services != nil { + if blob := services.Blob; blob != nil { + d.Set("enable_blob_encryption", blob.Enabled) + } + if file := services.File; file != nil { + d.Set("enable_file_encryption", file.Enabled) + } + } + + if keyVaultProperties := encryption.KeyVaultProperties; keyVaultProperties != nil { + if err := d.Set("key_vault", flattenAzureRmStorageAccountKeyVaultProperties(keyVaultProperties, "", "")); err != nil { + return nil, fmt.Errorf("Error flattening `key_vault_properties` on import: %+v", err) + } + } + } + } + + resourceId := fmt.Sprintf("%s/encryptionSettings", id) + d.SetId(resourceId) + + results := make([]*schema.ResourceData, 1) + + results[0] = d + return results, nil +} + +func expandAzureRmStorageAccountKeyVaultProperties(d *schema.ResourceData) *storage.KeyVaultProperties { + vs := d.Get("key_vault").([]interface{}) + if len(vs) == 0 { + return &storage.KeyVaultProperties{} + } + + v := vs[0].(map[string]interface{}) + keyName := v["key_name"].(string) + keyVersion := v["key_version"].(string) + + return &storage.KeyVaultProperties{ + KeyName: utils.String(keyName), + KeyVersion: utils.String(keyVersion), + } +} + +func flattenAzureRmStorageAccountKeyVaultProperties(keyVaultProperties *storage.KeyVaultProperties, keyVaultId string, keyVaultPolicyId string) []interface{} { + if keyVaultProperties == nil { + return make([]interface{}, 0) + } + + result := make(map[string]interface{}) + if keyVaultId != "" { + result["key_vault_id"] = keyVaultId + } + + if keyVaultPolicyId != "" { + result["key_vault_policy_id"] = keyVaultPolicyId + } + + if keyVaultProperties.KeyName != nil { + result["key_name"] = *keyVaultProperties.KeyName + } + if keyVaultProperties.KeyVersion != nil { + result["key_version"] = *keyVaultProperties.KeyVersion + } + if keyVaultProperties.KeyVaultURI != nil { + result["key_vault_uri"] = *keyVaultProperties.KeyVaultURI + } + + return []interface{}{result} +} diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_encryption_settings_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_encryption_settings_test.go new file mode 100644 index 0000000000000..751b0b733fa63 --- /dev/null +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_account_encryption_settings_test.go @@ -0,0 +1,341 @@ +package azurerm + +import ( + "fmt" + "net/http" + "os" + "testing" + + "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage" + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" +) + +func TestAccAzureRMStorageAccountEncryptionSettings_basic(t *testing.T) { + parentResourceName := "azurerm_storage_account.testsa" + resourceName := "azurerm_storage_account_encryption_settings.custom" + ri := tf.AccRandTimeInt() + rs := acctest.RandString(4) + location := testLocation() + preConfig := testAccAzureRMStorageAccountEncryptionSettings_basic(ri, rs, location) + postConfig := testAccAzureRMStorageAccountEncryptionSettings_basicDelete(ri, rs, location) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMStorageAccountDestroyed, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMStorageAccountEncryptionSettingsExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "enable_blob_encryption", "true"), + resource.TestCheckResourceAttr(resourceName, "enable_file_encryption", "true"), + ), + }, + { + // Delete the encryption settings resource and verify it is gone + // Whilst making sure the encryption settings on the storage account + // have been reverted to their default state + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMStorageAccountExistsWithDefaultSettings(parentResourceName), + testCheckAzureRMStorageAccountEncryptionSettingsDestroyed(resourceName), + ), + }, + }, + }) +} + +func TestAccAzureRMStorageAccountEncryptionSettings_blobEncryptionDisable(t *testing.T) { + _, exists := os.LookupEnv("TF_ACC_STORAGE_ENCRYPTION_DISABLE") + if !exists { + t.Skip("`TF_ACC_STORAGE_ENCRYPTION_DISABLE` isn't specified - skipping since disabling encryption is generally disabled") + } + + resourceName := "azurerm_storage_account_encryption_settings.custom" + ri := tf.AccRandTimeInt() + rs := acctest.RandString(4) + location := testLocation() + config := testAccAzureRMStorageAccountEncryptionSettings_blobEncryptionDisabled(ri, rs, location) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMStorageAccountDestroyed, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMStorageAccountEncryptionSettingsExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "enable_blob_encryption", "false"), + ), + }, + }, + }) +} + +func TestAccAzureRMStorageAccountEncryptionSettings_fileEncryptionDisable(t *testing.T) { + _, exists := os.LookupEnv("TF_ACC_STORAGE_ENCRYPTION_DISABLE") + if !exists { + t.Skip("`TF_ACC_STORAGE_ENCRYPTION_DISABLE` isn't specified - skipping since disabling encryption is generally disabled") + } + + resourceName := "azurerm_storage_account_encryption_settings.custom" + ri := tf.AccRandTimeInt() + rs := acctest.RandString(4) + location := testLocation() + config := testAccAzureRMStorageAccountEncryptionSettings_fileEncryptionDisabled(ri, rs, location) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMStorageAccountDestroyed, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMStorageAccountEncryptionSettingsExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "enable_file_encryption", "false"), + ), + }, + }, + }) +} + +func TestAccAzureRMStorageAccountEncryptionSettings_disappears(t *testing.T) { + parentResourceName := "azurerm_storage_account.testsa" + resourceName := "azurerm_storage_account_encryption_settings.custom" + ri := tf.AccRandTimeInt() + rs := acctest.RandString(4) + preConfig := testAccAzureRMStorageAccountEncryptionSettings_basic(ri, rs, testLocation()) + postConfig := testAccAzureRMStorageAccountEncryptionSettings_basicDelete(ri, rs, testLocation()) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMStorageAccountDestroyed, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMStorageAccountEncryptionSettingsExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "enable_blob_encryption", "true"), + resource.TestCheckResourceAttr(resourceName, "enable_file_encryption", "true"), + ), + }, + { + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMStorageAccountExistsWithDefaultSettings(parentResourceName), + testCheckAzureRMStorageAccountEncryptionSettingsDestroyed(resourceName), + ), + }, + }, + }) +} + +func testCheckAzureRMStorageAccountExistsWithDefaultSettings(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + // Ensure we have enough information in state to look up in API + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("Not found: %s", resourceName) + } + + storageAccount := rs.Primary.Attributes["name"] + resourceGroup := rs.Primary.Attributes["resource_group_name"] + + // Ensure resource group exists in API + ctx := testAccProvider.Meta().(*ArmClient).StopContext + conn := testAccProvider.Meta().(*ArmClient).storageServiceClient + + resp, err := conn.GetProperties(ctx, resourceGroup, storageAccount) + if err != nil { + return fmt.Errorf("Bad: Get on storageServiceClient: %+v", err) + } + + if resp.StatusCode == http.StatusNotFound { + return fmt.Errorf("Bad: StorageAccount %q (resource group: %q) does not exist", storageAccount, resourceGroup) + } + + if props := resp.AccountProperties; props != nil { + if encryption := props.Encryption; encryption != nil { + if services := encryption.Services; services != nil { + if !*services.Blob.Enabled { + return fmt.Errorf("enable_blob_encryption not set to default: %s", resourceName) + } + if !*services.File.Enabled { + return fmt.Errorf("enable_file_encryption not set to default: %s", resourceName) + } + } + + if encryption.KeySource != storage.MicrosoftStorage { + return fmt.Errorf("%s keySource not set to default(storage.MicrosoftStorage): %s", resourceName, encryption.KeySource) + } + } else { + return fmt.Errorf("storage account encryption properties not found: %s", resourceName) + } + } + + return nil + } +} + +func testCheckAzureRMStorageAccountEncryptionSettingsExists(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + // Ensure we have enough information in state to look up in API + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("Not found: %s", resourceName) + } + + if storageAccountId := rs.Primary.Attributes["storage_account_id"]; storageAccountId == "" { + return fmt.Errorf("Unable to read storageAccountId: %s", resourceName) + } + + return nil + } +} + +func testCheckAzureRMStorageAccountDestroyed(s *terraform.State) error { + ctx := testAccProvider.Meta().(*ArmClient).StopContext + conn := testAccProvider.Meta().(*ArmClient).storageServiceClient + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_storage_account" { + continue + } + + name := rs.Primary.Attributes["name"] + resourceGroup := rs.Primary.Attributes["resource_group_name"] + + resp, err := conn.GetProperties(ctx, resourceGroup, name) + if err != nil { + return nil + } + + if resp.StatusCode != http.StatusNotFound { + return fmt.Errorf("Storage Account still exists:\n%#v", resp.AccountProperties) + } + } + + return nil +} + +func testCheckAzureRMStorageAccountEncryptionSettingsDestroyed(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + _, ok := s.RootModule().Resources[resourceName] + if !ok { + return nil + } + + return fmt.Errorf("Found: %s", resourceName) + } +} + +func testAccAzureRMStorageAccountEncryptionSettings_basic(rInt int, rString string, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "testrg" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_storage_account" "testsa" { + name = "unlikely23exst2acct%s" + resource_group_name = "${azurerm_resource_group.testrg.name}" + + location = "${azurerm_resource_group.testrg.location}" + account_tier = "Standard" + account_replication_type = "LRS" + + tags { + environment = "production" + } +} + +resource "azurerm_storage_account_encryption_settings" "custom" { + storage_account_id = "${azurerm_storage_account.testsa.id}" + enable_blob_encryption = true + enable_file_encryption = true +} +`, rInt, location, rString) +} + +func testAccAzureRMStorageAccountEncryptionSettings_basicDelete(rInt int, rString string, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "testrg" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_storage_account" "testsa" { + name = "unlikely23exst2acct%s" + resource_group_name = "${azurerm_resource_group.testrg.name}" + + location = "${azurerm_resource_group.testrg.location}" + account_tier = "Standard" + account_replication_type = "LRS" + + tags { + environment = "production" + } +} +`, rInt, location, rString) +} + +func testAccAzureRMStorageAccountEncryptionSettings_fileEncryptionDisabled(rInt int, rString string, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "testrg" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_storage_account" "testsa" { + name = "unlikely23exst2acct%s" + resource_group_name = "${azurerm_resource_group.testrg.name}" + + location = "${azurerm_resource_group.testrg.location}" + account_tier = "Standard" + account_replication_type = "LRS" + + tags { + environment = "production" + } +} + +resource "azurerm_storage_account_encryption_settings" "custom" { + storage_account_id = "${azurerm_storage_account.testsa.id} + enable_file_encryption = false" +} +`, rInt, location, rString) +} + +func testAccAzureRMStorageAccountEncryptionSettings_blobEncryptionDisabled(rInt int, rString string, location string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "testrg" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_storage_account" "testsa" { + name = "unlikely23exst2acct%s" + resource_group_name = "${azurerm_resource_group.testrg.name}" + + location = "${azurerm_resource_group.testrg.location}" + account_tier = "Standard" + account_replication_type = "LRS" + + tags { + environment = "production" + } +} + +resource "azurerm_storage_account_encryption_settings" "custom" { + storage_account_id = "${azurerm_storage_account.testsa.id} + enable_blob_encryption = false" +} +`, rInt, location, rString) +} diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go index 24f8b1618d89e..99c1cda3a0e20 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go @@ -3,7 +3,6 @@ package tests import ( "fmt" "net/http" - "os" "regexp" "testing" @@ -212,68 +211,6 @@ func TestAccAzureRMStorageAccount_blobConnectionString(t *testing.T) { }) } -func TestAccAzureRMStorageAccount_blobEncryption(t *testing.T) { - _, exists := os.LookupEnv("TF_ACC_STORAGE_ENCRYPTION_DISABLE") - if !exists { - t.Skip("`TF_ACC_STORAGE_ENCRYPTION_DISABLE` isn't specified - skipping since disabling encryption is generally disabled") - } - data := acceptance.BuildTestData(t, "azurerm_storage_account", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMStorageAccountDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMStorageAccount_blobEncryption(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "enable_blob_encryption", "true"), - ), - }, - data.ImportStep(), - { - Config: testAccAzureRMStorageAccount_blobEncryptionDisabled(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "enable_blob_encryption", "false"), - ), - }, - }, - }) -} - -func TestAccAzureRMStorageAccount_fileEncryption(t *testing.T) { - _, exists := os.LookupEnv("TF_ACC_STORAGE_ENCRYPTION_DISABLE") - if !exists { - t.Skip("`TF_ACC_STORAGE_ENCRYPTION_DISABLE` isn't specified - skipping since disabling encryption is generally disabled") - } - data := acceptance.BuildTestData(t, "azurerm_storage_account", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMStorageAccountDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMStorageAccount_fileEncryption(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "enable_file_encryption", "true"), - ), - }, - data.ImportStep(), - { - Config: testAccAzureRMStorageAccount_fileEncryptionDisabled(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "enable_file_encryption", "false"), - ), - }, - }, - }) -} - func TestAccAzureRMStorageAccount_enableHttpsTrafficOnly(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_storage_account", "test") @@ -823,98 +760,6 @@ resource "azurerm_storage_account" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomString) } -func testAccAzureRMStorageAccount_blobEncryption(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-storage-%d" - location = "%s" -} - -resource "azurerm_storage_account" "test" { - name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.test.name}" - - location = "${azurerm_resource_group.test.location}" - account_tier = "Standard" - account_replication_type = "LRS" - enable_blob_encryption = true - - tags = { - environment = "production" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomString) -} - -func testAccAzureRMStorageAccount_blobEncryptionDisabled(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-storage-%d" - location = "%s" -} - -resource "azurerm_storage_account" "test" { - name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.test.name}" - - location = "${azurerm_resource_group.test.location}" - account_tier = "Standard" - account_replication_type = "LRS" - enable_blob_encryption = false - - tags = { - environment = "production" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomString) -} - -func testAccAzureRMStorageAccount_fileEncryption(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-storage-%d" - location = "%s" -} - -resource "azurerm_storage_account" "test" { - name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.test.name}" - - location = "${azurerm_resource_group.test.location}" - account_tier = "Standard" - account_replication_type = "LRS" - enable_file_encryption = true - - tags = { - environment = "production" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomString) -} - -func testAccAzureRMStorageAccount_fileEncryptionDisabled(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-storage-%d" - location = "%s" -} - -resource "azurerm_storage_account" "test" { - name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.test.name}" - - location = "${azurerm_resource_group.test.location}" - account_tier = "Standard" - account_replication_type = "LRS" - enable_file_encryption = false - - tags = { - environment = "production" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomString) -} - func testAccAzureRMStorageAccount_enableHttpsTrafficOnly(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { diff --git a/website/docs/r/storage_account.html.markdown b/website/docs/r/storage_account.html.markdown index b62d07a008e06..068392892101c 100644 --- a/website/docs/r/storage_account.html.markdown +++ b/website/docs/r/storage_account.html.markdown @@ -92,17 +92,11 @@ The following arguments are supported: * `access_tier` - (Optional) Defines the access tier for `BlobStorage`, `FileStorage` and `StorageV2` accounts. Valid options are `Hot` and `Cool`, defaults to `Hot`. -* `enable_blob_encryption` - (Optional) Boolean flag which controls if Encryption Services are enabled for Blob storage, see [here](https://azure.microsoft.com/en-us/documentation/articles/storage-service-encryption/) for more information. Defaults to `true`. - -* `enable_file_encryption` - (Optional) Boolean flag which controls if Encryption Services are enabled for File storage, see [here](https://azure.microsoft.com/en-us/documentation/articles/storage-service-encryption/) for more information. Defaults to `true`. - * `enable_https_traffic_only` - (Optional) Boolean flag which forces HTTPS if enabled, see [here](https://docs.microsoft.com/en-us/azure/storage/storage-require-secure-transfer/) for more information. * `is_hns_enabled` - (Optional) Is Hierarchical Namespace enabled? This can be used with Azure Data Lake Storage Gen 2 ([see here for more information](https://docs.microsoft.com/en-us/azure/storage/blobs/data-lake-storage-quickstart-create-account/)). Changing this forces a new resource to be created. -* `account_encryption_source` - (Optional) The Encryption Source for this Storage Account. Possible values are `Microsoft.Keyvault` and `Microsoft.Storage`. Defaults to `Microsoft.Storage`. - * `custom_domain` - (Optional) A `custom_domain` block as documented below. * `enable_advanced_threat_protection` (Optional) Boolean flag which controls if advanced threat protection is enabled, see [here](https://docs.microsoft.com/en-us/azure/storage/common/storage-advanced-threat-protection) for more information. Defaults to `false`. diff --git a/website/docs/r/storage_account_encryption_settings.html.markdown b/website/docs/r/storage_account_encryption_settings.html.markdown new file mode 100644 index 0000000000000..88680d48328a1 --- /dev/null +++ b/website/docs/r/storage_account_encryption_settings.html.markdown @@ -0,0 +1,133 @@ +--- +subcategory: "Storage" +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_storage_account_encryption_settings" +description: |- + Manages the encryption settings of an Azure Storage Account. +--- + +# azurerm_storage_account_encryption_settings + +Manages the encryption settings of an Azure Storage Account. + +## Example Usage + +```hcl +resource "azurerm_storage_account_encryption_settings" "tfex" { + storage_account_id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/tfex-RG/providers/Microsoft.Storage/storageAccounts/tfexstorageaccount" + + key_vault { + key_vault_policy_id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/tfex-RG/providers/Microsoft.KeyVault/vaults/tfex-key-vault/objectId/00000000-0000-0000-0000-000000000000" + key_vault_id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/tfex-RG/providers/Microsoft.KeyVault/vaults/tfex-key-vault" + key_name = "tfex-key" + key_version = "955b9ad9579e4501a311df5493bacd02" + } +} +``` + +## Example Usage with User Managed Key Vault Key + +```hcl +resource "azurerm_resource_group" "tfex" { + name = "tfex-RG" + location = "westeurope" +} + +resource "azurerm_key_vault" "tfex" { + name = "tfex-key-vault" + location = "${azurerm_resource_group.tfex.location}" + resource_group_name = "${azurerm_resource_group.tfex.name}" + enabled_for_disk_encryption = true + tenant_id = "00000000-0000-0000-0000-000000000000" + + sku { + name = "standard" + } + + tags { + environment = "testing" + } +} + +resource "azurerm_key_vault_key" "tfex" { + name = "tfex-key" + key_vault_id = "${azurerm_key_vault.tfex.id}" + key_type = "RSA" + key_size = 2048 + key_opts = ["decrypt", "encrypt", "sign", "unwrapKey", "verify", "wrapKey"] +} + +resource "azurerm_key_vault_access_policy" "tfex" { + key_vault_id = "${azurerm_key_vault.tfex.id}" + tenant_id = "00000000-0000-0000-0000-000000000000" + object_id = "${azurerm_storage_account.tfex.identity.0.principal_id}" + + key_permissions = ["get","create","delete","list","restore","recover","unwrapkey","wrapkey","purge","encrypt","decrypt","sign","verify"] + secret_permissions = ["get"] +} + +resource "azurerm_storage_account" "tfex" { + name = "tfexstorageaccount" + resource_group_name = "${azurerm_resource_group.tfex.name}" + location = "${azurerm_resource_group.tfex.location}" + account_tier = "Standard" + account_replication_type = "GRS" + + identity { + type = "SystemAssigned" + } + + tags { + environment = "testing" + } +} + +resource "azurerm_storage_account_encryption_settings" "tfex" { + storage_account_id = "${azurerm_storage_account.tfex.id}" + + key_vault { + key_vault_policy_id = "${azurerm_key_vault_access_policy.tfex.id}" + key_vault_id = "${azurerm_key_vault.tfex.id}" + key_name = "${azurerm_key_vault_key.tfex.name}" + key_version = "${azurerm_key_vault_key.tfex.version}" + } +} +``` + +## Argument Reference + +The following arguments are supported: + +* `storage_account_id` - (Required) The id of the storage account to manage the encryption settings for. + +* `enable_blob_encryption` - (Optional) Boolean flag which controls if Encryption Services are enabled for Blob storage, see [here](https://azure.microsoft.com/en-us/documentation/articles/storage-service-encryption/) for more information. Defaults to `true`. + +* `enable_file_encryption` - (Optional) Boolean flag which controls if Encryption Services are enabled for File storage, see [here](https://azure.microsoft.com/en-us/documentation/articles/storage-service-encryption/) for more information. Defaults to `true`. + +* `key_vault` - (Optional) A `key_vault` block as documented below. + +--- + +* `key_vault` supports the following: + +* `key_vault_id` - (Required) The ID of the Key Vault. +* `key_vault_policy_id` - (Required) The resource ID of the `azurerm_key_vault_access_policy` granting the storage account access to the key vault. +* `key_name` - (Required) The name of Key Vault key. +* `key_version` - (Required) The version of Key Vault key. + +## Attributes Reference + +The following attributes are exported in addition to the arguments listed above: + +* `id` - The storage account encryption settings Resource ID. +* `key_vault_uri` - The base URI of the Key Vault. + +--- + +## Import + +Storage Accounts Encryption Settings can be imported using the `resource id`, e.g. + +```shell +terraform import azurerm_storage_account_encryption_settings.tfex /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myresourcegroup/providers/Microsoft.Storage/storageAccounts/myaccount +``` \ No newline at end of file From 8f9d064990fb90efd72b0cdce8f440cee244b2ae Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Mon, 10 Feb 2020 16:12:07 -0800 Subject: [PATCH 055/498] Got it to compile --- .../internal/services/storage/registration.go | 23 +++---- .../storage/resource_arm_storage_account.go | 6 -- ...arm_storage_account_encryption_settings.go | 63 +++++++++++-------- ...torage_account_encryption_settings_test.go | 2 +- ..._account_encryption_settings.html.markdown | 48 ++++++++------ 5 files changed, 81 insertions(+), 61 deletions(-) diff --git a/azurerm/internal/services/storage/registration.go b/azurerm/internal/services/storage/registration.go index bdf608f1635cf..bc6bb490477ab 100644 --- a/azurerm/internal/services/storage/registration.go +++ b/azurerm/internal/services/storage/registration.go @@ -25,16 +25,17 @@ 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_storage_account": resourceArmStorageAccount(), - "azurerm_storage_account_network_rules": resourceArmStorageAccountNetworkRules(), - "azurerm_storage_blob": resourceArmStorageBlob(), - "azurerm_storage_container": resourceArmStorageContainer(), - "azurerm_storage_data_lake_gen2_filesystem": resourceArmStorageDataLakeGen2FileSystem(), - "azurerm_storage_management_policy": resourceArmStorageManagementPolicy(), - "azurerm_storage_queue": resourceArmStorageQueue(), - "azurerm_storage_share": resourceArmStorageShare(), - "azurerm_storage_share_directory": resourceArmStorageShareDirectory(), - "azurerm_storage_table": resourceArmStorageTable(), - "azurerm_storage_table_entity": resourceArmStorageTableEntity(), + "azurerm_storage_account": resourceArmStorageAccount(), + "azurerm_storage_account_encryption_settings": resourceArmStorageAccountEncryptionSettings(), + "azurerm_storage_account_network_rules": resourceArmStorageAccountNetworkRules(), + "azurerm_storage_blob": resourceArmStorageBlob(), + "azurerm_storage_container": resourceArmStorageContainer(), + "azurerm_storage_data_lake_gen2_filesystem": resourceArmStorageDataLakeGen2FileSystem(), + "azurerm_storage_management_policy": resourceArmStorageManagementPolicy(), + "azurerm_storage_queue": resourceArmStorageQueue(), + "azurerm_storage_share": resourceArmStorageShare(), + "azurerm_storage_share_directory": resourceArmStorageShareDirectory(), + "azurerm_storage_table": resourceArmStorageTable(), + "azurerm_storage_table_entity": resourceArmStorageTableEntity(), } } diff --git a/azurerm/internal/services/storage/resource_arm_storage_account.go b/azurerm/internal/services/storage/resource_arm_storage_account.go index c6a48bd2caacb..6ce053f5425d5 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account.go @@ -664,7 +664,6 @@ func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) e Tags: tags.Expand(t), Kind: storage.Kind(accountKind), AccountPropertiesCreateParameters: &storage.AccountPropertiesCreateParameters{ - Encryption: &storage.Encryption{ EnableHTTPSTrafficOnly: &enableHTTPSTrafficOnly, NetworkRuleSet: expandStorageAccountNetworkRules(d), IsHnsEnabled: &isHnsEnabled, @@ -868,11 +867,6 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e d.SetPartial("tags") } - if _, err := client.Update(ctx, resourceGroupName, storageAccountName, opts); err != nil { - return fmt.Errorf("Error updating Azure Storage Account Encryption %q: %+v", storageAccountName, err) - } - } - if d.HasChange("custom_domain") { opts := storage.AccountUpdateParameters{ AccountPropertiesUpdateParameters: &storage.AccountPropertiesUpdateParameters{ diff --git a/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go b/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go index d536707a7398e..0ba2bc5380a48 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go @@ -1,26 +1,35 @@ -package azurerm +package storage import ( "fmt" + "time" - "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage" - "github.com/hashicorp/terraform/helper/schema" + "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-04-01/storage" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func resourceArmStorageAccountEncryptionSettings() *schema.Resource { return &schema.Resource{ - Read: resourceArmStorageAccountEncryptionSettingsRead, - Create: resourceArmStorageAccountEncryptionSettingsCreateUpdate, - Update: resourceArmStorageAccountEncryptionSettingsCreateUpdate, - Delete: resourceArmStorageAccountEncryptionSettingsDelete, - + Read: resourceArmStorageAccountEncryptionSettingsRead, + Create: resourceArmStorageAccountEncryptionSettingsCreateUpdate, + Update: resourceArmStorageAccountEncryptionSettingsCreateUpdate, + Delete: resourceArmStorageAccountEncryptionSettingsDelete, + SchemaVersion: 2, Importer: &schema.ResourceImporter{ - State: resourceArmStorageAccountEncryptionSettingsImportState, + State: schema.ImportStatePassthrough, + }, + + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(30 * time.Minute), + Read: schema.DefaultTimeout(5 * time.Minute), + Update: schema.DefaultTimeout(30 * time.Minute), + Delete: schema.DefaultTimeout(30 * time.Minute), }, - SchemaVersion: 2, Schema: map[string]*schema.Schema{ "storage_account_id": { @@ -83,9 +92,10 @@ func resourceArmStorageAccountEncryptionSettings() *schema.Resource { } func resourceArmStorageAccountEncryptionSettingsCreateUpdate(d *schema.ResourceData, meta interface{}) error { - ctx := meta.(*ArmClient).StopContext - vaultClient := meta.(*ArmClient).keyVaultClient - client := meta.(*ArmClient).storageServiceClient + vaultClient := meta.(*clients.Client).KeyVault.VaultsClient + storageClient := meta.(*clients.Client).Storage.AccountsClient + ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) + defer cancel() storageAccountId := d.Get("storage_account_id").(string) @@ -139,7 +149,7 @@ func resourceArmStorageAccountEncryptionSettingsCreateUpdate(d *schema.ResourceD } } - _, err = client.Update(ctx, resourceGroupName, storageAccountName, opts) + _, err = storageClient.Update(ctx, resourceGroupName, storageAccountName, opts) if err != nil { return fmt.Errorf("Error updating Azure Storage Account Encryption %q: %+v", storageAccountName, err) } @@ -151,19 +161,20 @@ func resourceArmStorageAccountEncryptionSettingsCreateUpdate(d *schema.ResourceD } func resourceArmStorageAccountEncryptionSettingsRead(d *schema.ResourceData, meta interface{}) error { - ctx := meta.(*ArmClient).StopContext - client := meta.(*ArmClient).storageServiceClient + storageClient := meta.(*clients.Client).Storage.AccountsClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() storageAccountId := d.Get("storage_account_id").(string) - id, err := parseAzureResourceID(storageAccountId) + id, err := azure.ParseAzureResourceID(storageAccountId) if err != nil { return err } name := id.Path["storageAccounts"] resGroup := id.ResourceGroup - resp, err := client.GetProperties(ctx, resGroup, name) + resp, err := storageClient.GetProperties(ctx, resGroup, name, "") if err != nil { if utils.ResponseWasNotFound(resp.Response) { d.SetId("") @@ -198,8 +209,9 @@ func resourceArmStorageAccountEncryptionSettingsRead(d *schema.ResourceData, met } func resourceArmStorageAccountEncryptionSettingsDelete(d *schema.ResourceData, meta interface{}) error { - ctx := meta.(*ArmClient).StopContext - client := meta.(*ArmClient).storageServiceClient + storageClient := meta.(*clients.Client).Storage.AccountsClient + ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) + defer cancel() storageAccountId := d.Get("storage_account_id").(string) @@ -223,7 +235,7 @@ func resourceArmStorageAccountEncryptionSettingsDelete(d *schema.ResourceData, m }, } - _, err = client.Update(ctx, resourceGroupName, storageAccountName, opts) + _, err = storageClient.Update(ctx, resourceGroupName, storageAccountName, opts) if err != nil { return fmt.Errorf("Error updating Azure Storage Account Encryption %q: %+v", storageAccountName, err) } @@ -232,21 +244,22 @@ func resourceArmStorageAccountEncryptionSettingsDelete(d *schema.ResourceData, m } func resourceArmStorageAccountEncryptionSettingsImportState(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { - ctx := meta.(*ArmClient).StopContext - client := meta.(*ArmClient).storageServiceClient + storageClient := meta.(*clients.Client).Storage.AccountsClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() id := d.Id() d.Set("storage_account_id", id) - saId, err := parseAzureResourceID(id) + saId, err := azure.ParseAzureResourceID(id) if err != nil { return nil, err } name := saId.Path["storageAccounts"] resGroup := saId.ResourceGroup - resp, err := client.GetProperties(ctx, resGroup, name) + resp, err := storageClient.GetProperties(ctx, resGroup, name, "") if err != nil { if utils.ResponseWasNotFound(resp.Response) { d.SetId("") diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_encryption_settings_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_encryption_settings_test.go index 751b0b733fa63..cc994667f9407 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_account_encryption_settings_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_account_encryption_settings_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage" + "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-04-01/storage" "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" diff --git a/website/docs/r/storage_account_encryption_settings.html.markdown b/website/docs/r/storage_account_encryption_settings.html.markdown index 88680d48328a1..c234b895f6eec 100644 --- a/website/docs/r/storage_account_encryption_settings.html.markdown +++ b/website/docs/r/storage_account_encryption_settings.html.markdown @@ -28,6 +28,16 @@ resource "azurerm_storage_account_encryption_settings" "tfex" { ## Example Usage with User Managed Key Vault Key ```hcl +provider "azurerm" { + alias = "keyVault" + + features { + key_vault { + purge_soft_delete_on_destroy = true + } + } +} + resource "azurerm_resource_group" "tfex" { name = "tfex-RG" location = "westeurope" @@ -35,32 +45,34 @@ resource "azurerm_resource_group" "tfex" { resource "azurerm_key_vault" "tfex" { name = "tfex-key-vault" - location = "${azurerm_resource_group.tfex.location}" - resource_group_name = "${azurerm_resource_group.tfex.name}" - enabled_for_disk_encryption = true + provider = azurerm.keyVault + location = azurerm_resource_group.tfex.location + resource_group_name = azurerm_resource_group.tfex.name tenant_id = "00000000-0000-0000-0000-000000000000" + + enabled_for_disk_encryption = true + soft_delete_enabled = true + purge_protection_enabled = false - sku { - name = "standard" - } + sku_name = "standard" - tags { + tags = { environment = "testing" } } resource "azurerm_key_vault_key" "tfex" { name = "tfex-key" - key_vault_id = "${azurerm_key_vault.tfex.id}" + key_vault_id = azurerm_key_vault.tfex.id key_type = "RSA" key_size = 2048 key_opts = ["decrypt", "encrypt", "sign", "unwrapKey", "verify", "wrapKey"] } resource "azurerm_key_vault_access_policy" "tfex" { - key_vault_id = "${azurerm_key_vault.tfex.id}" + key_vault_id = azurerm_key_vault.tfex.id tenant_id = "00000000-0000-0000-0000-000000000000" - object_id = "${azurerm_storage_account.tfex.identity.0.principal_id}" + object_id = azurerm_storage_account.tfex.identity.0.principal_id key_permissions = ["get","create","delete","list","restore","recover","unwrapkey","wrapkey","purge","encrypt","decrypt","sign","verify"] secret_permissions = ["get"] @@ -68,8 +80,8 @@ resource "azurerm_key_vault_access_policy" "tfex" { resource "azurerm_storage_account" "tfex" { name = "tfexstorageaccount" - resource_group_name = "${azurerm_resource_group.tfex.name}" - location = "${azurerm_resource_group.tfex.location}" + resource_group_name = azurerm_resource_group.tfex.name + location = azurerm_resource_group.tfex.location account_tier = "Standard" account_replication_type = "GRS" @@ -77,19 +89,19 @@ resource "azurerm_storage_account" "tfex" { type = "SystemAssigned" } - tags { + tags = { environment = "testing" } } resource "azurerm_storage_account_encryption_settings" "tfex" { - storage_account_id = "${azurerm_storage_account.tfex.id}" + storage_account_id = azurerm_storage_account.tfex.id key_vault { - key_vault_policy_id = "${azurerm_key_vault_access_policy.tfex.id}" - key_vault_id = "${azurerm_key_vault.tfex.id}" - key_name = "${azurerm_key_vault_key.tfex.name}" - key_version = "${azurerm_key_vault_key.tfex.version}" + key_vault_policy_id = azurerm_key_vault_access_policy.tfex.id + key_vault_id = azurerm_key_vault.tfex.id + key_name = azurerm_key_vault_key.tfex.name + key_version = azurerm_key_vault_key.tfex.version } } ``` From 7c10eb5955c1ad6e500d728e3b01a3b10396912f Mon Sep 17 00:00:00 2001 From: aqche <39076898+aqche@users.noreply.github.com> Date: Mon, 10 Feb 2020 17:11:12 -0800 Subject: [PATCH 056/498] Apply suggestions from code review Co-Authored-By: Tom Harvey --- .../storage/resource_arm_storage_account.go | 23 +++++++++++++++++-- website/docs/r/storage_account.html.markdown | 2 +- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/azurerm/internal/services/storage/resource_arm_storage_account.go b/azurerm/internal/services/storage/resource_arm_storage_account.go index 3e3d5de99f642..6759bbfbebb1e 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account.go @@ -1346,7 +1346,13 @@ func resourceArmStorageAccountRead(d *schema.ResourceData, meta interface{}) err if err := d.Set("blob_account_properties", flattenBlobAccountProperties(blobAccountProps)); err != nil { return fmt.Errorf("Error setting `blob_account_properties `for AzureRM Storage Account %q: %+v", name, err) + var staticWebsite []interface{} + if resp.Kind == storage.StorageV2 { + staticWebsite = flattenStaticWebsite(...) } + if err := d.Set("static_website", staticWebsite); err != nil { + return fmt.Errorf("Error setting `blob_account_properties `for AzureRM Storage Account %q: %+v", name, err) + } } return tags.FlattenAndSet(d, resp.Tags) @@ -1644,7 +1650,11 @@ func expandQueuePropertiesCors(input []interface{}) *queues.Cors { func expandBlobAccountProperties(input []interface{}) (accounts.StorageServiceProperties, error) { var err error - properties := accounts.StorageServiceProperties{} + properties := accounts.StorageServiceProperties{ + StaticWebsite: accounts.StaticWebsite{ + Enabled: false, + } + } if len(input) == 0 { return properties, nil } @@ -1883,7 +1893,16 @@ func flattenBlobAccountPropertiesStaticWebsite(input accounts.StaticWebsite) []i staticWebsite["index_document"] = input.IndexDocument staticWebsite["error_document_404_path"] = input.ErrorDocument404Path - return []interface{}{staticWebsite} + if !input.Enabled { + return []interface{}{} + } + + return []interface{}{ + map[string]interface{}{ + "index_document": input.IndexDocument, + "error_document_404_path": index.ErrorDocument404Path, + }, + } } func flattenStorageAccountBypass(input storage.Bypass) []interface{} { diff --git a/website/docs/r/storage_account.html.markdown b/website/docs/r/storage_account.html.markdown index 6dddfe6e71bc8..f989988c35342 100644 --- a/website/docs/r/storage_account.html.markdown +++ b/website/docs/r/storage_account.html.markdown @@ -247,7 +247,7 @@ A `static_website` block supports the following: * `index_document` - (Optional) The webpage that Azure Storage serves for requests to the root of a website or any subfolder. For example, index.html. The value is case-sensitive. -* `error_document_404_path` - (Optional) The absolute path to a webpage that Azure Storage serves for requests that do not correspond to an existing file. For example, error/404.html. Only a single custom 404 page is supported in each static website. The value is case-sensitive. If the server returns a 404 error, and you have not specified an error document, then a default 404 page is returned to the user. +* `error_document_404_path` - (Optional) The absolute path to a custom webpage that should be used when a request is made which does not correspond to an existing file. ## Attributes Reference From f349fafbaadad07393471609d0af46f5d4910db6 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 10 Feb 2020 20:53:16 -0600 Subject: [PATCH 057/498] Corrected Prefix Length The maximum IP prefix length that can be reserved (according to docs.microsoft) is `/28` or 16 usable addresses. https://docs.microsoft.com/en-us/azure/virtual-network/public-ip-address-prefix#constraints --- website/docs/r/public_ip_prefix.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/public_ip_prefix.html.markdown b/website/docs/r/public_ip_prefix.html.markdown index 50827aed4e228..e34444fc9cc70 100644 --- a/website/docs/r/public_ip_prefix.html.markdown +++ b/website/docs/r/public_ip_prefix.html.markdown @@ -45,7 +45,7 @@ The following arguments are supported: -> **Note** Public IP Prefix can only be created with Standard SKUs at this time. -* `prefix_length` - (Optional) Specifies the number of bits of the prefix. The value can be set between 24 (256 addresses) and 31 (2 addresses). Changing this forces a new resource to be created. +* `prefix_length` - (Optional) Specifies the number of bits of the prefix. The value can be set between 28 (16 addresses) and 31 (2 addresses). Changing this forces a new resource to be created. -> **Please Note:**: There may be Public IP address limits on the subscription . [More information available here](https://docs.microsoft.com/en-us/azure/azure-subscription-service-limits?toc=%2fazure%2fvirtual-network%2ftoc.json#publicip-address) From 10e222d3c890a066d6663029c6be5123ab6a0020 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Mon, 10 Feb 2020 19:01:36 -0800 Subject: [PATCH 058/498] Mostly working --- ...arm_storage_account_encryption_settings.go | 33 ++----------------- ..._account_encryption_settings.html.markdown | 6 +--- 2 files changed, 4 insertions(+), 35 deletions(-) diff --git a/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go b/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go index 0ba2bc5380a48..32c868cba41fe 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go @@ -37,17 +37,6 @@ func resourceArmStorageAccountEncryptionSettings() *schema.Resource { Required: true, ValidateFunc: azure.ValidateResourceID, }, - "enable_blob_encryption": { - Type: schema.TypeBool, - Optional: true, - Default: true, - }, - - "enable_file_encryption": { - Type: schema.TypeBool, - Optional: true, - Default: true, - }, "key_vault": { Type: schema.TypeList, @@ -107,9 +96,7 @@ func resourceArmStorageAccountEncryptionSettingsCreateUpdate(d *schema.ResourceD storageAccountName := id.Path["storageAccounts"] resourceGroupName := id.ResourceGroup - // set default values for the attributes - enableBlobEncryption := true - enableFileEncryption := true + // TODO: Validate that the key vault has both soft delete and purge protection enabled // create the update object with the default values opts := storage.AccountUpdateParameters{ @@ -117,10 +104,10 @@ func resourceArmStorageAccountEncryptionSettingsCreateUpdate(d *schema.ResourceD Encryption: &storage.Encryption{ Services: &storage.EncryptionServices{ Blob: &storage.EncryptionService{ - Enabled: utils.Bool(enableBlobEncryption), + Enabled: true, }, File: &storage.EncryptionService{ - Enabled: utils.Bool(enableFileEncryption), + Enabled: true, }}, KeySource: storage.MicrosoftStorage, KeyVaultProperties: &storage.KeyVaultProperties{}, @@ -128,11 +115,6 @@ func resourceArmStorageAccountEncryptionSettingsCreateUpdate(d *schema.ResourceD }, } - if d.HasChange("enable_blob_encryption") || d.HasChange("enable_file_encryption") { - opts.Encryption.Services.Blob.Enabled = utils.Bool(d.Get("enable_blob_encryption").(bool)) - opts.Encryption.Services.File.Enabled = utils.Bool(d.Get("enable_file_encryption").(bool)) - } - if keyVaultProperties := expandAzureRmStorageAccountKeyVaultProperties(d); keyVaultProperties.KeyName != utils.String("") { if v, ok := d.GetOk("key_vault.0.key_vault_id"); ok { // Get the key vault base URL from the key vault @@ -270,15 +252,6 @@ func resourceArmStorageAccountEncryptionSettingsImportState(d *schema.ResourceDa if props := resp.AccountProperties; props != nil { if encryption := props.Encryption; encryption != nil { - if services := encryption.Services; services != nil { - if blob := services.Blob; blob != nil { - d.Set("enable_blob_encryption", blob.Enabled) - } - if file := services.File; file != nil { - d.Set("enable_file_encryption", file.Enabled) - } - } - if keyVaultProperties := encryption.KeyVaultProperties; keyVaultProperties != nil { if err := d.Set("key_vault", flattenAzureRmStorageAccountKeyVaultProperties(keyVaultProperties, "", "")); err != nil { return nil, fmt.Errorf("Error flattening `key_vault_properties` on import: %+v", err) diff --git a/website/docs/r/storage_account_encryption_settings.html.markdown b/website/docs/r/storage_account_encryption_settings.html.markdown index c234b895f6eec..118ffcf34b92a 100644 --- a/website/docs/r/storage_account_encryption_settings.html.markdown +++ b/website/docs/r/storage_account_encryption_settings.html.markdown @@ -52,7 +52,7 @@ resource "azurerm_key_vault" "tfex" { enabled_for_disk_encryption = true soft_delete_enabled = true - purge_protection_enabled = false + purge_protection_enabled = true sku_name = "standard" @@ -112,10 +112,6 @@ The following arguments are supported: * `storage_account_id` - (Required) The id of the storage account to manage the encryption settings for. -* `enable_blob_encryption` - (Optional) Boolean flag which controls if Encryption Services are enabled for Blob storage, see [here](https://azure.microsoft.com/en-us/documentation/articles/storage-service-encryption/) for more information. Defaults to `true`. - -* `enable_file_encryption` - (Optional) Boolean flag which controls if Encryption Services are enabled for File storage, see [here](https://azure.microsoft.com/en-us/documentation/articles/storage-service-encryption/) for more information. Defaults to `true`. - * `key_vault` - (Optional) A `key_vault` block as documented below. --- From fef89d3e391a7ecf21ef22eda99fa910ce220ee3 Mon Sep 17 00:00:00 2001 From: Austin Cheung Date: Mon, 10 Feb 2020 19:16:20 -0800 Subject: [PATCH 059/498] address code review suggestions --- .../services/storage/client/client.go | 2 +- .../storage/resource_arm_storage_account.go | 181 ++++++------------ .../resource_arm_storage_account_test.go | 32 ++-- website/docs/r/storage_account.html.markdown | 14 +- 4 files changed, 77 insertions(+), 152 deletions(-) diff --git a/azurerm/internal/services/storage/client/client.go b/azurerm/internal/services/storage/client/client.go index 50ffac155a0b7..adc2f7eb2c14d 100644 --- a/azurerm/internal/services/storage/client/client.go +++ b/azurerm/internal/services/storage/client/client.go @@ -45,7 +45,7 @@ func NewClient(options *common.ClientOptions) *Client { options.ConfigureClient(&blobServicesClient.Client, options.ResourceManagerAuthorizer) blobAccountsClient := accounts.NewWithEnvironment(options.Environment) - blobAccountsClient.Authorizer = options.StorageAuthorizer + options.ConfigureClient(&blobAccountsClient.Client, options.StorageAuthorizer) // TODO: switch Storage Containers to using the storage.BlobContainersClient // (which should fix #2977) when the storage clients have been moved in here diff --git a/azurerm/internal/services/storage/resource_arm_storage_account.go b/azurerm/internal/services/storage/resource_arm_storage_account.go index 6759bbfbebb1e..7d2662b4253d8 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account.go @@ -453,35 +453,22 @@ func resourceArmStorageAccount() *schema.Resource { }, }, - "blob_account_properties": { + "static_website": { Type: schema.TypeList, Optional: true, Computed: true, MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ - "static_website": { - Type: schema.TypeList, - Optional: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "enabled": { - Type: schema.TypeBool, - Required: true, - }, - "index_document": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "error_document_404_path": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - }, - }, + "index_document": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringIsNotEmpty, + }, + "error_404_document": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringIsNotEmpty, }, }, }, @@ -857,21 +844,17 @@ func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) e } } - if val, ok := d.GetOk("blob_account_properties"); ok { + if val, ok := d.GetOk("static_website"); ok { // static website only supported on Storage V2 - if accountKind == string(storage.StorageV2) { - blobAccountClient := meta.(*clients.Client).Storage.BlobAccountsClient + if accountKind != string(storage.StorageV2) { + return fmt.Errorf("`static_website` is only supported for Storage V2.") + } + blobAccountClient := meta.(*clients.Client).Storage.BlobAccountsClient - blobAccountProperties, err := expandBlobAccountProperties(val.([]interface{})) - if err != nil { - return fmt.Errorf("Error expanding `blob_account_properties` for Azure Storage Account %q: %+v", storageAccountName, err) - } + staticWebsiteProps := expandStaticWebsiteProperties(val.([]interface{})) - if _, err = blobAccountClient.SetServiceProperties(ctx, storageAccountName, blobAccountProperties); err != nil { - return fmt.Errorf("Error updating Azure Storage Account `blob_account_properties` %q: %+v", storageAccountName, err) - } - } else { - return fmt.Errorf("`blob_account_properties` are only supported for Storage V2.") + if _, err = blobAccountClient.SetServiceProperties(ctx, storageAccountName, staticWebsiteProps); err != nil { + return fmt.Errorf("Error updating Azure Storage Account `static_website` %q: %+v", storageAccountName, err) } } @@ -1099,24 +1082,20 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e d.SetPartial("queue_properties") } - if d.HasChange("blob_account_properties") { + if d.HasChange("static_website") { // static website only supported on Storage V2 - if accountKind == string(storage.StorageV2) { - blobAccountClient := meta.(*clients.Client).Storage.BlobAccountsClient + if accountKind != string(storage.StorageV2) { + return fmt.Errorf("`static_website` are only supported for Storage V2.") + } + blobAccountClient := meta.(*clients.Client).Storage.BlobAccountsClient - blobAccounProperties, err := expandBlobAccountProperties(d.Get("blob_account_properties").([]interface{})) - if err != nil { - return fmt.Errorf("Error expanding `blob_account_properties` for Azure Storage Account %q: %+v", storageAccountName, err) - } + staticWebsiteProps := expandStaticWebsiteProperties(d.Get("static_website").([]interface{})) - if _, err = blobAccountClient.SetServiceProperties(ctx, storageAccountName, blobAccounProperties); err != nil { - return fmt.Errorf("Error updating Azure Storage Account `blob_account_properties` %q: %+v", storageAccountName, err) - } - } else { - return fmt.Errorf("`blob_account_properties` are only supported for Storage V2.") + if _, err = blobAccountClient.SetServiceProperties(ctx, storageAccountName, staticWebsiteProps); err != nil { + return fmt.Errorf("Error updating Azure Storage Account `static_website` %q: %+v", storageAccountName, err) } - d.SetPartial("blob_account_properties") + d.SetPartial("static_website") } d.Partial(false) @@ -1333,26 +1312,24 @@ func resourceArmStorageAccountRead(d *schema.ResourceData, meta interface{}) err } } + var staticWebsite []interface{} + // static website only supported on Storage V2 if resp.Kind == storage.StorageV2 { blobAccountClient := storageClient.BlobAccountsClient - blobAccountProps, err := blobAccountClient.GetServiceProperties(ctx, name) + staticWebsiteProps, err := blobAccountClient.GetServiceProperties(ctx, name) if err != nil { - if blobAccountProps.Response.Response != nil && !utils.ResponseWasNotFound(blobAccountProps.Response) { - return fmt.Errorf("Error reading blob account properties for AzureRM Storage Account %q: %+v", name, err) + if staticWebsiteProps.Response.Response != nil && !utils.ResponseWasNotFound(staticWebsiteProps.Response) { + return fmt.Errorf("Error reading static website for AzureRM Storage Account %q: %+v", name, err) } } - if err := d.Set("blob_account_properties", flattenBlobAccountProperties(blobAccountProps)); err != nil { - return fmt.Errorf("Error setting `blob_account_properties `for AzureRM Storage Account %q: %+v", name, err) - var staticWebsite []interface{} - if resp.Kind == storage.StorageV2 { - staticWebsite = flattenStaticWebsite(...) - } - if err := d.Set("static_website", staticWebsite); err != nil { - return fmt.Errorf("Error setting `blob_account_properties `for AzureRM Storage Account %q: %+v", name, err) - } + staticWebsite = flattenStaticWebsiteProperties(staticWebsiteProps) + } + + if err := d.Set("static_website", staticWebsite); err != nil { + return fmt.Errorf("Error setting `static_website `for AzureRM Storage Account %q: %+v", name, err) } return tags.FlattenAndSet(d, resp.Tags) @@ -1648,47 +1625,29 @@ func expandQueuePropertiesCors(input []interface{}) *queues.Cors { return cors } -func expandBlobAccountProperties(input []interface{}) (accounts.StorageServiceProperties, error) { - var err error +func expandStaticWebsiteProperties(input []interface{}) accounts.StorageServiceProperties { properties := accounts.StorageServiceProperties{ - StaticWebsite: accounts.StaticWebsite{ + StaticWebsite: &accounts.StaticWebsite{ Enabled: false, - } - } - if len(input) == 0 { - return properties, nil - } - - attrs := input[0].(map[string]interface{}) - - properties.StaticWebsite, err = expandBlobAccountPropertiesStaticWebsite(attrs["static_website"].([]interface{})) - if err != nil { - return properties, fmt.Errorf("Error expanding `static_website`: %+v", err) + }, } - - return properties, nil -} - -func expandBlobAccountPropertiesStaticWebsite(input []interface{}) (*accounts.StaticWebsite, error) { if len(input) == 0 { - return &accounts.StaticWebsite{}, nil + return properties } - staticWebsiteAttr := input[0].(map[string]interface{}) + attr := input[0].(map[string]interface{}) - staticWebsite := &accounts.StaticWebsite{ - Enabled: staticWebsiteAttr["enabled"].(bool), - } + properties.StaticWebsite.Enabled = true - if v, ok := staticWebsiteAttr["index_document"]; ok { - staticWebsite.IndexDocument = v.(string) + if v, ok := attr["index_document"]; ok { + properties.StaticWebsite.IndexDocument = v.(string) } - if v, ok := staticWebsiteAttr["error_document_404_path"]; ok { - staticWebsite.ErrorDocument404Path = v.(string) + if v, ok := attr["error_404_document"]; ok { + properties.StaticWebsite.ErrorDocument404Path = v.(string) } - return staticWebsite, nil + return properties } func flattenStorageAccountNetworkRules(input *storage.NetworkRuleSet) []interface{} { @@ -1867,42 +1826,22 @@ func flattenCorsProperty(input string) []interface{} { return results } -func flattenBlobAccountProperties(input accounts.GetServicePropertiesResult) []interface{} { - if input.Response.Response == nil { - return []interface{}{} - } - - blobAccountProperties := make(map[string]interface{}) - +func flattenStaticWebsiteProperties(input accounts.GetServicePropertiesResult) []interface{} { if storageServiceProps := input.StorageServiceProperties; storageServiceProps != nil { if staticWebsite := storageServiceProps.StaticWebsite; staticWebsite != nil { - blobAccountProperties["static_website"] = flattenBlobAccountPropertiesStaticWebsite(*staticWebsite) - } - } - - if len(blobAccountProperties) == 0 { - return []interface{}{} - } - return []interface{}{blobAccountProperties} -} - -func flattenBlobAccountPropertiesStaticWebsite(input accounts.StaticWebsite) []interface{} { - staticWebsite := make(map[string]interface{}) - - staticWebsite["enabled"] = input.Enabled - staticWebsite["index_document"] = input.IndexDocument - staticWebsite["error_document_404_path"] = input.ErrorDocument404Path + if !staticWebsite.Enabled { + return []interface{}{} + } - if !input.Enabled { - return []interface{}{} - } - - return []interface{}{ - map[string]interface{}{ - "index_document": input.IndexDocument, - "error_document_404_path": index.ErrorDocument404Path, - }, + return []interface{}{ + map[string]interface{}{ + "index_document": staticWebsite.IndexDocument, + "error_404_document": staticWebsite.ErrorDocument404Path, + }, + } + } } + return []interface{}{} } func flattenStorageAccountBypass(input storage.Bypass) []interface{} { diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go index a3a6bbf12130b..9133bf1ea44f6 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go @@ -653,7 +653,7 @@ func TestAccAzureRMStorageAccount_queueProperties(t *testing.T) { }) } -func TestAccAzureRMStorageAccount_blobAccountProperties(t *testing.T) { +func TestAccAzureRMStorageAccount_staticWebsiteProperties(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_storage_account", "test") resource.ParallelTest(t, resource.TestCase{ @@ -662,14 +662,14 @@ func TestAccAzureRMStorageAccount_blobAccountProperties(t *testing.T) { CheckDestroy: testCheckAzureRMStorageAccountDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMStorageAccount_blobAccountProperties(data), + Config: testAccAzureRMStorageAccount_staticWebsiteProperties(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists(data.ResourceName), ), }, data.ImportStep(), { - Config: testAccAzureRMStorageAccount_blobAccountPropertiesUpdated(data), + Config: testAccAzureRMStorageAccount_staticWebsitePropertiesUpdated(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists(data.ResourceName), ), @@ -1552,7 +1552,7 @@ resource "azurerm_storage_account" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomString) } -func testAccAzureRMStorageAccount_blobAccountProperties(data acceptance.TestData) string { +func testAccAzureRMStorageAccount_staticWebsiteProperties(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" @@ -1567,19 +1567,16 @@ resource "azurerm_storage_account" "test" { account_kind = "StorageV2" account_tier = "Standard" account_replication_type = "LRS" - - blob_account_properties { - static_website { - enabled = true - index_document = "index.html" - error_document_404_path = "404.html" - } + + static_website { + index_document = "index.html" + error_404_document = "404.html" } } `, data.RandomInteger, data.Locations.Primary, data.RandomString) } -func testAccAzureRMStorageAccount_blobAccountPropertiesUpdated(data acceptance.TestData) string { +func testAccAzureRMStorageAccount_staticWebsitePropertiesUpdated(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" @@ -1594,13 +1591,10 @@ resource "azurerm_storage_account" "test" { account_kind = "StorageV2" account_tier = "Standard" account_replication_type = "LRS" - - blob_account_properties { - static_website { - enabled = true - index_document = "index-2.html" - error_document_404_path = "404-2.html" - } + + static_website { + index_document = "index-2.html" + error_404_document = "404-2.html" } } `, data.RandomInteger, data.Locations.Primary, data.RandomString) diff --git a/website/docs/r/storage_account.html.markdown b/website/docs/r/storage_account.html.markdown index e56bb91b97fb4..661e3683793f9 100644 --- a/website/docs/r/storage_account.html.markdown +++ b/website/docs/r/storage_account.html.markdown @@ -117,9 +117,9 @@ The following arguments are supported: ~> **NOTE:** `queue_properties` cannot be set when the `access_tier` is set to `BlobStorage` -* `blob_account_properties` - (Optional) A `blob_account_properties` block as defined below. +* `static_website` - (Optional) A `static_website` block as defined below. -~> **NOTE:** `blob_account_properties` can only be set when the `account_kind` is set to `StorageV2` +~> **NOTE:** `static_website` can only be set when the `account_kind` is set to `StorageV2` * `network_rules` - (Optional) A `network_rules` block as documented below. @@ -235,19 +235,11 @@ A `queue_properties` block supports the following: --- -A `blob_account_properties` block supports the following: - -* `static_website` - (Optional) A `static_website` block as defined below. - ---- - A `static_website` block supports the following: -* `enabled` - (Required) Indicates whether static website support is enabled for the given account. If a blob storage container named $web doesn't already exist in the account, one is created for you. Add the files of your site to this container. - * `index_document` - (Optional) The webpage that Azure Storage serves for requests to the root of a website or any subfolder. For example, index.html. The value is case-sensitive. -* `error_document_404_path` - (Optional) The absolute path to a custom webpage that should be used when a request is made which does not correspond to an existing file. +* `error_404_document` - (Optional) The absolute path to a custom webpage that should be used when a request is made which does not correspond to an existing file. ## Attributes Reference From f697f8ad5056efeda917354512008abab2c9126c Mon Sep 17 00:00:00 2001 From: Austin Cheung Date: Mon, 10 Feb 2020 19:18:34 -0800 Subject: [PATCH 060/498] are -> is --- .../internal/services/storage/resource_arm_storage_account.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/storage/resource_arm_storage_account.go b/azurerm/internal/services/storage/resource_arm_storage_account.go index 7d2662b4253d8..4c59eb4047750 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account.go @@ -1085,7 +1085,7 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e if d.HasChange("static_website") { // static website only supported on Storage V2 if accountKind != string(storage.StorageV2) { - return fmt.Errorf("`static_website` are only supported for Storage V2.") + return fmt.Errorf("`static_website` is only supported for Storage V2.") } blobAccountClient := meta.(*clients.Client).Storage.BlobAccountsClient From 16c7b24bf075d22244292d33f0d2525ce141dfcd Mon Sep 17 00:00:00 2001 From: Austin Cheung Date: Mon, 10 Feb 2020 19:34:27 -0800 Subject: [PATCH 061/498] tflint fixes --- .../storage/tests/resource_arm_storage_account_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go index 9133bf1ea44f6..e10215508a7d4 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go @@ -1569,8 +1569,8 @@ resource "azurerm_storage_account" "test" { account_replication_type = "LRS" static_website { - index_document = "index.html" - error_404_document = "404.html" + index_document = "index.html" + error_404_document = "404.html" } } `, data.RandomInteger, data.Locations.Primary, data.RandomString) @@ -1593,8 +1593,8 @@ resource "azurerm_storage_account" "test" { account_replication_type = "LRS" static_website { - index_document = "index-2.html" - error_404_document = "404-2.html" + index_document = "index-2.html" + error_404_document = "404-2.html" } } `, data.RandomInteger, data.Locations.Primary, data.RandomString) From 4b190a438f13ac2a4778808397c82e4fdfc4604a Mon Sep 17 00:00:00 2001 From: Austin Cheung Date: Mon, 10 Feb 2020 19:59:13 -0800 Subject: [PATCH 062/498] tflint fix 2 --- .../tests/resource_arm_storage_account_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go index e10215508a7d4..36c78e15794c3 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go @@ -1567,10 +1567,10 @@ resource "azurerm_storage_account" "test" { account_kind = "StorageV2" account_tier = "Standard" account_replication_type = "LRS" - + static_website { - index_document = "index.html" - error_404_document = "404.html" + index_document = "index.html" + error_404_document = "404.html" } } `, data.RandomInteger, data.Locations.Primary, data.RandomString) @@ -1591,10 +1591,10 @@ resource "azurerm_storage_account" "test" { account_kind = "StorageV2" account_tier = "Standard" account_replication_type = "LRS" - + static_website { - index_document = "index-2.html" - error_404_document = "404-2.html" + index_document = "index-2.html" + error_404_document = "404-2.html" } } `, data.RandomInteger, data.Locations.Primary, data.RandomString) From 14d0825cc0c0f81d9d2ed1367d08dda729bafb4f Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Tue, 11 Feb 2020 10:07:10 -0600 Subject: [PATCH 063/498] Validate metric_trigger query; add example to docs --- ...arm_monitor_scheduled_query_rules_alert.go | 13 ++++++- ..._scheduled_query_rules_alert.html.markdown | 37 +++++++++++++++++-- 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go index 3fb0fa6c8317d..6ea171c6cd89a 100644 --- a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go +++ b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go @@ -4,6 +4,7 @@ import ( "fmt" "log" "strconv" + "strings" "time" "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" @@ -204,10 +205,20 @@ func resourceArmMonitorScheduledQueryRulesAlertCreateUpdate(d *schema.ResourceDa name := d.Get("name").(string) resourceGroup := d.Get("resource_group_name").(string) - if *schedule.TimeWindowInMinutes < *schedule.FrequencyInMinutes { + frequency := d.Get("frequency").(int) + timeWindow := d.Get("time_window").(int) + if timeWindow < frequency { return fmt.Errorf("Error in parameter values for Scheduled Query Rules %q (Resource Group %q): time_window must be greater than or equal to frequency", name, resourceGroup) } + query := d.Get("query").(string) + _, ok := d.GetOk("metric_trigger") + if ok { + if !(strings.Contains(query, "summarize") && strings.Contains(query, "AggregatedValue") && strings.Contains(query, "bin")) { + return fmt.Errorf("Error in parameter values for Scheduled Query Rules %q (Resource Group %q): query must contain summarize, AggregatedValue, and bin when metric_trigger is specified", name, resourceGroup) + } + } + if features.ShouldResourcesBeImported() && d.IsNewResource() { existing, err := client.Get(ctx, resourceGroup, name) if err != nil { diff --git a/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown b/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown index 647252ecd1e2a..09cc587790910 100644 --- a/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown +++ b/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown @@ -33,7 +33,36 @@ resource "azurerm_log_analytics_workspace" "example" { retention_in_days = 30 } -# Example: Alerting Action + +# Example: Alerting Action with result count trigger +# Alert if more than three HTTP requests returned a >= 500 result code +# in the past 30 minutes +resource "azurerm_scheduled_query_rule_alert" "example" { + name = format("%s-queryrule", var.prefix) + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name + + action { + action_group = [] + email_subject = "Email Header" + custom_webhook_payload = "{}" + } + data_source_id = azurerm_application_insights.example.id + description = "Result count trigger example - alert when total results cross threshold" + enabled = true + frequency = 5 + query = "requests | where tolong(resultCode) >= 500 | summarize AggregatedValue = count() by bin(timestamp, 5m)" + severity = 1 + time_window = 30 + trigger { + operator = "GreaterThan" + threshold = 3 + } +} + +# Example: Alerting Action with metric trigger +# Alert if more than three HTTP requests returned a >= 500 result code +# in the past 30 minutes that have the same operation (ie: GET /) resource "azurerm_scheduled_query_rule_alert" "example" { name = format("%s-queryrule", var.prefix) location = azurerm_resource_group.example.location @@ -45,10 +74,10 @@ resource "azurerm_scheduled_query_rule_alert" "example" { custom_webhook_payload = "{}" } data_source_id = azurerm_application_insights.example.id - description = "Scheduled query rule Alerting Action example" + description = "Metric trigger example - query results grouped by metric; alert when results per metric_column cross threshold" enabled = true frequency = 5 - query = "requests | where status_code >= 500 | summarize AggregatedValue = count() by bin(timestamp, 5m)" + query = "requests | where tolong(resultCode) >= 500 | summarize AggregatedValue = count() by operation_Name, bin(timestamp, 5m)" severity = 1 time_window = 30 trigger { @@ -58,7 +87,7 @@ resource "azurerm_scheduled_query_rule_alert" "example" { operator = "GreaterThan" threshold = 1 metric_trigger_type = "Total" - metric_column = "timestamp" + metric_column = "operation_Name" } } } From 6f7c7720577ca2cfb427cb428ca532b145364281 Mon Sep 17 00:00:00 2001 From: John Kendall Date: Wed, 12 Feb 2020 09:49:07 +1100 Subject: [PATCH 064/498] fix site attributes --- website/docs/r/bot_channel_directline.markdown | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/website/docs/r/bot_channel_directline.markdown b/website/docs/r/bot_channel_directline.markdown index 241054e3d7027..33ae413f20722 100644 --- a/website/docs/r/bot_channel_directline.markdown +++ b/website/docs/r/bot_channel_directline.markdown @@ -66,12 +66,6 @@ A `site` block has the following properties: - `trusted_origins` - (Optional) This field is required when `is_secure_site_enabled` is enabled. Determines which origins can establish a Directline conversation for this site. -- `key` - (Computed) Primary key for accessing this site - -- `key2` - (Computed) Secondary key for accessing this site - -- `id` - (Computed) Id for the site - ## Attributes Reference @@ -79,6 +73,16 @@ The following attributes are exported: - `id` - The Bot Channel ID. +--- + +A `site` block exports the following: + +- `key` - Primary key for accessing this site + +- `key2` - Secondary key for accessing this site + +- `id` - Id for the site + ## Import The Directline Channel for a Bot can be imported using the `resource id`, e.g. From 2f4c11727aa86ae6b1f4b4d5731f33076ef19d78 Mon Sep 17 00:00:00 2001 From: John Kendall Date: Wed, 12 Feb 2020 09:54:33 +1100 Subject: [PATCH 065/498] format docs --- website/docs/r/bot_channel_directline.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/bot_channel_directline.markdown b/website/docs/r/bot_channel_directline.markdown index 33ae413f20722..5ac64028af915 100644 --- a/website/docs/r/bot_channel_directline.markdown +++ b/website/docs/r/bot_channel_directline.markdown @@ -34,7 +34,7 @@ resource "azurerm_bot_channel_directline" "example" { resource_group_name = "${azurerm_resource_group.example.name}" site { - name = "default" + name = "default" enabled = true } } From b15d1b390eb42e61cbc7704e8ed59dbc73b99068 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Tue, 11 Feb 2020 18:34:18 -0800 Subject: [PATCH 066/498] Progress --- azurerm/helpers/azure/key_vault.go | 29 +++++++++++ .../keyvault/resource_arm_key_vault_key.go | 51 +++++++------------ ...arm_storage_account_encryption_settings.go | 13 +++-- website/docs/r/key_vault.html.markdown | 11 ++-- website/docs/r/key_vault_key.html.markdown | 2 + ..._account_encryption_settings.html.markdown | 20 ++++---- 6 files changed, 72 insertions(+), 54 deletions(-) diff --git a/azurerm/helpers/azure/key_vault.go b/azurerm/helpers/azure/key_vault.go index f75368e5d2374..b070b87a71600 100644 --- a/azurerm/helpers/azure/key_vault.go +++ b/azurerm/helpers/azure/key_vault.go @@ -163,3 +163,32 @@ func KeyVaultGetSoftDeletedState(ctx context.Context, client *keyvault.VaultsCli // this means we found an existing key vault that is not soft deleted return nil, nil, nil } + +func KeyVaultIsSoftDeleteAndPurgeProtected(ctx context.Context, client *keyvault.VaultsClient, keyVaultId string) bool { + id, err := ParseAzureResourceID(keyVaultId) + if err != nil { + return false + } + resourceGroup := id.ResourceGroup + name := id.Path["vaults"] + + resp, err := client.Get(ctx, resourceGroup, name) + + if props := resp.Properties; props != nil { + softDeleteEnabled := false + purgeProtectionEnabled := false + + if esd := props.EnableSoftDelete; esd != nil { + softDeleteEnabled = *esd + } + if epp := props.EnableSoftDelete; epp != nil { + purgeProtectionEnabled = *epp + } + + if softDeleteEnabled && purgeProtectionEnabled { + return true + } + } + + return false +} diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go b/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go index 73dc13da185ef..454aaa8728d74 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go @@ -46,23 +46,17 @@ func resourceArmKeyVaultKey() *schema.Resource { }, "key_vault_id": { - Type: schema.TypeString, - Optional: true, //todo required in 2.0 - Computed: true, //todo removed in 2.0 - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - ConflictsWith: []string{"vault_uri"}, + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: azure.ValidateResourceID, }, - // todo remove in 2.0 - "vault_uri": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, - Computed: true, - Deprecated: "This property has been deprecated in favour of the key_vault_id property. This will prevent a class of bugs as described in https://github.com/terraform-providers/terraform-provider-azurerm/issues/2396 and will be removed in version 2.0 of the provider", - ValidateFunc: validation.IsURLWithHTTPS, - ConflictsWith: []string{"key_vault_id"}, + "key_vault_access_policy_id": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: azure.ValidateResourceID, }, "key_type": { @@ -174,28 +168,15 @@ func resourceArmKeyVaultKeyCreate(d *schema.ResourceData, meta interface{}) erro log.Print("[INFO] preparing arguments for AzureRM KeyVault Key creation.") name := d.Get("name").(string) - keyVaultBaseUri := d.Get("vault_uri").(string) keyVaultId := d.Get("key_vault_id").(string) - if keyVaultBaseUri == "" { - if keyVaultId == "" { - return fmt.Errorf("one of `key_vault_id` or `vault_uri` must be set") - } - - pKeyVaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) - if err != nil { - return fmt.Errorf("Error looking up Key %q vault url from id %q: %+v", name, keyVaultId, err) - } - - keyVaultBaseUri = pKeyVaultBaseUrl - } else { - id, err := azure.GetKeyVaultIDFromBaseUrl(ctx, vaultClient, keyVaultBaseUri) - if err != nil { - return fmt.Errorf("Error unable to find key vault ID from URL %q for certificate %q: %+v", keyVaultBaseUri, name, err) - } - d.Set("key_vault_id", id) + pKeyVaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) + if err != nil { + return fmt.Errorf("Error looking up Key %q vault url from id %q: %+v", name, keyVaultId, err) } + keyVaultBaseUri := pKeyVaultBaseUrl + if features.ShouldResourcesBeImported() { existing, err := client.GetKey(ctx, keyVaultBaseUri, name, "") if err != nil { @@ -330,6 +311,8 @@ func resourceArmKeyVaultKeyRead(d *schema.ResourceData, meta interface{}) error ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() + keyVaultAccessPolicyId := d.Get("key_vault_access_policy_id").(string) + id, err := azure.ParseKeyVaultChildID(d.Id()) if err != nil { return err @@ -367,7 +350,7 @@ func resourceArmKeyVaultKeyRead(d *schema.ResourceData, meta interface{}) error } d.Set("name", id.Name) - d.Set("vault_uri", id.KeyVaultBaseUrl) + d.Set("key_vault_access_policy_id", keyVaultAccessPolicyId) if key := resp.Key; key != nil { d.Set("key_type", string(key.Kty)) diff --git a/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go b/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go index 32c868cba41fe..c9e61d23393a9 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go @@ -96,18 +96,17 @@ func resourceArmStorageAccountEncryptionSettingsCreateUpdate(d *schema.ResourceD storageAccountName := id.Path["storageAccounts"] resourceGroupName := id.ResourceGroup - // TODO: Validate that the key vault has both soft delete and purge protection enabled - // create the update object with the default values + alwaysEnabled := true opts := storage.AccountUpdateParameters{ AccountPropertiesUpdateParameters: &storage.AccountPropertiesUpdateParameters{ Encryption: &storage.Encryption{ Services: &storage.EncryptionServices{ Blob: &storage.EncryptionService{ - Enabled: true, + Enabled: utils.Bool(alwaysEnabled), }, File: &storage.EncryptionService{ - Enabled: true, + Enabled: utils.Bool(alwaysEnabled), }}, KeySource: storage.MicrosoftStorage, KeyVaultProperties: &storage.KeyVaultProperties{}, @@ -125,6 +124,10 @@ func resourceArmStorageAccountEncryptionSettingsCreateUpdate(d *schema.ResourceD return fmt.Errorf("Error looking up Key Vault URI from id %q: %+v", keyVaultId, err) } + if azure.KeyVaultIsSoftDeleteAndPurgeProtected(ctx, vaultClient, keyVaultId) { + return fmt.Errorf("Key Vault %q is not configured correctly, please make sure that both 'soft_delete_enabled' and 'purge_protection_enabled' arguments are set to 'true'", keyVaultId) + } + keyVaultProperties.KeyVaultURI = utils.String(pKeyVaultBaseUrl) opts.Encryption.KeyVaultProperties = keyVaultProperties opts.Encryption.KeySource = storage.MicrosoftKeyvault @@ -219,7 +222,7 @@ func resourceArmStorageAccountEncryptionSettingsDelete(d *schema.ResourceData, m _, err = storageClient.Update(ctx, resourceGroupName, storageAccountName, opts) if err != nil { - return fmt.Errorf("Error updating Azure Storage Account Encryption %q: %+v", storageAccountName, err) + return fmt.Errorf("Error deleting Azure Storage Account Encryption %q: %+v", storageAccountName, err) } return nil diff --git a/website/docs/r/key_vault.html.markdown b/website/docs/r/key_vault.html.markdown index 39cff382c4413..3726d985fa135 100644 --- a/website/docs/r/key_vault.html.markdown +++ b/website/docs/r/key_vault.html.markdown @@ -15,6 +15,8 @@ Manages a Key Vault. ## Example Usage ```hcl +data "azurerm_client_config" "current" {} + provider "azurerm" { alias = "keyVault" @@ -36,16 +38,15 @@ resource "azurerm_key_vault" "example" { location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name - enabled_for_disk_encryption = true - tenant_id = "d6e396d0-5584-41dc-9fc0-268df99bc610" + tenant_id = data.azurerm_client_config.current.tenant_id soft_delete_enabled = true purge_protection_enabled = false sku_name = "standard" access_policy { - tenant_id = "d6e396d0-5584-41dc-9fc0-268df99bc610" - object_id = "d746815a-0433-4a21-b95d-fc437d2d475b" + tenant_id = data.azurerm_client_config.current.tenant_id + object_id = data.azurerm_client_config.current.service_principal_object_id key_permissions = [ "get", @@ -66,7 +67,7 @@ resource "azurerm_key_vault" "example" { } tags = { - environment = "Production" + environment = "Testing" } } ``` diff --git a/website/docs/r/key_vault_key.html.markdown b/website/docs/r/key_vault_key.html.markdown index 415d4af543d2f..a854886a837cb 100644 --- a/website/docs/r/key_vault_key.html.markdown +++ b/website/docs/r/key_vault_key.html.markdown @@ -82,6 +82,8 @@ The following arguments are supported: * `key_vault_id` - (Required) The ID of the Key Vault where the Key should be created. Changing this forces a new resource to be created. +* `key_vault_access_policy_id` - (Optional) The ID of the Key Vault Access Policy which should exist before the Key should be created. Changing this forces a new resource to be created. + * `key_type` - (Required) Specifies the Key Type to use for this Key Vault Key. Possible values are `EC` (Elliptic Curve), `EC-HSM`, `Oct` (Octet), `RSA` and `RSA-HSM`. Changing this forces a new resource to be created. * `key_size` - (Optional) Specifies the Size of the RSA key to create in bytes. For example, 1024 or 2048. *Note*: This field is required if `key_type` is `RSA` or `RSA-HSM`. Changing this forces a new resource to be created. diff --git a/website/docs/r/storage_account_encryption_settings.html.markdown b/website/docs/r/storage_account_encryption_settings.html.markdown index 118ffcf34b92a..553bdcdfad954 100644 --- a/website/docs/r/storage_account_encryption_settings.html.markdown +++ b/website/docs/r/storage_account_encryption_settings.html.markdown @@ -50,9 +50,8 @@ resource "azurerm_key_vault" "tfex" { resource_group_name = azurerm_resource_group.tfex.name tenant_id = "00000000-0000-0000-0000-000000000000" - enabled_for_disk_encryption = true soft_delete_enabled = true - purge_protection_enabled = true + purge_protection_enabled = false sku_name = "standard" @@ -62,17 +61,18 @@ resource "azurerm_key_vault" "tfex" { } resource "azurerm_key_vault_key" "tfex" { - name = "tfex-key" - key_vault_id = azurerm_key_vault.tfex.id - key_type = "RSA" - key_size = 2048 - key_opts = ["decrypt", "encrypt", "sign", "unwrapKey", "verify", "wrapKey"] + name = "tfex-key" + key_vault_id = azurerm_key_vault.tfex.id + key_vault_access_policy_id = azurerm_key_vault_access_policy.tfex.id + key_type = "RSA" + key_size = 2048 + key_opts = ["decrypt", "encrypt", "sign", "unwrapKey", "verify", "wrapKey"] } resource "azurerm_key_vault_access_policy" "tfex" { - key_vault_id = azurerm_key_vault.tfex.id - tenant_id = "00000000-0000-0000-0000-000000000000" - object_id = azurerm_storage_account.tfex.identity.0.principal_id + key_vault_id = azurerm_key_vault.tfex.id + tenant_id = "00000000-0000-0000-0000-000000000000" + object_id = azurerm_storage_account.tfex.identity.0.principal_id key_permissions = ["get","create","delete","list","restore","recover","unwrapkey","wrapkey","purge","encrypt","decrypt","sign","verify"] secret_permissions = ["get"] From 000f916504e52c6dba38990dc41792fa7c6db392 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 11 Feb 2020 20:39:32 -0600 Subject: [PATCH 067/498] Update IP Prefix validation IP Prefix can be deployed as a maximum /28 ip space. The code would allow a max of /24 which is not correct. Updated to support /28 as the max. --- .../internal/services/network/resource_arm_public_ip_prefix.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/network/resource_arm_public_ip_prefix.go b/azurerm/internal/services/network/resource_arm_public_ip_prefix.go index 4249c2ed00b8d..304f093f68f05 100644 --- a/azurerm/internal/services/network/resource_arm_public_ip_prefix.go +++ b/azurerm/internal/services/network/resource_arm_public_ip_prefix.go @@ -59,7 +59,7 @@ func resourceArmPublicIpPrefix() *schema.Resource { Optional: true, Default: 28, ForceNew: true, - ValidateFunc: validation.IntBetween(24, 31), + ValidateFunc: validation.IntBetween(28, 31), }, "ip_prefix": { From 371aa19e1e159c7a43447a9c311858d39a158cfe Mon Sep 17 00:00:00 2001 From: Brent Harrison Date: Tue, 11 Feb 2020 23:49:42 -0500 Subject: [PATCH 068/498] Requested changes to error handling & structure Documentation fixes --- .../resource_arm_express_route_gateway.go | 31 ++++++++++++------- ...resource_arm_express_route_gateway_test.go | 2 +- .../r/express_route_gateway.html.markdown | 21 +++++++++++-- 3 files changed, 39 insertions(+), 15 deletions(-) diff --git a/azurerm/internal/services/network/resource_arm_express_route_gateway.go b/azurerm/internal/services/network/resource_arm_express_route_gateway.go index e883985637eaa..5008b5e87567c 100644 --- a/azurerm/internal/services/network/resource_arm_express_route_gateway.go +++ b/azurerm/internal/services/network/resource_arm_express_route_gateway.go @@ -92,11 +92,14 @@ func resourceArmExpressRouteGatewayCreateUpdate(d *schema.ResourceData, meta int virtualHubId := d.Get("virtual_hub_id").(string) t := d.Get("tags").(map[string]interface{}) + minScaleUnits := int32(d.Get("scale_units").(int)) parameters := network.ExpressRouteGateway{ Location: utils.String(location), ExpressRouteGatewayProperties: &network.ExpressRouteGatewayProperties{ AutoScaleConfiguration: &network.ExpressRouteGatewayPropertiesAutoScaleConfiguration{ - Bounds: expandExpressRouteGatewayAutoScaleConfigurationBounds(d), + Bounds: &network.ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds{ + Min: &minScaleUnits, + }, }, VirtualHub: &network.VirtualHubID{ ID: &virtualHubId, @@ -154,11 +157,17 @@ func resourceArmExpressRouteGatewayRead(d *schema.ResourceData, meta interface{} } if props := resp.ExpressRouteGatewayProperties; props != nil { - d.Set("virtual_hub_id", props.VirtualHub.ID) + virtualHubId := "" + if props.VirtualHub != nil && props.VirtualHub.ID != nil { + virtualHubId = *props.VirtualHub.ID + } + d.Set("virtual_hub_id", virtualHubId) - if setErr := d.Set("scale_units", props.AutoScaleConfiguration.Bounds.Min); setErr != nil { - return fmt.Errorf("Error setting `scale_units`: %+v", setErr) + scaleUnits := 0 + if props.AutoScaleConfiguration != nil && props.AutoScaleConfiguration.Bounds != nil && props.AutoScaleConfiguration.Bounds.Min != nil { + scaleUnits = int(*props.AutoScaleConfiguration.Bounds.Min) } + d.Set("scale_units", scaleUnits) } return tags.FlattenAndSet(d, resp.Tags) @@ -193,11 +202,11 @@ func resourceArmExpressRouteGatewayDelete(d *schema.ResourceData, meta interface return nil } -func expandExpressRouteGatewayAutoScaleConfigurationBounds(d *schema.ResourceData) *network.ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds { - minScaleUnits := int32(d.Get("scale_units").(int)) - configuration := network.ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds{ - Min: &minScaleUnits, - } +// func expandExpressRouteGatewayAutoScaleConfigurationBounds(d *schema.ResourceData) *network.ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds { +// minScaleUnits := int32(d.Get("scale_units").(int)) +// configuration := network.ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds{ +// Min: &minScaleUnits, +// } - return &configuration -} +// return &configuration +// } diff --git a/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go index 155337c6743fa..ff468064d7fab 100644 --- a/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go @@ -179,7 +179,7 @@ func testAccAzureRMExpressRouteGateway_requiresImport(data acceptance.TestData) return fmt.Sprintf(` %s -resource "azurerm_express_route_gateway" "test" { +resource "azurerm_express_route_gateway" "import" { name = azurerm_express_route_gateway.test.name resource_group_name = azurerm_express_route_gateway.test.name location = azurerm_express_route_gateway.test.location diff --git a/website/docs/r/express_route_gateway.html.markdown b/website/docs/r/express_route_gateway.html.markdown index a40ae80de023f..27900d800de6e 100644 --- a/website/docs/r/express_route_gateway.html.markdown +++ b/website/docs/r/express_route_gateway.html.markdown @@ -15,7 +15,7 @@ Manages an ExpressRoute gateway. ```hcl resource "azurerm_resource_group" "example" { name = "example-resources" - location = "West US" + location = "West Europe" } resource "azurerm_virtual_wan" "example" { @@ -65,11 +65,26 @@ The following arguments are supported: The following attributes are exported: -* `id` - The Resource ID of the ExpressRoute gateway. +* `id` - The ID of the ExpressRoute gateway. + +### Timeouts + +~> **Note:** Custom Timeouts are available [as an opt-in Beta in version 1.43 of the Azure Provider](/docs/providers/azurerm/guides/2.0-beta.html) and will be enabled by default in version 2.0 of the Azure Provider. + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: + +* `create` - (Defaults to 60 minutes) Used when creating the ExpressRoute Gateway. + +* `update` - (Defaults to 60 minutes) Used when updating the ExpressRoute Gateway. + +* `read` - (Defaults to 5 minutes) Used when retrieving the ExpressRoute Gateway. + +* `delete` - (Defaults to 60 minutes) Used when deleting the ExpressRoute Gateway. + ## Import -ExpressRoute gateways can be imported using the `resource id`, e.g. +ExpressRoute Gateways can be imported using the `resource id`, e.g. ```shell terraform import azurerm_express_route_gateway.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.Network/expressRouteGateways/myExpressRouteGateway From d0864cbd2ceea2b152783e16f2fd8277629b0cea Mon Sep 17 00:00:00 2001 From: Brent Harrison Date: Tue, 11 Feb 2020 23:51:18 -0500 Subject: [PATCH 069/498] remove commented block --- .../network/resource_arm_express_route_gateway.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/azurerm/internal/services/network/resource_arm_express_route_gateway.go b/azurerm/internal/services/network/resource_arm_express_route_gateway.go index 5008b5e87567c..731594d7fd24f 100644 --- a/azurerm/internal/services/network/resource_arm_express_route_gateway.go +++ b/azurerm/internal/services/network/resource_arm_express_route_gateway.go @@ -201,12 +201,3 @@ func resourceArmExpressRouteGatewayDelete(d *schema.ResourceData, meta interface return nil } - -// func expandExpressRouteGatewayAutoScaleConfigurationBounds(d *schema.ResourceData) *network.ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds { -// minScaleUnits := int32(d.Get("scale_units").(int)) -// configuration := network.ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds{ -// Min: &minScaleUnits, -// } - -// return &configuration -// } From 6de712f0dfcb34176b5311f66ee4bc86f7226668 Mon Sep 17 00:00:00 2001 From: Brent Harrison Date: Wed, 12 Feb 2020 00:33:40 -0500 Subject: [PATCH 070/498] Add express_route_gateway to website sidebar --- website/azurerm.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/azurerm.erb b/website/azurerm.erb index 45745f5158f32..eb3f9efbc3f61 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -202,6 +202,10 @@ azurerm_express_route_circuit +
  • + azurerm_express_route_gateway +
    • +
  • azurerm_firewall
    • From 3123d0212ab58b4ab445e14ba0e2506fe6b42391 Mon Sep 17 00:00:00 2001 From: Brent Harrison Date: Wed, 12 Feb 2020 00:40:48 -0500 Subject: [PATCH 071/498] Correct sidebar location --- website/azurerm.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/website/azurerm.erb b/website/azurerm.erb index eb3f9efbc3f61..a00c87244b48b 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -202,10 +202,6 @@ azurerm_express_route_circuit -
  • - azurerm_express_route_gateway -
    • -
  • azurerm_firewall
    • @@ -1721,6 +1717,10 @@ azurerm_express_route_circuit_peering +
  • + azurerm_express_route_gateway +
    • +
  • azurerm_firewall
    • From 9f174d4483ca7525a6a4d2e63fe8db531f868a13 Mon Sep 17 00:00:00 2001 From: Variour Date: Wed, 12 Feb 2020 13:45:42 +0100 Subject: [PATCH 072/498] add recommendation for scope parameter value Recommendation is to use the first entry of the assignable_scopes parameter. It is sourced from the microsoft docs. Section 4 in the following howto: https://docs.microsoft.com/en-us/azure/role-based-access-control/custom-roles-rest#create-a-custom-role --- website/docs/r/role_definition.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/role_definition.html.markdown b/website/docs/r/role_definition.html.markdown index 5c733e4d12b8b..26ba0b82eaf4e 100644 --- a/website/docs/r/role_definition.html.markdown +++ b/website/docs/r/role_definition.html.markdown @@ -41,7 +41,7 @@ The following arguments are supported: * `name` - (Required) The name of the Role Definition. Changing this forces a new resource to be created. -* `scope` - (Required) The scope at which the Role Definition applies too, such as `/subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333`, `/subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup`, or `/subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup/providers/Microsoft.Compute/virtualMachines/myVM`. Changing this forces a new resource to be created. +* `scope` - (Required) The scope at which the Role Definition applies too, such as `/subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333`, `/subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup`, or `/subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup/providers/Microsoft.Compute/virtualMachines/myVM`. It is recommended to use the first entry of the `assignable_scopes`. Changing this forces a new resource to be created. * `description` - (Optional) A description of the Role Definition. From b44a0c2732d3eadac9df6c86221dc2cb137c5f0d Mon Sep 17 00:00:00 2001 From: John Schmidt Date: Wed, 12 Feb 2020 13:22:48 -0800 Subject: [PATCH 073/498] Documentation changed based on observed terraform and Azure API behavior. --- website/docs/r/virtual_machine_scale_set.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/virtual_machine_scale_set.html.markdown b/website/docs/r/virtual_machine_scale_set.html.markdown index 6452175c6d72b..7b402578d0b84 100644 --- a/website/docs/r/virtual_machine_scale_set.html.markdown +++ b/website/docs/r/virtual_machine_scale_set.html.markdown @@ -437,7 +437,7 @@ output "principal_id" { * `name` - (Required) Specifies name of the IP configuration. * `subnet_id` - (Required) Specifies the identifier of the subnet. -* `application_gateway_backend_address_pool_ids` - (Optional) Specifies an array of references to backend address pools of application gateways. A scale set can reference backend address pools of multiple application gateways. Multiple scale sets cannot use the same application gateway. +* `application_gateway_backend_address_pool_ids` - (Optional) Specifies an array of references to backend address pools of application gateways. A scale set can reference backend address pools of multiple application gateways. Multiple scale sets can use the same application gateway. * `load_balancer_backend_address_pool_ids` - (Optional) Specifies an array of references to backend address pools of load balancers. A scale set can reference backend address pools of one public and one internal load balancer. Multiple scale sets cannot use the same load balancer. -> **NOTE:** When using this field you'll also need to configure a Rule for the Load Balancer, and use a `depends_on` between this resource and the Load Balancer Rule. From 99b6fe5f22658bcfe23002e0cb92d4156d9fece9 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Wed, 12 Feb 2020 14:25:52 -0800 Subject: [PATCH 074/498] Make error msg more user friendly --- ...rce_arm_storage_account_encryption_settings.go | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go b/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go index c9e61d23393a9..c5d2a5e51fd33 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go @@ -118,17 +118,26 @@ func resourceArmStorageAccountEncryptionSettingsCreateUpdate(d *schema.ResourceD if v, ok := d.GetOk("key_vault.0.key_vault_id"); ok { // Get the key vault base URL from the key vault keyVaultId := v.(string) - pKeyVaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) + + kvId, err := azure.ParseAzureResourceID(keyVaultId) + if err != nil { + return err + } + + keyVaultAccountName := kvId.Path["vaults"] + keyVaultResourceGroupName := kvId.ResourceGroup + + pKeyVaultBaseURL, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) if err != nil { return fmt.Errorf("Error looking up Key Vault URI from id %q: %+v", keyVaultId, err) } if azure.KeyVaultIsSoftDeleteAndPurgeProtected(ctx, vaultClient, keyVaultId) { - return fmt.Errorf("Key Vault %q is not configured correctly, please make sure that both 'soft_delete_enabled' and 'purge_protection_enabled' arguments are set to 'true'", keyVaultId) + return fmt.Errorf("Key Vault %q (Resource Group %q) is not configured correctly, please make sure that both 'soft_delete_enabled' and 'purge_protection_enabled' arguments are set to 'true'", keyVaultAccountName, keyVaultResourceGroupName) } - keyVaultProperties.KeyVaultURI = utils.String(pKeyVaultBaseUrl) + keyVaultProperties.KeyVaultURI = utils.String(pKeyVaultBaseURL) opts.Encryption.KeyVaultProperties = keyVaultProperties opts.Encryption.KeySource = storage.MicrosoftKeyvault } From bb8ed6858fa58a5da11ba0f0d7c6d8e331ee01a6 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Wed, 12 Feb 2020 14:56:30 -0800 Subject: [PATCH 075/498] Update error conditional --- .../storage/resource_arm_storage_account_encryption_settings.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go b/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go index c5d2a5e51fd33..e03e8a77d9c3d 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go @@ -133,7 +133,7 @@ func resourceArmStorageAccountEncryptionSettingsCreateUpdate(d *schema.ResourceD return fmt.Errorf("Error looking up Key Vault URI from id %q: %+v", keyVaultId, err) } - if azure.KeyVaultIsSoftDeleteAndPurgeProtected(ctx, vaultClient, keyVaultId) { + if !azure.KeyVaultIsSoftDeleteAndPurgeProtected(ctx, vaultClient, keyVaultId) { return fmt.Errorf("Key Vault %q (Resource Group %q) is not configured correctly, please make sure that both 'soft_delete_enabled' and 'purge_protection_enabled' arguments are set to 'true'", keyVaultAccountName, keyVaultResourceGroupName) } From ccde214c3eb589a38453cedbf298c7921cf318bc Mon Sep 17 00:00:00 2001 From: John Kendall Date: Thu, 13 Feb 2020 17:45:23 +1100 Subject: [PATCH 076/498] resolve review comments --- .../resource_arm_bot_channel_directline.go | 59 +++++++++++++++---- ...esource_arm_bot_channel_directline_test.go | 50 ++++++++-------- website/azurerm.erb | 4 ++ 3 files changed, 75 insertions(+), 38 deletions(-) diff --git a/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go b/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go index 8678b9340873f..30b28aa95ed15 100644 --- a/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go +++ b/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go @@ -149,6 +149,12 @@ func resourceArmBotChannelDirectlineCreate(d *schema.ResourceData, meta interfac return fmt.Errorf("Error issuing create request for Channel Directline for Bot %q (Resource Group %q): %+v", resourceGroup, botName, err) } + // Create does not include sites properly, so we need to update as well + time.Sleep(10 * time.Second) + if _, err := client.Update(ctx, resourceGroup, botName, botservice.ChannelNameDirectLineChannel, channel); err != nil { + return fmt.Errorf("Error issuing create request for Channel Directline for Bot %q (Resource Group %q): %+v", resourceGroup, botName, err) + } + resp, err := client.Get(ctx, resourceGroup, botName, string(botservice.ChannelNameDirectLineChannel1)) if err != nil { return fmt.Errorf("Error making get request for Channel Directline for Bot %q (Resource Group %q): %+v", resourceGroup, botName, err) @@ -193,7 +199,7 @@ func resourceArmBotChannelDirectlineRead(d *schema.ResourceData, meta interface{ if props := channelsResp.Properties; props != nil { if channel, ok := props.AsDirectLineChannel(); ok { if channelProps := channel.Properties; channelProps != nil { - d.Set("site", flattenDirectlineSites(*channelProps.Sites)) + d.Set("site", flattenDirectlineSites(filterSites(channelProps.Sites))) } } } @@ -208,12 +214,11 @@ func resourceArmBotChannelDirectlineUpdate(d *schema.ResourceData, meta interfac botName := d.Get("bot_name").(string) resourceGroup := d.Get("resource_group_name").(string) - sites := expandDirectlineSites(d.Get("site").(*schema.Set).List()) channel := botservice.BotChannel{ Properties: botservice.DirectLineChannel{ Properties: &botservice.DirectLineChannelProperties{ - Sites: sites, + Sites: expandDirectlineSites(d.Get("site").(*schema.Set).List()), }, ChannelName: botservice.ChannelNameDirectLineChannel1, }, @@ -225,6 +230,12 @@ func resourceArmBotChannelDirectlineUpdate(d *schema.ResourceData, meta interfac return fmt.Errorf("Error issuing create request for Channel Directline for Bot %q (Resource Group %q): %+v", resourceGroup, botName, err) } + // Create does not include sites properly, so we need to update as well + time.Sleep(10 * time.Second) + if _, err := client.Update(ctx, resourceGroup, botName, botservice.ChannelNameDirectLineChannel, channel); err != nil { + return fmt.Errorf("Error issuing create request for Channel Directline for Bot %q (Resource Group %q): %+v", resourceGroup, botName, err) + } + resp, err := client.Get(ctx, resourceGroup, botName, string(botservice.ChannelNameDirectLineChannel1)) if err != nil { return fmt.Errorf("Error making get request for Channel Directline for Bot %q (Resource Group %q): %+v", resourceGroup, botName, err) @@ -264,31 +275,39 @@ func resourceArmBotChannelDirectlineDelete(d *schema.ResourceData, meta interfac func expandDirectlineSites(input []interface{}) *[]botservice.DirectLineSite { sites := make([]botservice.DirectLineSite, len(input)) - for i, element := range input { + for _, element := range input { + if element == nil { + continue + } + site := element.(map[string]interface{}) + expanded := botservice.DirectLineSite{} if v, ok := site["name"].(string); ok { - sites[i].SiteName = &v + expanded.SiteName = &v } if v, ok := site["enabled"].(bool); ok { - sites[i].IsEnabled = &v + expanded.IsEnabled = &v } if v, ok := site["v1_allowed"].(bool); ok { - sites[i].IsV1Enabled = &v + expanded.IsV1Enabled = &v } if v, ok := site["v3_allowed"].(bool); ok { - sites[i].IsV3Enabled = &v + expanded.IsV3Enabled = &v } if v, ok := site["enhanced_authentication_enabled"].(bool); ok { - sites[i].IsSecureSiteEnabled = &v + expanded.IsSecureSiteEnabled = &v } - if v, ok := site["trusted_origins"].([]interface{}); ok { - items := make([]string, len(v)) - for i, raw := range v { + if v, ok := site["trusted_origins"].(*schema.Set); ok { + origins := v.List() + items := make([]string, len(origins)) + for i, raw := range origins { items[i] = raw.(string) } - sites[i].TrustedOrigins = &items + expanded.TrustedOrigins = &items } + + sites = append(sites, expanded) } return &sites @@ -337,3 +356,17 @@ func flattenDirectlineSites(input []botservice.DirectLineSite) []interface{} { return sites } + +// When creating a new directline channel, a Default Site is created +// There is a race condition where this site is not removed before the create request is completed +func filterSites(sites *[]botservice.DirectLineSite) []botservice.DirectLineSite { + + filtered := make([]botservice.DirectLineSite, 0) + for _, site := range *sites { + if *site.SiteName == "Default Site" { + continue + } + filtered = append(filtered, site) + } + return filtered +} diff --git a/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go b/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go index ccbe57ea5b31a..94c210e8eabf4 100644 --- a/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go +++ b/azurerm/internal/services/bot/tests/resource_arm_bot_channel_directline_test.go @@ -146,13 +146,13 @@ func testAccAzureRMBotChannelDirectline_basicConfig(data acceptance.TestData) st %s resource "azurerm_bot_channel_directline" "test" { - bot_name = "${azurerm_bot_channels_registration.test.name}" - location = "${azurerm_bot_channels_registration.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - site { - name = "test" - enabled = true - } + bot_name = "${azurerm_bot_channels_registration.test.name}" + location = "${azurerm_bot_channels_registration.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + site { + name = "test" + enabled = true + } } `, template) } @@ -163,17 +163,17 @@ func testAccAzureRMBotChannelDirectline_completeConfig(data acceptance.TestData) %s resource "azurerm_bot_channel_directline" "test" { - bot_name = "${azurerm_bot_channels_registration.test.name}" - location = "${azurerm_bot_channels_registration.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - site { - name = "test" - enabled = true - v1_allowed = true - v3_allowed = true - enhanced_authentication_enabled = true - trusted_origins = ["https://example.com"] - } + bot_name = "${azurerm_bot_channels_registration.test.name}" + location = "${azurerm_bot_channels_registration.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + site { + name = "test" + enabled = true + v1_allowed = true + v3_allowed = true + enhanced_authentication_enabled = true + trusted_origins = ["https://example.com"] + } } `, template) } @@ -184,13 +184,13 @@ func testAccAzureRMBotChannelDirectline_basicUpdate(data acceptance.TestData) st %s resource "azurerm_bot_channel_directline" "test" { - bot_name = "${azurerm_bot_channels_registration.test.name}" - location = "${azurerm_bot_channels_registration.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - site { - name = "test" - enabled = false - } + bot_name = "${azurerm_bot_channels_registration.test.name}" + location = "${azurerm_bot_channels_registration.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + site { + name = "test" + enabled = false + } } `, template) } diff --git a/website/azurerm.erb b/website/azurerm.erb index 648428026d863..4b3538480598f 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -846,6 +846,10 @@ azurerm_bot_channel_slack +
  • + azurerm_bot_channel_directline +
    • +
  • azurerm_bot_channels_registration
    • From 41402a1712f63ad2c8d50d89565eeb8579641fc7 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Thu, 13 Feb 2020 09:14:53 +0000 Subject: [PATCH 077/498] 2.0 todos and associated tests --- .../data_source_api_management.go | 28 +- .../resource_arm_api_management.go | 265 ++---------------- .../data_source_api_management_group_test.go | 6 +- ...data_source_api_management_product_test.go | 13 +- .../tests/data_source_api_management_test.go | 13 +- .../data_source_api_management_user_test.go | 13 +- ...e_arm_api_management_api_operation_test.go | 6 +- ...urce_arm_api_management_api_policy_test.go | 12 +- ...urce_arm_api_management_api_schema_test.go | 6 +- .../resource_arm_api_management_api_test.go | 6 +- ...arm_api_management_api_version_set_test.go | 6 +- ...pi_management_authorization_server_test.go | 6 +- ...esource_arm_api_management_backend_test.go | 6 +- ...rce_arm_api_management_certificate_test.go | 6 +- ...resource_arm_api_management_logger_test.go | 2 +- ...management_openid_connect_provider_test.go | 6 +- ..._arm_api_management_product_policy_test.go | 12 +- ...esource_arm_api_management_product_test.go | 6 +- .../tests/resource_arm_api_management_test.go | 79 ------ website/docs/r/api_management.html.markdown | 12 - 20 files changed, 54 insertions(+), 455 deletions(-) diff --git a/azurerm/internal/services/apimanagement/data_source_api_management.go b/azurerm/internal/services/apimanagement/data_source_api_management.go index f482b9cc0c902..329c8d0ff5b98 100644 --- a/azurerm/internal/services/apimanagement/data_source_api_management.go +++ b/azurerm/internal/services/apimanagement/data_source_api_management.go @@ -47,24 +47,6 @@ func dataSourceApiManagementService() *schema.Resource { Computed: true, }, - // TODO: Remove in 2.0 - "sku": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Computed: true, - }, - "capacity": { - Type: schema.TypeInt, - Computed: true, - }, - }, - }, - }, - "sku_name": { Type: schema.TypeString, Computed: true, @@ -211,15 +193,7 @@ func dataSourceApiManagementRead(d *schema.ResourceData, meta interface{}) error } } - if sku := resp.Sku; sku != nil { - // TODO: Remove in 2.0 - if err := d.Set("sku", flattenApiManagementServiceSku(resp.Sku)); err != nil { - return fmt.Errorf("Error setting `sku`: %+v", err) - } - if err := d.Set("sku_name", flattenApiManagementServiceSkuName(resp.Sku)); err != nil { - return fmt.Errorf("Error setting `sku_name`: %+v", err) - } - } + d.Set("sku_name", flattenApiManagementServiceSkuName(resp.Sku)) return tags.FlattenAndSet(d, resp.Tags) } diff --git a/azurerm/internal/services/apimanagement/resource_arm_api_management.go b/azurerm/internal/services/apimanagement/resource_arm_api_management.go index 5146ebd6650df..02630cfe75391 100644 --- a/azurerm/internal/services/apimanagement/resource_arm_api_management.go +++ b/azurerm/internal/services/apimanagement/resource_arm_api_management.go @@ -75,41 +75,9 @@ func resourceArmApiManagementService() *schema.Resource { ValidateFunc: validate.ApiManagementServicePublisherEmail, }, - // TODO: Remove in 2.0 - "sku": { - Type: schema.TypeList, - Optional: true, - Computed: true, - Deprecated: "This property has been deprecated in favour of the 'sku_name' property and will be removed in version 2.0 of the provider", - ConflictsWith: []string{"sku_name"}, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - string(apimanagement.SkuTypeDeveloper), - string(apimanagement.SkuTypeBasic), - string(apimanagement.SkuTypeStandard), - string(apimanagement.SkuTypePremium), - }, false), - }, - - "capacity": { - Type: schema.TypeInt, - Optional: true, - ValidateFunc: validation.IntAtLeast(0), - }, - }, - }, - }, - "sku_name": { - Type: schema.TypeString, - Optional: true, - Computed: true, // TODO: Remove computed in 2.0 - ConflictsWith: []string{"sku"}, + Type: schema.TypeString, + Required: true, ValidateFunc: azure.MinCapacitySkuNameInSlice([]string{ string(apimanagement.SkuTypeDeveloper), string(apimanagement.SkuTypeBasic), @@ -205,7 +173,6 @@ func resourceArmApiManagementService() *schema.Resource { "protocols": { Type: schema.TypeList, Optional: true, - Computed: true, // TODO: remove in 2.0 MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -221,115 +188,40 @@ func resourceArmApiManagementService() *schema.Resource { "security": { Type: schema.TypeList, Optional: true, - Computed: true, // TODO: Remove in 2.0 ? MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ - "enable_backend_ssl30": { - Type: schema.TypeBool, - Optional: true, - Computed: true, // TODO: Remove in 2.0 - ConflictsWith: []string{"security.0.disable_backend_ssl30"}, + Type: schema.TypeBool, + Optional: true, }, "enable_backend_tls10": { - Type: schema.TypeBool, - Optional: true, - Computed: true, // TODO: Remove in 2.0 - ConflictsWith: []string{"security.0.disable_backend_tls10"}, + Type: schema.TypeBool, + Optional: true, }, "enable_backend_tls11": { - Type: schema.TypeBool, - Optional: true, - Computed: true, // TODO: Remove in 2.0 - ConflictsWith: []string{"security.0.disable_backend_tls11"}, + Type: schema.TypeBool, + Optional: true, }, "enable_frontend_ssl30": { - Type: schema.TypeBool, - Optional: true, - Computed: true, // TODO: Remove in 2.0 - ConflictsWith: []string{"security.0.disable_frontend_ssl30"}, + Type: schema.TypeBool, + Optional: true, }, "enable_frontend_tls10": { - Type: schema.TypeBool, - Optional: true, - Computed: true, // TODO: Remove in 2.0 - ConflictsWith: []string{"security.0.disable_frontend_tls10"}, + Type: schema.TypeBool, + Optional: true, }, "enable_frontend_tls11": { - Type: schema.TypeBool, - Optional: true, - Computed: true, // TODO: Remove in 2.0 - ConflictsWith: []string{"security.0.disable_frontend_tls11"}, + Type: schema.TypeBool, + Optional: true, }, "enable_triple_des_ciphers": { - Type: schema.TypeBool, - Optional: true, - Computed: true, // TODO: Remove in 2.0 - ConflictsWith: []string{"security.0.disable_triple_des_chipers", "security.0.disable_triple_des_ciphers"}, - }, - - //the follow have all been replaced by the `enable` flags - "disable_backend_ssl30": { - Type: schema.TypeBool, - Optional: true, - Computed: true, - ConflictsWith: []string{"security.0.enable_backend_ssl30"}, - Deprecated: "This field has been deprecated in favour of the `enable_backend_ssl30` which correctly reflects the boolean value. it will be removed in version 2.0 of the provider", - }, - "disable_backend_tls10": { - Type: schema.TypeBool, - Optional: true, - Computed: true, - ConflictsWith: []string{"security.0.enable_backend_tls10"}, - Deprecated: "This field has been deprecated in favour of the `enable_backend_tls10` which correctly reflects the boolean value. it will be removed in version 2.0 of the provider", - }, - "disable_backend_tls11": { - Type: schema.TypeBool, - Optional: true, - Computed: true, - ConflictsWith: []string{"security.0.enable_backend_tls11"}, - Deprecated: "This field has been deprecated in favour of the `enable_backend_tls11` which correctly reflects the boolean value. it will be removed in version 2.0 of the provider", - }, - "disable_frontend_ssl30": { - Type: schema.TypeBool, - Optional: true, - Computed: true, - ConflictsWith: []string{"security.0.enable_frontend_ssl30"}, - Deprecated: "This field has been deprecated in favour of the `enable_frontend_ssl30` which correctly reflects the boolean value. it will be removed in version 2.0 of the provider", - }, - "disable_frontend_tls10": { - Type: schema.TypeBool, - Optional: true, - Computed: true, - ConflictsWith: []string{"security.0.enable_frontend_tls10"}, - Deprecated: "This field has been deprecated in favour of the `enable_frontend_tls10` which correctly reflects the boolean value. it will be removed in version 2.0 of the provider", - }, - "disable_frontend_tls11": { - Type: schema.TypeBool, - Optional: true, - Computed: true, - ConflictsWith: []string{"security.0.enable_frontend_tls11"}, - Deprecated: "This field has been deprecated in favour of the `enable_frontend_tls11` which correctly reflects the boolean value. it will be removed in version 2.0 of the provider", - }, - "disable_triple_des_chipers": { - Type: schema.TypeBool, - Optional: true, - Computed: true, - Deprecated: "This field has been deprecated in favour of the `disable_triple_des_ciphers` property to correct the spelling. it will be removed in version 2.0 of the provider", - ConflictsWith: []string{"security.0.disable_triple_des_ciphers"}, - }, - "disable_triple_des_ciphers": { Type: schema.TypeBool, Optional: true, - // Default: false, // TODO: Remove in 2.0 - Computed: true, // TODO: Remove in 2.0 - ConflictsWith: []string{"security.0.enable_triple_des_ciphers"}, - Deprecated: "This field has been deprecated in favour of the `enable_triple_des_ciphers` which correctly reflects the boolean value. it will be removed in version 2.0 of the provider", }, }, }, @@ -486,13 +378,7 @@ func resourceArmApiManagementServiceCreateUpdate(d *schema.ResourceData, meta in ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() - // TODO: Remove in 2.0 - sku := expandAzureRmApiManagementSku(d) - if sku == nil { - if sku = expandAzureRmApiManagementSkuName(d); sku == nil { - return fmt.Errorf("either 'sku_name' or 'sku' must be defined in the configuration file") - } - } + sku := expandAzureRmApiManagementSkuName(d) log.Printf("[INFO] preparing arguments for API Management Service creation.") @@ -693,14 +579,8 @@ func resourceArmApiManagementServiceRead(d *schema.ResourceData, meta interface{ } } - if sku := resp.Sku; sku != nil { - // TODO: Remove in 2.0 - if err := d.Set("sku", flattenApiManagementServiceSku(resp.Sku)); err != nil { - return fmt.Errorf("Error setting `sku`: %+v", err) - } - if err := d.Set("sku_name", flattenApiManagementServiceSkuName(resp.Sku)); err != nil { - return fmt.Errorf("Error setting `sku_name`: %+v", err) - } + if err := d.Set("sku_name", flattenApiManagementServiceSkuName(resp.Sku)); err != nil { + return fmt.Errorf("Error setting `sku_name`: %+v", err) } if err := d.Set("sign_in", flattenApiManagementSignInSettings(signInSettings)); err != nil { @@ -985,29 +865,6 @@ func flattenAzureRmApiManagementMachineIdentity(identity *apimanagement.ServiceI return []interface{}{result} } -// TODO: Remove in 2.0 timeframe -func expandAzureRmApiManagementSku(d *schema.ResourceData) *apimanagement.ServiceSkuProperties { - var name string - var capacity int32 - - vs := d.Get("sku").([]interface{}) - - if len(vs) == 0 { - return nil - } - - // guaranteed by MinItems in the schema - v := vs[0].(map[string]interface{}) - - name = v["name"].(string) - capacity = int32(v["capacity"].(int)) - - return &apimanagement.ServiceSkuProperties{ - Name: apimanagement.SkuType(name), - Capacity: utils.Int32(capacity), - } -} - func expandAzureRmApiManagementSkuName(d *schema.ResourceData) *apimanagement.ServiceSkuProperties { vs := d.Get("sku_name").(string) @@ -1034,21 +891,6 @@ func flattenApiManagementServiceSkuName(input *apimanagement.ServiceSkuPropertie return fmt.Sprintf("%s_%d", string(input.Name), *input.Capacity) } -func flattenApiManagementServiceSku(input *apimanagement.ServiceSkuProperties) []interface{} { - if input == nil { - return []interface{}{} - } - - sku := make(map[string]interface{}) - - sku["name"] = string(input.Name) - if input.Capacity != nil { - sku["capacity"] = *input.Capacity - } - - return []interface{}{sku} -} - func expandApiManagementCustomProperties(d *schema.ResourceData) map[string]*string { backendProtocolSsl3 := false backendProtocolTls10 := false @@ -1058,61 +900,15 @@ func expandApiManagementCustomProperties(d *schema.ResourceData) map[string]*str frontendProtocolTls11 := false tripleDesCiphers := false - //if vs := d.Get("security").([]interface{}); len(vs) > 0 { - //v := vs[0].(map[string]interface{}) - // restore these in 2.0 - // backendProtocolSsl3 = v["enable_backend_ssl30"].(bool) - // backendProtocolTls10 = v["enable_backend_tls10"].(bool) - // backendProtocolTls11 = v["enable_backend_tls11"].(bool) - // frontendProtocolSsl3 = v["enable_frontend_ssl30"].(bool) - // frontendProtocolTls10 = v["enable_frontend_tls10"].(bool) - // frontendProtocolTls11 = v["enable_frontend_tls11"].(bool) - // tripleDesCiphers = v["enable_triple_des_ciphers"].(bool) - //} - - // remove all these for 2.0 - if c, ok := d.GetOkExists("security.0.enable_triple_des_ciphers"); ok { - tripleDesCiphers = c.(bool) - } else if c, ok := d.GetOkExists("security.0.disable_triple_des_ciphers"); ok { - tripleDesCiphers = c.(bool) - } else if c, ok := d.GetOkExists("security.0.disable_triple_des_chipers"); ok { - tripleDesCiphers = c.(bool) - } - - if c, ok := d.GetOkExists("security.0.enable_frontend_tls11"); ok { - frontendProtocolTls11 = c.(bool) - } else if c, ok := d.GetOkExists("security.0.disable_frontend_tls11"); ok { - frontendProtocolTls11 = c.(bool) - } - - if c, ok := d.GetOkExists("security.0.enable_frontend_tls10"); ok { - frontendProtocolTls10 = c.(bool) - } else if c, ok := d.GetOkExists("security.0.disable_frontend_tls10"); ok { - frontendProtocolTls10 = c.(bool) - } - - if c, ok := d.GetOkExists("security.0.enable_frontend_ssl30"); ok { - frontendProtocolSsl3 = c.(bool) - } else if c, ok := d.GetOkExists("security.0.disable_frontend_ssl30"); ok { - frontendProtocolSsl3 = c.(bool) - } - - if c, ok := d.GetOkExists("security.0.enable_backend_tls11"); ok { - backendProtocolTls11 = c.(bool) - } else if c, ok := d.GetOkExists("security.0.disable_backend_ssl30"); ok { - backendProtocolTls11 = c.(bool) - } - - if c, ok := d.GetOkExists("security.0.enable_backend_tls10"); ok { - backendProtocolTls10 = c.(bool) - } else if c, ok := d.GetOkExists("security.0.disable_backend_tls10"); ok { - backendProtocolTls10 = c.(bool) - } - - if c, ok := d.GetOkExists("security.0.enable_backend_ssl30"); ok { - backendProtocolSsl3 = c.(bool) - } else if c, ok := d.GetOkExists("security.0.disable_backend_ssl30"); ok { - backendProtocolSsl3 = c.(bool) + if vs := d.Get("security").([]interface{}); len(vs) > 0 { + v := vs[0].(map[string]interface{}) + backendProtocolSsl3 = v["enable_backend_ssl30"].(bool) + backendProtocolTls10 = v["enable_backend_tls10"].(bool) + backendProtocolTls11 = v["enable_backend_tls11"].(bool) + frontendProtocolSsl3 = v["enable_frontend_ssl30"].(bool) + frontendProtocolTls10 = v["enable_frontend_tls10"].(bool) + frontendProtocolTls11 = v["enable_frontend_tls11"].(bool) + tripleDesCiphers = v["enable_triple_des_ciphers"].(bool) } customProperties := map[string]*string{ @@ -1145,15 +941,6 @@ func flattenApiManagementSecurityCustomProperties(input map[string]*string) []in output["enable_frontend_tls11"] = parseApiManagementNilableDictionary(input, apimFrontendProtocolTls11) output["enable_triple_des_ciphers"] = parseApiManagementNilableDictionary(input, apimTripleDesCiphers) - output["disable_backend_ssl30"] = parseApiManagementNilableDictionary(input, apimBackendProtocolSsl3) // TODO: Remove in 2.0 - output["disable_backend_tls10"] = parseApiManagementNilableDictionary(input, apimBackendProtocolTls10) // TODO: Remove in 2.0 - output["disable_backend_tls11"] = parseApiManagementNilableDictionary(input, apimBackendProtocolTls11) // TODO: Remove in 2.0 - output["disable_frontend_ssl30"] = parseApiManagementNilableDictionary(input, apimFrontendProtocolSsl3) // TODO: Remove in 2.0 - output["disable_frontend_tls10"] = parseApiManagementNilableDictionary(input, apimFrontendProtocolTls10) // TODO: Remove in 2.0 - output["disable_frontend_tls11"] = parseApiManagementNilableDictionary(input, apimFrontendProtocolTls11) // TODO: Remove in 2.0 - output["disable_triple_des_chipers"] = parseApiManagementNilableDictionary(input, apimTripleDesCiphers) // TODO: Remove in 2.0 - output["disable_triple_des_ciphers"] = parseApiManagementNilableDictionary(input, apimTripleDesCiphers) // TODO: Remove in 2.0 - return []interface{}{output} } diff --git a/azurerm/internal/services/apimanagement/tests/data_source_api_management_group_test.go b/azurerm/internal/services/apimanagement/tests/data_source_api_management_group_test.go index a5b18026b829f..91cc90ac5597c 100644 --- a/azurerm/internal/services/apimanagement/tests/data_source_api_management_group_test.go +++ b/azurerm/internal/services/apimanagement/tests/data_source_api_management_group_test.go @@ -41,11 +41,7 @@ resource "azurerm_api_management" "test" { resource_group_name = "${azurerm_resource_group.test.name}" publisher_name = "pub1" publisher_email = "pub1@email.com" - - sku { - name = "Developer" - capacity = 1 - } + sku_name = "Developer_1" } resource "azurerm_api_management_group" "test" { diff --git a/azurerm/internal/services/apimanagement/tests/data_source_api_management_product_test.go b/azurerm/internal/services/apimanagement/tests/data_source_api_management_product_test.go index 4c6ae3ae60170..58d0a5d663c1f 100644 --- a/azurerm/internal/services/apimanagement/tests/data_source_api_management_product_test.go +++ b/azurerm/internal/services/apimanagement/tests/data_source_api_management_product_test.go @@ -39,15 +39,10 @@ resource "azurerm_resource_group" "test" { } resource "azurerm_api_management" "test" { - name = "acctestAM-%d" - publisher_name = "pub1" - publisher_email = "pub1@email.com" - - sku { - name = "Developer" - capacity = 1 - } - + name = "acctestAM-%d" + publisher_name = "pub1" + publisher_email = "pub1@email.com" + sku_name = "Developer_1" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } diff --git a/azurerm/internal/services/apimanagement/tests/data_source_api_management_test.go b/azurerm/internal/services/apimanagement/tests/data_source_api_management_test.go index 0efd692c1e068..aeca7634a929f 100644 --- a/azurerm/internal/services/apimanagement/tests/data_source_api_management_test.go +++ b/azurerm/internal/services/apimanagement/tests/data_source_api_management_test.go @@ -39,15 +39,10 @@ resource "azurerm_resource_group" "test" { } resource "azurerm_api_management" "test" { - name = "acctestAM-%d" - publisher_name = "pub1" - publisher_email = "pub1@email.com" - - sku { - name = "Developer" - capacity = 1 - } - + name = "acctestAM-%d" + publisher_name = "pub1" + publisher_email = "pub1@email.com" + sku_name = "Developer_1" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } diff --git a/azurerm/internal/services/apimanagement/tests/data_source_api_management_user_test.go b/azurerm/internal/services/apimanagement/tests/data_source_api_management_user_test.go index d418a69cc6f53..ed655416f8e53 100644 --- a/azurerm/internal/services/apimanagement/tests/data_source_api_management_user_test.go +++ b/azurerm/internal/services/apimanagement/tests/data_source_api_management_user_test.go @@ -38,15 +38,10 @@ resource "azurerm_resource_group" "test" { } resource "azurerm_api_management" "test" { - name = "acctestAM-%d" - publisher_name = "pub1" - publisher_email = "pub1@email.com" - - sku { - name = "Developer" - capacity = 1 - } - + name = "acctestAM-%d" + publisher_name = "pub1" + publisher_email = "pub1@email.com" + sku_name = "Developer_1" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_test.go index dfbda05bd8862..2902e271967e3 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_test.go @@ -496,11 +496,7 @@ resource "azurerm_api_management" "test" { resource_group_name = "${azurerm_resource_group.test.name}" publisher_name = "pub1" publisher_email = "pub1@email.com" - - sku { - name = "Developer" - capacity = 1 - } + sku_name = "Developer_1" } resource "azurerm_api_management_api" "test" { diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_policy_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_policy_test.go index 01f78f6b64255..43d008e446358 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_policy_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_policy_test.go @@ -182,11 +182,7 @@ resource "azurerm_api_management" "test" { resource_group_name = "${azurerm_resource_group.test.name}" publisher_name = "pub1" publisher_email = "pub1@email.com" - - sku { - name = "Developer" - capacity = 1 - } + sku_name = "Developer_1" } resource "azurerm_api_management_api" "test" { @@ -235,11 +231,7 @@ resource "azurerm_api_management" "test" { resource_group_name = "${azurerm_resource_group.test.name}" publisher_name = "pub1" publisher_email = "pub1@email.com" - - sku { - name = "Developer" - capacity = 1 - } + sku_name = "Developer_1" } resource "azurerm_api_management_api" "test" { diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_schema_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_schema_test.go index 019fd65bb06b5..d71d224d70f96 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_schema_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_schema_test.go @@ -157,11 +157,7 @@ resource "azurerm_api_management" "test" { resource_group_name = "${azurerm_resource_group.test.name}" publisher_name = "pub1" publisher_email = "pub1@email.com" - - sku { - name = "Developer" - capacity = 1 - } + sku_name = "Developer_1" } resource "azurerm_api_management_api" "test" { diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_test.go index a0b0bb8dbb76c..858a33be0ca18 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_test.go @@ -534,11 +534,7 @@ resource "azurerm_api_management" "test" { resource_group_name = "${azurerm_resource_group.test.name}" publisher_name = "pub1" publisher_email = "pub1@email.com" - - sku { - name = "Developer" - capacity = 1 - } + sku_name = "Developer_1" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_version_set_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_version_set_test.go index 660e2a0a763d5..5cd88d2aa9452 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_version_set_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_version_set_test.go @@ -268,11 +268,7 @@ resource "azurerm_api_management" "test" { resource_group_name = "${azurerm_resource_group.test.name}" publisher_name = "pub1" publisher_email = "pub1@email.com" - - sku { - name = "Developer" - capacity = 1 - } + sku_name = "Developer_1" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_authorization_server_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_authorization_server_test.go index bce30b68d9904..4f6f621c00763 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_authorization_server_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_authorization_server_test.go @@ -222,11 +222,7 @@ resource "azurerm_api_management" "test" { resource_group_name = "${azurerm_resource_group.test.name}" publisher_name = "pub1" publisher_email = "pub1@email.com" - - sku { - name = "Developer" - capacity = 1 - } + sku_name = "Developer_1" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_backend_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_backend_test.go index dabe3c2633f0b..33f50deae5a30 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_backend_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_backend_test.go @@ -450,11 +450,7 @@ resource "azurerm_api_management" "test" { resource_group_name = "${azurerm_resource_group.test.name}" publisher_name = "pub1" publisher_email = "pub1@email.com" - - sku { - name = "Developer" - capacity = 1 - } + sku_name = "Developer_1" } `, data.RandomInteger, testName, data.Locations.Primary, data.RandomInteger, testName) } diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_certificate_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_certificate_test.go index 9e9f11a5df186..96fcbdf2be1e3 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_certificate_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_certificate_test.go @@ -131,11 +131,7 @@ resource "azurerm_api_management" "test" { resource_group_name = "${azurerm_resource_group.test.name}" publisher_name = "pub1" publisher_email = "pub1@email.com" - - sku { - name = "Developer" - capacity = 1 - } + sku_name = "Developer_1" } resource "azurerm_api_management_certificate" "test" { diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_logger_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_logger_test.go index 03b6eb97fbce6..bf410a65df16e 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_logger_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_logger_test.go @@ -263,7 +263,7 @@ resource "azurerm_eventhub_namespace" "test" { name = "acctesteventhubnamespace-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - sku = "Basic" + sku_name = "Basic_1" } resource "azurerm_eventhub" "test" { diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_openid_connect_provider_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_openid_connect_provider_test.go index 7a165628b67de..fecf4454683b3 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_openid_connect_provider_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_openid_connect_provider_test.go @@ -194,11 +194,7 @@ resource "azurerm_api_management" "test" { resource_group_name = "${azurerm_resource_group.test.name}" publisher_name = "pub1" publisher_email = "pub1@email.com" - - sku { - name = "Developer" - capacity = 1 - } + sku_name = "Developer_1" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_policy_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_policy_test.go index 0dbeffb131959..c9bfb50e67e78 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_policy_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_policy_test.go @@ -157,11 +157,7 @@ resource "azurerm_api_management" "test" { resource_group_name = "${azurerm_resource_group.test.name}" publisher_name = "pub1" publisher_email = "pub1@email.com" - - sku { - name = "Developer" - capacity = 1 - } + sku_name = "Developer_1" } resource "azurerm_api_management_product" "test" { @@ -209,11 +205,7 @@ resource "azurerm_api_management" "test" { resource_group_name = "${azurerm_resource_group.test.name}" publisher_name = "pub1" publisher_email = "pub1@email.com" - - sku { - name = "Developer" - capacity = 1 - } + sku_name = "Developer_1" } resource "azurerm_api_management_product" "test" { diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_test.go index 308a9e97f331f..669148dcab8f7 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_test.go @@ -386,11 +386,7 @@ resource "azurerm_api_management" "test" { resource_group_name = "${azurerm_resource_group.test.name}" publisher_name = "pub1" publisher_email = "pub1@email.com" - - sku { - name = "Developer" - capacity = 1 - } + sku_name = "Developer_1" } resource "azurerm_api_management_product" "test" { diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_test.go index a31d047b5a5f4..4bcf07de2babe 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_test.go @@ -2,7 +2,6 @@ package tests import ( "fmt" - "regexp" "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" @@ -32,43 +31,6 @@ func TestAccAzureRMApiManagement_basic(t *testing.T) { }) } -// Remove in 2.0 -func TestAccAzureRMApiManagement_basicClassic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_api_management", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMApiManagementDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMApiManagement_basicClassic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMApiManagementExists(data.ResourceName), - ), - }, - data.ImportStep(), - }, - }) -} - -// Remove in 2.0 -func TestAccAzureRMApiManagement_basicNotDefined(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_api_management", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMApiManagementDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMApiManagement_basicNotDefined(data), - ExpectError: regexp.MustCompile("either 'sku_name' or 'sku' must be defined in the configuration file"), - }, - }, - }) -} - func TestAccAzureRMApiManagement_requiresImport(t *testing.T) { if !features.ShouldResourcesBeImported() { t.Skip("Skipping since resources aren't required to be imported") @@ -282,47 +244,6 @@ resource "azurerm_api_management" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } -// Remove in 2.0 -func testAccAzureRMApiManagement_basicClassic(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_api_management" "test" { - name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - publisher_name = "pub1" - publisher_email = "pub1@email.com" - - sku { - name = "Developer" - capacity = 1 - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - -// Remove in 2.0 -func testAccAzureRMApiManagement_basicNotDefined(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_api_management" "test" { - name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - publisher_name = "pub1" - publisher_email = "pub1@email.com" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - func testAccAzureRMApiManagement_policyXmlContent(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { diff --git a/website/docs/r/api_management.html.markdown b/website/docs/r/api_management.html.markdown index 8dc484ad51a88..e4a863dec1482 100644 --- a/website/docs/r/api_management.html.markdown +++ b/website/docs/r/api_management.html.markdown @@ -55,8 +55,6 @@ The following arguments are supported: * `publisher_email` - (Required) The email of publisher/company. -* `sku` - (Deprecated) A `sku` block as documented below - * `sku_name` - (Required) `sku_name` is a string consisting of two parts separated by an underscore(\_). The fist part is the `name`, valid values include: `Developer`, `Basic`, `Standard` and `Premium`. The second part is the `capacity` (e.g. the number of deployed units of the `sku`), which must be a positive `integer` (e.g. `Developer_1`). --- @@ -232,16 +230,6 @@ A `security` block supports the following: --- -A `sku` block supports the following: (Deprecated) - -* `name` - (Required) Specifies the Pricing Tier for the API Management Service. Possible values include: Developer, Basic, Standard and Premium. - -* `capacity` - (Required) Specifies the Pricing Capacity for the API Management Service. - --> **Note:** This property has been deprecated in favour of the `sku_name` property and will be removed in version 2.0 of the provider. - ---- - A `sign_in` block supports the following: * `enabled` - (Required) Should anonymous users be redirected to the sign in page? From bd260e078676628ae30fdf87c60040b04f37beab Mon Sep 17 00:00:00 2001 From: jackofallops Date: Thu, 13 Feb 2020 10:36:25 +0000 Subject: [PATCH 078/498] added optional bool defaults for diff --- .../services/apimanagement/resource_arm_api_management.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/azurerm/internal/services/apimanagement/resource_arm_api_management.go b/azurerm/internal/services/apimanagement/resource_arm_api_management.go index 02630cfe75391..50c643795192a 100644 --- a/azurerm/internal/services/apimanagement/resource_arm_api_management.go +++ b/azurerm/internal/services/apimanagement/resource_arm_api_management.go @@ -194,34 +194,41 @@ func resourceArmApiManagementService() *schema.Resource { "enable_backend_ssl30": { Type: schema.TypeBool, Optional: true, + Default: false, }, "enable_backend_tls10": { Type: schema.TypeBool, Optional: true, + Default: false, }, "enable_backend_tls11": { Type: schema.TypeBool, Optional: true, + Default: false, }, "enable_frontend_ssl30": { Type: schema.TypeBool, Optional: true, + Default: false, }, "enable_frontend_tls10": { Type: schema.TypeBool, Optional: true, + Default: false, }, "enable_frontend_tls11": { Type: schema.TypeBool, Optional: true, + Default: false, }, "enable_triple_des_ciphers": { Type: schema.TypeBool, Optional: true, + Default: false, }, }, }, From 88ac09e6e99c3bcdc6d43ddcefb0cbcd148e9e22 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Thu, 13 Feb 2020 14:32:19 +0000 Subject: [PATCH 079/498] Added Computed flag to TypeList resources with default values --- .../services/apimanagement/resource_arm_api_management.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azurerm/internal/services/apimanagement/resource_arm_api_management.go b/azurerm/internal/services/apimanagement/resource_arm_api_management.go index 50c643795192a..9a013976fa968 100644 --- a/azurerm/internal/services/apimanagement/resource_arm_api_management.go +++ b/azurerm/internal/services/apimanagement/resource_arm_api_management.go @@ -173,6 +173,7 @@ func resourceArmApiManagementService() *schema.Resource { "protocols": { Type: schema.TypeList, Optional: true, + Computed: true, MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -188,6 +189,7 @@ func resourceArmApiManagementService() *schema.Resource { "security": { Type: schema.TypeList, Optional: true, + Computed: true, MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ From d8e3d89c6a2993df5de22eb29d777d52ae87107a Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Wed, 12 Feb 2020 21:46:35 -0800 Subject: [PATCH 080/498] postgres service to 2.0 --- .../resource_arm_postgresql_server.go | 161 +----------------- .../resource_arm_postgresql_server_test.go | 22 --- 2 files changed, 8 insertions(+), 175 deletions(-) diff --git a/azurerm/internal/services/postgres/resource_arm_postgresql_server.go b/azurerm/internal/services/postgres/resource_arm_postgresql_server.go index d1bcb127aef6e..8cc850d40b9c5 100644 --- a/azurerm/internal/services/postgres/resource_arm_postgresql_server.go +++ b/azurerm/internal/services/postgres/resource_arm_postgresql_server.go @@ -60,10 +60,8 @@ func resourceArmPostgreSQLServer() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), "sku_name": { - Type: schema.TypeString, - Optional: true, // required in 2.0 - Computed: true, // remove in 2.0 - ConflictsWith: []string{"sku"}, + Type: schema.TypeString, + Required: true, ValidateFunc: validation.StringInSlice([]string{ "B_Gen4_1", "B_Gen4_2", @@ -88,82 +86,6 @@ func resourceArmPostgreSQLServer() *schema.Resource { }, false), }, - // remove in 2.0 - "sku": { - Type: schema.TypeList, - Optional: true, - Computed: true, - ConflictsWith: []string{"sku_name"}, - Deprecated: "This property has been deprecated in favour of the 'sku_name' property and will be removed in version 2.0 of the provider", - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - "B_Gen4_1", - "B_Gen4_2", - "B_Gen5_1", - "B_Gen5_2", - "GP_Gen4_2", - "GP_Gen4_4", - "GP_Gen4_8", - "GP_Gen4_16", - "GP_Gen4_32", - "GP_Gen5_2", - "GP_Gen5_4", - "GP_Gen5_8", - "GP_Gen5_16", - "GP_Gen5_32", - "GP_Gen5_64", - "MO_Gen5_2", - "MO_Gen5_4", - "MO_Gen5_8", - "MO_Gen5_16", - "MO_Gen5_32", - }, true), - DiffSuppressFunc: suppress.CaseDifference, - }, - - "capacity": { - Type: schema.TypeInt, - Required: true, - ValidateFunc: validation.IntInSlice([]int{ - 1, - 2, - 4, - 8, - 16, - 32, - 64, - }), - }, - - "tier": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - string(postgresql.Basic), - string(postgresql.GeneralPurpose), - string(postgresql.MemoryOptimized), - }, true), - DiffSuppressFunc: suppress.CaseDifference, - }, - - "family": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - "Gen4", - "Gen5", - }, true), - DiffSuppressFunc: suppress.CaseDifference, - }, - }, - }, - }, - "administrator_login": { Type: schema.TypeString, Required: true, @@ -250,17 +172,6 @@ func resourceArmPostgreSQLServer() *schema.Resource { "tags": tags.Schema(), }, - - CustomizeDiff: func(diff *schema.ResourceDiff, v interface{}) error { - tier, _ := diff.GetOk("sku.0.tier") - storageMB, _ := diff.GetOk("storage_profile.0.storage_mb") - - if strings.ToLower(tier.(string)) == "basic" && storageMB.(int) > 1048576 { - return fmt.Errorf("basic pricing tier only supports upto 1,048,576 MB (1TB) of storage") - } - - return nil - }, } } @@ -288,17 +199,9 @@ func resourceArmPostgreSQLServerCreate(d *schema.ResourceData, meta interface{}) } } - var sku *postgresql.Sku - if b, ok := d.GetOk("sku_name"); ok { - var err error - sku, err = expandServerSkuName(b.(string)) - if err != nil { - return fmt.Errorf("error expanding sku_name for PostgreSQL Server %s (Resource Group %q): %v", name, resourceGroup, err) - } - } else if _, ok := d.GetOk("sku"); ok { - sku = expandAzureRmPostgreSQLServerSku(d) - } else { - return fmt.Errorf("One of `sku` or `sku_name` must be set for PostgreSQL Server %q (Resource Group %q)", name, resourceGroup) + sku, err := expandServerSkuName(d.Get("sku_name").(string)) + if err != nil { + return fmt.Errorf("error expanding `sku_name` for PostgreSQL Server %s (Resource Group %q): %v", name, resourceGroup, err) } properties := postgresql.ServerForCreate{ @@ -348,17 +251,9 @@ func resourceArmPostgreSQLServerUpdate(d *schema.ResourceData, meta interface{}) name := d.Get("name").(string) resourceGroup := d.Get("resource_group_name").(string) - var sku *postgresql.Sku - if b, ok := d.GetOk("sku_name"); ok { - var err error - sku, err = expandServerSkuName(b.(string)) - if err != nil { - return fmt.Errorf("error expanding sku_name for PostgreSQL Server %q (Resource Group %q): %v", name, resourceGroup, err) - } - } else if _, ok := d.GetOk("sku"); ok { - sku = expandAzureRmPostgreSQLServerSku(d) - } else { - return fmt.Errorf("One of `sku` or `sku_name` must be set for PostgreSQL Server %q (Resource Group %q)", name, resourceGroup) + sku, err := expandServerSkuName(d.Get("sku_name").(string)) + if err != nil { + return fmt.Errorf("error expanding `sku_name` for PostgreSQL Server %s (Resource Group %q): %v", name, resourceGroup, err) } properties := postgresql.ServerUpdateParameters{ @@ -428,9 +323,6 @@ func resourceArmPostgreSQLServerRead(d *schema.ResourceData, meta interface{}) e d.Set("version", string(resp.Version)) d.Set("ssl_enforcement", string(resp.SslEnforcement)) - if err := d.Set("sku", flattenPostgreSQLServerSku(resp.Sku)); err != nil { - return fmt.Errorf("Error setting `sku`: %+v", err) - } if sku := resp.Sku; sku != nil { d.Set("sku_name", sku.Name) } @@ -508,23 +400,6 @@ func expandServerSkuName(skuName string) (*postgresql.Sku, error) { }, nil } -func expandAzureRmPostgreSQLServerSku(d *schema.ResourceData) *postgresql.Sku { - skus := d.Get("sku").([]interface{}) - sku := skus[0].(map[string]interface{}) - - name := sku["name"].(string) - capacity := sku["capacity"].(int) - tier := sku["tier"].(string) - family := sku["family"].(string) - - return &postgresql.Sku{ - Name: utils.String(name), - Tier: postgresql.SkuTier(tier), - Capacity: utils.Int32(int32(capacity)), - Family: utils.String(family), - } -} - func expandAzureRmPostgreSQLStorageProfile(d *schema.ResourceData) *postgresql.StorageProfile { storageprofiles := d.Get("storage_profile").([]interface{}) storageprofile := storageprofiles[0].(map[string]interface{}) @@ -542,26 +417,6 @@ func expandAzureRmPostgreSQLStorageProfile(d *schema.ResourceData) *postgresql.S } } -func flattenPostgreSQLServerSku(resp *postgresql.Sku) []interface{} { - values := map[string]interface{}{} - - if name := resp.Name; name != nil { - values["name"] = *name - } - - if capacity := resp.Capacity; capacity != nil { - values["capacity"] = *capacity - } - - values["tier"] = string(resp.Tier) - - if family := resp.Family; family != nil { - values["family"] = *family - } - - return []interface{}{values} -} - func flattenPostgreSQLStorageProfile(resp *postgresql.StorageProfile) []interface{} { values := map[string]interface{}{} diff --git a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go index a90489d476d83..7a137ac85862f 100644 --- a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go +++ b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go @@ -33,28 +33,6 @@ func TestAccAzureRMPostgreSQLServer_basicNinePointFive(t *testing.T) { }) } -// TODO: remove in 2.0 -func TestAccAzureRMPostgreSQLServer_basicNinePointFiveOldSku(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_postgresql_server", "test") - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMPostgreSQLServerDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMPostgreSQLServer_basicNinePointFiveOldSku(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMPostgreSQLServerExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "administrator_login", "acctestun"), - resource.TestCheckResourceAttr(data.ResourceName, "version", "9.5"), - resource.TestCheckResourceAttr(data.ResourceName, "ssl_enforcement", "Enabled"), - ), - }, - data.ImportStep("administrator_login_password"), - }, - }) -} - func TestAccAzureRMPostgreSQLServer_basicNinePointSix(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_postgresql_server", "test") resource.ParallelTest(t, resource.TestCase{ From 160f8cf963b4b4899583bf8df00a0b84df954a5f Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Wed, 12 Feb 2020 09:57:12 -0800 Subject: [PATCH 081/498] Preparing the the storage package for 2.0 --- .../storage/resource_arm_storage_account.go | 65 +------------------ .../storage/resource_arm_storage_blob.go | 8 +-- .../storage/resource_arm_storage_table.go | 5 -- .../resource_arm_storage_account_test.go | 64 ------------------ .../tests/resource_arm_storage_table_test.go | 4 -- website/docs/r/storage_account.html.markdown | 4 -- website/docs/r/storage_table.html.markdown | 3 - 7 files changed, 6 insertions(+), 147 deletions(-) diff --git a/azurerm/internal/services/storage/resource_arm_storage_account.go b/azurerm/internal/services/storage/resource_arm_storage_account.go index dda85e0d247f6..6380874a70c34 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account.go @@ -8,10 +8,6 @@ import ( "strings" "time" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/iothub" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network" - - "github.com/Azure/azure-sdk-for-go/services/preview/security/mgmt/v1.0/security" "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-04-01/storage" azautorest "github.com/Azure/go-autorest/autorest" "github.com/hashicorp/go-azure-helpers/response" @@ -24,8 +20,11 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/locks" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/iothub" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" "github.com/tombuildsstuff/giovanni/storage/2018-11-09/queue/queues" ) @@ -177,14 +176,6 @@ func resourceArmStorageAccount() *schema.Resource { ForceNew: true, }, - // TODO remove this in 2.0 for the dedicated resource - "enable_advanced_threat_protection": { - Type: schema.TypeBool, - Optional: true, - Computed: true, - Deprecated: "This property has been deprecated in favour of the new 'azurerm_advanced_threat_protection' resource and will be removed in version 2.0 of the provider", - }, - "network_rules": { Type: schema.TypeList, Optional: true, @@ -646,7 +637,6 @@ func validateAzureRMStorageAccountTags(v interface{}, _ string) (warnings []stri func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Storage.AccountsClient - advancedThreatProtectionClient := meta.(*clients.Client).SecurityCenter.AdvancedThreatProtectionClient ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -766,22 +756,6 @@ func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) e log.Printf("[INFO] storage account %q ID: %q", storageAccountName, *account.ID) d.SetId(*account.ID) - // TODO: deprecate & split this out into it's own resource in 2.0 - // as this is not available in all regions, and presumably off by default - // lets only try to set this value when true - // TODO in 2.0 switch to guarding this with d.GetOkExists() ? - if v := d.Get("enable_advanced_threat_protection").(bool); v { - advancedThreatProtectionSetting := security.AdvancedThreatProtectionSetting{ - AdvancedThreatProtectionProperties: &security.AdvancedThreatProtectionProperties{ - IsEnabled: utils.Bool(v), - }, - } - - if _, err = advancedThreatProtectionClient.Create(ctx, d.Id(), advancedThreatProtectionSetting); err != nil { - return fmt.Errorf("Error updating Azure Storage Account enable_advanced_threat_protection %q: %+v", storageAccountName, err) - } - } - if val, ok := d.GetOk("blob_properties"); ok { // FileStorage does not support blob settings if accountKind != string(storage.FileStorage) { @@ -830,7 +804,6 @@ func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) e // available requires a call to Update per parameter... func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Storage.AccountsClient - advancedThreatProtectionClient := meta.(*clients.Client).SecurityCenter.AdvancedThreatProtectionClient ctx, cancel := timeouts.ForUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -989,20 +962,6 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e d.SetPartial("network_rules") } - if d.HasChange("enable_advanced_threat_protection") { - opts := security.AdvancedThreatProtectionSetting{ - AdvancedThreatProtectionProperties: &security.AdvancedThreatProtectionProperties{ - IsEnabled: utils.Bool(d.Get("enable_advanced_threat_protection").(bool)), - }, - } - - if _, err := advancedThreatProtectionClient.Create(ctx, d.Id(), opts); err != nil { - return fmt.Errorf("Error updating Azure Storage Account enable_advanced_threat_protection %q: %+v", storageAccountName, err) - } - - d.SetPartial("enable_advanced_threat_protection") - } - if d.HasChange("blob_properties") { // FileStorage does not support blob settings if accountKind != string(storage.FileStorage) { @@ -1052,7 +1011,6 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e func resourceArmStorageAccountRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Storage.AccountsClient - advancedThreatProtectionClient := meta.(*clients.Client).SecurityCenter.AdvancedThreatProtectionClient endpointSuffix := meta.(*clients.Client).Account.Environment.StorageEndpointSuffix ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -1193,23 +1151,6 @@ func resourceArmStorageAccountRead(d *schema.ResourceData, meta interface{}) err return err } - // TODO in 2.0 switch to guarding this with d.GetOkExists() - atp, err := advancedThreatProtectionClient.Get(ctx, d.Id()) - if err != nil { - msg := err.Error() - if !strings.Contains(msg, "The resource namespace 'Microsoft.Security' is invalid.") { - if !strings.Contains(msg, "No registered resource provider found for location '") { - if !strings.Contains(msg, "' and API version '2017-08-01-preview' for type ") { - return fmt.Errorf("Error reading the advanced threat protection settings of AzureRM Storage Account %q: %+v", name, err) - } - } - } - } else { - if atpp := atp.AdvancedThreatProtectionProperties; atpp != nil { - d.Set("enable_advanced_threat_protection", atpp.IsEnabled) - } - } - storageClient := meta.(*clients.Client).Storage account, err := storageClient.FindAccount(ctx, name) if err != nil { diff --git a/azurerm/internal/services/storage/resource_arm_storage_blob.go b/azurerm/internal/services/storage/resource_arm_storage_blob.go index bcf7801da9dbd..7e6835ac4c822 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_blob.go +++ b/azurerm/internal/services/storage/resource_arm_storage_blob.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" @@ -61,10 +60,9 @@ func resourceArmStorageBlob() *schema.Resource { }, "type": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - DiffSuppressFunc: suppress.CaseDifference, // TODO: remove in 2.0 + Type: schema.TypeString, + Required: true, + ForceNew: true, ValidateFunc: validation.StringInSlice([]string{ "Append", "Block", diff --git a/azurerm/internal/services/storage/resource_arm_storage_table.go b/azurerm/internal/services/storage/resource_arm_storage_table.go index 7d2960cafec03..21d52120c07da 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_table.go +++ b/azurerm/internal/services/storage/resource_arm_storage_table.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" @@ -63,9 +62,6 @@ func resourceArmStorageTable() *schema.Resource { ValidateFunc: ValidateArmStorageAccountName, }, - // TODO: deprecate this in the docs - "resource_group_name": azure.SchemaResourceGroupNameDeprecated(), - "acl": { Type: schema.TypeSet, Optional: true, @@ -199,7 +195,6 @@ func resourceArmStorageTableRead(d *schema.ResourceData, meta interface{}) error d.Set("name", id.TableName) d.Set("storage_account_name", id.AccountName) - d.Set("resource_group_name", account.ResourceGroup) if err := d.Set("acl", flattenStorageTableACLs(acls)); err != nil { return fmt.Errorf("Error flattening `acl`: %+v", err) diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go index 24f8b1618d89e..aac39ac243f15 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go @@ -571,34 +571,6 @@ func TestAccAzureRMStorageAccount_networkRulesDeleted(t *testing.T) { }) } -func TestAccAzureRMStorageAccount_enableAdvancedThreatProtection(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_storage_account", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMStorageAccountDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMStorageAccount_enableAdvancedThreatProtection(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "enable_advanced_threat_protection", "true"), - ), - }, - data.ImportStep(), - { - Config: testAccAzureRMStorageAccount_enableAdvancedThreatProtectionDisabled(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "enable_advanced_threat_protection", "false"), - ), - }, - data.ImportStep(), - }, - }) -} - func TestAccAzureRMStorageAccount_blobProperties(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_storage_account", "test") @@ -1339,42 +1311,6 @@ resource "azurerm_storage_account" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomString) } -func testAccAzureRMStorageAccount_enableAdvancedThreatProtection(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-storage-%d" - location = "%s" -} - -resource "azurerm_storage_account" "test" { - name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - account_tier = "Standard" - account_replication_type = "LRS" - enable_advanced_threat_protection = true -} -`, data.RandomInteger, data.Locations.Primary, data.RandomString) -} - -func testAccAzureRMStorageAccount_enableAdvancedThreatProtectionDisabled(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-storage-%d" - location = "%s" -} - -resource "azurerm_storage_account" "test" { - name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - account_tier = "Standard" - account_replication_type = "LRS" - enable_advanced_threat_protection = false -} -`, data.RandomInteger, data.Locations.Primary, data.RandomString) -} - func testAccAzureRMStorageAccount_blobProperties(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_table_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_table_test.go index d07f2387d5b8b..391decdc72dd7 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_table_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_table_test.go @@ -277,7 +277,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_table" "test" { name = "acctestst%d" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" } `, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomInteger) @@ -290,7 +289,6 @@ func testAccAzureRMStorageTable_requiresImport(data acceptance.TestData) string resource "azurerm_storage_table" "import" { name = "${azurerm_storage_table.test.name}" - resource_group_name = "${azurerm_storage_table.test.resource_group_name}" storage_account_name = "${azurerm_storage_table.test.storage_account_name}" } `, template) @@ -317,7 +315,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_table" "test" { name = "acctestst%d" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" acl { id = "MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI" @@ -353,7 +350,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_table" "test" { name = "acctestst%d" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" acl { diff --git a/website/docs/r/storage_account.html.markdown b/website/docs/r/storage_account.html.markdown index 95c4ccff93fd7..648f1440199db 100644 --- a/website/docs/r/storage_account.html.markdown +++ b/website/docs/r/storage_account.html.markdown @@ -105,10 +105,6 @@ The following arguments are supported: * `custom_domain` - (Optional) A `custom_domain` block as documented below. -* `enable_advanced_threat_protection` (Optional) Boolean flag which controls if advanced threat protection is enabled, see [here](https://docs.microsoft.com/en-us/azure/storage/common/storage-advanced-threat-protection) for more information. Defaults to `false`. - -~> **Note:** `enable_advanced_threat_protection` is not supported in all regions. - * `identity` - (Optional) A `identity` block as defined below. * `blob_properties` - (Optional) A `blob_properties` block as defined below. diff --git a/website/docs/r/storage_table.html.markdown b/website/docs/r/storage_table.html.markdown index 5107c08548abb..909864dfd0d8e 100644 --- a/website/docs/r/storage_table.html.markdown +++ b/website/docs/r/storage_table.html.markdown @@ -28,7 +28,6 @@ resource "azurerm_storage_account" "example" { resource "azurerm_storage_table" "example" { name = "mysampletable" - resource_group_name = azurerm_resource_group.example.name storage_account_name = azurerm_storage_account.example.name } ``` @@ -42,8 +41,6 @@ The following arguments are supported: * `storage_account_name` - (Required) Specifies the storage account in which to create the storage table. Changing this forces a new resource to be created. -* `resource_group_name` - (Optional / **Deprecated**) The name of the resource group in which to create the storage table. - * `acl` - (Optional) One or more `acl` blocks as defined below. --- From 4b239e07bff78cca9b92596dcad085273f9da49f Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Wed, 12 Feb 2020 10:43:15 -0800 Subject: [PATCH 082/498] Removed additional deprecated fields --- .../storage/resource_arm_storage_account.go | 10 --- .../storage/resource_arm_storage_blob.go | 16 +---- .../storage/resource_arm_storage_container.go | 17 ----- .../storage/resource_arm_storage_queue.go | 4 -- .../storage/resource_arm_storage_share.go | 6 -- ...storage_account_blob_container_sas_test.go | 1 - .../resource_arm_storage_account_test.go | 18 ----- .../tests/resource_arm_storage_blob_test.go | 70 ++++++------------- .../resource_arm_storage_container_test.go | 9 --- .../tests/resource_arm_storage_share_test.go | 7 -- .../resource_arm_storage_table_entity_test.go | 1 - website/docs/r/storage_blob.html.markdown | 5 -- .../docs/r/storage_container.html.markdown | 5 -- website/docs/r/storage_queue.html.markdown | 3 - website/docs/r/storage_share.html.markdown | 3 - 15 files changed, 22 insertions(+), 153 deletions(-) diff --git a/azurerm/internal/services/storage/resource_arm_storage_account.go b/azurerm/internal/services/storage/resource_arm_storage_account.go index 6380874a70c34..f7a46c557dec3 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account.go @@ -78,15 +78,6 @@ func resourceArmStorageAccount() *schema.Resource { Default: string(storage.Storage), }, - "account_type": { - Type: schema.TypeString, - Optional: true, - Computed: true, - Deprecated: "This field has been split into `account_tier` and `account_replication_type`", - ValidateFunc: ValidateArmStorageAccountType, - DiffSuppressFunc: suppress.CaseDifference, - }, - "account_tier": { Type: schema.TypeString, Required: true, @@ -1064,7 +1055,6 @@ func resourceArmStorageAccountRead(d *schema.ResourceData, meta interface{}) err d.Set("account_kind", resp.Kind) if sku := resp.Sku; sku != nil { - d.Set("account_type", sku.Name) d.Set("account_tier", sku.Tier) d.Set("account_replication_type", strings.Split(fmt.Sprintf("%v", sku.Name), "_")[1]) } diff --git a/azurerm/internal/services/storage/resource_arm_storage_blob.go b/azurerm/internal/services/storage/resource_arm_storage_blob.go index 7e6835ac4c822..d9d469f5774b7 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_blob.go +++ b/azurerm/internal/services/storage/resource_arm_storage_blob.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" @@ -67,7 +66,7 @@ func resourceArmStorageBlob() *schema.Resource { "Append", "Block", "Page", - }, true), + }, false), }, "size": { @@ -131,18 +130,6 @@ func resourceArmStorageBlob() *schema.Resource { }, "metadata": MetaDataComputedSchema(), - - // Deprecated fields - "attempts": { - Type: schema.TypeInt, - Optional: true, - Default: 1, - ForceNew: true, - Deprecated: "Retries are now handled by the Azure SDK as such this field is no longer necessary and will be removed in v2.0 of the Azure Provider", - ValidateFunc: validation.IntAtLeast(1), - }, - - "resource_group_name": azure.SchemaResourceGroupNameDeprecated(), }, } } @@ -312,7 +299,6 @@ func resourceArmStorageBlobRead(d *schema.ResourceData, meta interface{}) error d.Set("name", id.BlobName) d.Set("storage_container_name", id.ContainerName) d.Set("storage_account_name", id.AccountName) - d.Set("resource_group_name", account.ResourceGroup) d.Set("access_tier", string(props.AccessTier)) d.Set("content_type", props.ContentType) diff --git a/azurerm/internal/services/storage/resource_arm_storage_container.go b/azurerm/internal/services/storage/resource_arm_storage_container.go index 0971adb3adaaf..f4aa2908d9a83 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_container.go +++ b/azurerm/internal/services/storage/resource_arm_storage_container.go @@ -7,7 +7,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" @@ -75,17 +74,6 @@ func resourceArmStorageContainer() *schema.Resource { Type: schema.TypeBool, Computed: true, }, - - "resource_group_name": azure.SchemaResourceGroupNameDeprecated(), - - "properties": { - Type: schema.TypeMap, - Computed: true, - Deprecated: "This field will be removed in version 2.0 of the Azure Provider", - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, }, } } @@ -229,7 +217,6 @@ func resourceArmStorageContainerRead(d *schema.ResourceData, meta interface{}) e d.Set("name", id.ContainerName) d.Set("storage_account_name", id.AccountName) - d.Set("resource_group_name", account.ResourceGroup) d.Set("container_access_type", flattenStorageContainerAccessLevel(props.AccessLevel)) @@ -237,10 +224,6 @@ func resourceArmStorageContainerRead(d *schema.ResourceData, meta interface{}) e return fmt.Errorf("Error setting `metadata`: %+v", err) } - if err := d.Set("properties", flattenStorageContainerProperties(props)); err != nil { - return fmt.Errorf("Error setting `properties`: %+v", err) - } - d.Set("has_immutability_policy", props.HasImmutabilityPolicy) d.Set("has_legal_hold", props.HasLegalHold) diff --git a/azurerm/internal/services/storage/resource_arm_storage_queue.go b/azurerm/internal/services/storage/resource_arm_storage_queue.go index b512884cd6fbc..ba77e57565bad 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_queue.go +++ b/azurerm/internal/services/storage/resource_arm_storage_queue.go @@ -7,7 +7,6 @@ import ( "time" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" @@ -50,8 +49,6 @@ func resourceArmStorageQueue() *schema.Resource { ValidateFunc: ValidateArmStorageAccountName, }, - "resource_group_name": azure.SchemaResourceGroupNameDeprecated(), - "metadata": MetaDataSchema(), }, } @@ -204,7 +201,6 @@ func resourceArmStorageQueueRead(d *schema.ResourceData, meta interface{}) error d.Set("name", id.QueueName) d.Set("storage_account_name", id.AccountName) - d.Set("resource_group_name", account.ResourceGroup) if err := d.Set("metadata", FlattenMetaData(metaData.MetaData)); err != nil { return fmt.Errorf("Error setting `metadata`: %s", err) diff --git a/azurerm/internal/services/storage/resource_arm_storage_share.go b/azurerm/internal/services/storage/resource_arm_storage_share.go index 04eb1ff535859..9c4edd8c7a436 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_share.go +++ b/azurerm/internal/services/storage/resource_arm_storage_share.go @@ -7,7 +7,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" @@ -55,8 +54,6 @@ func resourceArmStorageShare() *schema.Resource { ValidateFunc: ValidateArmStorageShareName, }, - "resource_group_name": azure.SchemaResourceGroupNameDeprecated(), - "storage_account_name": { Type: schema.TypeString, Required: true, @@ -230,9 +227,6 @@ func resourceArmStorageShareRead(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("Error flattening `acl`: %+v", err) } - // Deprecated: remove in 2.0 - d.Set("resource_group_name", account.ResourceGroup) - return nil } diff --git a/azurerm/internal/services/storage/tests/data_source_storage_account_blob_container_sas_test.go b/azurerm/internal/services/storage/tests/data_source_storage_account_blob_container_sas_test.go index 6b719546e072d..ac44c2e5bd8a3 100644 --- a/azurerm/internal/services/storage/tests/data_source_storage_account_blob_container_sas_test.go +++ b/azurerm/internal/services/storage/tests/data_source_storage_account_blob_container_sas_test.go @@ -65,7 +65,6 @@ resource "azurerm_storage_account" "storage" { resource "azurerm_storage_container" "container" { name = "sas-test" - resource_group_name = "${azurerm_resource_group.rg.name}" storage_account_name = "${azurerm_storage_account.storage.name}" container_access_type = "private" } diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go index aac39ac243f15..d436d6c51e09d 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go @@ -18,24 +18,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" ) -func TestValidateArmStorageAccountType(t *testing.T) { - testCases := []struct { - input string - shouldError bool - }{ - {"standard_lrs", false}, - {"invalid", true}, - } - - for _, test := range testCases { - _, es := storage.ValidateArmStorageAccountType(test.input, "account_type") - - if test.shouldError && len(es) == 0 { - t.Fatalf("Expected validating account_type %q to fail", test.input) - } - } -} - func TestValidateArmStorageAccountName(t *testing.T) { testCases := []struct { input string diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go index ddc5438f401b7..33f70757fb2bc 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go @@ -54,7 +54,7 @@ func TestAccAzureRMStorageBlob_appendEmpty(t *testing.T) { ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "type"}, + ImportStateVerifyIgnore: []string{"parallelism", "size", "type"}, }, }, }) @@ -78,7 +78,7 @@ func TestAccAzureRMStorageBlob_appendEmptyMetaData(t *testing.T) { ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "type"}, + ImportStateVerifyIgnore: []string{"parallelism", "size", "type"}, }, }, }) @@ -102,7 +102,7 @@ func TestAccAzureRMStorageBlob_blockEmpty(t *testing.T) { ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "type"}, + ImportStateVerifyIgnore: []string{"parallelism", "size", "type"}, }, }, }) @@ -126,7 +126,7 @@ func TestAccAzureRMStorageBlob_blockEmptyAzureADAuth(t *testing.T) { ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "type"}, + ImportStateVerifyIgnore: []string{"parallelism", "size", "type"}, }, }, }) @@ -150,7 +150,7 @@ func TestAccAzureRMStorageBlob_blockEmptyMetaData(t *testing.T) { ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "type"}, + ImportStateVerifyIgnore: []string{"parallelism", "size", "type"}, }, }, }) @@ -175,7 +175,7 @@ func TestAccAzureRMStorageBlob_blockEmptyAccessTier(t *testing.T) { ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "type"}, + ImportStateVerifyIgnore: []string{"parallelism", "size", "type"}, }, { Config: testAccAzureRMStorageBlob_blockEmptyAccessTier(data, blobs.Hot), @@ -213,7 +213,7 @@ func TestAccAzureRMStorageBlob_blockFromInlineContent(t *testing.T) { ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "source_content", "type"}, + ImportStateVerifyIgnore: []string{"parallelism", "size", "source_content", "type"}, }, }, }) @@ -237,7 +237,7 @@ func TestAccAzureRMStorageBlob_blockFromPublicBlob(t *testing.T) { ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "source_uri", "type"}, + ImportStateVerifyIgnore: []string{"parallelism", "size", "source_uri", "type"}, }, }, }) @@ -261,7 +261,7 @@ func TestAccAzureRMStorageBlob_blockFromPublicFile(t *testing.T) { ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "source_uri", "type"}, + ImportStateVerifyIgnore: []string{"parallelism", "size", "source_uri", "type"}, }, }, }) @@ -285,7 +285,7 @@ func TestAccAzureRMStorageBlob_blockFromExistingBlob(t *testing.T) { ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "source_uri", "type"}, + ImportStateVerifyIgnore: []string{"parallelism", "size", "source_uri", "type"}, }, }, }) @@ -318,7 +318,7 @@ func TestAccAzureRMStorageBlob_blockFromLocalFile(t *testing.T) { ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "source", "type"}, + ImportStateVerifyIgnore: []string{"parallelism", "size", "source", "type"}, }, }, }) @@ -342,7 +342,7 @@ func TestAccAzureRMStorageBlob_contentType(t *testing.T) { ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "type"}, + ImportStateVerifyIgnore: []string{"parallelism", "size", "type"}, }, { Config: testAccAzureRMStorageBlob_contentTypeUpdated(data), @@ -354,7 +354,7 @@ func TestAccAzureRMStorageBlob_contentType(t *testing.T) { ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "type"}, + ImportStateVerifyIgnore: []string{"parallelism", "size", "type"}, }, }, }) @@ -378,7 +378,7 @@ func TestAccAzureRMStorageBlob_contentTypePremium(t *testing.T) { ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "type"}, + ImportStateVerifyIgnore: []string{"parallelism", "size", "type"}, }, }, }) @@ -402,7 +402,7 @@ func TestAccAzureRMStorageBlob_pageEmpty(t *testing.T) { ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "type"}, + ImportStateVerifyIgnore: []string{"parallelism", "size", "type"}, }, }, }) @@ -426,7 +426,7 @@ func TestAccAzureRMStorageBlob_pageEmptyPremium(t *testing.T) { ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "type"}, + ImportStateVerifyIgnore: []string{"parallelism", "size", "type"}, }, }, }) @@ -450,7 +450,7 @@ func TestAccAzureRMStorageBlob_pageEmptyMetaData(t *testing.T) { ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "type"}, + ImportStateVerifyIgnore: []string{"parallelism", "size", "type"}, }, }, }) @@ -474,7 +474,7 @@ func TestAccAzureRMStorageBlob_pageFromExistingBlob(t *testing.T) { ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "source_uri", "type"}, + ImportStateVerifyIgnore: []string{"parallelism", "size", "source_uri", "type"}, }, }, }) @@ -507,7 +507,7 @@ func TestAccAzureRMStorageBlob_pageFromLocalFile(t *testing.T) { ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "source", "type"}, + ImportStateVerifyIgnore: []string{"parallelism", "size", "source", "type"}, }, }, }) @@ -554,7 +554,7 @@ func TestAccAzureRMStorageBlob_update(t *testing.T) { ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "type"}, + ImportStateVerifyIgnore: []string{"parallelism", "size", "type"}, }, { Config: testAccAzureRMStorageBlob_updateUpdated(data), @@ -566,7 +566,7 @@ func TestAccAzureRMStorageBlob_update(t *testing.T) { ResourceName: data.ResourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"attempts", "parallelism", "size", "type"}, + ImportStateVerifyIgnore: []string{"parallelism", "size", "type"}, }, }, }) @@ -763,7 +763,6 @@ func testAccAzureRMStorageBlob_appendEmpty(data acceptance.TestData) string { resource "azurerm_storage_blob" "test" { name = "example.vhd" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "append" @@ -778,7 +777,6 @@ func testAccAzureRMStorageBlob_appendEmptyMetaData(data acceptance.TestData) str resource "azurerm_storage_blob" "test" { name = "example.vhd" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "append" @@ -797,7 +795,6 @@ func testAccAzureRMStorageBlob_blockEmpty(data acceptance.TestData) string { resource "azurerm_storage_blob" "test" { name = "example.vhd" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "block" @@ -823,7 +820,6 @@ func testAccAzureRMStorageBlob_blockEmptyMetaData(data acceptance.TestData) stri resource "azurerm_storage_blob" "test" { name = "example.vhd" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "block" @@ -842,7 +838,6 @@ func testAccAzureRMStorageBlob_blockEmptyAccessTier(data acceptance.TestData, ac resource "azurerm_storage_blob" "test" { name = "example.vhd" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "block" @@ -858,7 +853,6 @@ func testAccAzureRMStorageBlob_blockFromInlineContent(data acceptance.TestData) resource "azurerm_storage_blob" "test" { name = "rick.morty" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "block" @@ -874,7 +868,6 @@ func testAccAzureRMStorageBlob_blockFromPublicBlob(data acceptance.TestData) str resource "azurerm_storage_blob" "source" { name = "example.vhd" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "block" @@ -884,14 +877,12 @@ resource "azurerm_storage_blob" "source" { resource "azurerm_storage_container" "second" { name = "second" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } resource "azurerm_storage_blob" "test" { name = "copied.vhd" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.second.name}" type = "block" @@ -908,7 +899,6 @@ func testAccAzureRMStorageBlob_blockFromPublicFile(data acceptance.TestData) str resource "azurerm_storage_blob" "test" { name = "example.vhd" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "block" @@ -925,7 +915,6 @@ func testAccAzureRMStorageBlob_blockFromExistingBlob(data acceptance.TestData) s resource "azurerm_storage_blob" "source" { name = "example.vhd" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "block" @@ -935,7 +924,6 @@ resource "azurerm_storage_blob" "source" { resource "azurerm_storage_blob" "test" { name = "copied.vhd" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "block" @@ -952,7 +940,6 @@ func testAccAzureRMStorageBlob_blockFromLocalBlob(data acceptance.TestData, file resource "azurerm_storage_blob" "test" { name = "example.vhd" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "block" @@ -968,7 +955,6 @@ func testAccAzureRMStorageBlob_contentType(data acceptance.TestData) string { resource "azurerm_storage_blob" "test" { name = "example.ext" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "page" @@ -985,7 +971,6 @@ func testAccAzureRMStorageBlob_contentTypePremium(data acceptance.TestData) stri resource "azurerm_storage_blob" "test" { name = "example.ext" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "page" @@ -1002,7 +987,6 @@ func testAccAzureRMStorageBlob_contentTypeUpdated(data acceptance.TestData) stri resource "azurerm_storage_blob" "test" { name = "example.ext" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "page" @@ -1019,7 +1003,6 @@ func testAccAzureRMStorageBlob_pageEmpty(data acceptance.TestData) string { resource "azurerm_storage_blob" "test" { name = "example.vhd" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "page" @@ -1035,7 +1018,6 @@ func testAccAzureRMStorageBlob_pageEmptyPremium(data acceptance.TestData) string resource "azurerm_storage_blob" "test" { name = "example.vhd" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "page" @@ -1051,7 +1033,6 @@ func testAccAzureRMStorageBlob_pageEmptyMetaData(data acceptance.TestData) strin resource "azurerm_storage_blob" "test" { name = "example.vhd" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "page" @@ -1071,7 +1052,6 @@ func testAccAzureRMStorageBlob_pageFromExistingBlob(data acceptance.TestData) st resource "azurerm_storage_blob" "source" { name = "example.vhd" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "page" @@ -1081,7 +1061,6 @@ resource "azurerm_storage_blob" "source" { resource "azurerm_storage_blob" "test" { name = "copied.vhd" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "page" @@ -1098,7 +1077,6 @@ func testAccAzureRMStorageBlob_pageFromLocalBlob(data acceptance.TestData, fileN resource "azurerm_storage_blob" "test" { name = "example.vhd" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "page" @@ -1146,7 +1124,6 @@ func testAccAzureRMStorageBlob_requiresImport(data acceptance.TestData) string { resource "azurerm_storage_blob" "import" { name = "${azurerm_storage_blob.test.name}" - resource_group_name = "${azurerm_storage_blob.test.resource_group_name}" storage_account_name = "${azurerm_storage_blob.test.storage_account_name}" storage_container_name = "${azurerm_storage_blob.test.storage_container_name}" type = "${azurerm_storage_blob.test.type}" @@ -1162,7 +1139,6 @@ func testAccAzureRMStorageBlob_update(data acceptance.TestData) string { resource "azurerm_storage_blob" "test" { name = "example.vhd" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "block" @@ -1182,7 +1158,6 @@ func testAccAzureRMStorageBlob_updateUpdated(data acceptance.TestData) string { resource "azurerm_storage_blob" "test" { name = "example.vhd" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "block" @@ -1213,7 +1188,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "test" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "%s" } @@ -1238,7 +1212,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "test" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "%s" } @@ -1262,7 +1235,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "test" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "%s" } diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_container_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_container_test.go index 45753cc73f351..a15e49e8ed850 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_container_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_container_test.go @@ -311,7 +311,6 @@ func testAccAzureRMStorageContainer_basic(data acceptance.TestData) string { resource "azurerm_storage_container" "test" { name = "vhds" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } @@ -336,7 +335,6 @@ func testAccAzureRMStorageContainer_requiresImport(data acceptance.TestData) str resource "azurerm_storage_container" "import" { name = "${azurerm_storage_container.test.name}" - resource_group_name = "${azurerm_storage_container.test.resource_group_name}" storage_account_name = "${azurerm_storage_container.test.storage_account_name}" container_access_type = "${azurerm_storage_container.test.container_access_type}" } @@ -350,7 +348,6 @@ func testAccAzureRMStorageContainer_update(data acceptance.TestData, accessType resource "azurerm_storage_container" "test" { name = "vhds" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "%s" } @@ -364,7 +361,6 @@ func testAccAzureRMStorageContainer_metaData(data acceptance.TestData) string { resource "azurerm_storage_container" "test" { name = "vhds" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" @@ -382,7 +378,6 @@ func testAccAzureRMStorageContainer_metaDataUpdated(data acceptance.TestData) st resource "azurerm_storage_container" "test" { name = "vhds" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" @@ -401,7 +396,6 @@ func testAccAzureRMStorageContainer_metaDataEmpty(data acceptance.TestData) stri resource "azurerm_storage_container" "test" { name = "vhds" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" @@ -418,7 +412,6 @@ func testAccAzureRMStorageContainer_root(data acceptance.TestData) string { resource "azurerm_storage_container" "test" { name = "$root" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } @@ -432,7 +425,6 @@ func testAccAzureRMStorageContainer_web(data acceptance.TestData) string { resource "azurerm_storage_container" "test" { name = "$web" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } @@ -448,7 +440,6 @@ resource "azurerm_resource_group" "test" { resource "azurerm_storage_account" "test" { name = "acctestacc%s" - resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" 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 211babe020461..be1d26afd4d9a 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 @@ -266,7 +266,6 @@ func testAccAzureRMStorageShare_basic(data acceptance.TestData) string { resource "azurerm_storage_share" "test" { name = "testshare%s" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" } `, template, data.RandomString) @@ -279,7 +278,6 @@ func testAccAzureRMStorageShare_metaData(data acceptance.TestData) string { resource "azurerm_storage_share" "test" { name = "testshare%s" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" metadata = { @@ -296,7 +294,6 @@ func testAccAzureRMStorageShare_metaDataUpdated(data acceptance.TestData) string resource "azurerm_storage_share" "test" { name = "testshare%s" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" metadata = { @@ -314,7 +311,6 @@ func testAccAzureRMStorageShare_acl(data acceptance.TestData) string { resource "azurerm_storage_share" "test" { name = "testshare%s" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" acl { @@ -337,7 +333,6 @@ func testAccAzureRMStorageShare_aclUpdated(data acceptance.TestData) string { resource "azurerm_storage_share" "test" { name = "testshare%s" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" acl { @@ -368,7 +363,6 @@ func testAccAzureRMStorageShare_requiresImport(data acceptance.TestData) string resource "azurerm_storage_share" "import" { name = "${azurerm_storage_share.test.name}" - resource_group_name = "${azurerm_storage_share.test.resource_group_name}" storage_account_name = "${azurerm_storage_share.test.storage_account_name}" } `, template) @@ -381,7 +375,6 @@ func testAccAzureRMStorageShare_updateQuota(data acceptance.TestData) string { resource "azurerm_storage_share" "test" { name = "testshare%s" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" quota = 5 } diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_table_entity_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_table_entity_test.go index df29e6263cc51..d23872c16f7b7 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_table_entity_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_table_entity_test.go @@ -249,7 +249,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_table" "test" { name = "acctestst%d" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" } `, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomInteger) diff --git a/website/docs/r/storage_blob.html.markdown b/website/docs/r/storage_blob.html.markdown index 511f92eefe2bf..9ab5f98f37592 100644 --- a/website/docs/r/storage_blob.html.markdown +++ b/website/docs/r/storage_blob.html.markdown @@ -35,7 +35,6 @@ resource "azurerm_storage_container" "example" { resource "azurerm_storage_blob" "example" { name = "my-awesome-content.zip" - resource_group_name = azurerm_resource_group.example.name storage_account_name = azurerm_storage_account.example.name storage_container_name = azurerm_storage_container.example.name type = "Block" @@ -75,10 +74,6 @@ The following arguments are supported: * `metadata` - (Optional) A map of custom blob metadata. -* `attempts` - (Optional / **Deprecated**) The number of attempts to make per page or block when uploading. Defaults to `1`. - -* `resource_group_name` - (Optional / **Deprecated**) The name of the resource group in which to create the storage container. - ## Attributes Reference The following attributes are exported in addition to the arguments listed above: diff --git a/website/docs/r/storage_container.html.markdown b/website/docs/r/storage_container.html.markdown index eddbca6ffccc7..3600e019e1732 100644 --- a/website/docs/r/storage_container.html.markdown +++ b/website/docs/r/storage_container.html.markdown @@ -32,7 +32,6 @@ resource "azurerm_storage_account" "example" { resource "azurerm_storage_container" "example" { name = "vhds" - resource_group_name = azurerm_resource_group.example.name storage_account_name = azurerm_storage_account.example.name container_access_type = "private" } @@ -50,8 +49,6 @@ The following arguments are supported: * `metadata` - (Optional) A mapping of MetaData for this Container. -* `resource_group_name` - (Optional / **Deprecated**) The name of the resource group in which to create the storage container. This field is no longer used and will be removed in 2.0. - ## Attributes Reference The following attributes are exported in addition to the arguments listed above: @@ -62,8 +59,6 @@ The following attributes are exported in addition to the arguments listed above: * `has_legal_hold` - Is there a Legal Hold configured on this Storage Container? -* `properties` - (**Deprecated**) Key-value definition of additional properties associated to the Storage Container - ## Timeouts The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: diff --git a/website/docs/r/storage_queue.html.markdown b/website/docs/r/storage_queue.html.markdown index e4223e600f2f1..06aee1e33cc70 100644 --- a/website/docs/r/storage_queue.html.markdown +++ b/website/docs/r/storage_queue.html.markdown @@ -28,7 +28,6 @@ resource "azurerm_storage_account" "example" { resource "azurerm_storage_queue" "example" { name = "mysamplequeue" - resource_group_name = azurerm_resource_group.example.name storage_account_name = azurerm_storage_account.example.name } ``` @@ -41,8 +40,6 @@ The following arguments are supported: * `storage_account_name` - (Required) Specifies the Storage Account in which the Storage Queue should exist. Changing this forces a new resource to be created. -* `resource_group_name` - (Optional / **Deprecated**) The name of the resource group in which to create the storage queue. - * `metadata` - (Optional) A mapping of MetaData which should be assigned to this Storage Queue. ## Attributes Reference diff --git a/website/docs/r/storage_share.html.markdown b/website/docs/r/storage_share.html.markdown index 49a593513ad30..fb8213835e31c 100644 --- a/website/docs/r/storage_share.html.markdown +++ b/website/docs/r/storage_share.html.markdown @@ -48,9 +48,6 @@ The following arguments are supported: * `metadata` - (Optional) A mapping of MetaData for this File Share. -* `resource_group_name` - (Optional / **Deprecated**) The name of the resource group in which to - create the share. Changing this forces a new resource to be created. - --- A `acl` block supports the following: From 36a5888307a4655e1e8a80d971bdc3339c36cddb Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Wed, 12 Feb 2020 10:45:16 -0800 Subject: [PATCH 083/498] fix imports --- .../internal/services/storage/resource_arm_storage_account.go | 1 - 1 file changed, 1 deletion(-) diff --git a/azurerm/internal/services/storage/resource_arm_storage_account.go b/azurerm/internal/services/storage/resource_arm_storage_account.go index f7a46c557dec3..9d1fa745a2e9f 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account.go @@ -24,7 +24,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" "github.com/tombuildsstuff/giovanni/storage/2018-11-09/queue/queues" ) From d8a66011f3e0387ece6a258f308dd7383b2ae05f Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Wed, 12 Feb 2020 11:53:14 -0800 Subject: [PATCH 084/498] fix up tests --- .../data_source_storage_container_test.go | 1 - .../tests/resource_arm_storage_blob_test.go | 42 +++++++++---------- .../resource_arm_storage_container_test.go | 1 + 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/azurerm/internal/services/storage/tests/data_source_storage_container_test.go b/azurerm/internal/services/storage/tests/data_source_storage_container_test.go index 351a2ab4e5a34..2797f681fb284 100644 --- a/azurerm/internal/services/storage/tests/data_source_storage_container_test.go +++ b/azurerm/internal/services/storage/tests/data_source_storage_container_test.go @@ -47,7 +47,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "containerdstest-%s" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" metadata = { diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go index 33f70757fb2bc..c8be718c8028f 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go @@ -765,7 +765,7 @@ resource "azurerm_storage_blob" "test" { name = "example.vhd" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" - type = "append" + type = "Append" } `, template) } @@ -779,7 +779,7 @@ resource "azurerm_storage_blob" "test" { name = "example.vhd" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" - type = "append" + type = "Append" metadata = { hello = "world" @@ -797,7 +797,7 @@ resource "azurerm_storage_blob" "test" { name = "example.vhd" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" - type = "block" + type = "Block" } `, template) } @@ -822,7 +822,7 @@ resource "azurerm_storage_blob" "test" { name = "example.vhd" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" - type = "block" + type = "Block" metadata = { hello = "world" @@ -840,7 +840,7 @@ resource "azurerm_storage_blob" "test" { name = "example.vhd" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" - type = "block" + type = "Block" access_tier = "%s" } `, template, string(accessTier)) @@ -855,7 +855,7 @@ resource "azurerm_storage_blob" "test" { name = "rick.morty" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" - type = "block" + type = "Block" source_content = "Wubba Lubba Dub Dub" } `, template) @@ -870,7 +870,7 @@ resource "azurerm_storage_blob" "source" { name = "example.vhd" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" - type = "block" + type = "Block" source_uri = "http://releases.ubuntu.com/18.04.3/ubuntu-18.04.3-desktop-amd64.iso" content_type = "application/x-iso9660-image" } @@ -885,7 +885,7 @@ resource "azurerm_storage_blob" "test" { name = "copied.vhd" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.second.name}" - type = "block" + type = "Block" source_uri = "${azurerm_storage_blob.source.id}" content_type = "${azurerm_storage_blob.source.content_type}" } @@ -901,7 +901,7 @@ resource "azurerm_storage_blob" "test" { name = "example.vhd" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" - type = "block" + type = "Block" source_uri = "http://releases.ubuntu.com/18.04.3/ubuntu-18.04.3-desktop-amd64.iso" content_type = "application/x-iso9660-image" } @@ -917,7 +917,7 @@ resource "azurerm_storage_blob" "source" { name = "example.vhd" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" - type = "block" + type = "Block" source_uri = "http://releases.ubuntu.com/18.04.3/ubuntu-18.04.3-desktop-amd64.iso" content_type = "application/x-iso9660-image" } @@ -926,7 +926,7 @@ resource "azurerm_storage_blob" "test" { name = "copied.vhd" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" - type = "block" + type = "Block" source_uri = "${azurerm_storage_blob.source.id}" content_type = "${azurerm_storage_blob.source.content_type}" } @@ -942,7 +942,7 @@ resource "azurerm_storage_blob" "test" { name = "example.vhd" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" - type = "block" + type = "Block" source = "%s" } `, template, fileName) @@ -957,7 +957,7 @@ resource "azurerm_storage_blob" "test" { name = "example.ext" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" - type = "page" + type = "Page" size = 5120 content_type = "image/png" } @@ -973,7 +973,7 @@ resource "azurerm_storage_blob" "test" { name = "example.ext" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" - type = "page" + type = "Page" size = 5120 content_type = "image/png" } @@ -989,7 +989,7 @@ resource "azurerm_storage_blob" "test" { name = "example.ext" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" - type = "page" + type = "Page" size = 5120 content_type = "image/gif" } @@ -1005,7 +1005,7 @@ resource "azurerm_storage_blob" "test" { name = "example.vhd" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" - type = "page" + type = "Page" size = 5120 } `, template) @@ -1020,7 +1020,7 @@ resource "azurerm_storage_blob" "test" { name = "example.vhd" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" - type = "page" + type = "Page" size = 5120 } `, template) @@ -1035,7 +1035,7 @@ resource "azurerm_storage_blob" "test" { name = "example.vhd" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" - type = "page" + type = "Page" size = 5120 metadata = { @@ -1063,7 +1063,7 @@ resource "azurerm_storage_blob" "test" { name = "copied.vhd" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" - type = "page" + type = "Page" source_uri = "${azurerm_storage_blob.source.id}" content_type = "${azurerm_storage_blob.source.content_type}" } @@ -1079,7 +1079,7 @@ resource "azurerm_storage_blob" "test" { name = "example.vhd" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" - type = "page" + type = "Page" source = "%s" } `, template, fileName) @@ -1160,7 +1160,7 @@ resource "azurerm_storage_blob" "test" { name = "example.vhd" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" - type = "block" + type = "Block" size = 5120 content_type = "vnd/mountain-mover-3000" metadata = { diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_container_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_container_test.go index a15e49e8ed850..f1e8a151ed680 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_container_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_container_test.go @@ -440,6 +440,7 @@ resource "azurerm_resource_group" "test" { resource "azurerm_storage_account" "test" { name = "acctestacc%s" + resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" From 35f7f202a4298c66f9bec3a6a06af6159fd83bf1 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Wed, 12 Feb 2020 14:35:52 -0800 Subject: [PATCH 085/498] Continue fixing tests --- .../tests/data_source_storage_management_policy_test.go | 2 +- .../services/storage/tests/resource_arm_storage_blob_test.go | 4 ++-- .../resource_arm_storage_data_lake_gen2_filesystem_test.go | 2 +- .../storage/tests/resource_arm_storage_table_entity_test.go | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/azurerm/internal/services/storage/tests/data_source_storage_management_policy_test.go b/azurerm/internal/services/storage/tests/data_source_storage_management_policy_test.go index 2c1e9ad47d5ac..28b5e8394d2df 100644 --- a/azurerm/internal/services/storage/tests/data_source_storage_management_policy_test.go +++ b/azurerm/internal/services/storage/tests/data_source_storage_management_policy_test.go @@ -9,7 +9,7 @@ import ( ) func TestAccDataSourceAzureRMStorageManagementPolicy_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "data.azurerm_storage_account", "test") + data := acceptance.BuildTestData(t, "data.azurerm_storage_management_policy", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go index c8be718c8028f..b0f6f4e4dc5cc 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go @@ -1054,7 +1054,7 @@ resource "azurerm_storage_blob" "source" { name = "example.vhd" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" - type = "page" + type = "Page" size = 5120 content_type = "application/x-iso9660-image" } @@ -1141,7 +1141,7 @@ resource "azurerm_storage_blob" "test" { name = "example.vhd" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" - type = "block" + type = "Block" size = 5120 content_type = "vnd/panda+pops" metadata = { diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_data_lake_gen2_filesystem_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_data_lake_gen2_filesystem_test.go index 44d993cc0c86f..b43b5a26b6871 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_data_lake_gen2_filesystem_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_data_lake_gen2_filesystem_test.go @@ -155,7 +155,7 @@ func testAccAzureRMStorageDataLakeGen2FileSystem_requiresImport(data acceptance. resource "azurerm_storage_data_lake_gen2_filesystem" "import" { name = azurerm_storage_data_lake_gen2_filesystem.test.name - storage_account_id = azurerm_storage_data_lake_gen2_filesystem.storage_account_id + storage_account_id = azurerm_storage_data_lake_gen2_filesystem.test.storage_account_id } `, template) } diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_table_entity_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_table_entity_test.go index d23872c16f7b7..2598bb8bcf363 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_table_entity_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_table_entity_test.go @@ -37,7 +37,7 @@ func TestAccAzureRMTableEntity_requiresImport(t *testing.T) { t.Skip("Skipping since resources aren't required to be imported") return } - data := acceptance.BuildTestData(t, "azurerm_storage_table_entity", "test") + data := acceptance.BuildTestData(t, "azurerm_storage_table_entity", "import") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -200,7 +200,7 @@ func testAccAzureRMTableEntity_requiresImport(data acceptance.TestData) string { return fmt.Sprintf(` %s -resource "azurerm_storage_table_entity" "test" { +resource "azurerm_storage_table_entity" "import" { storage_account_name = "${azurerm_storage_account.test.name}" table_name = "${azurerm_storage_table.test.name}" From 81d8944f0a1b3007b2a2a24a22aa8a487d41aafb Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Wed, 12 Feb 2020 14:37:45 -0800 Subject: [PATCH 086/498] Revert web changes --- .../web/resource_arm_app_service_plan.go | 62 ++++++++++++++++--- 1 file changed, 54 insertions(+), 8 deletions(-) diff --git a/azurerm/internal/services/web/resource_arm_app_service_plan.go b/azurerm/internal/services/web/resource_arm_app_service_plan.go index db32dd0b5efde..93d65b7652da9 100644 --- a/azurerm/internal/services/web/resource_arm_app_service_plan.go +++ b/azurerm/internal/services/web/resource_arm_app_service_plan.go @@ -94,21 +94,63 @@ func resourceArmAppServicePlan() *schema.Resource { }, }, + "properties": { + Type: schema.TypeList, + Optional: true, + Computed: true, + MaxItems: 1, + Deprecated: "These properties have been moved to the top level", + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "app_service_environment_id": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + Computed: true, + Deprecated: "This property has been moved to the top level", + ConflictsWith: []string{"app_service_environment_id"}, + }, + + "reserved": { + Type: schema.TypeBool, + Optional: true, + Computed: true, + Deprecated: "This property has been moved to the top level", + ConflictsWith: []string{"reserved"}, + }, + + "per_site_scaling": { + Type: schema.TypeBool, + Optional: true, + Computed: true, + Deprecated: "This property has been moved to the top level", + ConflictsWith: []string{"per_site_scaling"}, + }, + }, + }, + }, + /// AppServicePlanProperties "app_service_environment_id": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, + Type: schema.TypeString, + Optional: true, + ForceNew: true, + Computed: true, + ConflictsWith: []string{"properties.0.app_service_environment_id"}, }, "per_site_scaling": { - Type: schema.TypeBool, - Optional: true, + Type: schema.TypeBool, + Optional: true, + Computed: true, + ConflictsWith: []string{"properties.0.per_site_scaling"}, }, "reserved": { - Type: schema.TypeBool, - Optional: true, + Type: schema.TypeBool, + Optional: true, + Computed: true, + ConflictsWith: []string{"properties.0.reserved"}, }, "maximum_elastic_worker_count": { @@ -264,6 +306,10 @@ func resourceArmAppServicePlanRead(d *schema.ResourceData, meta interface{}) err d.Set("kind", resp.Kind) if props := resp.AppServicePlanProperties; props != nil { + if err := d.Set("properties", flattenAppServiceProperties(props)); err != nil { + return fmt.Errorf("Error setting `properties`: %+v", err) + } + if profile := props.HostingEnvironmentProfile; profile != nil { d.Set("app_service_environment_id", profile.ID) } @@ -366,4 +412,4 @@ func validateAppServicePlanName(v interface{}, k string) (warnings []string, err } return warnings, errors -} +} \ No newline at end of file From 9353b9efadce355e6aac807b5988e09f65781455 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Wed, 12 Feb 2020 18:04:13 -0800 Subject: [PATCH 087/498] Update resource_arm_app_service_plan.go --- azurerm/internal/services/web/resource_arm_app_service_plan.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/web/resource_arm_app_service_plan.go b/azurerm/internal/services/web/resource_arm_app_service_plan.go index 93d65b7652da9..cb867d4ad749d 100644 --- a/azurerm/internal/services/web/resource_arm_app_service_plan.go +++ b/azurerm/internal/services/web/resource_arm_app_service_plan.go @@ -412,4 +412,4 @@ func validateAppServicePlanName(v interface{}, k string) (warnings []string, err } return warnings, errors -} \ No newline at end of file +} From f0c23ee719be4f9a5717bd6e54204f99dfc4d4c5 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Wed, 12 Feb 2020 18:05:29 -0800 Subject: [PATCH 088/498] Remove unused method --- .../storage/resource_arm_storage_container.go | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/azurerm/internal/services/storage/resource_arm_storage_container.go b/azurerm/internal/services/storage/resource_arm_storage_container.go index f4aa2908d9a83..2efbdf8154696 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_container.go +++ b/azurerm/internal/services/storage/resource_arm_storage_container.go @@ -260,21 +260,6 @@ func resourceArmStorageContainerDelete(d *schema.ResourceData, meta interface{}) return nil } -func flattenStorageContainerProperties(input containers.ContainerProperties) map[string]interface{} { - output := map[string]interface{}{ - "last_modified": input.Header.Get("Last-Modified"), - "lease_duration": "", - "lease_state": string(input.LeaseState), - "lease_status": string(input.LeaseStatus), - } - - if input.LeaseDuration != nil { - output["lease_duration"] = string(*input.LeaseDuration) - } - - return output -} - func expandStorageContainerAccessLevel(input string) containers.AccessLevel { // for historical reasons, "private" above is an empty string in the API // so the enum doesn't 1:1 match. You could argue the SDK should handle this From b6d0fb85bc9c86b402511ef22c581a80c3c128bb Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 13 Feb 2020 12:41:40 +0100 Subject: [PATCH 089/498] r/storage: fixing broken tests --- .../storage/tests/resource_arm_storage_blob_test.go | 6 +++--- .../storage/tests/resource_arm_storage_table_entity_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go index b0f6f4e4dc5cc..a1916bf6f0308 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go @@ -871,7 +871,7 @@ resource "azurerm_storage_blob" "source" { storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "Block" - source_uri = "http://releases.ubuntu.com/18.04.3/ubuntu-18.04.3-desktop-amd64.iso" + source_uri = "http://old-releases.ubuntu.com/releases/bionic/ubuntu-18.04-desktop-amd64.iso" content_type = "application/x-iso9660-image" } @@ -902,7 +902,7 @@ resource "azurerm_storage_blob" "test" { storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "Block" - source_uri = "http://releases.ubuntu.com/18.04.3/ubuntu-18.04.3-desktop-amd64.iso" + source_uri = "http://old-releases.ubuntu.com/releases/bionic/ubuntu-18.04-desktop-amd64.iso" content_type = "application/x-iso9660-image" } `, template) @@ -918,7 +918,7 @@ resource "azurerm_storage_blob" "source" { storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" type = "Block" - source_uri = "http://releases.ubuntu.com/18.04.3/ubuntu-18.04.3-desktop-amd64.iso" + source_uri = "http://old-releases.ubuntu.com/releases/bionic/ubuntu-18.04-desktop-amd64.iso" content_type = "application/x-iso9660-image" } diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_table_entity_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_table_entity_test.go index 2598bb8bcf363..8f31b96016a08 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_table_entity_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_table_entity_test.go @@ -37,7 +37,7 @@ func TestAccAzureRMTableEntity_requiresImport(t *testing.T) { t.Skip("Skipping since resources aren't required to be imported") return } - data := acceptance.BuildTestData(t, "azurerm_storage_table_entity", "import") + data := acceptance.BuildTestData(t, "azurerm_storage_table_entity", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, From 698f296d3da9b63f26021dcbf35714910292aacd Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 13 Feb 2020 13:07:34 +0100 Subject: [PATCH 090/498] r/storage_account_network_rules: switching to use the networkruleset from props --- .../storage/resource_arm_storage_account_network_rules.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/storage/resource_arm_storage_account_network_rules.go b/azurerm/internal/services/storage/resource_arm_storage_account_network_rules.go index a85b4e115b252..6e987f0f79b87 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account_network_rules.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account_network_rules.go @@ -115,11 +115,15 @@ func resourceArmStorageAccountNetworkRulesCreateUpdate(d *schema.ResourceData, m return fmt.Errorf("Storage Account %q (Resource Group %q) was not found", storageAccountName, resourceGroup) } - return fmt.Errorf("Error loading Storage Account %q (Resource Group %q): %+v", storageAccountName, resourceGroup, err) + return fmt.Errorf("Error retrieving Storage Account %q (Resource Group %q): %+v", storageAccountName, resourceGroup, err) } if features.ShouldResourcesBeImported() { - if checkForNonDefaultStorageAccountNetworkRule(storageAccount.NetworkRuleSet) { + if storageAccount.AccountProperties == nil { + return fmt.Errorf("Error retrieving Storage Account %q (Resource Group %q): `properties` was nil", storageAccountName, resourceGroup) + } + + if checkForNonDefaultStorageAccountNetworkRule(storageAccount.AccountProperties.NetworkRuleSet) { return tf.ImportAsExistsError("azurerm_storage_account_network_rule", *storageAccount.ID) } } From cfe947b1cab3c9c960db48372561524aedfcd411 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 13 Feb 2020 13:46:34 +0100 Subject: [PATCH 091/498] r/app_service_plan: fixing a bad rebase --- .../internal/services/web/resource_arm_app_service_plan.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/azurerm/internal/services/web/resource_arm_app_service_plan.go b/azurerm/internal/services/web/resource_arm_app_service_plan.go index cb867d4ad749d..70ced7d9b7328 100644 --- a/azurerm/internal/services/web/resource_arm_app_service_plan.go +++ b/azurerm/internal/services/web/resource_arm_app_service_plan.go @@ -306,10 +306,6 @@ func resourceArmAppServicePlanRead(d *schema.ResourceData, meta interface{}) err d.Set("kind", resp.Kind) if props := resp.AppServicePlanProperties; props != nil { - if err := d.Set("properties", flattenAppServiceProperties(props)); err != nil { - return fmt.Errorf("Error setting `properties`: %+v", err) - } - if profile := props.HostingEnvironmentProfile; profile != nil { d.Set("app_service_environment_id", profile.ID) } From ab640a81c460681caf66b7531c1ce06058366587 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 13 Feb 2020 18:58:08 +0100 Subject: [PATCH 092/498] r/postgresql_server: fixing broken tests --- .../resource_arm_postgresql_server_test.go | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go index 7a137ac85862f..e5011a79dc950 100644 --- a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go +++ b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go @@ -213,7 +213,7 @@ func TestAccAzureRMPostgreSQLServer_updated(t *testing.T) { Config: testAccAzureRMPostgreSQLServer_basicNinePointSix(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMPostgreSQLServerExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.name", "GP_Gen5_2"), + resource.TestCheckResourceAttr(data.ResourceName, "sku_name", "GP_Gen5_2"), resource.TestCheckResourceAttr(data.ResourceName, "version", "9.6"), resource.TestCheckResourceAttr(data.ResourceName, "storage_profile.0.storage_mb", "51200"), resource.TestCheckResourceAttr(data.ResourceName, "storage_profile.0.auto_grow", "Disabled"), @@ -246,10 +246,7 @@ func TestAccAzureRMPostgreSQLServer_updateSKU(t *testing.T) { Config: testAccAzureRMPostgreSQLServer_generalPurpose(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMPostgreSQLServerExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.name", "GP_Gen5_32"), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.capacity", "32"), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.tier", "GeneralPurpose"), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.family", "Gen5"), + resource.TestCheckResourceAttr(data.ResourceName, "sku_name", "GP_Gen5_32"), resource.TestCheckResourceAttr(data.ResourceName, "storage_profile.0.storage_mb", "640000"), resource.TestCheckResourceAttr(data.ResourceName, "administrator_login", "acctestun"), ), @@ -258,10 +255,7 @@ func TestAccAzureRMPostgreSQLServer_updateSKU(t *testing.T) { Config: testAccAzureRMPostgreSQLServer_memoryOptimized(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMPostgreSQLServerExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.name", "MO_Gen5_16"), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.capacity", "16"), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.tier", "MemoryOptimized"), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.family", "Gen5"), + resource.TestCheckResourceAttr(data.ResourceName, "sku_name", "MO_Gen5_16"), resource.TestCheckResourceAttr(data.ResourceName, "storage_profile.0.storage_mb", "4194304"), resource.TestCheckResourceAttr(data.ResourceName, "administrator_login", "acctestun"), ), @@ -582,13 +576,7 @@ resource "azurerm_postgresql_server" "test" { name = "acctest-psql-server-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "MO_Gen5_16" - capacity = 16 - tier = "MemoryOptimized" - family = "Gen5" - } + sku_name = "MO_Gen5_16" storage_profile { storage_mb = 4194304 From a703f356acc1c04c6aa31549aa4525db7c4c24de Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 13 Feb 2020 19:13:25 +0100 Subject: [PATCH 093/498] r/postgresql_server: missed a failing test condition --- .../postgres/tests/resource_arm_postgresql_server_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go index e5011a79dc950..b6a6ad04b8ea9 100644 --- a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go +++ b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go @@ -224,7 +224,7 @@ func TestAccAzureRMPostgreSQLServer_updated(t *testing.T) { Config: testAccAzureRMPostgreSQLServer_basicNinePointSixUpdated(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMPostgreSQLServerExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.name", "GP_Gen5_4"), + resource.TestCheckResourceAttr(data.ResourceName, "sku_name", "GP_Gen5_4"), resource.TestCheckResourceAttr(data.ResourceName, "version", "9.6"), resource.TestCheckResourceAttr(data.ResourceName, "storage_profile.0.storage_mb", "640000"), resource.TestCheckResourceAttr(data.ResourceName, "storage_profile.0.auto_grow", "Enabled"), From 1d4684a36f4e26ec7919418e37b5fe6b0ef5b659 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Thu, 13 Feb 2020 14:56:28 -0800 Subject: [PATCH 094/498] Rename resource --- azurerm/helpers/azure/key_vault.go | 10 + azurerm/internal/acceptance/data.go | 13 +- .../internal/services/storage/registration.go | 24 +- ...rm_storage_account_customer_managed_key.go | 249 +++++++++++++ ...arm_storage_account_encryption_settings.go | 325 ----------------- ...orage_account_customer_managed_key_test.go | 221 ++++++++++++ ...torage_account_encryption_settings_test.go | 341 ------------------ ...ccount_customer_managed_key.html.markdown} | 53 +-- 8 files changed, 524 insertions(+), 712 deletions(-) create mode 100644 azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go delete mode 100644 azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go create mode 100644 azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go delete mode 100644 azurerm/internal/services/storage/tests/resource_arm_storage_account_encryption_settings_test.go rename website/docs/r/{storage_account_encryption_settings.html.markdown => storage_account_customer_managed_key.html.markdown} (58%) diff --git a/azurerm/helpers/azure/key_vault.go b/azurerm/helpers/azure/key_vault.go index b070b87a71600..e5e68e8ec8ef8 100644 --- a/azurerm/helpers/azure/key_vault.go +++ b/azurerm/helpers/azure/key_vault.go @@ -7,6 +7,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2018-02-14/keyvault" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -192,3 +193,12 @@ func KeyVaultIsSoftDeleteAndPurgeProtected(ctx context.Context, client *keyvault return false } + +func KeyVaultGetResourceNameResource(resourceId string, namePathKey string) (resourceName interface{}, resourceGroup interface{}, err error) { + id, err := azure.ParseAzureResourceID(resourceId) + if err != nil { + return nil, nil, err + } + + return id.Path[namePathKey], id.ResourceGroup, nil +} diff --git a/azurerm/internal/acceptance/data.go b/azurerm/internal/acceptance/data.go index 3e79ea88bee17..2a7ad06e102e7 100644 --- a/azurerm/internal/acceptance/data.go +++ b/azurerm/internal/acceptance/data.go @@ -24,7 +24,7 @@ type TestData struct { // Locations is a set of Azure Regions which should be used for this Test Locations Regions - // RandomString is a random integer which is unique to this test case + // RandomInteger is a random integer which is unique to this test case RandomInteger int // RandomString is a random 5 character string is unique to this test case @@ -90,6 +90,7 @@ func BuildTestData(t *testing.T, resourceType string, resourceLabel string) Test return testData } +// RandomIntOfLength is a random 8 to 18 digit integer which is unique to this test case func (td *TestData) RandomIntOfLength(len int) int { // len should not be // - greater then 18, longest a int can represent @@ -116,3 +117,13 @@ func (td *TestData) RandomIntOfLength(len int) int { return i } + +// RandomStringOfLength is a random 1 to 1024 character string which is unique to this test case +func (td *TestData) RandomStringOfLength(len int) string { + // len should not be less then 1 or greater than 1024 + if 1 > len || len > 1024 { + panic(fmt.Sprintf("Invalid Test: RandomStringOfLength: length argument must be between 1 and 1024 characters")) + } + + return acctest.RandString(len) +} diff --git a/azurerm/internal/services/storage/registration.go b/azurerm/internal/services/storage/registration.go index bc6bb490477ab..608eebed13136 100644 --- a/azurerm/internal/services/storage/registration.go +++ b/azurerm/internal/services/storage/registration.go @@ -25,17 +25,17 @@ 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_storage_account": resourceArmStorageAccount(), - "azurerm_storage_account_encryption_settings": resourceArmStorageAccountEncryptionSettings(), - "azurerm_storage_account_network_rules": resourceArmStorageAccountNetworkRules(), - "azurerm_storage_blob": resourceArmStorageBlob(), - "azurerm_storage_container": resourceArmStorageContainer(), - "azurerm_storage_data_lake_gen2_filesystem": resourceArmStorageDataLakeGen2FileSystem(), - "azurerm_storage_management_policy": resourceArmStorageManagementPolicy(), - "azurerm_storage_queue": resourceArmStorageQueue(), - "azurerm_storage_share": resourceArmStorageShare(), - "azurerm_storage_share_directory": resourceArmStorageShareDirectory(), - "azurerm_storage_table": resourceArmStorageTable(), - "azurerm_storage_table_entity": resourceArmStorageTableEntity(), + "azurerm_storage_account": resourceArmStorageAccount(), + "azurerm_storage_account_customer_managed_key": resourceArmStorageAccountCustomerManagedKey(), + "azurerm_storage_account_network_rules": resourceArmStorageAccountNetworkRules(), + "azurerm_storage_blob": resourceArmStorageBlob(), + "azurerm_storage_container": resourceArmStorageContainer(), + "azurerm_storage_data_lake_gen2_filesystem": resourceArmStorageDataLakeGen2FileSystem(), + "azurerm_storage_management_policy": resourceArmStorageManagementPolicy(), + "azurerm_storage_queue": resourceArmStorageQueue(), + "azurerm_storage_share": resourceArmStorageShare(), + "azurerm_storage_share_directory": resourceArmStorageShareDirectory(), + "azurerm_storage_table": resourceArmStorageTable(), + "azurerm_storage_table_entity": resourceArmStorageTableEntity(), } } diff --git a/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go b/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go new file mode 100644 index 0000000000000..280717be845a5 --- /dev/null +++ b/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go @@ -0,0 +1,249 @@ +package storage + +import ( + "fmt" + "time" + + "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-04-01/storage" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmStorageAccountCustomerManagedKey() *schema.Resource { + return &schema.Resource{ + Read: resourceArmStorageAccountCustomerManagedKeyRead, + Create: resourceArmStorageAccountCustomerManagedKeyCreateUpdate, + Update: resourceArmStorageAccountCustomerManagedKeyCreateUpdate, + Delete: resourceArmStorageAccountCustomerManagedKeyDelete, + SchemaVersion: 2, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(30 * time.Minute), + Read: schema.DefaultTimeout(5 * time.Minute), + Update: schema.DefaultTimeout(30 * time.Minute), + Delete: schema.DefaultTimeout(30 * time.Minute), + }, + + Schema: map[string]*schema.Schema{ + "storage_account_id": { + Type: schema.TypeString, + Required: true, + ValidateFunc: azure.ValidateResourceID, + }, + + "key_vault_id": { + Type: schema.TypeString, + Required: true, + ValidateFunc: azure.ValidateResourceID, + }, + + "key_vault_access_policy_id": { + Type: schema.TypeString, + Required: true, + ValidateFunc: azure.ValidateResourceID, + }, + + "key_name": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validate.NoEmptyStrings, + }, + "key_version": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validate.NoEmptyStrings, + }, + "key_vault_uri": { + Type: schema.TypeString, + Computed: true, + }, + }, + } +} + +func resourceArmStorageAccountCustomerManagedKeyCreateUpdate(d *schema.ResourceData, meta interface{}) error { + vaultClient := meta.(*clients.Client).KeyVault.VaultsClient + storageClient := meta.(*clients.Client).Storage.AccountsClient + ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) + defer cancel() + + keyVaultId := d.Get("key_vault_id").(string) + keyName := d.Get("key_name").(string) + keyVersion := d.Get("key_version").(string) + storageAccountId := d.Get("storage_account_id").(string) + encryptionServices := true + + storageAccountName, storageAccountResourceGroupName, err := azure.KeyVaultGetResourceNameResource(storageAccountId, "storageAccounts") + if err != nil { + return err + } + + keyVaultAccountName, keyVaultResourceGroupName, err := azure.KeyVaultGetResourceNameResource(keyVaultId, "vaults") + if err != nil { + return err + } + + // First check to see if the key vault is configured correctly or not + if !azure.KeyVaultIsSoftDeleteAndPurgeProtected(ctx, vaultClient, keyVaultId) { + return fmt.Errorf("Key Vault %q (Resource Group %q) is not configured correctly, please make sure that both 'soft_delete_enabled' and 'purge_protection_enabled' arguments are set to 'true'", keyVaultAccountName, keyVaultResourceGroupName) + } + + pKeyVaultBaseURL, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) + if err != nil { + return fmt.Errorf("Error looking up Key Vault URI from Key Vault %q (Resource Group %q): %+v", keyVaultAccountName, keyVaultResourceGroupName, err) + } + + props := storage.AccountUpdateParameters{ + AccountPropertiesUpdateParameters: &storage.AccountPropertiesUpdateParameters{ + Encryption: &storage.Encryption{ + Services: &storage.EncryptionServices{ + Blob: &storage.EncryptionService{ + Enabled: utils.Bool(encryptionServices), + }, + File: &storage.EncryptionService{ + Enabled: utils.Bool(encryptionServices), + }, + }, + KeySource: storage.MicrosoftKeyvault, + KeyVaultProperties: &storage.KeyVaultProperties{ + KeyName: utils.String(keyName), + KeyVersion: utils.String(keyVersion), + KeyVaultURI: utils.String(pKeyVaultBaseURL), + }, + }, + }, + } + + _, err = storageClient.Update(ctx, storageAccountResourceGroupName.(string), storageAccountName.(string), props) + if err != nil { + return fmt.Errorf("Error updating Azure Storage Account %q (Resource Group %q) Customer Managed Key : %+v", storageAccountName, storageAccountResourceGroupName, err) + } + + resourceId := fmt.Sprintf("%s/customerManagedKey", storageAccountId) + d.SetId(resourceId) + + return resourceArmStorageAccountCustomerManagedKeyRead(d, meta) +} + +func resourceArmStorageAccountCustomerManagedKeyRead(d *schema.ResourceData, meta interface{}) error { + storageClient := meta.(*clients.Client).Storage.AccountsClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + storageAccountId := d.Get("storage_account_id").(string) + keyVaultId := d.Get("key_vault_id").(string) + keyVaultPolicy := d.Get("key_vault_access_policy_id").(string) + + d.Set("storage_account_id", storageAccountId) + d.Set("key_vault_id", keyVaultId) + d.Set("key_vault_access_policy_id", keyVaultPolicy) + + name, resGroup, err := azure.KeyVaultGetResourceNameResource(storageAccountId, "storageAccounts") + if err != nil { + return err + } + + resp, err := storageClient.GetProperties(ctx, resGroup.(string), name.(string), "") + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + d.SetId("") + return nil + } + return fmt.Errorf("Error reading the state of AzureRM Storage Account %q (Resource Group %q): %+v", name, resGroup, err) + } + + if props := resp.AccountProperties; props != nil { + if encryption := props.Encryption; encryption != nil { + if keyVaultProperties := encryption.KeyVaultProperties; keyVaultProperties != nil { + d.Set("key_name", *keyVaultProperties.KeyName) + d.Set("key_version", *keyVaultProperties.KeyVersion) + d.Set("key_vault_uri", *keyVaultProperties.KeyVaultURI) + } + } + } + + return nil +} + +func resourceArmStorageAccountCustomerManagedKeyDelete(d *schema.ResourceData, meta interface{}) error { + storageClient := meta.(*clients.Client).Storage.AccountsClient + ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) + defer cancel() + + storageAccountId := d.Get("storage_account_id").(string) + + storageAccountName, resourceGroupName, err := azure.KeyVaultGetResourceNameResource(storageAccountId, "storageAccounts") + if err != nil { + return err + } + + // Since this isn't a real object, just modifying an existing object + // "Delete" doesn't really make sense it should really be a "Revert to Default" + // So instead of the Delete func actually deleting the Storage Account I am + // making it reset the Storage Account to it's default state + opts := storage.AccountUpdateParameters{ + AccountPropertiesUpdateParameters: &storage.AccountPropertiesUpdateParameters{ + Encryption: &storage.Encryption{ + KeySource: storage.MicrosoftStorage, + }, + }, + } + + _, err = storageClient.Update(ctx, resourceGroupName.(string), storageAccountName.(string), opts) + if err != nil { + return fmt.Errorf("Error deleting AzureRM Storage Account %q (Resource Group %q) %q: %+v", storageAccountName.(string), resourceGroupName.(string), err) + } + + return nil +} + +func resourceArmStorageAccountCustomerManagedKeyImportState(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + storageClient := meta.(*clients.Client).Storage.AccountsClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + id := d.Id() + + d.Set("storage_account_id", id) + d.Set("key_vault_id", "") + d.Set("key_vault_access_policy_id", "") + + name, resGroup, err := azure.KeyVaultGetResourceNameResource(id, "storageAccounts") + if err != nil { + return nil, err + } + + resp, err := storageClient.GetProperties(ctx, resGroup.(string), name.(string), "") + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + d.SetId("") + return nil, nil + } + return nil, fmt.Errorf("Error importing the state of AzureRM Storage Account %q (Resource Group %q): %+v", name.(string), resGroup.(string), err) + } + + if props := resp.AccountProperties; props != nil { + if encryption := props.Encryption; encryption != nil { + if keyVaultProperties := encryption.KeyVaultProperties; keyVaultProperties != nil { + d.Set("key_name", keyVaultProperties.KeyName) + d.Set("key_version", keyVaultProperties.KeyVersion) + d.Set("key_vault_uri", keyVaultProperties.KeyVaultURI) + } + } + } + + resourceId := fmt.Sprintf("%s/customerManagedKey", id) + d.SetId(resourceId) + + results := make([]*schema.ResourceData, 1) + + results[0] = d + return results, nil +} diff --git a/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go b/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go deleted file mode 100644 index e03e8a77d9c3d..0000000000000 --- a/azurerm/internal/services/storage/resource_arm_storage_account_encryption_settings.go +++ /dev/null @@ -1,325 +0,0 @@ -package storage - -import ( - "fmt" - "time" - - "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-04-01/storage" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmStorageAccountEncryptionSettings() *schema.Resource { - return &schema.Resource{ - Read: resourceArmStorageAccountEncryptionSettingsRead, - Create: resourceArmStorageAccountEncryptionSettingsCreateUpdate, - Update: resourceArmStorageAccountEncryptionSettingsCreateUpdate, - Delete: resourceArmStorageAccountEncryptionSettingsDelete, - SchemaVersion: 2, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - "storage_account_id": { - Type: schema.TypeString, - Required: true, - ValidateFunc: azure.ValidateResourceID, - }, - - "key_vault": { - Type: schema.TypeList, - MaxItems: 1, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - // This attribute is not used, it was only added - // to create a dependency between this resource - // and the key vault policy - "key_vault_policy_id": { - Type: schema.TypeString, - Required: true, - ValidateFunc: azure.ValidateResourceID, - }, - - "key_vault_id": { - Type: schema.TypeString, - Required: true, - ValidateFunc: azure.ValidateResourceID, - }, - - "key_name": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validate.NoEmptyStrings, - }, - "key_version": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validate.NoEmptyStrings, - }, - "key_vault_uri": { - Type: schema.TypeString, - Computed: true, - }, - }, - }, - }, - }, - } -} - -func resourceArmStorageAccountEncryptionSettingsCreateUpdate(d *schema.ResourceData, meta interface{}) error { - vaultClient := meta.(*clients.Client).KeyVault.VaultsClient - storageClient := meta.(*clients.Client).Storage.AccountsClient - ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) - defer cancel() - - storageAccountId := d.Get("storage_account_id").(string) - - id, err := azure.ParseAzureResourceID(storageAccountId) - if err != nil { - return err - } - - storageAccountName := id.Path["storageAccounts"] - resourceGroupName := id.ResourceGroup - - // create the update object with the default values - alwaysEnabled := true - opts := storage.AccountUpdateParameters{ - AccountPropertiesUpdateParameters: &storage.AccountPropertiesUpdateParameters{ - Encryption: &storage.Encryption{ - Services: &storage.EncryptionServices{ - Blob: &storage.EncryptionService{ - Enabled: utils.Bool(alwaysEnabled), - }, - File: &storage.EncryptionService{ - Enabled: utils.Bool(alwaysEnabled), - }}, - KeySource: storage.MicrosoftStorage, - KeyVaultProperties: &storage.KeyVaultProperties{}, - }, - }, - } - - if keyVaultProperties := expandAzureRmStorageAccountKeyVaultProperties(d); keyVaultProperties.KeyName != utils.String("") { - if v, ok := d.GetOk("key_vault.0.key_vault_id"); ok { - // Get the key vault base URL from the key vault - keyVaultId := v.(string) - - kvId, err := azure.ParseAzureResourceID(keyVaultId) - if err != nil { - return err - } - - keyVaultAccountName := kvId.Path["vaults"] - keyVaultResourceGroupName := kvId.ResourceGroup - - pKeyVaultBaseURL, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) - - if err != nil { - return fmt.Errorf("Error looking up Key Vault URI from id %q: %+v", keyVaultId, err) - } - - if !azure.KeyVaultIsSoftDeleteAndPurgeProtected(ctx, vaultClient, keyVaultId) { - return fmt.Errorf("Key Vault %q (Resource Group %q) is not configured correctly, please make sure that both 'soft_delete_enabled' and 'purge_protection_enabled' arguments are set to 'true'", keyVaultAccountName, keyVaultResourceGroupName) - } - - keyVaultProperties.KeyVaultURI = utils.String(pKeyVaultBaseURL) - opts.Encryption.KeyVaultProperties = keyVaultProperties - opts.Encryption.KeySource = storage.MicrosoftKeyvault - } - } - - _, err = storageClient.Update(ctx, resourceGroupName, storageAccountName, opts) - if err != nil { - return fmt.Errorf("Error updating Azure Storage Account Encryption %q: %+v", storageAccountName, err) - } - - resourceId := fmt.Sprintf("%s/encryptionSettings", storageAccountId) - d.SetId(resourceId) - - return resourceArmStorageAccountEncryptionSettingsRead(d, meta) -} - -func resourceArmStorageAccountEncryptionSettingsRead(d *schema.ResourceData, meta interface{}) error { - storageClient := meta.(*clients.Client).Storage.AccountsClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - storageAccountId := d.Get("storage_account_id").(string) - - id, err := azure.ParseAzureResourceID(storageAccountId) - if err != nil { - return err - } - name := id.Path["storageAccounts"] - resGroup := id.ResourceGroup - - resp, err := storageClient.GetProperties(ctx, resGroup, name, "") - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil - } - return fmt.Errorf("Error reading the state of AzureRM Storage Account %q: %+v", name, err) - } - - if props := resp.AccountProperties; props != nil { - if encryption := props.Encryption; encryption != nil { - if services := encryption.Services; services != nil { - if blob := services.Blob; blob != nil { - d.Set("enable_blob_encryption", blob.Enabled) - } - if file := services.File; file != nil { - d.Set("enable_file_encryption", file.Enabled) - } - } - - if keyVaultProperties := encryption.KeyVaultProperties; keyVaultProperties != nil { - keyVaultId := d.Get("key_vault.0.key_vault_id").(string) - keyVaultPolicyId := d.Get("key_vault.0.key_vault_policy_id").(string) - - if err := d.Set("key_vault", flattenAzureRmStorageAccountKeyVaultProperties(keyVaultProperties, keyVaultId, keyVaultPolicyId)); err != nil { - return fmt.Errorf("Error flattening `key_vault_properties`: %+v", err) - } - } - } - } - - return nil -} - -func resourceArmStorageAccountEncryptionSettingsDelete(d *schema.ResourceData, meta interface{}) error { - storageClient := meta.(*clients.Client).Storage.AccountsClient - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - storageAccountId := d.Get("storage_account_id").(string) - - id, err := azure.ParseAzureResourceID(storageAccountId) - if err != nil { - return err - } - - storageAccountName := id.Path["storageAccounts"] - resourceGroupName := id.ResourceGroup - - // Since this isn't a real object, just modifying an existing object - // "Delete" doesn't really make sense it should really be a "Revert to Default" - // So instead of the Delete func actually deleting the Storage Account I am - // making it reset the Storage Account to it's default state - opts := storage.AccountUpdateParameters{ - AccountPropertiesUpdateParameters: &storage.AccountPropertiesUpdateParameters{ - Encryption: &storage.Encryption{ - KeySource: storage.MicrosoftStorage, - }, - }, - } - - _, err = storageClient.Update(ctx, resourceGroupName, storageAccountName, opts) - if err != nil { - return fmt.Errorf("Error deleting Azure Storage Account Encryption %q: %+v", storageAccountName, err) - } - - return nil -} - -func resourceArmStorageAccountEncryptionSettingsImportState(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { - storageClient := meta.(*clients.Client).Storage.AccountsClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - id := d.Id() - - d.Set("storage_account_id", id) - - saId, err := azure.ParseAzureResourceID(id) - if err != nil { - return nil, err - } - name := saId.Path["storageAccounts"] - resGroup := saId.ResourceGroup - - resp, err := storageClient.GetProperties(ctx, resGroup, name, "") - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil, nil - } - return nil, fmt.Errorf("Error importing the state of AzureRM Storage Account %q: %+v", name, err) - } - - if props := resp.AccountProperties; props != nil { - if encryption := props.Encryption; encryption != nil { - if keyVaultProperties := encryption.KeyVaultProperties; keyVaultProperties != nil { - if err := d.Set("key_vault", flattenAzureRmStorageAccountKeyVaultProperties(keyVaultProperties, "", "")); err != nil { - return nil, fmt.Errorf("Error flattening `key_vault_properties` on import: %+v", err) - } - } - } - } - - resourceId := fmt.Sprintf("%s/encryptionSettings", id) - d.SetId(resourceId) - - results := make([]*schema.ResourceData, 1) - - results[0] = d - return results, nil -} - -func expandAzureRmStorageAccountKeyVaultProperties(d *schema.ResourceData) *storage.KeyVaultProperties { - vs := d.Get("key_vault").([]interface{}) - if len(vs) == 0 { - return &storage.KeyVaultProperties{} - } - - v := vs[0].(map[string]interface{}) - keyName := v["key_name"].(string) - keyVersion := v["key_version"].(string) - - return &storage.KeyVaultProperties{ - KeyName: utils.String(keyName), - KeyVersion: utils.String(keyVersion), - } -} - -func flattenAzureRmStorageAccountKeyVaultProperties(keyVaultProperties *storage.KeyVaultProperties, keyVaultId string, keyVaultPolicyId string) []interface{} { - if keyVaultProperties == nil { - return make([]interface{}, 0) - } - - result := make(map[string]interface{}) - if keyVaultId != "" { - result["key_vault_id"] = keyVaultId - } - - if keyVaultPolicyId != "" { - result["key_vault_policy_id"] = keyVaultPolicyId - } - - if keyVaultProperties.KeyName != nil { - result["key_name"] = *keyVaultProperties.KeyName - } - if keyVaultProperties.KeyVersion != nil { - result["key_version"] = *keyVaultProperties.KeyVersion - } - if keyVaultProperties.KeyVaultURI != nil { - result["key_vault_uri"] = *keyVaultProperties.KeyVaultURI - } - - return []interface{}{result} -} diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go new file mode 100644 index 0000000000000..5a735cf7ba5c6 --- /dev/null +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go @@ -0,0 +1,221 @@ +package tests + +import ( + "fmt" + "net/http" + "testing" + + "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-04-01/storage" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +func TestAccAzureRMStorageAccountCustomerManagedKey_basic(t *testing.T) { + parentResourceName := "azurerm_storage_account.testsa" + data := acceptance.BuildTestData(t, "azurerm_storage_account_customer_managed_key", "custom") + preConfig := testAccAzureRMStorageAccountCustomerManagedKey_basic(data) + postConfig := testAccAzureRMStorageAccountCustomerManagedKey_basicDelete(data) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMStorageAccountDestroyed, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMStorageAccountCustomerManagedKeyExists(data.ResourceName), + ), + }, + { + // Delete the encryption settings resource and verify it is gone + // Whilst making sure the encryption settings on the storage account + // have been reverted to their default state + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMStorageAccountExistsWithDefaultSettings(parentResourceName), + testCheckAzureRMStorageAccountCustomerManagedKeyDestroyed(data.ResourceName), + ), + }, + }, + }) +} + +func TestAccAzureRMStorageAccountCustomerManagedKey_disappears(t *testing.T) { + parentResourceName := "azurerm_storage_account.testsa" + data := acceptance.BuildTestData(t, "azurerm_storage_account_customer_managed_key", "custom") + preConfig := testAccAzureRMStorageAccountCustomerManagedKey_basic(data) + postConfig := testAccAzureRMStorageAccountCustomerManagedKey_basicDelete(data) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMStorageAccountDestroyed, + Steps: []resource.TestStep{ + { + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMStorageAccountCustomerManagedKeyExists(data.ResourceName), + ), + }, + { + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMStorageAccountExistsWithDefaultSettings(parentResourceName), + testCheckAzureRMStorageAccountCustomerManagedKeyDestroyed(data.ResourceName), + ), + }, + }, + }) +} + +func testCheckAzureRMStorageAccountExistsWithDefaultSettings(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + // Ensure we have enough information in state to look up in API + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("Not found: %s", resourceName) + } + + storageAccount := rs.Primary.Attributes["name"] + resourceGroup := rs.Primary.Attributes["resource_group_name"] + + // Ensure resource group exists in API + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + conn := acceptance.AzureProvider.Meta().(*clients.Client).Storage.AccountsClient + + resp, err := conn.GetProperties(ctx, resourceGroup, storageAccount, "") + if err != nil { + return fmt.Errorf("Bad: Get on storageServiceClient: %+v", err) + } + + if resp.StatusCode == http.StatusNotFound { + return fmt.Errorf("Bad: StorageAccount %q (resource group: %q) does not exist", storageAccount, resourceGroup) + } + + if props := resp.AccountProperties; props != nil { + if encryption := props.Encryption; encryption != nil { + if services := encryption.Services; services != nil { + if !*services.Blob.Enabled { + return fmt.Errorf("enable_blob_encryption not set to default: %s", resourceName) + } + if !*services.File.Enabled { + return fmt.Errorf("enable_file_encryption not set to default: %s", resourceName) + } + } + + if encryption.KeySource != storage.MicrosoftStorage { + return fmt.Errorf("%s keySource not set to default(storage.MicrosoftStorage): %s", resourceName, encryption.KeySource) + } + } else { + return fmt.Errorf("storage account encryption properties not found: %s", resourceName) + } + } + + return nil + } +} + +func testCheckAzureRMStorageAccountCustomerManagedKeyExists(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + // Ensure we have enough information in state to look up in API + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("Not found: %s", resourceName) + } + + if storageAccountId := rs.Primary.Attributes["storage_account_id"]; storageAccountId == "" { + return fmt.Errorf("Unable to read storageAccountId: %s", resourceName) + } + + return nil + } +} + +func testCheckAzureRMStorageAccountDestroyed(s *terraform.State) error { + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + conn := acceptance.AzureProvider.Meta().(*clients.Client).Storage.AccountsClient + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_storage_account" { + continue + } + + name := rs.Primary.Attributes["name"] + resourceGroup := rs.Primary.Attributes["resource_group_name"] + + resp, err := conn.GetProperties(ctx, resourceGroup, name, "") + if err != nil { + return nil + } + + if resp.StatusCode != http.StatusNotFound { + return fmt.Errorf("Storage Account still exists:\n%#v", resp.AccountProperties) + } + } + + return nil +} + +func testCheckAzureRMStorageAccountCustomerManagedKeyDestroyed(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + _, ok := s.RootModule().Resources[resourceName] + if !ok { + return nil + } + + return fmt.Errorf("Found: %s", resourceName) + } +} + +func testAccAzureRMStorageAccountCustomerManagedKey_basic(data acceptance.TestData) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "testrg" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_storage_account" "testsa" { + name = "unlikely23exst2acct%s" + resource_group_name = "${azurerm_resource_group.testrg.name}" + + location = "${azurerm_resource_group.testrg.location}" + account_tier = "Standard" + account_replication_type = "LRS" + + tags = { + environment = "production" + } +} + +resource "azurerm_storage_account_customer_managed_key" "custom" { + storage_account_id = "${azurerm_storage_account.testsa.id}" +} +`, data.RandomInteger, data.Locations.Primary, data.RandomStringOfLength(4)) +} + +func testAccAzureRMStorageAccountCustomerManagedKey_basicDelete(data acceptance.TestData) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "testrg" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_storage_account" "testsa" { + name = "unlikely23exst2acct%s" + resource_group_name = "${azurerm_resource_group.testrg.name}" + + location = "${azurerm_resource_group.testrg.location}" + account_tier = "Standard" + account_replication_type = "LRS" + + tags = { + environment = "production" + } +} +`, data.RandomInteger, data.Locations.Primary, data.RandomStringOfLength(4)) +} diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_encryption_settings_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_encryption_settings_test.go deleted file mode 100644 index cc994667f9407..0000000000000 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_account_encryption_settings_test.go +++ /dev/null @@ -1,341 +0,0 @@ -package azurerm - -import ( - "fmt" - "net/http" - "os" - "testing" - - "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-04-01/storage" - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" - "github.com/hashicorp/terraform/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" -) - -func TestAccAzureRMStorageAccountEncryptionSettings_basic(t *testing.T) { - parentResourceName := "azurerm_storage_account.testsa" - resourceName := "azurerm_storage_account_encryption_settings.custom" - ri := tf.AccRandTimeInt() - rs := acctest.RandString(4) - location := testLocation() - preConfig := testAccAzureRMStorageAccountEncryptionSettings_basic(ri, rs, location) - postConfig := testAccAzureRMStorageAccountEncryptionSettings_basicDelete(ri, rs, location) - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMStorageAccountDestroyed, - Steps: []resource.TestStep{ - { - Config: preConfig, - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMStorageAccountEncryptionSettingsExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "enable_blob_encryption", "true"), - resource.TestCheckResourceAttr(resourceName, "enable_file_encryption", "true"), - ), - }, - { - // Delete the encryption settings resource and verify it is gone - // Whilst making sure the encryption settings on the storage account - // have been reverted to their default state - Config: postConfig, - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMStorageAccountExistsWithDefaultSettings(parentResourceName), - testCheckAzureRMStorageAccountEncryptionSettingsDestroyed(resourceName), - ), - }, - }, - }) -} - -func TestAccAzureRMStorageAccountEncryptionSettings_blobEncryptionDisable(t *testing.T) { - _, exists := os.LookupEnv("TF_ACC_STORAGE_ENCRYPTION_DISABLE") - if !exists { - t.Skip("`TF_ACC_STORAGE_ENCRYPTION_DISABLE` isn't specified - skipping since disabling encryption is generally disabled") - } - - resourceName := "azurerm_storage_account_encryption_settings.custom" - ri := tf.AccRandTimeInt() - rs := acctest.RandString(4) - location := testLocation() - config := testAccAzureRMStorageAccountEncryptionSettings_blobEncryptionDisabled(ri, rs, location) - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMStorageAccountDestroyed, - Steps: []resource.TestStep{ - { - Config: config, - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMStorageAccountEncryptionSettingsExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "enable_blob_encryption", "false"), - ), - }, - }, - }) -} - -func TestAccAzureRMStorageAccountEncryptionSettings_fileEncryptionDisable(t *testing.T) { - _, exists := os.LookupEnv("TF_ACC_STORAGE_ENCRYPTION_DISABLE") - if !exists { - t.Skip("`TF_ACC_STORAGE_ENCRYPTION_DISABLE` isn't specified - skipping since disabling encryption is generally disabled") - } - - resourceName := "azurerm_storage_account_encryption_settings.custom" - ri := tf.AccRandTimeInt() - rs := acctest.RandString(4) - location := testLocation() - config := testAccAzureRMStorageAccountEncryptionSettings_fileEncryptionDisabled(ri, rs, location) - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMStorageAccountDestroyed, - Steps: []resource.TestStep{ - { - Config: config, - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMStorageAccountEncryptionSettingsExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "enable_file_encryption", "false"), - ), - }, - }, - }) -} - -func TestAccAzureRMStorageAccountEncryptionSettings_disappears(t *testing.T) { - parentResourceName := "azurerm_storage_account.testsa" - resourceName := "azurerm_storage_account_encryption_settings.custom" - ri := tf.AccRandTimeInt() - rs := acctest.RandString(4) - preConfig := testAccAzureRMStorageAccountEncryptionSettings_basic(ri, rs, testLocation()) - postConfig := testAccAzureRMStorageAccountEncryptionSettings_basicDelete(ri, rs, testLocation()) - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMStorageAccountDestroyed, - Steps: []resource.TestStep{ - { - Config: preConfig, - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMStorageAccountEncryptionSettingsExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "enable_blob_encryption", "true"), - resource.TestCheckResourceAttr(resourceName, "enable_file_encryption", "true"), - ), - }, - { - Config: postConfig, - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMStorageAccountExistsWithDefaultSettings(parentResourceName), - testCheckAzureRMStorageAccountEncryptionSettingsDestroyed(resourceName), - ), - }, - }, - }) -} - -func testCheckAzureRMStorageAccountExistsWithDefaultSettings(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - // Ensure we have enough information in state to look up in API - rs, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %s", resourceName) - } - - storageAccount := rs.Primary.Attributes["name"] - resourceGroup := rs.Primary.Attributes["resource_group_name"] - - // Ensure resource group exists in API - ctx := testAccProvider.Meta().(*ArmClient).StopContext - conn := testAccProvider.Meta().(*ArmClient).storageServiceClient - - resp, err := conn.GetProperties(ctx, resourceGroup, storageAccount) - if err != nil { - return fmt.Errorf("Bad: Get on storageServiceClient: %+v", err) - } - - if resp.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: StorageAccount %q (resource group: %q) does not exist", storageAccount, resourceGroup) - } - - if props := resp.AccountProperties; props != nil { - if encryption := props.Encryption; encryption != nil { - if services := encryption.Services; services != nil { - if !*services.Blob.Enabled { - return fmt.Errorf("enable_blob_encryption not set to default: %s", resourceName) - } - if !*services.File.Enabled { - return fmt.Errorf("enable_file_encryption not set to default: %s", resourceName) - } - } - - if encryption.KeySource != storage.MicrosoftStorage { - return fmt.Errorf("%s keySource not set to default(storage.MicrosoftStorage): %s", resourceName, encryption.KeySource) - } - } else { - return fmt.Errorf("storage account encryption properties not found: %s", resourceName) - } - } - - return nil - } -} - -func testCheckAzureRMStorageAccountEncryptionSettingsExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - // Ensure we have enough information in state to look up in API - rs, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %s", resourceName) - } - - if storageAccountId := rs.Primary.Attributes["storage_account_id"]; storageAccountId == "" { - return fmt.Errorf("Unable to read storageAccountId: %s", resourceName) - } - - return nil - } -} - -func testCheckAzureRMStorageAccountDestroyed(s *terraform.State) error { - ctx := testAccProvider.Meta().(*ArmClient).StopContext - conn := testAccProvider.Meta().(*ArmClient).storageServiceClient - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_storage_account" { - continue - } - - name := rs.Primary.Attributes["name"] - resourceGroup := rs.Primary.Attributes["resource_group_name"] - - resp, err := conn.GetProperties(ctx, resourceGroup, name) - if err != nil { - return nil - } - - if resp.StatusCode != http.StatusNotFound { - return fmt.Errorf("Storage Account still exists:\n%#v", resp.AccountProperties) - } - } - - return nil -} - -func testCheckAzureRMStorageAccountEncryptionSettingsDestroyed(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - _, ok := s.RootModule().Resources[resourceName] - if !ok { - return nil - } - - return fmt.Errorf("Found: %s", resourceName) - } -} - -func testAccAzureRMStorageAccountEncryptionSettings_basic(rInt int, rString string, location string) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_storage_account" "testsa" { - name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" - - location = "${azurerm_resource_group.testrg.location}" - account_tier = "Standard" - account_replication_type = "LRS" - - tags { - environment = "production" - } -} - -resource "azurerm_storage_account_encryption_settings" "custom" { - storage_account_id = "${azurerm_storage_account.testsa.id}" - enable_blob_encryption = true - enable_file_encryption = true -} -`, rInt, location, rString) -} - -func testAccAzureRMStorageAccountEncryptionSettings_basicDelete(rInt int, rString string, location string) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_storage_account" "testsa" { - name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" - - location = "${azurerm_resource_group.testrg.location}" - account_tier = "Standard" - account_replication_type = "LRS" - - tags { - environment = "production" - } -} -`, rInt, location, rString) -} - -func testAccAzureRMStorageAccountEncryptionSettings_fileEncryptionDisabled(rInt int, rString string, location string) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_storage_account" "testsa" { - name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" - - location = "${azurerm_resource_group.testrg.location}" - account_tier = "Standard" - account_replication_type = "LRS" - - tags { - environment = "production" - } -} - -resource "azurerm_storage_account_encryption_settings" "custom" { - storage_account_id = "${azurerm_storage_account.testsa.id} - enable_file_encryption = false" -} -`, rInt, location, rString) -} - -func testAccAzureRMStorageAccountEncryptionSettings_blobEncryptionDisabled(rInt int, rString string, location string) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_storage_account" "testsa" { - name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" - - location = "${azurerm_resource_group.testrg.location}" - account_tier = "Standard" - account_replication_type = "LRS" - - tags { - environment = "production" - } -} - -resource "azurerm_storage_account_encryption_settings" "custom" { - storage_account_id = "${azurerm_storage_account.testsa.id} - enable_blob_encryption = false" -} -`, rInt, location, rString) -} diff --git a/website/docs/r/storage_account_encryption_settings.html.markdown b/website/docs/r/storage_account_customer_managed_key.html.markdown similarity index 58% rename from website/docs/r/storage_account_encryption_settings.html.markdown rename to website/docs/r/storage_account_customer_managed_key.html.markdown index 553bdcdfad954..abfb32696860a 100644 --- a/website/docs/r/storage_account_encryption_settings.html.markdown +++ b/website/docs/r/storage_account_customer_managed_key.html.markdown @@ -1,27 +1,24 @@ --- subcategory: "Storage" layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_storage_account_encryption_settings" +page_title: "Azure Resource Manager: azurerm_storage_account_customer_managed_key" description: |- - Manages the encryption settings of an Azure Storage Account. + Manages the customer managed key of an Azure Storage Account. --- -# azurerm_storage_account_encryption_settings +# azurerm_storage_account_customer_managed_key -Manages the encryption settings of an Azure Storage Account. +Manages the customer managed key of an Azure Storage Account. ## Example Usage ```hcl -resource "azurerm_storage_account_encryption_settings" "tfex" { - storage_account_id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/tfex-RG/providers/Microsoft.Storage/storageAccounts/tfexstorageaccount" - - key_vault { - key_vault_policy_id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/tfex-RG/providers/Microsoft.KeyVault/vaults/tfex-key-vault/objectId/00000000-0000-0000-0000-000000000000" - key_vault_id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/tfex-RG/providers/Microsoft.KeyVault/vaults/tfex-key-vault" - key_name = "tfex-key" - key_version = "955b9ad9579e4501a311df5493bacd02" - } +resource "azurerm_storage_account_customer_managed_key" "tfex" { + storage_account_id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/tfex-RG/providers/Microsoft.Storage/storageAccounts/tfexstorageaccount" + key_vault_id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/tfex-RG/providers/Microsoft.KeyVault/vaults/tfex-key-vault" + key_vault_access_policy_id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/tfex-RG/providers/Microsoft.KeyVault/vaults/tfex-key-vault/objectId/00000000-0000-0000-0000-000000000000" + key_name = "tfex-key" + key_version = "955b9ad9579e4501a311df5493bacd02" } ``` @@ -33,7 +30,7 @@ provider "azurerm" { features { key_vault { - purge_soft_delete_on_destroy = true + purge_soft_delete_on_destroy = false } } } @@ -51,7 +48,7 @@ resource "azurerm_key_vault" "tfex" { tenant_id = "00000000-0000-0000-0000-000000000000" soft_delete_enabled = true - purge_protection_enabled = false + purge_protection_enabled = true sku_name = "standard" @@ -94,15 +91,12 @@ resource "azurerm_storage_account" "tfex" { } } -resource "azurerm_storage_account_encryption_settings" "tfex" { - storage_account_id = azurerm_storage_account.tfex.id - - key_vault { - key_vault_policy_id = azurerm_key_vault_access_policy.tfex.id - key_vault_id = azurerm_key_vault.tfex.id - key_name = azurerm_key_vault_key.tfex.name - key_version = azurerm_key_vault_key.tfex.version - } +resource "azurerm_storage_account_customer_managed_key" "tfex" { + storage_account_id = azurerm_storage_account.tfex.id + key_vault_id = azurerm_key_vault.tfex.id + key_vault_access_policy_id = azurerm_key_vault_access_policy.tfex.id + key_name = azurerm_key_vault_key.tfex.name + key_version = azurerm_key_vault_key.tfex.version } ``` @@ -111,15 +105,8 @@ resource "azurerm_storage_account_encryption_settings" "tfex" { The following arguments are supported: * `storage_account_id` - (Required) The id of the storage account to manage the encryption settings for. - -* `key_vault` - (Optional) A `key_vault` block as documented below. - ---- - -* `key_vault` supports the following: - * `key_vault_id` - (Required) The ID of the Key Vault. -* `key_vault_policy_id` - (Required) The resource ID of the `azurerm_key_vault_access_policy` granting the storage account access to the key vault. +* `key_vault_access_policy_id` - (Required) The resource ID of the `azurerm_key_vault_access_policy` granting the storage account access to the key vault. * `key_name` - (Required) The name of Key Vault key. * `key_version` - (Required) The version of Key Vault key. @@ -137,5 +124,5 @@ The following attributes are exported in addition to the arguments listed above: Storage Accounts Encryption Settings can be imported using the `resource id`, e.g. ```shell -terraform import azurerm_storage_account_encryption_settings.tfex /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myresourcegroup/providers/Microsoft.Storage/storageAccounts/myaccount +terraform import azurerm_storage_account_customer_managed_key.tfex /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myresourcegroup/providers/Microsoft.Storage/storageAccounts/myaccount ``` \ No newline at end of file From a86c893394a4784d66286fc6f1ca6c6355b6c46e Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Thu, 13 Feb 2020 15:04:28 -0800 Subject: [PATCH 095/498] Add SACMK doc to TOC --- website/azurerm.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/azurerm.erb b/website/azurerm.erb index 4301935ec7abe..e03d2a220a19b 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -2185,6 +2185,10 @@ azurerm_storage_account +
  • + azurerm_storage_account_customer_managed_key +
    • +
  • azurerm_storage_account_network_rules
    • From 08feb94a75739fb2bfd371f960f4eef0625ce100 Mon Sep 17 00:00:00 2001 From: John Kendall Date: Fri, 14 Feb 2020 10:11:53 +1100 Subject: [PATCH 096/498] remove synthentic delays --- .../services/bot/resource_arm_bot_channel_directline.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go b/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go index 30b28aa95ed15..e33a7f534a303 100644 --- a/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go +++ b/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go @@ -149,8 +149,7 @@ func resourceArmBotChannelDirectlineCreate(d *schema.ResourceData, meta interfac return fmt.Errorf("Error issuing create request for Channel Directline for Bot %q (Resource Group %q): %+v", resourceGroup, botName, err) } - // Create does not include sites properly, so we need to update as well - time.Sleep(10 * time.Second) + // Unable to create a new site with enhanced_authentication_enabled in the same operation, so we need to make two calls if _, err := client.Update(ctx, resourceGroup, botName, botservice.ChannelNameDirectLineChannel, channel); err != nil { return fmt.Errorf("Error issuing create request for Channel Directline for Bot %q (Resource Group %q): %+v", resourceGroup, botName, err) } @@ -230,8 +229,7 @@ func resourceArmBotChannelDirectlineUpdate(d *schema.ResourceData, meta interfac return fmt.Errorf("Error issuing create request for Channel Directline for Bot %q (Resource Group %q): %+v", resourceGroup, botName, err) } - // Create does not include sites properly, so we need to update as well - time.Sleep(10 * time.Second) + // Unable to create a new site with enhanced_authentication_enabled in the same operation, so we need to make two calls if _, err := client.Update(ctx, resourceGroup, botName, botservice.ChannelNameDirectLineChannel, channel); err != nil { return fmt.Errorf("Error issuing create request for Channel Directline for Bot %q (Resource Group %q): %+v", resourceGroup, botName, err) } From da671823b9722dc4e0bb9ef514106c9802c7f26a Mon Sep 17 00:00:00 2001 From: John Kendall Date: Fri, 14 Feb 2020 10:46:04 +1100 Subject: [PATCH 097/498] Fix whitespace --- .../internal/services/bot/resource_arm_bot_channel_directline.go | 1 - 1 file changed, 1 deletion(-) diff --git a/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go b/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go index e33a7f534a303..b84927665a03e 100644 --- a/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go +++ b/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go @@ -358,7 +358,6 @@ func flattenDirectlineSites(input []botservice.DirectLineSite) []interface{} { // When creating a new directline channel, a Default Site is created // There is a race condition where this site is not removed before the create request is completed func filterSites(sites *[]botservice.DirectLineSite) []botservice.DirectLineSite { - filtered := make([]botservice.DirectLineSite, 0) for _, site := range *sites { if *site.SiteName == "Default Site" { From cf39a6e4617ec8e72b9ec7bcf0418a42c990c080 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Thu, 13 Feb 2020 15:52:52 -0800 Subject: [PATCH 098/498] Fixed import issue --- azurerm/helpers/azure/key_vault.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/azurerm/helpers/azure/key_vault.go b/azurerm/helpers/azure/key_vault.go index e5e68e8ec8ef8..d35fa9400c2ce 100644 --- a/azurerm/helpers/azure/key_vault.go +++ b/azurerm/helpers/azure/key_vault.go @@ -7,7 +7,6 @@ import ( "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2018-02-14/keyvault" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -195,7 +194,7 @@ func KeyVaultIsSoftDeleteAndPurgeProtected(ctx context.Context, client *keyvault } func KeyVaultGetResourceNameResource(resourceId string, namePathKey string) (resourceName interface{}, resourceGroup interface{}, err error) { - id, err := azure.ParseAzureResourceID(resourceId) + id, err := ParseAzureResourceID(resourceId) if err != nil { return nil, nil, err } From 5d7f77b76cca75916ae94f169bc7224ceff5c5b5 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Thu, 13 Feb 2020 18:50:46 -0800 Subject: [PATCH 099/498] Updates --- .../keyvault/data_source_key_vault_key.go | 46 ++++--------------- .../keyvault/resource_arm_key_vault_key.go | 4 +- ...rm_storage_account_customer_managed_key.go | 32 ++++++------- ...account_customer_managed_key.html.markdown | 11 ++--- 4 files changed, 31 insertions(+), 62 deletions(-) diff --git a/azurerm/internal/services/keyvault/data_source_key_vault_key.go b/azurerm/internal/services/keyvault/data_source_key_vault_key.go index b1d672a650e0c..2632b6f015721 100644 --- a/azurerm/internal/services/keyvault/data_source_key_vault_key.go +++ b/azurerm/internal/services/keyvault/data_source_key_vault_key.go @@ -5,7 +5,6 @@ import ( "time" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" @@ -29,21 +28,13 @@ func dataSourceArmKeyVaultKey() *schema.Resource { }, "key_vault_id": { - Type: schema.TypeString, - Optional: true, //todo required in 2.0 - Computed: true, //todo removed in 2.0 - ValidateFunc: azure.ValidateResourceID, - ConflictsWith: []string{"vault_uri"}, + Type: schema.TypeString, + Computed: true, }, - // todo remove in 2.0 - "vault_uri": { - Type: schema.TypeString, - Optional: true, - Computed: true, - Deprecated: "This property has been deprecated in favour of the key_vault_id property. This will prevent a class of bugs as described in https://github.com/terraform-providers/terraform-provider-azurerm/issues/2396 and will be removed in version 2.0 of the provider", - ValidateFunc: validation.IsURLWithHTTPS, - ConflictsWith: []string{"key_vault_id"}, + "key_vault_access_policy_id": { + Type: schema.TypeString, + Computed: true, }, "key_type": { @@ -90,33 +81,16 @@ func dataSourceArmKeyVaultKeyRead(d *schema.ResourceData, meta interface{}) erro ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() - keyVaultBaseUri := d.Get("vault_uri").(string) name := d.Get("name").(string) keyVaultId := d.Get("key_vault_id").(string) - if keyVaultBaseUri == "" { - if keyVaultId == "" { - return fmt.Errorf("one of `key_vault_id` or `vault_uri` must be set") - } - - pKeyVaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) - if err != nil { - return fmt.Errorf("Error looking up Key %q vault url from id %q: %+v", name, keyVaultId, err) - } - - keyVaultBaseUri = pKeyVaultBaseUrl - d.Set("vault_uri", keyVaultBaseUri) - } else { - id, err := azure.GetKeyVaultIDFromBaseUrl(ctx, vaultClient, keyVaultBaseUri) - if err != nil { - return fmt.Errorf("Error retrieving the Resource ID the Key Vault at URL %q: %s", keyVaultBaseUri, err) - } - if id == nil { - return fmt.Errorf("Unable to locate the Resource ID for the Key Vault at URL %q: %s", keyVaultBaseUri, err) - } - d.Set("key_vault_id", id) + keyVaultBaseUri, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) + if err != nil { + return fmt.Errorf("Error looking up Key %q vault url from id %q: %+v", name, keyVaultId, err) } + d.Set("key_vault_id", keyVaultId) + resp, err := client.GetKey(ctx, keyVaultBaseUri, name, "") if err != nil { if utils.ResponseWasNotFound(resp.Response) { diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go b/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go index 454aaa8728d74..b48a213873dab 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go @@ -170,13 +170,11 @@ func resourceArmKeyVaultKeyCreate(d *schema.ResourceData, meta interface{}) erro name := d.Get("name").(string) keyVaultId := d.Get("key_vault_id").(string) - pKeyVaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) + keyVaultBaseUri, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) if err != nil { return fmt.Errorf("Error looking up Key %q vault url from id %q: %+v", name, keyVaultId, err) } - keyVaultBaseUri := pKeyVaultBaseUrl - if features.ShouldResourcesBeImported() { existing, err := client.GetKey(ctx, keyVaultBaseUri, name, "") if err != nil { diff --git a/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go b/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go index 280717be845a5..3291bc3ef832b 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go @@ -44,12 +44,6 @@ func resourceArmStorageAccountCustomerManagedKey() *schema.Resource { ValidateFunc: azure.ValidateResourceID, }, - "key_vault_access_policy_id": { - Type: schema.TypeString, - Required: true, - ValidateFunc: azure.ValidateResourceID, - }, - "key_name": { Type: schema.TypeString, Required: true, @@ -121,9 +115,9 @@ func resourceArmStorageAccountCustomerManagedKeyCreateUpdate(d *schema.ResourceD }, } - _, err = storageClient.Update(ctx, storageAccountResourceGroupName.(string), storageAccountName.(string), props) + _, err := storageClient.Update(ctx, storageAccountResourceGroupName.(string), storageAccountName.(string), props) if err != nil { - return fmt.Errorf("Error updating Azure Storage Account %q (Resource Group %q) Customer Managed Key : %+v", storageAccountName, storageAccountResourceGroupName, err) + return fmt.Errorf("Error updating Azure Storage Account %q (Resource Group %q) Customer Managed Key: %+v", storageAccountName, storageAccountResourceGroupName, err) } resourceId := fmt.Sprintf("%s/customerManagedKey", storageAccountId) @@ -139,11 +133,9 @@ func resourceArmStorageAccountCustomerManagedKeyRead(d *schema.ResourceData, met storageAccountId := d.Get("storage_account_id").(string) keyVaultId := d.Get("key_vault_id").(string) - keyVaultPolicy := d.Get("key_vault_access_policy_id").(string) d.Set("storage_account_id", storageAccountId) d.Set("key_vault_id", keyVaultId) - d.Set("key_vault_access_policy_id", keyVaultPolicy) name, resGroup, err := azure.KeyVaultGetResourceNameResource(storageAccountId, "storageAccounts") if err != nil { @@ -178,6 +170,7 @@ func resourceArmStorageAccountCustomerManagedKeyDelete(d *schema.ResourceData, m defer cancel() storageAccountId := d.Get("storage_account_id").(string) + encryptionServices := true storageAccountName, resourceGroupName, err := azure.KeyVaultGetResourceNameResource(storageAccountId, "storageAccounts") if err != nil { @@ -188,15 +181,23 @@ func resourceArmStorageAccountCustomerManagedKeyDelete(d *schema.ResourceData, m // "Delete" doesn't really make sense it should really be a "Revert to Default" // So instead of the Delete func actually deleting the Storage Account I am // making it reset the Storage Account to it's default state - opts := storage.AccountUpdateParameters{ + props := storage.AccountUpdateParameters{ AccountPropertiesUpdateParameters: &storage.AccountPropertiesUpdateParameters{ Encryption: &storage.Encryption{ + Services: &storage.EncryptionServices{ + Blob: &storage.EncryptionService{ + Enabled: utils.Bool(encryptionServices), + }, + File: &storage.EncryptionService{ + Enabled: utils.Bool(encryptionServices), + }, + }, KeySource: storage.MicrosoftStorage, }, }, } - _, err = storageClient.Update(ctx, resourceGroupName.(string), storageAccountName.(string), opts) + _, err = storageClient.Update(ctx, resourceGroupName.(string), storageAccountName.(string), props) if err != nil { return fmt.Errorf("Error deleting AzureRM Storage Account %q (Resource Group %q) %q: %+v", storageAccountName.(string), resourceGroupName.(string), err) } @@ -213,20 +214,19 @@ func resourceArmStorageAccountCustomerManagedKeyImportState(d *schema.ResourceDa d.Set("storage_account_id", id) d.Set("key_vault_id", "") - d.Set("key_vault_access_policy_id", "") - name, resGroup, err := azure.KeyVaultGetResourceNameResource(id, "storageAccounts") + name, resourceGroup, err := azure.KeyVaultGetResourceNameResource(id, "storageAccounts") if err != nil { return nil, err } - resp, err := storageClient.GetProperties(ctx, resGroup.(string), name.(string), "") + resp, err := storageClient.GetProperties(ctx, resourceGroup.(string), name.(string), "") if err != nil { if utils.ResponseWasNotFound(resp.Response) { d.SetId("") return nil, nil } - return nil, fmt.Errorf("Error importing the state of AzureRM Storage Account %q (Resource Group %q): %+v", name.(string), resGroup.(string), err) + return nil, fmt.Errorf("Error importing the state of AzureRM Storage Account %q (Resource Group %q): %+v", name.(string), resourceGroup.(string), err) } if props := resp.AccountProperties; props != nil { diff --git a/website/docs/r/storage_account_customer_managed_key.html.markdown b/website/docs/r/storage_account_customer_managed_key.html.markdown index abfb32696860a..8210f51f5bafc 100644 --- a/website/docs/r/storage_account_customer_managed_key.html.markdown +++ b/website/docs/r/storage_account_customer_managed_key.html.markdown @@ -16,7 +16,6 @@ Manages the customer managed key of an Azure Storage Account. resource "azurerm_storage_account_customer_managed_key" "tfex" { storage_account_id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/tfex-RG/providers/Microsoft.Storage/storageAccounts/tfexstorageaccount" key_vault_id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/tfex-RG/providers/Microsoft.KeyVault/vaults/tfex-key-vault" - key_vault_access_policy_id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/tfex-RG/providers/Microsoft.KeyVault/vaults/tfex-key-vault/objectId/00000000-0000-0000-0000-000000000000" key_name = "tfex-key" key_version = "955b9ad9579e4501a311df5493bacd02" } @@ -92,11 +91,10 @@ resource "azurerm_storage_account" "tfex" { } resource "azurerm_storage_account_customer_managed_key" "tfex" { - storage_account_id = azurerm_storage_account.tfex.id - key_vault_id = azurerm_key_vault.tfex.id - key_vault_access_policy_id = azurerm_key_vault_access_policy.tfex.id - key_name = azurerm_key_vault_key.tfex.name - key_version = azurerm_key_vault_key.tfex.version + storage_account_id = azurerm_storage_account.tfex.id + key_vault_id = azurerm_key_vault.tfex.id + key_name = azurerm_key_vault_key.tfex.name + key_version = azurerm_key_vault_key.tfex.version } ``` @@ -106,7 +104,6 @@ The following arguments are supported: * `storage_account_id` - (Required) The id of the storage account to manage the encryption settings for. * `key_vault_id` - (Required) The ID of the Key Vault. -* `key_vault_access_policy_id` - (Required) The resource ID of the `azurerm_key_vault_access_policy` granting the storage account access to the key vault. * `key_name` - (Required) The name of Key Vault key. * `key_version` - (Required) The version of Key Vault key. From 4021461eae82255e1dcd3304f163c4e2e8febc11 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Thu, 13 Feb 2020 20:12:42 -0800 Subject: [PATCH 100/498] Update mysql to 2.0 --- .../mysql/resource_arm_mysql_server.go | 148 +----------------- .../tests/resource_arm_mysql_server_test.go | 108 +------------ 2 files changed, 9 insertions(+), 247 deletions(-) diff --git a/azurerm/internal/services/mysql/resource_arm_mysql_server.go b/azurerm/internal/services/mysql/resource_arm_mysql_server.go index 1772bd255339e..831db404112ce 100644 --- a/azurerm/internal/services/mysql/resource_arm_mysql_server.go +++ b/azurerm/internal/services/mysql/resource_arm_mysql_server.go @@ -52,8 +52,7 @@ func resourceArmMySqlServer() *schema.Resource { "sku_name": { Type: schema.TypeString, - Optional: true, // required in 2.0 - Computed: true, // remove in 2.0 + Required: true, ConflictsWith: []string{"sku"}, ValidateFunc: validation.StringInSlice([]string{ "B_Gen4_1", @@ -79,82 +78,6 @@ func resourceArmMySqlServer() *schema.Resource { }, false), }, - // remove in 2.0 - "sku": { - Type: schema.TypeList, - Optional: true, - Computed: true, - ConflictsWith: []string{"sku_name"}, - Deprecated: "This property has been deprecated in favour of the 'sku_name' property and will be removed in version 2.0 of the provider", - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - "B_Gen4_1", - "B_Gen4_2", - "B_Gen5_1", - "B_Gen5_2", - "GP_Gen4_2", - "GP_Gen4_4", - "GP_Gen4_8", - "GP_Gen4_16", - "GP_Gen4_32", - "GP_Gen5_2", - "GP_Gen5_4", - "GP_Gen5_8", - "GP_Gen5_16", - "GP_Gen5_32", - "GP_Gen5_64", - "MO_Gen5_2", - "MO_Gen5_4", - "MO_Gen5_8", - "MO_Gen5_16", - "MO_Gen5_32", - }, true), - DiffSuppressFunc: suppress.CaseDifference, - }, - - "capacity": { - Type: schema.TypeInt, - Required: true, - ValidateFunc: validation.IntInSlice([]int{ - 1, - 2, - 4, - 8, - 16, - 32, - 64, - }), - }, - - "tier": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - string(mysql.Basic), - string(mysql.GeneralPurpose), - string(mysql.MemoryOptimized), - }, true), - DiffSuppressFunc: suppress.CaseDifference, - }, - - "family": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - "Gen4", - "Gen5", - }, true), - DiffSuppressFunc: suppress.CaseDifference, - }, - }, - }, - }, - "administrator_login": { Type: schema.TypeString, Required: true, @@ -275,17 +198,9 @@ func resourceArmMySqlServerCreate(d *schema.ResourceData, meta interface{}) erro } } - var sku *mysql.Sku - if b, ok := d.GetOk("sku_name"); ok { - var err error - sku, err = expandServerSkuName(b.(string)) - if err != nil { - return fmt.Errorf("error expanding sku_name for MySQL Server %q (Resource Group %q): %v", name, resourceGroup, err) - } - } else if _, ok := d.GetOk("sku"); ok { - sku = expandMySQLServerSku(d) - } else { - return fmt.Errorf("One of `sku` or `sku_name` must be set for MySQL Server %q (Resource Group %q)", name, resourceGroup) + sku, err := expandServerSkuName(d.Get("sku_name").(string)) + if err != nil { + return fmt.Errorf("error expanding sku_name for MySQL Server %q (Resource Group %q): %v", name, resourceGroup, err) } properties := mysql.ServerForCreate{ @@ -335,17 +250,9 @@ func resourceArmMySqlServerUpdate(d *schema.ResourceData, meta interface{}) erro name := d.Get("name").(string) resourceGroup := d.Get("resource_group_name").(string) - var sku *mysql.Sku - if b, ok := d.GetOk("sku_name"); ok { - var err error - sku, err = expandServerSkuName(b.(string)) - if err != nil { - return fmt.Errorf("error expanding sku_name for MySQL Server %q (Resource Group %q): %v", name, resourceGroup, err) - } - } else if _, ok := d.GetOk("sku"); ok { - sku = expandMySQLServerSku(d) - } else { - return fmt.Errorf("One of `sku` or `sku_name` must be set for MySQL Server %q (Resource Group %q)", name, resourceGroup) + sku, err := expandServerSkuName(d.Get("sku_name").(string)) + if err != nil { + return fmt.Errorf("error expanding sku_name for MySQL Server %q (Resource Group %q): %v", name, resourceGroup, err) } properties := mysql.ServerUpdateParameters{ @@ -419,10 +326,6 @@ func resourceArmMySqlServerRead(d *schema.ResourceData, meta interface{}) error d.Set("version", string(resp.Version)) d.Set("ssl_enforcement", string(resp.SslEnforcement)) - if err := d.Set("sku", flattenMySQLServerSku(resp.Sku)); err != nil { - return fmt.Errorf("Error setting `sku`: %+v", err) - } - if err := d.Set("storage_profile", flattenMySQLStorageProfile(resp.StorageProfile)); err != nil { return fmt.Errorf("Error setting `storage_profile`: %+v", err) } @@ -488,23 +391,6 @@ func expandServerSkuName(skuName string) (*mysql.Sku, error) { }, nil } -func expandMySQLServerSku(d *schema.ResourceData) *mysql.Sku { - skus := d.Get("sku").([]interface{}) - sku := skus[0].(map[string]interface{}) - - name := sku["name"].(string) - capacity := sku["capacity"].(int) - tier := sku["tier"].(string) - family := sku["family"].(string) - - return &mysql.Sku{ - Name: utils.String(name), - Tier: mysql.SkuTier(tier), - Capacity: utils.Int32(int32(capacity)), - Family: utils.String(family), - } -} - func expandMySQLStorageProfile(d *schema.ResourceData) *mysql.StorageProfile { storageprofiles := d.Get("storage_profile").([]interface{}) storageprofile := storageprofiles[0].(map[string]interface{}) @@ -522,26 +408,6 @@ func expandMySQLStorageProfile(d *schema.ResourceData) *mysql.StorageProfile { } } -func flattenMySQLServerSku(resp *mysql.Sku) []interface{} { - values := map[string]interface{}{} - - if name := resp.Name; name != nil { - values["name"] = *name - } - - if capacity := resp.Capacity; capacity != nil { - values["capacity"] = *capacity - } - - values["tier"] = string(resp.Tier) - - if family := resp.Family; family != nil { - values["family"] = *family - } - - return []interface{}{values} -} - func flattenMySQLStorageProfile(resp *mysql.StorageProfile) []interface{} { values := map[string]interface{}{} diff --git a/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go b/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go index b97425bd6887c..b2070f11645dd 100644 --- a/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go +++ b/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go @@ -31,25 +31,6 @@ func TestAccAzureRMMySQLServer_basicFiveSix(t *testing.T) { }) } -func TestAccAzureRMMySQLServer_basicFiveSixOldSku(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_mysql_server", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMySQLServerDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMMySQLServer_basicFiveSixOldSku(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMySQLServerExists(data.ResourceName), - ), - }, - data.ImportStep("administrator_login_password"), // not returned as sensitive - }, - }) -} - func TestAccAzureRMMySQLServer_requiresImport(t *testing.T) { if !features.ShouldResourcesBeImported() { t.Skip("Skipping since resources aren't required to be imported") @@ -120,25 +101,6 @@ func TestAccAzureRMMySQLServer_basicEightZero(t *testing.T) { }) } -func TestAccAzureRMMySqlServer_generalPurpose(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_mysql_server", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMySQLServerDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMMySQLServer_generalPurpose(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMySQLServerExists(data.ResourceName), - ), - }, - data.ImportStep("administrator_login_password"), // not returned as sensitive - }, - }) -} - func TestAccAzureRMMySqlServer_memoryOptimized(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_mysql_server", "test") @@ -199,7 +161,7 @@ func TestAccAzureRMMySQLServer_updateSKU(t *testing.T) { CheckDestroy: testCheckAzureRMMySQLServerDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMMySQLServer_generalPurpose(data), + Config: testAccAzureRMMySQLServer_basicEightZero(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMMySQLServerExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "sku.0.name", "GP_Gen5_32"), @@ -211,7 +173,7 @@ func TestAccAzureRMMySQLServer_updateSKU(t *testing.T) { ), }, { - Config: testAccAzureRMMySQLServer_memoryOptimized(data), + Config: testAccAzureRMMySQLServer_basicFiveSevenUpdated(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMMySQLServerExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "sku.0.name", "MO_Gen5_16"), @@ -337,39 +299,6 @@ resource "azurerm_mysql_server" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } -func testAccAzureRMMySQLServer_basicFiveSixOldSku(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_mysql_server" "test" { - name = "acctestmysqlsvr-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "GP_Gen5_2" - capacity = 2 - tier = "GeneralPurpose" - family = "Gen5" - } - - storage_profile { - storage_mb = 51200 - backup_retention_days = 7 - geo_redundant_backup = "Disabled" - } - - administrator_login = "acctestun" - administrator_login_password = "H@Sh1CoR3!" - version = "5.6" - ssl_enforcement = "Enabled" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - func testAccAzureRMMySQLServer_basicFiveSeven(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { @@ -479,39 +408,6 @@ resource "azurerm_mysql_server" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } -func testAccAzureRMMySQLServer_generalPurpose(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_mysql_server" "test" { - name = "acctestmysqlsvr-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "GP_Gen5_32" - capacity = 32 - tier = "GeneralPurpose" - family = "Gen5" - } - - storage_profile { - storage_mb = 640000 - backup_retention_days = 7 - geo_redundant_backup = "Disabled" - } - - administrator_login = "acctestun" - administrator_login_password = "H@Sh1CoR3!" - version = "5.7" - ssl_enforcement = "Enabled" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - func testAccAzureRMMySQLServer_memoryOptimized(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { From fa31f3124006eeef630454379ca33aed84a4de59 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Thu, 13 Feb 2020 20:26:46 -0800 Subject: [PATCH 101/498] update mssql to 2.0 --- .../mssql/resource_arm_mssql_elasticpool.go | 61 ------------------- 1 file changed, 61 deletions(-) diff --git a/azurerm/internal/services/mssql/resource_arm_mssql_elasticpool.go b/azurerm/internal/services/mssql/resource_arm_mssql_elasticpool.go index 23c8b521d3d32..ab4603acac80c 100644 --- a/azurerm/internal/services/mssql/resource_arm_mssql_elasticpool.go +++ b/azurerm/internal/services/mssql/resource_arm_mssql_elasticpool.go @@ -129,45 +129,6 @@ func resourceArmMsSqlElasticPool() *schema.Resource { }, }, - "elastic_pool_properties": { - Type: schema.TypeList, - Computed: true, - Deprecated: "These properties herein have been moved to the top level or removed", - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "state": { - Type: schema.TypeString, - Computed: true, - Deprecated: "This property has been removed", - }, - - "creation_date": { - Type: schema.TypeString, - Computed: true, - Deprecated: "This property has been removed", - }, - - "max_size_bytes": { - Type: schema.TypeInt, - Computed: true, - Deprecated: "This property has been moved to the top level", - }, - - "zone_redundant": { - Type: schema.TypeBool, - Computed: true, - Deprecated: "This property has been moved to the top level", - }, - - "license_type": { - Type: schema.TypeString, - Computed: true, - Deprecated: "This property has been removed", - }, - }, - }, - }, - "max_size_bytes": { Type: schema.TypeInt, Optional: true, @@ -320,11 +281,6 @@ func resourceArmMsSqlElasticPoolRead(d *schema.ResourceData, meta interface{}) e } d.Set("zone_redundant", properties.ZoneRedundant) - // todo remove in 2.0 - if err := d.Set("elastic_pool_properties", flattenAzureRmMsSqlElasticPoolProperties(resp.ElasticPoolProperties)); err != nil { - return fmt.Errorf("Error setting `elastic_pool_properties`: %+v", err) - } - if err := d.Set("per_database_settings", flattenAzureRmMsSqlElasticPoolPerDatabaseSettings(properties.PerDatabaseSettings)); err != nil { return fmt.Errorf("Error setting `per_database_settings`: %+v", err) } @@ -412,23 +368,6 @@ func flattenAzureRmMsSqlElasticPoolSku(input *sql.Sku) []interface{} { return []interface{}{values} } -func flattenAzureRmMsSqlElasticPoolProperties(resp *sql.ElasticPoolProperties) []interface{} { - elasticPoolProperty := map[string]interface{}{} - elasticPoolProperty["state"] = string(resp.State) - - if date := resp.CreationDate; date != nil { - elasticPoolProperty["creation_date"] = date.String() - } - - if zoneRedundant := resp.ZoneRedundant; zoneRedundant != nil { - elasticPoolProperty["zone_redundant"] = *zoneRedundant - } - - elasticPoolProperty["license_type"] = string(resp.LicenseType) - - return []interface{}{elasticPoolProperty} -} - func flattenAzureRmMsSqlElasticPoolPerDatabaseSettings(resp *sql.ElasticPoolPerDatabaseSettings) []interface{} { perDatabaseSettings := map[string]interface{}{} From 1ed30cf72d76d21b634c6e591d82fbc67850ae29 Mon Sep 17 00:00:00 2001 From: Narsi-1310 <55081590+Narsi-1310@users.noreply.github.com> Date: Fri, 14 Feb 2020 16:59:30 +1100 Subject: [PATCH 102/498] Update subnets options and add details for endpoint The following changes have been carried out: - renamed parameter to enforce_private_link_service_network_policies from disable_private_link_service_network_policy_enforcement for service and endpoint subnets - Include private service connection under azurerm_private_endpoint - to provide better view of example. --- website/docs/r/private_endpoint.html.markdown | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/website/docs/r/private_endpoint.html.markdown b/website/docs/r/private_endpoint.html.markdown index a6d8acdafdfb2..47ca392476af0 100644 --- a/website/docs/r/private_endpoint.html.markdown +++ b/website/docs/r/private_endpoint.html.markdown @@ -35,7 +35,7 @@ resource "azurerm_subnet" "service" { virtual_network_name = azurerm_virtual_network.example.name address_prefix = "10.0.1.0/24" - disable_private_link_service_network_policy_enforcement = true + enforce_private_link_service_network_policies = true } resource "azurerm_subnet" "endpoint" { @@ -44,7 +44,7 @@ resource "azurerm_subnet" "endpoint" { virtual_network_name = azurerm_virtual_network.example.name address_prefix = "10.0.2.0/24" - disable_private_link_endpoint_network_policy_enforcement = true + enforce_private_link_endpoint_network_policies = true } resource "azurerm_public_ip" "example" { @@ -88,6 +88,12 @@ resource "azurerm_private_endpoint" "example" { location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name subnet_id = azurerm_subnet.endpoint.id + + private_service_connection { + name = "example-privateserviceconnection" + private_connection_resource_id = azurerm_private_link_service.example.id + is_manual_connection = false + } } ``` From 3850025c3304e2ae7a6ae44d05ac24f6bbb28c40 Mon Sep 17 00:00:00 2001 From: Narsi-1310 <55081590+Narsi-1310@users.noreply.github.com> Date: Fri, 14 Feb 2020 17:01:35 +1100 Subject: [PATCH 103/498] Format private service connection --- website/docs/r/private_endpoint.html.markdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/docs/r/private_endpoint.html.markdown b/website/docs/r/private_endpoint.html.markdown index 47ca392476af0..d590fd957bbc3 100644 --- a/website/docs/r/private_endpoint.html.markdown +++ b/website/docs/r/private_endpoint.html.markdown @@ -90,9 +90,9 @@ resource "azurerm_private_endpoint" "example" { subnet_id = azurerm_subnet.endpoint.id private_service_connection { - name = "example-privateserviceconnection" - private_connection_resource_id = azurerm_private_link_service.example.id - is_manual_connection = false + name = "example-privateserviceconnection" + private_connection_resource_id = azurerm_private_link_service.example.id + is_manual_connection = false } } ``` From 4c870410fca7b7143f5481c30f25cba47b14efd0 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 14 Feb 2020 09:37:21 +0100 Subject: [PATCH 104/498] r/mysql_server: removing reference to the old field --- .../internal/services/mysql/resource_arm_mysql_server.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/azurerm/internal/services/mysql/resource_arm_mysql_server.go b/azurerm/internal/services/mysql/resource_arm_mysql_server.go index 831db404112ce..7dd5ba650553e 100644 --- a/azurerm/internal/services/mysql/resource_arm_mysql_server.go +++ b/azurerm/internal/services/mysql/resource_arm_mysql_server.go @@ -51,9 +51,8 @@ func resourceArmMySqlServer() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), "sku_name": { - Type: schema.TypeString, - Required: true, - ConflictsWith: []string{"sku"}, + Type: schema.TypeString, + Required: true, ValidateFunc: validation.StringInSlice([]string{ "B_Gen4_1", "B_Gen4_2", @@ -162,10 +161,10 @@ func resourceArmMySqlServer() *schema.Resource { }, CustomizeDiff: func(diff *schema.ResourceDiff, v interface{}) error { - tier, _ := diff.GetOk("sku.0.tier") + tier, _ := diff.GetOk("sku_name") storageMB, _ := diff.GetOk("storage_profile.0.storage_mb") - if strings.ToLower(tier.(string)) == "basic" && storageMB.(int) > 1048576 { + if strings.HasPrefix(tier.(string), "B_") && storageMB.(int) > 1048576 { return fmt.Errorf("basic pricing tier only supports upto 1,048,576 MB (1TB) of storage") } From 3b9cc7f5497ec80b110522a076ca10d9d6aca8a4 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Fri, 14 Feb 2020 10:24:24 +0000 Subject: [PATCH 105/498] tweaked import acctests --- .../tests/resource_arm_api_management_api_operation_test.go | 3 ++- .../tests/resource_arm_api_management_api_schema_test.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_test.go index 2902e271967e3..bf2fd8babfee4 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_test.go @@ -239,7 +239,8 @@ resource "azurerm_api_management_api_operation" "test" { } func testAccAzureRMApiManagementApiOperation_requiresImport(data acceptance.TestData) string { - template := testAccAzureRMApiManagementApiOperation_template(data) + //template := testAccAzureRMApiManagementApiOperation_template(data) + template := testAccAzureRMApiManagementApiOperation_basic(data) return fmt.Sprintf(` %s diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_schema_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_schema_test.go index d71d224d70f96..cead65cccb6ad 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_schema_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_schema_test.go @@ -133,7 +133,7 @@ func testAccAzureRMApiManagementApiSchema_requiresImport(data acceptance.TestDat return fmt.Sprintf(` %s -resource "azurerm_api_management_api_schema" "test" { +resource "azurerm_api_management_api_schema" "import" { api_name = "${azurerm_api_management_api.test.name}" api_management_name = "${azurerm_api_management.test.name}" resource_group_name = "${azurerm_resource_group.test.name}" From f9a2a85a2dc938d365fba8e6512b7568b9708ffd Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 14 Feb 2020 09:28:08 +0100 Subject: [PATCH 106/498] r/mssql_elasticpool: fixing the import tests --- .../resource_arm_mssql_elasticpool_test.go | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/azurerm/internal/services/mssql/tests/resource_arm_mssql_elasticpool_test.go b/azurerm/internal/services/mssql/tests/resource_arm_mssql_elasticpool_test.go index 5c4555b8bfba2..2d693a5b1dccd 100644 --- a/azurerm/internal/services/mssql/tests/resource_arm_mssql_elasticpool_test.go +++ b/azurerm/internal/services/mssql/tests/resource_arm_mssql_elasticpool_test.go @@ -329,18 +329,27 @@ func testAccAzureRMMsSqlElasticPool_basic_DTU(data acceptance.TestData) string { } func testAccAzureRMMsSqlElasticPool_requiresImport(data acceptance.TestData) string { - template := testAccAzureRMMsSqlElasticPool_DTU_Template(data, "BasicPool", "Basic", 50, 5242880000, 0, 5, false) + template := testAccAzureRMMsSqlElasticPool_DTU_Template(data, "BasicPool", "Basic", 50, 4.8828125, 0, 5, false) return fmt.Sprintf(` %s resource "azurerm_mssql_elasticpool" "import" { - name = "${azurerm_mssql_elasticpool.test.name}" - resource_group_name = "${azurerm_mssql_elasticpool.test.resource_group_name}" - location = "${azurerm_mssql_elasticpool.test.location}" - server_name = "${azurerm_mssql_elasticpool.test.server_name}" - max_size_bytes = "${azurerm_mssql_elasticpool.test.max_size_bytes}" - sku = "${azurerm_mssql_elasticpool.test.sku}" - per_database_settings = "${azurerm_mssql_elasticpool.test.per_database_settings}" + name = "${azurerm_mssql_elasticpool.test.name}" + resource_group_name = "${azurerm_mssql_elasticpool.test.resource_group_name}" + location = "${azurerm_mssql_elasticpool.test.location}" + server_name = "${azurerm_mssql_elasticpool.test.server_name}" + max_size_gb = 4.8828125 + + sku { + name = "BasicPool" + tier = "Basic" + capacity = 50 + } + + per_database_settings { + min_capacity = 0 + max_capacity = 5 + } } `, template) } From 0476ebaec7b2ea29c9aaaf05fdd4cbec44c31793 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 14 Feb 2020 11:56:44 +0100 Subject: [PATCH 107/498] iothub: removing the deprecated `azurerm_iot_dps` and `azurerm_iot_dps_certificate` resources Replacements for these resources is available in the form of `azurerm_iothub_..` resources --- .../internal/services/iothub/registration.go | 2 - .../services/iothub/resource_arm_iot_dps.go | 381 ------------------ .../resource_arm_iot_dps_certificate.go | 174 -------- .../resource_arm_iot_dps_certificate_test.go | 216 ---------- .../iothub/tests/resource_arm_iot_dps_test.go | 284 ------------- 5 files changed, 1057 deletions(-) delete mode 100644 azurerm/internal/services/iothub/resource_arm_iot_dps.go delete mode 100644 azurerm/internal/services/iothub/resource_arm_iot_dps_certificate.go delete mode 100644 azurerm/internal/services/iothub/tests/resource_arm_iot_dps_certificate_test.go delete mode 100644 azurerm/internal/services/iothub/tests/resource_arm_iot_dps_test.go diff --git a/azurerm/internal/services/iothub/registration.go b/azurerm/internal/services/iothub/registration.go index 5bdcfdd493122..62c25ce49a2f4 100644 --- a/azurerm/internal/services/iothub/registration.go +++ b/azurerm/internal/services/iothub/registration.go @@ -23,8 +23,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_iot_dps": resourceArmIotDPS(), - "azurerm_iot_dps_certificate": resourceArmIotDPSCertificate(), "azurerm_iothub_dps": resourceArmIotHubDPS(), "azurerm_iothub_dps_certificate": resourceArmIotHubDPSCertificate(), "azurerm_iothub_dps_shared_access_policy": resourceArmIotHubDPSSharedAccessPolicy(), diff --git a/azurerm/internal/services/iothub/resource_arm_iot_dps.go b/azurerm/internal/services/iothub/resource_arm_iot_dps.go deleted file mode 100644 index 31818c1d88e82..0000000000000 --- a/azurerm/internal/services/iothub/resource_arm_iot_dps.go +++ /dev/null @@ -1,381 +0,0 @@ -package iothub - -import ( - "context" - "fmt" - "log" - "regexp" - "strconv" - "time" - - "github.com/Azure/azure-sdk-for-go/services/preview/iothub/mgmt/2018-12-01-preview/devices" - "github.com/Azure/azure-sdk-for-go/services/provisioningservices/mgmt/2018-01-22/iothub" - "github.com/hashicorp/go-azure-helpers/response" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmIotDPS() *schema.Resource { - return &schema.Resource{ - Create: resourceArmIotDPSCreateUpdate, - Read: resourceArmIotDPSRead, - Update: resourceArmIotDPSCreateUpdate, - Delete: resourceArmIotDPSDelete, - - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - DeprecationMessage: `The 'azurerm_iot_dps' resource is deprecated in favour of the renamed version 'azurerm_iothub_dps'. - -Information on migrating to the renamed resource can be found here: https://terraform.io/docs/providers/azurerm/guides/migrating-between-renamed-resources.html - -As such the existing 'azurerm_iot_dps' resource is deprecated and will be removed in the next major version of the AzureRM Provider (2.0). -`, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validate.IoTHubName, - }, - - "resource_group_name": azure.SchemaResourceGroupName(), // azure.SchemaResourceGroupNameDiffSuppress(), - - "location": azure.SchemaLocation(), - - "sku": { - Type: schema.TypeList, - MaxItems: 1, - Required: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validation.StringInSlice([]string{ - string(devices.B1), - string(devices.B2), - string(devices.B3), - string(devices.F1), - string(devices.S1), - string(devices.S2), - string(devices.S3), - }, true), - }, - - "tier": { - Type: schema.TypeString, - Optional: true, - Computed: true, - Deprecated: "This property is no longer required and will be removed in version 2.0 of the provider", - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validation.StringInSlice([]string{ - string(devices.Basic), - string(devices.Free), - string(devices.Standard), - }, true), - }, - - "capacity": { - Type: schema.TypeInt, - Required: true, - ValidateFunc: validation.IntAtLeast(1), - }, - }, - }, - }, - - "linked_hub": { - Type: schema.TypeList, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "connection_string": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringIsNotEmpty, - ForceNew: true, - // Azure returns the key as ****. We'll suppress that here. - DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { - secretKeyRegex := regexp.MustCompile("(SharedAccessKey)=[^;]+") - maskedNew := secretKeyRegex.ReplaceAllString(new, "$1=****") - return (new == d.Get(k).(string)) && (maskedNew == old) - }, - Sensitive: true, - }, - "location": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringIsNotEmpty, - StateFunc: azure.NormalizeLocation, - ForceNew: true, - }, - "apply_allocation_policy": { - Type: schema.TypeBool, - Optional: true, - Default: false, - }, - "allocation_weight": { - Type: schema.TypeInt, - Optional: true, - Default: 0, - ValidateFunc: validation.IntBetween(0, 1000), - }, - "hostname": { - Type: schema.TypeString, - Computed: true, - }, - }, - }, - }, - - "tags": tags.Schema(), - }, - } -} - -func resourceArmIotDPSCreateUpdate(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).IoTHub.DPSResourceClient - ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) - defer cancel() - - name := d.Get("name").(string) - resourceGroup := d.Get("resource_group_name").(string) - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, name, resourceGroup) - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing IoT Device Provisioning Service %q (Resource Group %q): %+v", name, resourceGroup, err) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_iot_dps", *existing.ID) - } - } - - iotdps := iothub.ProvisioningServiceDescription{ - Location: utils.String(d.Get("location").(string)), - Name: utils.String(name), - Sku: expandIoTDPSSku(d), - Properties: &iothub.IotDpsPropertiesDescription{ - IotHubs: expandIoTDPSIoTHubs(d.Get("linked_hub").([]interface{})), - }, - Tags: tags.Expand(d.Get("tags").(map[string]interface{})), - } - - future, err := client.CreateOrUpdate(ctx, resourceGroup, name, iotdps) - if err != nil { - return fmt.Errorf("Error creating/updating IoT Device Provisioning Service %q (Resource Group %q): %+v", name, resourceGroup, err) - } - - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for the completion of the creating/updating of IoT Device Provisioning Service %q (Resource Group %q): %+v", name, resourceGroup, err) - } - - resp, err := client.Get(ctx, name, resourceGroup) - if err != nil { - return fmt.Errorf("Error retrieving IoT Device Provisioning Service %q (Resource Group %q): %+v", name, resourceGroup, err) - } - - if resp.ID == nil { - return fmt.Errorf("Cannot read IoT Device Provisioning Service %q (Resource Group %q): %+v", name, resourceGroup, err) - } - - d.SetId(*resp.ID) - - return resourceArmIotDPSRead(d, meta) -} - -func resourceArmIotDPSRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).IoTHub.DPSResourceClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - resourceGroup := id.ResourceGroup - name := id.Path["provisioningServices"] - - resp, err := client.Get(ctx, name, resourceGroup) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil - } - - return fmt.Errorf("Error retrieving IoT Device Provisioning Service %q (Resource Group %q): %+v", name, resourceGroup, err) - } - - d.Set("name", resp.Name) - d.Set("resource_group_name", resourceGroup) - if location := resp.Location; location != nil { - d.Set("location", azure.NormalizeLocation(*location)) - } - sku := flattenIoTDPSSku(resp.Sku) - if err := d.Set("sku", sku); err != nil { - return fmt.Errorf("Error setting `sku`: %+v", err) - } - - if props := resp.Properties; props != nil { - if err := d.Set("linked_hub", flattenIoTDPSLinkedHub(props.IotHubs)); err != nil { - return fmt.Errorf("Error setting `linked_hub`: %+v", err) - } - } - - return tags.FlattenAndSet(d, resp.Tags) -} - -func resourceArmIotDPSDelete(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).IoTHub.DPSResourceClient - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - resourceGroup := id.ResourceGroup - name := id.Path["provisioningServices"] - - future, err := client.Delete(ctx, name, resourceGroup) - if err != nil { - if !response.WasNotFound(future.Response()) { - return fmt.Errorf("Error deleting IoT Device Provisioning Service %q (Resource Group %q): %+v", name, resourceGroup, err) - } - } - - return waitForIotDPSToBeDeleted(ctx, client, resourceGroup, name, d) -} - -func waitForIotDPSToBeDeleted(ctx context.Context, client *iothub.IotDpsResourceClient, resourceGroup, name string, d *schema.ResourceData) error { - // we can't use the Waiter here since the API returns a 404 once it's deleted which is considered a polling status code.. - log.Printf("[DEBUG] Waiting for IoT Device Provisioning Service %q (Resource Group %q) to be deleted", name, resourceGroup) - stateConf := &resource.StateChangeConf{ - Pending: []string{"200"}, - Target: []string{"404"}, - Refresh: iotdpsStateStatusCodeRefreshFunc(ctx, client, resourceGroup, name), - Timeout: d.Timeout(schema.TimeoutDelete), - } - - if _, err := stateConf.WaitForState(); err != nil { - return fmt.Errorf("Error waiting for IoT Device Provisioning Service %q (Resource Group %q) to be deleted: %+v", name, resourceGroup, err) - } - - return nil -} - -func iotdpsStateStatusCodeRefreshFunc(ctx context.Context, client *iothub.IotDpsResourceClient, resourceGroup, name string) resource.StateRefreshFunc { - return func() (interface{}, string, error) { - res, err := client.Get(ctx, name, resourceGroup) - - log.Printf("Retrieving IoT Device Provisioning Service %q (Resource Group %q) returned Status %d", resourceGroup, name, res.StatusCode) - - if err != nil { - if utils.ResponseWasNotFound(res.Response) { - return res, strconv.Itoa(res.StatusCode), nil - } - return nil, "", fmt.Errorf("Error polling for the status of the IoT Device Provisioning Service %q (Resource Group %q): %+v", name, resourceGroup, err) - } - - return res, strconv.Itoa(res.StatusCode), nil - } -} - -func expandIoTDPSSku(d *schema.ResourceData) *iothub.IotDpsSkuInfo { - skuList := d.Get("sku").([]interface{}) - skuMap := skuList[0].(map[string]interface{}) - capacity := int64(skuMap["capacity"].(int)) - - name := skuMap["name"].(string) - tier := skuMap["tier"].(string) - - return &iothub.IotDpsSkuInfo{ - Name: iothub.IotDpsSku(name), - Tier: utils.String(tier), - Capacity: utils.Int64(capacity), - } -} - -func expandIoTDPSIoTHubs(input []interface{}) *[]iothub.DefinitionDescription { - linkedHubs := make([]iothub.DefinitionDescription, 0) - - for _, attr := range input { - linkedHubConfig := attr.(map[string]interface{}) - linkedHub := iothub.DefinitionDescription{ - ConnectionString: utils.String(linkedHubConfig["connection_string"].(string)), - AllocationWeight: utils.Int32(int32(linkedHubConfig["allocation_weight"].(int))), - ApplyAllocationPolicy: utils.Bool(linkedHubConfig["apply_allocation_policy"].(bool)), - Location: utils.String(linkedHubConfig["location"].(string)), - } - - linkedHubs = append(linkedHubs, linkedHub) - } - - return &linkedHubs -} - -func flattenIoTDPSSku(input *iothub.IotDpsSkuInfo) []interface{} { - output := make(map[string]interface{}) - - output["name"] = string(input.Name) - output["tier"] = input.Tier - if capacity := input.Capacity; capacity != nil { - output["capacity"] = int(*capacity) - } - - return []interface{}{output} -} - -func flattenIoTDPSLinkedHub(input *[]iothub.DefinitionDescription) []interface{} { - linkedHubs := make([]interface{}, 0) - if input == nil { - return linkedHubs - } - - for _, attr := range *input { - linkedHub := make(map[string]interface{}) - - if attr.Name != nil { - linkedHub["hostname"] = *attr.Name - } - if attr.ApplyAllocationPolicy != nil { - linkedHub["apply_allocation_policy"] = *attr.ApplyAllocationPolicy - } - if attr.AllocationWeight != nil { - linkedHub["allocation_weight"] = *attr.AllocationWeight - } - if attr.ConnectionString != nil { - linkedHub["connection_string"] = *attr.ConnectionString - } - if attr.Location != nil { - linkedHub["location"] = *attr.Location - } - - linkedHubs = append(linkedHubs, linkedHub) - } - - return linkedHubs -} diff --git a/azurerm/internal/services/iothub/resource_arm_iot_dps_certificate.go b/azurerm/internal/services/iothub/resource_arm_iot_dps_certificate.go deleted file mode 100644 index 694cbf1a8fe15..0000000000000 --- a/azurerm/internal/services/iothub/resource_arm_iot_dps_certificate.go +++ /dev/null @@ -1,174 +0,0 @@ -package iothub - -import ( - "fmt" - "time" - - "github.com/Azure/azure-sdk-for-go/services/provisioningservices/mgmt/2018-01-22/iothub" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmIotDPSCertificate() *schema.Resource { - return &schema.Resource{ - Create: resourceArmIotDPSCertificateCreateUpdate, - Read: resourceArmIotDPSCertificateRead, - Update: resourceArmIotDPSCertificateCreateUpdate, - Delete: resourceArmIotDPSCertificateDelete, - - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - DeprecationMessage: `The 'azurerm_iot_dps_certificate' resource is deprecated in favour of the renamed version 'azurerm_iothub_dps_certificate'. - -Information on migrating to the renamed resource can be found here: https://terraform.io/docs/providers/azurerm/guides/migrating-between-renamed-resources.html - -As such the existing 'azurerm_iot_dps_certificate' resource is deprecated and will be removed in the next major version of the AzureRM Provider (2.0). -`, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validate.IoTHubName, - }, - - "resource_group_name": azure.SchemaResourceGroupName(), - - "iot_dps_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validate.IoTHubName, - }, - - "certificate_content": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringIsNotEmpty, - Sensitive: true, - }, - }, - } -} - -func resourceArmIotDPSCertificateCreateUpdate(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).IoTHub.DPSCertificateClient - ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) - defer cancel() - - name := d.Get("name").(string) - resourceGroup := d.Get("resource_group_name").(string) - iotDPSName := d.Get("iot_dps_name").(string) - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, name, resourceGroup, iotDPSName, "") - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing IoT Device Provisioning Service Certificate %q (Device Provisioning Service %q / Resource Group %q): %+v", name, iotDPSName, resourceGroup, err) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_iot_dps_certificate", *existing.ID) - } - } - - certificate := iothub.CertificateBodyDescription{ - Certificate: utils.String(d.Get("certificate_content").(string)), - } - - if _, err := client.CreateOrUpdate(ctx, resourceGroup, iotDPSName, name, certificate, ""); err != nil { - return fmt.Errorf("Error creating/updating IoT Device Provisioning Service Certificate %q (Device Provisioning Service %q / Resource Group %q): %+v", name, iotDPSName, resourceGroup, err) - } - - resp, err := client.Get(ctx, name, resourceGroup, iotDPSName, "") - if err != nil { - return fmt.Errorf("Error retrieving IoT Device Provisioning Service Certificate %q (Device Provisioning Service %q / Resource Group %q): %+v", name, iotDPSName, resourceGroup, err) - } - - if resp.ID == nil { - return fmt.Errorf("Cannot read IoT Device Provisioning Service Certificate %q (Device Provisioning Service %q / Resource Group %q): %+v", name, iotDPSName, resourceGroup, err) - } - - d.SetId(*resp.ID) - - return resourceArmIotDPSCertificateRead(d, meta) -} - -func resourceArmIotDPSCertificateRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).IoTHub.DPSCertificateClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - resourceGroup := id.ResourceGroup - iotDPSName := id.Path["provisioningServices"] - name := id.Path["certificates"] - - resp, err := client.Get(ctx, name, resourceGroup, iotDPSName, "") - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil - } - return fmt.Errorf("Error retrieving IoT Device Provisioning Service Certificate %q (Device Provisioning Service %q / Resource Group %q): %+v", name, iotDPSName, resourceGroup, err) - } - - d.Set("name", resp.Name) - d.Set("resource_group_name", resourceGroup) - d.Set("iot_dps_name", iotDPSName) - // We are unable to set `certificate_content` since it is not returned from the API - - return nil -} - -func resourceArmIotDPSCertificateDelete(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).IoTHub.DPSCertificateClient - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - resourceGroup := id.ResourceGroup - iotDPSName := id.Path["provisioningServices"] - name := id.Path["certificates"] - - resp, err := client.Get(ctx, name, resourceGroup, iotDPSName, "") - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - return nil - } - return fmt.Errorf("Error retrieving IoT Device Provisioning Service Certificate %q (Device Provisioning Service %q / Resource Group %q): %+v", name, iotDPSName, resourceGroup, err) - } - - if resp.Etag == nil { - return fmt.Errorf("Error deleting IoT Device Provisioning Service Certificate %q (Device Provisioning Service %q / Resource Group %q) because Etag is nil", name, iotDPSName, resourceGroup) - } - - // TODO address this delete call if https://github.com/Azure/azure-rest-api-specs/pull/6311 get's merged - if _, err := client.Delete(ctx, resourceGroup, *resp.Etag, iotDPSName, name, "", nil, nil, iothub.ServerAuthentication, nil, nil, nil, ""); err != nil { - return fmt.Errorf("Error deleting IoT Device Provisioning Service Certificate %q (Device Provisioning Service %q / Resource Group %q): %+v", name, iotDPSName, resourceGroup, err) - } - return nil -} diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iot_dps_certificate_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iot_dps_certificate_test.go deleted file mode 100644 index 03bf322e7f417..0000000000000 --- a/azurerm/internal/services/iothub/tests/resource_arm_iot_dps_certificate_test.go +++ /dev/null @@ -1,216 +0,0 @@ -package tests - -import ( - "fmt" - "net/http" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" -) - -func TestAccAzureRMIotDPSCertificate_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_iot_dps_certificate", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMIotDPSCertificateDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMIotDPSCertificate_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMIotDPSCertificateExists(data.ResourceName), - ), - }, - data.ImportStep("certificate_content"), - }, - }) -} - -func TestAccAzureRMIotDPSCertificate_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - - data := acceptance.BuildTestData(t, "azurerm_iot_dps_certificate", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMIotDPSCertificateDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMIotDPSCertificate_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMIotDPSCertificateExists(data.ResourceName), - ), - }, - { - Config: testAccAzureRMIotDPSCertificate_requiresImport(data), - ExpectError: acceptance.RequiresImportError("azurerm_iotdps"), - }, - }, - }) -} - -func TestAccAzureRMIotDPSCertificate_update(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_iot_dps_certificate", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMIotDPSCertificateDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMIotDPSCertificate_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMIotDPSCertificateExists(data.ResourceName), - ), - }, - data.ImportStep("certificate_content"), - { - Config: testAccAzureRMIotDPSCertificate_update(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMIotDPSCertificateExists(data.ResourceName), - ), - }, - data.ImportStep("certificate_content"), - }, - }) -} - -func testCheckAzureRMIotDPSCertificateDestroy(s *terraform.State) error { - client := acceptance.AzureProvider.Meta().(*clients.Client).IoTHub.DPSCertificateClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_iot_dps_certificate" { - continue - } - - name := rs.Primary.Attributes["name"] - resourceGroup := rs.Primary.Attributes["resource_group_name"] - iotDPSName := rs.Primary.Attributes["iot_dps_name"] - - resp, err := client.Get(ctx, name, resourceGroup, iotDPSName, "") - - if err != nil { - return nil - } - - if resp.StatusCode != http.StatusNotFound { - return fmt.Errorf("IoT Device Provisioning Service Certificate %s still exists in (device provisioning service %s / resource group %s)", name, iotDPSName, resourceGroup) - } - } - return nil -} - -func testCheckAzureRMIotDPSCertificateExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - client := acceptance.AzureProvider.Meta().(*clients.Client).IoTHub.DPSCertificateClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - rs, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %s", resourceName) - } - name := rs.Primary.Attributes["name"] - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - iotDPSName := rs.Primary.Attributes["iot_dps_name"] - - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for IoT Device Provisioning Service Certificate: %s", name) - } - - resp, err := client.Get(ctx, name, resourceGroup, iotDPSName, "") - if err != nil { - if resp.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: IoT Device Provisioning Service Certificate %q (Device Provisioning Service %q / Resource Group %q) does not exist", name, iotDPSName, resourceGroup) - } - - return fmt.Errorf("Bad: Get on iothubDPSCertificateClient: %+v", err) - } - - return nil - } -} - -func testAccAzureRMIotDPSCertificate_basic(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_iot_dps" "test" { - name = "acctestIoTDPS-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - - sku { - name = "S1" - capacity = "1" - } -} - -resource "azurerm_iot_dps_certificate" "test" { - name = "acctestIoTDPSCertificate-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - iot_dps_name = "${azurerm_iot_dps.test.name}" - - certificate_content = "${filebase64("testdata/batch_certificate.cer")}" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) -} - -func testAccAzureRMIotDPSCertificate_requiresImport(data acceptance.TestData) string { - template := testAccAzureRMIotDPS_basic(data) - return fmt.Sprintf(` -%s - -resource "azurerm_iot_dps_certificate" "test" { - name = "${azurerm_iot_dps_certificate.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - iot_dps_name = "${azurerm_iot_dps.test.name}" - - certificate_content = "${filebase64("testdata/batch_certificate.cer")}" -} -`, template) -} - -func testAccAzureRMIotDPSCertificate_update(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_iot_dps" "test" { - name = "acctestIoTDPS-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - - sku { - name = "S1" - capacity = "1" - } - - tags = { - purpose = "testing" - } -} - -resource "azurerm_iot_dps_certificate" "test" { - name = "acctestIoTDPSCertificate-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - iot_dps_name = "${azurerm_iot_dps.test.name}" - - certificate_content = "${filebase64("testdata/application_gateway_test.cer")}" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) -} diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iot_dps_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iot_dps_test.go deleted file mode 100644 index 8283155704e49..0000000000000 --- a/azurerm/internal/services/iothub/tests/resource_arm_iot_dps_test.go +++ /dev/null @@ -1,284 +0,0 @@ -package tests - -import ( - "fmt" - "net/http" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" -) - -func TestAccAzureRMIotDPS_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_iot_dps", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMIotDPSDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMIotDPS_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMIotDPSExists(data.ResourceName), - ), - }, - data.ImportStep(), - }, - }) -} - -func TestAccAzureRMIotDPS_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - - data := acceptance.BuildTestData(t, "azurerm_iot_dps", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMIotDPSDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMIotDPS_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMIotDPSExists(data.ResourceName), - ), - }, - { - Config: testAccAzureRMIotDPS_requiresImport(data), - ExpectError: acceptance.RequiresImportError("azurerm_iotdps"), - }, - }, - }) -} - -func TestAccAzureRMIotDPS_update(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_iot_dps", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMIotDPSDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMIotDPS_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMIotDPSExists(data.ResourceName), - ), - }, - data.ImportStep(), - { - Config: testAccAzureRMIotDPS_update(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMIotDPSExists(data.ResourceName), - ), - }, - data.ImportStep(), - }, - }) -} - -func TestAccAzureRMIotDPS_linkedHubs(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_iot_dps", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMIotDPSDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMIotDPS_linkedHubs(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMIotDPSExists(data.ResourceName), - ), - }, - data.ImportStep(), - { - Config: testAccAzureRMIotDPS_linkedHubsUpdated(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMIotDPSExists(data.ResourceName), - ), - }, - data.ImportStep(), - }, - }) -} - -func testCheckAzureRMIotDPSDestroy(s *terraform.State) error { - client := acceptance.AzureProvider.Meta().(*clients.Client).IoTHub.DPSResourceClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_iotdps" { - continue - } - - name := rs.Primary.Attributes["name"] - resourceGroup := rs.Primary.Attributes["resource_group_name"] - - resp, err := client.Get(ctx, resourceGroup, name) - - if err != nil { - return nil - } - - if resp.StatusCode != http.StatusNotFound { - return fmt.Errorf("IoT Device Provisioning Service %s still exists in resource group %s", name, resourceGroup) - } - } - return nil -} - -func testCheckAzureRMIotDPSExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - client := acceptance.AzureProvider.Meta().(*clients.Client).IoTHub.DPSResourceClient - - rs, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %s", resourceName) - } - iotdpsName := rs.Primary.Attributes["name"] - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for IoT Device Provisioning Service: %s", iotdpsName) - } - - resp, err := client.Get(ctx, iotdpsName, resourceGroup) - if err != nil { - if resp.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: IoT Device Provisioning Service %q (Resource Group %q) does not exist", iotdpsName, resourceGroup) - } - - return fmt.Errorf("Bad: Get on iothubDPSResourceClient: %+v", err) - } - - return nil - } -} - -func testAccAzureRMIotDPS_basic(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_iot_dps" "test" { - name = "acctestIoTDPS-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - - sku { - name = "S1" - capacity = "1" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - -func testAccAzureRMIotDPS_requiresImport(data acceptance.TestData) string { - template := testAccAzureRMIotDPS_basic(data) - return fmt.Sprintf(` -%s - -resource "azurerm_iot_dps" "import" { - name = "${azurerm_iot_dps.test.name}" - resource_group_name = "${azurerm_iot_dps.test.resource_group_name}" - location = "${azurerm_iot_dps.test.location}" - - sku { - name = "S1" - capacity = "1" - } -} -`, template) -} - -func testAccAzureRMIotDPS_update(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_iot_dps" "test" { - name = "acctestIoTDPS-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - - sku { - name = "S1" - capacity = "1" - } - - tags = { - purpose = "testing" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - -func testAccAzureRMIotDPS_linkedHubs(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_iot_dps" "test" { - name = "acctestIoTDPS-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - - sku { - name = "S1" - capacity = "1" - } - - linked_hub { - connection_string = "HostName=test.azure-devices.net;SharedAccessKeyName=iothubowner;SharedAccessKey=booo" - location = "${azurerm_resource_group.test.location}" - allocation_weight = 15 - apply_allocation_policy = true - } - - linked_hub { - connection_string = "HostName=test2.azure-devices.net;SharedAccessKeyName=iothubowner2;SharedAccessKey=key2" - location = "${azurerm_resource_group.test.location}" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - -func testAccAzureRMIotDPS_linkedHubsUpdated(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_iot_dps" "test" { - name = "acctestIoTDPS-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - - sku { - name = "S1" - capacity = "1" - } - - linked_hub { - connection_string = "HostName=test.azure-devices.net;SharedAccessKeyName=iothubowner;SharedAccessKey=booo" - location = "${azurerm_resource_group.test.location}" - allocation_weight = 150 - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} From 514b6562ac0d1dfb09ca1ee6a8837cccfe4bfeb9 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Fri, 14 Feb 2020 13:20:35 +0000 Subject: [PATCH 108/498] Minor formatting update. Added azurerm_role_definition data source note --- website/docs/guides/2.0-upgrade-guide.html.markdown | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index 6382c36896385..b70630ce6bb6d 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -169,6 +169,10 @@ The deprecated field `internal_fqdn` will be removed. The deprecated field `network_interface_ids` will be removed. +### Date Source: `azurerm_role_definition` + +The Data Source no longer supports the alias `VirtualMachineContributor` for the Built-in role `Virtual Machine Contributor`. + ### Data Source: `azurerm_scheduler_job_collection` Azure Scheduler is being retired in favour of Logic Apps ([more information can be found here](https://docs.microsoft.com/en-us/azure/scheduler/migrate-from-scheduler-to-logic-apps)) - as such this Data Source will be removed. @@ -287,15 +291,15 @@ The deprecated `zone_type` field will be removed. This has been replaced by the The deprecated `location` field will be removed, since this is no longer used. -## Resource: `azurerm_eventhub_authorization_rule` +### Resource: `azurerm_eventhub_authorization_rule` The deprecated `location` field will be removed, since this is no longer used. -## Resource: `azurerm_eventhub_consumer_group` +### Resource: `azurerm_eventhub_consumer_group` The deprecated `location` field will be removed, since this is no longer used. -## Resource: `azurerm_eventhub_namespace` +^### Resource: `azurerm_eventhub_namespace` The deprecated `kafka_enabled` field will be removed, since this is no longer used. @@ -383,7 +387,7 @@ The `load_balancer_backend_address_pools_ids` field in the `ip_configuration` bl The `load_balancer_inbound_nat_rules_ids` field in the `ip_configuration` block will been removed. This has been replaced by the `azurerm_network_interface_nat_rule_association` resource. -## Resource: `azurerm_notification_hub_namespace` +^### Resource: `azurerm_notification_hub_namespace` The deprecated `sku` block has been replaced by the `sku_name` field and will be removed. From f5a4293b4a886deea7b16e959babd384c4586297 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Fri, 14 Feb 2020 13:23:45 +0000 Subject: [PATCH 109/498] removed unintended carets --- website/docs/guides/2.0-upgrade-guide.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index b70630ce6bb6d..cbcfc6a085892 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -299,7 +299,7 @@ The deprecated `location` field will be removed, since this is no longer used. The deprecated `location` field will be removed, since this is no longer used. -^### Resource: `azurerm_eventhub_namespace` +### Resource: `azurerm_eventhub_namespace` The deprecated `kafka_enabled` field will be removed, since this is no longer used. @@ -387,7 +387,7 @@ The `load_balancer_backend_address_pools_ids` field in the `ip_configuration` bl The `load_balancer_inbound_nat_rules_ids` field in the `ip_configuration` block will been removed. This has been replaced by the `azurerm_network_interface_nat_rule_association` resource. -^### Resource: `azurerm_notification_hub_namespace` +### Resource: `azurerm_notification_hub_namespace` The deprecated `sku` block has been replaced by the `sku_name` field and will be removed. From 9f487ee9670b8888caa67e8c605a8ebdec4750c8 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 14 Feb 2020 14:25:15 +0100 Subject: [PATCH 110/498] linting --- .../services/mssql/tests/resource_arm_mssql_elasticpool_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/mssql/tests/resource_arm_mssql_elasticpool_test.go b/azurerm/internal/services/mssql/tests/resource_arm_mssql_elasticpool_test.go index 2d693a5b1dccd..f131eaa6c2377 100644 --- a/azurerm/internal/services/mssql/tests/resource_arm_mssql_elasticpool_test.go +++ b/azurerm/internal/services/mssql/tests/resource_arm_mssql_elasticpool_test.go @@ -339,7 +339,7 @@ resource "azurerm_mssql_elasticpool" "import" { location = "${azurerm_mssql_elasticpool.test.location}" server_name = "${azurerm_mssql_elasticpool.test.server_name}" max_size_gb = 4.8828125 - + sku { name = "BasicPool" tier = "Basic" From 976f85ee48cee04f4c155fd287fe6203829cc771 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 14 Feb 2020 14:26:19 +0100 Subject: [PATCH 111/498] removing dead code --- .../resource_arm_postgresql_server_test.go | 29 ------------------- 1 file changed, 29 deletions(-) diff --git a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go index b6a6ad04b8ea9..a02ee21b42dd4 100644 --- a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go +++ b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go @@ -353,35 +353,6 @@ resource "azurerm_postgresql_server" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, version) } -func testAccAzureRMPostgreSQLServer_basicNinePointFiveOldSku(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-psql-%d" - location = "%s" -} - -resource "azurerm_postgresql_server" "test" { - name = "acctest-psql-server-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - sku_name = "GP_Gen5_2" - - storage_profile { - storage_mb = 51200 - backup_retention_days = 7 - geo_redundant_backup = "Disabled" - auto_grow = "Disabled" - } - - administrator_login = "acctestun" - administrator_login_password = "H@Sh1CoR3!" - version = "%s" - ssl_enforcement = "Enabled" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, "9.5") -} - func testAccAzureRMPostgreSQLServer_basicNinePointFive(data acceptance.TestData) string { return testAccAzureRMPostgreSQLServer_basic(data, "9.5") } From adb6f592e49249dd5092dca1b7095a382e671ee2 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 14 Feb 2020 13:49:10 +0100 Subject: [PATCH 112/498] r/network_interface: introducing a separate update method --- azurerm/helpers/azure/contains.go | 11 + .../keyvault/resource_arm_key_vault.go | 4 +- .../network/network_interface_locking.go | 61 ++ .../resource_arm_ddos_protection_plan.go | 2 +- .../services/network/resource_arm_firewall.go | 8 +- ...source_arm_network_ddos_protection_plan.go | 2 +- .../network/resource_arm_network_interface.go | 639 ++++++++++-------- .../network/resource_arm_network_profile.go | 4 +- .../network/resource_arm_virtual_network.go | 4 +- 9 files changed, 446 insertions(+), 289 deletions(-) create mode 100644 azurerm/helpers/azure/contains.go create mode 100644 azurerm/internal/services/network/network_interface_locking.go diff --git a/azurerm/helpers/azure/contains.go b/azurerm/helpers/azure/contains.go new file mode 100644 index 0000000000000..d6357dc3cc5bb --- /dev/null +++ b/azurerm/helpers/azure/contains.go @@ -0,0 +1,11 @@ +package azure + +func SliceContainsValue(input []string, value string) bool { + for _, v := range input { + if v == value { + return true + } + } + + return false +} diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault.go b/azurerm/internal/services/keyvault/resource_arm_key_vault.go index 62d559c4d2f13..b8794993e092a 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault.go @@ -290,7 +290,7 @@ func resourceArmKeyVaultCreateUpdate(d *schema.ResourceData, meta interface{}) e } virtualNetworkName := id.Path["virtualNetworks"] - if !network.SliceContainsValue(virtualNetworkNames, virtualNetworkName) { + if !azure.SliceContainsValue(virtualNetworkNames, virtualNetworkName) { virtualNetworkNames = append(virtualNetworkNames, virtualNetworkName) } } @@ -437,7 +437,7 @@ func resourceArmKeyVaultDelete(d *schema.ResourceData, meta interface{}) error { } virtualNetworkName := id.Path["virtualNetworks"] - if !network.SliceContainsValue(virtualNetworkNames, virtualNetworkName) { + if !azure.SliceContainsValue(virtualNetworkNames, virtualNetworkName) { virtualNetworkNames = append(virtualNetworkNames, virtualNetworkName) } } diff --git a/azurerm/internal/services/network/network_interface_locking.go b/azurerm/internal/services/network/network_interface_locking.go new file mode 100644 index 0000000000000..9e599ce482b8b --- /dev/null +++ b/azurerm/internal/services/network/network_interface_locking.go @@ -0,0 +1,61 @@ +package network + +import ( + "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-09-01/network" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/locks" +) + +type networkInterfaceIPConfigurationLockingDetails struct { + subnetNamesToLock []string + virtualNetworkNamesToLock []string +} + +func (details networkInterfaceIPConfigurationLockingDetails) lock() { + locks.MultipleByName(&details.subnetNamesToLock, SubnetResourceName) + locks.MultipleByName(&details.virtualNetworkNamesToLock, VirtualNetworkResourceName) +} + +func (details networkInterfaceIPConfigurationLockingDetails) unlock() { + locks.UnlockMultipleByName(&details.subnetNamesToLock, SubnetResourceName) + locks.UnlockMultipleByName(&details.virtualNetworkNamesToLock, VirtualNetworkResourceName) +} + +func determineResourcesToLockFromIPConfiguration(input *[]network.InterfaceIPConfiguration) (*networkInterfaceIPConfigurationLockingDetails, error) { + if input == nil { + return &networkInterfaceIPConfigurationLockingDetails{ + subnetNamesToLock: []string{}, + virtualNetworkNamesToLock: []string{}, + }, nil + } + + subnetNamesToLock := make([]string, 0) + virtualNetworkNamesToLock := make([]string, 0) + + for _, config := range *input { + if config.Subnet == nil || config.Subnet.ID == nil { + continue + } + + id, err := azure.ParseAzureResourceID(*config.Subnet.ID) + if err != nil { + return nil, err + } + + virtualNetworkName := id.Path["virtualNetworks"] + subnetName := id.Path["subnets"] + + if !azure.SliceContainsValue(virtualNetworkNamesToLock, virtualNetworkName) { + virtualNetworkNamesToLock = append(virtualNetworkNamesToLock, virtualNetworkName) + } + + if !azure.SliceContainsValue(subnetNamesToLock, subnetName) { + subnetNamesToLock = append(subnetNamesToLock, subnetName) + } + } + + return &networkInterfaceIPConfigurationLockingDetails{ + subnetNamesToLock: subnetNamesToLock, + virtualNetworkNamesToLock: virtualNetworkNamesToLock, + }, nil +} diff --git a/azurerm/internal/services/network/resource_arm_ddos_protection_plan.go b/azurerm/internal/services/network/resource_arm_ddos_protection_plan.go index 29edffb05e505..10c5377ba10e7 100644 --- a/azurerm/internal/services/network/resource_arm_ddos_protection_plan.go +++ b/azurerm/internal/services/network/resource_arm_ddos_protection_plan.go @@ -229,7 +229,7 @@ func extractVnetNames(d *schema.ResourceData) (*[]string, error) { vnetName := vnetResourceID.Path["virtualNetworks"] - if !SliceContainsValue(vnetNames, vnetName) { + if !azure.SliceContainsValue(vnetNames, vnetName) { vnetNames = append(vnetNames, vnetName) } } diff --git a/azurerm/internal/services/network/resource_arm_firewall.go b/azurerm/internal/services/network/resource_arm_firewall.go index 9b4ac25596ad5..c825d2e914d8d 100644 --- a/azurerm/internal/services/network/resource_arm_firewall.go +++ b/azurerm/internal/services/network/resource_arm_firewall.go @@ -267,12 +267,12 @@ func resourceArmFirewallDelete(d *schema.ResourceData, meta interface{}) error { } subnetName := parsedSubnetId.Path["subnets"] - if !SliceContainsValue(subnetNamesToLock, subnetName) { + if !azure.SliceContainsValue(subnetNamesToLock, subnetName) { subnetNamesToLock = append(subnetNamesToLock, subnetName) } virtualNetworkName := parsedSubnetId.Path["virtualNetworks"] - if !SliceContainsValue(virtualNetworkNamesToLock, virtualNetworkName) { + if !azure.SliceContainsValue(virtualNetworkNamesToLock, virtualNetworkName) { virtualNetworkNamesToLock = append(virtualNetworkNamesToLock, virtualNetworkName) } } @@ -338,11 +338,11 @@ func expandArmFirewallIPConfigurations(d *schema.ResourceData) (*[]network.Azure subnetName := subnetID.Path["subnets"] virtualNetworkName := subnetID.Path["virtualNetworks"] - if !SliceContainsValue(subnetNamesToLock, subnetName) { + if !azure.SliceContainsValue(subnetNamesToLock, subnetName) { subnetNamesToLock = append(subnetNamesToLock, subnetName) } - if !SliceContainsValue(virtualNetworkNamesToLock, virtualNetworkName) { + if !azure.SliceContainsValue(virtualNetworkNamesToLock, virtualNetworkName) { virtualNetworkNamesToLock = append(virtualNetworkNamesToLock, virtualNetworkName) } diff --git a/azurerm/internal/services/network/resource_arm_network_ddos_protection_plan.go b/azurerm/internal/services/network/resource_arm_network_ddos_protection_plan.go index f8c8b7131d434..3f8f2f8dfb534 100644 --- a/azurerm/internal/services/network/resource_arm_network_ddos_protection_plan.go +++ b/azurerm/internal/services/network/resource_arm_network_ddos_protection_plan.go @@ -223,7 +223,7 @@ func expandArmNetworkDDoSProtectionPlanVnetNames(d *schema.ResourceData) (*[]str vnetName := vnetResourceID.Path["virtualNetworks"] - if !SliceContainsValue(vnetNames, vnetName) { + if !azure.SliceContainsValue(vnetNames, vnetName) { vnetNames = append(vnetNames, vnetName) } } diff --git a/azurerm/internal/services/network/resource_arm_network_interface.go b/azurerm/internal/services/network/resource_arm_network_interface.go index 67d9a448b7fb1..108413b84da73 100644 --- a/azurerm/internal/services/network/resource_arm_network_interface.go +++ b/azurerm/internal/services/network/resource_arm_network_interface.go @@ -3,7 +3,6 @@ package network import ( "fmt" "log" - "strings" "time" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-09-01/network" @@ -12,7 +11,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/locks" @@ -26,9 +24,9 @@ var networkInterfaceResourceName = "azurerm_network_interface" func resourceArmNetworkInterface() *schema.Resource { return &schema.Resource{ - Create: resourceArmNetworkInterfaceCreateUpdate, + Create: resourceArmNetworkInterfaceCreate, Read: resourceArmNetworkInterfaceRead, - Update: resourceArmNetworkInterfaceCreateUpdate, + Update: resourceArmNetworkInterfaceUpdate, Delete: resourceArmNetworkInterfaceDelete, Importer: &schema.ResourceImporter{ @@ -53,26 +51,13 @@ func resourceArmNetworkInterface() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), + // NOTE: does this want it's own association resource? "network_security_group_id": { Type: schema.TypeString, Optional: true, ValidateFunc: azure.ValidateResourceIDOrEmpty, }, - "mac_address": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ValidateFunc: validate.MACAddress, - }, - - "virtual_machine_id": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ValidateFunc: azure.ValidateResourceID, - }, - "ip_configuration": { Type: schema.TypeList, Required: true, @@ -107,7 +92,6 @@ func resourceArmNetworkInterface() *schema.Resource { }, false), }, - //TODO: should this be renamed to private_ip_address_allocation_method or private_ip_allocation_method ? "private_ip_address_allocation": { Type: schema.TypeString, Required: true, @@ -193,6 +177,18 @@ func resourceArmNetworkInterface() *schema.Resource { Set: schema.HashString, }, + "enable_accelerated_networking": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + + "enable_ip_forwarding": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + "internal_dns_name_label": { Type: schema.TypeString, Optional: true, @@ -200,45 +196,22 @@ func resourceArmNetworkInterface() *schema.Resource { ValidateFunc: validation.StringIsNotEmpty, }, + "tags": tags.Schema(), + + // Computed "applied_dns_servers": { - Type: schema.TypeSet, - Optional: true, + Type: schema.TypeList, Computed: true, Elem: &schema.Schema{ - Type: schema.TypeString, - ValidateFunc: validation.StringIsNotEmpty, + Type: schema.TypeString, }, - Set: schema.HashString, }, - "internal_fqdn": { - Type: schema.TypeString, - Optional: true, - Computed: true, - Deprecated: "This field has been removed by Azure", - }, - - /** - * As of 2018-01-06: AN (aka. SR-IOV) on Azure is GA on Windows and Linux. - * - * Refer to: https://azure.microsoft.com/en-us/blog/maximize-your-vm-s-performance-with-accelerated-networking-now-generally-available-for-both-windows-and-linux/ - * - * Refer to: https://docs.microsoft.com/en-us/azure/virtual-network/create-vm-accelerated-networking-cli - * For details, VM configuration and caveats. - */ - "enable_accelerated_networking": { - Type: schema.TypeBool, - Optional: true, - Default: false, - }, - - "enable_ip_forwarding": { - Type: schema.TypeBool, - Optional: true, - Default: false, + "mac_address": { + Type: schema.TypeString, + Computed: true, }, - // todo consider removing this one day as it is exposed in `private_ip_addresses.0` "private_ip_address": { Type: schema.TypeString, Computed: true, @@ -252,26 +225,27 @@ func resourceArmNetworkInterface() *schema.Resource { }, }, - "tags": tags.Schema(), + "virtual_machine_id": { + Type: schema.TypeString, + Computed: true, + }, }, } } -func resourceArmNetworkInterfaceCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceArmNetworkInterfaceCreate(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Network.InterfacesClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() - log.Printf("[INFO] preparing arguments for AzureRM Network Interface creation.") - name := d.Get("name").(string) - resGroup := d.Get("resource_group_name").(string) + resourceGroup := d.Get("resource_group_name").(string) if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, resGroup, name, "") + existing, err := client.Get(ctx, resourceGroup, name, "") if err != nil { if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing Network Interface %q (Resource Group %q): %s", name, resGroup, err) + return fmt.Errorf("Error checking for presence of existing Network Interface %q (Resource Group %q): %s", name, resourceGroup, err) } } @@ -313,70 +287,176 @@ func resourceArmNetworkInterfaceCreateUpdate(d *schema.ResourceData, meta interf dns, hasDns := d.GetOk("dns_servers") nameLabel, hasNameLabel := d.GetOk("internal_dns_name_label") if hasDns || hasNameLabel { - ifaceDnsSettings := network.InterfaceDNSSettings{} + dnsSettings := network.InterfaceDNSSettings{} if hasDns { - var dnsServers []string - dns := dns.(*schema.Set).List() - for _, v := range dns { - str := v.(string) - dnsServers = append(dnsServers, str) - } - ifaceDnsSettings.DNSServers = &dnsServers + dnsRaw := dns.(*schema.Set).List() + dns := expandNetworkInterfaceDnsServers(dnsRaw) + dnsSettings.DNSServers = &dns } if hasNameLabel { name_label := nameLabel.(string) - ifaceDnsSettings.InternalDNSNameLabel = &name_label + dnsSettings.InternalDNSNameLabel = &name_label } - properties.DNSSettings = &ifaceDnsSettings + properties.DNSSettings = &dnsSettings } - ipConfigs, subnetnToLock, vnnToLock, sgErr := expandAzureRmNetworkInterfaceIpConfigurations(d) - if sgErr != nil { - return fmt.Errorf("Error Building list of Network Interface IP Configurations: %+v", sgErr) + ipConfigsRaw := d.Get("ip_configuration").([]interface{}) + ipConfigs, err := expandNetworkInterfaceIPConfigurations(ipConfigsRaw) + if err != nil { + return fmt.Errorf("Error expanding `ip_configuration`: %+v", err) + } + lockingDetails, err := determineResourcesToLockFromIPConfiguration(&ipConfigs) + if err != nil { + return fmt.Errorf("Error determing locking details: %+v", err) } - locks.MultipleByName(subnetnToLock, SubnetResourceName) - defer locks.UnlockMultipleByName(subnetnToLock, SubnetResourceName) - - locks.MultipleByName(vnnToLock, VirtualNetworkResourceName) - defer locks.UnlockMultipleByName(vnnToLock, VirtualNetworkResourceName) + lockingDetails.lock() + defer lockingDetails.unlock() if len(ipConfigs) > 0 { properties.IPConfigurations = &ipConfigs } iface := network.Interface{ - Name: &name, - Location: &location, + Name: utils.String(name), + Location: utils.String(location), InterfacePropertiesFormat: &properties, Tags: tags.Expand(t), } - future, err := client.CreateOrUpdate(ctx, resGroup, name, iface) + future, err := client.CreateOrUpdate(ctx, resourceGroup, name, iface) if err != nil { - return err + return fmt.Errorf("Error creating Network Interface %q (Resource Group %q): %+v", name, resourceGroup, err) } if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return err + return fmt.Errorf("Error waiting for creation of Network Interface %q (Resource Group %q): %+v", name, resourceGroup, err) } - read, err := client.Get(ctx, resGroup, name, "") + read, err := client.Get(ctx, resourceGroup, name, "") if err != nil { - return err + return fmt.Errorf("Error retrieving Network Interface %q (Resource Group %q): %+v", name, resourceGroup, err) } if read.ID == nil { - return fmt.Errorf("Cannot read NIC %q (resource group %q) ID", name, resGroup) + return fmt.Errorf("Error retrieving Network Interface %q (Resource Group %q): ID was nil", name, resourceGroup) } - d.SetId(*read.ID) return resourceArmNetworkInterfaceRead(d, meta) } +func resourceArmNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Network.InterfacesClient + ctx, cancel := timeouts.ForUpdate(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := azure.ParseAzureResourceID(d.Id()) + if err != nil { + return err + } + resourceGroup := id.ResourceGroup + name := id.Path["networkInterfaces"] + + locks.ByName(name, networkInterfaceResourceName) + defer locks.UnlockByName(name, networkInterfaceResourceName) + + location := azure.NormalizeLocation(d.Get("location").(string)) + update := network.Interface{ + Name: utils.String(name), + Location: utils.String(location), + } + + if d.HasChange("dns_servers") { + if update.InterfacePropertiesFormat == nil { + update.InterfacePropertiesFormat = &network.InterfacePropertiesFormat{} + } + if update.InterfacePropertiesFormat.DNSSettings == nil { + update.InterfacePropertiesFormat.DNSSettings = &network.InterfaceDNSSettings{} + } + + dnsServersRaw := d.Get("dns_servers").(*schema.Set).List() + dnsServers := expandNetworkInterfaceDnsServers(dnsServersRaw) + + update.InterfacePropertiesFormat.DNSSettings.DNSServers = &dnsServers + } + + if d.HasChange("enable_accelerated_networking") { + if update.InterfacePropertiesFormat == nil { + update.InterfacePropertiesFormat = &network.InterfacePropertiesFormat{} + } + + update.InterfacePropertiesFormat.EnableAcceleratedNetworking = utils.Bool(d.Get("enable_accelerated_networking").(bool)) + } + + if d.HasChange("enable_ip_forwarding") { + if update.InterfacePropertiesFormat == nil { + update.InterfacePropertiesFormat = &network.InterfacePropertiesFormat{} + } + + update.InterfacePropertiesFormat.EnableIPForwarding = utils.Bool(d.Get("enable_ip_forwarding").(bool)) + } + + if d.HasChange("internal_dns_name_label") { + if update.InterfacePropertiesFormat == nil { + update.InterfacePropertiesFormat = &network.InterfacePropertiesFormat{} + } + if update.InterfacePropertiesFormat.DNSSettings == nil { + update.InterfacePropertiesFormat.DNSSettings = &network.InterfaceDNSSettings{} + } + + update.InterfacePropertiesFormat.DNSSettings.InternalDNSNameLabel = utils.String(d.Get("internal_dns_name_label").(string)) + } + + if d.HasChange("ip_configuration") { + if update.InterfacePropertiesFormat == nil { + update.InterfacePropertiesFormat = &network.InterfacePropertiesFormat{} + } + + ipConfigsRaw := d.Get("ip_configuration").([]interface{}) + ipConfigs, err := expandNetworkInterfaceIPConfigurations(ipConfigsRaw) + if err != nil { + return fmt.Errorf("Error expanding `ip_configuration`: %+v", err) + } + lockingDetails, err := determineResourcesToLockFromIPConfiguration(&ipConfigs) + if err != nil { + return fmt.Errorf("Error determing locking details: %+v", err) + } + + lockingDetails.lock() + defer lockingDetails.unlock() + + update.InterfacePropertiesFormat.IPConfigurations = &ipConfigs + } + + if d.HasChange("network_security_group_id") { + if update.InterfacePropertiesFormat == nil { + update.InterfacePropertiesFormat = &network.InterfacePropertiesFormat{} + } + + update.InterfacePropertiesFormat.NetworkSecurityGroup = &network.SecurityGroup{ + ID: utils.String(d.Get("network_security_group_id").(string)), + } + } + + if d.HasChange("tags") { + tagsRaw := d.Get("tags").(map[string]interface{}) + update.Tags = tags.Expand(tagsRaw) + } + + future, err := client.CreateOrUpdate(ctx, resourceGroup, name, update) + if err != nil { + return fmt.Errorf("Error updating Network Interface %q (Resource Group %q): %+v", name, resourceGroup, err) + } + if err := future.WaitForCompletionRef(ctx, client.Client); err != nil { + return fmt.Errorf("Error waiting for update of Network Interface %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + return nil +} + func resourceArmNetworkInterfaceRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Network.InterfacesClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) @@ -386,80 +466,88 @@ func resourceArmNetworkInterfaceRead(d *schema.ResourceData, meta interface{}) e if err != nil { return err } - resGroup := id.ResourceGroup + resourceGroup := id.ResourceGroup name := id.Path["networkInterfaces"] - resp, err := client.Get(ctx, resGroup, name, "") + resp, err := client.Get(ctx, resourceGroup, name, "") if err != nil { if utils.ResponseWasNotFound(resp.Response) { d.SetId("") return nil } - return fmt.Errorf("Error making Read request on Azure Network Interface %q (Resource Group %q): %+v", name, resGroup, err) + return fmt.Errorf("Error making Read request on Azure Network Interface %q (Resource Group %q): %+v", name, resourceGroup, err) } d.Set("name", resp.Name) - d.Set("resource_group_name", resGroup) + d.Set("resource_group_name", resourceGroup) if location := resp.Location; location != nil { d.Set("location", azure.NormalizeLocation(*location)) } if props := resp.InterfacePropertiesFormat; props != nil { - d.Set("mac_address", props.MacAddress) - addresses := make([]interface{}, 0) + primaryPrivateIPAddress := "" + privateIPAddresses := make([]interface{}, 0) if configs := props.IPConfigurations; configs != nil { for i, config := range *props.IPConfigurations { if ipProps := config.InterfaceIPConfigurationPropertiesFormat; ipProps != nil { - if v := ipProps.PrivateIPAddress; v != nil { - if i == 0 { - d.Set("private_ip_address", v) - } - addresses = append(addresses, *v) + v := ipProps.PrivateIPAddress + if v == nil { + continue } - } - } - } - if err := d.Set("private_ip_addresses", addresses); err != nil { - return err - } - if props.IPConfigurations != nil { - configs := flattenNetworkInterfaceIPConfigurations(props.IPConfigurations) - if err := d.Set("ip_configuration", configs); err != nil { - return fmt.Errorf("Error setting `ip_configuration`: %+v", err) - } - } + if i == 0 { + primaryPrivateIPAddress = *v + } - if vm := props.VirtualMachine; vm != nil { - d.Set("virtual_machine_id", vm.ID) + privateIPAddresses = append(privateIPAddresses, *v) + } + } } - var appliedDNSServers []string - var dnsServers []string + appliedDNSServers := make([]string, 0) + dnsServers := make([]string, 0) + internalDnsNameLabel := "" if dnsSettings := props.DNSSettings; dnsSettings != nil { - if s := dnsSettings.AppliedDNSServers; s != nil { - appliedDNSServers = *s - } + appliedDNSServers = flattenNetworkInterfaceDnsServers(dnsSettings.AppliedDNSServers) + dnsServers = flattenNetworkInterfaceDnsServers(dnsSettings.DNSServers) - if s := dnsSettings.DNSServers; s != nil { - dnsServers = *s + if dnsSettings.InternalDNSNameLabel != nil { + internalDnsNameLabel = *dnsSettings.InternalDNSNameLabel } + } - d.Set("internal_fqdn", dnsSettings.InternalFqdn) - d.Set("internal_dns_name_label", dnsSettings.InternalDNSNameLabel) + networkSecurityGroupId := "" + if props.NetworkSecurityGroup != nil && props.NetworkSecurityGroup.ID != nil { + networkSecurityGroupId = *props.NetworkSecurityGroup.ID + } + virtualMachineId := "" + if props.VirtualMachine != nil && props.VirtualMachine.ID != nil { + virtualMachineId = *props.VirtualMachine.ID } - d.Set("applied_dns_servers", appliedDNSServers) - d.Set("dns_servers", dnsServers) + if err := d.Set("applied_dns_servers", appliedDNSServers); err != nil { + return fmt.Errorf("Error setting `applied_dns_servers`: %+v", err) + } - if nsg := props.NetworkSecurityGroup; nsg != nil { - d.Set("network_security_group_id", nsg.ID) - } else { - d.Set("network_security_group_id", "") + if err := d.Set("dns_servers", dnsServers); err != nil { + return fmt.Errorf("Error setting `applied_dns_servers`: %+v", err) } d.Set("enable_ip_forwarding", resp.EnableIPForwarding) d.Set("enable_accelerated_networking", resp.EnableAcceleratedNetworking) + d.Set("internal_dns_name_label", internalDnsNameLabel) + d.Set("mac_address", props.MacAddress) + d.Set("network_security_group_id", networkSecurityGroupId) + d.Set("private_ip_address", primaryPrivateIPAddress) + d.Set("virtual_machine_id", virtualMachineId) + + if err := d.Set("ip_configuration", flattenNetworkInterfaceIPConfigurations(props.IPConfigurations)); err != nil { + return fmt.Errorf("Error setting `ip_configuration`: %+v", err) + } + + if err := d.Set("private_ip_addresses", privateIPAddresses); err != nil { + return fmt.Errorf("Error setting `private_ip_addresses`: %+v", err) + } } return tags.FlattenAndSet(d, resp.Tags) @@ -474,14 +562,30 @@ func resourceArmNetworkInterfaceDelete(d *schema.ResourceData, meta interface{}) if err != nil { return err } - resGroup := id.ResourceGroup + resourceGroup := id.ResourceGroup name := id.Path["networkInterfaces"] locks.ByName(name, networkInterfaceResourceName) defer locks.UnlockByName(name, networkInterfaceResourceName) - if v, ok := d.GetOk("network_security_group_id"); ok { - networkSecurityGroupId := v.(string) + existing, err := client.Get(ctx, resourceGroup, name, "") + if err != nil { + if utils.ResponseWasNotFound(existing.Response) { + log.Printf("[DEBUG] Network Interface %q was not found in Resource Group %q - removing from state", name, resourceGroup) + d.SetId("") + return nil + } + + return fmt.Errorf("Error retrieving Network Interface %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + if existing.InterfacePropertiesFormat == nil { + return fmt.Errorf("Error retrieving Network Interface %q (Resource Group %q): `properties` was nil", name, resourceGroup) + } + props := *existing.InterfacePropertiesFormat + + if props.NetworkSecurityGroup != nil && props.NetworkSecurityGroup.ID != nil { + networkSecurityGroupId := *props.NetworkSecurityGroup.ID parsedNsgID, err := azure.ParseAzureResourceID(networkSecurityGroupId) if err != nil { return fmt.Errorf("Error parsing Network Security Group ID %q: %+v", networkSecurityGroupId, err) @@ -493,159 +597,49 @@ func resourceArmNetworkInterfaceDelete(d *schema.ResourceData, meta interface{}) defer locks.UnlockByName(networkSecurityGroupName, networkSecurityGroupResourceName) } - configs := d.Get("ip_configuration").([]interface{}) - subnetNamesToLock := make([]string, 0) - virtualNetworkNamesToLock := make([]string, 0) - - for _, configRaw := range configs { - data := configRaw.(map[string]interface{}) - - subnet_id := data["subnet_id"].(string) - if subnet_id != "" { - subnetId, err2 := azure.ParseAzureResourceID(subnet_id) - if err2 != nil { - return err2 - } - subnetName := subnetId.Path["subnets"] - if !SliceContainsValue(subnetNamesToLock, subnetName) { - subnetNamesToLock = append(subnetNamesToLock, subnetName) - } - - virtualNetworkName := subnetId.Path["virtualNetworks"] - if !SliceContainsValue(virtualNetworkNamesToLock, virtualNetworkName) { - virtualNetworkNamesToLock = append(virtualNetworkNamesToLock, virtualNetworkName) - } - } + lockingDetails, err := determineResourcesToLockFromIPConfiguration(props.IPConfigurations) + if err != nil { + return fmt.Errorf("Error determing locking details: %+v", err) } - locks.MultipleByName(&subnetNamesToLock, SubnetResourceName) - defer locks.UnlockMultipleByName(&subnetNamesToLock, SubnetResourceName) - - locks.MultipleByName(&virtualNetworkNamesToLock, VirtualNetworkResourceName) - defer locks.UnlockMultipleByName(&virtualNetworkNamesToLock, VirtualNetworkResourceName) + lockingDetails.lock() + defer lockingDetails.unlock() - future, err := client.Delete(ctx, resGroup, name) + future, err := client.Delete(ctx, resourceGroup, name) if err != nil { - return fmt.Errorf("Error deleting Network Interface %q (Resource Group %q): %+v", name, resGroup, err) + return fmt.Errorf("Error deleting Network Interface %q (Resource Group %q): %+v", name, resourceGroup, err) } if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for the deletion of Network Interface %q (Resource Group %q): %+v", name, resGroup, err) + return fmt.Errorf("Error waiting for the deletion of Network Interface %q (Resource Group %q): %+v", name, resourceGroup, err) } - return err -} - -func flattenNetworkInterfaceIPConfigurations(ipConfigs *[]network.InterfaceIPConfiguration) []interface{} { - result := make([]interface{}, 0, len(*ipConfigs)) - for _, ipConfig := range *ipConfigs { - niIPConfig := make(map[string]interface{}) - - props := ipConfig.InterfaceIPConfigurationPropertiesFormat - - niIPConfig["name"] = *ipConfig.Name - - if props.Subnet != nil && props.Subnet.ID != nil { - niIPConfig["subnet_id"] = *props.Subnet.ID - } - - niIPConfig["private_ip_address_allocation"] = strings.ToLower(string(props.PrivateIPAllocationMethod)) - - if props.PrivateIPAddress != nil { - niIPConfig["private_ip_address"] = *props.PrivateIPAddress - } - - if props.PrivateIPAddressVersion != "" { - niIPConfig["private_ip_address_version"] = string(props.PrivateIPAddressVersion) - } - - if props.PublicIPAddress != nil { - niIPConfig["public_ip_address_id"] = *props.PublicIPAddress.ID - } - - if props.Primary != nil { - niIPConfig["primary"] = *props.Primary - } - - var poolsAG []interface{} - if props.ApplicationGatewayBackendAddressPools != nil { - for _, pool := range *props.ApplicationGatewayBackendAddressPools { - poolsAG = append(poolsAG, *pool.ID) - } - } - niIPConfig["application_gateway_backend_address_pools_ids"] = schema.NewSet(schema.HashString, poolsAG) - - var pools []interface{} - if props.LoadBalancerBackendAddressPools != nil { - for _, pool := range *props.LoadBalancerBackendAddressPools { - pools = append(pools, *pool.ID) - } - } - niIPConfig["load_balancer_backend_address_pools_ids"] = schema.NewSet(schema.HashString, pools) - - var rules []interface{} - if props.LoadBalancerInboundNatRules != nil { - for _, rule := range *props.LoadBalancerInboundNatRules { - rules = append(rules, *rule.ID) - } - } - niIPConfig["load_balancer_inbound_nat_rules_ids"] = schema.NewSet(schema.HashString, rules) - - securityGroups := make([]interface{}, 0) - if sgs := props.ApplicationSecurityGroups; sgs != nil { - for _, sg := range *sgs { - securityGroups = append(securityGroups, *sg.ID) - } - } - niIPConfig["application_security_group_ids"] = schema.NewSet(schema.HashString, securityGroups) - - result = append(result, niIPConfig) - } - return result + return nil } -func expandAzureRmNetworkInterfaceIpConfigurations(d *schema.ResourceData) ([]network.InterfaceIPConfiguration, *[]string, *[]string, error) { - configs := d.Get("ip_configuration").([]interface{}) - ipConfigs := make([]network.InterfaceIPConfiguration, 0, len(configs)) - subnetNamesToLock := make([]string, 0) - virtualNetworkNamesToLock := make([]string, 0) +func expandNetworkInterfaceIPConfigurations(input []interface{}) ([]network.InterfaceIPConfiguration, error) { + ipConfigs := make([]network.InterfaceIPConfiguration, 0) - for _, configRaw := range configs { + for _, configRaw := range input { data := configRaw.(map[string]interface{}) - subnet_id := data["subnet_id"].(string) - private_ip_allocation_method := data["private_ip_address_allocation"].(string) - private_ip_address_version := network.IPVersion(data["private_ip_address_version"].(string)) + subnetId := data["subnet_id"].(string) + privateIpAllocationMethod := data["private_ip_address_allocation"].(string) + privateIpAddressVersion := network.IPVersion(data["private_ip_address_version"].(string)) - allocationMethod := network.IPAllocationMethod(private_ip_allocation_method) + allocationMethod := network.IPAllocationMethod(privateIpAllocationMethod) properties := network.InterfaceIPConfigurationPropertiesFormat{ PrivateIPAllocationMethod: allocationMethod, - PrivateIPAddressVersion: private_ip_address_version, + PrivateIPAddressVersion: privateIpAddressVersion, } - if private_ip_address_version == network.IPv4 && subnet_id == "" { - return nil, nil, nil, fmt.Errorf("A Subnet ID must be specified for an IPv4 Network Interface.") + if privateIpAddressVersion == network.IPv4 && subnetId == "" { + return nil, fmt.Errorf("A Subnet ID must be specified for an IPv4 Network Interface.") } - if subnet_id != "" { + if subnetId != "" { properties.Subnet = &network.Subnet{ - ID: &subnet_id, - } - - subnetId, err := azure.ParseAzureResourceID(subnet_id) - if err != nil { - return []network.InterfaceIPConfiguration{}, nil, nil, err - } - - subnetName := subnetId.Path["subnets"] - virtualNetworkName := subnetId.Path["virtualNetworks"] - - if !SliceContainsValue(subnetNamesToLock, subnetName) { - subnetNamesToLock = append(subnetNamesToLock, subnetName) - } - - if !SliceContainsValue(virtualNetworkNamesToLock, virtualNetworkName) { - virtualNetworkNamesToLock = append(virtualNetworkNamesToLock, virtualNetworkName) + ID: &subnetId, } } @@ -660,17 +654,16 @@ func expandAzureRmNetworkInterfaceIpConfigurations(d *schema.ResourceData) ([]ne } if v, ok := data["primary"]; ok { - b := v.(bool) - properties.Primary = &b + properties.Primary = utils.Bool(v.(bool)) } if v, ok := data["application_gateway_backend_address_pools_ids"]; ok { var ids []network.ApplicationGatewayBackendAddressPool pools := v.(*schema.Set).List() for _, p := range pools { - pool_id := p.(string) + poolId := p.(string) id := network.ApplicationGatewayBackendAddressPool{ - ID: &pool_id, + ID: &poolId, } ids = append(ids, id) @@ -683,9 +676,9 @@ func expandAzureRmNetworkInterfaceIpConfigurations(d *schema.ResourceData) ([]ne var ids []network.BackendAddressPool pools := v.(*schema.Set).List() for _, p := range pools { - pool_id := p.(string) + poolId := p.(string) id := network.BackendAddressPool{ - ID: &pool_id, + ID: &poolId, } ids = append(ids, id) @@ -698,9 +691,9 @@ func expandAzureRmNetworkInterfaceIpConfigurations(d *schema.ResourceData) ([]ne var natRules []network.InboundNatRule rules := v.(*schema.Set).List() for _, r := range rules { - rule_id := r.(string) + ruleId := r.(string) rule := network.InboundNatRule{ - ID: &rule_id, + ID: &ruleId, } natRules = append(natRules, rule) @@ -725,12 +718,10 @@ func expandAzureRmNetworkInterfaceIpConfigurations(d *schema.ResourceData) ([]ne } name := data["name"].(string) - ipConfig := network.InterfaceIPConfiguration{ + ipConfigs = append(ipConfigs, network.InterfaceIPConfiguration{ Name: &name, InterfaceIPConfigurationPropertiesFormat: &properties, - } - - ipConfigs = append(ipConfigs, ipConfig) + }) } // if we've got multiple IP Configurations - one must be designated Primary @@ -744,19 +735,113 @@ func expandAzureRmNetworkInterfaceIpConfigurations(d *schema.ResourceData) ([]ne } if !hasPrimary { - return nil, nil, nil, fmt.Errorf("If multiple `ip_configurations` are specified - one must be designated as `primary`.") + return nil, fmt.Errorf("If multiple `ip_configurations` are specified - one must be designated as `primary`.") } } - return ipConfigs, &subnetNamesToLock, &virtualNetworkNamesToLock, nil + return ipConfigs, nil } -func SliceContainsValue(input []string, value string) bool { - for _, v := range input { - if v == value { - return true +func flattenNetworkInterfaceIPConfigurations(input *[]network.InterfaceIPConfiguration) []interface{} { + if input == nil { + return []interface{}{} + } + + result := make([]interface{}, 0) + for _, ipConfig := range *input { + props := ipConfig.InterfaceIPConfigurationPropertiesFormat + + name := "" + if ipConfig.Name != nil { + name = *ipConfig.Name + } + + subnetId := "" + if props.Subnet != nil && props.Subnet.ID != nil { + subnetId = *props.Subnet.ID + } + + privateIPAddress := "" + if props.PrivateIPAddress != nil { + privateIPAddress = *props.PrivateIPAddress + } + + privateIPAddressVersion := "" + if props.PrivateIPAddressVersion != "" { + privateIPAddressVersion = string(props.PrivateIPAddressVersion) + } + + publicIPAddressId := "" + if props.PublicIPAddress != nil && props.PublicIPAddress.ID != nil { + publicIPAddressId = *props.PublicIPAddress.ID + } + + var appGatewayBackendPools []interface{} + if props.ApplicationGatewayBackendAddressPools != nil { + for _, pool := range *props.ApplicationGatewayBackendAddressPools { + appGatewayBackendPools = append(appGatewayBackendPools, *pool.ID) + } } + + var lbBackendAddressPools []interface{} + if props.LoadBalancerBackendAddressPools != nil { + for _, pool := range *props.LoadBalancerBackendAddressPools { + lbBackendAddressPools = append(lbBackendAddressPools, *pool.ID) + } + } + + var lbInboundNatRules []interface{} + if props.LoadBalancerInboundNatRules != nil { + for _, rule := range *props.LoadBalancerInboundNatRules { + lbInboundNatRules = append(lbInboundNatRules, *rule.ID) + } + } + + primary := false + if props.Primary != nil { + primary = *props.Primary + } + + securityGroups := make([]interface{}, 0) + if sgs := props.ApplicationSecurityGroups; sgs != nil { + for _, sg := range *sgs { + securityGroups = append(securityGroups, *sg.ID) + } + } + + result = append(result, map[string]interface{}{ + "application_gateway_backend_address_pools_ids": schema.NewSet(schema.HashString, appGatewayBackendPools), + "application_security_group_ids": schema.NewSet(schema.HashString, securityGroups), + "load_balancer_backend_address_pools_ids": schema.NewSet(schema.HashString, lbBackendAddressPools), + "load_balancer_inbound_nat_rules_ids": schema.NewSet(schema.HashString, lbInboundNatRules), + "name": name, + "primary": primary, + "private_ip_address": privateIPAddress, + "private_ip_address_allocation": string(props.PrivateIPAllocationMethod), + "private_ip_address_version": privateIPAddressVersion, + "public_ip_address_id": publicIPAddressId, + "subnet_id": subnetId, + }) + } + return result +} + +func expandNetworkInterfaceDnsServers(input []interface{}) []string { + dnsServers := make([]string, 0) + for _, v := range input { + dnsServers = append(dnsServers, v.(string)) + } + return dnsServers +} + +func flattenNetworkInterfaceDnsServers(input *[]string) []string { + output := make([]string, 0) + if input == nil { + return output } - return false + for _, v := range *input { + output = append(output, v) + } + return output } diff --git a/azurerm/internal/services/network/resource_arm_network_profile.go b/azurerm/internal/services/network/resource_arm_network_profile.go index 40c8bd3593e0c..f3338e0dc9721 100644 --- a/azurerm/internal/services/network/resource_arm_network_profile.go +++ b/azurerm/internal/services/network/resource_arm_network_profile.go @@ -315,11 +315,11 @@ func expandNetworkProfileVirtualNetworkSubnetNames(d *schema.ResourceData) (*[]s subnetName := subnetResourceID.Path["subnets"] vnetName := subnetResourceID.Path["virtualNetworks"] - if !SliceContainsValue(subnetNames, subnetName) { + if !azure.SliceContainsValue(subnetNames, subnetName) { subnetNames = append(subnetNames, subnetName) } - if !SliceContainsValue(vnetNames, vnetName) { + if !azure.SliceContainsValue(vnetNames, vnetName) { vnetNames = append(vnetNames, vnetName) } } diff --git a/azurerm/internal/services/network/resource_arm_virtual_network.go b/azurerm/internal/services/network/resource_arm_virtual_network.go index 3bc5e00805675..3b7ce65bf6640 100644 --- a/azurerm/internal/services/network/resource_arm_virtual_network.go +++ b/azurerm/internal/services/network/resource_arm_virtual_network.go @@ -178,7 +178,7 @@ func resourceArmVirtualNetworkCreateUpdate(d *schema.ResourceData, meta interfac networkSecurityGroupName := parsedNsgID.Path["networkSecurityGroups"] - if !SliceContainsValue(networkSecurityGroupNames, networkSecurityGroupName) { + if !azure.SliceContainsValue(networkSecurityGroupNames, networkSecurityGroupName) { networkSecurityGroupNames = append(networkSecurityGroupNames, networkSecurityGroupName) } } @@ -480,7 +480,7 @@ func expandAzureRmVirtualNetworkVirtualNetworkSecurityGroupNames(d *schema.Resou networkSecurityGroupName := parsedNsgID.Path["networkSecurityGroups"] - if !SliceContainsValue(nsgNames, networkSecurityGroupName) { + if !azure.SliceContainsValue(nsgNames, networkSecurityGroupName) { nsgNames = append(nsgNames, networkSecurityGroupName) } } From 9ea66209d490b0ac5c6e7192c6a51a6a28a04695 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 14 Feb 2020 14:43:15 +0100 Subject: [PATCH 113/498] r/network_interface: removing the `application_gateway_backend_address_pool_ids` field --- .../network/resource_arm_network_interface.go | 55 ++------ ...ce_application_gateway_association_test.go | 130 +++++++++++++----- .../resource_arm_network_interface_test.go | 130 ------------------ .../docs/r/network_interface.html.markdown | 4 - 4 files changed, 108 insertions(+), 211 deletions(-) diff --git a/azurerm/internal/services/network/resource_arm_network_interface.go b/azurerm/internal/services/network/resource_arm_network_interface.go index 108413b84da73..d137973c4c67f 100644 --- a/azurerm/internal/services/network/resource_arm_network_interface.go +++ b/azurerm/internal/services/network/resource_arm_network_interface.go @@ -109,18 +109,6 @@ func resourceArmNetworkInterface() *schema.Resource { ValidateFunc: azure.ValidateResourceIDOrEmpty, }, - "application_gateway_backend_address_pools_ids": { - Type: schema.TypeSet, - Optional: true, - Computed: true, - Deprecated: "This field has been deprecated in favour of the `azurerm_network_interface_application_gateway_backend_address_pool_association` resource.", - Elem: &schema.Schema{ - Type: schema.TypeString, - ValidateFunc: azure.ValidateResourceID, - }, - Set: schema.HashString, - }, - "load_balancer_backend_address_pools_ids": { Type: schema.TypeSet, Optional: true, @@ -657,21 +645,6 @@ func expandNetworkInterfaceIPConfigurations(input []interface{}) ([]network.Inte properties.Primary = utils.Bool(v.(bool)) } - if v, ok := data["application_gateway_backend_address_pools_ids"]; ok { - var ids []network.ApplicationGatewayBackendAddressPool - pools := v.(*schema.Set).List() - for _, p := range pools { - poolId := p.(string) - id := network.ApplicationGatewayBackendAddressPool{ - ID: &poolId, - } - - ids = append(ids, id) - } - - properties.ApplicationGatewayBackendAddressPools = &ids - } - if v, ok := data["load_balancer_backend_address_pools_ids"]; ok { var ids []network.BackendAddressPool pools := v.(*schema.Set).List() @@ -776,13 +749,6 @@ func flattenNetworkInterfaceIPConfigurations(input *[]network.InterfaceIPConfigu publicIPAddressId = *props.PublicIPAddress.ID } - var appGatewayBackendPools []interface{} - if props.ApplicationGatewayBackendAddressPools != nil { - for _, pool := range *props.ApplicationGatewayBackendAddressPools { - appGatewayBackendPools = append(appGatewayBackendPools, *pool.ID) - } - } - var lbBackendAddressPools []interface{} if props.LoadBalancerBackendAddressPools != nil { for _, pool := range *props.LoadBalancerBackendAddressPools { @@ -810,17 +776,16 @@ func flattenNetworkInterfaceIPConfigurations(input *[]network.InterfaceIPConfigu } result = append(result, map[string]interface{}{ - "application_gateway_backend_address_pools_ids": schema.NewSet(schema.HashString, appGatewayBackendPools), - "application_security_group_ids": schema.NewSet(schema.HashString, securityGroups), - "load_balancer_backend_address_pools_ids": schema.NewSet(schema.HashString, lbBackendAddressPools), - "load_balancer_inbound_nat_rules_ids": schema.NewSet(schema.HashString, lbInboundNatRules), - "name": name, - "primary": primary, - "private_ip_address": privateIPAddress, - "private_ip_address_allocation": string(props.PrivateIPAllocationMethod), - "private_ip_address_version": privateIPAddressVersion, - "public_ip_address_id": publicIPAddressId, - "subnet_id": subnetId, + "application_security_group_ids": schema.NewSet(schema.HashString, securityGroups), + "load_balancer_backend_address_pools_ids": schema.NewSet(schema.HashString, lbBackendAddressPools), + "load_balancer_inbound_nat_rules_ids": schema.NewSet(schema.HashString, lbInboundNatRules), + "name": name, + "primary": primary, + "private_ip_address": privateIPAddress, + "private_ip_address_allocation": string(props.PrivateIPAllocationMethod), + "private_ip_address_version": privateIPAddressVersion, + "public_ip_address_id": publicIPAddressId, + "subnet_id": subnetId, }) } return result diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_application_gateway_association_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_application_gateway_association_test.go index 3fc2b0d855eb1..f2dad35421cd7 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_application_gateway_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_application_gateway_association_test.go @@ -27,6 +27,7 @@ func TestAccAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssociati testCheckAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssociationExists(data.ResourceName), ), }, + data.ImportStep(), }, }) } @@ -79,6 +80,32 @@ func TestAccAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssociati }) } +func TestAccAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssociation_updateNIC(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_network_interface_application_gateway_backend_address_pool_association", "test") + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + // intentional as this is a Virtual Resource + CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssociation_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssociationExists(data.ResourceName), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssociation_updateNIC(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssociationExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + func testCheckAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssociationExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).Network.InterfacesClient @@ -185,6 +212,76 @@ func testCheckAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssocia } func testAccAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssociation_basic(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssociation_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_network_interface" "test" { + name = "acctestni-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + ip_configuration { + name = "testconfiguration1" + subnet_id = "${azurerm_subnet.frontend.id}" + private_ip_address_allocation = "Dynamic" + } +} + +resource "azurerm_network_interface_application_gateway_backend_address_pool_association" "test" { + network_interface_id = azurerm_network_interface.test.id + ip_configuration_name = "testconfiguration1" + backend_address_pool_id = azurerm_application_gateway.test.backend_address_pool.0.id +} +`, template, data.RandomInteger) +} + +func testAccAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssociation_requiresImport(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssociation_basic(data) + return fmt.Sprintf(` +%s + +resource "azurerm_network_interface_application_gateway_backend_address_pool_association" "import" { + network_interface_id = "${azurerm_network_interface_application_gateway_backend_address_pool_association.test.network_interface_id}" + ip_configuration_name = "${azurerm_network_interface_application_gateway_backend_address_pool_association.test.ip_configuration_name}" + backend_address_pool_id = "${azurerm_network_interface_application_gateway_backend_address_pool_association.test.backend_address_pool_id}" +} +`, template) +} + +func testAccAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssociation_updateNIC(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssociation_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_network_interface" "test" { + name = "acctestni-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + ip_configuration { + name = "testconfiguration1" + subnet_id = "${azurerm_subnet.frontend.id}" + private_ip_address_allocation = "Dynamic" + primary = true + } + + ip_configuration { + name = "testconfiguration2" + private_ip_address_version = "IPv6" + private_ip_address_allocation = "dynamic" + } +} + +resource "azurerm_network_interface_application_gateway_backend_address_pool_association" "test" { + network_interface_id = azurerm_network_interface.test.id + ip_configuration_name = "testconfiguration1" + backend_address_pool_id = azurerm_application_gateway.test.backend_address_pool.0.id +} +`, template, data.RandomInteger) +} + +func testAccAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssociation_template(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" @@ -282,36 +379,5 @@ resource "azurerm_application_gateway" "test" { backend_http_settings_name = "${local.http_setting_name}" } } - -resource "azurerm_network_interface" "test" { - name = "acctestni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.frontend.id}" - private_ip_address_allocation = "Dynamic" - } -} - -resource "azurerm_network_interface_application_gateway_backend_address_pool_association" "test" { - network_interface_id = "${azurerm_network_interface.test.id}" - ip_configuration_name = "testconfiguration1" - backend_address_pool_id = "${azurerm_application_gateway.test.backend_address_pool.0.id}" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - -func testAccAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssociation_requiresImport(data acceptance.TestData) string { - template := testAccAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssociation_basic(data) - return fmt.Sprintf(` -%s - -resource "azurerm_network_interface_application_gateway_backend_address_pool_association" "import" { - network_interface_id = "${azurerm_network_interface_application_gateway_backend_address_pool_association.test.network_interface_id}" - ip_configuration_name = "${azurerm_network_interface_application_gateway_backend_address_pool_association.test.ip_configuration_name}" - backend_address_pool_id = "${azurerm_network_interface_application_gateway_backend_address_pool_association.test.backend_address_pool_id}" -} -`, template) +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) } diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go index 468f031e32375..8d35f133cbac6 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go @@ -231,24 +231,6 @@ func TestAccAzureRMNetworkInterface_multipleLoadBalancers(t *testing.T) { }) } -func TestAccAzureRMNetworkInterface_applicationGateway(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_network_interface", "test") - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMNetworkInterface_applicationGatewayBackendPool(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMNetworkInterfaceExists("azurerm_network_interface.test"), - resource.TestCheckResourceAttr(data.ResourceName, "ip_configuration.0.application_gateway_backend_address_pools_ids.#", "1"), - ), - }, - }, - }) -} - func TestAccAzureRMNetworkInterface_withTags(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_interface", "test") resource.ParallelTest(t, resource.TestCase{ @@ -1067,118 +1049,6 @@ resource "azurerm_network_interface" "test2" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) } -func testAccAzureRMNetworkInterface_applicationGatewayBackendPool(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctest-vnet-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - address_space = ["10.254.0.0/16"] - location = "${azurerm_resource_group.test.location}" -} - -resource "azurerm_subnet" "gateway" { - name = "subnet-gateway-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.254.0.0/24" -} - -resource "azurerm_subnet" "test" { - name = "subnet-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.254.1.0/24" -} - -resource "azurerm_public_ip" "test" { - name = "acctest-pubip-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - allocation_method = "Dynamic" -} - -resource "azurerm_application_gateway" "test" { - name = "acctestgw-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "Standard_Medium" - tier = "Standard" - capacity = 1 - } - - gateway_ip_configuration { - name = "gw-ip-config1" - subnet_id = "${azurerm_subnet.gateway.id}" - } - - frontend_port { - name = "port-8080" - port = 8080 - } - - frontend_ip_configuration { - name = "ip-config-public" - public_ip_address_id = "${azurerm_public_ip.test.id}" - } - - backend_address_pool { - name = "pool-1" - } - - backend_http_settings { - name = "backend-http-1" - port = 8080 - protocol = "Http" - cookie_based_affinity = "Enabled" - request_timeout = 30 - } - - http_listener { - name = "listener-1" - frontend_ip_configuration_name = "ip-config-public" - frontend_port_name = "port-8080" - protocol = "Http" - } - - request_routing_rule { - name = "rule-basic-1" - rule_type = "Basic" - http_listener_name = "listener-1" - backend_address_pool_name = "pool-1" - backend_http_settings_name = "backend-http-1" - } - - tags = { - environment = "tf01" - } -} - -resource "azurerm_network_interface" "test" { - name = "acctestnic-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - enable_ip_forwarding = true - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - - application_gateway_backend_address_pools_ids = [ - "${azurerm_application_gateway.test.backend_address_pool.0.id}", - ] - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - func testAccAzureRMNetworkInterface_bug7986(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { diff --git a/website/docs/r/network_interface.html.markdown b/website/docs/r/network_interface.html.markdown index 45f5f6bfddcec..ccd50c5460126 100644 --- a/website/docs/r/network_interface.html.markdown +++ b/website/docs/r/network_interface.html.markdown @@ -90,10 +90,6 @@ The `ip_configuration` block supports: * `public_ip_address_id` - (Optional) Reference to a Public IP Address to associate with this NIC -* `application_gateway_backend_address_pools_ids` - (Optional / **Deprecated**) List of Application Gateway Backend Address Pool IDs references to which this NIC belongs - --> **NOTE:** At this time Network Interface <-> Application Gateway Backend Address Pool associations need to be configured both using this field (which is now Deprecated) and using the `azurerm_network_interface_application_gateway_backend_address_pool_association` resource. This field is deprecated and will be removed in favour of that resource in the next major version (2.0) of the AzureRM Provider. - * `load_balancer_backend_address_pools_ids` - (Optional / **Deprecated**) List of Load Balancer Backend Address Pool IDs references to which this NIC belongs -> **NOTE:** At this time Network Interface <-> Load Balancer Backend Address Pool associations need to be configured both using this field (which is now Deprecated) and using the `azurerm_network_interface_backend_address_pool_association` resource. This field is deprecated and will be removed in favour of that resource in the next major version (2.0) of the AzureRM Provider. From bf5cf315c9fe54f65f245213a561c69ec48bb88f Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 14 Feb 2020 14:55:32 +0100 Subject: [PATCH 114/498] r/network_interface: removing the deprecated `application_security_group_ids` field --- .../network/resource_arm_network_interface.go | 35 ----- ...ication_security_group_association_test.go | 131 +++++++++++++----- .../resource_arm_network_interface_test.go | 60 -------- .../docs/r/network_interface.html.markdown | 4 - 4 files changed, 98 insertions(+), 132 deletions(-) diff --git a/azurerm/internal/services/network/resource_arm_network_interface.go b/azurerm/internal/services/network/resource_arm_network_interface.go index d137973c4c67f..1c9ebd3dd1062 100644 --- a/azurerm/internal/services/network/resource_arm_network_interface.go +++ b/azurerm/internal/services/network/resource_arm_network_interface.go @@ -133,18 +133,6 @@ func resourceArmNetworkInterface() *schema.Resource { Set: schema.HashString, }, - "application_security_group_ids": { - Type: schema.TypeSet, - Optional: true, - Computed: true, - Deprecated: "This field has been deprecated in favour of the `azurerm_network_interface_application_security_group_association` resource.", - Elem: &schema.Schema{ - Type: schema.TypeString, - ValidateFunc: azure.ValidateResourceID, - }, - Set: schema.HashString, - }, - "primary": { Type: schema.TypeBool, Optional: true, @@ -675,21 +663,6 @@ func expandNetworkInterfaceIPConfigurations(input []interface{}) ([]network.Inte properties.LoadBalancerInboundNatRules = &natRules } - if v, ok := data["application_security_group_ids"]; ok { - var securityGroups []network.ApplicationSecurityGroup - rules := v.(*schema.Set).List() - for _, r := range rules { - groupId := r.(string) - group := network.ApplicationSecurityGroup{ - ID: &groupId, - } - - securityGroups = append(securityGroups, group) - } - - properties.ApplicationSecurityGroups = &securityGroups - } - name := data["name"].(string) ipConfigs = append(ipConfigs, network.InterfaceIPConfiguration{ Name: &name, @@ -768,15 +741,7 @@ func flattenNetworkInterfaceIPConfigurations(input *[]network.InterfaceIPConfigu primary = *props.Primary } - securityGroups := make([]interface{}, 0) - if sgs := props.ApplicationSecurityGroups; sgs != nil { - for _, sg := range *sgs { - securityGroups = append(securityGroups, *sg.ID) - } - } - result = append(result, map[string]interface{}{ - "application_security_group_ids": schema.NewSet(schema.HashString, securityGroups), "load_balancer_backend_address_pools_ids": schema.NewSet(schema.HashString, lbBackendAddressPools), "load_balancer_inbound_nat_rules_ids": schema.NewSet(schema.HashString, lbInboundNatRules), "name": name, diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_application_security_group_association_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_application_security_group_association_test.go index 563976476bbf9..bd544711f3e11 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_application_security_group_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_application_security_group_association_test.go @@ -27,6 +27,7 @@ func TestAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_basic(t * testCheckAzureRMNetworkInterfaceApplicationSecurityGroupAssociationExists(data.ResourceName), ), }, + data.ImportStep(), }, }) } @@ -79,6 +80,32 @@ func TestAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_deleted(t }) } +func TestAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_updateNIC(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_network_interface_application_security_group_association", "test") + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + // intentional as this is a Virtual Resource + CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceApplicationSecurityGroupAssociationExists(data.ResourceName), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_updateNIC(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceApplicationSecurityGroupAssociationExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + func testCheckAzureRMNetworkInterfaceApplicationSecurityGroupAssociationExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).Network.InterfacesClient @@ -185,51 +212,28 @@ func testCheckAzureRMNetworkInterfaceApplicationSecurityGroupAssociationDisappea } func testAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_basic(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_template(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "internal" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.1.0/24" -} - -resource "azurerm_application_security_group" "test" { - name = "acctest-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} +%s resource "azurerm_network_interface" "test" { name = "acctestni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - application_security_group_ids = ["${azurerm_application_security_group.test.id}"] + name = "testconfiguration1" + subnet_id = azurerm_subnet.test.id + private_ip_address_allocation = "Dynamic" } } resource "azurerm_network_interface_application_security_group_association" "test" { - network_interface_id = "${azurerm_network_interface.test.id}" + network_interface_id = azurerm_network_interface.test.id ip_configuration_name = "testconfiguration1" - application_security_group_id = "${azurerm_application_security_group.test.id}" + application_security_group_id = azurerm_application_security_group.test.id } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, template, data.RandomInteger) } func testAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_requiresImport(data acceptance.TestData) string { @@ -244,3 +248,64 @@ resource "azurerm_network_interface_application_security_group_association" "imp } `, template) } + +func testAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_updateNIC(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_network_interface" "test" { + name = "acctestni-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + + ip_configuration { + name = "testconfiguration1" + subnet_id = azurerm_subnet.test.id + private_ip_address_allocation = "Dynamic" + primary = true + } + + ip_configuration { + name = "testconfiguration2" + private_ip_address_version = "IPv6" + private_ip_address_allocation = "dynamic" + } +} + +resource "azurerm_network_interface_application_security_group_association" "test" { + network_interface_id = azurerm_network_interface.test.id + ip_configuration_name = "testconfiguration1" + application_security_group_id = azurerm_application_security_group.test.id +} +`, template, data.RandomInteger) +} + +func testAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_template(data acceptance.TestData) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctestvn-%d" + address_space = ["10.0.0.0/16"] + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" +} + +resource "azurerm_subnet" "test" { + name = "internal" + resource_group_name = "${azurerm_resource_group.test.name}" + virtual_network_name = "${azurerm_virtual_network.test.name}" + address_prefix = "10.0.1.0/24" +} + +resource "azurerm_application_security_group" "test" { + name = "acctest-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) +} diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go index 8d35f133cbac6..3dfa3f73ea013 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go @@ -326,24 +326,6 @@ func TestAccAzureRMNetworkInterface_bug7986(t *testing.T) { }) } -func TestAccAzureRMNetworkInterface_applicationSecurityGroups(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_network_interface", "test") - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMNetworkInterface_applicationSecurityGroup(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMNetworkInterfaceExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "ip_configuration.0.application_security_group_ids.#", "1"), - ), - }, - }, - }) -} - func TestAccAzureRMNetworkInterface_importPublicIP(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_interface", "test") @@ -1195,45 +1177,3 @@ resource "azurerm_network_interface" "test" { } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) } - -func testAccAzureRMNetworkInterface_applicationSecurityGroup(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "testsubnet" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" -} - -resource "azurerm_application_security_group" "test" { - name = "acctest-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_network_interface" "test" { - name = "acctestnic-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - application_security_group_ids = ["${azurerm_application_security_group.test.id}"] - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} diff --git a/website/docs/r/network_interface.html.markdown b/website/docs/r/network_interface.html.markdown index ccd50c5460126..25af5192cf89f 100644 --- a/website/docs/r/network_interface.html.markdown +++ b/website/docs/r/network_interface.html.markdown @@ -98,10 +98,6 @@ The `ip_configuration` block supports: -> **NOTE:** At this time Network Interface <-> Load Balancer Inbound NAT Rule associations need to be configured both using this field (which is now Deprecated) and using the `azurerm_network_interface_nat_rule_association` resource. This field is deprecated and will be removed in favour of that resource in the next major version (2.0) of the AzureRM Provider. -* `application_security_group_ids` - (Optional / **Deprecated**) List of Application Security Group IDs which should be attached to this NIC - --> **NOTE:** At this time Network Interface <-> Application Security Group associations need to be configured both using this field (which is now Deprecated) and using the `azurerm_network_interface_application_security_group_association` resource. This field is deprecated and will be removed in favour of that resource in the next major version (2.0) of the AzureRM Provider. - * `primary` - (Optional) Is this the Primary Network Interface? If set to `true` this should be the first `ip_configuration` in the array. ## Attributes Reference From a024810d55ab9030b489d7f1b467bfe27f6917f9 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 14 Feb 2020 15:16:52 +0100 Subject: [PATCH 115/498] r/network_interface: removing the deprecated `load_balancer_inbound_nat_rules_ids` field --- .../network/resource_arm_network_interface.go | 49 ++-------- ...ork_interface_nat_rule_association_test.go | 98 +++++++++++++------ .../docs/r/network_interface.html.markdown | 4 - 3 files changed, 73 insertions(+), 78 deletions(-) diff --git a/azurerm/internal/services/network/resource_arm_network_interface.go b/azurerm/internal/services/network/resource_arm_network_interface.go index 1c9ebd3dd1062..70f7246ead853 100644 --- a/azurerm/internal/services/network/resource_arm_network_interface.go +++ b/azurerm/internal/services/network/resource_arm_network_interface.go @@ -121,18 +121,6 @@ func resourceArmNetworkInterface() *schema.Resource { Set: schema.HashString, }, - "load_balancer_inbound_nat_rules_ids": { - Type: schema.TypeSet, - Optional: true, - Computed: true, - Deprecated: "This field has been deprecated in favour of the `azurerm_network_interface_nat_rule_association` resource.", - Elem: &schema.Schema{ - Type: schema.TypeString, - ValidateFunc: azure.ValidateResourceID, - }, - Set: schema.HashString, - }, - "primary": { Type: schema.TypeBool, Optional: true, @@ -648,21 +636,6 @@ func expandNetworkInterfaceIPConfigurations(input []interface{}) ([]network.Inte properties.LoadBalancerBackendAddressPools = &ids } - if v, ok := data["load_balancer_inbound_nat_rules_ids"]; ok { - var natRules []network.InboundNatRule - rules := v.(*schema.Set).List() - for _, r := range rules { - ruleId := r.(string) - rule := network.InboundNatRule{ - ID: &ruleId, - } - - natRules = append(natRules, rule) - } - - properties.LoadBalancerInboundNatRules = &natRules - } - name := data["name"].(string) ipConfigs = append(ipConfigs, network.InterfaceIPConfiguration{ Name: &name, @@ -729,13 +702,6 @@ func flattenNetworkInterfaceIPConfigurations(input *[]network.InterfaceIPConfigu } } - var lbInboundNatRules []interface{} - if props.LoadBalancerInboundNatRules != nil { - for _, rule := range *props.LoadBalancerInboundNatRules { - lbInboundNatRules = append(lbInboundNatRules, *rule.ID) - } - } - primary := false if props.Primary != nil { primary = *props.Primary @@ -743,14 +709,13 @@ func flattenNetworkInterfaceIPConfigurations(input *[]network.InterfaceIPConfigu result = append(result, map[string]interface{}{ "load_balancer_backend_address_pools_ids": schema.NewSet(schema.HashString, lbBackendAddressPools), - "load_balancer_inbound_nat_rules_ids": schema.NewSet(schema.HashString, lbInboundNatRules), - "name": name, - "primary": primary, - "private_ip_address": privateIPAddress, - "private_ip_address_allocation": string(props.PrivateIPAllocationMethod), - "private_ip_address_version": privateIPAddressVersion, - "public_ip_address_id": publicIPAddressId, - "subnet_id": subnetId, + "name": name, + "primary": primary, + "private_ip_address": privateIPAddress, + "private_ip_address_allocation": string(props.PrivateIPAllocationMethod), + "private_ip_address_version": privateIPAddressVersion, + "public_ip_address_id": publicIPAddressId, + "subnet_id": subnetId, }) } return result diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_nat_rule_association_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_nat_rule_association_test.go index e10f617bfe017..2585bea6c433c 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_nat_rule_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_nat_rule_association_test.go @@ -27,6 +27,7 @@ func TestAccAzureRMNetworkInterfaceNATRuleAssociation_basic(t *testing.T) { testCheckAzureRMNetworkInterfaceNATRuleAssociationExists(data.ResourceName), ), }, + data.ImportStep(), }, }) } @@ -79,6 +80,32 @@ func TestAccAzureRMNetworkInterfaceNATRuleAssociation_deleted(t *testing.T) { }) } +func TestAccAzureRMNetworkInterfaceNATRuleAssociation_updateNIC(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_network_interface_nat_rule_association", "test") + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + // intentional as this is a Virtual Resource + CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMNetworkInterfaceNATRuleAssociation_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceNATRuleAssociationExists(data.ResourceName), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMNetworkInterfaceNATRuleAssociation_updateNIC(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceNATRuleAssociationExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + func testCheckAzureRMNetworkInterfaceNATRuleAssociationExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).Network.InterfacesClient @@ -185,6 +212,44 @@ func testCheckAzureRMNetworkInterfaceNATRuleAssociationDisappears(resourceName s } func testAccAzureRMNetworkInterfaceNATRuleAssociation_basic(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterfaceNATRuleAssociation_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_network_interface" "test" { + name = "acctestni-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + + ip_configuration { + name = "testconfiguration1" + subnet_id = azurerm_subnet.test.id + private_ip_address_allocation = "Dynamic" + } +} + +resource "azurerm_network_interface_nat_rule_association" "test" { + network_interface_id = azurerm_network_interface.test.id + ip_configuration_name = "testconfiguration1" + nat_rule_id = azurerm_lb_nat_rule.test.id +} +`, template, data.RandomInteger) +} + +func testAccAzureRMNetworkInterfaceNATRuleAssociation_requiresImport(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterfaceNATRuleAssociation_basic(data) + return fmt.Sprintf(` +%s + +resource "azurerm_network_interface_nat_rule_association" "import" { + network_interface_id = "${azurerm_network_interface_nat_rule_association.test.network_interface_id}" + ip_configuration_name = "${azurerm_network_interface_nat_rule_association.test.ip_configuration_name}" + nat_rule_id = "${azurerm_network_interface_nat_rule_association.test.nat_rule_id}" +} +`, template) +} + +func testAccAzureRMNetworkInterfaceNATRuleAssociation_template(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" @@ -232,36 +297,5 @@ resource "azurerm_lb_nat_rule" "test" { backend_port = 3389 frontend_ip_configuration_name = "primary" } - -resource "azurerm_network_interface" "test" { - name = "acctestni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - } -} - -resource "azurerm_network_interface_nat_rule_association" "test" { - network_interface_id = "${azurerm_network_interface.test.id}" - ip_configuration_name = "testconfiguration1" - nat_rule_id = "${azurerm_lb_nat_rule.test.id}" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - -func testAccAzureRMNetworkInterfaceNATRuleAssociation_requiresImport(data acceptance.TestData) string { - template := testAccAzureRMNetworkInterfaceNATRuleAssociation_basic(data) - return fmt.Sprintf(` -%s - -resource "azurerm_network_interface_nat_rule_association" "import" { - network_interface_id = "${azurerm_network_interface_nat_rule_association.test.network_interface_id}" - ip_configuration_name = "${azurerm_network_interface_nat_rule_association.test.ip_configuration_name}" - nat_rule_id = "${azurerm_network_interface_nat_rule_association.test.nat_rule_id}" -} -`, template) +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) } diff --git a/website/docs/r/network_interface.html.markdown b/website/docs/r/network_interface.html.markdown index 25af5192cf89f..8c7d9542c57ab 100644 --- a/website/docs/r/network_interface.html.markdown +++ b/website/docs/r/network_interface.html.markdown @@ -94,10 +94,6 @@ The `ip_configuration` block supports: -> **NOTE:** At this time Network Interface <-> Load Balancer Backend Address Pool associations need to be configured both using this field (which is now Deprecated) and using the `azurerm_network_interface_backend_address_pool_association` resource. This field is deprecated and will be removed in favour of that resource in the next major version (2.0) of the AzureRM Provider. -* `load_balancer_inbound_nat_rules_ids` - (Optional / **Deprecated**) List of Load Balancer Inbound Nat Rules IDs involving this NIC - --> **NOTE:** At this time Network Interface <-> Load Balancer Inbound NAT Rule associations need to be configured both using this field (which is now Deprecated) and using the `azurerm_network_interface_nat_rule_association` resource. This field is deprecated and will be removed in favour of that resource in the next major version (2.0) of the AzureRM Provider. - * `primary` - (Optional) Is this the Primary Network Interface? If set to `true` this should be the first `ip_configuration` in the array. ## Attributes Reference From 380f32c3cba42124866000e55492e642056483f5 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 14 Feb 2020 15:19:32 +0100 Subject: [PATCH 116/498] r/network_interface: removing the deprecated `load_balancer_backend_address_pools_ids` field --- .../network/resource_arm_network_interface.go | 35 ---- ...e_backend_address_pool_association_test.go | 130 +++++++++++---- .../resource_arm_network_interface_test.go | 151 ------------------ .../docs/r/network_interface.html.markdown | 4 - 4 files changed, 98 insertions(+), 222 deletions(-) diff --git a/azurerm/internal/services/network/resource_arm_network_interface.go b/azurerm/internal/services/network/resource_arm_network_interface.go index 70f7246ead853..135ed6669a659 100644 --- a/azurerm/internal/services/network/resource_arm_network_interface.go +++ b/azurerm/internal/services/network/resource_arm_network_interface.go @@ -109,18 +109,6 @@ func resourceArmNetworkInterface() *schema.Resource { ValidateFunc: azure.ValidateResourceIDOrEmpty, }, - "load_balancer_backend_address_pools_ids": { - Type: schema.TypeSet, - Optional: true, - Computed: true, - Deprecated: "This field has been deprecated in favour of the `azurerm_network_interface_backend_address_pool_association` resource.", - Elem: &schema.Schema{ - Type: schema.TypeString, - ValidateFunc: azure.ValidateResourceID, - }, - Set: schema.HashString, - }, - "primary": { Type: schema.TypeBool, Optional: true, @@ -621,21 +609,6 @@ func expandNetworkInterfaceIPConfigurations(input []interface{}) ([]network.Inte properties.Primary = utils.Bool(v.(bool)) } - if v, ok := data["load_balancer_backend_address_pools_ids"]; ok { - var ids []network.BackendAddressPool - pools := v.(*schema.Set).List() - for _, p := range pools { - poolId := p.(string) - id := network.BackendAddressPool{ - ID: &poolId, - } - - ids = append(ids, id) - } - - properties.LoadBalancerBackendAddressPools = &ids - } - name := data["name"].(string) ipConfigs = append(ipConfigs, network.InterfaceIPConfiguration{ Name: &name, @@ -695,20 +668,12 @@ func flattenNetworkInterfaceIPConfigurations(input *[]network.InterfaceIPConfigu publicIPAddressId = *props.PublicIPAddress.ID } - var lbBackendAddressPools []interface{} - if props.LoadBalancerBackendAddressPools != nil { - for _, pool := range *props.LoadBalancerBackendAddressPools { - lbBackendAddressPools = append(lbBackendAddressPools, *pool.ID) - } - } - primary := false if props.Primary != nil { primary = *props.Primary } result = append(result, map[string]interface{}{ - "load_balancer_backend_address_pools_ids": schema.NewSet(schema.HashString, lbBackendAddressPools), "name": name, "primary": primary, "private_ip_address": privateIPAddress, diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_backend_address_pool_association_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_backend_address_pool_association_test.go index 635796cfc4267..ae067fb3fb8c8 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_backend_address_pool_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_backend_address_pool_association_test.go @@ -27,6 +27,7 @@ func TestAccAzureRMNetworkInterfaceBackendAddressPoolAssociation_basic(t *testin testCheckAzureRMNetworkInterfaceBackendAddressPoolAssociationExists(data.ResourceName), ), }, + data.ImportStep(), }, }) } @@ -79,6 +80,32 @@ func TestAccAzureRMNetworkInterfaceBackendAddressPoolAssociation_deleted(t *test }) } +func TestAccAzureRMNetworkInterfaceBackendAddressPoolAssociation_updateNIC(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_network_interface_backend_address_pool_association", "test") + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + // intentional as this is a Virtual Resource + CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMNetworkInterfaceBackendAddressPoolAssociation_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceBackendAddressPoolAssociationExists(data.ResourceName), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMNetworkInterfaceBackendAddressPoolAssociation_updateNIC(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceBackendAddressPoolAssociationExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + func testCheckAzureRMNetworkInterfaceBackendAddressPoolAssociationExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).Network.InterfacesClient @@ -185,6 +212,76 @@ func testCheckAzureRMNetworkInterfaceBackendAddressPoolAssociationDisappears(res } func testAccAzureRMNetworkInterfaceBackendAddressPoolAssociation_basic(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterfaceBackendAddressPoolAssociation_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_network_interface" "test" { + name = "acctestni-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + + ip_configuration { + name = "testconfiguration1" + subnet_id = azurerm_subnet.test.id + private_ip_address_allocation = "Dynamic" + } +} + +resource "azurerm_network_interface_backend_address_pool_association" "test" { + network_interface_id = azurerm_network_interface.test.id + ip_configuration_name = "testconfiguration1" + backend_address_pool_id = azurerm_lb_backend_address_pool.test.id +} +`, template, data.RandomInteger) +} + +func testAccAzureRMNetworkInterfaceBackendAddressPoolAssociation_requiresImport(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterfaceBackendAddressPoolAssociation_basic(data) + return fmt.Sprintf(` +%s + +resource "azurerm_network_interface_backend_address_pool_association" "import" { + network_interface_id = "${azurerm_network_interface_backend_address_pool_association.test.network_interface_id}" + ip_configuration_name = "${azurerm_network_interface_backend_address_pool_association.test.ip_configuration_name}" + backend_address_pool_id = "${azurerm_network_interface_backend_address_pool_association.test.backend_address_pool_id}" +} +`, template) +} + +func testAccAzureRMNetworkInterfaceBackendAddressPoolAssociation_updateNIC(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterfaceBackendAddressPoolAssociation_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_network_interface" "test" { + name = "acctestni-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + + ip_configuration { + name = "testconfiguration1" + subnet_id = azurerm_subnet.test.id + private_ip_address_allocation = "Dynamic" + primary = true + } + + ip_configuration { + name = "testconfiguration2" + private_ip_address_version = "IPv6" + private_ip_address_allocation = "dynamic" + } +} + +resource "azurerm_network_interface_backend_address_pool_association" "test" { + network_interface_id = azurerm_network_interface.test.id + ip_configuration_name = "testconfiguration1" + backend_address_pool_id = azurerm_lb_backend_address_pool.test.id +} +`, template, data.RandomInteger) +} + +func testAccAzureRMNetworkInterfaceBackendAddressPoolAssociation_template(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" @@ -229,36 +326,5 @@ resource "azurerm_lb_backend_address_pool" "test" { loadbalancer_id = "${azurerm_lb.test.id}" name = "acctestpool" } - -resource "azurerm_network_interface" "test" { - name = "acctestni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - } -} - -resource "azurerm_network_interface_backend_address_pool_association" "test" { - network_interface_id = "${azurerm_network_interface.test.id}" - ip_configuration_name = "testconfiguration1" - backend_address_pool_id = "${azurerm_lb_backend_address_pool.test.id}" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - -func testAccAzureRMNetworkInterfaceBackendAddressPoolAssociation_requiresImport(data acceptance.TestData) string { - template := testAccAzureRMNetworkInterfaceBackendAddressPoolAssociation_basic(data) - return fmt.Sprintf(` -%s - -resource "azurerm_network_interface_backend_address_pool_association" "import" { - network_interface_id = "${azurerm_network_interface_backend_address_pool_association.test.network_interface_id}" - ip_configuration_name = "${azurerm_network_interface_backend_address_pool_association.test.ip_configuration_name}" - backend_address_pool_id = "${azurerm_network_interface_backend_address_pool_association.test.backend_address_pool_id}" -} -`, template) +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) } diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go index 3dfa3f73ea013..05170566f5b45 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go @@ -212,25 +212,6 @@ func TestAccAzureRMNetworkInterface_enableAcceleratedNetworking(t *testing.T) { }) } -func TestAccAzureRMNetworkInterface_multipleLoadBalancers(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_network_interface", "test1") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMNetworkInterface_multipleLoadBalancers(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMNetworkInterfaceExists("azurerm_network_interface.test1"), - testCheckAzureRMNetworkInterfaceExists("azurerm_network_interface.test2"), - ), - }, - }, - }) -} - func TestAccAzureRMNetworkInterface_withTags(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_interface", "test") resource.ParallelTest(t, resource.TestCase{ @@ -899,138 +880,6 @@ resource "azurerm_network_interface" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) } -func testAccAzureRMNetworkInterface_multipleLoadBalancers(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "testsubnet" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" -} - -resource "azurerm_public_ip" "testext" { - name = "acctestpip-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - allocation_method = "Static" -} - -resource "azurerm_lb" "testext" { - name = "acctestlb-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - frontend_ip_configuration { - name = "publicipext" - public_ip_address_id = "${azurerm_public_ip.testext.id}" - } -} - -resource "azurerm_lb_backend_address_pool" "testext" { - name = "testbackendpoolext" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - loadbalancer_id = "${azurerm_lb.testext.id}" -} - -resource "azurerm_lb_nat_rule" "testext" { - name = "testnatruleext" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - loadbalancer_id = "${azurerm_lb.testext.id}" - protocol = "Tcp" - frontend_port = 3389 - backend_port = 3390 - frontend_ip_configuration_name = "publicipext" -} - -resource "azurerm_public_ip" "testint" { - name = "testpublicipint" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - allocation_method = "Static" -} - -resource "azurerm_lb" "testint" { - name = "testlbint" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - frontend_ip_configuration { - name = "publicipint" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - } -} - -resource "azurerm_lb_backend_address_pool" "testint" { - name = "testbackendpoolint" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - loadbalancer_id = "${azurerm_lb.testint.id}" -} - -resource "azurerm_lb_nat_rule" "testint" { - name = "testnatruleint" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - loadbalancer_id = "${azurerm_lb.testint.id}" - protocol = "Tcp" - frontend_port = 3389 - backend_port = 3391 - frontend_ip_configuration_name = "publicipint" -} - -resource "azurerm_network_interface" "test1" { - name = "acctestnic1-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - enable_ip_forwarding = true - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - - load_balancer_backend_address_pools_ids = [ - "${azurerm_lb_backend_address_pool.testext.id}", - "${azurerm_lb_backend_address_pool.testint.id}", - ] - } -} - -resource "azurerm_network_interface" "test2" { - name = "acctestnic2-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - enable_ip_forwarding = true - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - - load_balancer_inbound_nat_rules_ids = [ - "${azurerm_lb_nat_rule.testext.id}", - "${azurerm_lb_nat_rule.testint.id}", - ] - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - func testAccAzureRMNetworkInterface_bug7986(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { diff --git a/website/docs/r/network_interface.html.markdown b/website/docs/r/network_interface.html.markdown index 8c7d9542c57ab..d2045d5c50d6b 100644 --- a/website/docs/r/network_interface.html.markdown +++ b/website/docs/r/network_interface.html.markdown @@ -90,10 +90,6 @@ The `ip_configuration` block supports: * `public_ip_address_id` - (Optional) Reference to a Public IP Address to associate with this NIC -* `load_balancer_backend_address_pools_ids` - (Optional / **Deprecated**) List of Load Balancer Backend Address Pool IDs references to which this NIC belongs - --> **NOTE:** At this time Network Interface <-> Load Balancer Backend Address Pool associations need to be configured both using this field (which is now Deprecated) and using the `azurerm_network_interface_backend_address_pool_association` resource. This field is deprecated and will be removed in favour of that resource in the next major version (2.0) of the AzureRM Provider. - * `primary` - (Optional) Is this the Primary Network Interface? If set to `true` this should be the first `ip_configuration` in the array. ## Attributes Reference From 367ca5b1a04d938b021c5147cd1f677499aa2893 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 14 Feb 2020 15:26:05 +0100 Subject: [PATCH 117/498] r/network_interface_nat_rule_association: commiting the missing method --- ...ork_interface_nat_rule_association_test.go | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_nat_rule_association_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_nat_rule_association_test.go index 2585bea6c433c..57c369aa6ce71 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_nat_rule_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_nat_rule_association_test.go @@ -249,6 +249,38 @@ resource "azurerm_network_interface_nat_rule_association" "import" { `, template) } +func testAccAzureRMNetworkInterfaceNATRuleAssociation_updateNIC(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterfaceNATRuleAssociation_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_network_interface" "test" { + name = "acctestni-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + + ip_configuration { + name = "testconfiguration1" + subnet_id = azurerm_subnet.test.id + private_ip_address_allocation = "Dynamic" + primary = true + } + + ip_configuration { + name = "testconfiguration2" + private_ip_address_version = "IPv6" + private_ip_address_allocation = "dynamic" + } +} + +resource "azurerm_network_interface_nat_rule_association" "test" { + network_interface_id = azurerm_network_interface.test.id + ip_configuration_name = "testconfiguration1" + nat_rule_id = azurerm_lb_nat_rule.test.id +} +`, template, data.RandomInteger) +} + func testAccAzureRMNetworkInterfaceNATRuleAssociation_template(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { From f50eb8d9341deeb7c57d3bd3b591960d78304ebd Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 14 Feb 2020 17:59:29 +0100 Subject: [PATCH 118/498] r/network_interface: loading the existing nic details during a delta update --- .../network/resource_arm_network_interface.go | 47 ++++++++----------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/azurerm/internal/services/network/resource_arm_network_interface.go b/azurerm/internal/services/network/resource_arm_network_interface.go index 135ed6669a659..0789e212bfea3 100644 --- a/azurerm/internal/services/network/resource_arm_network_interface.go +++ b/azurerm/internal/services/network/resource_arm_network_interface.go @@ -51,7 +51,6 @@ func resourceArmNetworkInterface() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), - // NOTE: does this want it's own association resource? "network_security_group_id": { Type: schema.TypeString, Optional: true, @@ -315,16 +314,20 @@ func resourceArmNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{}) locks.ByName(name, networkInterfaceResourceName) defer locks.UnlockByName(name, networkInterfaceResourceName) + // first get the existing one so that we can pull things as needed + existing, err := client.Get(ctx, resourceGroup, name, "") + if err != nil { + return fmt.Errorf("Error retrieving Network Interface %q (Resource Group %q): %+v", name, resourceGroup, err) + } + location := azure.NormalizeLocation(d.Get("location").(string)) update := network.Interface{ - Name: utils.String(name), - Location: utils.String(location), + Name: utils.String(name), + Location: utils.String(location), + InterfacePropertiesFormat: &network.InterfacePropertiesFormat{}, } if d.HasChange("dns_servers") { - if update.InterfacePropertiesFormat == nil { - update.InterfacePropertiesFormat = &network.InterfacePropertiesFormat{} - } if update.InterfacePropertiesFormat.DNSSettings == nil { update.InterfacePropertiesFormat.DNSSettings = &network.InterfaceDNSSettings{} } @@ -336,25 +339,14 @@ func resourceArmNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{}) } if d.HasChange("enable_accelerated_networking") { - if update.InterfacePropertiesFormat == nil { - update.InterfacePropertiesFormat = &network.InterfacePropertiesFormat{} - } - update.InterfacePropertiesFormat.EnableAcceleratedNetworking = utils.Bool(d.Get("enable_accelerated_networking").(bool)) } if d.HasChange("enable_ip_forwarding") { - if update.InterfacePropertiesFormat == nil { - update.InterfacePropertiesFormat = &network.InterfacePropertiesFormat{} - } - update.InterfacePropertiesFormat.EnableIPForwarding = utils.Bool(d.Get("enable_ip_forwarding").(bool)) } if d.HasChange("internal_dns_name_label") { - if update.InterfacePropertiesFormat == nil { - update.InterfacePropertiesFormat = &network.InterfacePropertiesFormat{} - } if update.InterfacePropertiesFormat.DNSSettings == nil { update.InterfacePropertiesFormat.DNSSettings = &network.InterfaceDNSSettings{} } @@ -363,10 +355,6 @@ func resourceArmNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{}) } if d.HasChange("ip_configuration") { - if update.InterfacePropertiesFormat == nil { - update.InterfacePropertiesFormat = &network.InterfacePropertiesFormat{} - } - ipConfigsRaw := d.Get("ip_configuration").([]interface{}) ipConfigs, err := expandNetworkInterfaceIPConfigurations(ipConfigsRaw) if err != nil { @@ -381,16 +369,19 @@ func resourceArmNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{}) defer lockingDetails.unlock() update.InterfacePropertiesFormat.IPConfigurations = &ipConfigs + } else { + update.InterfacePropertiesFormat.IPConfigurations = existing.InterfacePropertiesFormat.IPConfigurations } if d.HasChange("network_security_group_id") { - if update.InterfacePropertiesFormat == nil { - update.InterfacePropertiesFormat = &network.InterfacePropertiesFormat{} - } - - update.InterfacePropertiesFormat.NetworkSecurityGroup = &network.SecurityGroup{ - ID: utils.String(d.Get("network_security_group_id").(string)), - } + update.InterfacePropertiesFormat.NetworkSecurityGroup = &network.SecurityGroup{} + if networkSecurityGroupId := d.Get("network_security_group_id").(string); networkSecurityGroupId != "" { + update.InterfacePropertiesFormat.NetworkSecurityGroup.ID = utils.String(networkSecurityGroupId) + } else { + update.InterfacePropertiesFormat.NetworkSecurityGroup = nil + } + } else { + update.InterfacePropertiesFormat.NetworkSecurityGroup = existing.InterfacePropertiesFormat.NetworkSecurityGroup } if d.HasChange("tags") { From 6fa556476efa01c0efde883395460e7c3ffae905 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Fri, 14 Feb 2020 17:43:27 +0000 Subject: [PATCH 119/498] Tweaked boolean logic for checkForNonDefaultStorageAccountNetworkRule --- .../storage/resource_arm_storage_account_network_rules.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/storage/resource_arm_storage_account_network_rules.go b/azurerm/internal/services/storage/resource_arm_storage_account_network_rules.go index 6e987f0f79b87..81fefac044d3a 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account_network_rules.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account_network_rules.go @@ -251,8 +251,8 @@ func checkForNonDefaultStorageAccountNetworkRule(rule *storage.NetworkRuleSet) b return false } - if rule.IPRules != nil || len(*rule.IPRules) != 0 || - rule.VirtualNetworkRules != nil || len(*rule.VirtualNetworkRules) == 0 || + if (rule.IPRules != nil && len(*rule.IPRules) != 0) || + (rule.VirtualNetworkRules != nil && len(*rule.VirtualNetworkRules) != 0) || rule.Bypass != "AzureServices" || rule.DefaultAction != "Allow" { return true } From dd57fb27188d8d53b7ccb177405f511ca87a7f8b Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 14 Feb 2020 20:10:47 +0100 Subject: [PATCH 120/498] r/(linux|windows)_virtual_machine: using the Delete timeout during Deletion --- .../internal/services/compute/linux_virtual_machine_resource.go | 2 +- .../services/compute/windows_virtual_machine_resource.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/compute/linux_virtual_machine_resource.go b/azurerm/internal/services/compute/linux_virtual_machine_resource.go index acb2ed83ebd0f..702b9f0ce07a5 100644 --- a/azurerm/internal/services/compute/linux_virtual_machine_resource.go +++ b/azurerm/internal/services/compute/linux_virtual_machine_resource.go @@ -892,7 +892,7 @@ func resourceLinuxVirtualMachineUpdate(d *schema.ResourceData, meta interface{}) func resourceLinuxVirtualMachineDelete(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Compute.VMClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() id, err := ParseVirtualMachineID(d.Id()) diff --git a/azurerm/internal/services/compute/windows_virtual_machine_resource.go b/azurerm/internal/services/compute/windows_virtual_machine_resource.go index 28324b4b26f12..2da51519cb9d4 100644 --- a/azurerm/internal/services/compute/windows_virtual_machine_resource.go +++ b/azurerm/internal/services/compute/windows_virtual_machine_resource.go @@ -917,7 +917,7 @@ func resourceWindowsVirtualMachineUpdate(d *schema.ResourceData, meta interface{ func resourceWindowsVirtualMachineDelete(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Compute.VMClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() id, err := ParseVirtualMachineID(d.Id()) From 3a45d8e6dcce3a2174de7d5b7d30aa6dc664a56c Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Fri, 14 Feb 2020 12:57:55 -0800 Subject: [PATCH 121/498] Updated doc --- ...account_customer_managed_key.html.markdown | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/website/docs/r/storage_account_customer_managed_key.html.markdown b/website/docs/r/storage_account_customer_managed_key.html.markdown index 8210f51f5bafc..6c855704bb510 100644 --- a/website/docs/r/storage_account_customer_managed_key.html.markdown +++ b/website/docs/r/storage_account_customer_managed_key.html.markdown @@ -13,17 +13,8 @@ Manages the customer managed key of an Azure Storage Account. ## Example Usage ```hcl -resource "azurerm_storage_account_customer_managed_key" "tfex" { - storage_account_id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/tfex-RG/providers/Microsoft.Storage/storageAccounts/tfexstorageaccount" - key_vault_id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/tfex-RG/providers/Microsoft.KeyVault/vaults/tfex-key-vault" - key_name = "tfex-key" - key_version = "955b9ad9579e4501a311df5493bacd02" -} -``` +data "azurerm_client_config" "current" {} -## Example Usage with User Managed Key Vault Key - -```hcl provider "azurerm" { alias = "keyVault" @@ -44,7 +35,7 @@ resource "azurerm_key_vault" "tfex" { provider = azurerm.keyVault location = azurerm_resource_group.tfex.location resource_group_name = azurerm_resource_group.tfex.name - tenant_id = "00000000-0000-0000-0000-000000000000" + tenant_id = data.azurerm_client_config.current.tenant_id soft_delete_enabled = true purge_protection_enabled = true @@ -59,15 +50,24 @@ resource "azurerm_key_vault" "tfex" { resource "azurerm_key_vault_key" "tfex" { name = "tfex-key" key_vault_id = azurerm_key_vault.tfex.id - key_vault_access_policy_id = azurerm_key_vault_access_policy.tfex.id + key_vault_access_policy_id = azurerm_key_vault_access_policy.storage.id key_type = "RSA" key_size = 2048 key_opts = ["decrypt", "encrypt", "sign", "unwrapKey", "verify", "wrapKey"] } -resource "azurerm_key_vault_access_policy" "tfex" { +resource "azurerm_key_vault_access_policy" "storage" { + key_vault_id = azurerm_key_vault.tfex.id + tenant_id = data.azurerm_client_config.current.tenant_id + object_id = azurerm_storage_account.tfex.identity.0.principal_id + + key_permissions = ["get","create","delete","list","restore","recover","unwrapkey","wrapkey","purge","encrypt","decrypt","sign","verify"] + secret_permissions = ["get"] +} + +resource "azurerm_key_vault_access_policy" "client" { key_vault_id = azurerm_key_vault.tfex.id - tenant_id = "00000000-0000-0000-0000-000000000000" + tenant_id = data.azurerm_client_config.current.tenant_id object_id = azurerm_storage_account.tfex.identity.0.principal_id key_permissions = ["get","create","delete","list","restore","recover","unwrapkey","wrapkey","purge","encrypt","decrypt","sign","verify"] From 1668aa3be036ee992cbf8eaa25df908592c299aa Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Fri, 14 Feb 2020 13:56:15 -0800 Subject: [PATCH 122/498] Format doc hcl blocks --- ...rm_storage_account_customer_managed_key.go | 2 +- website/docs/r/key_vault.html.markdown | 21 +++++-------- ...account_customer_managed_key.html.markdown | 30 +++++++++---------- 3 files changed, 23 insertions(+), 30 deletions(-) diff --git a/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go b/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go index 3291bc3ef832b..f56c98db9a7a6 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go @@ -115,7 +115,7 @@ func resourceArmStorageAccountCustomerManagedKeyCreateUpdate(d *schema.ResourceD }, } - _, err := storageClient.Update(ctx, storageAccountResourceGroupName.(string), storageAccountName.(string), props) + _, err = storageClient.Update(ctx, storageAccountResourceGroupName.(string), storageAccountName.(string), props) if err != nil { return fmt.Errorf("Error updating Azure Storage Account %q (Resource Group %q) Customer Managed Key: %+v", storageAccountName, storageAccountResourceGroupName, err) } diff --git a/website/docs/r/key_vault.html.markdown b/website/docs/r/key_vault.html.markdown index 3726d985fa135..9da136c4273ef 100644 --- a/website/docs/r/key_vault.html.markdown +++ b/website/docs/r/key_vault.html.markdown @@ -33,14 +33,14 @@ resource "azurerm_resource_group" "example" { } resource "azurerm_key_vault" "example" { - name = "testvault" - provider = azurerm.keyVault - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name + name = "testvault" + provider = azurerm.keyVault + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name - tenant_id = data.azurerm_client_config.current.tenant_id - soft_delete_enabled = true - purge_protection_enabled = false + tenant_id = data.azurerm_client_config.current.tenant_id + soft_delete_enabled = true + purge_protection_enabled = false sku_name = "standard" @@ -82,8 +82,6 @@ The following arguments are supported: * `resource_group_name` - (Required) The name of the resource group in which to create the Key Vault. Changing this forces a new resource to be created. -* `sku` - (Optional **Deprecated**)) A `sku` block as described below. - * `sku_name` - (Optional) The Name of the SKU used for this Key Vault. Possible values are `standard` and `premium`. * `tenant_id` - (Required) The Azure Active Directory tenant ID that should be used for authenticating requests to the key vault. @@ -110,11 +108,6 @@ The following arguments are supported: * `tags` - (Optional) A mapping of tags to assign to the resource. ---- -A `sku` block supports the following: - -* `name` - (Required) The Name of the SKU used for this Key Vault. Possible values are `standard` and `premium`. - --- A `access_policy` block supports the following: diff --git a/website/docs/r/storage_account_customer_managed_key.html.markdown b/website/docs/r/storage_account_customer_managed_key.html.markdown index 6c855704bb510..74058b8101a9f 100644 --- a/website/docs/r/storage_account_customer_managed_key.html.markdown +++ b/website/docs/r/storage_account_customer_managed_key.html.markdown @@ -31,14 +31,14 @@ resource "azurerm_resource_group" "tfex" { } resource "azurerm_key_vault" "tfex" { - name = "tfex-key-vault" - provider = azurerm.keyVault - location = azurerm_resource_group.tfex.location - resource_group_name = azurerm_resource_group.tfex.name - tenant_id = data.azurerm_client_config.current.tenant_id - - soft_delete_enabled = true - purge_protection_enabled = true + name = "tfex-key-vault" + provider = azurerm.keyVault + location = azurerm_resource_group.tfex.location + resource_group_name = azurerm_resource_group.tfex.name + tenant_id = data.azurerm_client_config.current.tenant_id + + soft_delete_enabled = true + purge_protection_enabled = true sku_name = "standard" @@ -61,7 +61,7 @@ resource "azurerm_key_vault_access_policy" "storage" { tenant_id = data.azurerm_client_config.current.tenant_id object_id = azurerm_storage_account.tfex.identity.0.principal_id - key_permissions = ["get","create","delete","list","restore","recover","unwrapkey","wrapkey","purge","encrypt","decrypt","sign","verify"] + key_permissions = ["get", "create", "delete", "list", "restore", "recover", "unwrapkey", "wrapkey", "purge", "encrypt", "decrypt", "sign", "verify"] secret_permissions = ["get"] } @@ -70,16 +70,16 @@ resource "azurerm_key_vault_access_policy" "client" { tenant_id = data.azurerm_client_config.current.tenant_id object_id = azurerm_storage_account.tfex.identity.0.principal_id - key_permissions = ["get","create","delete","list","restore","recover","unwrapkey","wrapkey","purge","encrypt","decrypt","sign","verify"] + key_permissions = ["get", "create", "delete", "list", "restore", "recover", "unwrapkey", "wrapkey", "purge", "encrypt", "decrypt", "sign", "verify"] secret_permissions = ["get"] } resource "azurerm_storage_account" "tfex" { - name = "tfexstorageaccount" - resource_group_name = azurerm_resource_group.tfex.name - location = azurerm_resource_group.tfex.location - account_tier = "Standard" - account_replication_type = "GRS" + name = "tfexstorageaccount" + resource_group_name = azurerm_resource_group.tfex.name + location = azurerm_resource_group.tfex.location + account_tier = "Standard" + account_replication_type = "GRS" identity { type = "SystemAssigned" From 146a82ea26276829181298a0142d6248d4320e96 Mon Sep 17 00:00:00 2001 From: Tracy Holmes Date: Fri, 14 Feb 2020 20:49:24 -0600 Subject: [PATCH 123/498] r/compute - adds support for additional dedicated host SKUs Validation added for two additional SKUs: DSv3-Type2 and ESv3-Type2 Fixes #5700 --- .../internal/services/compute/resource_arm_dedicated_host.go | 2 ++ website/docs/r/dedicated_host.html.markdown | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/azurerm/internal/services/compute/resource_arm_dedicated_host.go b/azurerm/internal/services/compute/resource_arm_dedicated_host.go index 11031012f6229..d2d42cb804c93 100644 --- a/azurerm/internal/services/compute/resource_arm_dedicated_host.go +++ b/azurerm/internal/services/compute/resource_arm_dedicated_host.go @@ -68,7 +68,9 @@ func resourceArmDedicatedHost() *schema.Resource { Required: true, ValidateFunc: validation.StringInSlice([]string{ "DSv3-Type1", + "DSv3-Type2", "ESv3-Type1", + "ESv3-Type2", "FSv2-Type2", }, false), }, diff --git a/website/docs/r/dedicated_host.html.markdown b/website/docs/r/dedicated_host.html.markdown index 00af08790d591..fda61f4ec235d 100644 --- a/website/docs/r/dedicated_host.html.markdown +++ b/website/docs/r/dedicated_host.html.markdown @@ -44,7 +44,7 @@ The following arguments are supported: * `location` - (Required) Specify the supported Azure location where the resource exists. Changing this forces a new resource to be created. -* `sku_name` - (Required) Specify the sku name of the Dedicated Host. Possible values are `DSv3-Type1`, `ESv3-Type1`, `FSv2-Type2`. Changing this forces a new resource to be created. +* `sku_name` - (Required) Specify the sku name of the Dedicated Host. Possible values are `DSv3-Type1`, `DSv3-Type2`, `ESv3-Type1`, `ESv3-Type2`,`FSv2-Type2`. Changing this forces a new resource to be created. * `platform_fault_domain` - (Required) Specify the fault domain of the Dedicated Host Group in which to create the Dedicated Host. Changing this forces a new resource to be created. @@ -64,8 +64,6 @@ The following attributes are exported: ## Timeouts - - The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: * `create` - (Defaults to 30 minutes) Used when creating the Dedicated Host. From 651c41fe20749876087ada46c328c5d33201fb8c Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Sat, 15 Feb 2020 15:07:37 -0600 Subject: [PATCH 124/498] Address review comments - Fix test crash - Move common functions to helpers - Add more schema validations - Add Update tests --- azurerm/helpers/azure/monitor.go | 116 ++++++++++++++ ...rce_monitor_scheduled_query_rules_alert.go | 14 +- ...ource_monitor_scheduled_query_rules_log.go | 17 +- ...arm_monitor_scheduled_query_rules_alert.go | 101 +++--------- ...e_arm_monitor_scheduled_query_rules_log.go | 75 ++------- ...onitor_scheduled_query_rules_alert_test.go | 127 ++------------- ..._monitor_scheduled_query_rules_log_test.go | 44 +---- ...onitor_scheduled_query_rules_alert_test.go | 150 +++++++++++++++++- ..._monitor_scheduled_query_rules_log_test.go | 131 ++++++++++++++- ..._scheduled_query_rules_alert.html.markdown | 3 +- ...or_scheduled_query_rules_log.html.markdown | 1 - ..._scheduled_query_rules_alert.html.markdown | 5 +- ...or_scheduled_query_rules_log.html.markdown | 4 +- 13 files changed, 450 insertions(+), 338 deletions(-) diff --git a/azurerm/helpers/azure/monitor.go b/azurerm/helpers/azure/monitor.go index f5bf82a5bcf26..0560c1f027863 100644 --- a/azurerm/helpers/azure/monitor.go +++ b/azurerm/helpers/azure/monitor.go @@ -2,8 +2,124 @@ package azure import ( "fmt" + + "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) +func FlattenAzureRmScheduledQueryRulesAlertAction(input *insights.AzNsActionGroup) []interface{} { + result := make([]interface{}, 0) + v := make(map[string]interface{}) + + if input != nil { + if input.ActionGroup != nil { + v["action_group"] = *input.ActionGroup + } + v["email_subject"] = input.EmailSubject + v["custom_webhook_payload"] = input.CustomWebhookPayload + } + result = append(result, v) + + return result +} + +func ExpandMonitorScheduledQueryRulesCommonSource(d *schema.ResourceData) *insights.Source { + authorizedResourceIDs := d.Get("authorized_resource_ids").(*schema.Set).List() + dataSourceID := d.Get("data_source_id").(string) + query, ok := d.GetOk("query") + source := insights.Source{ + AuthorizedResources: utils.ExpandStringSlice(authorizedResourceIDs), + DataSourceID: utils.String(dataSourceID), + QueryType: insights.ResultCount, + } + if ok { + source.Query = utils.String(query.(string)) + } + + return &source +} + +func FlattenAzureRmScheduledQueryRulesAlertMetricTrigger(input *insights.LogMetricTrigger) []interface{} { + result := make(map[string]interface{}) + + if input == nil { + return []interface{}{} + } + + result["operator"] = string(input.ThresholdOperator) + + if input.Threshold != nil { + result["threshold"] = *input.Threshold + } + + result["metric_trigger_type"] = string(input.MetricTriggerType) + + if input.MetricColumn != nil { + result["metric_column"] = *input.MetricColumn + } + return []interface{}{result} +} + +func FlattenAzureRmScheduledQueryRulesAlertTrigger(input *insights.TriggerCondition) []interface{} { + result := make(map[string]interface{}) + + result["operator"] = string(input.ThresholdOperator) + + if input.Threshold != nil { + result["threshold"] = *input.Threshold + } + + if input.MetricTrigger != nil { + result["metric_trigger"] = FlattenAzureRmScheduledQueryRulesAlertMetricTrigger(input.MetricTrigger) + } + + return []interface{}{result} +} + +func FlattenAzureRmScheduledQueryRulesLogCriteria(input *[]insights.Criteria) []interface{} { + result := make([]interface{}, 0) + + if input != nil { + for _, criteria := range *input { + v := make(map[string]interface{}) + + v["dimension"] = FlattenAzureRmScheduledQueryRulesLogDimension(criteria.Dimensions) + v["metric_name"] = *criteria.MetricName + + result = append(result, v) + } + } + + return result +} + +func FlattenAzureRmScheduledQueryRulesLogDimension(input *[]insights.Dimension) []interface{} { + result := make([]interface{}, 0) + + if input != nil { + for _, dimension := range *input { + v := make(map[string]interface{}) + + if dimension.Name != nil { + v["name"] = *dimension.Name + } + + if dimension.Operator != nil { + v["operator"] = *dimension.Operator + } + + if dimension.Values != nil { + v["values"] = *dimension.Values + } + + result = append(result, v) + } + } + + return result +} + // ValidateThreshold checks that a threshold value is between 0 and 10000 // and is a whole number. The azure-sdk-for-go expects this value to be a float64 // but the user validation rules want an integer. diff --git a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_alert.go b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_alert.go index cc535fed14527..c7089ad132da9 100644 --- a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_alert.go +++ b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_alert.go @@ -149,18 +149,20 @@ func dataSourceArmMonitorScheduledQueryRulesAlertRead(d *schema.ResourceData, me ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() - name := d.Get("name").(string) resourceGroup := d.Get("resource_group_name").(string) + name := d.Get("name").(string) resp, err := client.Get(ctx, resourceGroup, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - return fmt.Errorf("Error: Scheduled Query Rule %q was not found", name) + return fmt.Errorf("[DEBUG] Scheduled Query Rule %q was not found in Resource Group %q: %+v", name, resourceGroup, err) } - return fmt.Errorf("Error reading Scheduled Query Rule: %+v", err) + return fmt.Errorf("Error getting Scheduled Query Rule %q (resource group %q): %+v", name, resourceGroup, err) } d.SetId(*resp.ID) + + d.Set("name", name) d.Set("resource_group_name", resourceGroup) if location := resp.Location; location != nil { d.Set("location", azure.NormalizeLocation(*location)) @@ -175,9 +177,9 @@ func dataSourceArmMonitorScheduledQueryRulesAlertRead(d *schema.ResourceData, me action, ok := resp.Action.(insights.AlertingAction) if !ok { - return fmt.Errorf("Wrong action type in scheduled query rule %q (resource group %q): %T", name, resourceGroup, resp.Action) + return fmt.Errorf("Wrong action type in Scheduled Query Rule %q (resource group %q): %T", name, resourceGroup, resp.Action) } - if err = d.Set("action", flattenAzureRmScheduledQueryRulesAlertAction(action.AznsAction)); err != nil { + if err = d.Set("action", azure.FlattenAzureRmScheduledQueryRulesAlertAction(action.AznsAction)); err != nil { return fmt.Errorf("Error setting `action`: %+v", err) } severity, err := strconv.Atoi(string(action.Severity)) @@ -186,7 +188,7 @@ func dataSourceArmMonitorScheduledQueryRulesAlertRead(d *schema.ResourceData, me } d.Set("severity", severity) d.Set("throttling", action.ThrottlingInMin) - if err = d.Set("trigger", flattenAzureRmScheduledQueryRulesAlertTrigger(action.Trigger)); err != nil { + if err = d.Set("trigger", azure.FlattenAzureRmScheduledQueryRulesAlertTrigger(action.Trigger)); err != nil { return fmt.Errorf("Error setting `trigger`: %+v", err) } diff --git a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go index bad7e1f79797b..ce22485f3879f 100644 --- a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go +++ b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go @@ -85,10 +85,6 @@ func dataSourceArmMonitorScheduledQueryRulesLog() *schema.Resource { Type: schema.TypeBool, Computed: true, }, - "query_type": { - Type: schema.TypeString, - Computed: true, - }, "tags": tags.SchemaDataSource(), }, @@ -100,18 +96,20 @@ func dataSourceArmMonitorScheduledQueryRulesLogRead(d *schema.ResourceData, meta ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() - name := d.Get("name").(string) resourceGroup := d.Get("resource_group_name").(string) + name := d.Get("name").(string) resp, err := client.Get(ctx, resourceGroup, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - return fmt.Errorf("Error: Scheduled Query Rule %q was not found", name) + return fmt.Errorf("[DEBUG] Scheduled Query Rule %q was not found in Resource Group %q: %+v", name, resourceGroup, err) } - return fmt.Errorf("Error reading Scheduled Query Rule: %+v", err) + return fmt.Errorf("Error getting Scheduled Query Rule %q (resource group %q): %+v", name, resourceGroup, err) } d.SetId(*resp.ID) + + d.Set("name", name) d.Set("resource_group_name", resourceGroup) if location := resp.Location; location != nil { d.Set("location", azure.NormalizeLocation(*location)) @@ -126,9 +124,9 @@ func dataSourceArmMonitorScheduledQueryRulesLogRead(d *schema.ResourceData, meta action, ok := resp.Action.(insights.LogToMetricAction) if !ok { - return fmt.Errorf("Wrong action type in scheduled query rule %q (resource group %q): %T", name, resourceGroup, resp.Action) + return fmt.Errorf("Wrong action type in Scheduled Query Rule %q (resource group %q): %T", name, resourceGroup, resp.Action) } - if err = d.Set("criteria", flattenAzureRmScheduledQueryRulesLogCriteria(action.Criteria)); err != nil { + if err = d.Set("criteria", azure.FlattenAzureRmScheduledQueryRulesLogCriteria(action.Criteria)); err != nil { return fmt.Errorf("Error setting `criteria`: %+v", err) } @@ -148,7 +146,6 @@ func dataSourceArmMonitorScheduledQueryRulesLogRead(d *schema.ResourceData, meta if source.DataSourceID != nil { d.Set("data_source_id", source.DataSourceID) } - d.Set("query_type", string(source.QueryType)) } return tags.FlattenAndSet(d, resp.Tags) diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go index 6ea171c6cd89a..25ede04fd1690 100644 --- a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go +++ b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go @@ -58,8 +58,9 @@ func resourceArmMonitorScheduledQueryRulesAlert() *schema.Resource { }, }, "action": { - Type: schema.TypeSet, - Optional: true, + Type: schema.TypeList, + Required: true, + MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "action_group": { @@ -133,13 +134,15 @@ func resourceArmMonitorScheduledQueryRulesAlert() *schema.Resource { ValidateFunc: validation.IntBetween(5, 2880), }, "trigger": { - Type: schema.TypeSet, + Type: schema.TypeList, Required: true, + MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "metric_trigger": { - Type: schema.TypeSet, + Type: schema.TypeList, Optional: true, + MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "metric_column": { @@ -214,7 +217,9 @@ func resourceArmMonitorScheduledQueryRulesAlertCreateUpdate(d *schema.ResourceDa query := d.Get("query").(string) _, ok := d.GetOk("metric_trigger") if ok { - if !(strings.Contains(query, "summarize") && strings.Contains(query, "AggregatedValue") && strings.Contains(query, "bin")) { + if !(strings.Contains(query, "summarize") && + strings.Contains(query, "AggregatedValue") && + strings.Contains(query, "bin")) { return fmt.Errorf("Error in parameter values for Scheduled Query Rules %q (Resource Group %q): query must contain summarize, AggregatedValue, and bin when metric_trigger is specified", name, resourceGroup) } } @@ -242,7 +247,7 @@ func resourceArmMonitorScheduledQueryRulesAlertCreateUpdate(d *schema.ResourceDa location := azure.NormalizeLocation(d.Get("location")) - source := expandMonitorScheduledQueryRulesAlertSource(d) + source := azure.ExpandMonitorScheduledQueryRulesCommonSource(d) t := d.Get("tags").(map[string]interface{}) expandedTags := tags.Expand(t) @@ -260,7 +265,7 @@ func resourceArmMonitorScheduledQueryRulesAlertCreateUpdate(d *schema.ResourceDa } if _, err := client.CreateOrUpdate(ctx, resourceGroup, name, parameters); err != nil { - return fmt.Errorf("Error creating or updating scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error creating or updating Scheduled Query Rule %q (resource group %q): %+v", name, resourceGroup, err) } read, err := client.Get(ctx, resourceGroup, name) @@ -290,11 +295,11 @@ func resourceArmMonitorScheduledQueryRulesAlertRead(d *schema.ResourceData, meta resp, err := client.Get(ctx, resourceGroup, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - log.Printf("[DEBUG] Scheduled Query Rule %q was not found in Resource Group %q - removing from state!", name, resourceGroup) + log.Printf("[DEBUG] Scheduled Query Rule %q was not found in Resource Group %q", name, resourceGroup) d.SetId("") return nil } - return fmt.Errorf("Error getting scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error getting Scheduled Query Rule %q (resource group %q): %+v", name, resourceGroup, err) } d.Set("name", name) @@ -303,19 +308,18 @@ func resourceArmMonitorScheduledQueryRulesAlertRead(d *schema.ResourceData, meta d.Set("location", azure.NormalizeLocation(*location)) } + d.Set("description", resp.Description) if resp.Enabled == insights.True { d.Set("enabled", true) } else { d.Set("enabled", false) } - d.Set("description", resp.Description) - action, ok := resp.Action.(insights.AlertingAction) if !ok { - return fmt.Errorf("Wrong action type in scheduled query rule %q (resource group %q): %T", name, resourceGroup, resp.Action) + return fmt.Errorf("Wrong action type in Scheduled Query Rule %q (resource group %q): %T", name, resourceGroup, resp.Action) } - if err = d.Set("action", flattenAzureRmScheduledQueryRulesAlertAction(action.AznsAction)); err != nil { + if err = d.Set("action", azure.FlattenAzureRmScheduledQueryRulesAlertAction(action.AznsAction)); err != nil { return fmt.Errorf("Error setting `action`: %+v", err) } severity, err := strconv.Atoi(string(action.Severity)) @@ -324,7 +328,7 @@ func resourceArmMonitorScheduledQueryRulesAlertRead(d *schema.ResourceData, meta } d.Set("severity", severity) d.Set("throttling", action.ThrottlingInMin) - if err = d.Set("trigger", flattenAzureRmScheduledQueryRulesAlertTrigger(action.Trigger)); err != nil { + if err = d.Set("trigger", azure.FlattenAzureRmScheduledQueryRulesAlertTrigger(action.Trigger)); err != nil { return fmt.Errorf("Error setting `trigger`: %+v", err) } @@ -367,7 +371,7 @@ func resourceArmMonitorScheduledQueryRulesAlertDelete(d *schema.ResourceData, me if resp, err := client.Delete(ctx, resourceGroup, name); err != nil { if !response.WasNotFound(resp.Response) { - return fmt.Errorf("Error deleting scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error deleting Scheduled Query Rule %q (resource group %q): %+v", name, resourceGroup, err) } } @@ -454,20 +458,6 @@ func expandMonitorScheduledQueryRulesAlertSchedule(d *schema.ResourceData) *insi return &schedule } -func expandMonitorScheduledQueryRulesAlertSource(d *schema.ResourceData) *insights.Source { - authorizedResourceIDs := d.Get("authorized_resource_ids").(*schema.Set).List() - dataSourceID := d.Get("data_source_id").(string) - query := d.Get("query").(string) - source := insights.Source{ - AuthorizedResources: utils.ExpandStringSlice(authorizedResourceIDs), - DataSourceID: utils.String(dataSourceID), - Query: utils.String(query), - QueryType: insights.ResultCount, - } - - return &source -} - func expandMonitorScheduledQueryRulesAlertTrigger(input []interface{}) *insights.TriggerCondition { result := insights.TriggerCondition{} if len(input) == 0 { @@ -491,56 +481,3 @@ func expandMonitorScheduledQueryRulesAlertTrigger(input []interface{}) *insights return &result } - -func flattenAzureRmScheduledQueryRulesAlertAction(input *insights.AzNsActionGroup) []interface{} { - result := make([]interface{}, 0) - v := make(map[string]interface{}) - - if input != nil { - if input.ActionGroup != nil { - v["action_group"] = *input.ActionGroup - } - v["email_subject"] = input.EmailSubject - v["custom_webhook_payload"] = input.CustomWebhookPayload - } - result = append(result, v) - - return result -} - -func flattenAzureRmScheduledQueryRulesAlertMetricTrigger(input *insights.LogMetricTrigger) []interface{} { - result := make(map[string]interface{}) - - if input == nil { - return []interface{}{} - } - - result["operator"] = string(input.ThresholdOperator) - - if input.Threshold != nil { - result["threshold"] = *input.Threshold - } - - result["metric_trigger_type"] = string(input.MetricTriggerType) - - if input.MetricColumn != nil { - result["metric_column"] = *input.MetricColumn - } - return []interface{}{result} -} - -func flattenAzureRmScheduledQueryRulesAlertTrigger(input *insights.TriggerCondition) []interface{} { - result := make(map[string]interface{}) - - result["operator"] = string(input.ThresholdOperator) - - if input.Threshold != nil { - result["threshold"] = *input.Threshold - } - - if input.MetricTrigger != nil { - result["metric_trigger"] = flattenAzureRmScheduledQueryRulesAlertMetricTrigger(input.MetricTrigger) - } - - return []interface{}{result} -} diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go index f9537f6a7306e..1ff8e7ca63ae2 100644 --- a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go +++ b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go @@ -57,8 +57,9 @@ func resourceArmMonitorScheduledQueryRulesLog() *schema.Resource { }, "criteria": { - Type: schema.TypeSet, + Type: schema.TypeList, Required: true, + MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "dimension": { @@ -152,7 +153,7 @@ func resourceArmMonitorScheduledQueryRulesLogCreateUpdate(d *schema.ResourceData location := azure.NormalizeLocation(d.Get("location")) - source := expandMonitorScheduledQueryRulesLogSource(d) + source := azure.ExpandMonitorScheduledQueryRulesCommonSource(d) t := d.Get("tags").(map[string]interface{}) expandedTags := tags.Expand(t) @@ -169,7 +170,7 @@ func resourceArmMonitorScheduledQueryRulesLogCreateUpdate(d *schema.ResourceData } if _, err := client.CreateOrUpdate(ctx, resourceGroup, name, parameters); err != nil { - return fmt.Errorf("Error creating or updating scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error creating or updating Scheduled Query Rule %q (resource group %q): %+v", name, resourceGroup, err) } read, err := client.Get(ctx, resourceGroup, name) @@ -199,11 +200,11 @@ func resourceArmMonitorScheduledQueryRulesLogRead(d *schema.ResourceData, meta i resp, err := client.Get(ctx, resourceGroup, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - log.Printf("[DEBUG] Scheduled Query Rule %q was not found in Resource Group %q - removing from state!", name, resourceGroup) + log.Printf("[DEBUG] Scheduled Query Rule %q was not found in Resource Group %q", name, resourceGroup) d.SetId("") return nil } - return fmt.Errorf("Error getting scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error getting Scheduled Query Rule %q (resource group %q): %+v", name, resourceGroup, err) } d.Set("name", name) @@ -212,19 +213,18 @@ func resourceArmMonitorScheduledQueryRulesLogRead(d *schema.ResourceData, meta i d.Set("location", azure.NormalizeLocation(*location)) } + d.Set("description", resp.Description) if resp.Enabled == insights.True { d.Set("enabled", true) } else { d.Set("enabled", false) } - d.Set("description", resp.Description) - action, ok := resp.Action.(insights.LogToMetricAction) if !ok { - return fmt.Errorf("Wrong action type in scheduled query rule %q (resource group %q): %T", name, resourceGroup, resp.Action) + return fmt.Errorf("Wrong action type in Scheduled Query Rule %q (resource group %q): %T", name, resourceGroup, resp.Action) } - if err = d.Set("criteria", flattenAzureRmScheduledQueryRulesLogCriteria(action.Criteria)); err != nil { + if err = d.Set("criteria", azure.FlattenAzureRmScheduledQueryRulesLogCriteria(action.Criteria)); err != nil { return fmt.Errorf("Error setting `criteria`: %+v", err) } @@ -254,7 +254,7 @@ func resourceArmMonitorScheduledQueryRulesLogDelete(d *schema.ResourceData, meta if resp, err := client.Delete(ctx, resourceGroup, name); err != nil { if !response.WasNotFound(resp.Response) { - return fmt.Errorf("Error deleting scheduled query rule %q (resource group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error deleting Scheduled Query Rule %q (resource group %q): %+v", name, resourceGroup, err) } } @@ -311,58 +311,3 @@ func expandMonitorScheduledQueryRulesLogToMetricAction(d *schema.ResourceData) * return &action } - -func expandMonitorScheduledQueryRulesLogSource(d *schema.ResourceData) *insights.Source { - authorizedResourceIDs := d.Get("authorized_resource_ids").(*schema.Set).List() - dataSourceID := d.Get("data_source_id").(string) - source := insights.Source{ - AuthorizedResources: utils.ExpandStringSlice(authorizedResourceIDs), - DataSourceID: utils.String(dataSourceID), - QueryType: insights.ResultCount, - } - - return &source -} - -func flattenAzureRmScheduledQueryRulesLogCriteria(input *[]insights.Criteria) []interface{} { - result := make([]interface{}, 0) - - if input != nil { - for _, criteria := range *input { - v := make(map[string]interface{}) - - v["dimension"] = flattenAzureRmScheduledQueryRulesLogDimension(criteria.Dimensions) - v["metric_name"] = *criteria.MetricName - - result = append(result, v) - } - } - - return result -} - -func flattenAzureRmScheduledQueryRulesLogDimension(input *[]insights.Dimension) []interface{} { - result := make([]interface{}, 0) - - if input != nil { - for _, dimension := range *input { - v := make(map[string]interface{}) - - if dimension.Name != nil { - v["name"] = *dimension.Name - } - - if dimension.Operator != nil { - v["operator"] = *dimension.Operator - } - - if dimension.Values != nil { - v["values"] = *dimension.Values - } - - result = append(result, v) - } - } - - return result -} diff --git a/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_alert_test.go b/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_alert_test.go index 4f41939128074..e1955393eb102 100644 --- a/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_alert_test.go +++ b/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_alert_test.go @@ -9,7 +9,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" ) -func TestAccDataSourceAzureRMMonitorScheduledQueryRules_alertingAction(t *testing.T) { +func TestAccDataSourceAzureRMMonitorScheduledQueryRulesAlertingAction(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_monitor_scheduled_query_rules_alert", "test") resource.ParallelTest(t, resource.TestCase{ @@ -26,7 +26,7 @@ func TestAccDataSourceAzureRMMonitorScheduledQueryRules_alertingAction(t *testin }) } -func TestAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResource(t *testing.T) { +func TestAccDataSourceAzureRMMonitorScheduledQueryRulesAlertingActionCrossResource(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_monitor_scheduled_query_rules_alert", "test") resource.ParallelTest(t, resource.TestCase{ @@ -45,133 +45,26 @@ func TestAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResou func testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionConfig(data acceptance.TestData) string { ts := time.Now().Format(time.RFC3339) + template := testAccAzureRMMonitorScheduledQueryRulesAlertingActionConfig_basic(data, ts) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-monitor-%d" - location = "%s" -} - -resource "azurerm_log_analytics_workspace" "test" { - name = "acctestWorkspace-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku = "PerGB2018" - retention_in_days = 30 -} - -resource "azurerm_monitor_action_group" "test" { - name = "acctestActionGroup-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - short_name = "acctestag" -} - -resource "azurerm_monitor_scheduled_query_rules_alert" "test" { - name = "acctestsqr-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - description = "test alerting action" - enabled = true - - query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" - data_source_id = "${azurerm_log_analytics_workspace.test.id}" - query_type = "ResultCount" - - frequency = 60 - time_window = 60 - - severity = 3 - action { - action_group = ["${azurerm_monitor_action_group.test.id}"] - email_subject = "Custom alert email subject" - } - - trigger { - operator = "GreaterThan" - threshold = 5000 - metric_trigger { - operator = "GreaterThan" - threshold = 1 - metric_trigger_type = "Total" - metric_column = "TimeGenerated" - } - } -} +%s data "azurerm_monitor_scheduled_query_rules_alert" "test" { - name = "${azurerm_monitor_scheduled_query_rules_alert.test.name}" + name = basename(azurerm_monitor_scheduled_query_rules_alert.test.id) resource_group_name = "${azurerm_resource_group.test.name}" } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, ts, ts) +`, template) } func testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResourceConfig(data acceptance.TestData) string { - ts := time.Now().Format(time.RFC3339) - + template := testAccAzureRMMonitorScheduledQueryRules_alertingActionCrossResourceConfig(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-monitor-%d" - location = "%s" -} - -resource "azurerm_log_analytics_workspace" "test" { - name = "acctestWorkspace-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku = "PerGB2018" - retention_in_days = 30 -} - -resource "azurerm_log_analytics_workspace" "test2" { - name = "acctestWorkspace2-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku = "PerGB2018" - retention_in_days = 30 -} - -resource "azurerm_monitor_action_group" "test" { - name = "acctestActionGroup-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - short_name = "acctestag" -} - -resource "azurerm_monitor_scheduled_query_rules_alert" "test" { - name = "acctestSqr-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - description = "test alerting action" - enabled = true - - query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" - data_source_id = "${azurerm_log_analytics_workspace.test.id}" - query_type = "ResultCount" - authorized_resource_ids = ["${azurerm_log_analytics_workspace.test.id}", "${azurerm_log_analytics_workspace.test2.id}"] - - frequency = 60 - time_window = 60 - - severity = 3 - action { - action_group = ["${azurerm_monitor_action_group.test.id}"] - email_subject = "Custom alert email subject" - } - - trigger { - operator = "GreaterThan" - threshold = 5000 - metric_trigger { - operator = "GreaterThan" - threshold = 1 - metric_trigger_type = "Total" - metric_column = "TimeGenerated" - } - } -} +%s data "azurerm_monitor_scheduled_query_rules_alert" "test" { - name = "${azurerm_monitor_scheduled_query_rules_alert.test.name}" + name = basename(azurerm_monitor_scheduled_query_rules_alert.test.id) resource_group_name = "${azurerm_resource_group.test.name}" } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, ts, ts) +`, template) } diff --git a/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_log_test.go b/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_log_test.go index d25c6a7de3558..4d17e1662fb1e 100644 --- a/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_log_test.go +++ b/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_log_test.go @@ -8,7 +8,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" ) -func TestAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricAction(t *testing.T) { +func TestAccDataSourceAzureRMMonitorScheduledQueryRulesLogToMetricAction(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_monitor_scheduled_query_rules_log", "test") resource.ParallelTest(t, resource.TestCase{ @@ -26,47 +26,13 @@ func TestAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricAction(t *tes } func testAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricActionConfig(data acceptance.TestData) string { + template := testAccAzureRMMonitorScheduledQueryRulesLogToMetricActionConfig_basic(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-monitor-%d" - location = "%s" -} - -resource "azurerm_application_insights" "test" { - name = "acctestAppInsights-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - application_type = "web" -} - -resource "azurerm_monitor_action_group" "test" { - name = "acctestActionGroup-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - short_name = "acctestag" -} - -resource "azurerm_monitor_scheduled_query_rules_log" "test" { - name = "acctestsqr-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - description = "test log to metric action" - enabled = true - - data_source_id = "${azurerm_application_insights.test.id}" - - criteria { - metric_name = "Average_%% Idle Time" - dimension { - name = "InstanceName" - operator = "Include" - values = ["50"] - } - } -} +%s data "azurerm_monitor_scheduled_query_rules_log" "test" { - name = "${azurerm_monitor_scheduled_query_rules_log.test.name}" + name = basename(azurerm_monitor_scheduled_query_rules_log.test.id) resource_group_name = "${azurerm_resource_group.test.name}" } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, template) } diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go index a558a53593667..3ecf0a52bb0a0 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go @@ -12,8 +12,9 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" ) -func TestAccAzureRMMonitorScheduledQueryRules_AlertingAction(t *testing.T) { +func TestAccAzureRMMonitorScheduledQueryRulesAlertingAction_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules_alert", "test") + ts := time.Now().Format(time.RFC3339) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -21,7 +22,53 @@ func TestAccAzureRMMonitorScheduledQueryRules_AlertingAction(t *testing.T) { CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesAlertDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMMonitorScheduledQueryRules_alertingAction(data), + Config: testAccAzureRMMonitorScheduledQueryRulesAlertingActionConfig_basic(data, ts), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMonitorScheduledQueryRulesAlertExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMMonitorScheduledQueryRulesAlertingAction_update(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules_alert", "test") + ts := time.Now().Format(time.RFC3339) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesAlertDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMMonitorScheduledQueryRulesAlertingActionConfig_basic(data, ts), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMonitorScheduledQueryRulesAlertExists(data.ResourceName), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMMonitorScheduledQueryRulesAlertingActionConfig_update(data, ts), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMonitorScheduledQueryRulesAlertExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMMonitorScheduledQueryRulesAlertingAction_complete(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules_alert", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesAlertDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMMonitorScheduledQueryRulesAlertingActionConfig_complete(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMMonitorScheduledQueryRulesAlertExists(data.ResourceName), ), @@ -40,7 +87,7 @@ func TestAccAzureRMMonitorScheduledQueryRules_AlertingActionCrossResource(t *tes CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesAlertDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMMonitorScheduledQueryRules_alertingActionCrossResource(data), + Config: testAccAzureRMMonitorScheduledQueryRules_alertingActionCrossResourceConfig(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMMonitorScheduledQueryRulesAlertExists(data.ResourceName), ), @@ -50,7 +97,95 @@ func TestAccAzureRMMonitorScheduledQueryRules_AlertingActionCrossResource(t *tes }) } -func testAccAzureRMMonitorScheduledQueryRules_alertingAction(data acceptance.TestData) string { +func testAccAzureRMMonitorScheduledQueryRulesAlertingActionConfig_basic(data acceptance.TestData, ts string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-monitor-%d" + location = "%s" +} + +resource "azurerm_application_insights" "test" { + name = "acctestAppInsights-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + application_type = "web" +} + +resource "azurerm_monitor_action_group" "test" { + name = "acctestActionGroup-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + short_name = "acctestag" +} + +resource "azurerm_monitor_scheduled_query_rules_alert" "test" { + name = "acctestsqr-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + + data_source_id = "${azurerm_application_insights.test.id}" + query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" + + frequency = 60 + time_window = 60 + + action { + action_group = ["${azurerm_monitor_action_group.test.id}"] + } + + trigger { + operator = "GreaterThan" + threshold = 5000 + } +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, ts, ts) +} + +func testAccAzureRMMonitorScheduledQueryRulesAlertingActionConfig_update(data acceptance.TestData, ts string) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-monitor-%d" + location = "%s" +} + +resource "azurerm_application_insights" "test" { + name = "acctestAppInsights-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + application_type = "web" +} + +resource "azurerm_monitor_action_group" "test" { + name = "acctestActionGroup-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + short_name = "acctestag" +} + +resource "azurerm_monitor_scheduled_query_rules_alert" "test" { + name = "acctestsqr-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + + data_source_id = "${azurerm_application_insights.test.id}" + query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" + enabled = false + description = "test description" + + frequency = 30 + time_window = 30 + + action { + action_group = ["${azurerm_monitor_action_group.test.id}"] + } + + trigger { + operator = "GreaterThan" + threshold = 1000 + } +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, ts, ts) +} + +func testAccAzureRMMonitorScheduledQueryRulesAlertingActionConfig_complete(data acceptance.TestData) string { ts := time.Now().Format(time.RFC3339) return fmt.Sprintf(` @@ -81,12 +216,12 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "test" { data_source_id = "${azurerm_application_insights.test.id}" query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" - query_type = "ResultCount" frequency = 60 time_window = 60 - severity = 3 + severity = 3 + throttling = 5 action { action_group = ["${azurerm_monitor_action_group.test.id}"] email_subject = "Custom alert email subject" @@ -107,7 +242,7 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, ts, ts) } -func testAccAzureRMMonitorScheduledQueryRules_alertingActionCrossResource(data acceptance.TestData) string { +func testAccAzureRMMonitorScheduledQueryRules_alertingActionCrossResourceConfig(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-monitor-%d" @@ -145,7 +280,6 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "test" { authorized_resource_ids = ["${azurerm_application_insights.test.id}", "${azurerm_log_analytics_workspace.test.id}"] data_source_id = "${azurerm_application_insights.test.id}" query = format("let a=workspace('%%s').Perf | where Computer='dependency' and TimeGenerated > ago(1h) | where ObjectName == 'Processor' and CounterName == '%%%% Processor Time' | summarize cpu=avg(CounterValue) by bin(TimeGenerated, 1m) | extend ts=tostring(TimeGenerated); let b=requests | where resultCode == '200' and timestamp > ago(1h) | summarize reqs=count() by bin(timestamp, 1m) | extend ts = tostring(timestamp); a | join b on $left.ts == $right.ts | where cpu > 50 and reqs > 5", azurerm_log_analytics_workspace.test.id) - query_type = "ResultCount" frequency = 60 time_window = 60 diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go index 0706ca5810786..fb742cd513ee2 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go @@ -11,7 +11,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" ) -func TestAccAzureRMMonitorScheduledQueryRules_LogToMetricAction(t *testing.T) { +func TestAccAzureRMMonitorScheduledQueryRulesLogToMetricAction_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules_log", "test") resource.ParallelTest(t, resource.TestCase{ @@ -20,7 +20,7 @@ func TestAccAzureRMMonitorScheduledQueryRules_LogToMetricAction(t *testing.T) { CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesLogDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMMonitorScheduledQueryRules_logToMetricAction(data), + Config: testAccAzureRMMonitorScheduledQueryRulesLogToMetricActionConfig_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMMonitorScheduledQueryRulesLogExists(data.ResourceName), ), @@ -30,7 +30,132 @@ func TestAccAzureRMMonitorScheduledQueryRules_LogToMetricAction(t *testing.T) { }) } -func testAccAzureRMMonitorScheduledQueryRules_logToMetricAction(data acceptance.TestData) string { +func TestAccAzureRMMonitorScheduledQueryRulesLogToMetricAction_update(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules_log", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesLogDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMMonitorScheduledQueryRulesLogToMetricActionConfig_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMonitorScheduledQueryRulesLogExists(data.ResourceName), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMMonitorScheduledQueryRulesLogToMetricActionConfig_update(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMonitorScheduledQueryRulesLogExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMMonitorScheduledQueryRulesLogToMetricAction_complete(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules_log", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesLogDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMMonitorScheduledQueryRulesLogToMetricActionConfig_complete(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMonitorScheduledQueryRulesLogExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + +func testAccAzureRMMonitorScheduledQueryRulesLogToMetricActionConfig_basic(data acceptance.TestData) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-monitor-%d" + location = "%s" +} + +resource "azurerm_application_insights" "test" { + name = "acctestAppInsights-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + application_type = "web" +} + +resource "azurerm_monitor_action_group" "test" { + name = "acctestActionGroup-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + short_name = "acctestag" +} + +resource "azurerm_monitor_scheduled_query_rules_log" "test" { + name = "acctestsqr-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + + data_source_id = "${azurerm_application_insights.test.id}" + + criteria { + metric_name = "Average_%% Idle Time" + dimension { + name = "InstanceName" + operator = "Include" + values = ["50"] + } + } +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) +} + +func testAccAzureRMMonitorScheduledQueryRulesLogToMetricActionConfig_update(data acceptance.TestData) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-monitor-%d" + location = "%s" +} + +resource "azurerm_application_insights" "test" { + name = "acctestAppInsights-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + application_type = "web" +} + +resource "azurerm_monitor_action_group" "test" { + name = "acctestActionGroup-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + short_name = "acctestag" +} + +resource "azurerm_monitor_scheduled_query_rules_log" "test" { + name = "acctestsqr-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + description = "test log to metric action" + enabled = true + + data_source_id = "${azurerm_application_insights.test.id}" + + criteria { + metric_name = "Average_%% Idle Time" + dimension { + name = "Computer" + operator = "Include" + values = ["25"] + } + } +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) +} + +func testAccAzureRMMonitorScheduledQueryRulesLogToMetricActionConfig_complete(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-monitor-%d" diff --git a/website/docs/d/monitor_scheduled_query_rules_alert.html.markdown b/website/docs/d/monitor_scheduled_query_rules_alert.html.markdown index 7e513bf3c885a..a48871a910b7b 100644 --- a/website/docs/d/monitor_scheduled_query_rules_alert.html.markdown +++ b/website/docs/d/monitor_scheduled_query_rules_alert.html.markdown @@ -35,10 +35,9 @@ output "query_rule_id" { * `authorized_resource_ids` - List of Resource IDs referred into query. * `data_source_id` - The resource URI over which log search query is to be run. * `description` - The description of the Scheduled Query Rule. -* `enabled` - Whether this scheduled query rule is enabled. +* `enabled` - Whether this Scheduled Query Rule is enabled. * `frequency` - Frequency at which rule condition should be evaluated. * `query` - Log search query. -* `query_type` - Must equal "ResultCount". * `time_window` - Time window for which data needs to be fetched for query. * `severity` - Severity of the alert. * `throttling` - Time for which alerts should be throttled or suppressed. diff --git a/website/docs/d/monitor_scheduled_query_rules_log.html.markdown b/website/docs/d/monitor_scheduled_query_rules_log.html.markdown index af8890e478d20..47cb9bdbdd236 100644 --- a/website/docs/d/monitor_scheduled_query_rules_log.html.markdown +++ b/website/docs/d/monitor_scheduled_query_rules_log.html.markdown @@ -35,7 +35,6 @@ output "query_rule_id" { * `data_source_id` - The resource URI over which log search query is to be run. * `description` - The description of the Scheduled Query Rule. * `enabled` - Whether this Scheduled Query Rule is enabled. -* `throttling` - Time for which alerts should be throttled or suppressed. --- diff --git a/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown b/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown index 09cc587790910..d00a1f636a4f0 100644 --- a/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown +++ b/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown @@ -127,12 +127,13 @@ The following arguments are supported: * `resource_group_name` - (Required) The name of the resource group in which to create the Scheduled Query Rule instance. * `data_source_id` - (Required) The resource URI over which log search query is to be run. * `frequency` - (Required) Frequency (in minutes) at which rule condition should be evaluated. Values must be between 5 and 1440 (inclusive). +* `query` - (Required) Log search query. * `time_window` - (Required) Time window for which data needs to be fetched for query (must be greater than or equal to `frequency`). Values must be between 5 and 2880 (inclusive). * `trigger` - (Required) The condition that results in the alert rule being run. +* `action` - (Required) An `action` block as defined below. * `authorized_resource_ids` - (Optional) List of Resource IDs referred into query. -* `action` - (Optional) An `action` block as defined below. * `description` - (Optional) The description of the Scheduled Query Rule. -* `enabled` - (Optional) Whether this scheduled query rule is enabled. Default is `true`. +* `enabled` - (Optional) Whether this Scheduled Query Rule is enabled. Default is `true`. * `severity` - (Optional) Severity of the alert. Possible values include: 0, 1, 2, 3, or 4. * `throttling` - (Optional) Time (in minutes) for which Alerts should be throttled or suppressed. Values must be between 0 and 10000 (inclusive). diff --git a/website/docs/r/monitor_scheduled_query_rules_log.html.markdown b/website/docs/r/monitor_scheduled_query_rules_log.html.markdown index 48beb3b33359c..d804aa2180d2d 100644 --- a/website/docs/r/monitor_scheduled_query_rules_log.html.markdown +++ b/website/docs/r/monitor_scheduled_query_rules_log.html.markdown @@ -53,9 +53,7 @@ The following arguments are supported: * `criteria` - (Required) A `criteria` block as defined below. * `data_source_id` - (Required) The resource uri over which log search query is to be run. * `description` - (Optional) The description of the Scheduled Query Rule. -* `enabled` - (Optional) Whether this scheduled query rule is enabled. Default is `true`. -* `throttling` - (Optional) Time (in minutes) for which Alerts should be throttled or suppressed. Values must be between 0 and 10000 ( -inclusive). +* `enabled` - (Optional) Whether this Scheduled Query Rule is enabled. Default is `true`. --- From 3c4d40d08e644deb5aba7f5a6bcc5651b5dbb7b5 Mon Sep 17 00:00:00 2001 From: Austin Cheung Date: Sat, 15 Feb 2020 15:54:16 -0800 Subject: [PATCH 125/498] add zone_redundant to azurerm_sql_database --- .../services/sql/resource_arm_sql_database.go | 14 +++++ .../tests/resource_arm_sql_database_test.go | 55 +++++++++++++++++++ website/docs/r/sql_database.html.markdown | 2 + 3 files changed, 71 insertions(+) diff --git a/azurerm/internal/services/sql/resource_arm_sql_database.go b/azurerm/internal/services/sql/resource_arm_sql_database.go index 34ef8acfea751..1f65c65fa817e 100644 --- a/azurerm/internal/services/sql/resource_arm_sql_database.go +++ b/azurerm/internal/services/sql/resource_arm_sql_database.go @@ -318,6 +318,12 @@ func resourceArmSqlDatabase() *schema.Resource { Default: false, }, + "zone_redundant": { + Type: schema.TypeBool, + Optional: true, + Computed: true, + }, + "tags": tags.Schema(), }, @@ -449,6 +455,10 @@ func resourceArmSqlDatabaseCreateUpdate(d *schema.ResourceData, meta interface{} properties.DatabaseProperties.ReadScale = sql.ReadScaleDisabled } + if v, ok := d.GetOkExists("zone_redundant"); ok { + properties.DatabaseProperties.ZoneRedundant = utils.Bool(v.(bool)) + } + // The requested Service Objective Name does not match the requested Service Objective Id. if d.HasChange("requested_service_objective_name") && !d.HasChange("requested_service_objective_id") { properties.DatabaseProperties.RequestedServiceObjectiveID = nil @@ -570,6 +580,10 @@ func resourceArmSqlDatabaseRead(d *schema.ResourceData, meta interface{}) error } else { d.Set("read_scale", false) } + + if zoneRedundant := props.ZoneRedundant; zoneRedundant != nil { + d.Set("zone_redundant", zoneRedundant) + } } return tags.FlattenAndSet(d, resp.Tags) 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 c1c58164693a1..887b9daf1c323 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 @@ -296,6 +296,32 @@ func TestAccAzureRMSqlDatabase_readScale(t *testing.T) { }) } +func TestAccAzureRMSqlDatabase_zoneRedundant(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_sql_database", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMSqlDatabaseDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMSqlDatabase_zoneRedundant(data, true), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMSqlDatabaseExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "zone_redundant", "true"), + ), + }, + { + Config: testAccAzureRMSqlDatabase_zoneRedundant(data, false), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMSqlDatabaseExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "zone_redundant", "false"), + ), + }, + }, + }) +} + func testCheckAzureRMSqlDatabaseExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).Sql.DatabasesClient @@ -814,3 +840,32 @@ resource "azurerm_sql_database" "test" { } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, readScale) } + +func testAccAzureRMSqlDatabase_zoneRedundant(data acceptance.TestData, zoneRedundant bool) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_sql_server" "test" { + name = "acctestsqlserver%d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + version = "12.0" + administrator_login = "mradministrator" + administrator_login_password = "thisIsDog11" +} + +resource "azurerm_sql_database" "test" { + name = "acctestdb%d" + resource_group_name = "${azurerm_resource_group.test.name}" + server_name = "${azurerm_sql_server.test.name}" + location = "${azurerm_resource_group.test.location}" + edition = "Premium" + collation = "SQL_Latin1_General_CP1_CI_AS" + max_size_bytes = "1073741824" + zone_redundant = %t +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, zoneRedundant) +} diff --git a/website/docs/r/sql_database.html.markdown b/website/docs/r/sql_database.html.markdown index 912454fc1b979..2d740c064440e 100644 --- a/website/docs/r/sql_database.html.markdown +++ b/website/docs/r/sql_database.html.markdown @@ -76,6 +76,8 @@ The following arguments are supported: * `read_scale` - (Optional) Read-only connections will be redirected to a high-available replica. Please see [Use read-only replicas to load-balance read-only query workloads](https://docs.microsoft.com/en-us/azure/sql-database/sql-database-read-scale-out). +* `zone_redundant` - (Optional) Whether or not this database is zone redundant, which means the replicas of this database will be spread across multiple availability zones. + * `tags` - (Optional) A mapping of tags to assign to the resource. `import` supports the following: From 8e350e6fe4fa9e8b604d7e6bc9b6041a647022cc Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Sun, 16 Feb 2020 08:17:41 +0100 Subject: [PATCH 126/498] Update website/docs/guides/2.0-upgrade-guide.html.markdown --- website/docs/guides/2.0-upgrade-guide.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index cbcfc6a085892..75886b011ee70 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -169,7 +169,7 @@ The deprecated field `internal_fqdn` will be removed. The deprecated field `network_interface_ids` will be removed. -### Date Source: `azurerm_role_definition` +### Data Source: `azurerm_role_definition` The Data Source no longer supports the alias `VirtualMachineContributor` for the Built-in role `Virtual Machine Contributor`. From 33dfa98a7311830a15c03d505ee8670eae06382e Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Sun, 16 Feb 2020 08:30:14 +0100 Subject: [PATCH 127/498] updating to include #5768 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e990219aceb41..2e3119e57147e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,7 @@ BREAKING CHANGES: IMPROVEMENTS: * Data Source: `azurerm_kubernetes_service_version` - support for filtering of preview releases [GH-5662] +* `azurerm_dedicated_host` - support for setting `sku_name` to `DSv3-Type2` and `ESv3-Type2` [GH-5768] * `azurerm_storage_account` - support for configuring `cors_rules` within the `blob_properties` block [GH-5425] * `azurerm_windows_virtual_machine` - fixing a bug when provisioning from a Shared Gallery image [GH-5661] From bd400bc2dd323211e0bcbb6b8ced297c493a321e Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Sun, 16 Feb 2020 08:48:59 +0100 Subject: [PATCH 128/498] updating to include #5744 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e3119e57147e..7404898508b82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ BREAKING CHANGES: * `azurerm_container_service` - This resource has been removed since it was deprecated [GH-5709] * `azurerm_kubernetes_cluster` - updating the default value for `load_balancer_sku` to `Standard` from `Basic` [GH-5747] * `azurerm_log_analytics_workspace_linked_service` - This resource has been removed since it was deprecated [GH-5754] +* `azurerm_mssql_elasticpool` - removing the deprecated `elastic_pool_properties` block [GH-5744] * `azurerm_notification_hub_namesapce` - removing the `sku` block in favour of the `sku_name` argument [GH-5722] * `azurerm_relay_namespace` - removing the `sku` block in favour of the `sku_name` field [GH-5719] * `azurerm_scheduler_job` - This resource has been removed since it was deprecated [GH-5712] From ab5070dfc936df71d9130ab7eb27bddb2ba2ddc1 Mon Sep 17 00:00:00 2001 From: Sivan Guetta Date: Sun, 16 Feb 2020 17:17:59 +0200 Subject: [PATCH 129/498] On metric alert rule creation, the 'autoMitigate' property should be set to true by default --- .../monitor/resource_arm_monitor_metric_alert.go | 2 +- .../tests/resource_arm_monitor_metric_alert_test.go | 10 +++++----- website/docs/r/monitor_metric_alert.html.markdown | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_metric_alert.go b/azurerm/internal/services/monitor/resource_arm_monitor_metric_alert.go index 63983794a554b..c9eed84502a38 100644 --- a/azurerm/internal/services/monitor/resource_arm_monitor_metric_alert.go +++ b/azurerm/internal/services/monitor/resource_arm_monitor_metric_alert.go @@ -166,7 +166,7 @@ func resourceArmMonitorMetricAlert() *schema.Resource { "auto_mitigate": { Type: schema.TypeBool, Optional: true, - Default: false, + Default: true, }, "description": { diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_metric_alert_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_metric_alert_test.go index 3e94e9972d150..0a6c0ccccd2af 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_metric_alert_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_metric_alert_test.go @@ -80,7 +80,7 @@ func TestAccAzureRMMonitorMetricAlert_complete(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMMonitorMetricAlertExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "enabled", "true"), - resource.TestCheckResourceAttr(data.ResourceName, "auto_mitigate", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "auto_mitigate", "false"), resource.TestCheckResourceAttr(data.ResourceName, "severity", "4"), resource.TestCheckResourceAttr(data.ResourceName, "description", "This is a complete metric alert resource."), resource.TestCheckResourceAttr(data.ResourceName, "frequency", "PT30M"), @@ -128,7 +128,7 @@ func TestAccAzureRMMonitorMetricAlert_basicAndCompleteUpdate(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMMonitorMetricAlertExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "enabled", "true"), - resource.TestCheckResourceAttr(data.ResourceName, "auto_mitigate", "false"), + resource.TestCheckResourceAttr(data.ResourceName, "auto_mitigate", "true"), resource.TestCheckResourceAttr(data.ResourceName, "severity", "3"), resource.TestCheckResourceAttr(data.ResourceName, "description", ""), resource.TestCheckResourceAttr(data.ResourceName, "frequency", "PT1M"), @@ -149,7 +149,7 @@ func TestAccAzureRMMonitorMetricAlert_basicAndCompleteUpdate(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMMonitorMetricAlertExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "enabled", "true"), - resource.TestCheckResourceAttr(data.ResourceName, "auto_mitigate", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "auto_mitigate", "false"), resource.TestCheckResourceAttr(data.ResourceName, "severity", "4"), resource.TestCheckResourceAttr(data.ResourceName, "description", "This is a complete metric alert resource."), resource.TestCheckResourceAttr(data.ResourceName, "frequency", "PT30M"), @@ -184,7 +184,7 @@ func TestAccAzureRMMonitorMetricAlert_basicAndCompleteUpdate(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMMonitorMetricAlertExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "enabled", "true"), - resource.TestCheckResourceAttr(data.ResourceName, "auto_mitigate", "false"), + resource.TestCheckResourceAttr(data.ResourceName, "auto_mitigate", "true"), resource.TestCheckResourceAttr(data.ResourceName, "severity", "3"), resource.TestCheckResourceAttr(data.ResourceName, "description", ""), resource.TestCheckResourceAttr(data.ResourceName, "frequency", "PT1M"), @@ -288,7 +288,7 @@ resource "azurerm_monitor_metric_alert" "test" { resource_group_name = "${azurerm_resource_group.test.name}" scopes = ["${azurerm_storage_account.test.id}"] enabled = true - auto_mitigate = true + auto_mitigate = false severity = 4 description = "This is a complete metric alert resource." frequency = "PT30M" diff --git a/website/docs/r/monitor_metric_alert.html.markdown b/website/docs/r/monitor_metric_alert.html.markdown index 7baf7b06d2ab9..3947465d4bf13 100644 --- a/website/docs/r/monitor_metric_alert.html.markdown +++ b/website/docs/r/monitor_metric_alert.html.markdown @@ -73,7 +73,7 @@ The following arguments are supported: * `criteria` - (Required) One or more `criteria` blocks as defined below. * `action` - (Optional) One or more `action` blocks as defined below. * `enabled` - (Optional) Should this Metric Alert be enabled? Defaults to `true`. -* `auto_mitigate` - (Optional) Should the alerts in this Metric Alert be auto resolved? Defaults to `false`. +* `auto_mitigate` - (Optional) Should the alerts in this Metric Alert be auto resolved? Defaults to `true`. * `description` - (Optional) The description of this Metric Alert. * `frequency` - (Optional) The evaluation frequency of this Metric Alert, represented in ISO 8601 duration format. Possible values are `PT1M`, `PT5M`, `PT15M`, `PT30M` and `PT1H`. Defaults to `PT1M`. * `severity` - (Optional) The severity of this Metric Alert. Possible values are `0`, `1`, `2`, `3` and `4`. Defaults to `3`. From 277e7c334ddc0fee3a4cfec9b930123aaca9231b Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Sun, 16 Feb 2020 09:05:20 -0700 Subject: [PATCH 130/498] Update mariadb to 2.0 --- .../mariadb/resource_arm_mariadb_server.go | 124 +----------------- 1 file changed, 4 insertions(+), 120 deletions(-) diff --git a/azurerm/internal/services/mariadb/resource_arm_mariadb_server.go b/azurerm/internal/services/mariadb/resource_arm_mariadb_server.go index 1300051621fa5..51fc54a56fc8a 100644 --- a/azurerm/internal/services/mariadb/resource_arm_mariadb_server.go +++ b/azurerm/internal/services/mariadb/resource_arm_mariadb_server.go @@ -55,8 +55,7 @@ func resourceArmMariaDbServer() *schema.Resource { "sku_name": { Type: schema.TypeString, - Optional: true, // required in 2.0 - Computed: true, // remove in 2.0 + Required: true, ConflictsWith: []string{"sku"}, ValidateFunc: validation.StringInSlice([]string{ "B_Gen5_1", @@ -73,68 +72,6 @@ func resourceArmMariaDbServer() *schema.Resource { }, false), }, - // remove in 2.0 - "sku": { - Type: schema.TypeList, - Optional: true, - Computed: true, - ConflictsWith: []string{"sku_name"}, - Deprecated: "This property has been deprecated in favour of the 'sku_name' property and will be removed in version 2.0 of the provider", - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - "B_Gen5_1", - "B_Gen5_2", - "GP_Gen5_2", - "GP_Gen5_4", - "GP_Gen5_8", - "GP_Gen5_16", - "GP_Gen5_32", - "MO_Gen5_2", - "MO_Gen5_4", - "MO_Gen5_8", - "MO_Gen5_16", - }, false), - }, - - "capacity": { - Type: schema.TypeInt, - Required: true, - ValidateFunc: validation.IntInSlice([]int{ - 1, - 2, - 4, - 8, - 16, - 32, - }), - }, - - "tier": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - string(mariadb.Basic), - string(mariadb.GeneralPurpose), - string(mariadb.MemoryOptimized), - }, false), - }, - - "family": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - "Gen5", - }, false), - }, - }, - }, - }, - "administrator_login": { Type: schema.TypeString, Required: true, @@ -248,17 +185,9 @@ func resourceArmMariaDbServerCreateUpdate(d *schema.ResourceData, meta interface storageProfile := expandAzureRmMariaDbStorageProfile(d) - var sku *mariadb.Sku - if b, ok := d.GetOk("sku_name"); ok { - var err error - sku, err = expandServerSkuName(b.(string)) - if err != nil { - return fmt.Errorf("error expanding sku_name for PostgreSQL Server %q (Resource Group %q): %v", name, resourceGroup, err) - } - } else if _, ok := d.GetOk("sku"); ok { - sku = expandAzureRmMariaDbServerSku(d) - } else { - return fmt.Errorf("One of `sku` or `sku_name` must be set for PostgreSQL Server %q (Resource Group %q)", name, resourceGroup) + sku, err := expandServerSkuName(d.Get("sku_name").(string)) + if err != nil { + return fmt.Errorf("error expanding sku_name for PostgreSQL Server %q (Resource Group %q): %v", name, resourceGroup, err) } skuName := sku.Name @@ -396,10 +325,6 @@ func resourceArmMariaDbServerRead(d *schema.ResourceData, meta interface{}) erro } } - if err := d.Set("sku", flattenMariaDbServerSku(resp.Sku)); err != nil { - return fmt.Errorf("Error setting `sku`: %+v", err) - } - return tags.FlattenAndSet(d, resp.Tags) } @@ -466,23 +391,6 @@ func expandServerSkuName(skuName string) (*mariadb.Sku, error) { }, nil } -func expandAzureRmMariaDbServerSku(d *schema.ResourceData) *mariadb.Sku { - skus := d.Get("sku").([]interface{}) - sku := skus[0].(map[string]interface{}) - - name := sku["name"].(string) - capacity := sku["capacity"].(int) - tier := sku["tier"].(string) - family := sku["family"].(string) - - return &mariadb.Sku{ - Name: utils.String(name), - Tier: mariadb.SkuTier(tier), - Capacity: utils.Int32(int32(capacity)), - Family: utils.String(family), - } -} - func expandAzureRmMariaDbStorageProfile(d *schema.ResourceData) *mariadb.StorageProfile { storageprofiles := d.Get("storage_profile").([]interface{}) storageprofile := storageprofiles[0].(map[string]interface{}) @@ -500,30 +408,6 @@ func expandAzureRmMariaDbStorageProfile(d *schema.ResourceData) *mariadb.Storage } } -func flattenMariaDbServerSku(sku *mariadb.Sku) []interface{} { - values := map[string]interface{}{} - - if sku == nil { - return []interface{}{} - } - - if name := sku.Name; name != nil { - values["name"] = *name - } - - if capacity := sku.Capacity; capacity != nil { - values["capacity"] = *capacity - } - - values["tier"] = string(sku.Tier) - - if family := sku.Family; family != nil { - values["family"] = *family - } - - return []interface{}{values} -} - func flattenMariaDbStorageProfile(storage *mariadb.StorageProfile) []interface{} { values := map[string]interface{}{} From 7bcea7f3a4a262fbdae85868ad9f6477557eb9cc Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Sun, 16 Feb 2020 09:08:18 -0700 Subject: [PATCH 131/498] upgrade maps to 2.0 --- azurerm/internal/services/maps/resource_arm_maps_account.go | 3 +-- website/docs/guides/2.0-upgrade-guide.html.markdown | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/maps/resource_arm_maps_account.go b/azurerm/internal/services/maps/resource_arm_maps_account.go index 6b8eec8e510da..96380765ad5f0 100644 --- a/azurerm/internal/services/maps/resource_arm_maps_account.go +++ b/azurerm/internal/services/maps/resource_arm_maps_account.go @@ -55,8 +55,7 @@ func resourceArmMapsAccount() *schema.Resource { ValidateFunc: validation.StringInSlice([]string{ "s0", "s1", - // TODO: revert this in 2.0 - }, true), + }, false), }, "tags": tags.Schema(), diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index 3c3fc2955605c..bda4ba8293d81 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -361,6 +361,10 @@ This resource has been renamed to `azurerm_log_analytics_linked_service` which i The deprecated field `linked_service_properties` will be removed. This has been replaced by the `resource_id` resource. +### Resource: `azurerm_maps_account` + +The `sku_name` field is now case sensitive. + ### Resource: `azurerm_mariadb_server` The deprecated `sku` block has been replaced by the `sku_name` field and will be removed. From 30c58c58b40026c0039bc1a3a5987b77b6e093b8 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Sun, 16 Feb 2020 09:14:55 -0700 Subject: [PATCH 132/498] remove conflictswith --- .../internal/services/mariadb/resource_arm_mariadb_server.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/azurerm/internal/services/mariadb/resource_arm_mariadb_server.go b/azurerm/internal/services/mariadb/resource_arm_mariadb_server.go index 51fc54a56fc8a..0b8fefbcd8847 100644 --- a/azurerm/internal/services/mariadb/resource_arm_mariadb_server.go +++ b/azurerm/internal/services/mariadb/resource_arm_mariadb_server.go @@ -54,9 +54,8 @@ func resourceArmMariaDbServer() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), "sku_name": { - Type: schema.TypeString, - Required: true, - ConflictsWith: []string{"sku"}, + Type: schema.TypeString, + Required: true, ValidateFunc: validation.StringInSlice([]string{ "B_Gen5_1", "B_Gen5_2", From 5f3fae24d3b404e7e83e976e4445af68bbf33091 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Sun, 16 Feb 2020 09:56:19 -0700 Subject: [PATCH 133/498] Upgrade keyvault to 2.0 --- .../keyvault/data_source_key_vault.go | 19 --- .../keyvault/data_source_key_vault_key.go | 46 ++----- .../keyvault/data_source_key_vault_secret.go | 47 +------ .../keyvault/resource_arm_key_vault.go | 66 +--------- .../resource_arm_key_vault_access_policy.go | 77 ++--------- .../resource_arm_key_vault_certificate.go | 43 +------ .../keyvault/resource_arm_key_vault_key.go | 43 +------ .../keyvault/resource_arm_key_vault_secret.go | 44 +------ .../tests/data_source_key_vault_test.go | 6 +- ...source_arm_key_vault_access_policy_test.go | 49 +------ ...resource_arm_key_vault_certificate_test.go | 120 +++--------------- .../tests/resource_arm_key_vault_key_test.go | 118 +++++------------ .../resource_arm_key_vault_secret_test.go | 93 +++----------- .../tests/resource_arm_key_vault_test.go | 64 +--------- website/docs/d/key_vault.html.markdown | 10 +- .../guides/2.0-upgrade-guide.html.markdown | 37 ++++++ website/docs/r/key_vault.html.markdown | 10 +- .../r/key_vault_access_policy.html.markdown | 8 -- 18 files changed, 170 insertions(+), 730 deletions(-) diff --git a/azurerm/internal/services/keyvault/data_source_key_vault.go b/azurerm/internal/services/keyvault/data_source_key_vault.go index 6ff4ad35b13af..f99387eb327e7 100644 --- a/azurerm/internal/services/keyvault/data_source_key_vault.go +++ b/azurerm/internal/services/keyvault/data_source_key_vault.go @@ -33,20 +33,6 @@ func dataSourceArmKeyVault() *schema.Resource { "location": azure.SchemaLocationForDataSource(), - // Remove in 2.0 - "sku": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Computed: true, - }, - }, - }, - }, - "sku_name": { Type: schema.TypeString, Computed: true, @@ -192,11 +178,6 @@ func dataSourceArmKeyVaultRead(d *schema.ResourceData, meta interface{}) error { d.Set("vault_uri", props.VaultURI) if sku := props.Sku; sku != nil { - // Remove in 2.0 - if err := d.Set("sku", flattenKeyVaultDataSourceSku(sku)); err != nil { - return fmt.Errorf("Error setting `sku` for KeyVault %q: %+v", *resp.Name, err) - } - if err := d.Set("sku_name", string(sku.Name)); err != nil { return fmt.Errorf("Error setting `sku_name` for KeyVault %q: %+v", *resp.Name, err) } diff --git a/azurerm/internal/services/keyvault/data_source_key_vault_key.go b/azurerm/internal/services/keyvault/data_source_key_vault_key.go index b1d672a650e0c..3b1277b7d91fe 100644 --- a/azurerm/internal/services/keyvault/data_source_key_vault_key.go +++ b/azurerm/internal/services/keyvault/data_source_key_vault_key.go @@ -5,7 +5,6 @@ import ( "time" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" @@ -29,21 +28,9 @@ func dataSourceArmKeyVaultKey() *schema.Resource { }, "key_vault_id": { - Type: schema.TypeString, - Optional: true, //todo required in 2.0 - Computed: true, //todo removed in 2.0 - ValidateFunc: azure.ValidateResourceID, - ConflictsWith: []string{"vault_uri"}, - }, - - // todo remove in 2.0 - "vault_uri": { - Type: schema.TypeString, - Optional: true, - Computed: true, - Deprecated: "This property has been deprecated in favour of the key_vault_id property. This will prevent a class of bugs as described in https://github.com/terraform-providers/terraform-provider-azurerm/issues/2396 and will be removed in version 2.0 of the provider", - ValidateFunc: validation.IsURLWithHTTPS, - ConflictsWith: []string{"key_vault_id"}, + Type: schema.TypeString, + Required: true, + ValidateFunc: azure.ValidateResourceID, }, "key_type": { @@ -90,31 +77,12 @@ func dataSourceArmKeyVaultKeyRead(d *schema.ResourceData, meta interface{}) erro ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() - keyVaultBaseUri := d.Get("vault_uri").(string) name := d.Get("name").(string) keyVaultId := d.Get("key_vault_id").(string) - if keyVaultBaseUri == "" { - if keyVaultId == "" { - return fmt.Errorf("one of `key_vault_id` or `vault_uri` must be set") - } - - pKeyVaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) - if err != nil { - return fmt.Errorf("Error looking up Key %q vault url from id %q: %+v", name, keyVaultId, err) - } - - keyVaultBaseUri = pKeyVaultBaseUrl - d.Set("vault_uri", keyVaultBaseUri) - } else { - id, err := azure.GetKeyVaultIDFromBaseUrl(ctx, vaultClient, keyVaultBaseUri) - if err != nil { - return fmt.Errorf("Error retrieving the Resource ID the Key Vault at URL %q: %s", keyVaultBaseUri, err) - } - if id == nil { - return fmt.Errorf("Unable to locate the Resource ID for the Key Vault at URL %q: %s", keyVaultBaseUri, err) - } - d.Set("key_vault_id", id) + keyVaultBaseUri, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) + if err != nil { + return fmt.Errorf("Error looking up Key %q vault url from id %q: %+v", name, keyVaultId, err) } resp, err := client.GetKey(ctx, keyVaultBaseUri, name, "") @@ -133,6 +101,8 @@ func dataSourceArmKeyVaultKeyRead(d *schema.ResourceData, meta interface{}) erro } d.SetId(id) + d.Set("key_vault_id", keyVaultId) + if key := resp.Key; key != nil { d.Set("key_type", string(key.Kty)) diff --git a/azurerm/internal/services/keyvault/data_source_key_vault_secret.go b/azurerm/internal/services/keyvault/data_source_key_vault_secret.go index 7ce9f365f68c3..0f9c305038337 100644 --- a/azurerm/internal/services/keyvault/data_source_key_vault_secret.go +++ b/azurerm/internal/services/keyvault/data_source_key_vault_secret.go @@ -5,7 +5,6 @@ import ( "time" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" @@ -29,21 +28,9 @@ func dataSourceArmKeyVaultSecret() *schema.Resource { }, "key_vault_id": { - Type: schema.TypeString, - Optional: true, //todo required in 2.0 - Computed: true, //todo removed in 2.0 - ValidateFunc: azure.ValidateResourceID, - ConflictsWith: []string{"vault_uri"}, - }, - - // todo remove in 2.0 - "vault_uri": { - Type: schema.TypeString, - Optional: true, - Computed: true, - Deprecated: "This property has been deprecated in favour of the key_vault_id property. This will prevent a class of bugs as described in https://github.com/terraform-providers/terraform-provider-azurerm/issues/2396 and will be removed in version 2.0 of the provider", - ValidateFunc: validation.IsURLWithHTTPS, - ConflictsWith: []string{"key_vault_id"}, + Type: schema.TypeString, + Required: true, + ValidateFunc: azure.ValidateResourceID, }, "value": { @@ -74,31 +61,11 @@ func dataSourceArmKeyVaultSecretRead(d *schema.ResourceData, meta interface{}) e defer cancel() name := d.Get("name").(string) - keyVaultBaseUri := d.Get("vault_uri").(string) keyVaultId := d.Get("key_vault_id").(string) - if keyVaultBaseUri == "" { - if keyVaultId == "" { - return fmt.Errorf("one of `key_vault_id` or `vault_uri` must be set") - } - - pKeyVaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) - if err != nil { - return fmt.Errorf("Error looking up Secret %q vault url from id %q: %+v", name, keyVaultId, err) - } - - keyVaultBaseUri = pKeyVaultBaseUrl - d.Set("vault_uri", keyVaultBaseUri) - } else { - id, err := azure.GetKeyVaultIDFromBaseUrl(ctx, vaultClient, keyVaultBaseUri) - if err != nil { - return fmt.Errorf("Error retrieving the Resource ID the Key Vault at URL %q: %s", keyVaultBaseUri, err) - } - if id == nil { - return fmt.Errorf("Unable to locate the Resource ID for the Key Vault at URL %q: %s", keyVaultBaseUri, err) - } - - d.Set("key_vault_id", id) + keyVaultBaseUri, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) + if err != nil { + return fmt.Errorf("Error looking up Secret %q vault url from id %q: %+v", name, keyVaultId, err) } // we always want to get the latest version @@ -119,7 +86,7 @@ func dataSourceArmKeyVaultSecretRead(d *schema.ResourceData, meta interface{}) e d.SetId(*resp.ID) d.Set("name", respID.Name) - d.Set("vault_uri", respID.KeyVaultBaseUrl) + d.Set("key_vault_id", keyVaultId) d.Set("value", resp.Value) d.Set("version", respID.Version) d.Set("content_type", resp.ContentType) diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault.go b/azurerm/internal/services/keyvault/resource_arm_key_vault.go index 62d559c4d2f13..331fab188ef81 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault.go @@ -66,37 +66,13 @@ func resourceArmKeyVault() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), - // Remove in 2.0 - "sku": { - Type: schema.TypeList, - Optional: true, - Computed: true, - Deprecated: "This property has been deprecated in favour of the 'sku_name' property and will be removed in version 2.0 of the provider", - ConflictsWith: []string{"sku_name"}, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringInSlice([]string{ - string(keyvault.Standard), - string(keyvault.Premium), - }, false), - }, - }, - }, - }, - "sku_name": { Type: schema.TypeString, - Optional: true, - Computed: true, + Required: true, ValidateFunc: validation.StringInSlice([]string{ string(keyvault.Standard), string(keyvault.Premium), - // TODO: revert this in 2.0 - }, true), + }, false), }, "vault_uri": { @@ -205,27 +181,9 @@ func resourceArmKeyVaultCreateUpdate(d *schema.ResourceData, meta interface{}) e ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() - // Remove in 2.0 - var sku keyvault.Sku - - if inputs := d.Get("sku").([]interface{}); len(inputs) != 0 { - input := inputs[0].(map[string]interface{}) - v := input["name"].(string) - - sku = keyvault.Sku{ - Family: &armKeyVaultSkuFamily, - Name: keyvault.SkuName(v), - } - } else { - // Keep in 2.0 - sku = keyvault.Sku{ - Family: &armKeyVaultSkuFamily, - Name: keyvault.SkuName(d.Get("sku_name").(string)), - } - } - - if sku.Name == "" { - return fmt.Errorf("either 'sku_name' or 'sku' must be defined in the configuration file") + sku := keyvault.Sku{ + Family: &armKeyVaultSkuFamily, + Name: keyvault.SkuName(d.Get("sku_name").(string)), } log.Printf("[INFO] preparing arguments for Azure ARM KeyVault creation.") @@ -372,11 +330,6 @@ func resourceArmKeyVaultRead(d *schema.ResourceData, meta interface{}) error { d.Set("vault_uri", props.VaultURI) if sku := props.Sku; sku != nil { - // Remove in 2.0 - if err := d.Set("sku", flattenKeyVaultSku(sku)); err != nil { - return fmt.Errorf("Error setting 'sku' for KeyVault %q: %+v", *resp.Name, err) - } - if err := d.Set("sku_name", string(sku.Name)); err != nil { return fmt.Errorf("Error setting 'sku_name' for KeyVault %q: %+v", *resp.Name, err) } @@ -458,15 +411,6 @@ func resourceArmKeyVaultDelete(d *schema.ResourceData, meta interface{}) error { return nil } -// Remove in 2.0 -func flattenKeyVaultSku(sku *keyvault.Sku) []interface{} { - result := map[string]interface{}{ - "name": string(sku.Name), - } - - return []interface{}{result} -} - func flattenKeyVaultNetworkAcls(input *keyvault.NetworkRuleSet) []interface{} { if input == nil { return []interface{}{ diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault_access_policy.go b/azurerm/internal/services/keyvault/resource_arm_key_vault_access_policy.go index e22f0f7ed3579..61023c81a1ab9 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault_access_policy.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault_access_policy.go @@ -3,7 +3,6 @@ package keyvault import ( "fmt" "log" - "regexp" "strings" "time" @@ -39,50 +38,10 @@ func resourceArmKeyVaultAccessPolicy() *schema.Resource { Schema: map[string]*schema.Schema{ "key_vault_id": { - Type: schema.TypeString, - Optional: true, //todo required in 2.0 - Computed: true, //todo removed in 2.0 - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - ConflictsWith: []string{"vault_name"}, - }, - - // todo remove in 2.0 - "vault_name": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, - Computed: true, - Deprecated: "This property has been deprecated in favour of the key_vault_id property. This will prevent a class of bugs as described in https://github.com/terraform-providers/terraform-provider-azurerm/issues/2396 and will be removed in version 2.0 of the provider", - ValidateFunc: validation.StringIsNotEmpty, - ConflictsWith: []string{"key_vault_id"}, - }, - - // todo remove in 2.0 - "resource_group_name": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, - Computed: true, - Deprecated: "This property has been deprecated as the resource group is now pulled from the vault ID and will be removed in version 2.0 of the provider", - ValidateFunc: func(v interface{}, k string) (warnings []string, errors []error) { - value := v.(string) - - if len(value) > 80 { - errors = append(errors, fmt.Errorf("%q may not exceed 80 characters in length", k)) - } - - if strings.HasSuffix(value, ".") { - errors = append(errors, fmt.Errorf("%q may not end with a period", k)) - } - - // regex pulled from https://docs.microsoft.com/en-us/rest/api/resources/resourcegroups/createorupdate - if matched := regexp.MustCompile(`^[-\w\._\(\)]+$`).Match([]byte(value)); !matched { - errors = append(errors, fmt.Errorf("%q may only contain alphanumeric characters, dash, underscores, parentheses and periods", k)) - } - - return warnings, errors - }, + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: azure.ValidateResourceID, }, "tenant_id": { @@ -124,7 +83,6 @@ func resourceArmKeyVaultAccessPolicyCreateOrDelete(d *schema.ResourceData, meta log.Printf("[INFO] Preparing arguments for Key Vault Access Policy: %s.", action) vaultId := d.Get("key_vault_id").(string) - vaultName := d.Get("vault_name").(string) resourceGroup := d.Get("resource_group_name").(string) tenantIdRaw := d.Get("tenant_id").(string) @@ -136,24 +94,15 @@ func resourceArmKeyVaultAccessPolicyCreateOrDelete(d *schema.ResourceData, meta applicationIdRaw := d.Get("application_id").(string) objectId := d.Get("object_id").(string) - if vaultName == "" { - if vaultId == "" { - return fmt.Errorf("one of `key_vault_id` or `vault_name` must be set") - } - id, err2 := azure.ParseAzureResourceID(vaultId) - if err2 != nil { - return err2 - } - - resourceGroup = id.ResourceGroup + id, err := azure.ParseAzureResourceID(vaultId) + if err != nil { + return err + } - vaultNameTemp, ok := id.Path["vaults"] - if !ok { - return fmt.Errorf("key_value_id does not contain `vaults`: %q", vaultId) - } - vaultName = vaultNameTemp - } else if resourceGroup == "" { - return fmt.Errorf("one of `resource_group_name` must be set when `vault_name` is used") + resourceGroup = id.ResourceGroup + vaultName, ok := id.Path["vaults"] + if !ok { + return fmt.Errorf("key_value_id does not contain `vaults`: %q", vaultId) } keyVault, err := client.Get(ctx, resourceGroup, vaultName) @@ -323,8 +272,6 @@ func resourceArmKeyVaultAccessPolicyRead(d *schema.ResourceData, meta interface{ } d.Set("key_vault_id", resp.ID) - d.Set("vault_name", resp.Name) - d.Set("resource_group_name", resGroup) d.Set("object_id", objectId) if tid := policy.TenantID; tid != nil { diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault_certificate.go b/azurerm/internal/services/keyvault/resource_arm_key_vault_certificate.go index 0355f164ba80f..6219533d02b24 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault_certificate.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault_certificate.go @@ -70,23 +70,10 @@ func resourceArmKeyVaultCertificate() *schema.Resource { }, "key_vault_id": { - Type: schema.TypeString, - Optional: true, //todo required in 2.0 - Computed: true, //todo removed in 2.0 - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - ConflictsWith: []string{"vault_uri"}, - }, - - // todo remove in 2.0 - "vault_uri": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, - Computed: true, - Deprecated: "This property has been deprecated in favour of the key_vault_id property. This will prevent a class of bugs as described in https://github.com/terraform-providers/terraform-provider-azurerm/issues/2396 and will be removed in version 2.0 of the provider", - ValidateFunc: validation.IsURLWithHTTPS, - ConflictsWith: []string{"key_vault_id"}, + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: azure.ValidateResourceID, }, "certificate": { @@ -356,25 +343,10 @@ func resourceArmKeyVaultCertificateCreate(d *schema.ResourceData, meta interface name := d.Get("name").(string) keyVaultId := d.Get("key_vault_id").(string) - keyVaultBaseUrl := d.Get("vault_uri").(string) - - if keyVaultBaseUrl == "" { - if keyVaultId == "" { - return fmt.Errorf("one of `key_vault_id` or `vault_uri` must be set") - } - pKeyVaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) - if err != nil { - return fmt.Errorf("Error looking up Certificate %q vault url from id %q: %+v", name, keyVaultId, err) - } - - keyVaultBaseUrl = pKeyVaultBaseUrl - } else { - id, err := azure.GetKeyVaultIDFromBaseUrl(ctx, vaultClient, keyVaultBaseUrl) - if err != nil { - return fmt.Errorf("Error unable to find key vault ID from URL %q for certificate %q: %+v", keyVaultBaseUrl, name, err) - } - d.Set("key_vault_id", id) + keyVaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) + if err != nil { + return fmt.Errorf("Error looking up Certificate %q vault url from id %q: %+v", name, keyVaultId, err) } if features.ShouldResourcesBeImported() { @@ -497,7 +469,6 @@ func resourceArmKeyVaultCertificateRead(d *schema.ResourceData, meta interface{} } d.Set("name", id.Name) - d.Set("vault_uri", id.KeyVaultBaseUrl) certificatePolicy := flattenKeyVaultCertificatePolicy(cert.Policy) if err := d.Set("certificate_policy", certificatePolicy); err != nil { diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go b/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go index 73dc13da185ef..3e1ca20609880 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go @@ -46,23 +46,10 @@ func resourceArmKeyVaultKey() *schema.Resource { }, "key_vault_id": { - Type: schema.TypeString, - Optional: true, //todo required in 2.0 - Computed: true, //todo removed in 2.0 - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - ConflictsWith: []string{"vault_uri"}, - }, - - // todo remove in 2.0 - "vault_uri": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, - Computed: true, - Deprecated: "This property has been deprecated in favour of the key_vault_id property. This will prevent a class of bugs as described in https://github.com/terraform-providers/terraform-provider-azurerm/issues/2396 and will be removed in version 2.0 of the provider", - ValidateFunc: validation.IsURLWithHTTPS, - ConflictsWith: []string{"key_vault_id"}, + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: azure.ValidateResourceID, }, "key_type": { @@ -174,26 +161,11 @@ func resourceArmKeyVaultKeyCreate(d *schema.ResourceData, meta interface{}) erro log.Print("[INFO] preparing arguments for AzureRM KeyVault Key creation.") name := d.Get("name").(string) - keyVaultBaseUri := d.Get("vault_uri").(string) keyVaultId := d.Get("key_vault_id").(string) - if keyVaultBaseUri == "" { - if keyVaultId == "" { - return fmt.Errorf("one of `key_vault_id` or `vault_uri` must be set") - } - - pKeyVaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) - if err != nil { - return fmt.Errorf("Error looking up Key %q vault url from id %q: %+v", name, keyVaultId, err) - } - - keyVaultBaseUri = pKeyVaultBaseUrl - } else { - id, err := azure.GetKeyVaultIDFromBaseUrl(ctx, vaultClient, keyVaultBaseUri) - if err != nil { - return fmt.Errorf("Error unable to find key vault ID from URL %q for certificate %q: %+v", keyVaultBaseUri, name, err) - } - d.Set("key_vault_id", id) + keyVaultBaseUri, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) + if err != nil { + return fmt.Errorf("Error looking up Key %q vault url from id %q: %+v", name, keyVaultId, err) } if features.ShouldResourcesBeImported() { @@ -367,7 +339,6 @@ func resourceArmKeyVaultKeyRead(d *schema.ResourceData, meta interface{}) error } d.Set("name", id.Name) - d.Set("vault_uri", id.KeyVaultBaseUrl) if key := resp.Key; key != nil { d.Set("key_type", string(key.Kty)) diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault_secret.go b/azurerm/internal/services/keyvault/resource_arm_key_vault_secret.go index 1cc2f655ab7e1..7e4508bfca17b 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault_secret.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault_secret.go @@ -8,7 +8,6 @@ import ( "github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault" "github.com/Azure/go-autorest/autorest/date" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" @@ -45,23 +44,10 @@ func resourceArmKeyVaultSecret() *schema.Resource { }, "key_vault_id": { - Type: schema.TypeString, - Optional: true, //todo required in 2.0 - Computed: true, //todo removed in 2.0 - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - ConflictsWith: []string{"vault_uri"}, - }, - - // todo remove in 2.0 - "vault_uri": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, - Computed: true, - Deprecated: "This property has been deprecated in favour of the key_vault_id property. This will prevent a class of bugs as described in https://github.com/terraform-providers/terraform-provider-azurerm/issues/2396 and will be removed in version 2.0 of the provider", - ValidateFunc: validation.IsURLWithHTTPS, - ConflictsWith: []string{"key_vault_id"}, + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: azure.ValidateResourceID, }, "value": { @@ -106,26 +92,11 @@ func resourceArmKeyVaultSecretCreate(d *schema.ResourceData, meta interface{}) e log.Print("[INFO] preparing arguments for AzureRM KeyVault Secret creation.") name := d.Get("name").(string) - keyVaultBaseUrl := d.Get("vault_uri").(string) keyVaultId := d.Get("key_vault_id").(string) - if keyVaultBaseUrl == "" { - if keyVaultId == "" { - return fmt.Errorf("one of `key_vault_id` or `vault_uri` must be set") - } - - pKeyVaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) - if err != nil { - return fmt.Errorf("Error looking up Secret %q vault url from id %q: %+v", name, keyVaultId, err) - } - - keyVaultBaseUrl = pKeyVaultBaseUrl - } else { - id, err := azure.GetKeyVaultIDFromBaseUrl(ctx, vaultClient, keyVaultBaseUrl) - if err != nil { - return fmt.Errorf("Error unable to find key vault ID from URL %q for certificate %q: %+v", keyVaultBaseUrl, name, err) - } - d.Set("key_vault_id", id) + keyVaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) + if err != nil { + return fmt.Errorf("Error looking up Secret %q vault url from id %q: %+v", name, keyVaultId, err) } if features.ShouldResourcesBeImported() { @@ -319,7 +290,6 @@ func resourceArmKeyVaultSecretRead(d *schema.ResourceData, meta interface{}) err } d.Set("name", respID.Name) - d.Set("vault_uri", respID.KeyVaultBaseUrl) d.Set("value", resp.Value) d.Set("version", respID.Version) d.Set("content_type", resp.ContentType) diff --git a/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go b/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go index 8953c5d82eff8..1330457be7a0c 100644 --- a/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go @@ -46,7 +46,7 @@ func TestAccDataSourceAzureRMKeyVault_basicClassic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMKeyVaultExists(data.ResourceName), resource.TestCheckResourceAttrSet(data.ResourceName, "tenant_id"), - resource.TestCheckResourceAttrSet(data.ResourceName, "sku.0.name"), + resource.TestCheckResourceAttrSet(data.ResourceName, "sku_name"), resource.TestCheckResourceAttrSet(data.ResourceName, "access_policy.0.tenant_id"), resource.TestCheckResourceAttrSet(data.ResourceName, "access_policy.0.object_id"), resource.TestCheckResourceAttr(data.ResourceName, "access_policy.0.key_permissions.0", "create"), @@ -71,7 +71,7 @@ func TestAccDataSourceAzureRMKeyVault_complete(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMKeyVaultExists(data.ResourceName), resource.TestCheckResourceAttrSet(data.ResourceName, "tenant_id"), - resource.TestCheckResourceAttrSet(data.ResourceName, "sku.0.name"), + resource.TestCheckResourceAttrSet(data.ResourceName, "sku_name"), resource.TestCheckResourceAttrSet(data.ResourceName, "access_policy.0.tenant_id"), resource.TestCheckResourceAttrSet(data.ResourceName, "access_policy.0.object_id"), resource.TestCheckResourceAttr(data.ResourceName, "access_policy.0.key_permissions.0", "get"), @@ -97,7 +97,7 @@ func TestAccDataSourceAzureRMKeyVault_networkAcls(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMKeyVaultExists(data.ResourceName), resource.TestCheckResourceAttrSet(data.ResourceName, "tenant_id"), - resource.TestCheckResourceAttrSet(data.ResourceName, "sku.0.name"), + resource.TestCheckResourceAttrSet(data.ResourceName, "sku_name"), resource.TestCheckResourceAttrSet(data.ResourceName, "access_policy.0.tenant_id"), resource.TestCheckResourceAttrSet(data.ResourceName, "access_policy.0.object_id"), resource.TestCheckResourceAttr(data.ResourceName, "access_policy.0.key_permissions.0", "create"), diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_access_policy_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_access_policy_test.go index 41161a553330b..788ff00d413bc 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_access_policy_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_access_policy_test.go @@ -37,28 +37,6 @@ func TestAccAzureRMKeyVaultAccessPolicy_basic(t *testing.T) { }) } -func TestAccAzureRMKeyVaultAccessPolicy_basicClassic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_key_vault_access_policy", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMKeyVaultDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMKeyVaultAccessPolicy_basicClassic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMKeyVaultAccessPolicyExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "key_permissions.0", "get"), - resource.TestCheckResourceAttr(data.ResourceName, "secret_permissions.0", "get"), - resource.TestCheckResourceAttr(data.ResourceName, "secret_permissions.1", "set"), - ), - }, - data.ImportStep(), - }, - }) -} - func TestAccAzureRMKeyVaultAccessPolicy_requiresImport(t *testing.T) { if !features.ShouldResourcesBeImported() { t.Skip("Skipping since resources aren't required to be imported") @@ -240,30 +218,6 @@ resource "azurerm_key_vault_access_policy" "test" { `, template) } -func testAccAzureRMKeyVaultAccessPolicy_basicClassic(data acceptance.TestData) string { - template := testAccAzureRMKeyVaultAccessPolicy_template(data) - return fmt.Sprintf(` -%s - -resource "azurerm_key_vault_access_policy" "test" { - vault_name = "${azurerm_key_vault.test.name}" - resource_group_name = "${azurerm_key_vault.test.resource_group_name}" - - key_permissions = [ - "get", - ] - - secret_permissions = [ - "get", - "set", - ] - - tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" -} -`, template) -} - func testAccAzureRMKeyVaultAccessPolicy_requiresImport(data acceptance.TestData) string { template := testAccAzureRMKeyVaultAccessPolicy_basic(data) return fmt.Sprintf(` @@ -361,8 +315,7 @@ func testAccAzureRMKeyVaultAccessPolicy_update(data acceptance.TestData) string %s resource "azurerm_key_vault_access_policy" "test" { - vault_name = "${azurerm_key_vault.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + key_vault_id = "${azurerm_key_vault.test.id}" key_permissions = [ "list", diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_certificate_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_certificate_test.go index 41d67eb2af812..59a2079005c5e 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_certificate_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_certificate_test.go @@ -35,26 +35,6 @@ func TestAccAzureRMKeyVaultCertificate_basicImportPFX(t *testing.T) { }) } -func TestAccAzureRMKeyVaultCertificate_basicImportPFXClassic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_key_vault_certificate", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMKeyVaultCertificateDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMKeyVaultCertificate_basicImportPFXClassic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMKeyVaultCertificateExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "certificate_data"), - ), - }, - data.ImportStep("certificate"), - }, - }) -} - func TestAccAzureRMKeyVaultCertificate_requiresImport(t *testing.T) { if !features.ShouldResourcesBeImported() { t.Skip("Skipping since resources aren't required to be imported") @@ -233,6 +213,7 @@ func TestAccAzureRMKeyVaultCertificate_emptyExtendedKeyUsage(t *testing.T) { func testCheckAzureRMKeyVaultCertificateDestroy(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.ManagementClient + vaultClient := acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext for _, rs := range s.RootModule().Resources { @@ -241,8 +222,11 @@ func testCheckAzureRMKeyVaultCertificateDestroy(s *terraform.State) error { } name := rs.Primary.Attributes["name"] - vaultBaseUrl := rs.Primary.Attributes["vault_uri"] keyVaultId := rs.Primary.Attributes["key_vault_id"] + vaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) + if err != nil { + return fmt.Errorf("Error looking up Secret %q vault url from id %q: %+v", name, keyVaultId, err) + } ok, err := azure.KeyVaultExists(ctx, acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient, keyVaultId) if err != nil { @@ -271,6 +255,7 @@ func testCheckAzureRMKeyVaultCertificateDestroy(s *terraform.State) error { func testCheckAzureRMKeyVaultCertificateExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.ManagementClient + vaultClient := acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext // Ensure we have enough information in state to look up in API @@ -280,10 +265,13 @@ func testCheckAzureRMKeyVaultCertificateExists(resourceName string) resource.Tes } name := rs.Primary.Attributes["name"] - vaultBaseUrl := rs.Primary.Attributes["vault_uri"] keyVaultId := rs.Primary.Attributes["key_vault_id"] + vaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) + if err != nil { + return fmt.Errorf("Error looking up Secret %q vault url from id %q: %+v", name, keyVaultId, err) + } - ok, err := azure.KeyVaultExists(ctx, acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient, keyVaultId) + ok, err = azure.KeyVaultExists(ctx, acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient, keyVaultId) if err != nil { return fmt.Errorf("Error checking if key vault %q for Certificate %q in Vault at url %q exists: %v", keyVaultId, name, vaultBaseUrl, err) } @@ -308,6 +296,7 @@ func testCheckAzureRMKeyVaultCertificateExists(resourceName string) resource.Tes func testCheckAzureRMKeyVaultCertificateDisappears(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.ManagementClient + vaultClient := acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext // Ensure we have enough information in state to look up in API @@ -316,10 +305,13 @@ func testCheckAzureRMKeyVaultCertificateDisappears(resourceName string) resource return fmt.Errorf("Not found: %s", resourceName) } name := rs.Primary.Attributes["name"] - vaultBaseUrl := rs.Primary.Attributes["vault_uri"] keyVaultId := rs.Primary.Attributes["key_vault_id"] + vaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) + if err != nil { + return fmt.Errorf("Error looking up Secret %q vault url from id %q: %+v", name, keyVaultId, err) + } - ok, err := azure.KeyVaultExists(ctx, acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient, keyVaultId) + ok, err = azure.KeyVaultExists(ctx, acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient, keyVaultId) if err != nil { return fmt.Errorf("Error checking if key vault %q for Certificate %q in Vault at url %q exists: %v", keyVaultId, name, vaultBaseUrl, err) } @@ -407,76 +399,6 @@ resource "azurerm_key_vault_certificate" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } -func testAccAzureRMKeyVaultCertificate_basicImportPFXClassic(data acceptance.TestData) string { - return fmt.Sprintf(` -data "azurerm_client_config" "current" {} - -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_key_vault" "test" { - name = "acctestkeyvault%s" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - tenant_id = "${data.azurerm_client_config.current.tenant_id}" - - sku_name = "standard" - - access_policy { - tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" - - certificate_permissions = [ - "delete", - "import", - "get", - ] - - key_permissions = [ - "create", - ] - - secret_permissions = [ - "set", - ] - - storage_permissions = [ - "set", - ] - } -} - -resource "azurerm_key_vault_certificate" "test" { - name = "acctestcert%s" - vault_uri = "${azurerm_key_vault.test.vault_uri}" - - certificate { - contents = "${filebase64("testdata/keyvaultcert.pfx")}" - password = "" - } - - certificate_policy { - issuer_parameters { - name = "Self" - } - - key_properties { - exportable = true - key_size = 2048 - key_type = "RSA" - reuse_key = false - } - - secret_properties { - content_type = "application/x-pkcs12" - } - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) -} - func testAccAzureRMKeyVaultCertificate_requiresImport(data acceptance.TestData) string { template := testAccAzureRMKeyVaultCertificate_basicImportPFX(data) return fmt.Sprintf(` @@ -831,8 +753,8 @@ resource "azurerm_key_vault" "test" { } resource "azurerm_key_vault_certificate" "test" { - name = "acctestcert%s" - vault_uri = "${azurerm_key_vault.test.vault_uri}" + name = "acctestcert%s" + key_vault_id = "${azurerm_key_vault.test.id}" certificate_policy { issuer_parameters { @@ -927,8 +849,8 @@ resource "azurerm_key_vault" "test" { } resource "azurerm_key_vault_certificate" "test" { - name = "acctestcert%s" - vault_uri = "${azurerm_key_vault.test.vault_uri}" + name = "acctestcert%s" + key_vault_id = "${azurerm_key_vault.test.id}" certificate_policy { issuer_parameters { diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go index ec3c7ffc8d9b5..b9cf42e1673b8 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go @@ -34,25 +34,6 @@ func TestAccAzureRMKeyVaultKey_basicEC(t *testing.T) { }) } -func TestAccAzureRMKeyVaultKey_basicECClassic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_key_vault_key", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMKeyVaultKeyDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMKeyVaultKey_basicECClassic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMKeyVaultKeyExists(data.ResourceName), - ), - }, - data.ImportStep("key_size"), - }, - }) -} - func TestAccAzureRMKeyVaultKey_requiresImport(t *testing.T) { if !features.ShouldResourcesBeImported() { t.Skip("Skipping since resources aren't required to be imported") @@ -248,6 +229,7 @@ func TestAccAzureRMKeyVaultKey_disappearsWhenParentKeyVaultDeleted(t *testing.T) func testCheckAzureRMKeyVaultKeyDestroy(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.ManagementClient + vaultClient := acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext for _, rs := range s.RootModule().Resources { @@ -256,8 +238,11 @@ func testCheckAzureRMKeyVaultKeyDestroy(s *terraform.State) error { } name := rs.Primary.Attributes["name"] - vaultBaseUrl := rs.Primary.Attributes["vault_uri"] keyVaultId := rs.Primary.Attributes["key_vault_id"] + vaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) + if err != nil { + return fmt.Errorf("Error looking up Secret %q vault url from id %q: %+v", name, keyVaultId, err) + } ok, err := azure.KeyVaultExists(ctx, acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient, keyVaultId) if err != nil { @@ -286,6 +271,7 @@ func testCheckAzureRMKeyVaultKeyDestroy(s *terraform.State) error { func testCheckAzureRMKeyVaultKeyExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.ManagementClient + vaultClient := acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext // Ensure we have enough information in state to look up in API @@ -294,10 +280,13 @@ func testCheckAzureRMKeyVaultKeyExists(resourceName string) resource.TestCheckFu return fmt.Errorf("Not found: %s", resourceName) } name := rs.Primary.Attributes["name"] - vaultBaseUrl := rs.Primary.Attributes["vault_uri"] keyVaultId := rs.Primary.Attributes["key_vault_id"] + vaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) + if err != nil { + return fmt.Errorf("Error looking up Secret %q vault url from id %q: %+v", name, keyVaultId, err) + } - ok, err := azure.KeyVaultExists(ctx, acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient, keyVaultId) + ok, err = azure.KeyVaultExists(ctx, acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient, keyVaultId) if err != nil { return fmt.Errorf("Error checking if key vault %q for Key %q in Vault at url %q exists: %v", keyVaultId, name, vaultBaseUrl, err) } @@ -322,6 +311,7 @@ func testCheckAzureRMKeyVaultKeyExists(resourceName string) resource.TestCheckFu func testCheckAzureRMKeyVaultKeyDisappears(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.ManagementClient + vaultClient := acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext // Ensure we have enough information in state to look up in API @@ -331,10 +321,13 @@ func testCheckAzureRMKeyVaultKeyDisappears(resourceName string) resource.TestChe } name := rs.Primary.Attributes["name"] - vaultBaseUrl := rs.Primary.Attributes["vault_uri"] keyVaultId := rs.Primary.Attributes["key_vault_id"] + vaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) + if err != nil { + return fmt.Errorf("Error looking up Secret %q vault url from id %q: %+v", name, keyVaultId, err) + } - ok, err := azure.KeyVaultExists(ctx, acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient, keyVaultId) + ok, err = azure.KeyVaultExists(ctx, acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient, keyVaultId) if err != nil { return fmt.Errorf("Error checking if key vault %q for Key %q in Vault at url %q exists: %v", keyVaultId, name, vaultBaseUrl, err) } @@ -409,59 +402,6 @@ resource "azurerm_key_vault_key" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } -func testAccAzureRMKeyVaultKey_basicECClassic(data acceptance.TestData) string { - return fmt.Sprintf(` -data "azurerm_client_config" "current" {} - -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_key_vault" "test" { - name = "acctestkv-%s" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - tenant_id = "${data.azurerm_client_config.current.tenant_id}" - - sku_name = "premium" - - access_policy { - tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" - - key_permissions = [ - "create", - "delete", - "get", - ] - - secret_permissions = [ - "get", - "delete", - "set", - ] - } - - tags = { - environment = "Production" - } -} - -resource "azurerm_key_vault_key" "test" { - name = "key-%s" - vault_uri = "${azurerm_key_vault.test.vault_uri}" - key_type = "EC" - key_size = 2048 - - key_opts = [ - "sign", - "verify", - ] -} -`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) -} - func testAccAzureRMKeyVaultKey_requiresImport(data acceptance.TestData) string { template := testAccAzureRMKeyVaultKey_basicEC(data) return fmt.Sprintf(` @@ -700,10 +640,10 @@ resource "azurerm_key_vault" "test" { } resource "azurerm_key_vault_key" "test" { - name = "key-%s" - vault_uri = "${azurerm_key_vault.test.vault_uri}" - key_type = "RSA" - key_size = 2048 + name = "key-%s" + key_vault_id = "${azurerm_key_vault.test.id}" + key_type = "RSA" + key_size = 2048 key_opts = [ "encrypt", @@ -758,10 +698,10 @@ resource "azurerm_key_vault" "test" { } resource "azurerm_key_vault_key" "test" { - name = "key-%s" - vault_uri = "${azurerm_key_vault.test.vault_uri}" - key_type = "EC" - curve = "P-521" + name = "key-%s" + key_vault_id = "${azurerm_key_vault.test.id}" + key_type = "EC" + curve = "P-521" key_opts = [ "sign", @@ -813,10 +753,10 @@ resource "azurerm_key_vault" "test" { } resource "azurerm_key_vault_key" "test" { - name = "key-%s" - vault_uri = "${azurerm_key_vault.test.vault_uri}" - key_type = "EC-HSM" - curve = "P-521" + name = "key-%s" + key_vault_id = "${azurerm_key_vault.test.id}" + key_type = "EC-HSM" + curve = "P-521" key_opts = [ "sign", diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go index 5b2fd6a2d5964..693c1a0cccb61 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go @@ -35,26 +35,6 @@ func TestAccAzureRMKeyVaultSecret_basic(t *testing.T) { }) } -func TestAccAzureRMKeyVaultSecret_basicClassic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_key_vault_secret", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMKeyVaultSecretDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMKeyVaultSecret_basicClasic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMKeyVaultSecretExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "value", "rick-and-morty"), - ), - }, - data.ImportStep(), - }, - }) -} - func TestAccAzureRMKeyVaultSecret_requiresImport(t *testing.T) { if !features.ShouldResourcesBeImported() { t.Skip("Skipping since resources aren't required to be imported") @@ -174,6 +154,7 @@ func TestAccAzureRMKeyVaultSecret_update(t *testing.T) { func testCheckAzureRMKeyVaultSecretDestroy(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.ManagementClient + vaultClient := acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext for _, rs := range s.RootModule().Resources { @@ -182,8 +163,11 @@ func testCheckAzureRMKeyVaultSecretDestroy(s *terraform.State) error { } name := rs.Primary.Attributes["name"] - vaultBaseUrl := rs.Primary.Attributes["vault_uri"] keyVaultId := rs.Primary.Attributes["key_vault_id"] + vaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) + if err != nil { + return fmt.Errorf("Error looking up Secret %q vault url from id %q: %+v", name, keyVaultId, err) + } ok, err := azure.KeyVaultExists(ctx, acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient, keyVaultId) if err != nil { @@ -212,6 +196,7 @@ func testCheckAzureRMKeyVaultSecretDestroy(s *terraform.State) error { func testCheckAzureRMKeyVaultSecretExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.ManagementClient + vaultClient := acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext // Ensure we have enough information in state to look up in API @@ -220,10 +205,13 @@ func testCheckAzureRMKeyVaultSecretExists(resourceName string) resource.TestChec return fmt.Errorf("Not found: %s", resourceName) } name := rs.Primary.Attributes["name"] - vaultBaseUrl := rs.Primary.Attributes["vault_uri"] keyVaultId := rs.Primary.Attributes["key_vault_id"] + vaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) + if err != nil { + return fmt.Errorf("Error looking up Secret %q vault url from id %q: %+v", name, keyVaultId, err) + } - ok, err := azure.KeyVaultExists(ctx, acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient, keyVaultId) + ok, err = azure.KeyVaultExists(ctx, acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient, keyVaultId) if err != nil { return fmt.Errorf("Error checking if key vault %q for Secret %q in Vault at url %q exists: %v", keyVaultId, name, vaultBaseUrl, err) } @@ -248,6 +236,7 @@ func testCheckAzureRMKeyVaultSecretExists(resourceName string) resource.TestChec func testCheckAzureRMKeyVaultSecretDisappears(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.ManagementClient + vaultClient := acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext // Ensure we have enough information in state to look up in API @@ -256,10 +245,13 @@ func testCheckAzureRMKeyVaultSecretDisappears(resourceName string) resource.Test return fmt.Errorf("Not found: %s", resourceName) } name := rs.Primary.Attributes["name"] - vaultBaseUrl := rs.Primary.Attributes["vault_uri"] keyVaultId := rs.Primary.Attributes["key_vault_id"] + vaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) + if err != nil { + return fmt.Errorf("Error looking up Secret %q vault url from id %q: %+v", name, keyVaultId, err) + } - ok, err := azure.KeyVaultExists(ctx, acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient, keyVaultId) + ok, err = azure.KeyVaultExists(ctx, acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient, keyVaultId) if err != nil { return fmt.Errorf("Error checking if key vault %q for Secret %q in Vault at url %q exists: %v", keyVaultId, name, vaultBaseUrl, err) } @@ -326,51 +318,6 @@ resource "azurerm_key_vault_secret" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } -func testAccAzureRMKeyVaultSecret_basicClasic(data acceptance.TestData) string { - return fmt.Sprintf(` -data "azurerm_client_config" "current" {} - -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_key_vault" "test" { - name = "acctestkv-%s" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - tenant_id = "${data.azurerm_client_config.current.tenant_id}" - - sku_name = "premium" - - access_policy { - tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" - - key_permissions = [ - "get", - ] - - secret_permissions = [ - "get", - "delete", - "set", - ] - } - - tags = { - environment = "Production" - } -} - -resource "azurerm_key_vault_secret" "test" { - name = "secret-%s" - value = "rick-and-morty" - vault_uri = "${azurerm_key_vault.test.vault_uri}" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) -} - func testAccAzureRMKeyVaultSecret_requiresImport(data acceptance.TestData) string { template := testAccAzureRMKeyVaultSecret_basic(data) return fmt.Sprintf(` @@ -474,9 +421,9 @@ resource "azurerm_key_vault" "test" { } resource "azurerm_key_vault_secret" "test" { - name = "secret-%s" - value = "szechuan" - vault_uri = "${azurerm_key_vault.test.vault_uri}" + name = "secret-%s" + value = "szechuan" + key_vault_id = "${azurerm_key_vault.test.id}" } `, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go index b4d595382d5ba..4fab60950554a 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go @@ -109,27 +109,6 @@ func TestAccAzureRMKeyVault_basicNotDefined(t *testing.T) { }) } -// Remove in 2.0 -func TestAccAzureRMKeyVault_basicClassic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_key_vault", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMKeyVaultDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMKeyVault_basicClassic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMKeyVaultExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.name", "premium"), - ), - }, - data.ImportStep(), - }, - }) -} - func TestAccAzureRMKeyVault_requiresImport(t *testing.T) { if !features.ShouldResourcesBeImported() { t.Skip("Skipping since resources aren't required to be imported") @@ -481,41 +460,6 @@ resource "azurerm_key_vault" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } -func testAccAzureRMKeyVault_basicClassic(data acceptance.TestData) string { - return fmt.Sprintf(` -data "azurerm_client_config" "current" {} - -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_key_vault" "test" { - name = "vault%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - tenant_id = "${data.azurerm_client_config.current.tenant_id}" - - sku { - name = "premium" - } - - access_policy { - tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.client_id}" - - key_permissions = [ - "create", - ] - - secret_permissions = [ - "set", - ] - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - func testAccAzureRMKeyVault_requiresImport(data acceptance.TestData) string { template := testAccAzureRMKeyVault_basic(data) return fmt.Sprintf(` @@ -740,9 +684,7 @@ resource "azurerm_key_vault" "test" { resource_group_name = "${azurerm_resource_group.test.name}" tenant_id = "${data.azurerm_client_config.current.tenant_id}" - sku { - name = "premium" - } + sku_name = "premium" enabled_for_deployment = true enabled_for_disk_encryption = true @@ -770,9 +712,7 @@ resource "azurerm_key_vault" "test" { resource_group_name = "${azurerm_resource_group.test.name}" tenant_id = "${data.azurerm_client_config.current.tenant_id}" - sku { - name = "premium" - } + sku_name = "premium" access_policy = [] diff --git a/website/docs/d/key_vault.html.markdown b/website/docs/d/key_vault.html.markdown index 429419f0eafba..0ffaf2d118621 100644 --- a/website/docs/d/key_vault.html.markdown +++ b/website/docs/d/key_vault.html.markdown @@ -41,10 +41,10 @@ The following attributes are exported: * `location` - The Azure Region in which the Key Vault exists. -* `sku` - A `sku` block as described below. - * `tenant_id` - The Azure Active Directory Tenant ID used for authenticating requests to the Key Vault. +* `sku_name` - The Name of the SKU used for this Key Vault. + * `access_policy` - One or more `access_policy` blocks as defined below. * `enabled_for_deployment` - Can Azure Virtual Machines retrieve certificates stored as secrets from the Key Vault? @@ -55,11 +55,7 @@ The following attributes are exported: * `tags` - A mapping of tags assigned to the Key Vault. -A `sku` block exports the following: - -* `name` - The name of the SKU used for this Key Vault. - -`access_policy` supports the following: +A `access_policy` block supports the following: * `tenant_id` - The Azure Active Directory Tenant ID used to authenticate requests for this Key Vault. diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index 3c3fc2955605c..e153aeb66919c 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -157,6 +157,18 @@ The deprecated fields `service_principal_object_id` and `service_principal_appli The deprecated field `zone_type` will be removed. Private DNS Zones are now a separate resource in both Azure and Terraform. +### Data Source: `azurerm_key_vault` + +The deprecated `sku` block has been replaced by the `sku_name` field and will be removed. + +### Data Source: `azurerm_key_vault_key` + +The deprecated `vault_uri` field has been replaced by the `key_vault_id` field and will be removed. + +### Data Source: `azurerm_key_vault_secret` + +The deprecated `vault_uri` field has been replaced by the `key_vault_id` field and will be removed. + ### Data Source: `azurerm_kubernetes_cluster` The deprecated block `agent_pool_profile` will be removed. This has been replaced by the `default_node_pool` block. @@ -349,6 +361,31 @@ The deprecated `location` field will be removed, since this is no longer used. The deprecated `location` field will be removed, since this is no longer used. +### Resource: `azurerm_key_vault` + +The deprecated `sku` block has been replaced by the `sku_name` field and will be removed. + +The `sku_name` field is now case sensitive. + +### Resource: `azurerm_key_vault_access_policy` + +The deprecated `vault_name` field has been replaced by the `key_vault_id` field and will be removed. + +The deprecated `resource_group_name` will be removed. + +### Resource: `azurerm_key_vault_certificate` + +The deprecated `vault_uri` field has been replaced by the `key_vault_id` field and will be removed. + +### Resource: `azurerm_key_vault_key` + +The deprecated `vault_uri` field has been replaced by the `key_vault_id` field and will be removed. + + +### Resource: `azurerm_key_vault_secret` + +The deprecated `vault_uri` field has been replaced by the `key_vault_id` field and will be removed. + ### Resource: `azurerm_log_analytics_linked_service` The `resource_id` field has been moved from the `linked_service_properties` block to the top-level. diff --git a/website/docs/r/key_vault.html.markdown b/website/docs/r/key_vault.html.markdown index fff01660246fd..a358cd62a4c61 100644 --- a/website/docs/r/key_vault.html.markdown +++ b/website/docs/r/key_vault.html.markdown @@ -67,9 +67,7 @@ The following arguments are supported: * `resource_group_name` - (Required) The name of the resource group in which to create the Key Vault. Changing this forces a new resource to be created. -* `sku` - (Optional **Deprecated**)) A `sku` block as described below. - -* `sku_name` - (Optional) The Name of the SKU used for this Key Vault. Possible values are `standard` and `premium`. +* `sku_name` - (Required) The Name of the SKU used for this Key Vault. Possible values are `standard` and `premium`. * `tenant_id` - (Required) The Azure Active Directory tenant ID that should be used for authenticating requests to the key vault. @@ -88,11 +86,7 @@ The following arguments are supported: * `tags` - (Optional) A mapping of tags to assign to the resource. --- -A `sku` block supports the following: - -* `name` - (Required) The Name of the SKU used for this Key Vault. Possible values are `standard` and `premium`. ---- A `access_policy` block supports the following: Elements of `access_policy` support: @@ -133,8 +127,6 @@ The following attributes are exported: ## Timeouts - - The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: * `create` - (Defaults to 30 minutes) Used when creating the Key Vault. diff --git a/website/docs/r/key_vault_access_policy.html.markdown b/website/docs/r/key_vault_access_policy.html.markdown index c01f01cde5392..f4d9b171c1f12 100644 --- a/website/docs/r/key_vault_access_policy.html.markdown +++ b/website/docs/r/key_vault_access_policy.html.markdown @@ -61,14 +61,6 @@ The following arguments are supported: * `key_vault_id` - (Required) Specifies the id of the Key Vault resource. Changing this forces a new resource to be created. --> **NOTE:** At this time the Key Vault `<->` Key Vault Access Policy associations need to be configured using the field `key_vault_id` or using both fields `vault_name` and `resource_group_name`. These fields are now deprecated and will be removed in favour of `key_vault_id` in the next major version (2.0) of the AzureRM Provider. - -* `vault_name` - (Required / **Deprecated**) Specifies the name of the Key Vault resource. Changing this - forces a new resource to be created. - -* `resource_group_name` - (Required / **Deprecated**) The name of the resource group in which to - create the namespace. Changing this forces a new resource to be created. - * `tenant_id` - (Required) The Azure Active Directory tenant ID that should be used for authenticating requests to the key vault. Changing this forces a new resource to be created. From 576fa5b5b09f2e6567537e6be80395f79bf56128 Mon Sep 17 00:00:00 2001 From: aqche <39076898+aqche@users.noreply.github.com> Date: Sun, 16 Feb 2020 09:18:26 -0800 Subject: [PATCH 134/498] Update azurerm/internal/services/storage/resource_arm_storage_account.go Co-Authored-By: Tom Harvey --- .../internal/services/storage/resource_arm_storage_account.go | 1 - 1 file changed, 1 deletion(-) diff --git a/azurerm/internal/services/storage/resource_arm_storage_account.go b/azurerm/internal/services/storage/resource_arm_storage_account.go index 4c59eb4047750..5ea5ba80964ce 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account.go @@ -456,7 +456,6 @@ func resourceArmStorageAccount() *schema.Resource { "static_website": { Type: schema.TypeList, Optional: true, - Computed: true, MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ From 525ec02e479259987cb7448aafdac1553547d45f Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 17 Feb 2020 06:27:43 +0100 Subject: [PATCH 135/498] updating to include #5721 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7404898508b82..25c81191e38a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ BREAKING CHANGES: * `azurerm_log_analytics_workspace_linked_service` - This resource has been removed since it was deprecated [GH-5754] * `azurerm_mssql_elasticpool` - removing the deprecated `elastic_pool_properties` block [GH-5744] * `azurerm_notification_hub_namesapce` - removing the `sku` block in favour of the `sku_name` argument [GH-5722] +* `azurerm_postgresql_server` - removing the `sku` block which has been deprecated in favour of the `sku_name` field [GH-5721] * `azurerm_relay_namespace` - removing the `sku` block in favour of the `sku_name` field [GH-5719] * `azurerm_scheduler_job` - This resource has been removed since it was deprecated [GH-5712] * `azurerm_scheduler_job_collection` - This resource has been removed since it was deprecated [GH-5712] From 5c6975b8be6c3e19debfa5fcc7f3f7d399a7b675 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 17 Feb 2020 06:45:09 +0100 Subject: [PATCH 136/498] r/iothub_dps: fixing the test --- .../services/iothub/tests/resource_arm_iothub_dps_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_test.go index 2219458d2d30e..d56e7fa952b27 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_test.go @@ -46,7 +46,7 @@ func TestAccAzureRMIotHubDPS_requiresImport(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMIotDPSDestroy, + CheckDestroy: testCheckAzureRMIotHubDPSDestroy, Steps: []resource.TestStep{ { Config: testAccAzureRMIotHubDPS_basic(data), @@ -68,7 +68,7 @@ func TestAccAzureRMIotHubDPS_update(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMIotDPSDestroy, + CheckDestroy: testCheckAzureRMIotHubDPSDestroy, Steps: []resource.TestStep{ { Config: testAccAzureRMIotHubDPS_basic(data), From c4cf372975f829688747a6762cc45a972c2d45a4 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 17 Feb 2020 06:47:54 +0100 Subject: [PATCH 137/498] updating to include #5776 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25c81191e38a8..019d9c0b929bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ BREAKING CHANGES: * `azurerm_container_service` - This resource has been removed since it was deprecated [GH-5709] * `azurerm_kubernetes_cluster` - updating the default value for `load_balancer_sku` to `Standard` from `Basic` [GH-5747] * `azurerm_log_analytics_workspace_linked_service` - This resource has been removed since it was deprecated [GH-5754] +* `azurerm_maps_account` - the `sku_name` field is now case-sensitive [GH-5776] * `azurerm_mssql_elasticpool` - removing the deprecated `elastic_pool_properties` block [GH-5744] * `azurerm_notification_hub_namesapce` - removing the `sku` block in favour of the `sku_name` argument [GH-5722] * `azurerm_postgresql_server` - removing the `sku` block which has been deprecated in favour of the `sku_name` field [GH-5721] From b854b1606f3bf5b36dc7c808e17d1c712cf32258 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 17 Feb 2020 07:15:51 +0100 Subject: [PATCH 138/498] updating to include #5649 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 019d9c0b929bc..77ffcd60a6490 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ IMPROVEMENTS: * Data Source: `azurerm_kubernetes_service_version` - support for filtering of preview releases [GH-5662] * `azurerm_dedicated_host` - support for setting `sku_name` to `DSv3-Type2` and `ESv3-Type2` [GH-5768] +* `azurerm_storage_account` - support for configuring the `static_website` block [GH-5649] * `azurerm_storage_account` - support for configuring `cors_rules` within the `blob_properties` block [GH-5425] * `azurerm_windows_virtual_machine` - fixing a bug when provisioning from a Shared Gallery image [GH-5661] From f3b56ac1a6a80de1b9fd65fe0b3c8cbc38874cb4 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 17 Feb 2020 07:22:19 +0100 Subject: [PATCH 139/498] r/app_service_plan: fixing a merge conflict --- .../web/resource_arm_app_service_plan.go | 56 +++---------------- 1 file changed, 7 insertions(+), 49 deletions(-) diff --git a/azurerm/internal/services/web/resource_arm_app_service_plan.go b/azurerm/internal/services/web/resource_arm_app_service_plan.go index 70ced7d9b7328..db32dd0b5efde 100644 --- a/azurerm/internal/services/web/resource_arm_app_service_plan.go +++ b/azurerm/internal/services/web/resource_arm_app_service_plan.go @@ -94,63 +94,21 @@ func resourceArmAppServicePlan() *schema.Resource { }, }, - "properties": { - Type: schema.TypeList, - Optional: true, - Computed: true, - MaxItems: 1, - Deprecated: "These properties have been moved to the top level", - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "app_service_environment_id": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, - Computed: true, - Deprecated: "This property has been moved to the top level", - ConflictsWith: []string{"app_service_environment_id"}, - }, - - "reserved": { - Type: schema.TypeBool, - Optional: true, - Computed: true, - Deprecated: "This property has been moved to the top level", - ConflictsWith: []string{"reserved"}, - }, - - "per_site_scaling": { - Type: schema.TypeBool, - Optional: true, - Computed: true, - Deprecated: "This property has been moved to the top level", - ConflictsWith: []string{"per_site_scaling"}, - }, - }, - }, - }, - /// AppServicePlanProperties "app_service_environment_id": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, - Computed: true, - ConflictsWith: []string{"properties.0.app_service_environment_id"}, + Type: schema.TypeString, + Optional: true, + ForceNew: true, }, "per_site_scaling": { - Type: schema.TypeBool, - Optional: true, - Computed: true, - ConflictsWith: []string{"properties.0.per_site_scaling"}, + Type: schema.TypeBool, + Optional: true, }, "reserved": { - Type: schema.TypeBool, - Optional: true, - Computed: true, - ConflictsWith: []string{"properties.0.reserved"}, + Type: schema.TypeBool, + Optional: true, }, "maximum_elastic_worker_count": { From 67700c6aa4f418846fdad5feb13e44152df93709 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 17 Feb 2020 08:00:17 +0100 Subject: [PATCH 140/498] updating to include #5753 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77ffcd60a6490..8f236b32c3df7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,8 @@ BREAKING CHANGES: * `azurerm_azuread_service_principal_password` - This resource has been removed since it was deprecated [GH-5748] * `azurerm_azuread_service_principal` - This resource has been removed since it was deprecated [GH-5748] * `azurerm_container_service` - This resource has been removed since it was deprecated [GH-5709] +* `azurerm_iot_dps` - This resource has been removed since it was deprecated [GH-5753] +* `azurerm_iot_dps_certificate` - This resource has been removed since it was deprecated [GH-5753] * `azurerm_kubernetes_cluster` - updating the default value for `load_balancer_sku` to `Standard` from `Basic` [GH-5747] * `azurerm_log_analytics_workspace_linked_service` - This resource has been removed since it was deprecated [GH-5754] * `azurerm_maps_account` - the `sku_name` field is now case-sensitive [GH-5776] From 3e6929666a356882a6e816d140299d59cf5320a9 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Mon, 17 Feb 2020 07:18:45 +0000 Subject: [PATCH 141/498] Fix for update --- .../storage/resource_arm_storage_account_network_rules.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/storage/resource_arm_storage_account_network_rules.go b/azurerm/internal/services/storage/resource_arm_storage_account_network_rules.go index 81fefac044d3a..7bbfda7558ce8 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account_network_rules.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account_network_rules.go @@ -118,7 +118,7 @@ func resourceArmStorageAccountNetworkRulesCreateUpdate(d *schema.ResourceData, m return fmt.Errorf("Error retrieving Storage Account %q (Resource Group %q): %+v", storageAccountName, resourceGroup, err) } - if features.ShouldResourcesBeImported() { + if features.ShouldResourcesBeImported() && d.IsNewResource() { if storageAccount.AccountProperties == nil { return fmt.Errorf("Error retrieving Storage Account %q (Resource Group %q): `properties` was nil", storageAccountName, resourceGroup) } From 56051b864940a700cce301da60b78a1e7d4d0a11 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 17 Feb 2020 08:25:59 +0100 Subject: [PATCH 142/498] updating to include #5764 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f236b32c3df7..1804f23113323 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,8 @@ IMPROVEMENTS: BUG FIXES: +* `azurerm_linux_virtual_machine` - using the delete custom timeout during deletion [GH-5764] +* `azurerm_windows_virtual_machine` - using the delete custom timeout during deletion [GH-5764] * `azurerm_signalr_service` - ensuring the SignalR segment is parsed in the correct case [GH-5737] --- From 34340db17924ea5709f2d174ca5a1f1240496cf3 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 17 Feb 2020 08:37:55 +0100 Subject: [PATCH 143/498] New Resource: `azurerm_network_interface_security_group_association` This commit introduces a new resource for linking a Network Interface and a Network Security Group which is required to work around a dependency issue in the Azure API where the NSG must be detached in order to be able to delete dependent resources. --- .../azuresdkhacks/network_interface.go | 105 +++++++ azurerm/internal/azuresdkhacks/notes.go | 15 + ...ork_security_group_association_resource.go | 218 ++++++++++++++ .../internal/services/network/registration.go | 1 + ...ecurity_group_association_resource_test.go | 281 ++++++++++++++++++ ...e_security_group_association.html.markdown | 91 ++++++ 6 files changed, 711 insertions(+) create mode 100644 azurerm/internal/azuresdkhacks/network_interface.go create mode 100644 azurerm/internal/azuresdkhacks/notes.go create mode 100644 azurerm/internal/services/network/network_interface_network_security_group_association_resource.go create mode 100644 azurerm/internal/services/network/tests/network_interface_network_security_group_association_resource_test.go create mode 100644 website/docs/r/network_interface_security_group_association.html.markdown diff --git a/azurerm/internal/azuresdkhacks/network_interface.go b/azurerm/internal/azuresdkhacks/network_interface.go new file mode 100644 index 0000000000000..8f4c849d71dec --- /dev/null +++ b/azurerm/internal/azuresdkhacks/network_interface.go @@ -0,0 +1,105 @@ +package azuresdkhacks + +import ( + "bytes" + "context" + "encoding/json" + "io/ioutil" + "net/http" + + "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-09-01/network" + "github.com/Azure/go-autorest/autorest" +) + +// UpdateNetworkInterfaceAllowingRemovalOfNSG patches our way around a design flaw in the Azure +// Resource Manager API <-> Azure SDK for Go where it's not possible to remove a Network Security Group +func UpdateNetworkInterfaceAllowingRemovalOfNSG(ctx context.Context, client *network.InterfacesClient, resourceGroupName string, networkInterfaceName string, parameters network.Interface) (result network.InterfacesCreateOrUpdateFuture, err error) { + req, err := updateNetworkInterfaceAllowingRemovalOfNSGPreparer(ctx, client, resourceGroupName, networkInterfaceName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "network.InterfacesClient", "CreateOrUpdate", nil, "Failure preparing request") + return + } + + result, err = client.CreateOrUpdateSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "network.InterfacesClient", "CreateOrUpdate", result.Response(), "Failure sending request") + return + } + + return +} + +// updateNetworkInterfaceAllowingRemovalOfNSGPreparer prepares the CreateOrUpdate request but applies the +// necessary patches to be able to remove the NSG if required +func updateNetworkInterfaceAllowingRemovalOfNSGPreparer(ctx context.Context, client *network.InterfacesClient, resourceGroupName string, networkInterfaceName string, parameters network.Interface) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "networkInterfaceName": autorest.Encode("path", networkInterfaceName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-09-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + parameters.Etag = nil + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}", pathParameters), + withJsonWorkingAroundTheBrokenNetworkAPI(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +func withJsonWorkingAroundTheBrokenNetworkAPI(v network.Interface) autorest.PrepareDecorator { + return func(p autorest.Preparer) autorest.Preparer { + return autorest.PreparerFunc(func(r *http.Request) (*http.Request, error) { + r, err := p.Prepare(r) + if err == nil { + b, err := json.Marshal(v) + if err == nil { + // there's a few fields which can be intentionally set to nil - as such here we need to check if they should be nil and force them to be nil + var out map[string]interface{} + if err := json.Unmarshal(b, &out); err != nil { + return r, err + } + + // apply the hack + out = patchNICUpdateAPIIssue(v, out) + + // then reserialize it as needed + b, err = json.Marshal(out) + if err == nil { + r.ContentLength = int64(len(b)) + r.Body = ioutil.NopCloser(bytes.NewReader(b)) + } + } + } + return r, err + }) + } +} + +func patchNICUpdateAPIIssue(nic network.Interface, input map[string]interface{}) map[string]interface{} { + if nic.InterfacePropertiesFormat == nil { + return input + } + + output := input + + if v, ok := output["properties"]; ok { + props := v.(map[string]interface{}) + + if nic.InterfacePropertiesFormat.NetworkSecurityGroup == nil { + var hack *string // a nil-pointered string + props["networkSecurityGroup"] = hack + } + + output["properties"] = props + } + + return output +} diff --git a/azurerm/internal/azuresdkhacks/notes.go b/azurerm/internal/azuresdkhacks/notes.go new file mode 100644 index 0000000000000..a1612ed8dad82 --- /dev/null +++ b/azurerm/internal/azuresdkhacks/notes.go @@ -0,0 +1,15 @@ +package azuresdkhacks + +// There's a functional difference that exists between the Azure SDK for Go and Azure Resource Manager API +// where when performing a delta update unchanged fields are omited from the response when they could +// also have a legitimate value of `null` (to remove/disable a sub-block). +// +// Ultimately the Azure SDK for Go has opted to serialise structs with `json:"name,omitempty"` which +// means that this value will be omited if nil to allow for delta updates - however this means there's +// no means of removing/resetting a value of a nested object once provided since a `nil` object will be +// reset +// +// As such this set of well intentioned hacks is intended to force this behaviour where necessary. +// +// It's worth noting that these hacks are a last resort and the Swagger/API/SDK should almost always be +// fixed instead. diff --git a/azurerm/internal/services/network/network_interface_network_security_group_association_resource.go b/azurerm/internal/services/network/network_interface_network_security_group_association_resource.go new file mode 100644 index 0000000000000..b71f335adb043 --- /dev/null +++ b/azurerm/internal/services/network/network_interface_network_security_group_association_resource.go @@ -0,0 +1,218 @@ +package network + +import ( + "fmt" + "log" + "strings" + "time" + + "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-09-01/network" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/azuresdkhacks" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/locks" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmNetworkInterfaceSecurityGroupAssociation() *schema.Resource { + return &schema.Resource{ + Create: resourceArmNetworkInterfaceSecurityGroupAssociationCreate, + Read: resourceArmNetworkInterfaceSecurityGroupAssociationRead, + Delete: resourceArmNetworkInterfaceSecurityGroupAssociationDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(30 * time.Minute), + Read: schema.DefaultTimeout(5 * time.Minute), + Update: schema.DefaultTimeout(30 * time.Minute), + Delete: schema.DefaultTimeout(30 * time.Minute), + }, + + Schema: map[string]*schema.Schema{ + "network_interface_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: azure.ValidateResourceID, + }, + + "network_security_group_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: azure.ValidateResourceID, + }, + }, + } +} + +func resourceArmNetworkInterfaceSecurityGroupAssociationCreate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Network.InterfacesClient + ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) + defer cancel() + + log.Printf("[INFO] preparing arguments for Network Interface <-> Network Security Group Association creation.") + + networkInterfaceId := d.Get("network_interface_id").(string) + networkSecurityGroupId := d.Get("network_security_group_id").(string) + + nicId, err := azure.ParseAzureResourceID(networkInterfaceId) + if err != nil { + return err + } + + networkInterfaceName := nicId.Path["networkInterfaces"] + resourceGroup := nicId.ResourceGroup + + locks.ByName(networkInterfaceName, networkInterfaceResourceName) + defer locks.UnlockByName(networkInterfaceName, networkInterfaceResourceName) + + nsgId, err := azure.ParseAzureResourceID(networkSecurityGroupId) + if err != nil { + return err + } + nsgName := nsgId.Path["networkSecurityGroups"] + + locks.ByName(nsgName, networkSecurityGroupResourceName) + defer locks.UnlockByName(nsgName, networkSecurityGroupResourceName) + + read, err := client.Get(ctx, resourceGroup, networkInterfaceName, "") + if err != nil { + if utils.ResponseWasNotFound(read.Response) { + return fmt.Errorf("Network Interface %q (Resource Group %q) was not found!", networkInterfaceName, resourceGroup) + } + + return fmt.Errorf("Error retrieving Network Interface %q (Resource Group %q): %+v", networkInterfaceName, resourceGroup, err) + } + + props := read.InterfacePropertiesFormat + if props == nil { + return fmt.Errorf("Error: `properties` was nil for Network Interface %q (Resource Group %q)", networkInterfaceName, resourceGroup) + } + + // first double-check it doesn't exist + resourceId := fmt.Sprintf("%s|%s", networkInterfaceId, networkSecurityGroupId) + if features.ShouldResourcesBeImported() { + if props.NetworkSecurityGroup != nil { + return tf.ImportAsExistsError("azurerm_network_interface_security_group_association", resourceGroup) + } + } + + props.NetworkSecurityGroup = &network.SecurityGroup{ + ID: utils.String(networkSecurityGroupId), + } + + future, err := client.CreateOrUpdate(ctx, resourceGroup, networkInterfaceName, read) + if err != nil { + return fmt.Errorf("Error updating Security Group Association for Network Interface %q (Resource Group %q): %+v", networkInterfaceName, resourceGroup, err) + } + + if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { + return fmt.Errorf("Error waiting for completion of Security Group Association for NIC %q (Resource Group %q): %+v", networkInterfaceName, resourceGroup, err) + } + + d.SetId(resourceId) + + return resourceArmNetworkInterfaceSecurityGroupAssociationRead(d, meta) +} + +func resourceArmNetworkInterfaceSecurityGroupAssociationRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Network.InterfacesClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + splitId := strings.Split(d.Id(), "|") + if len(splitId) != 2 { + return fmt.Errorf("Expected ID to be in the format {networkInterfaceId}|{networkSecurityGroupId} but got %q", d.Id()) + } + + nicID, err := azure.ParseAzureResourceID(splitId[0]) + if err != nil { + return err + } + + name := nicID.Path["networkInterfaces"] + resourceGroup := nicID.ResourceGroup + + read, err := client.Get(ctx, resourceGroup, name, "") + if err != nil { + if utils.ResponseWasNotFound(read.Response) { + return fmt.Errorf("Network Interface %q (Resource Group %q) was not found!", name, resourceGroup) + } + + return fmt.Errorf("Error retrieving Network Interface %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + props := read.InterfacePropertiesFormat + if props == nil { + return fmt.Errorf("Error: `properties` was nil for Network Interface %q (Resource Group %q)", name, resourceGroup) + } + + if props.NetworkSecurityGroup == nil || props.NetworkSecurityGroup.ID == nil { + log.Printf("Network Interface %q (Resource Group %q) doesn't have a Security Group attached - removing from state!", name, resourceGroup) + d.SetId("") + return nil + } + + d.Set("network_interface_id", read.ID) + + // nil-checked above + d.Set("network_security_group_id", props.NetworkSecurityGroup.ID) + + return nil +} + +func resourceArmNetworkInterfaceSecurityGroupAssociationDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Network.InterfacesClient + ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) + defer cancel() + + splitId := strings.Split(d.Id(), "|") + if len(splitId) != 2 { + return fmt.Errorf("Expected ID to be in the format {networkInterfaceId}/{networkSecurityGroup} but got %q", d.Id()) + } + + nicID, err := azure.ParseAzureResourceID(splitId[0]) + if err != nil { + return err + } + + name := nicID.Path["networkInterfaces"] + resourceGroup := nicID.ResourceGroup + + locks.ByName(name, networkInterfaceResourceName) + defer locks.UnlockByName(name, networkInterfaceResourceName) + + read, err := client.Get(ctx, resourceGroup, name, "") + if err != nil { + if utils.ResponseWasNotFound(read.Response) { + return fmt.Errorf("Network Interface %q (Resource Group %q) was not found!", name, resourceGroup) + } + + return fmt.Errorf("Error retrieving Network Interface %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + props := read.InterfacePropertiesFormat + if props == nil { + return fmt.Errorf("Error: `properties` was nil for Network Interface %q (Resource Group %q)", name, resourceGroup) + } + + props.NetworkSecurityGroup = nil + read.InterfacePropertiesFormat = props + + future, err := azuresdkhacks.UpdateNetworkInterfaceAllowingRemovalOfNSG(ctx, client, resourceGroup, name, read) + if err != nil { + return fmt.Errorf("Error updating Network Interface %q (Resource Group %q): %+v", name, resourceGroup, err) + } + if err := future.WaitForCompletionRef(ctx, client.Client); err != nil { + return fmt.Errorf("Error waiting for update of Network Interface %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + return nil +} diff --git a/azurerm/internal/services/network/registration.go b/azurerm/internal/services/network/registration.go index fc30e925d99b7..3209c66a5d484 100644 --- a/azurerm/internal/services/network/registration.go +++ b/azurerm/internal/services/network/registration.go @@ -71,6 +71,7 @@ func (r Registration) SupportedResources() map[string]*schema.Resource { "azurerm_network_interface_application_security_group_association": resourceArmNetworkInterfaceApplicationSecurityGroupAssociation(), "azurerm_network_interface_backend_address_pool_association": resourceArmNetworkInterfaceBackendAddressPoolAssociation(), "azurerm_network_interface_nat_rule_association": resourceArmNetworkInterfaceNatRuleAssociation(), + "azurerm_network_interface_security_group_association": resourceArmNetworkInterfaceSecurityGroupAssociation(), "azurerm_network_packet_capture": resourceArmNetworkPacketCapture(), "azurerm_network_profile": resourceArmNetworkProfile(), "azurerm_packet_capture": resourceArmPacketCapture(), diff --git a/azurerm/internal/services/network/tests/network_interface_network_security_group_association_resource_test.go b/azurerm/internal/services/network/tests/network_interface_network_security_group_association_resource_test.go new file mode 100644 index 0000000000000..1ad3e382435be --- /dev/null +++ b/azurerm/internal/services/network/tests/network_interface_network_security_group_association_resource_test.go @@ -0,0 +1,281 @@ +package tests + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/azuresdkhacks" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" +) + +func TestAccAzureRMNetworkInterfaceSecurityGroupAssociation_basic(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_network_interface_security_group_association", "test") + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + // intentional as this is a Virtual Resource + CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMNetworkInterfaceSecurityGroupAssociation_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceSecurityGroupAssociationExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMNetworkInterfaceSecurityGroupAssociation_requiresImport(t *testing.T) { + if !features.ShouldResourcesBeImported() { + t.Skip("Skipping since resources aren't required to be imported") + return + } + + data := acceptance.BuildTestData(t, "azurerm_network_interface_security_group_association", "test") + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + // intentional as this is a Virtual Resource + CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMNetworkInterfaceSecurityGroupAssociation_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceSecurityGroupAssociationExists(data.ResourceName), + ), + }, + { + Config: testAccAzureRMNetworkInterfaceSecurityGroupAssociation_requiresImport(data), + ExpectError: acceptance.RequiresImportError("azurerm_network_interface_security_group_association"), + }, + }, + }) +} + +func TestAccAzureRMNetworkInterfaceSecurityGroupAssociation_deleted(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_network_interface_security_group_association", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + // intentional as this is a Virtual Resource + CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMNetworkInterfaceSecurityGroupAssociation_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceSecurityGroupAssociationExists(data.ResourceName), + testCheckAzureRMNetworkInterfaceSecurityGroupAssociationDisappears(data.ResourceName), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func TestAccAzureRMNetworkInterfaceSecurityGroupAssociation_updateNIC(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_network_interface_security_group_association", "test") + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + // intentional as this is a Virtual Resource + CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMNetworkInterfaceSecurityGroupAssociation_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceSecurityGroupAssociationExists(data.ResourceName), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMNetworkInterfaceSecurityGroupAssociation_updateNIC(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceSecurityGroupAssociationExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + +func testCheckAzureRMNetworkInterfaceSecurityGroupAssociationExists(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + client := acceptance.AzureProvider.Meta().(*clients.Client).Network.InterfacesClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + // Ensure we have enough information in state to look up in API + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("Not found: %s", resourceName) + } + + nicID, err := azure.ParseAzureResourceID(rs.Primary.Attributes["network_interface_id"]) + if err != nil { + return err + } + + nicName := nicID.Path["networkInterfaces"] + resourceGroup := nicID.ResourceGroup + networkSecurityGroupId := rs.Primary.Attributes["network_security_group_id"] + + read, err := client.Get(ctx, resourceGroup, nicName, "") + if err != nil { + return fmt.Errorf("Error retrieving Network Interface %q (Resource Group %q): %+v", nicName, resourceGroup, err) + } + + found := false + if read.InterfacePropertiesFormat != nil { + if read.InterfacePropertiesFormat.NetworkSecurityGroup != nil && read.InterfacePropertiesFormat.NetworkSecurityGroup.ID != nil { + found = *read.InterfacePropertiesFormat.NetworkSecurityGroup.ID == networkSecurityGroupId + } + } + if !found { + return fmt.Errorf("Association between NIC %q and Network Security Group %q was not found!", nicName, networkSecurityGroupId) + } + + return nil + } +} + +func testCheckAzureRMNetworkInterfaceSecurityGroupAssociationDisappears(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + client := acceptance.AzureProvider.Meta().(*clients.Client).Network.InterfacesClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + // Ensure we have enough information in state to look up in API + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("Not found: %s", resourceName) + } + + nicID, err := azure.ParseAzureResourceID(rs.Primary.Attributes["network_interface_id"]) + if err != nil { + return err + } + + nicName := nicID.Path["networkInterfaces"] + resourceGroup := nicID.ResourceGroup + + read, err := client.Get(ctx, resourceGroup, nicName, "") + if err != nil { + return fmt.Errorf("Error retrieving Network Interface %q (Resource Group %q): %+v", nicName, resourceGroup, err) + } + + read.InterfacePropertiesFormat.NetworkSecurityGroup = nil + + future, err := azuresdkhacks.UpdateNetworkInterfaceAllowingRemovalOfNSG(ctx, client, resourceGroup, nicName, read) + if err != nil { + return fmt.Errorf("Error removing Network Security Group Association for Network Interface %q (Resource Group %q): %+v", nicName, resourceGroup, err) + } + + if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { + return fmt.Errorf("Error waiting for removal of Network Security Group Association for NIC %q (Resource Group %q): %+v", nicName, resourceGroup, err) + } + + return nil + } +} + +func testAccAzureRMNetworkInterfaceSecurityGroupAssociation_basic(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterfaceSecurityGroupAssociation_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_network_interface" "test" { + name = "acctestni-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + + ip_configuration { + name = "testconfiguration1" + subnet_id = azurerm_subnet.test.id + private_ip_address_allocation = "Dynamic" + } +} + +resource "azurerm_network_interface_security_group_association" "test" { + network_interface_id = azurerm_network_interface.test.id + network_security_group_id = azurerm_network_security_group.test.id +} +`, template, data.RandomInteger) +} + +func testAccAzureRMNetworkInterfaceSecurityGroupAssociation_requiresImport(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterfaceSecurityGroupAssociation_basic(data) + return fmt.Sprintf(` +%s + +resource "azurerm_network_interface_security_group_association" "import" { + network_interface_id = azurerm_network_interface_security_group_association.test.network_interface_id + network_security_group_id = azurerm_network_interface_security_group_association.test.network_security_group_id +} +`, template) +} + +func testAccAzureRMNetworkInterfaceSecurityGroupAssociation_updateNIC(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterfaceSecurityGroupAssociation_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_network_interface" "test" { + name = "acctestni-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + + ip_configuration { + name = "testconfiguration1" + subnet_id = azurerm_subnet.test.id + private_ip_address_allocation = "Dynamic" + primary = true + } + + ip_configuration { + name = "testconfiguration2" + private_ip_address_version = "IPv6" + private_ip_address_allocation = "dynamic" + } +} + +resource "azurerm_network_interface_security_group_association" "test" { + network_interface_id = azurerm_network_interface.test.id + network_security_group_id = azurerm_network_security_group.test.id +} +`, template, data.RandomInteger) +} + +func testAccAzureRMNetworkInterfaceSecurityGroupAssociation_template(data acceptance.TestData) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctestvn-%d" + address_space = ["10.0.0.0/16"] + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name +} + +resource "azurerm_subnet" "test" { + name = "internal" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name + address_prefix = "10.0.1.0/24" +} + +resource "azurerm_network_security_group" "test" { + name = "acctestnsg-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) +} diff --git a/website/docs/r/network_interface_security_group_association.html.markdown b/website/docs/r/network_interface_security_group_association.html.markdown new file mode 100644 index 0000000000000..3bc138982a77d --- /dev/null +++ b/website/docs/r/network_interface_security_group_association.html.markdown @@ -0,0 +1,91 @@ +--- +subcategory: "Network" +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_network_interface_security_group_association" +description: |- + Manages the association between a Network Interface and a Network Security Group. + +--- + +# azurerm_network_interface_security_group_association + +Manages the association between a Network Interface and a Network Security Group. + +## Example Usage + +```hcl +resource "azurerm_resource_group" "example" { + name = "example-resources" + location = "West Europe" +} + +resource "azurerm_virtual_network" "example" { + name = "example-network" + address_space = ["10.0.0.0/16"] + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name +} + +resource "azurerm_subnet" "example" { + name = "internal" + resource_group_name = azurerm_resource_group.example.name + virtual_network_name = azurerm_virtual_network.example.name + address_prefix = "10.0.2.0/24" +} + +resource "azurerm_network_security_group" "example" { + name = "example-nsg" + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name +} + +resource "azurerm_network_interface" "example" { + name = "example-nic" + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name + + ip_configuration { + name = "testconfiguration1" + subnet_id = azurerm_subnet.example.id + private_ip_address_allocation = "Dynamic" + } +} + +resource "azurerm_network_interface_security_group_association" "example" { + network_interface_id = azurerm_network_interface.example.id + network_security_group_id = azurerm_network_security_group.example.id +} +``` + +## Argument Reference + +The following arguments are supported: + +* `network_interface_id` - (Required) The ID of the Network Interface. Changing this forces a new resource to be created. + +* `network_security_group_id` - (Required) The ID of the Network Security Group which should be attached to the Network Interface. Changing this forces a new resource to be created. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The (Terraform specific) ID of the Association between the Network Interface and the Network Interface. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: + +* `create` - (Defaults to 30 minutes) Used when creating the association between the Network Interface and the Network Security Group. +* `update` - (Defaults to 30 minutes) Used when updating the association between the Network Interface and the Network Security Group. +* `read` - (Defaults to 5 minutes) Used when retrieving the association between the Network Interface and the Network Security Group. +* `delete` - (Defaults to 30 minutes) Used when deleting the association between the Network Interface and the Network Security Group. + +## Import + +Associations between Network Interfaces and Network Security Group can be imported using the `resource id`, e.g. + +```shell +terraform import azurerm_network_interface_security_group_association.association1 /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/microsoft.network/networkInterfaces/nic1/ipConfigurations/example|/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.Network/networkSecurityGroups/group1 +``` + +-> **NOTE:** This ID is specific to Terraform - and is of the format `{networkInterfaceId}/|{networkSecurityGroupId}`. From 1a18b602c780be2853356b258a62176b46d85672 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 17 Feb 2020 08:38:26 +0100 Subject: [PATCH 144/498] r/network_interface: applying properties managed in other resources to this resource --- .../network/resource_arm_network_interface.go | 203 +++++++++++++----- 1 file changed, 144 insertions(+), 59 deletions(-) diff --git a/azurerm/internal/services/network/resource_arm_network_interface.go b/azurerm/internal/services/network/resource_arm_network_interface.go index 0789e212bfea3..a6b1bd6d987c3 100644 --- a/azurerm/internal/services/network/resource_arm_network_interface.go +++ b/azurerm/internal/services/network/resource_arm_network_interface.go @@ -51,12 +51,6 @@ func resourceArmNetworkInterface() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), - "network_security_group_id": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: azure.ValidateResourceIDOrEmpty, - }, - "ip_configuration": { Type: schema.TypeList, Required: true, @@ -218,23 +212,6 @@ func resourceArmNetworkInterfaceCreate(d *schema.ResourceData, meta interface{}) locks.ByName(name, networkInterfaceResourceName) defer locks.UnlockByName(name, networkInterfaceResourceName) - if v, ok := d.GetOk("network_security_group_id"); ok { - nsgId := v.(string) - properties.NetworkSecurityGroup = &network.SecurityGroup{ - ID: &nsgId, - } - - parsedNsgID, err := azure.ParseAzureResourceID(nsgId) - if err != nil { - return fmt.Errorf("Error parsing Network Security Group ID %q: %+v", nsgId, err) - } - - networkSecurityGroupName := parsedNsgID.Path["networkSecurityGroups"] - - locks.ByName(networkSecurityGroupName, networkSecurityGroupResourceName) - defer locks.UnlockByName(networkSecurityGroupName, networkSecurityGroupResourceName) - } - dns, hasDns := d.GetOk("dns_servers") nameLabel, hasNameLabel := d.GetOk("internal_dns_name_label") if hasDns || hasNameLabel { @@ -259,7 +236,7 @@ func resourceArmNetworkInterfaceCreate(d *schema.ResourceData, meta interface{}) if err != nil { return fmt.Errorf("Error expanding `ip_configuration`: %+v", err) } - lockingDetails, err := determineResourcesToLockFromIPConfiguration(&ipConfigs) + lockingDetails, err := determineResourcesToLockFromIPConfiguration(ipConfigs) if err != nil { return fmt.Errorf("Error determing locking details: %+v", err) } @@ -267,8 +244,8 @@ func resourceArmNetworkInterfaceCreate(d *schema.ResourceData, meta interface{}) lockingDetails.lock() defer lockingDetails.unlock() - if len(ipConfigs) > 0 { - properties.IPConfigurations = &ipConfigs + if len(*ipConfigs) > 0 { + properties.IPConfigurations = ipConfigs } iface := network.Interface{ @@ -320,6 +297,13 @@ func resourceArmNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{}) return fmt.Errorf("Error retrieving Network Interface %q (Resource Group %q): %+v", name, resourceGroup, err) } + if existing.InterfacePropertiesFormat == nil { + return fmt.Errorf("Error retrieving Network Interface %q (Resource Group %q): `properties` was nil", name, resourceGroup) + } + + // then pull out things we need to lock on + info := parseFieldsFromNetworkInterface(*existing.InterfacePropertiesFormat) + location := azure.NormalizeLocation(d.Get("location").(string)) update := network.Interface{ Name: utils.String(name), @@ -360,7 +344,7 @@ func resourceArmNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{}) if err != nil { return fmt.Errorf("Error expanding `ip_configuration`: %+v", err) } - lockingDetails, err := determineResourcesToLockFromIPConfiguration(&ipConfigs) + lockingDetails, err := determineResourcesToLockFromIPConfiguration(ipConfigs) if err != nil { return fmt.Errorf("Error determing locking details: %+v", err) } @@ -368,20 +352,12 @@ func resourceArmNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{}) lockingDetails.lock() defer lockingDetails.unlock() - update.InterfacePropertiesFormat.IPConfigurations = &ipConfigs - } else { - update.InterfacePropertiesFormat.IPConfigurations = existing.InterfacePropertiesFormat.IPConfigurations - } + // then map the fields managed in other resources back + ipConfigs = mapFieldsToNetworkInterface(ipConfigs, info) - if d.HasChange("network_security_group_id") { - update.InterfacePropertiesFormat.NetworkSecurityGroup = &network.SecurityGroup{} - if networkSecurityGroupId := d.Get("network_security_group_id").(string); networkSecurityGroupId != "" { - update.InterfacePropertiesFormat.NetworkSecurityGroup.ID = utils.String(networkSecurityGroupId) - } else { - update.InterfacePropertiesFormat.NetworkSecurityGroup = nil - } + update.InterfacePropertiesFormat.IPConfigurations = ipConfigs } else { - update.InterfacePropertiesFormat.NetworkSecurityGroup = existing.InterfacePropertiesFormat.NetworkSecurityGroup + update.InterfacePropertiesFormat.IPConfigurations = existing.InterfacePropertiesFormat.IPConfigurations } if d.HasChange("tags") { @@ -389,6 +365,9 @@ func resourceArmNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{}) update.Tags = tags.Expand(tagsRaw) } + // this can be managed in another resource, so just port it over + update.InterfacePropertiesFormat.NetworkSecurityGroup = existing.InterfacePropertiesFormat.NetworkSecurityGroup + future, err := client.CreateOrUpdate(ctx, resourceGroup, name, update) if err != nil { return fmt.Errorf("Error updating Network Interface %q (Resource Group %q): %+v", name, resourceGroup, err) @@ -459,10 +438,6 @@ func resourceArmNetworkInterfaceRead(d *schema.ResourceData, meta interface{}) e } } - networkSecurityGroupId := "" - if props.NetworkSecurityGroup != nil && props.NetworkSecurityGroup.ID != nil { - networkSecurityGroupId = *props.NetworkSecurityGroup.ID - } virtualMachineId := "" if props.VirtualMachine != nil && props.VirtualMachine.ID != nil { virtualMachineId = *props.VirtualMachine.ID @@ -480,7 +455,6 @@ func resourceArmNetworkInterfaceRead(d *schema.ResourceData, meta interface{}) e d.Set("enable_accelerated_networking", resp.EnableAcceleratedNetworking) d.Set("internal_dns_name_label", internalDnsNameLabel) d.Set("mac_address", props.MacAddress) - d.Set("network_security_group_id", networkSecurityGroupId) d.Set("private_ip_address", primaryPrivateIPAddress) d.Set("virtual_machine_id", virtualMachineId) @@ -527,19 +501,6 @@ func resourceArmNetworkInterfaceDelete(d *schema.ResourceData, meta interface{}) } props := *existing.InterfacePropertiesFormat - if props.NetworkSecurityGroup != nil && props.NetworkSecurityGroup.ID != nil { - networkSecurityGroupId := *props.NetworkSecurityGroup.ID - parsedNsgID, err := azure.ParseAzureResourceID(networkSecurityGroupId) - if err != nil { - return fmt.Errorf("Error parsing Network Security Group ID %q: %+v", networkSecurityGroupId, err) - } - - networkSecurityGroupName := parsedNsgID.Path["networkSecurityGroups"] - - locks.ByName(networkSecurityGroupName, networkSecurityGroupResourceName) - defer locks.UnlockByName(networkSecurityGroupName, networkSecurityGroupResourceName) - } - lockingDetails, err := determineResourcesToLockFromIPConfiguration(props.IPConfigurations) if err != nil { return fmt.Errorf("Error determing locking details: %+v", err) @@ -560,7 +521,7 @@ func resourceArmNetworkInterfaceDelete(d *schema.ResourceData, meta interface{}) return nil } -func expandNetworkInterfaceIPConfigurations(input []interface{}) ([]network.InterfaceIPConfiguration, error) { +func expandNetworkInterfaceIPConfigurations(input []interface{}) (*[]network.InterfaceIPConfiguration, error) { ipConfigs := make([]network.InterfaceIPConfiguration, 0) for _, configRaw := range input { @@ -622,7 +583,7 @@ func expandNetworkInterfaceIPConfigurations(input []interface{}) ([]network.Inte } } - return ipConfigs, nil + return &ipConfigs, nil } func flattenNetworkInterfaceIPConfigurations(input *[]network.InterfaceIPConfiguration) []interface{} { @@ -696,3 +657,127 @@ func flattenNetworkInterfaceDnsServers(input *[]string) []string { } return output } + +type networkInterfaceUpdateInformation struct { + applicationGatewayBackendAddressPoolIDs []string + applicationSecurityGroupIDs []string + loadBalancerBackendAddressPoolIDs []string + loadBalancerInboundNatRuleIDs []string + networkSecurityGroupID string +} + +func parseFieldsFromNetworkInterface(input network.InterfacePropertiesFormat) networkInterfaceUpdateInformation { + networkSecurityGroupId := "" + if input.NetworkSecurityGroup != nil && input.NetworkSecurityGroup.ID != nil { + networkSecurityGroupId = *input.NetworkSecurityGroup.ID + } + + var mapToSlice = func(input map[string]struct{}) []string { + output := make([]string, 0) + + for id, _ := range input { + output = append(output, id) + } + + return output + } + + applicationSecurityGroupIds := make(map[string]struct{}, 0) + applicationGatewayBackendAddressPoolIds := make(map[string]struct{}, 0) + loadBalancerBackendAddressPoolIds := make(map[string]struct{}, 0) + loadBalancerInboundNatRuleIds := make(map[string]struct{}, 0) + + if input.IPConfigurations != nil { + for _, v := range *input.IPConfigurations { + if v.InterfaceIPConfigurationPropertiesFormat == nil { + continue + } + + props := *v.InterfaceIPConfigurationPropertiesFormat + if props.ApplicationSecurityGroups != nil { + for _, asg := range *props.ApplicationSecurityGroups { + if asg.ID != nil { + applicationSecurityGroupIds[*asg.ID] = struct{}{} + } + } + } + + if props.ApplicationGatewayBackendAddressPools != nil { + for _, pool := range *props.ApplicationGatewayBackendAddressPools { + if pool.ID != nil { + applicationGatewayBackendAddressPoolIds[*pool.ID] = struct{}{} + } + } + } + + if props.LoadBalancerBackendAddressPools != nil { + for _, pool := range *props.LoadBalancerBackendAddressPools { + if pool.ID != nil { + loadBalancerBackendAddressPoolIds[*pool.ID] = struct{}{} + } + } + } + + if props.LoadBalancerInboundNatRules != nil { + for _, rule := range *props.LoadBalancerInboundNatRules { + if rule.ID != nil { + loadBalancerInboundNatRuleIds[*rule.ID] = struct{}{} + } + } + } + } + } + + return networkInterfaceUpdateInformation{ + applicationGatewayBackendAddressPoolIDs: mapToSlice(applicationGatewayBackendAddressPoolIds), + applicationSecurityGroupIDs: mapToSlice(applicationSecurityGroupIds), + loadBalancerBackendAddressPoolIDs: mapToSlice(loadBalancerBackendAddressPoolIds), + loadBalancerInboundNatRuleIDs: mapToSlice(loadBalancerInboundNatRuleIds), + networkSecurityGroupID: networkSecurityGroupId, + } +} + +func mapFieldsToNetworkInterface(input *[]network.InterfaceIPConfiguration, info networkInterfaceUpdateInformation) *[]network.InterfaceIPConfiguration { + output := input + + applicationSecurityGroups := make([]network.ApplicationSecurityGroup, 0) + for _, id := range info.applicationSecurityGroupIDs { + applicationSecurityGroups = append(applicationSecurityGroups, network.ApplicationSecurityGroup{ + ID: utils.String(id), + }) + } + + applicationGatewayBackendAddressPools := make([]network.ApplicationGatewayBackendAddressPool, 0) + for _, id := range info.applicationGatewayBackendAddressPoolIDs { + applicationGatewayBackendAddressPools = append(applicationGatewayBackendAddressPools, network.ApplicationGatewayBackendAddressPool{ + ID: utils.String(id), + }) + } + + loadBalancerBackendAddressPools := make([]network.BackendAddressPool, 0) + for _, id := range info.loadBalancerBackendAddressPoolIDs { + loadBalancerBackendAddressPools = append(loadBalancerBackendAddressPools, network.BackendAddressPool{ + ID: utils.String(id), + }) + } + + loadBalancerInboundNatRules := make([]network.InboundNatRule, 0) + for _, id := range info.loadBalancerInboundNatRuleIDs { + loadBalancerInboundNatRules = append(loadBalancerInboundNatRules, network.InboundNatRule{ + ID: utils.String(id), + }) + } + + for _, config := range *output { + if config.InterfaceIPConfigurationPropertiesFormat == nil { + continue + } + + config.ApplicationSecurityGroups = &applicationSecurityGroups + config.ApplicationGatewayBackendAddressPools = &applicationGatewayBackendAddressPools + config.LoadBalancerBackendAddressPools = &loadBalancerBackendAddressPools + config.LoadBalancerInboundNatRules = &loadBalancerInboundNatRules + } + + return output +} From a99d908e20a083d33262a217e65d20b77ec44f70 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 17 Feb 2020 08:40:41 +0100 Subject: [PATCH 145/498] spelling --- azurerm/internal/azuresdkhacks/notes.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/azuresdkhacks/notes.go b/azurerm/internal/azuresdkhacks/notes.go index a1612ed8dad82..f75c0ac1c827c 100644 --- a/azurerm/internal/azuresdkhacks/notes.go +++ b/azurerm/internal/azuresdkhacks/notes.go @@ -1,11 +1,11 @@ package azuresdkhacks // There's a functional difference that exists between the Azure SDK for Go and Azure Resource Manager API -// where when performing a delta update unchanged fields are omited from the response when they could +// where when performing a delta update unchanged fields are omitted from the response when they could // also have a legitimate value of `null` (to remove/disable a sub-block). // // Ultimately the Azure SDK for Go has opted to serialise structs with `json:"name,omitempty"` which -// means that this value will be omited if nil to allow for delta updates - however this means there's +// means that this value will be omitted if nil to allow for delta updates - however this means there's // no means of removing/resetting a value of a nested object once provided since a `nil` object will be // reset // From be435833dfc0df7d0467fabe88b96eedd2bf8616 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 17 Feb 2020 09:32:30 +0100 Subject: [PATCH 146/498] updating to include #5710 --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1804f23113323..ec7b41bad612d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,16 @@ BREAKING CHANGES: * `azurerm_relay_namespace` - removing the `sku` block in favour of the `sku_name` field [GH-5719] * `azurerm_scheduler_job` - This resource has been removed since it was deprecated [GH-5712] * `azurerm_scheduler_job_collection` - This resource has been removed since it was deprecated [GH-5712] +* `azurerm_storage_account` - removing the deprecated `account_type` field [GH-5710] +* `azurerm_storage_account` - removing the deprecated `enable_advanced_threat_protection` field [GH-5710] +* `azurerm_storage_blob` - making the `type` field case-sensitive [GH-5710] +* `azurerm_storage_blob` - removing the deprecated `attempts` field [GH-5710] +* `azurerm_storage_blob` - removing the deprecated `resource_group_name` field [GH-5710] +* `azurerm_storage_container` - removing the deprecated `resource_group_name` field [GH-5710] +* `azurerm_storage_container` - removing the deprecated `properties` block [GH-5710] +* `azurerm_storage_queue` - removing the deprecated `resource_group_name` field [GH-5710] +* `azurerm_storage_share` - removing the deprecated `resource_group_name` field [GH-5710] +* `azurerm_storage_table` - removing the deprecated `resource_group_name` field [GH-5710] IMPROVEMENTS: From cad4978e7f7bd6b670778660dff325a81d84e9b4 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 17 Feb 2020 11:15:27 +0100 Subject: [PATCH 147/498] r/network_interface: updating the tests / rewriting the docs --- .../network/resource_arm_network_interface.go | 10 +- .../resource_arm_network_interface_test.go | 839 +++++++----------- .../docs/r/network_interface.html.markdown | 83 +- 3 files changed, 361 insertions(+), 571 deletions(-) diff --git a/azurerm/internal/services/network/resource_arm_network_interface.go b/azurerm/internal/services/network/resource_arm_network_interface.go index a6b1bd6d987c3..899d4bbfba607 100644 --- a/azurerm/internal/services/network/resource_arm_network_interface.go +++ b/azurerm/internal/services/network/resource_arm_network_interface.go @@ -112,14 +112,13 @@ func resourceArmNetworkInterface() *schema.Resource { }, "dns_servers": { - Type: schema.TypeSet, + Type: schema.TypeList, Optional: true, Computed: true, Elem: &schema.Schema{ Type: schema.TypeString, ValidateFunc: validation.StringIsNotEmpty, }, - Set: schema.HashString, }, "enable_accelerated_networking": { @@ -218,14 +217,13 @@ func resourceArmNetworkInterfaceCreate(d *schema.ResourceData, meta interface{}) dnsSettings := network.InterfaceDNSSettings{} if hasDns { - dnsRaw := dns.(*schema.Set).List() + dnsRaw := dns.([]interface{}) dns := expandNetworkInterfaceDnsServers(dnsRaw) dnsSettings.DNSServers = &dns } if hasNameLabel { - name_label := nameLabel.(string) - dnsSettings.InternalDNSNameLabel = &name_label + dnsSettings.InternalDNSNameLabel = utils.String(nameLabel.(string)) } properties.DNSSettings = &dnsSettings @@ -316,7 +314,7 @@ func resourceArmNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{}) update.InterfacePropertiesFormat.DNSSettings = &network.InterfaceDNSSettings{} } - dnsServersRaw := d.Get("dns_servers").(*schema.Set).List() + dnsServersRaw := d.Get("dns_servers").([]interface{}) dnsServers := expandNetworkInterfaceDnsServers(dnsServersRaw) update.InterfacePropertiesFormat.DNSSettings.DNSServers = &dnsServers diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go index 05170566f5b45..3ec528f8615a5 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go @@ -12,7 +12,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func TestAccAzureRMNetworkInterface_disappears(t *testing.T) { +func TestAccAzureRMNetworkInterface_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_interface", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -23,20 +23,14 @@ func TestAccAzureRMNetworkInterface_disappears(t *testing.T) { Config: testAccAzureRMNetworkInterface_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetworkInterfaceExists(data.ResourceName), - testCheckAzureRMNetworkInterfaceDisappears(data.ResourceName), ), - ExpectNonEmptyPlan: true, }, + data.ImportStep(), }, }) } -func TestAccAzureRMNetworkInterface_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - +func TestAccAzureRMNetworkInterface_disappears(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_interface", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -47,17 +41,15 @@ func TestAccAzureRMNetworkInterface_requiresImport(t *testing.T) { Config: testAccAzureRMNetworkInterface_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetworkInterfaceExists(data.ResourceName), + testCheckAzureRMNetworkInterfaceDisappears(data.ResourceName), ), - }, - { - Config: testAccAzureRMNetworkInterface_requiresImport(data), - ExpectError: acceptance.RequiresImportError("azurerm_network_interface"), + ExpectNonEmptyPlan: true, }, }, }) } -func TestAccAzureRMNetworkInterface_basic(t *testing.T) { +func TestAccAzureRMNetworkInterface_dnsServers(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_interface", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -65,7 +57,14 @@ func TestAccAzureRMNetworkInterface_basic(t *testing.T) { CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMNetworkInterface_basic(data), + Config: testAccAzureRMNetworkInterface_dnsServers(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceExists(data.ResourceName), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMNetworkInterface_dnsServersUpdated(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetworkInterfaceExists(data.ResourceName), ), @@ -75,108 +74,122 @@ func TestAccAzureRMNetworkInterface_basic(t *testing.T) { }) } -func TestAccAzureRMNetworkInterface_setNetworkSecurityGroupId(t *testing.T) { +func TestAccAzureRMNetworkInterface_enableAcceleratedNetworking(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_interface", "test") - resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMNetworkInterface_basic(data), + // Enabled + Config: testAccAzureRMNetworkInterface_enableAcceleratedNetworking(data, true), Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetworkInterfaceExists(data.ResourceName), ), }, + data.ImportStep(), + { + // Disabled + Config: testAccAzureRMNetworkInterface_enableAcceleratedNetworking(data, false), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceExists(data.ResourceName), + ), + }, + data.ImportStep(), { - Config: testAccAzureRMNetworkInterface_basicWithNetworkSecurityGroup(data), + // Enabled + Config: testAccAzureRMNetworkInterface_enableAcceleratedNetworking(data, true), Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetworkInterfaceExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "network_security_group_id"), ), }, + data.ImportStep(), }, }) } -func TestAccAzureRMNetworkInterface_removeNetworkSecurityGroupId(t *testing.T) { +func TestAccAzureRMNetworkInterface_enableIPForwarding(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_interface", "test") - resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMNetworkInterface_basicWithNetworkSecurityGroup(data), + // Enabled + Config: testAccAzureRMNetworkInterface_enableIPForwarding(data, true), Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetworkInterfaceExists(data.ResourceName), ), }, + data.ImportStep(), { - Config: testAccAzureRMNetworkInterface_basic(data), + // Disabled + Config: testAccAzureRMNetworkInterface_enableIPForwarding(data, false), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceExists(data.ResourceName), + ), + }, + data.ImportStep(), + { + // Enabled + Config: testAccAzureRMNetworkInterface_enableIPForwarding(data, true), Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetworkInterfaceExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "network_security_group_id", ""), ), }, + data.ImportStep(), }, }) } -func TestAccAzureRMNetworkInterface_multipleSubnets(t *testing.T) { +func TestAccAzureRMNetworkInterface_internalDomainNameLabel(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_interface", "test") - resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMNetworkInterface_multipleSubnets(data), + Config: testAccAzureRMNetworkInterface_internalDomainNameLabel(data, "1"), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceExists(data.ResourceName), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMNetworkInterface_internalDomainNameLabel(data, "2"), Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetworkInterfaceExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "ip_configuration.#", "2"), ), }, + data.ImportStep(), }, }) } -func TestAccAzureRMNetworkInterface_multipleSubnetsPrimary(t *testing.T) { +func TestAccAzureRMNetworkInterface_ipv6(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_interface", "test") - resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMNetworkInterface_multipleSubnets(data), + Config: testAccAzureRMNetworkInterface_ipv6(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetworkInterfaceExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "ip_configuration.0.primary", "true"), - resource.TestCheckResourceAttr(data.ResourceName, "ip_configuration.0.name", "testconfiguration1"), - resource.TestCheckResourceAttr(data.ResourceName, "ip_configuration.1.primary", "false"), - resource.TestCheckResourceAttr(data.ResourceName, "ip_configuration.1.name", "testconfiguration2"), - ), - }, - { - Config: testAccAzureRMNetworkInterface_multipleSubnetsUpdatedPrimary(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMNetworkInterfaceExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "ip_configuration.0.primary", "true"), - resource.TestCheckResourceAttr(data.ResourceName, "ip_configuration.0.name", "testconfiguration2"), - resource.TestCheckResourceAttr(data.ResourceName, "ip_configuration.1.primary", "false"), - resource.TestCheckResourceAttr(data.ResourceName, "ip_configuration.1.name", "testconfiguration1"), + resource.TestCheckResourceAttr(data.ResourceName, "ip_configuration.0.private_ip_address_version", "IPv4"), + resource.TestCheckResourceAttr(data.ResourceName, "ip_configuration.1.private_ip_address_version", "IPv6"), ), }, + data.ImportStep(), }, }) } -func TestAccAzureRMNetworkInterface_enableIPForwarding(t *testing.T) { +func TestAccAzureRMNetworkInterface_multipleIPConfigurations(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_interface", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -184,17 +197,17 @@ func TestAccAzureRMNetworkInterface_enableIPForwarding(t *testing.T) { CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMNetworkInterface_ipForwarding(data), + Config: testAccAzureRMNetworkInterface_multipleIPConfigurations(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetworkInterfaceExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "enable_ip_forwarding", "true"), ), }, + data.ImportStep(), }, }) } -func TestAccAzureRMNetworkInterface_enableAcceleratedNetworking(t *testing.T) { +func TestAccAzureRMNetworkInterface_multipleIPConfigurationsSecondaryAsPrimary(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_interface", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -202,17 +215,17 @@ func TestAccAzureRMNetworkInterface_enableAcceleratedNetworking(t *testing.T) { CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMNetworkInterface_acceleratedNetworking(data), + Config: testAccAzureRMNetworkInterface_multipleIPConfigurationsSecondaryAsPrimary(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetworkInterfaceExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "enable_accelerated_networking", "true"), ), }, + data.ImportStep(), }, }) } -func TestAccAzureRMNetworkInterface_withTags(t *testing.T) { +func TestAccAzureRMNetworkInterface_publicIP(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_interface", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -220,27 +233,36 @@ func TestAccAzureRMNetworkInterface_withTags(t *testing.T) { CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMNetworkInterface_withTags(data), + Config: testAccAzureRMNetworkInterface_publicIP(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceExists(data.ResourceName), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMNetworkInterface_publicIPRemoved(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetworkInterfaceExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "2"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.environment", "Production"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.cost_center", "MSFT"), ), }, + data.ImportStep(), { - Config: testAccAzureRMNetworkInterface_withTagsUpdate(data), + Config: testAccAzureRMNetworkInterface_publicIP(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetworkInterfaceExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.environment", "staging"), ), }, + data.ImportStep(), }, }) } -func TestAccAzureRMNetworkInterface_IPAddressesBug1286(t *testing.T) { +func TestAccAzureRMNetworkInterface_requiresImport(t *testing.T) { + if !features.ShouldResourcesBeImported() { + t.Skip("Skipping since resources aren't required to be imported") + return + } + data := acceptance.BuildTestData(t, "azurerm_network_interface", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -248,75 +270,81 @@ func TestAccAzureRMNetworkInterface_IPAddressesBug1286(t *testing.T) { CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMNetworkInterface_withIPAddresses(data), + Config: testAccAzureRMNetworkInterface_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetworkInterfaceExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "ip_configuration.0.private_ip_address"), - resource.TestCheckResourceAttrSet(data.ResourceName, "ip_configuration.0.public_ip_address_id"), ), }, { - Config: testAccAzureRMNetworkInterface_withIPAddressesUpdate(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMNetworkInterfaceExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "ip_configuration.0.private_ip_address"), - resource.TestCheckResourceAttr(data.ResourceName, "ip_configuration.0.public_ip_address_id", ""), - ), + Config: testAccAzureRMNetworkInterface_requiresImport(data), + ExpectError: acceptance.RequiresImportError("azurerm_network_interface"), }, }, }) } -func TestAccAzureRMNetworkInterface_IPAddressesFeature2543(t *testing.T) { +func TestAccAzureRMNetworkInterface_static(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_interface", "test") - resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMNetworkInterface_withIPv6Addresses(data), + Config: testAccAzureRMNetworkInterface_static(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetworkInterfaceExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "ip_configuration.0.private_ip_address_version", "IPv4"), - resource.TestCheckResourceAttr(data.ResourceName, "ip_configuration.1.private_ip_address_version", "IPv6"), - resource.TestCheckResourceAttrSet(data.ResourceName, "private_ip_address"), ), }, + data.ImportStep(), }, }) } -func TestAccAzureRMNetworkInterface_bug7986(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_network_interface", "test1") - +func TestAccAzureRMNetworkInterface_tags(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_network_interface", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMNetworkInterface_bug7986(data), + Config: testAccAzureRMNetworkInterface_tags(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceExists(data.ResourceName), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMNetworkInterface_tagsUpdated(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMNetworkInterfaceExists("azurerm_network_interface.test1"), - testCheckAzureRMNetworkInterfaceExists("azurerm_network_interface.test2"), + testCheckAzureRMNetworkInterfaceExists(data.ResourceName), ), }, + data.ImportStep(), }, }) } -func TestAccAzureRMNetworkInterface_importPublicIP(t *testing.T) { +func TestAccAzureRMNetworkInterface_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_interface", "test") - resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMNetworkInterface_publicIP(data), + Config: testAccAzureRMNetworkInterface_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceExists(data.ResourceName), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMNetworkInterface_multipleIPConfigurations(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceExists(data.ResourceName), + ), }, data.ImportStep(), }, @@ -335,11 +363,7 @@ func testCheckAzureRMNetworkInterfaceExists(resourceName string) resource.TestCh } name := rs.Primary.Attributes["name"] - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for availability set: %q", name) - } - + resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, name, "") if err != nil { if utils.ResponseWasNotFound(resp.Response) { @@ -365,10 +389,7 @@ func testCheckAzureRMNetworkInterfaceDisappears(resourceName string) resource.Te } name := rs.Primary.Attributes["name"] - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for availability set: %q", name) - } + resourceGroup := rs.Primary.Attributes["resource_group_name"] future, err := client.Delete(ctx, resourceGroup, name) if err != nil { @@ -411,580 +432,350 @@ func testCheckAzureRMNetworkInterfaceDestroy(s *terraform.State) error { } func testAccAzureRMNetworkInterface_basic(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterface_template(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "testsubnet" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" -} +%s resource "azurerm_network_interface" "test" { name = "acctestni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" + name = "primary" + subnet_id = azurerm_subnet.test.id private_ip_address_allocation = "Dynamic" } } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) +`, template, data.RandomInteger) } -func testAccAzureRMNetworkInterface_requiresImport(data acceptance.TestData) string { - template := testAccAzureRMNetworkInterface_basic(data) +func testAccAzureRMNetworkInterface_dnsServers(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterface_template(data) return fmt.Sprintf(` %s -resource "azurerm_network_interface" "import" { - name = "${azurerm_network_interface.test.name}" - location = "${azurerm_network_interface.test.location}" - resource_group_name = "${azurerm_network_interface.test.resource_group_name}" +resource "azurerm_network_interface" "test" { + name = "acctestni-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + + dns_servers = [ + "10.0.0.5", + "10.0.0.6" + ] ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" + name = "primary" + subnet_id = azurerm_subnet.test.id private_ip_address_allocation = "Dynamic" } } -`, template) +`, template, data.RandomInteger) } -func testAccAzureRMNetworkInterface_basicWithNetworkSecurityGroup(data acceptance.TestData) string { +func testAccAzureRMNetworkInterface_dnsServersUpdated(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterface_template(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "testsubnet" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" -} - -resource "azurerm_network_security_group" "test" { - name = "acctestnsg-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} +%s resource "azurerm_network_interface" "test" { - name = "acctestni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - network_security_group_id = "${azurerm_network_security_group.test.id}" + name = "acctestni-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + + dns_servers = [ + "10.0.0.6", + "10.0.0.5" + ] ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" + name = "primary" + subnet_id = azurerm_subnet.test.id private_ip_address_allocation = "Dynamic" } } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, template, data.RandomInteger) } -func testAccAzureRMNetworkInterface_multipleSubnets(data acceptance.TestData) string { +func testAccAzureRMNetworkInterface_enableAcceleratedNetworking(data acceptance.TestData, enabled bool) string { + template := testAccAzureRMNetworkInterface_template(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "testsubnet" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" -} +%s resource "azurerm_network_interface" "test" { - name = "acctestni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - primary = true - } + name = "acctestni-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + enable_accelerated_networking = %t ip_configuration { - name = "testconfiguration2" - subnet_id = "${azurerm_subnet.test.id}" + name = "primary" + subnet_id = azurerm_subnet.test.id private_ip_address_allocation = "Dynamic" } } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) +`, template, data.RandomInteger, enabled) } -func testAccAzureRMNetworkInterface_multipleSubnetsUpdatedPrimary(data acceptance.TestData) string { +func testAccAzureRMNetworkInterface_enableIPForwarding(data acceptance.TestData, enabled bool) string { + template := testAccAzureRMNetworkInterface_template(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "testsubnet" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" -} +%s resource "azurerm_network_interface" "test" { - name = "acctestni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration2" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - primary = true - } + name = "acctestni-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + enable_ip_forwarding = %t ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" + name = "primary" + subnet_id = azurerm_subnet.test.id private_ip_address_allocation = "Dynamic" } } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) +`, template, data.RandomInteger, enabled) } -func testAccAzureRMNetworkInterface_ipForwarding(data acceptance.TestData) string { +func testAccAzureRMNetworkInterface_internalDomainNameLabel(data acceptance.TestData, suffix string) string { + template := testAccAzureRMNetworkInterface_template(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "testsubnet" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" -} +%s resource "azurerm_network_interface" "test" { - name = "acctestni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - enable_ip_forwarding = true + name = "acctestni-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + internal_dns_name_label = "acctestni-%s-%s" ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" + name = "primary" + subnet_id = azurerm_subnet.test.id private_ip_address_allocation = "Dynamic" } } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) +`, template, data.RandomInteger, suffix, data.RandomString) } -func testAccAzureRMNetworkInterface_acceleratedNetworking(data acceptance.TestData) string { +func testAccAzureRMNetworkInterface_ipv6(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterface_template(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "testsubnet" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" -} +%s resource "azurerm_network_interface" "test" { - name = "acctestni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - enable_ip_forwarding = false - enable_accelerated_networking = true + name = "acctestni-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" + name = "primary" + subnet_id = azurerm_subnet.test.id private_ip_address_allocation = "Dynamic" + primary = true } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) -} -func testAccAzureRMNetworkInterface_withTags(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" + ip_configuration { + name = "secondary" + private_ip_address_allocation = "Dynamic" + private_ip_address_version = "IPv6" + } } - -resource "azurerm_virtual_network" "test" { - name = "acctestvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" +`, template, data.RandomInteger) } -resource "azurerm_subnet" "test" { - name = "testsubnet" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" -} +func testAccAzureRMNetworkInterface_multipleIPConfigurations(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterface_template(data) + return fmt.Sprintf(` +%s resource "azurerm_network_interface" "test" { name = "acctestni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" + name = "primary" + subnet_id = azurerm_subnet.test.id private_ip_address_allocation = "Dynamic" + primary = true } - tags = { - environment = "Production" - cost_center = "MSFT" + ip_configuration { + name = "secondary" + subnet_id = azurerm_subnet.test.id + private_ip_address_allocation = "Dynamic" } } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) +`, template, data.RandomInteger) } -func testAccAzureRMNetworkInterface_withTagsUpdate(data acceptance.TestData) string { +func testAccAzureRMNetworkInterface_multipleIPConfigurationsSecondaryAsPrimary(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterface_template(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "testsubnet" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" -} +%s resource "azurerm_network_interface" "test" { name = "acctestni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" + name = "primary" + subnet_id = azurerm_subnet.test.id private_ip_address_allocation = "Dynamic" } - tags = { - environment = "staging" + ip_configuration { + name = "secondary" + subnet_id = azurerm_subnet.test.id + private_ip_address_allocation = "Dynamic" + primary = true } } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) +`, template, data.RandomInteger) } -func testAccAzureRMNetworkInterface_withIPAddresses(data acceptance.TestData) string { +func testAccAzureRMNetworkInterface_publicIP(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterface_publicIPTemplate(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "testsubnet" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" -} - -resource "azurerm_public_ip" "test" { - name = "test-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - allocation_method = "Static" - domain_name_label = "${azurerm_resource_group.test.name}" -} +%s resource "azurerm_network_interface" "test" { name = "acctestni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Static" - private_ip_address = "10.0.2.9" - public_ip_address_id = "${azurerm_public_ip.test.id}" + name = "primary" + subnet_id = azurerm_subnet.test.id + private_ip_address_allocation = "Dynamic" + public_ip_address_id = azurerm_public_ip.test.id } } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, template, data.RandomInteger) } -func testAccAzureRMNetworkInterface_withIPAddressesUpdate(data acceptance.TestData) string { +func testAccAzureRMNetworkInterface_publicIPRemoved(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterface_publicIPTemplate(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "testsubnet" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" -} - -resource "azurerm_public_ip" "test" { - name = "test-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - allocation_method = "Static" - domain_name_label = "${azurerm_resource_group.test.name}" -} +%s resource "azurerm_network_interface" "test" { name = "acctestni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" + name = "primary" + subnet_id = azurerm_subnet.test.id private_ip_address_allocation = "Dynamic" } } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, template, data.RandomInteger) } -func testAccAzureRMNetworkInterface_withIPv6Addresses(data acceptance.TestData) string { +func testAccAzureRMNetworkInterface_publicIPTemplate(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterface_template(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "testsubnet" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" -} +%s resource "azurerm_public_ip" "test" { - name = "test-%d" + name = "acctestpublicip-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" allocation_method = "Static" - domain_name_label = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_network_interface" "test" { - name = "acctestni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "dynamic" - primary = true - } - - ip_configuration { - name = "testconfiguration2" - private_ip_address_version = "IPv6" - private_ip_address_allocation = "dynamic" - } } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, template, data.RandomInteger) } -func testAccAzureRMNetworkInterface_bug7986(data acceptance.TestData) string { +func testAccAzureRMNetworkInterface_requiresImport(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterface_basic(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctest-%d" - location = "%s" -} +%s -resource "azurerm_network_security_group" "test" { - name = "acctest-%d-nsg" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" +resource "azurerm_network_interface" "import" { + name = azurerm_network_interface.test.name + location = azurerm_network_interface.test.location + resource_group_name = azurerm_network_interface.test.resource_group_name - tags = { - environment = "Production" + ip_configuration { + name = "primary" + subnet_id = azurerm_subnet.test.id + private_ip_address_allocation = "Dynamic" } } - -resource "azurerm_network_security_rule" "test1" { - name = "test1" - priority = 101 - direction = "Outbound" - access = "Allow" - protocol = "Tcp" - source_port_range = "*" - destination_port_range = "*" - source_address_prefix = "*" - destination_address_prefix = "*" - resource_group_name = "${azurerm_resource_group.test.name}" - network_security_group_name = "${azurerm_network_security_group.test.name}" +`, template) } -resource "azurerm_network_security_rule" "test2" { - name = "test2" - priority = 102 - direction = "Outbound" - access = "Allow" - protocol = "Tcp" - source_port_range = "*" - destination_port_range = "*" - source_address_prefix = "*" - destination_address_prefix = "*" - resource_group_name = "${azurerm_resource_group.test.name}" - network_security_group_name = "${azurerm_network_security_group.test.name}" -} +func testAccAzureRMNetworkInterface_static(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterface_template(data) + return fmt.Sprintf(` +%s -resource "azurerm_public_ip" "test" { - name = "acctest-%d-pip" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - allocation_method = "Dynamic" +resource "azurerm_network_interface" "test" { + name = "acctestni-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name - tags = { - environment = "Production" + ip_configuration { + name = "primary" + subnet_id = azurerm_subnet.test.id + private_ip_address_allocation = "Static" + private_ip_address = "10.0.2.15" } } - -resource "azurerm_virtual_network" "test" { - name = "acctest-%d-vn" - address_space = ["10.0.0.0/16"] - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" +`, template, data.RandomInteger) } -resource "azurerm_subnet" "test" { - name = "first" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" -} +func testAccAzureRMNetworkInterface_tags(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterface_template(data) + return fmt.Sprintf(` +%s -resource "azurerm_network_interface" "test1" { - name = "acctest-%d-nic1" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" +resource "azurerm_network_interface" "test" { + name = "acctestni-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" + name = "primary" + subnet_id = azurerm_subnet.test.id private_ip_address_allocation = "Dynamic" } tags = { - environment = "staging" + Hello = "World" } } +`, template, data.RandomInteger) +} -resource "azurerm_network_interface" "test2" { - name = "acctest-%d-nic2" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" +func testAccAzureRMNetworkInterface_tagsUpdated(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterface_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_network_interface" "test" { + name = "acctestni-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" + name = "primary" + subnet_id = azurerm_subnet.test.id private_ip_address_allocation = "Dynamic" } tags = { - environment = "staging" + Hello = "World" + Elephants = "Five" } } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, template, data.RandomInteger) } -func testAccAzureRMNetworkInterface_publicIP(data acceptance.TestData) string { +func testAccAzureRMNetworkInterface_template(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" @@ -993,36 +784,16 @@ resource "azurerm_resource_group" "test" { resource "azurerm_virtual_network" "test" { name = "acctestvn-%d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { - name = "testsubnet" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" + name = "internal" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name address_prefix = "10.0.2.0/24" } - -resource "azurerm_public_ip" "testext" { - name = "acctestip-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - allocation_method = "Static" -} - -resource "azurerm_network_interface" "test" { - name = "acctestnic-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - public_ip_address_id = "${azurerm_public_ip.testext.id}" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } diff --git a/website/docs/r/network_interface.html.markdown b/website/docs/r/network_interface.html.markdown index d2045d5c50d6b..97e05d62d827f 100644 --- a/website/docs/r/network_interface.html.markdown +++ b/website/docs/r/network_interface.html.markdown @@ -3,50 +3,46 @@ subcategory: "Network" layout: "azurerm" page_title: "Azure Resource Manager: azurerm_network_interface" description: |- - Manages a Network Interface located in a Virtual Network, usually attached to a Virtual Machine. + Manages a Network Interface. --- # azurerm_network_interface -Manages a Network Interface located in a Virtual Network, usually attached to a Virtual Machine. +Manages a Network Interface. ## Example Usage ```hcl resource "azurerm_resource_group" "example" { - name = "acceptanceTestResourceGroup1" - location = "West US" + name = "example-resources" + location = "West Europe" } resource "azurerm_virtual_network" "example" { - name = "acceptanceTestVirtualNetwork1" + name = "example-network" address_space = ["10.0.0.0/16"] location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name } resource "azurerm_subnet" "example" { - name = "testsubnet" + name = "internal" resource_group_name = azurerm_resource_group.example.name virtual_network_name = azurerm_virtual_network.example.name address_prefix = "10.0.2.0/24" } resource "azurerm_network_interface" "example" { - name = "acceptanceTestNetworkInterface1" + name = "example-nic" location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name ip_configuration { - name = "testconfiguration1" + name = "internal" subnet_id = azurerm_subnet.example.id private_ip_address_allocation = "Dynamic" } - - tags = { - environment = "staging" - } } ``` @@ -54,54 +50,79 @@ resource "azurerm_network_interface" "example" { The following arguments are supported: -* `name` - (Required) The name of the network interface. Changing this forces a new resource to be created. +* `ip_configuration` - (Required) One or more `ip_configuration` blocks as defined below. + +* `location` - (Required) The location where the Network Interface should exist. Changing this forces a new resource to be created. -* `resource_group_name` - (Required) The name of the resource group in which to create the network interface. Changing this forces a new resource to be created. +* `name` - (Required) The name of the Network Interface. Changing this forces a new resource to be created. -* `location` - (Required) The location/region where the network interface is created. Changing this forces a new resource to be created. +* `resource_group_name` - (Required) The name of the Resource Group in which to create the Network Interface. Changing this forces a new resource to be created. + +--- -* `network_security_group_id` - (Optional) The ID of the Network Security Group to associate with the network interface. +* `dns_servers` - (Optional) A list of IP Addresses defining the DNS Servers which should be used for this Network Interface. -* `internal_dns_name_label` - (Optional) Relative DNS name for this NIC used for internal communications between VMs in the same VNet +-> **Note:** Configuring DNS Servers on the Network Interface will override the DNS Servers defined on the Virtual Network. -* `enable_ip_forwarding` - (Optional) Enables IP Forwarding on the NIC. Defaults to `false`. +* `enable_ip_forwarding` - (Optional) Should IP Forwarding be enabled? Defaults to `false`. -* `enable_accelerated_networking` - (Optional) Enables Azure Accelerated Networking using SR-IOV. Only certain VM instance sizes are supported. Refer to [Create a Virtual Machine with Accelerated Networking](https://docs.microsoft.com/en-us/azure/virtual-network/create-vm-accelerated-networking-cli). Defaults to `false`. +* `enable_accelerated_networking` - (Optional) Should Accelerated Networking be enabled? Defaults to `false`. -~> **NOTE:** when using Accelerated Networking in an Availability Set - the Availability Set must be deployed on an Accelerated Networking enabled cluster. +-> **Note:** Only certain Virtual Machine sizes are supported for Accelerated Networking - [more information can be found in this document](https://docs.microsoft.com/en-us/azure/virtual-network/create-vm-accelerated-networking-cli). -* `dns_servers` - (Optional) List of DNS servers IP addresses to use for this NIC, overrides the VNet-level server list +-> **Note:** To use Accelerated Networking in an Availability Set, the Availability Set must be deployed onto an Accelerated Networking enabled cluster. -* `ip_configuration` - (Required) One or more `ip_configuration` associated with this NIC as documented below. +* `internal_dns_name_label` - (Optional) The (relative) DNS Name used for internal communications between Virtual Machines in the same Virtual Network. * `tags` - (Optional) A mapping of tags to assign to the resource. -The `ip_configuration` block supports: +--- -* `name` - (Required) User-defined name of the IP. +The `ip_configuration` block supports the following: -* `subnet_id` - (Optional) Reference to a subnet in which this NIC has been created. Required when `private_ip_address_version` is IPv4. +* `name` - (Required) A name used for this IP Configuration. -* `private_ip_address` - (Optional) Static IP Address. +* `subnet_id` - (Optional) The ID of the Subnet where this Network Interface should be located in. -* `private_ip_address_allocation` - (Required) Defines how a private IP address is assigned. Options are Static or Dynamic. +-> **Note:** This is required when `private_ip_address_version` is set to `IPv4`. * `private_ip_address_version` - (Optional) The IP Version to use. Possible values are `IPv4` or `IPv6`. Defaults to `IPv4`. +* `private_ip_address_allocation` - (Required) The allocation method used for the Private IP Address. Possible values are `Dynamic` and `Static`. + +~> **Note:** Azure does not assign a Dynamic IP Address until the Network Interface is attached to a running Virtual Machine (or other resource) + * `public_ip_address_id` - (Optional) Reference to a Public IP Address to associate with this NIC -* `primary` - (Optional) Is this the Primary Network Interface? If set to `true` this should be the first `ip_configuration` in the array. +* `primary` - (Optional) Is this the Primary IP Configuration? Must be `true` for the first `ip_configuration` when multiple are specified. Defaults to `false`. + +When `private_ip_address_allocation` is set to `Static` the following fields can be configured: + +* `private_ip_address` - (Optional) The Static IP Address which should be used. + +When `private_ip_address_version` is set to `IPv4` the following fields can be configured: + +* `subnet_id` - (Required) The ID of the Subnet where this Network Interface should be located in. ## Attributes Reference The following attributes are exported: +* `applied_dns_servers` - If the Virtual Machine using this Network Interface is part of an Availability Set, then this list will have the union of all DNS servers from all Network Interfaces that are part of the Availability Set. + * `id` - The ID of the Network Interface. -* `mac_address` - The media access control (MAC) address of the network interface. + +* `mac_address` - The Media Access Control (MAC) Address of the Network Interface. + * `private_ip_address` - The first private IP address of the network interface. + +~> **Note:** If a `Dynamic` allocation method is used Azure will not allocate an IP Address until the Network Interface is attached to a running resource (such as a Virtual Machine). + * `private_ip_addresses` - The private IP addresses of the network interface. -* `virtual_machine_id` - Reference to a VM with which this NIC has been associated. -* `applied_dns_servers` - If the VM that uses this NIC is part of an Availability Set, then this list will have the union of all DNS servers from all NICs that are part of the Availability Set + +~> **Note:** If a `Dynamic` allocation method is used Azure will not allocate an IP Address until the Network Interface is attached to a running resource (such as a Virtual Machine). + +* `virtual_machine_id` - The ID of the Virtual Machine which this Network Interface is connected to. ## Timeouts From 3ececb9672b0033770c6b19c7a7ea985bbab8839 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 17 Feb 2020 11:18:02 +0100 Subject: [PATCH 148/498] r/network_interface: conditionally updating the nics only for ipv4 configurations --- .../services/network/network_interface.go | 134 ++++++++++++++++++ .../network/resource_arm_network_interface.go | 124 ---------------- 2 files changed, 134 insertions(+), 124 deletions(-) create mode 100644 azurerm/internal/services/network/network_interface.go diff --git a/azurerm/internal/services/network/network_interface.go b/azurerm/internal/services/network/network_interface.go new file mode 100644 index 0000000000000..dd29bb6aa188e --- /dev/null +++ b/azurerm/internal/services/network/network_interface.go @@ -0,0 +1,134 @@ +package network + +import ( + "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-09-01/network" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +type networkInterfaceUpdateInformation struct { + applicationGatewayBackendAddressPoolIDs []string + applicationSecurityGroupIDs []string + loadBalancerBackendAddressPoolIDs []string + loadBalancerInboundNatRuleIDs []string + networkSecurityGroupID string +} + +func parseFieldsFromNetworkInterface(input network.InterfacePropertiesFormat) networkInterfaceUpdateInformation { + networkSecurityGroupId := "" + if input.NetworkSecurityGroup != nil && input.NetworkSecurityGroup.ID != nil { + networkSecurityGroupId = *input.NetworkSecurityGroup.ID + } + + var mapToSlice = func(input map[string]struct{}) []string { + output := make([]string, 0) + + for id, _ := range input { + output = append(output, id) + } + + return output + } + + applicationSecurityGroupIds := make(map[string]struct{}, 0) + applicationGatewayBackendAddressPoolIds := make(map[string]struct{}, 0) + loadBalancerBackendAddressPoolIds := make(map[string]struct{}, 0) + loadBalancerInboundNatRuleIds := make(map[string]struct{}, 0) + + if input.IPConfigurations != nil { + for _, v := range *input.IPConfigurations { + if v.InterfaceIPConfigurationPropertiesFormat == nil { + continue + } + + props := *v.InterfaceIPConfigurationPropertiesFormat + if props.ApplicationSecurityGroups != nil { + for _, asg := range *props.ApplicationSecurityGroups { + if asg.ID != nil { + applicationSecurityGroupIds[*asg.ID] = struct{}{} + } + } + } + + if props.ApplicationGatewayBackendAddressPools != nil { + for _, pool := range *props.ApplicationGatewayBackendAddressPools { + if pool.ID != nil { + applicationGatewayBackendAddressPoolIds[*pool.ID] = struct{}{} + } + } + } + + if props.LoadBalancerBackendAddressPools != nil { + for _, pool := range *props.LoadBalancerBackendAddressPools { + if pool.ID != nil { + loadBalancerBackendAddressPoolIds[*pool.ID] = struct{}{} + } + } + } + + if props.LoadBalancerInboundNatRules != nil { + for _, rule := range *props.LoadBalancerInboundNatRules { + if rule.ID != nil { + loadBalancerInboundNatRuleIds[*rule.ID] = struct{}{} + } + } + } + } + } + + return networkInterfaceUpdateInformation{ + applicationGatewayBackendAddressPoolIDs: mapToSlice(applicationGatewayBackendAddressPoolIds), + applicationSecurityGroupIDs: mapToSlice(applicationSecurityGroupIds), + loadBalancerBackendAddressPoolIDs: mapToSlice(loadBalancerBackendAddressPoolIds), + loadBalancerInboundNatRuleIDs: mapToSlice(loadBalancerInboundNatRuleIds), + networkSecurityGroupID: networkSecurityGroupId, + } +} + +func mapFieldsToNetworkInterface(input *[]network.InterfaceIPConfiguration, info networkInterfaceUpdateInformation) *[]network.InterfaceIPConfiguration { + output := input + + applicationSecurityGroups := make([]network.ApplicationSecurityGroup, 0) + for _, id := range info.applicationSecurityGroupIDs { + applicationSecurityGroups = append(applicationSecurityGroups, network.ApplicationSecurityGroup{ + ID: utils.String(id), + }) + } + + applicationGatewayBackendAddressPools := make([]network.ApplicationGatewayBackendAddressPool, 0) + for _, id := range info.applicationGatewayBackendAddressPoolIDs { + applicationGatewayBackendAddressPools = append(applicationGatewayBackendAddressPools, network.ApplicationGatewayBackendAddressPool{ + ID: utils.String(id), + }) + } + + loadBalancerBackendAddressPools := make([]network.BackendAddressPool, 0) + for _, id := range info.loadBalancerBackendAddressPoolIDs { + loadBalancerBackendAddressPools = append(loadBalancerBackendAddressPools, network.BackendAddressPool{ + ID: utils.String(id), + }) + } + + loadBalancerInboundNatRules := make([]network.InboundNatRule, 0) + for _, id := range info.loadBalancerInboundNatRuleIDs { + loadBalancerInboundNatRules = append(loadBalancerInboundNatRules, network.InboundNatRule{ + ID: utils.String(id), + }) + } + + for _, config := range *output { + if config.InterfaceIPConfigurationPropertiesFormat == nil { + continue + } + + if config.InterfaceIPConfigurationPropertiesFormat.PrivateIPAddressVersion != network.IPv4 { + continue + } + + config.ApplicationSecurityGroups = &applicationSecurityGroups + config.ApplicationGatewayBackendAddressPools = &applicationGatewayBackendAddressPools + config.LoadBalancerBackendAddressPools = &loadBalancerBackendAddressPools + config.LoadBalancerInboundNatRules = &loadBalancerInboundNatRules + } + + return output +} diff --git a/azurerm/internal/services/network/resource_arm_network_interface.go b/azurerm/internal/services/network/resource_arm_network_interface.go index 899d4bbfba607..92f606503b841 100644 --- a/azurerm/internal/services/network/resource_arm_network_interface.go +++ b/azurerm/internal/services/network/resource_arm_network_interface.go @@ -655,127 +655,3 @@ func flattenNetworkInterfaceDnsServers(input *[]string) []string { } return output } - -type networkInterfaceUpdateInformation struct { - applicationGatewayBackendAddressPoolIDs []string - applicationSecurityGroupIDs []string - loadBalancerBackendAddressPoolIDs []string - loadBalancerInboundNatRuleIDs []string - networkSecurityGroupID string -} - -func parseFieldsFromNetworkInterface(input network.InterfacePropertiesFormat) networkInterfaceUpdateInformation { - networkSecurityGroupId := "" - if input.NetworkSecurityGroup != nil && input.NetworkSecurityGroup.ID != nil { - networkSecurityGroupId = *input.NetworkSecurityGroup.ID - } - - var mapToSlice = func(input map[string]struct{}) []string { - output := make([]string, 0) - - for id, _ := range input { - output = append(output, id) - } - - return output - } - - applicationSecurityGroupIds := make(map[string]struct{}, 0) - applicationGatewayBackendAddressPoolIds := make(map[string]struct{}, 0) - loadBalancerBackendAddressPoolIds := make(map[string]struct{}, 0) - loadBalancerInboundNatRuleIds := make(map[string]struct{}, 0) - - if input.IPConfigurations != nil { - for _, v := range *input.IPConfigurations { - if v.InterfaceIPConfigurationPropertiesFormat == nil { - continue - } - - props := *v.InterfaceIPConfigurationPropertiesFormat - if props.ApplicationSecurityGroups != nil { - for _, asg := range *props.ApplicationSecurityGroups { - if asg.ID != nil { - applicationSecurityGroupIds[*asg.ID] = struct{}{} - } - } - } - - if props.ApplicationGatewayBackendAddressPools != nil { - for _, pool := range *props.ApplicationGatewayBackendAddressPools { - if pool.ID != nil { - applicationGatewayBackendAddressPoolIds[*pool.ID] = struct{}{} - } - } - } - - if props.LoadBalancerBackendAddressPools != nil { - for _, pool := range *props.LoadBalancerBackendAddressPools { - if pool.ID != nil { - loadBalancerBackendAddressPoolIds[*pool.ID] = struct{}{} - } - } - } - - if props.LoadBalancerInboundNatRules != nil { - for _, rule := range *props.LoadBalancerInboundNatRules { - if rule.ID != nil { - loadBalancerInboundNatRuleIds[*rule.ID] = struct{}{} - } - } - } - } - } - - return networkInterfaceUpdateInformation{ - applicationGatewayBackendAddressPoolIDs: mapToSlice(applicationGatewayBackendAddressPoolIds), - applicationSecurityGroupIDs: mapToSlice(applicationSecurityGroupIds), - loadBalancerBackendAddressPoolIDs: mapToSlice(loadBalancerBackendAddressPoolIds), - loadBalancerInboundNatRuleIDs: mapToSlice(loadBalancerInboundNatRuleIds), - networkSecurityGroupID: networkSecurityGroupId, - } -} - -func mapFieldsToNetworkInterface(input *[]network.InterfaceIPConfiguration, info networkInterfaceUpdateInformation) *[]network.InterfaceIPConfiguration { - output := input - - applicationSecurityGroups := make([]network.ApplicationSecurityGroup, 0) - for _, id := range info.applicationSecurityGroupIDs { - applicationSecurityGroups = append(applicationSecurityGroups, network.ApplicationSecurityGroup{ - ID: utils.String(id), - }) - } - - applicationGatewayBackendAddressPools := make([]network.ApplicationGatewayBackendAddressPool, 0) - for _, id := range info.applicationGatewayBackendAddressPoolIDs { - applicationGatewayBackendAddressPools = append(applicationGatewayBackendAddressPools, network.ApplicationGatewayBackendAddressPool{ - ID: utils.String(id), - }) - } - - loadBalancerBackendAddressPools := make([]network.BackendAddressPool, 0) - for _, id := range info.loadBalancerBackendAddressPoolIDs { - loadBalancerBackendAddressPools = append(loadBalancerBackendAddressPools, network.BackendAddressPool{ - ID: utils.String(id), - }) - } - - loadBalancerInboundNatRules := make([]network.InboundNatRule, 0) - for _, id := range info.loadBalancerInboundNatRuleIDs { - loadBalancerInboundNatRules = append(loadBalancerInboundNatRules, network.InboundNatRule{ - ID: utils.String(id), - }) - } - - for _, config := range *output { - if config.InterfaceIPConfigurationPropertiesFormat == nil { - continue - } - - config.ApplicationSecurityGroups = &applicationSecurityGroups - config.ApplicationGatewayBackendAddressPools = &applicationGatewayBackendAddressPools - config.LoadBalancerBackendAddressPools = &loadBalancerBackendAddressPools - config.LoadBalancerInboundNatRules = &loadBalancerInboundNatRules - } - - return output -} From f22151a876a5de465164acf5b291d7104de7d866 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 17 Feb 2020 11:22:02 +0100 Subject: [PATCH 149/498] r/network_interface_application_gateway_association: fixing the tests --- ..._network_interface_application_gateway_association_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_application_gateway_association_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_application_gateway_association_test.go index f2dad35421cd7..2c02e84760305 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_application_gateway_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_application_gateway_association_test.go @@ -223,7 +223,7 @@ resource "azurerm_network_interface" "test" { ip_configuration { name = "testconfiguration1" - subnet_id = "${azurerm_subnet.frontend.id}" + subnet_id = "${azurerm_subnet.backend.id}" private_ip_address_allocation = "Dynamic" } } @@ -261,7 +261,7 @@ resource "azurerm_network_interface" "test" { ip_configuration { name = "testconfiguration1" - subnet_id = "${azurerm_subnet.frontend.id}" + subnet_id = "${azurerm_subnet.backend.id}" private_ip_address_allocation = "Dynamic" primary = true } From b751e18bf8920fa679ae19a8803c2d7cc867ceea Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 17 Feb 2020 11:27:40 +0100 Subject: [PATCH 150/498] Update azurerm/internal/services/mariadb/resource_arm_mariadb_server.go --- .../internal/services/mariadb/resource_arm_mariadb_server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/mariadb/resource_arm_mariadb_server.go b/azurerm/internal/services/mariadb/resource_arm_mariadb_server.go index 0b8fefbcd8847..e6329f8d340e5 100644 --- a/azurerm/internal/services/mariadb/resource_arm_mariadb_server.go +++ b/azurerm/internal/services/mariadb/resource_arm_mariadb_server.go @@ -186,7 +186,7 @@ func resourceArmMariaDbServerCreateUpdate(d *schema.ResourceData, meta interface sku, err := expandServerSkuName(d.Get("sku_name").(string)) if err != nil { - return fmt.Errorf("error expanding sku_name for PostgreSQL Server %q (Resource Group %q): %v", name, resourceGroup, err) + return fmt.Errorf("error expanding sku_name for MariaDB Server %q (Resource Group %q): %v", name, resourceGroup, err) } skuName := sku.Name From 6e2924e5bb90a7d47555153b2ebe7d0d10fe5786 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 17 Feb 2020 11:28:21 +0100 Subject: [PATCH 151/498] updating to include #5777 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec7b41bad612d..2f7708a81118e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ BREAKING CHANGES: * `azurerm_kubernetes_cluster` - updating the default value for `load_balancer_sku` to `Standard` from `Basic` [GH-5747] * `azurerm_log_analytics_workspace_linked_service` - This resource has been removed since it was deprecated [GH-5754] * `azurerm_maps_account` - the `sku_name` field is now case-sensitive [GH-5776] +* `azurerm_mariadb_server` - removing the `sku` block since it's been deprecated in favour of the `sku_name` field [GH-5777] * `azurerm_mssql_elasticpool` - removing the deprecated `elastic_pool_properties` block [GH-5744] * `azurerm_notification_hub_namesapce` - removing the `sku` block in favour of the `sku_name` argument [GH-5722] * `azurerm_postgresql_server` - removing the `sku` block which has been deprecated in favour of the `sku_name` field [GH-5721] From 346e89d85771beae939f0b72ce228d6591bb0076 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Mon, 17 Feb 2020 10:45:47 +0000 Subject: [PATCH 152/498] caught additional 2.0 todos --- .../resource_arm_automation_account.go | 67 ++----------------- .../resource_arm_automation_credential.go | 29 ++------ .../resource_arm_automation_runbook.go | 6 +- .../resource_arm_automation_schedule.go | 48 ++----------- 4 files changed, 17 insertions(+), 133 deletions(-) diff --git a/azurerm/internal/services/automation/resource_arm_automation_account.go b/azurerm/internal/services/automation/resource_arm_automation_account.go index bc04ffee144b9..ed612228403b2 100644 --- a/azurerm/internal/services/automation/resource_arm_automation_account.go +++ b/azurerm/internal/services/automation/resource_arm_automation_account.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" @@ -47,34 +46,9 @@ func resourceArmAutomationAccount() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), - // Remove in 2.0 - "sku": { - Type: schema.TypeList, - Optional: true, - Computed: true, - Deprecated: "This property has been deprecated in favour of the 'sku_name' property and will be removed in version 2.0 of the provider", - ConflictsWith: []string{"sku_name"}, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Optional: true, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validation.StringInSlice([]string{ - string(automation.Basic), - string(automation.Free), - }, true), - }, - }, - }, - }, - "sku_name": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ConflictsWith: []string{"sku"}, + Type: schema.TypeString, + Required: true, ValidateFunc: validation.StringInSlice([]string{ string(automation.Basic), string(automation.Free), @@ -104,25 +78,8 @@ func resourceArmAutomationAccountCreateUpdate(d *schema.ResourceData, meta inter ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() - // Remove in 2.0 - var sku automation.Sku - - if inputs := d.Get("sku").([]interface{}); len(inputs) != 0 { - input := inputs[0].(map[string]interface{}) - v := input["name"].(string) - - sku = automation.Sku{ - Name: automation.SkuNameEnum(v), - } - } else { - // Keep in 2.0 - sku = automation.Sku{ - Name: automation.SkuNameEnum(d.Get("sku_name").(string)), - } - } - - if sku.Name == "" { - return fmt.Errorf("either 'sku_name' or 'sku' must be defined in the configuration file") + sku := automation.Sku{ + Name: automation.SkuNameEnum(d.Get("sku_name").(string)), } log.Printf("[INFO] preparing arguments for Automation Account create/update.") @@ -214,11 +171,6 @@ func resourceArmAutomationAccountRead(d *schema.ResourceData, meta interface{}) } if sku := resp.Sku; sku != nil { - // Remove in 2.0 - if err := d.Set("sku", flattenAutomationAccountSku(sku)); err != nil { - return fmt.Errorf("Error setting 'sku': %+v", err) - } - if err := d.Set("sku_name", string(sku.Name)); err != nil { return fmt.Errorf("Error setting 'sku_name': %+v", err) } @@ -263,14 +215,3 @@ func resourceArmAutomationAccountDelete(d *schema.ResourceData, meta interface{} return nil } - -// Remove in 2.0 -func flattenAutomationAccountSku(sku *automation.Sku) []interface{} { - if sku == nil { - return []interface{}{} - } - - result := map[string]interface{}{} - result["name"] = string(sku.Name) - return []interface{}{result} -} diff --git a/azurerm/internal/services/automation/resource_arm_automation_credential.go b/azurerm/internal/services/automation/resource_arm_automation_credential.go index 13d9a8040d09d..de4a7570f0646 100644 --- a/azurerm/internal/services/automation/resource_arm_automation_credential.go +++ b/azurerm/internal/services/automation/resource_arm_automation_credential.go @@ -42,24 +42,11 @@ func resourceArmAutomationCredential() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), - //this is AutomationAccountName in the SDK - "account_name": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ForceNew: true, - Deprecated: "account_name has been renamed to automation_account_name for clarity and to match the azure API", - ConflictsWith: []string{"automation_account_name"}, - ValidateFunc: azure.ValidateAutomationAccountName(), - }, - "automation_account_name": { - Type: schema.TypeString, - Optional: true, //todo change to required once account_name has been removed - Computed: true, // todo remove once account_name has been removed - ForceNew: true, - ConflictsWith: []string{"account_name"}, // todo remove once account_name has been removed - ValidateFunc: azure.ValidateAutomationAccountName(), + Type: schema.TypeString, + Required: true, //todo change to required once account_name has been removed + ForceNew: true, + ValidateFunc: azure.ValidateAutomationAccountName(), }, "username": { @@ -91,12 +78,7 @@ func resourceArmAutomationCredentialCreateUpdate(d *schema.ResourceData, meta in name := d.Get("name").(string) resGroup := d.Get("resource_group_name").(string) // todo remove this once `account_name` is removed - accountName := "" - if v, ok := d.GetOk("automation_account_name"); ok { - accountName = v.(string) - } else if v, ok := d.GetOk("account_name"); ok { - accountName = v.(string) - } + accountName := d.Get("automation_account_name").(string) if features.ShouldResourcesBeImported() && d.IsNewResource() { existing, err := client.Get(ctx, resGroup, accountName, name) @@ -168,7 +150,6 @@ func resourceArmAutomationCredentialRead(d *schema.ResourceData, meta interface{ d.Set("name", resp.Name) d.Set("resource_group_name", resGroup) d.Set("automation_account_name", accountName) - d.Set("account_name", accountName) if props := resp.CredentialProperties; props != nil { d.Set("username", props.UserName) } diff --git a/azurerm/internal/services/automation/resource_arm_automation_runbook.go b/azurerm/internal/services/automation/resource_arm_automation_runbook.go index 25c01f9f48d88..2edf3bb69747d 100644 --- a/azurerm/internal/services/automation/resource_arm_automation_runbook.go +++ b/azurerm/internal/services/automation/resource_arm_automation_runbook.go @@ -46,7 +46,7 @@ func resourceArmAutomationRunbook() *schema.Resource { ValidateFunc: azure.ValidateAutomationRunbookName(), }, - "account_name": { + "automation_account_name": { Type: schema.TypeString, Required: true, ForceNew: true, @@ -143,7 +143,7 @@ func resourceArmAutomationRunbookCreateUpdate(d *schema.ResourceData, meta inter log.Printf("[INFO] preparing arguments for AzureRM Automation Runbook creation.") name := d.Get("name").(string) - accName := d.Get("account_name").(string) + accName := d.Get("automation_account_name").(string) resGroup := d.Get("resource_group_name").(string) if features.ShouldResourcesBeImported() && d.IsNewResource() { @@ -243,7 +243,7 @@ func resourceArmAutomationRunbookRead(d *schema.ResourceData, meta interface{}) d.Set("location", azure.NormalizeLocation(*location)) } - d.Set("account_name", accName) + d.Set("automation_account_name", accName) if props := resp.RunbookProperties; props != nil { d.Set("log_verbose", props.LogVerbose) d.Set("log_progress", props.LogProgress) diff --git a/azurerm/internal/services/automation/resource_arm_automation_schedule.go b/azurerm/internal/services/automation/resource_arm_automation_schedule.go index dd889645a0b85..da4b12fc03a19 100644 --- a/azurerm/internal/services/automation/resource_arm_automation_schedule.go +++ b/azurerm/internal/services/automation/resource_arm_automation_schedule.go @@ -49,23 +49,11 @@ func resourceArmAutomationSchedule() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), - //this is AutomationAccountName in the SDK - "account_name": { - Type: schema.TypeString, - Optional: true, - Computed: true, - Deprecated: "account_name has been renamed to automation_account_name for clarity and to match the azure API", - ConflictsWith: []string{"automation_account_name"}, - ValidateFunc: azure.ValidateAutomationAccountName(), - }, - "automation_account_name": { - Type: schema.TypeString, - Optional: true, //todo change to required once account_name has been removed - Computed: true, - //ForceNew: true, //todo this needs to come back once account_name has been removed - ConflictsWith: []string{"account_name"}, - ValidateFunc: azure.ValidateAutomationAccountName(), + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: azure.ValidateAutomationAccountName(), }, "frequency": { @@ -206,24 +194,6 @@ func resourceArmAutomationSchedule() *schema.Resource { return fmt.Errorf("`monthly_occurrence` can only be set when frequency is `Month`") } - _, hasAccount := diff.GetOk("automation_account_name") - _, hasAutomationAccountWeb := diff.GetOk("account_name") - if !hasAccount && !hasAutomationAccountWeb { - return fmt.Errorf("`automation_account_name` must be set") - } - - //if automation_account_name changed or account_name changed to or from nil force a new resource - //remove once we remove the deprecated property - oAan, nAan := diff.GetChange("automation_account_name") - if oAan != "" && nAan != "" { - diff.ForceNew("automation_account_name") - } - - oAn, nAn := diff.GetChange("account_name") - if oAn != "" && nAn != "" { - diff.ForceNew("account_name") - } - return nil }, } @@ -238,14 +208,7 @@ func resourceArmAutomationScheduleCreateUpdate(d *schema.ResourceData, meta inte name := d.Get("name").(string) resGroup := d.Get("resource_group_name").(string) - //CustomizeDiff should ensure one of these two is set - // todo remove this once `account_name` is removed - accountName := "" - if v, ok := d.GetOk("automation_account_name"); ok { - accountName = v.(string) - } else if v, ok := d.GetOk("account_name"); ok { - accountName = v.(string) - } + accountName := d.Get("automation_account_name").(string) if features.ShouldResourcesBeImported() && d.IsNewResource() { existing, err := client.Get(ctx, resGroup, accountName, name) @@ -350,7 +313,6 @@ func resourceArmAutomationScheduleRead(d *schema.ResourceData, meta interface{}) d.Set("name", resp.Name) d.Set("resource_group_name", resGroup) d.Set("automation_account_name", accountName) - d.Set("account_name", accountName) // todo remove once `account_name` is removed d.Set("frequency", string(resp.Frequency)) if v := resp.StartTime; v != nil { From 7ca59a3acad25e8783cddbe0a2a85b95e2c8fd85 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Mon, 17 Feb 2020 10:53:00 +0000 Subject: [PATCH 153/498] docs account_name to automation_account_name update --- .../r/automation_certificate.html.markdown | 8 ++--- .../docs/r/automation_runbook.html.markdown | 34 +++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/website/docs/r/automation_certificate.html.markdown b/website/docs/r/automation_certificate.html.markdown index e626a7a0e8086..81be197855532 100644 --- a/website/docs/r/automation_certificate.html.markdown +++ b/website/docs/r/automation_certificate.html.markdown @@ -27,9 +27,9 @@ resource "azurerm_automation_account" "example" { } resource "azurerm_automation_certificate" "example" { - name = "certificate1" - resource_group_name = "${azurerm_resource_group.example.name}" - account_name = "${azurerm_automation_account.example.name}" + name = "certificate1" + resource_group_name = "${azurerm_resource_group.example.name}" + automation_account_name = "${azurerm_automation_account.example.name}" description = "This is an example certificate" base64 = base64encode(file("certificate.pfx")) @@ -44,7 +44,7 @@ The following arguments are supported: * `resource_group_name` - (Required) The name of the resource group in which the Certificate is created. Changing this forces a new resource to be created. -* `account_name` - (Required) The name of the automation account in which the Certificate is created. Changing this forces a new resource to be created. +* `automation_account_name` - (Required) The name of the automation account in which the Certificate is created. Changing this forces a new resource to be created. * `base64` - (Required) Base64 encoded value of the certificate. diff --git a/website/docs/r/automation_runbook.html.markdown b/website/docs/r/automation_runbook.html.markdown index 8fc49bbff75f6..d4e2325ccc556 100644 --- a/website/docs/r/automation_runbook.html.markdown +++ b/website/docs/r/automation_runbook.html.markdown @@ -29,14 +29,14 @@ resource "azurerm_automation_account" "example" { } resource "azurerm_automation_runbook" "example" { - name = "Get-AzureVMTutorial" - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name - account_name = azurerm_automation_account.example.name - log_verbose = "true" - log_progress = "true" - description = "This is an example runbook" - runbook_type = "PowerShellWorkflow" + name = "Get-AzureVMTutorial" + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name + automation_account_name = azurerm_automation_account.example.name + log_verbose = "true" + log_progress = "true" + description = "This is an example runbook" + runbook_type = "PowerShellWorkflow" publish_content_link { uri = "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/c4935ffb69246a6058eb24f54640f53f69d3ac9f/101-automation-runbook-getvms/Runbooks/Get-AzureVMTutorial.ps1" @@ -67,14 +67,14 @@ data "local_file" "example" { } resource "azurerm_automation_runbook" "example" { - name = "Get-AzureVMTutorial" - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name - account_name = azurerm_automation_account.example.name - log_verbose = "true" - log_progress = "true" - description = "This is an example runbook" - runbook_type = "PowerShell" + name = "Get-AzureVMTutorial" + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name + automation_account_name = azurerm_automation_account.example.name + log_verbose = "true" + log_progress = "true" + description = "This is an example runbook" + runbook_type = "PowerShell" publish_content_link { uri = "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/c4935ffb69246a6058eb24f54640f53f69d3ac9f/101-automation-runbook-getvms/Runbooks/Get-AzureVMTutorial.ps1" @@ -94,7 +94,7 @@ The following arguments are supported: * `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. -* `account_name` - (Required) The name of the automation account in which the Runbook is created. Changing this forces a new resource to be created. +* `automation_account_name` - (Required) The name of the automation account in which the Runbook is created. Changing this forces a new resource to be created. * `runbook_type` - (Required) The type of the runbook - can be either `Graph`, `GraphPowerShell`, `GraphPowerShellWorkflow`, `PowerShellWorkflow`, `PowerShell` or `Script`. From e36c347458b707e29afd98d7032f4a13e974d8cb Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 17 Feb 2020 12:04:01 +0100 Subject: [PATCH 154/498] linting --- .../tests/resource_arm_key_vault_key_test.go | 24 +++++++++---------- .../resource_arm_key_vault_secret_test.go | 6 ++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go index b9cf42e1673b8..940cca033a0fa 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go @@ -640,10 +640,10 @@ resource "azurerm_key_vault" "test" { } resource "azurerm_key_vault_key" "test" { - name = "key-%s" - key_vault_id = "${azurerm_key_vault.test.id}" - key_type = "RSA" - key_size = 2048 + name = "key-%s" + key_vault_id = "${azurerm_key_vault.test.id}" + key_type = "RSA" + key_size = 2048 key_opts = [ "encrypt", @@ -698,10 +698,10 @@ resource "azurerm_key_vault" "test" { } resource "azurerm_key_vault_key" "test" { - name = "key-%s" - key_vault_id = "${azurerm_key_vault.test.id}" - key_type = "EC" - curve = "P-521" + name = "key-%s" + key_vault_id = "${azurerm_key_vault.test.id}" + key_type = "EC" + curve = "P-521" key_opts = [ "sign", @@ -753,10 +753,10 @@ resource "azurerm_key_vault" "test" { } resource "azurerm_key_vault_key" "test" { - name = "key-%s" - key_vault_id = "${azurerm_key_vault.test.id}" - key_type = "EC-HSM" - curve = "P-521" + name = "key-%s" + key_vault_id = "${azurerm_key_vault.test.id}" + key_type = "EC-HSM" + curve = "P-521" key_opts = [ "sign", diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go index 693c1a0cccb61..f34f1d82c0841 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go @@ -421,9 +421,9 @@ resource "azurerm_key_vault" "test" { } resource "azurerm_key_vault_secret" "test" { - name = "secret-%s" - value = "szechuan" - key_vault_id = "${azurerm_key_vault.test.id}" + name = "secret-%s" + value = "szechuan" + key_vault_id = "${azurerm_key_vault.test.id}" } `, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } From 690ef6f1f3d8a5417b8251fdca592ff293efe5ab Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 17 Feb 2020 12:05:14 +0100 Subject: [PATCH 155/498] r/key_vault_access_policy: removing the unused assignment --- .../internal/services/keyvault/data_source_key_vault.go | 9 --------- .../keyvault/resource_arm_key_vault_access_policy.go | 3 +-- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/azurerm/internal/services/keyvault/data_source_key_vault.go b/azurerm/internal/services/keyvault/data_source_key_vault.go index f99387eb327e7..42568e0d13c98 100644 --- a/azurerm/internal/services/keyvault/data_source_key_vault.go +++ b/azurerm/internal/services/keyvault/data_source_key_vault.go @@ -198,15 +198,6 @@ func dataSourceArmKeyVaultRead(d *schema.ResourceData, meta interface{}) error { return tags.FlattenAndSet(d, resp.Tags) } -// Remove in 2.0 -func flattenKeyVaultDataSourceSku(sku *keyvault.Sku) []interface{} { - result := map[string]interface{}{ - "name": string(sku.Name), - } - - return []interface{}{result} -} - func flattenKeyVaultDataSourceNetworkAcls(input *keyvault.NetworkRuleSet) []interface{} { if input == nil { return []interface{}{} diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault_access_policy.go b/azurerm/internal/services/keyvault/resource_arm_key_vault_access_policy.go index 61023c81a1ab9..cda95f3e30c2b 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault_access_policy.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault_access_policy.go @@ -83,7 +83,6 @@ func resourceArmKeyVaultAccessPolicyCreateOrDelete(d *schema.ResourceData, meta log.Printf("[INFO] Preparing arguments for Key Vault Access Policy: %s.", action) vaultId := d.Get("key_vault_id").(string) - resourceGroup := d.Get("resource_group_name").(string) tenantIdRaw := d.Get("tenant_id").(string) tenantId, err := uuid.FromString(tenantIdRaw) @@ -99,7 +98,7 @@ func resourceArmKeyVaultAccessPolicyCreateOrDelete(d *schema.ResourceData, meta return err } - resourceGroup = id.ResourceGroup + resourceGroup := id.ResourceGroup vaultName, ok := id.Path["vaults"] if !ok { return fmt.Errorf("key_value_id does not contain `vaults`: %q", vaultId) From 44868cb05d0f323aaf79c3a817ea48c29f8e53ba Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 17 Feb 2020 12:26:53 +0100 Subject: [PATCH 156/498] d/network_interface: updating the tests --- .../network/data_source_network_interface.go | 9 -- .../data_source_network_interface_test.go | 110 ++---------------- 2 files changed, 10 insertions(+), 109 deletions(-) diff --git a/azurerm/internal/services/network/data_source_network_interface.go b/azurerm/internal/services/network/data_source_network_interface.go index 7e934893da4ea..aac8054521939 100644 --- a/azurerm/internal/services/network/data_source_network_interface.go +++ b/azurerm/internal/services/network/data_source_network_interface.go @@ -73,7 +73,6 @@ func dataSourceArmNetworkInterface() *schema.Resource { Computed: true, }, - //TODO: should this be renamed to private_ip_address_allocation_method or private_ip_allocation_method ? "private_ip_address_allocation": { Type: schema.TypeString, Computed: true, @@ -145,14 +144,6 @@ func dataSourceArmNetworkInterface() *schema.Resource { Computed: true, }, - /** - * As of 2018-01-06: AN (aka. SR-IOV) on Azure is GA on Windows and Linux. - * - * Refer to: https://azure.microsoft.com/en-us/blog/maximize-your-vm-s-performance-with-accelerated-networking-now-generally-available-for-both-windows-and-linux/ - * - * Refer to: https://docs.microsoft.com/en-us/azure/virtual-network/create-vm-accelerated-networking-cli - * For details, VM configuration and caveats. - */ "enable_accelerated_networking": { Type: schema.TypeBool, Computed: true, diff --git a/azurerm/internal/services/network/tests/data_source_network_interface_test.go b/azurerm/internal/services/network/tests/data_source_network_interface_test.go index e4c0bd02235ec..c40a91de9e186 100644 --- a/azurerm/internal/services/network/tests/data_source_network_interface_test.go +++ b/azurerm/internal/services/network/tests/data_source_network_interface_test.go @@ -8,124 +8,34 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" ) -func TestAccDataSourceArmVirtualNetworkInterface_basic(t *testing.T) { +func TestAccDataSourceArmNetworkInterface_basic(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_network_interface", "test") - name := fmt.Sprintf("acctest-nic-%d", data.RandomInteger) - resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, Steps: []resource.TestStep{ { - Config: testAccDataSourceArmVirtualNetworkInterface_basic(data), + Config: testAccAzureRMNetworkInterface_static(data), }, { - Config: testAccDataSourceArmVirtualNetworkInterface_withDataSource(data), + Config: testAccDataSourceNetworkInterface_basic(data), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(data.ResourceName, "name", name), - resource.TestCheckResourceAttrSet(data.ResourceName, "id"), - resource.TestCheckResourceAttr(data.ResourceName, "private_ip_address", "10.0.1.4"), - resource.TestCheckResourceAttrSet(data.ResourceName, "network_security_group_id"), + resource.TestCheckResourceAttr(data.ResourceName, "private_ip_address", "10.0.2.15"), ), }, }, }) } -func testAccDataSourceArmVirtualNetworkInterface_basic(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctest-%d-rg" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctest-vn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_network_security_group" "test" { - name = "acctest-nsg-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "subnet1" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.1.0/24" -} - -resource "azurerm_network_interface" "test" { - name = "acctest-nic-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - network_security_group_id = "${azurerm_network_security_group.test.id}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - } - - tags = { - environment = "staging" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - -func testAccDataSourceArmVirtualNetworkInterface_withDataSource(data acceptance.TestData) string { +func testAccDataSourceNetworkInterface_basic(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterface_static(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctest-%d-rg" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctest-vn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_network_security_group" "test" { - name = "acctest-nsg-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "subnet1" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.1.0/24" -} - -resource "azurerm_network_interface" "test" { - name = "acctest-nic-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - network_security_group_id = "${azurerm_network_security_group.test.id}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - } - - tags = { - environment = "staging" - } -} +%s data "azurerm_network_interface" "test" { - name = "acctest-nic-%d" - resource_group_name = "${azurerm_resource_group.test.name}" + name = azurerm_network_interface.test.name + resource_group_name = azurerm_network_interface.test.resource_group_name } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, template) } From 7f80483755caa5828ddf93af2cd2f895baeed0ee Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 17 Feb 2020 13:22:47 +0100 Subject: [PATCH 157/498] updating to include #5624 --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f7708a81118e..5de85a3955621 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -64,8 +64,9 @@ IMPROVEMENTS: BUG FIXES: * `azurerm_linux_virtual_machine` - using the delete custom timeout during deletion [GH-5764] -* `azurerm_windows_virtual_machine` - using the delete custom timeout during deletion [GH-5764] +* `azurerm_role_assignment` - validating that the `name` is a UUID [GH-5624] * `azurerm_signalr_service` - ensuring the SignalR segment is parsed in the correct case [GH-5737] +* `azurerm_windows_virtual_machine` - using the delete custom timeout during deletion [GH-5764] --- From 94bbb6b92c160a6b079cba297ea3180c371df2b6 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 17 Feb 2020 13:26:00 +0100 Subject: [PATCH 158/498] updating to include #5693 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5de85a3955621..b704a9cc23bff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -64,6 +64,7 @@ IMPROVEMENTS: BUG FIXES: * `azurerm_linux_virtual_machine` - using the delete custom timeout during deletion [GH-5764] +* `azurerm_public_ip_prefix` - fixing the validation for the `prefix_length` to match the Azure API [GH-5693] * `azurerm_role_assignment` - validating that the `name` is a UUID [GH-5624] * `azurerm_signalr_service` - ensuring the SignalR segment is parsed in the correct case [GH-5737] * `azurerm_windows_virtual_machine` - using the delete custom timeout during deletion [GH-5764] From 8e874af34c2025ba406dc0da9944c8e256a73caf Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 17 Feb 2020 15:10:52 +0100 Subject: [PATCH 159/498] docs: adding the `azurerm_network_interface_security_group_association` to the sidebar --- website/azurerm.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/azurerm.erb b/website/azurerm.erb index 0ea9b471ad153..ac91bdd269443 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -1803,6 +1803,10 @@ azurerm_network_interface_nat_rule_association +
  • + azurerm_network_interface_security_group_association +
    • +
  • azurerm_network_packet_capture
    • From 04917d5ccb1c60e7a607bbfa876961c309d45f73 Mon Sep 17 00:00:00 2001 From: John Gleason Date: Mon, 17 Feb 2020 08:12:25 -0600 Subject: [PATCH 160/498] Very minor consistency edits --- website/docs/r/public_ip_prefix.html.markdown | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/website/docs/r/public_ip_prefix.html.markdown b/website/docs/r/public_ip_prefix.html.markdown index 0133bf8080591..16458054dbd8a 100644 --- a/website/docs/r/public_ip_prefix.html.markdown +++ b/website/docs/r/public_ip_prefix.html.markdown @@ -35,23 +35,23 @@ resource "azurerm_public_ip_prefix" "example" { The following arguments are supported: -* `name` - (Required) Specifies the name of the Public IP resource . Changing this forces a new resource to be created. +* `name` - (Required) Specifies the name of the Public IP Prefix resource . Changing this forces a new resource to be created. -* `resource_group_name` - (Required) The name of the resource group in which to create the public IP. +* `resource_group_name` - (Required) The name of the resource group in which to create the Public IP Prefix. * `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. * `sku` - (Optional) The SKU of the Public IP Prefix. Accepted values are `Standard`. Defaults to `Standard`. Changing this forces a new resource to be created. --> **Note** Public IP Prefix can only be created with Standard SKUs at this time. +-> **Note**: Public IP Prefix can only be created with Standard SKUs at this time. * `prefix_length` - (Optional) Specifies the number of bits of the prefix. The value can be set between 28 (16 addresses) and 31 (2 addresses). Changing this forces a new resource to be created. --> **Please Note:**: There may be Public IP address limits on the subscription . [More information available here](https://docs.microsoft.com/en-us/azure/azure-subscription-service-limits?toc=%2fazure%2fvirtual-network%2ftoc.json#publicip-address) +-> **Please Note**: There may be Public IP address limits on the subscription . [More information available here](https://docs.microsoft.com/en-us/azure/azure-subscription-service-limits?toc=%2fazure%2fvirtual-network%2ftoc.json#publicip-address) * `tags` - (Optional) A mapping of tags to assign to the resource. -* `zones` - (Optional) A collection containing the availability zone to allocate the Public IP in. +* `zones` - (Optional) A collection containing the availability zone to allocate the Public IP Prefix in. -> **Please Note**: Availability Zones are [only supported in several regions at this time](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview). From 746e9bd2547907cc46f4a575f94ca65aa5a56e16 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 17 Feb 2020 15:33:41 +0100 Subject: [PATCH 161/498] automation: fixing the tests to account for the field being removed --- .../resource_arm_automation_credential.go | 3 +- ...source_arm_automation_job_schedule_test.go | 19 ++++++----- .../resource_arm_automation_runbook_test.go | 32 +++++++++---------- 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/azurerm/internal/services/automation/resource_arm_automation_credential.go b/azurerm/internal/services/automation/resource_arm_automation_credential.go index de4a7570f0646..62e01a9cea3ff 100644 --- a/azurerm/internal/services/automation/resource_arm_automation_credential.go +++ b/azurerm/internal/services/automation/resource_arm_automation_credential.go @@ -44,7 +44,7 @@ func resourceArmAutomationCredential() *schema.Resource { "automation_account_name": { Type: schema.TypeString, - Required: true, //todo change to required once account_name has been removed + Required: true, ForceNew: true, ValidateFunc: azure.ValidateAutomationAccountName(), }, @@ -77,7 +77,6 @@ func resourceArmAutomationCredentialCreateUpdate(d *schema.ResourceData, meta in name := d.Get("name").(string) resGroup := d.Get("resource_group_name").(string) - // todo remove this once `account_name` is removed accountName := d.Get("automation_account_name").(string) if features.ShouldResourcesBeImported() && d.IsNewResource() { diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_job_schedule_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_job_schedule_test.go index 799d4a25de725..48f4b35ecafc5 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_job_schedule_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_job_schedule_test.go @@ -112,7 +112,7 @@ func testCheckAzureRMAutomationJobScheduleDestroy(s *terraform.State) error { } jobScheduleID := id.Path["jobSchedules"] jobScheduleUUID := uuid.FromStringOrNil(jobScheduleID) - accName := rs.Primary.Attributes["account_name"] + accName := rs.Primary.Attributes["automation_account_name"] resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] if !hasResourceGroup { @@ -190,15 +190,14 @@ resource "azurerm_automation_account" "test" { } resource "azurerm_automation_runbook" "test" { - name = "Output-HelloWorld" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - account_name = "${azurerm_automation_account.test.name}" - log_verbose = "true" - log_progress = "true" - description = "This is a test runbook for terraform acceptance test" - runbook_type = "PowerShell" + name = "Output-HelloWorld" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + automation_account_name = "${azurerm_automation_account.test.name}" + log_verbose = "true" + log_progress = "true" + description = "This is a test runbook for terraform acceptance test" + runbook_type = "PowerShell" publish_content_link { uri = "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/c4935ffb69246a6058eb24f54640f53f69d3ac9f/101-automation-runbook-getvms/Runbooks/Get-AzureVMTutorial.ps1" diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_runbook_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_runbook_test.go index c321e47ef7f9d..b3b5bc283530b 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_runbook_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_runbook_test.go @@ -106,7 +106,7 @@ func testCheckAzureRMAutomationRunbookDestroy(s *terraform.State) error { } name := rs.Primary.Attributes["name"] - accName := rs.Primary.Attributes["account_name"] + accName := rs.Primary.Attributes["automation_account_name"] resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] if !hasResourceGroup { @@ -141,7 +141,7 @@ func testCheckAzureRMAutomationRunbookExists(resourceName string) resource.TestC } name := rs.Primary.Attributes["name"] - accName := rs.Primary.Attributes["account_name"] + accName := rs.Primary.Attributes["automation_account_name"] resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] if !hasResourceGroup { @@ -180,11 +180,11 @@ resource "azurerm_automation_account" "test" { } resource "azurerm_automation_runbook" "test" { - name = "Get-AzureVMTutorial" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + name = "Get-AzureVMTutorial" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + automation_account_name = "${azurerm_automation_account.test.name}" - account_name = "${azurerm_automation_account.test.name}" log_verbose = "true" log_progress = "true" description = "This is a test runbook for terraform acceptance test" @@ -203,11 +203,11 @@ func testAccAzureRMAutomationRunbook_requiresImport(data acceptance.TestData) st %s resource "azurerm_automation_runbook" "import" { - name = "${azurerm_automation_runbook.test.name}" - location = "${azurerm_automation_runbook.test.location}" - resource_group_name = "${azurerm_automation_runbook.test.resource_group_name}" + name = "${azurerm_automation_runbook.test.name}" + location = "${azurerm_automation_runbook.test.location}" + resource_group_name = "${azurerm_automation_runbook.test.resource_group_name}" + automation_account_name = "${azurerm_automation_runbook.test.account_name}" - account_name = "${azurerm_automation_runbook.test.account_name}" log_verbose = "true" log_progress = "true" description = "This is a test runbook for terraform acceptance test" @@ -239,10 +239,10 @@ resource "azurerm_automation_account" "test" { resource "azurerm_automation_runbook" "test" { name = "Get-AzureVMTutorial" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + automation_account_name = "${azurerm_automation_account.test.name}" - account_name = "${azurerm_automation_account.test.name}" log_verbose = "true" log_progress = "true" description = "This is a test runbook for terraform acceptance test" @@ -280,10 +280,10 @@ resource "azurerm_automation_account" "test" { resource "azurerm_automation_runbook" "test" { name = "Get-AzureVMTutorial" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + automation_account_name = "${azurerm_automation_account.test.name}" - account_name = "${azurerm_automation_account.test.name}" log_verbose = "true" log_progress = "true" description = "This is a test runbook for terraform acceptance test" From da8015229b9054e0554e0c6367604c913d0f47dd Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 17 Feb 2020 15:39:30 +0100 Subject: [PATCH 162/498] r/key_vault: removing the test expecting a complaint --- .../tests/resource_arm_key_vault_test.go | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go index 4fab60950554a..57fdaeecaef49 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go @@ -2,7 +2,6 @@ package tests import ( "fmt" - "regexp" "testing" "github.com/hashicorp/go-azure-helpers/response" @@ -92,23 +91,6 @@ func TestAccAzureRMKeyVault_basic(t *testing.T) { }) } -// Remove in 2.0 -func TestAccAzureRMKeyVault_basicNotDefined(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_key_vault", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMKeyVaultDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMKeyVault_basicNotDefined(data), - ExpectError: regexp.MustCompile("either 'sku_name' or 'sku' must be defined in the configuration file"), - }, - }, - }) -} - func TestAccAzureRMKeyVault_requiresImport(t *testing.T) { if !features.ShouldResourcesBeImported() { t.Skip("Skipping since resources aren't required to be imported") From cb175c998dfc76e94aa32a6517946923845b7abf Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 17 Feb 2020 16:06:27 +0100 Subject: [PATCH 163/498] r/key_vault_*: handling the parent key vault not being available once it's deleted --- .../keyvault/tests/resource_arm_key_vault_certificate_test.go | 3 ++- .../services/keyvault/tests/resource_arm_key_vault_key_test.go | 3 ++- .../keyvault/tests/resource_arm_key_vault_secret_test.go | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_certificate_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_certificate_test.go index 59a2079005c5e..8748d336fbde2 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_certificate_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_certificate_test.go @@ -225,7 +225,8 @@ func testCheckAzureRMKeyVaultCertificateDestroy(s *terraform.State) error { keyVaultId := rs.Primary.Attributes["key_vault_id"] vaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) if err != nil { - return fmt.Errorf("Error looking up Secret %q vault url from id %q: %+v", name, keyVaultId, err) + // deleted, this is fine. + return nil } ok, err := azure.KeyVaultExists(ctx, acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient, keyVaultId) diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go index 940cca033a0fa..2f906cb728842 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go @@ -241,7 +241,8 @@ func testCheckAzureRMKeyVaultKeyDestroy(s *terraform.State) error { keyVaultId := rs.Primary.Attributes["key_vault_id"] vaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) if err != nil { - return fmt.Errorf("Error looking up Secret %q vault url from id %q: %+v", name, keyVaultId, err) + // key vault's been deleted + return nil } ok, err := azure.KeyVaultExists(ctx, acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient, keyVaultId) diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go index f34f1d82c0841..2fb2f3e813c5c 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go @@ -166,7 +166,8 @@ func testCheckAzureRMKeyVaultSecretDestroy(s *terraform.State) error { keyVaultId := rs.Primary.Attributes["key_vault_id"] vaultBaseUrl, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) if err != nil { - return fmt.Errorf("Error looking up Secret %q vault url from id %q: %+v", name, keyVaultId, err) + // key vault's been deleted + return nil } ok, err := azure.KeyVaultExists(ctx, acceptance.AzureProvider.Meta().(*clients.Client).KeyVault.VaultsClient, keyVaultId) From 14578f7050b244f0929b65335b654a3d18958782 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 17 Feb 2020 16:16:38 +0100 Subject: [PATCH 164/498] r/subnet: removing the `route_table_id` field from the examples/docs --- examples/kubernetes/advanced-networking-calico-policy/main.tf | 3 --- .../kubernetes/advanced-networking-multiple-agentpool/main.tf | 3 --- examples/kubernetes/advanced-networking/main.tf | 3 --- examples/virtual-networks/azure-firewall/main.tf | 1 - website/docs/r/subnet.html.markdown | 4 ---- website/docs/r/subnet_route_table_association.html.markdown | 3 --- 6 files changed, 17 deletions(-) diff --git a/examples/kubernetes/advanced-networking-calico-policy/main.tf b/examples/kubernetes/advanced-networking-calico-policy/main.tf index b14d95b0cc483..cf95062ee80ca 100644 --- a/examples/kubernetes/advanced-networking-calico-policy/main.tf +++ b/examples/kubernetes/advanced-networking-calico-policy/main.tf @@ -28,9 +28,6 @@ resource "azurerm_subnet" "test" { resource_group_name = "${azurerm_resource_group.test.name}" address_prefix = "10.1.0.0/24" virtual_network_name = "${azurerm_virtual_network.test.name}" - - # this field is deprecated and will be removed in 2.0 - but is required until then - route_table_id = "${azurerm_route_table.test.id}" } resource "azurerm_subnet_route_table_association" "test" { diff --git a/examples/kubernetes/advanced-networking-multiple-agentpool/main.tf b/examples/kubernetes/advanced-networking-multiple-agentpool/main.tf index a30e57432b882..bb3c463d167ed 100644 --- a/examples/kubernetes/advanced-networking-multiple-agentpool/main.tf +++ b/examples/kubernetes/advanced-networking-multiple-agentpool/main.tf @@ -28,9 +28,6 @@ resource "azurerm_subnet" "example" { resource_group_name = "${azurerm_resource_group.example.name}" address_prefix = "10.1.0.0/24" virtual_network_name = "${azurerm_virtual_network.example.name}" - - # this field is deprecated and will be removed in 2.0 - but is required until then - route_table_id = "${azurerm_route_table.example.id}" } resource "azurerm_subnet_route_table_association" "example" { diff --git a/examples/kubernetes/advanced-networking/main.tf b/examples/kubernetes/advanced-networking/main.tf index c778f7fb952a3..762b4db9718d8 100644 --- a/examples/kubernetes/advanced-networking/main.tf +++ b/examples/kubernetes/advanced-networking/main.tf @@ -28,9 +28,6 @@ resource "azurerm_subnet" "example" { resource_group_name = "${azurerm_resource_group.example.name}" address_prefix = "10.1.0.0/22" virtual_network_name = "${azurerm_virtual_network.example.name}" - - # this field is deprecated and will be removed in 2.0 - but is required until then - route_table_id = "${azurerm_route_table.example.id}" } resource "azurerm_subnet_route_table_association" "example" { diff --git a/examples/virtual-networks/azure-firewall/main.tf b/examples/virtual-networks/azure-firewall/main.tf index 90b4f70896778..1aaf9e8033a6d 100644 --- a/examples/virtual-networks/azure-firewall/main.tf +++ b/examples/virtual-networks/azure-firewall/main.tf @@ -89,7 +89,6 @@ resource "azurerm_subnet" "azusubnet" { resource_group_name = "${azurerm_resource_group.azurg.name}" virtual_network_name = "${azurerm_virtual_network.azuvnet.name}" address_prefix = "10.0.2.0/24" - route_table_id = "${azurerm_route_table.azurt.id}" } resource "azurerm_subnet_route_table_association" "azurtassoc" { diff --git a/website/docs/r/subnet.html.markdown b/website/docs/r/subnet.html.markdown index b23e95f7d5beb..6fc59355fd16e 100644 --- a/website/docs/r/subnet.html.markdown +++ b/website/docs/r/subnet.html.markdown @@ -63,10 +63,6 @@ The following arguments are supported: -> **NOTE:** At this time Subnet `<->` Network Security Group associations need to be configured both using this field (which is now Deprecated) and using the `azurerm_subnet_network_security_group_association` resource. This field is deprecated and will be removed in favour of that resource in the next major version (2.0) of the AzureRM Provider. -* `route_table_id` - (Optional / **Deprecated**) The ID of the Route Table to associate with the subnet. - --> **NOTE:** At this time Subnet `<->` Route Table associations need to be configured both using this field (which is now Deprecated) and using the `azurerm_subnet_route_table_association` resource. This field is deprecated and will be removed in favour of that resource in the next major version (2.0) of the AzureRM Provider. - * `service_endpoints` - (Optional) The list of Service endpoints to associate with the subnet. Possible values include: `Microsoft.AzureActiveDirectory`, `Microsoft.AzureCosmosDB`, `Microsoft.ContainerRegistry`, `Microsoft.EventHub`, `Microsoft.KeyVault`, `Microsoft.ServiceBus`, `Microsoft.Sql`, `Microsoft.Storage` and `Microsoft.Web`. * `delegation` - (Optional) One or more `delegation` blocks as defined below. diff --git a/website/docs/r/subnet_route_table_association.html.markdown b/website/docs/r/subnet_route_table_association.html.markdown index c0076e37aab73..8a2f294f2c931 100644 --- a/website/docs/r/subnet_route_table_association.html.markdown +++ b/website/docs/r/subnet_route_table_association.html.markdown @@ -11,8 +11,6 @@ description: |- Associates a [Route Table](route_table.html) with a [Subnet](subnet.html) within a [Virtual Network](virtual_network.html). --> **NOTE:** Subnet `<->` Route Table associations currently need to be configured on both this resource and using the `route_table_id` field on the `azurerm_subnet` resource. The next major version of the AzureRM Provider (2.0) will remove the `route_table_id` field from the `azurerm_subnet` resource such that this resource is used to link resources in future. - ## Example Usage ```hcl @@ -33,7 +31,6 @@ resource "azurerm_subnet" "example" { resource_group_name = azurerm_resource_group.example.name virtual_network_name = azurerm_virtual_network.example.name address_prefix = "10.0.2.0/24" - route_table_id = azurerm_route_table.example.id } resource "azurerm_route_table" "example" { From 9ac1cfa12ce96653d18e189d57d249e8e3275c76 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 17 Feb 2020 16:40:01 +0100 Subject: [PATCH 165/498] r/keyvault: updating the remaining tests --- .../keyvault/tests/resource_arm_key_vault_key_test.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go index 2f906cb728842..4e95d9a01fe07 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go @@ -671,10 +671,7 @@ resource "azurerm_key_vault" "test" { location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" tenant_id = "${data.azurerm_client_config.current.tenant_id}" - - sku { - name = "premium" - } + sku_name = "premium" access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" @@ -726,10 +723,7 @@ resource "azurerm_key_vault" "test" { location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" tenant_id = "${data.azurerm_client_config.current.tenant_id}" - - sku { - name = "premium" - } + sku_name = "premium" access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" From 8ed01245730d2501ccd08e32c4b9dfbac4197a31 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 17 Feb 2020 17:28:13 +0100 Subject: [PATCH 166/498] r/keyvault: removing dead code --- .../tests/resource_arm_key_vault_test.go | 31 ------------------- 1 file changed, 31 deletions(-) diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go index 57fdaeecaef49..9fca6afecdf0e 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go @@ -411,37 +411,6 @@ resource "azurerm_key_vault" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } -func testAccAzureRMKeyVault_basicNotDefined(data acceptance.TestData) string { - return fmt.Sprintf(` -data "azurerm_client_config" "current" {} - -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_key_vault" "test" { - name = "vault%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - tenant_id = "${data.azurerm_client_config.current.tenant_id}" - - access_policy { - tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.client_id}" - - key_permissions = [ - "create", - ] - - secret_permissions = [ - "set", - ] - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - func testAccAzureRMKeyVault_requiresImport(data acceptance.TestData) string { template := testAccAzureRMKeyVault_basic(data) return fmt.Sprintf(` From 08b62095de650ac5617b61934e9bdacffefb6e1a Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 17 Feb 2020 17:54:14 +0100 Subject: [PATCH 167/498] linting --- .../automation/tests/resource_arm_automation_runbook_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_runbook_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_runbook_test.go index b3b5bc283530b..727072b6949c8 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_runbook_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_runbook_test.go @@ -238,7 +238,7 @@ resource "azurerm_automation_account" "test" { } resource "azurerm_automation_runbook" "test" { - name = "Get-AzureVMTutorial" + name = "Get-AzureVMTutorial" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" automation_account_name = "${azurerm_automation_account.test.name}" @@ -279,7 +279,7 @@ resource "azurerm_automation_account" "test" { } resource "azurerm_automation_runbook" "test" { - name = "Get-AzureVMTutorial" + name = "Get-AzureVMTutorial" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" automation_account_name = "${azurerm_automation_account.test.name}" From 225783ab788404f0a10d475345a3911428576fa3 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 17 Feb 2020 18:07:55 +0100 Subject: [PATCH 168/498] updating to include #5774 --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b704a9cc23bff..117366c22c229 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,9 @@ BREAKING CHANGES: * Data Source: `azurerm_app_service_plan` - the deprecated `properties` block has been removed since these properties have been moved to the top level [GH-5717] * Data Source: `azurerm_azuread_application` - This data source has been removed since it was deprecated [GH-5748] * Data Source: `azurerm_azuread_service_principal` - This data source has been removed since it was deprecated [GH-5748] +* Data Source: `azurerm_key_vault` - removing the `sku` block since this has been deprecated in favour of the `sku_name` field [GH-5774] +* Data Source: `azurerm_key_vault_key` - removing the deprecated `vault_uri` field [GH-5774] +* Data Source: `azurerm_key_vault_secret` - removing the deprecated `vault_uri` field [GH-5774] * Data Source: `azurerm_role_definition` - removing the alias `VirtualMachineContributor` which has been deprecated in favour of the full name `Virtual Machine Contributor` [GH-5733] * Data Source: `azurerm_scheduler_job_collection` - This data source has been removed since it was deprecated [GH-5712] * `azurerm_app_service_plan` - the deprecated `properties` block has been removed since these properties have been moved to the top level [GH-5717] @@ -32,6 +35,12 @@ BREAKING CHANGES: * `azurerm_container_service` - This resource has been removed since it was deprecated [GH-5709] * `azurerm_iot_dps` - This resource has been removed since it was deprecated [GH-5753] * `azurerm_iot_dps_certificate` - This resource has been removed since it was deprecated [GH-5753] +* `azurerm_key_vault` - removing the `sku` block since this has been deprecated in favour of the `sku_name` field [GH-5774] +* `azurerm_key_vault_access_policy` - removing the deprecated field `vault_name` which has been superseded by the `key_vault_id` field [GH-5774] +* `azurerm_key_vault_access_policy` - removing the deprecated field `resource_group_name ` which has been superseded by the `key_vault_id` field [GH-5774] +* `azurerm_key_vault_certificate` - removing the deprecated `vault_uri` field [GH-5774] +* `azurerm_key_vault_key` - removing the deprecated `vault_uri` field [GH-5774] +* `azurerm_key_vault_secret` - removing the deprecated `vault_uri` field [GH-5774] * `azurerm_kubernetes_cluster` - updating the default value for `load_balancer_sku` to `Standard` from `Basic` [GH-5747] * `azurerm_log_analytics_workspace_linked_service` - This resource has been removed since it was deprecated [GH-5754] * `azurerm_maps_account` - the `sku_name` field is now case-sensitive [GH-5776] From d2ec7bf661dcc28c242f97ff4ad2c55297bec970 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Mon, 17 Feb 2020 17:34:57 +0000 Subject: [PATCH 169/498] fixup tests for sku_name --- .../tests/resource_arm_automation_account_test.go | 5 +---- .../resource_arm_automation_credential_test.go | 9 ++------- ...ource_arm_automation_dsc_configuration_test.go | 5 +---- ...e_arm_automation_dsc_nodeconfiguration_test.go | 5 +---- .../resource_arm_automation_job_schedule_test.go | 5 +---- .../tests/resource_arm_automation_module_test.go | 10 ++-------- .../tests/resource_arm_automation_runbook_test.go | 15 +++------------ .../resource_arm_automation_schedule_test.go | 5 +---- .../resource_arm_automation_variable_bool_test.go | 8 ++------ ...ource_arm_automation_variable_datetime_test.go | 10 ++-------- .../resource_arm_automation_variable_int_test.go | 10 ++-------- ...esource_arm_automation_variable_string_test.go | 10 ++-------- 12 files changed, 20 insertions(+), 77 deletions(-) diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_account_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_account_test.go index a44de6d452e4f..82954de9d00a2 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_account_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_account_test.go @@ -212,10 +212,7 @@ resource "azurerm_automation_account" "test" { name = "acctest-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "Basic" - } + sku_name = "Basic" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_credential_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_credential_test.go index e5220a6ce8f06..e2836e30d5fff 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_credential_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_credential_test.go @@ -153,10 +153,7 @@ resource "azurerm_automation_account" "test" { name = "acctest-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "Basic" - } + sku_name = "Basic" } resource "azurerm_automation_credential" "test" { @@ -195,10 +192,8 @@ resource "azurerm_automation_account" "test" { name = "acctest-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" + sku_name = "Basic" - sku { - name = "Basic" - } } resource "azurerm_automation_credential" "test" { diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_configuration_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_configuration_test.go index 42e9c066a2929..b90ae33efdd75 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_configuration_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_configuration_test.go @@ -135,10 +135,7 @@ resource "azurerm_automation_account" "test" { name = "acctest-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "Basic" - } + sku_name = "Basic" } resource "azurerm_automation_dsc_configuration" "test" { diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_nodeconfiguration_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_nodeconfiguration_test.go index deded2a5d0c23..43ff42acc6d0e 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_nodeconfiguration_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_nodeconfiguration_test.go @@ -132,10 +132,7 @@ resource "azurerm_automation_account" "test" { name = "acctest-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "Basic" - } + sku_name = "Basic" } resource "azurerm_automation_dsc_configuration" "test" { diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_job_schedule_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_job_schedule_test.go index 48f4b35ecafc5..98bf5410a4942 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_job_schedule_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_job_schedule_test.go @@ -183,10 +183,7 @@ resource "azurerm_automation_account" "test" { name = "acctestAA-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "Basic" - } + sku_name = "Basic" } resource "azurerm_automation_runbook" "test" { diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_module_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_module_test.go index b932aa7c9ff06..f41479200cf46 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_module_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_module_test.go @@ -150,10 +150,7 @@ resource "azurerm_automation_account" "test" { name = "acctest-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "Basic" - } + sku_name = "Basic" } resource "azurerm_automation_module" "test" { @@ -179,10 +176,7 @@ resource "azurerm_automation_account" "test" { name = "acctest-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "Basic" - } + sku_name = "Basic" } resource "azurerm_automation_module" "test" { diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_runbook_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_runbook_test.go index 727072b6949c8..6b3e947a45145 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_runbook_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_runbook_test.go @@ -173,10 +173,7 @@ resource "azurerm_automation_account" "test" { name = "acctest-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "Basic" - } + sku_name = "Basic" } resource "azurerm_automation_runbook" "test" { @@ -231,10 +228,7 @@ resource "azurerm_automation_account" "test" { name = "acctest-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "Basic" - } + sku_name = "Basic" } resource "azurerm_automation_runbook" "test" { @@ -272,10 +266,7 @@ resource "azurerm_automation_account" "test" { name = "acctest-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "Basic" - } + sku_name = "Basic" } resource "azurerm_automation_runbook" "test" { diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_schedule_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_schedule_test.go index f8c627f247975..50987ce112241 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_schedule_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_schedule_test.go @@ -293,10 +293,7 @@ resource "azurerm_automation_account" "test" { name = "acctestAA-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "Basic" - } + sku_name = "Basic" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_variable_bool_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_variable_bool_test.go index def9fe78d6f00..46a2eece17a7b 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_variable_bool_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_variable_bool_test.go @@ -103,10 +103,8 @@ resource "azurerm_automation_account" "test" { name = "acctestAutoAcct-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" + sku_name = "Basic" - sku { - name = "Basic" - } } resource "azurerm_automation_variable_bool" "test" { @@ -129,10 +127,8 @@ resource "azurerm_automation_account" "test" { name = "acctestAutoAcct-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" + sku_name = "Basic" - sku { - name = "Basic" - } } resource "azurerm_automation_variable_bool" "test" { diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_variable_datetime_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_variable_datetime_test.go index efb0613a105c3..b3b5ea423d931 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_variable_datetime_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_variable_datetime_test.go @@ -103,10 +103,7 @@ resource "azurerm_automation_account" "test" { name = "acctestAutoAcct-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "Basic" - } + sku_name = "Basic" } resource "azurerm_automation_variable_datetime" "test" { @@ -129,10 +126,7 @@ resource "azurerm_automation_account" "test" { name = "acctestAutoAcct-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "Basic" - } + sku_name = "Basic" } resource "azurerm_automation_variable_datetime" "test" { diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_variable_int_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_variable_int_test.go index ab4a6b89f3439..70e64939debab 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_variable_int_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_variable_int_test.go @@ -103,10 +103,7 @@ resource "azurerm_automation_account" "test" { name = "acctestAutoAcct-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "Basic" - } + sku_name = "Basic" } resource "azurerm_automation_variable_int" "test" { @@ -129,10 +126,7 @@ resource "azurerm_automation_account" "test" { name = "acctestAutoAcct-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "Basic" - } + sku_name = "Basic" } resource "azurerm_automation_variable_int" "test" { diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_variable_string_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_variable_string_test.go index 6dbddc3747da9..eccf0d21bd5cf 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_variable_string_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_variable_string_test.go @@ -103,10 +103,7 @@ resource "azurerm_automation_account" "test" { name = "acctestAutoAcct-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "Basic" - } + sku_name = "Basic" } resource "azurerm_automation_variable_string" "test" { @@ -129,10 +126,7 @@ resource "azurerm_automation_account" "test" { name = "acctestAutoAcct-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "Basic" - } + sku_name = "Basic" } resource "azurerm_automation_variable_string" "test" { From 97c13decb5e4b5e9100f505aed6179884accf5dd Mon Sep 17 00:00:00 2001 From: jackofallops Date: Mon, 17 Feb 2020 17:42:30 +0000 Subject: [PATCH 170/498] fix two more tests for attribute reference --- .../tests/resource_arm_automation_certificate_test.go | 2 +- .../automation/tests/resource_arm_automation_runbook_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_certificate_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_certificate_test.go index 57ed01c00ab6e..0e7aeec998267 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_certificate_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_certificate_test.go @@ -202,7 +202,7 @@ func testAccAzureRMAutomationCertificate_requiresImport(data acceptance.TestData resource "azurerm_automation_certificate" "import" { name = azurerm_automation_certificate.test.name resource_group_name = azurerm_automation_certificate.test.resource_group_name - automation_account_name = azurerm_automation_certificate.test.account_name + automation_account_name = azurerm_automation_certificate.test.automation_account_name base64 = azurerm_automation_certificate.test.base64 thumbprint = azurerm_automation_certificate.test.thumbprint } diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_runbook_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_runbook_test.go index 6b3e947a45145..d6db879dc44b7 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_runbook_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_runbook_test.go @@ -203,7 +203,7 @@ resource "azurerm_automation_runbook" "import" { name = "${azurerm_automation_runbook.test.name}" location = "${azurerm_automation_runbook.test.location}" resource_group_name = "${azurerm_automation_runbook.test.resource_group_name}" - automation_account_name = "${azurerm_automation_runbook.test.account_name}" + automation_account_name = "${azurerm_automation_runbook.test.automation_account_name}" log_verbose = "true" log_progress = "true" From 3aed7c858e081689951fad83b947ca1e1aa5035a Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Mon, 17 Feb 2020 09:52:09 -0800 Subject: [PATCH 171/498] Remove deadcode --- .../tests/resource_arm_mysql_server_test.go | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go b/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go index b2070f11645dd..267d9ea4315da 100644 --- a/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go +++ b/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go @@ -408,34 +408,6 @@ resource "azurerm_mysql_server" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } -func testAccAzureRMMySQLServer_memoryOptimized(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_mysql_server" "test" { - name = "acctestmysqlsvr-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - sku_name = "MO_Gen5_16" - - storage_profile { - storage_mb = 4194304 - backup_retention_days = 7 - geo_redundant_backup = "Disabled" - } - - administrator_login = "acctestun" - administrator_login_password = "H@Sh1CoR3!" - version = "5.7" - ssl_enforcement = "Enabled" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - func testAccAzureRMMySQLServer_memoryOptimizedGeoRedundant(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { From 32433ddb72c7d50d203e82826136fa921c94ca01 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Mon, 17 Feb 2020 17:55:58 +0000 Subject: [PATCH 172/498] Removed legacy tests no longer required --- .../resource_arm_automation_account_test.go | 75 ------------------- 1 file changed, 75 deletions(-) diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_account_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_account_test.go index 82954de9d00a2..f2d6252cce6fe 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_account_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_account_test.go @@ -2,7 +2,6 @@ package tests import ( "fmt" - "regexp" "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" @@ -36,47 +35,6 @@ func TestAccAzureRMAutomationAccount_basic(t *testing.T) { }) } -// Remove in 2.0 -func TestAccAzureRMAutomationAccount_basicClassic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_automation_account", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMAutomationAccountDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMAutomationAccount_basicClassic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMAutomationAccountExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.name", "Basic"), - resource.TestCheckResourceAttrSet(data.ResourceName, "dsc_server_endpoint"), - resource.TestCheckResourceAttrSet(data.ResourceName, "dsc_primary_access_key"), - resource.TestCheckResourceAttrSet(data.ResourceName, "dsc_secondary_access_key"), - ), - }, - data.ImportStep(), - }, - }) -} - -// Remove in 2.0 -func TestAccAzureRMAutomationAccount_basicNotDefined(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_automation_account", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMAutomationAccountDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMAutomationAccount_basicNotDefined(data), - ExpectError: regexp.MustCompile("either 'sku_name' or 'sku' must be defined in the configuration file"), - }, - }, - }) -} - func TestAccAzureRMAutomationAccount_requiresImport(t *testing.T) { if !features.ShouldResourcesBeImported() { t.Skip("Skipping since resources aren't required to be imported") @@ -200,39 +158,6 @@ resource "azurerm_automation_account" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } -// Remove in 2.0 -func testAccAzureRMAutomationAccount_basicClassic(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_automation_account" "test" { - name = "acctest-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku_name = "Basic" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - -// Remove in 2.0 -func testAccAzureRMAutomationAccount_basicNotDefined(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_automation_account" "test" { - name = "acctest-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - func testAccAzureRMAutomationAccount_requiresImport(data acceptance.TestData) string { template := testAccAzureRMAutomationAccount_basic(data) return fmt.Sprintf(` From 206453694468df4ecb724ad200bd727454b5e71c Mon Sep 17 00:00:00 2001 From: John Wildes Date: Mon, 17 Feb 2020 12:52:18 -0600 Subject: [PATCH 173/498] Update ACR docs SKU and GeoRepl Note --- website/docs/r/container_registry.html.markdown | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/docs/r/container_registry.html.markdown b/website/docs/r/container_registry.html.markdown index eed63df0fb58f..2f1a7435a45e8 100644 --- a/website/docs/r/container_registry.html.markdown +++ b/website/docs/r/container_registry.html.markdown @@ -46,7 +46,7 @@ The following arguments are supported: * `storage_account_id` - (Required for `Classic` Sku - Forbidden otherwise) The ID of a Storage Account which must be located in the same Azure Region as the Container Registry. -* `sku` - (Optional) The SKU name of the container registry. Possible values are `Classic` (which was previously `Basic`), `Basic`, `Standard` and `Premium`. +* `sku` - (Optional) The SKU name of the container registry. Possible values are `Basic`, `Standard` and `Premium`. `Classic` (which was previously `Basic`) is supported only for existing resources. ~> **NOTE:** The `Classic` SKU is Deprecated and will no longer be available for new resources from the end of March 2019. @@ -54,6 +54,8 @@ The following arguments are supported: * `georeplication_locations` - (Optional) A list of Azure locations where the container registry should be geo-replicated. +~> **NOTE:** The `georeplication_locations` is only supported on new resources with the `Premium` SKU. + * `network_rule_set` - (Optional) A `network_rule_set` block as documented below. `network_rule_set` supports the following: From 8e3a70fa2082e30950c0c895b84c81ae978a0349 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Mon, 17 Feb 2020 11:39:12 -0800 Subject: [PATCH 174/498] eventhub -> 2.0 --- .../services/eventhub/resource_arm_eventhub.go | 3 --- .../resource_arm_eventhub_authorization_rule.go | 2 -- .../eventhub/resource_arm_eventhub_consumer_group.go | 2 -- .../eventhub/resource_arm_eventhub_namespace.go | 10 ---------- ...source_arm_eventhub_namespace_authorization_rule.go | 2 -- website/docs/r/eventhub_namespace.html.markdown | 4 ---- 6 files changed, 23 deletions(-) diff --git a/azurerm/internal/services/eventhub/resource_arm_eventhub.go b/azurerm/internal/services/eventhub/resource_arm_eventhub.go index a16f9b115fcde..9c123649a3fe1 100644 --- a/azurerm/internal/services/eventhub/resource_arm_eventhub.go +++ b/azurerm/internal/services/eventhub/resource_arm_eventhub.go @@ -52,9 +52,6 @@ func resourceArmEventHub() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), - // TODO: remove me in the next major version - "location": azure.SchemaLocationDeprecated(), - "partition_count": { Type: schema.TypeInt, Required: true, diff --git a/azurerm/internal/services/eventhub/resource_arm_eventhub_authorization_rule.go b/azurerm/internal/services/eventhub/resource_arm_eventhub_authorization_rule.go index 6c96f669d2a8b..8fcf45bc0cf5b 100644 --- a/azurerm/internal/services/eventhub/resource_arm_eventhub_authorization_rule.go +++ b/azurerm/internal/services/eventhub/resource_arm_eventhub_authorization_rule.go @@ -57,8 +57,6 @@ func resourceArmEventHubAuthorizationRule() *schema.Resource { }, "resource_group_name": azure.SchemaResourceGroupName(), - - "location": azure.SchemaLocationDeprecated(), }), CustomizeDiff: azure.EventHubAuthorizationRuleCustomizeDiff, diff --git a/azurerm/internal/services/eventhub/resource_arm_eventhub_consumer_group.go b/azurerm/internal/services/eventhub/resource_arm_eventhub_consumer_group.go index 6553378d42005..75d32d0fa6c81 100644 --- a/azurerm/internal/services/eventhub/resource_arm_eventhub_consumer_group.go +++ b/azurerm/internal/services/eventhub/resource_arm_eventhub_consumer_group.go @@ -57,8 +57,6 @@ func resourceArmEventHubConsumerGroup() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), - "location": azure.SchemaLocationDeprecated(), - "user_metadata": { Type: schema.TypeString, Optional: true, diff --git a/azurerm/internal/services/eventhub/resource_arm_eventhub_namespace.go b/azurerm/internal/services/eventhub/resource_arm_eventhub_namespace.go index 75ae45576d158..b3d11deabdd0c 100644 --- a/azurerm/internal/services/eventhub/resource_arm_eventhub_namespace.go +++ b/azurerm/internal/services/eventhub/resource_arm_eventhub_namespace.go @@ -78,13 +78,6 @@ func resourceArmEventHubNamespace() *schema.Resource { Default: false, }, - "kafka_enabled": { - Type: schema.TypeBool, - Optional: true, - Computed: true, - Deprecated: "This field is now automatically set depending on the SKU used - as such it's no longer used and will be removed in 2.0 of the Azure Provider", - }, - "maximum_throughput_units": { Type: schema.TypeInt, Optional: true, @@ -314,9 +307,6 @@ func resourceArmEventHubNamespaceRead(d *schema.ResourceData, meta interface{}) if props := resp.EHNamespaceProperties; props != nil { d.Set("auto_inflate_enabled", props.IsAutoInflateEnabled) d.Set("maximum_throughput_units", int(*props.MaximumThroughputUnits)) - - // TODO: remove me in 2.0 - d.Set("kafka_enabled", props.KafkaEnabled) } ruleset, err := client.GetNetworkRuleSet(ctx, resGroup, name) diff --git a/azurerm/internal/services/eventhub/resource_arm_eventhub_namespace_authorization_rule.go b/azurerm/internal/services/eventhub/resource_arm_eventhub_namespace_authorization_rule.go index 662320cb9b97d..b1e96d35f049a 100644 --- a/azurerm/internal/services/eventhub/resource_arm_eventhub_namespace_authorization_rule.go +++ b/azurerm/internal/services/eventhub/resource_arm_eventhub_namespace_authorization_rule.go @@ -50,8 +50,6 @@ func resourceArmEventHubNamespaceAuthorizationRule() *schema.Resource { }, "resource_group_name": azure.SchemaResourceGroupName(), - - "location": azure.SchemaLocationDeprecated(), }), CustomizeDiff: azure.EventHubAuthorizationRuleCustomizeDiff, diff --git a/website/docs/r/eventhub_namespace.html.markdown b/website/docs/r/eventhub_namespace.html.markdown index 11aabca1bb708..7ae14af1ec139 100644 --- a/website/docs/r/eventhub_namespace.html.markdown +++ b/website/docs/r/eventhub_namespace.html.markdown @@ -49,10 +49,6 @@ The following arguments are supported: * `maximum_throughput_units` - (Optional) Specifies the maximum number of throughput units when Auto Inflate is Enabled. Valid values range from `1` - `20`. -* `kafka_enabled` - (Optional / **Deprecated**) Is Kafka enabled for the EventHub Namespace? Defaults to `false`. - --> **NOTE:** `kafka_enabled` is now configured depending on the `sku` being provisioned, where this is Disabled for a `Basic` sku and Enabled for a Standard sku. - * `tags` - (Optional) A mapping of tags to assign to the resource. * `network_rulesets` - (Optional) A `network_rulesets` block as defined below. From b2777ab8645d21a7d80c97399d2b96adf4759f66 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Mon, 17 Feb 2020 11:50:14 -0800 Subject: [PATCH 175/498] 2.0-dns --- .../services/dns/data_source_dns_zone.go | 7 - .../dns/resource_arm_dns_ns_record.go | 47 +--- .../services/dns/resource_arm_dns_zone.go | 15 - .../tests/resource_arm_dns_ns_record_test.go | 257 ------------------ .../dns/tests/resource_arm_dns_zone_test.go | 1 - website/docs/d/dns_zone.html.markdown | 3 - website/docs/r/dns_ns_record.html.markdown | 8 +- website/docs/r/dns_zone.html.markdown | 6 - 8 files changed, 5 insertions(+), 339 deletions(-) diff --git a/azurerm/internal/services/dns/data_source_dns_zone.go b/azurerm/internal/services/dns/data_source_dns_zone.go index 79f38a81fc4b3..4ee9f56b3eff2 100644 --- a/azurerm/internal/services/dns/data_source_dns_zone.go +++ b/azurerm/internal/services/dns/data_source_dns_zone.go @@ -51,12 +51,6 @@ func dataSourceArmDnsZone() *schema.Resource { Set: schema.HashString, }, - "zone_type": { - Type: schema.TypeString, - Computed: true, - Deprecated: "Private DNS Zones are now supported through a separate resource in Azure & Terraform", - }, - "registration_virtual_network_ids": { Type: schema.TypeList, Computed: true, @@ -114,7 +108,6 @@ func dataSourceArmDnsZoneRead(d *schema.ResourceData, meta interface{}) error { if props := resp.ZoneProperties; props != nil { d.Set("number_of_record_sets", props.NumberOfRecordSets) d.Set("max_number_of_record_sets", props.MaxNumberOfRecordSets) - d.Set("zone_type", props.ZoneType) registrationVNets := make([]string, 0) if rvns := props.RegistrationVirtualNetworks; rvns != nil { diff --git a/azurerm/internal/services/dns/resource_arm_dns_ns_record.go b/azurerm/internal/services/dns/resource_arm_dns_ns_record.go index a1d5e37a85cb3..99a2eff1a6da5 100644 --- a/azurerm/internal/services/dns/resource_arm_dns_ns_record.go +++ b/azurerm/internal/services/dns/resource_arm_dns_ns_record.go @@ -48,28 +48,9 @@ func resourceArmDnsNsRecord() *schema.Resource { }, "records": { - Type: schema.TypeList, - //TODO: add `Required: true` once we remove the `record` attribute - Optional: true, - Computed: true, - Elem: &schema.Schema{Type: schema.TypeString}, - ConflictsWith: []string{"record"}, - }, - - "record": { - Type: schema.TypeSet, - Optional: true, - Computed: true, - Deprecated: "This field has been replaced by `records`", - ConflictsWith: []string{"records"}, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "nsdname": { - Type: schema.TypeString, - Required: true, - }, - }, - }, + Type: schema.TypeList, + Required: true, + Elem: &schema.Schema{Type: schema.TypeString}, }, "ttl": { @@ -174,11 +155,6 @@ func resourceArmDnsNsRecordRead(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("Error settings `records`: %+v", err) } - //TODO: remove this once we remove the `record` attribute - if err := d.Set("record", flattenAzureRmDnsNsRecordsSet(resp.NsRecords)); err != nil { - return fmt.Errorf("Error settings `record`: %+v", err) - } - return tags.FlattenAndSet(d, resp.Metadata) } @@ -234,8 +210,7 @@ func flattenAzureRmDnsNsRecords(records *[]dns.NsRecord) []string { func expandAzureRmDnsNsRecords(d *schema.ResourceData) *[]dns.NsRecord { var records []dns.NsRecord - //TODO: remove this once we remove the `record` attribute - if d.HasChange("records") || !d.HasChange("record") { + if d.HasChange("records") { recordStrings := d.Get("records").([]interface{}) records = make([]dns.NsRecord, len(recordStrings)) for i, v := range recordStrings { @@ -247,20 +222,6 @@ func expandAzureRmDnsNsRecords(d *schema.ResourceData) *[]dns.NsRecord { records[i] = nsRecord } - } else { - recordList := d.Get("record").(*schema.Set).List() - if len(recordList) != 0 { - records = make([]dns.NsRecord, len(recordList)) - for i, v := range recordList { - record := v.(map[string]interface{}) - nsdname := record["nsdname"].(string) - nsRecord := dns.NsRecord{ - Nsdname: &nsdname, - } - - records[i] = nsRecord - } - } } return &records } diff --git a/azurerm/internal/services/dns/resource_arm_dns_zone.go b/azurerm/internal/services/dns/resource_arm_dns_zone.go index 8cbc72e5a3b8b..a073ae37bcf95 100644 --- a/azurerm/internal/services/dns/resource_arm_dns_zone.go +++ b/azurerm/internal/services/dns/resource_arm_dns_zone.go @@ -7,7 +7,6 @@ import ( "github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2018-05-01/dns" "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" @@ -60,17 +59,6 @@ func resourceArmDnsZone() *schema.Resource { Set: schema.HashString, }, - "zone_type": { - Type: schema.TypeString, - Default: string(dns.Public), - Optional: true, - Deprecated: "Use the `azurerm_private_dns_zone` resource instead.", - ValidateFunc: validation.StringInSlice([]string{ - string(dns.Private), - string(dns.Public), - }, false), - }, - "registration_virtual_network_ids": { Type: schema.TypeList, Optional: true, @@ -110,7 +98,6 @@ func resourceArmDnsZoneCreateUpdate(d *schema.ResourceData, meta interface{}) er } location := "global" - zoneType := d.Get("zone_type").(string) t := d.Get("tags").(map[string]interface{}) registrationVirtualNetworkIds := expandDnsZoneRegistrationVirtualNetworkIds(d) @@ -120,7 +107,6 @@ func resourceArmDnsZoneCreateUpdate(d *schema.ResourceData, meta interface{}) er Location: &location, Tags: tags.Expand(t), ZoneProperties: &dns.ZoneProperties{ - ZoneType: dns.ZoneType(zoneType), RegistrationVirtualNetworks: registrationVirtualNetworkIds, ResolutionVirtualNetworks: resolutionVirtualNetworkIds, }, @@ -173,7 +159,6 @@ func resourceArmDnsZoneRead(d *schema.ResourceData, meta interface{}) error { d.Set("resource_group_name", resGroup) d.Set("number_of_record_sets", resp.NumberOfRecordSets) d.Set("max_number_of_record_sets", resp.MaxNumberOfRecordSets) - d.Set("zone_type", resp.ZoneType) registrationVirtualNetworks := flattenDnsZoneRegistrationVirtualNetworkIDs(resp.RegistrationVirtualNetworks) if err := d.Set("registration_virtual_network_ids", registrationVirtualNetworks); err != nil { diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_ns_record_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_ns_record_test.go index f35992c2e2596..f4d159818a33d 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_ns_record_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_ns_record_test.go @@ -13,25 +13,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) -//TODO: remove this once we remove the `record` attribute -func TestAccAzureRMDnsNsRecord_deprecatedBasic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_dns_ns_record", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMDnsNsRecordDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMDnsNsRecord_deprecatedBasic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMDnsNsRecordExists(data.ResourceName), - ), - }, - }, - }) -} - func TestAccAzureRMDnsNsRecord_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_dns_ns_record", "test") @@ -79,33 +60,6 @@ func TestAccAzureRMDnsNsRecord_requiresImport(t *testing.T) { }) } -//TODO: remove this once we remove the `record` attribute -func TestAccAzureRMDnsNsRecord_deprecatedUpdateRecords(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_dns_ns_record", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMDnsNsRecordDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMDnsNsRecord_deprecatedBasic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMDnsNsRecordExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "record.#", "2"), - ), - }, - { - Config: testAccAzureRMDnsNsRecord_deprecatedUpdateRecords(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMDnsNsRecordExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "record.#", "3"), - ), - }, - }, - }) -} - func TestAccAzureRMDnsNsRecord_updateRecords(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_dns_ns_record", "test") @@ -132,60 +86,6 @@ func TestAccAzureRMDnsNsRecord_updateRecords(t *testing.T) { }) } -//TODO: remove this once we remove the `record` attribute -func TestAccAzureRMDnsNsRecord_deprecatedChangeRecordToRecords(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_dns_ns_record", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMDnsNsRecordDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMDnsNsRecord_deprecatedBasic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMDnsNsRecordExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "records.#", "2"), - ), - }, - { - Config: testAccAzureRMDnsNsRecord_deprecatedBasicNewRecords(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMDnsNsRecordExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "records.#", "2"), - ), - }, - }, - }) -} - -//TODO: remove this once we remove the `record` attribute -func TestAccAzureRMDnsNsRecord_deprecatedWithTags(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_dns_ns_record", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMDnsNsRecordDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMDnsNsRecord_deprecatedWithTags(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMDnsNsRecordExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "2"), - ), - }, - { - Config: testAccAzureRMDnsNsRecord_deprecatedWithTagsUpdate(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMDnsNsRecordExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"), - ), - }, - }, - }) -} - func TestAccAzureRMDnsNsRecord_withTags(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_dns_ns_record", "test") @@ -310,60 +210,6 @@ resource "azurerm_dns_ns_record" "import" { `, template) } -//TODO: remove this once we remove the `record` attribute -func testAccAzureRMDnsNsRecord_deprecatedBasic(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_dns_zone" "test" { - name = "acctestzone%d.com" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_dns_ns_record" "test" { - name = "mynsrecord%d" - resource_group_name = "${azurerm_resource_group.test.name}" - zone_name = "${azurerm_dns_zone.test.name}" - ttl = 300 - - record { - nsdname = "ns1.contoso.com" - } - - record { - nsdname = "ns2.contoso.com" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) -} - -//TODO: remove this once we remove the `record` attribute -func testAccAzureRMDnsNsRecord_deprecatedBasicNewRecords(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_dns_zone" "test" { - name = "acctestzone%d.com" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_dns_ns_record" "test" { - name = "mynsrecord%d" - resource_group_name = "${azurerm_resource_group.test.name}" - zone_name = "${azurerm_dns_zone.test.name}" - ttl = 300 - - records = ["ns2.contoso.com", "ns1.contoso.com"] -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) -} - func testAccAzureRMDnsNsRecord_updateRecords(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { @@ -387,40 +233,6 @@ resource "azurerm_dns_ns_record" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) } -//TODO: remove this once we remove the `record` attribute -func testAccAzureRMDnsNsRecord_deprecatedUpdateRecords(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_dns_zone" "test" { - name = "acctestzone%d.com" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_dns_ns_record" "test" { - name = "mynsrecord%d" - resource_group_name = "${azurerm_resource_group.test.name}" - zone_name = "${azurerm_dns_zone.test.name}" - ttl = 300 - - record { - nsdname = "ns1.contoso.com" - } - - record { - nsdname = "ns2.contoso.com" - } - - record { - nsdname = "ns3.contoso.com" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) -} - func testAccAzureRMDnsNsRecord_withTags(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { @@ -449,41 +261,6 @@ resource "azurerm_dns_ns_record" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) } -//TODO: remove this once we remove the `record` attribute -func testAccAzureRMDnsNsRecord_deprecatedWithTags(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_dns_zone" "test" { - name = "acctestzone%d.com" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_dns_ns_record" "test" { - name = "mynsrecord%d" - resource_group_name = "${azurerm_resource_group.test.name}" - zone_name = "${azurerm_dns_zone.test.name}" - ttl = 300 - - record { - nsdname = "ns1.contoso.com" - } - - record { - nsdname = "ns2.contoso.com" - } - - tags = { - environment = "Production" - cost_center = "MSFT" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) -} - func testAccAzureRMDnsNsRecord_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { @@ -510,37 +287,3 @@ resource "azurerm_dns_ns_record" "test" { } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) } - -//TODO: remove this once we remove the `record` attribute -func testAccAzureRMDnsNsRecord_deprecatedWithTagsUpdate(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_dns_zone" "test" { - name = "acctestzone%d.com" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_dns_ns_record" "test" { - name = "mynsrecord%d" - resource_group_name = "${azurerm_resource_group.test.name}" - zone_name = "${azurerm_dns_zone.test.name}" - ttl = 300 - - record { - nsdname = "ns1.contoso.com" - } - - record { - nsdname = "ns2.contoso.com" - } - - tags = { - environment = "staging" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) -} diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_zone_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_zone_test.go index 0d935db321d62..fc0302a2997c1 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_zone_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_zone_test.go @@ -205,7 +205,6 @@ resource "azurerm_virtual_network" "test" { resource "azurerm_dns_zone" "test" { name = "acctestzone%d.com" resource_group_name = "${azurerm_resource_group.test.name}" - zone_type = "Private" registration_virtual_network_ids = ["${azurerm_virtual_network.test.id}"] } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.Locations.Primary, data.RandomInteger) diff --git a/website/docs/d/dns_zone.html.markdown b/website/docs/d/dns_zone.html.markdown index 0ff4c48211cda..dbeac7e854005 100644 --- a/website/docs/d/dns_zone.html.markdown +++ b/website/docs/d/dns_zone.html.markdown @@ -41,9 +41,6 @@ in your subscription that matches `name` will be returned. * `registration_virtual_network_ids` - A list of Virtual Network ID's that register hostnames in this DNS zone. * `resolution_virtual_network_ids` - A list of Virtual Network ID's that resolve records in this DNS zone. * `tags` - A mapping of tags to assign to the EventHub Namespace. -* `zone_type` - (**Deprecated**) The type of this DNS zone, such as `Public` or `Private`. - -~> **Note:** This field is deprecated since Private DNS is now a separate resource and will be removed in 2.0 of the Azure Provider. ## Timeouts diff --git a/website/docs/r/dns_ns_record.html.markdown b/website/docs/r/dns_ns_record.html.markdown index 0774ff5adba72..97341fbf9a291 100644 --- a/website/docs/r/dns_ns_record.html.markdown +++ b/website/docs/r/dns_ns_record.html.markdown @@ -48,16 +48,10 @@ The following arguments are supported: * `ttl` - (Required) The Time To Live (TTL) of the DNS record in seconds. -* `records` - (Optional) A list of values that make up the NS record. *WARNING*: Either `records` or `record` is required. - -* `record` - (Optional) A list of values that make up the NS record. Each `record` block supports fields documented below. This field has been deprecated and will be removed in a future release. +* `records` - (Required) A list of values that make up the NS record. * `tags` - (Optional) A mapping of tags to assign to the resource. -The `record` block supports: - -* `nsdname` - (Required) The value of the record. - ## Attributes Reference The following attributes are exported: diff --git a/website/docs/r/dns_zone.html.markdown b/website/docs/r/dns_zone.html.markdown index 15ea41a3b08fe..230d4da6e0aa3 100644 --- a/website/docs/r/dns_zone.html.markdown +++ b/website/docs/r/dns_zone.html.markdown @@ -21,13 +21,11 @@ resource "azurerm_resource_group" "example" { resource "azurerm_dns_zone" "example-public" { name = "mydomain.com" resource_group_name = azurerm_resource_group.example.name - zone_type = "Public" } resource "azurerm_dns_zone" "example-private" { name = "mydomain.com" resource_group_name = azurerm_resource_group.example.name - zone_type = "Private" } ``` ## Argument Reference @@ -44,10 +42,6 @@ The following arguments are supported: * `tags` - (Optional) A mapping of tags to assign to the resource. -* `zone_type` - (Optional / **Deprecated**) Specifies the type of this DNS zone. Possible values are `Public` or `Private` (Defaults to `Public`). - -~> **NOTE:** This field was part of the initial Preview for Private DNS Zones - which has been [replaced by the separate resource `azurerm_private_dns_zone`](private_dns_zone.html) and will be removed in v2.0 of the Azure Provider. - ## Attributes Reference The following attributes are exported: From 3583ca4d8f2e70a4cb8c64d60d0ea8d572e46095 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Mon, 17 Feb 2020 12:04:56 -0800 Subject: [PATCH 176/498] 2.0-devspace --- .../resource_arm_devspace_controller.go | 83 ++----------------- .../resource_arm_devspace_controller_test.go | 71 ---------------- 2 files changed, 5 insertions(+), 149 deletions(-) diff --git a/azurerm/internal/services/devspace/resource_arm_devspace_controller.go b/azurerm/internal/services/devspace/resource_arm_devspace_controller.go index 12b20d526e244..5bbfd9e51c0f6 100644 --- a/azurerm/internal/services/devspace/resource_arm_devspace_controller.go +++ b/azurerm/internal/services/devspace/resource_arm_devspace_controller.go @@ -53,43 +53,13 @@ func resourceArmDevSpaceController() *schema.Resource { "sku_name": { Type: schema.TypeString, - Optional: true, // required in 2.0 - Computed: true, // remove in 2.0 - //ForceNew: true, // uncomment in 2.0 - this should be fine as there is only 1 valid value - ConflictsWith: []string{"sku"}, + Required: true, + ForceNew: true, ValidateFunc: validation.StringInSlice([]string{ "S1", }, false), }, - "sku": { - Type: schema.TypeList, - Optional: true, - //ForceNew: true, // uncomment in 2.0 - this should be fine as there is only 1 valid value - Computed: true, - ConflictsWith: []string{"sku_name"}, - Deprecated: "This property has been deprecated in favour of the 'sku_name' property and will be removed in version 2.0 of the provider", - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - "S1", - }, false), - }, - "tier": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - string(devspaces.Standard), - }, false), - }, - }, - }, - }, - "target_container_host_resource_id": { Type: schema.TypeString, Required: true, @@ -146,17 +116,9 @@ func resourceArmDevSpaceControllerCreate(d *schema.ResourceData, meta interface{ location := azure.NormalizeLocation(d.Get("location").(string)) t := d.Get("tags").(map[string]interface{}) - var sku *devspaces.Sku - if b, ok := d.GetOk("sku_name"); ok { - var err error - sku, err = expandControllerSkuName(b.(string)) - if err != nil { - return fmt.Errorf("error expanding sku_name for DevSpace Controller %s (Resource Group %q): %v", name, resourceGroup, err) - } - } else if _, ok := d.GetOk("sku"); ok { - sku = expandDevSpaceControllerSku(d) - } else { - return fmt.Errorf("One of `sku` or `sku_name` must be set for DevSpace Controller %q (Resource Group %q)", name, resourceGroup) + sku, err := expandControllerSkuName(d.Get("sku_name").(string)) + if err != nil { + return fmt.Errorf("error expanding `sku_name` for DevSpace Controller %s (Resource Group %q): %v", name, resourceGroup, err) } controller := devspaces.Controller{ @@ -250,10 +212,6 @@ func resourceArmDevSpaceControllerRead(d *schema.ResourceData, meta interface{}) d.Set("sku_name", sku.Name) } - if err := d.Set("sku", flattenDevSpaceControllerSku(resp.Sku)); err != nil { - return fmt.Errorf("Error flattenning `sku`: %+v", err) - } - if props := resp.ControllerProperties; props != nil { d.Set("host_suffix", props.HostSuffix) d.Set("data_plane_fqdn", props.DataPlaneFqdn) @@ -299,34 +257,3 @@ func expandControllerSkuName(skuName string) (*devspaces.Sku, error) { Tier: tier, }, nil } - -func expandDevSpaceControllerSku(d *schema.ResourceData) *devspaces.Sku { - if _, ok := d.GetOk("sku"); !ok { - return nil - } - - skuConfigs := d.Get("sku").([]interface{}) - skuConfig := skuConfigs[0].(map[string]interface{}) - skuName := skuConfig["name"].(string) - skuTier := devspaces.SkuTier(skuConfig["tier"].(string)) - - return &devspaces.Sku{ - Name: &skuName, - Tier: skuTier, - } -} - -func flattenDevSpaceControllerSku(skuObj *devspaces.Sku) []interface{} { - if skuObj == nil { - return []interface{}{} - } - - skuConfig := make(map[string]interface{}) - if skuObj.Name != nil { - skuConfig["name"] = *skuObj.Name - } - - skuConfig["tier"] = skuObj.Tier - - return []interface{}{skuConfig} -} diff --git a/azurerm/internal/services/devspace/tests/resource_arm_devspace_controller_test.go b/azurerm/internal/services/devspace/tests/resource_arm_devspace_controller_test.go index e0f0b48df240c..ff7972fb838e3 100644 --- a/azurerm/internal/services/devspace/tests/resource_arm_devspace_controller_test.go +++ b/azurerm/internal/services/devspace/tests/resource_arm_devspace_controller_test.go @@ -29,29 +29,6 @@ func TestAccAzureRMDevSpaceController_basic(t *testing.T) { Config: testAccAzureRMDevSpaceController_basic(data, clientId, clientSecret), Check: resource.ComposeTestCheckFunc( testCheckAzureRMDevSpaceControllerExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "sku.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "0"), - ), - }, - }, - }) -} - -func TestAccAzureRMDevSpaceController_basicOldSku(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_devspace_controller", "test") - clientId := os.Getenv("ARM_CLIENT_ID") - clientSecret := os.Getenv("ARM_CLIENT_SECRET") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMDevSpaceControllerDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMDevSpaceController_basicOldSku(data, clientId, clientSecret), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMDevSpaceControllerExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "sku.#", "1"), resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "0"), ), }, @@ -193,54 +170,6 @@ resource "azurerm_devspace_controller" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, clientId, clientSecret, data.RandomInteger) } -func testAccAzureRMDevSpaceController_basicOldSku(data acceptance.TestData, clientId string, clientSecret string) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_kubernetes_cluster" "test" { - name = "acctestaks%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - dns_prefix = "acctestaks1" - - linux_profile { - admin_username = "acctestuser1" - - ssh_key { - key_data = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCqaZoyiz1qbdOQ8xEf6uEu1cCwYowo5FHtsBhqLoDnnp7KUTEBN+L2NxRIfQ781rxV6Iq5jSav6b2Q8z5KiseOlvKA/RF2wqU0UPYqQviQhLmW6THTpmrv/YkUCuzxDpsH7DUDhZcwySLKVVe0Qm3+5N2Ta6UYH3lsDf9R9wTP2K/+vAnflKebuypNlmocIvakFWoZda18FOmsOoIVXQ8HWFNCuw9ZCunMSN62QGamCe3dL5cXlkgHYv7ekJE15IA9aOJcM7e90oeTqo+7HTcWfdu0qQqPWY5ujyMw/llas8tsXY85LFqRnr3gJ02bAscjc477+X+j/gkpFoN1QEmt terraform@demo.tld" - } - } - - agent_pool_profile { - name = "default" - count = "1" - vm_size = "Standard_DS2_v2" - } - - service_principal { - client_id = "%s" - client_secret = "%s" - } -} - -resource "azurerm_devspace_controller" "test" { - name = "acctestdsc%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - target_container_host_resource_id = "${azurerm_kubernetes_cluster.test.id}" - target_container_host_credentials_base64 = "${base64encode(azurerm_kubernetes_cluster.test.kube_config_raw)}" - - sku { - name = "S1" - tier = "Standard" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, clientId, clientSecret, data.RandomInteger) -} - func testAccAzureRMDevSpaceController_requiresImport(data acceptance.TestData, clientId string, clientSecret string) string { template := testAccAzureRMDevSpaceController_basic(data, clientId, clientSecret) return fmt.Sprintf(` From fbceb8373435f2f6e22a37f712f121789d638fc4 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Mon, 17 Feb 2020 12:31:06 -0800 Subject: [PATCH 177/498] 2.0-cosmos --- .../cosmos/resource_arm_cosmosdb_account.go | 167 ++---------------- 1 file changed, 11 insertions(+), 156 deletions(-) diff --git a/azurerm/internal/services/cosmos/resource_arm_cosmosdb_account.go b/azurerm/internal/services/cosmos/resource_arm_cosmosdb_account.go index 0bec359d958a8..b8fe4bfb06884 100644 --- a/azurerm/internal/services/cosmos/resource_arm_cosmosdb_account.go +++ b/azurerm/internal/services/cosmos/resource_arm_cosmosdb_account.go @@ -131,43 +131,9 @@ func resourceArmCosmosDbAccount() *schema.Resource { }, }, - // this actually maps to the Location field in the API/SDK on create/update so has been renamed - // failover_policy is just the name of the field we get back from the API on a read - "failover_policy": { - Type: schema.TypeSet, - Optional: true, - Deprecated: "This field has been renamed to 'geo_location' to match Azure's usage", - ConflictsWith: []string{"geo_location"}, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "id": { - Type: schema.TypeString, - Optional: true, - Computed: true, - }, - - "location": { - Type: schema.TypeString, - Required: true, - StateFunc: azure.NormalizeLocation, - DiffSuppressFunc: azure.SuppressLocationDiff, - }, - - "priority": { - Type: schema.TypeInt, - Required: true, - }, - }, - }, - Set: resourceAzureRMCosmosDBAccountFailoverPolicyHash, - }, - "geo_location": { Type: schema.TypeSet, - //Required: true, //todo needs to be required when failover_policy is removed - Optional: true, - Computed: true, - ConflictsWith: []string{"failover_policy"}, + Required: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -349,21 +315,10 @@ func resourceArmCosmosDbAccountCreate(d *schema.ResourceData, meta interface{}) return fmt.Errorf("CosmosDB Account %s already exists, please import the resource via terraform import", name) } - //hacky, todo fix up once deprecated field 'failover_policy' is removed - var geoLocations []documentdb.Location - if _, ok := d.GetOk("geo_location"); ok { - geoLocations, err = expandAzureRmCosmosDBAccountGeoLocations(name, d) - if err != nil { - return fmt.Errorf("Error expanding CosmosDB Account %q (Resource Group %q) geo locations: %+v", name, resourceGroup, err) - } - } else if _, ok := d.GetOk("failover_policy"); ok { - geoLocations, err = expandAzureRmCosmosDBAccountFailoverPolicy(name, d) - if err != nil { - return fmt.Errorf("Error expanding CosmosDB Account %q (Resource Group %q) failover_policy: %+v", name, resourceGroup, err) - } - } else { - //could be a CustomizeDiff?, but this is temporary - return fmt.Errorf("Neither `geo_location` or `failover_policy` is set for CosmosDB Account %s", name) + + geoLocations, err := expandAzureRmCosmosDBAccountGeoLocations(name, d) + if err != nil { + return fmt.Errorf("Error expanding CosmosDB Account %q (Resource Group %q) geo locations: %+v", name, resourceGroup, err) } account := documentdb.DatabaseAccountCreateUpdateParameters{ @@ -429,22 +384,9 @@ func resourceArmCosmosDbAccountUpdate(d *schema.ResourceData, meta interface{}) enableAutomaticFailover := d.Get("enable_automatic_failover").(bool) enableMultipleWriteLocations := d.Get("enable_multiple_write_locations").(bool) - //hacky, todo fix up once deprecated field 'failover_policy' is removed - var newLocations []documentdb.Location - var err error - if _, ok := d.GetOk("geo_location"); ok { - newLocations, err = expandAzureRmCosmosDBAccountGeoLocations(name, d) - if err != nil { - return fmt.Errorf("Error expanding CosmosDB Account %q (Resource Group %q) geo locations: %+v", name, resourceGroup, err) - } - } else if _, ok := d.GetOk("failover_policy"); ok { - newLocations, err = expandAzureRmCosmosDBAccountFailoverPolicy(name, d) - if err != nil { - return fmt.Errorf("Error expanding CosmosDB Account %q (Resource Group %q) failover_policy: %+v", name, resourceGroup, err) - } - } else { - //could be a CustomizeDiff?, but this is temporary - return fmt.Errorf("Neither `geo_location` or `failover_policy` is set for CosmosDB Account '%s'", name) + newLocations, err := expandAzureRmCosmosDBAccountGeoLocations(name, d) + if err != nil { + return fmt.Errorf("Error expanding CosmosDB Account %q (Resource Group %q) geo locations: %+v", name, resourceGroup, err) } //get existing locations (if exists) @@ -592,15 +534,9 @@ func resourceArmCosmosDbAccountRead(d *schema.ResourceData, meta interface{}) er if err = d.Set("consistency_policy", flattenAzureRmCosmosDBAccountConsistencyPolicy(resp.ConsistencyPolicy)); err != nil { return fmt.Errorf("Error setting CosmosDB Account %q `consistency_policy` (Resource Group %q): %+v", name, resourceGroup, err) } - if _, ok := d.GetOk("failover_policy"); ok { - if err = d.Set("failover_policy", flattenAzureRmCosmosDBAccountFailoverPolicy(resp.FailoverPolicies)); err != nil { - return fmt.Errorf("Error setting `failover_policy`: %+v", err) - } - } else { - //if failover policy isn't default to using geo_location - if err = d.Set("geo_location", flattenAzureRmCosmosDBAccountGeoLocations(d, resp)); err != nil { - return fmt.Errorf("Error setting `geo_location`: %+v", err) - } + + if err = d.Set("geo_location", flattenAzureRmCosmosDBAccountGeoLocations(d, resp)); err != nil { + return fmt.Errorf("Error setting `geo_location`: %+v", err) } if err = d.Set("capabilities", flattenAzureRmCosmosDBAccountCapabilities(resp.Capabilities)); err != nil { @@ -859,54 +795,6 @@ func expandAzureRmCosmosDBAccountGeoLocations(databaseName string, d *schema.Res return locations, nil } -// todo remove when deprecated field `failover_policy` is -func expandAzureRmCosmosDBAccountFailoverPolicy(databaseName string, d *schema.ResourceData) ([]documentdb.Location, error) { - input := d.Get("failover_policy").(*schema.Set).List() - locations := make([]documentdb.Location, 0, len(input)) - - for _, configRaw := range input { - data := configRaw.(map[string]interface{}) - - locationName := azure.NormalizeLocation(data["location"].(string)) - id := fmt.Sprintf("%s-%s", databaseName, locationName) - failoverPriority := int32(data["priority"].(int)) - - location := documentdb.Location{ - ID: &id, - LocationName: &locationName, - FailoverPriority: &failoverPriority, - } - - locations = append(locations, location) - } - - containsWriteLocation := false - writeFailoverPriority := int32(0) - for _, location := range locations { - if *location.FailoverPriority == writeFailoverPriority { - containsWriteLocation = true - break - } - } - - // all priorities must be unique - locationIds := make(map[int]struct{}, len(locations)) - for _, location := range locations { - priority := int(*location.FailoverPriority) - if _, ok := locationIds[priority]; ok { - return nil, fmt.Errorf("Each Failover Policy needs to be unique") - } - - locationIds[priority] = struct{}{} - } - - if !containsWriteLocation { - return nil, fmt.Errorf("Failover Policy should contain a Write Location (Location '0')") - } - - return locations, nil -} - func expandAzureRmCosmosDBAccountCapabilities(d *schema.ResourceData) *[]documentdb.Capability { capabilities := d.Get("capabilities").(*schema.Set).List() s := make([]documentdb.Capability, 0) @@ -943,25 +831,6 @@ func flattenAzureRmCosmosDBAccountConsistencyPolicy(policy *documentdb.Consisten return []interface{}{result} } -// todo remove when failover_policy field is removed -func flattenAzureRmCosmosDBAccountFailoverPolicy(list *[]documentdb.FailoverPolicy) *schema.Set { - results := schema.Set{ - F: resourceAzureRMCosmosDBAccountFailoverPolicyHash, - } - - for _, i := range *list { - result := map[string]interface{}{ - "id": *i.ID, - "location": azure.NormalizeLocation(*i.LocationName), - "priority": int(*i.FailoverPriority), - } - - results.Add(result) - } - - return &results -} - func flattenAzureRmCosmosDBAccountGeoLocations(d *schema.ResourceData, account documentdb.DatabaseAccount) *schema.Set { locationSet := schema.Set{ F: resourceAzureRMCosmosDBAccountGeoLocationHash, @@ -1029,20 +898,6 @@ func flattenAzureRmCosmosDBAccountVirtualNetworkRules(rules *[]documentdb.Virtua return &results } -// todo remove once deprecated field `failover_policy` is removed -func resourceAzureRMCosmosDBAccountFailoverPolicyHash(v interface{}) int { - var buf bytes.Buffer - - if m, ok := v.(map[string]interface{}); ok { - location := azure.NormalizeLocation(m["location"].(string)) - priority := int32(m["priority"].(int)) - - buf.WriteString(fmt.Sprintf("%s-%d", location, priority)) - } - - return hashcode.String(buf.String()) -} - func resourceAzureRMCosmosDBAccountGeoLocationHash(v interface{}) int { var buf bytes.Buffer From 956284bce4fe744089d6a47bf45d4733cec7b948 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Mon, 17 Feb 2020 13:05:59 -0800 Subject: [PATCH 178/498] 2.0-cosmos --- .../services/cosmos/resource_arm_cosmosdb_account.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/azurerm/internal/services/cosmos/resource_arm_cosmosdb_account.go b/azurerm/internal/services/cosmos/resource_arm_cosmosdb_account.go index b8fe4bfb06884..cf632b22bdc6a 100644 --- a/azurerm/internal/services/cosmos/resource_arm_cosmosdb_account.go +++ b/azurerm/internal/services/cosmos/resource_arm_cosmosdb_account.go @@ -132,8 +132,8 @@ func resourceArmCosmosDbAccount() *schema.Resource { }, "geo_location": { - Type: schema.TypeSet, - Required: true, + Type: schema.TypeSet, + Required: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -315,7 +315,6 @@ func resourceArmCosmosDbAccountCreate(d *schema.ResourceData, meta interface{}) return fmt.Errorf("CosmosDB Account %s already exists, please import the resource via terraform import", name) } - geoLocations, err := expandAzureRmCosmosDBAccountGeoLocations(name, d) if err != nil { return fmt.Errorf("Error expanding CosmosDB Account %q (Resource Group %q) geo locations: %+v", name, resourceGroup, err) From 4497bb45ad6e030ba73438c916413f719c844047 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Mon, 17 Feb 2020 13:27:50 -0800 Subject: [PATCH 179/498] 2.0-cognitive --- .../resource_arm_cognitive_account.go | 94 ++----------------- .../resource_arm_cognitive_account_test.go | 44 --------- 2 files changed, 8 insertions(+), 130 deletions(-) diff --git a/azurerm/internal/services/cognitive/resource_arm_cognitive_account.go b/azurerm/internal/services/cognitive/resource_arm_cognitive_account.go index d59372452d1ab..7882aea3fbaef 100644 --- a/azurerm/internal/services/cognitive/resource_arm_cognitive_account.go +++ b/azurerm/internal/services/cognitive/resource_arm_cognitive_account.go @@ -91,45 +91,13 @@ func resourceArmCognitiveAccount() *schema.Resource { }, "sku_name": { - Type: schema.TypeString, - Optional: true, // required in 2.0 - Computed: true, // remove in 2.0 - ConflictsWith: []string{"sku"}, + Type: schema.TypeString, + Required: true, ValidateFunc: validation.StringInSlice([]string{ "F0", "F1", "S0", "S1", "S2", "S3", "S4", "S5", "S6", "P0", "P1", "P2", }, false), }, - "sku": { - Type: schema.TypeList, - Optional: true, - Computed: true, - ConflictsWith: []string{"sku_name"}, - Deprecated: "This property has been deprecated in favour of the 'sku_name' property and will be removed in version 2.0 of the provider", - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - "F0", "F1", "S0", "S1", "S2", "S3", "S4", "S5", "S6", "P0", "P1", "P2", - }, false), - }, - - "tier": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - string(cognitiveservices.Free), - string(cognitiveservices.Standard), - string(cognitiveservices.Premium), - }, false), - }, - }, - }, - }, - "tags": tags.Schema(), "endpoint": { @@ -173,17 +141,9 @@ func resourceArmCognitiveAccountCreate(d *schema.ResourceData, meta interface{}) } } - var sku *cognitiveservices.Sku - if b, ok := d.GetOk("sku_name"); ok { - var err error - sku, err = expandAccountSkuName(b.(string)) - if err != nil { - return fmt.Errorf("error expanding sku_name for Cognitive Account %s (Resource Group %q): %v", name, resourceGroup, err) - } - } else if _, ok := d.GetOk("sku"); ok { - sku = expandCognitiveAccountSku(d) - } else { - return fmt.Errorf("One of `sku` or `sku_name` must be set for Cognitive Account %q (Resource Group %q)", name, resourceGroup) + sku, err := expandAccountSkuName(d.Get("sku_name").(string)) + if err != nil { + return fmt.Errorf("error expanding sku_name for Cognitive Account %s (Resource Group %q): %v", name, resourceGroup, err) } properties := cognitiveservices.Account{ @@ -218,17 +178,9 @@ func resourceArmCognitiveAccountUpdate(d *schema.ResourceData, meta interface{}) return err } - var sku *cognitiveservices.Sku - if b, ok := d.GetOk("sku_name"); ok { - var err error - sku, err = expandAccountSkuName(b.(string)) - if err != nil { - return fmt.Errorf("error expanding sku_name for Cognitive Account %s (Resource Group %q): %v", id.Name, id.ResourceGroup, err) - } - } else if _, ok := d.GetOk("sku"); ok { - sku = expandCognitiveAccountSku(d) - } else { - return fmt.Errorf("One of `sku` or `sku_name` must be set for Cognitive Account %q (Resource Group %q)", id.Name, id.ResourceGroup) + sku, err := expandAccountSkuName(d.Get("sku_name").(string)) + if err != nil { + return fmt.Errorf("error expanding sku_name for Cognitive Account %s (Resource Group %q): %v", id.Name, id.ResourceGroup, err) } properties := cognitiveservices.Account{ @@ -276,10 +228,6 @@ func resourceArmCognitiveAccountRead(d *schema.ResourceData, meta interface{}) e d.Set("sku_name", sku.Name) } - if err = d.Set("sku", flattenCognitiveAccountSku(resp.Sku)); err != nil { - return fmt.Errorf("Error setting `sku`: %+v", err) - } - if props := resp.Properties; props != nil { d.Set("endpoint", props.Endpoint) } @@ -339,29 +287,3 @@ func expandAccountSkuName(skuName string) (*cognitiveservices.Sku, error) { Tier: tier, }, nil } - -func expandCognitiveAccountSku(d *schema.ResourceData) *cognitiveservices.Sku { - skus := d.Get("sku").([]interface{}) - sku := skus[0].(map[string]interface{}) - - return &cognitiveservices.Sku{ - Name: utils.String(sku["name"].(string)), - Tier: cognitiveservices.SkuTier(sku["tier"].(string)), - } -} - -func flattenCognitiveAccountSku(input *cognitiveservices.Sku) []interface{} { - if input == nil { - return []interface{}{} - } - - m := map[string]interface{}{ - "tier": string(input.Tier), - } - - if v := input.Name; v != nil { - m["name"] = *v - } - - return []interface{}{m} -} diff --git a/azurerm/internal/services/cognitive/tests/resource_arm_cognitive_account_test.go b/azurerm/internal/services/cognitive/tests/resource_arm_cognitive_account_test.go index 4ad47191f12d1..f09e0e1011dc3 100644 --- a/azurerm/internal/services/cognitive/tests/resource_arm_cognitive_account_test.go +++ b/azurerm/internal/services/cognitive/tests/resource_arm_cognitive_account_test.go @@ -37,29 +37,6 @@ func TestAccAzureRMCognitiveAccount_basic(t *testing.T) { }) } -func TestAccAzureRMCognitiveAccount_basicOldSku(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_cognitive_account", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMAppCognitiveAccountDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMCognitiveAccount_basicOldSku(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMCognitiveAccountExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "kind", "Face"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "0"), - resource.TestCheckResourceAttrSet(data.ResourceName, "primary_access_key"), - resource.TestCheckResourceAttrSet(data.ResourceName, "secondary_access_key"), - ), - }, - data.ImportStep(), - }, - }) -} - func TestAccAzureRMCognitiveAccount_speechServices(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_cognitive_account", "test") @@ -241,27 +218,6 @@ resource "azurerm_cognitive_account" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } -func testAccAzureRMCognitiveAccount_basicOldSku(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_cognitive_account" "test" { - name = "acctestcogacc-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - kind = "Face" - - sku { - name = "S0" - tier = "Standard" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - func testAccAzureRMCognitiveAccount_speechServices(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { From 38dd127eaf9ee2d5cfc0a30bf82b33dfb07834ca Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Mon, 17 Feb 2020 22:14:30 -0800 Subject: [PATCH 180/498] 2.0-automation --- .../resource_arm_automation_account.go | 67 +--------------- .../resource_arm_automation_credential.go | 30 ++----- .../resource_arm_automation_schedule.go | 49 ++---------- .../resource_arm_automation_account_test.go | 78 ------------------- .../guides/2.0-upgrade-guide.html.markdown | 4 + 5 files changed, 19 insertions(+), 209 deletions(-) diff --git a/azurerm/internal/services/automation/resource_arm_automation_account.go b/azurerm/internal/services/automation/resource_arm_automation_account.go index bc04ffee144b9..ed612228403b2 100644 --- a/azurerm/internal/services/automation/resource_arm_automation_account.go +++ b/azurerm/internal/services/automation/resource_arm_automation_account.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" @@ -47,34 +46,9 @@ func resourceArmAutomationAccount() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), - // Remove in 2.0 - "sku": { - Type: schema.TypeList, - Optional: true, - Computed: true, - Deprecated: "This property has been deprecated in favour of the 'sku_name' property and will be removed in version 2.0 of the provider", - ConflictsWith: []string{"sku_name"}, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Optional: true, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validation.StringInSlice([]string{ - string(automation.Basic), - string(automation.Free), - }, true), - }, - }, - }, - }, - "sku_name": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ConflictsWith: []string{"sku"}, + Type: schema.TypeString, + Required: true, ValidateFunc: validation.StringInSlice([]string{ string(automation.Basic), string(automation.Free), @@ -104,25 +78,8 @@ func resourceArmAutomationAccountCreateUpdate(d *schema.ResourceData, meta inter ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() - // Remove in 2.0 - var sku automation.Sku - - if inputs := d.Get("sku").([]interface{}); len(inputs) != 0 { - input := inputs[0].(map[string]interface{}) - v := input["name"].(string) - - sku = automation.Sku{ - Name: automation.SkuNameEnum(v), - } - } else { - // Keep in 2.0 - sku = automation.Sku{ - Name: automation.SkuNameEnum(d.Get("sku_name").(string)), - } - } - - if sku.Name == "" { - return fmt.Errorf("either 'sku_name' or 'sku' must be defined in the configuration file") + sku := automation.Sku{ + Name: automation.SkuNameEnum(d.Get("sku_name").(string)), } log.Printf("[INFO] preparing arguments for Automation Account create/update.") @@ -214,11 +171,6 @@ func resourceArmAutomationAccountRead(d *schema.ResourceData, meta interface{}) } if sku := resp.Sku; sku != nil { - // Remove in 2.0 - if err := d.Set("sku", flattenAutomationAccountSku(sku)); err != nil { - return fmt.Errorf("Error setting 'sku': %+v", err) - } - if err := d.Set("sku_name", string(sku.Name)); err != nil { return fmt.Errorf("Error setting 'sku_name': %+v", err) } @@ -263,14 +215,3 @@ func resourceArmAutomationAccountDelete(d *schema.ResourceData, meta interface{} return nil } - -// Remove in 2.0 -func flattenAutomationAccountSku(sku *automation.Sku) []interface{} { - if sku == nil { - return []interface{}{} - } - - result := map[string]interface{}{} - result["name"] = string(sku.Name) - return []interface{}{result} -} diff --git a/azurerm/internal/services/automation/resource_arm_automation_credential.go b/azurerm/internal/services/automation/resource_arm_automation_credential.go index 13d9a8040d09d..62e01a9cea3ff 100644 --- a/azurerm/internal/services/automation/resource_arm_automation_credential.go +++ b/azurerm/internal/services/automation/resource_arm_automation_credential.go @@ -42,24 +42,11 @@ func resourceArmAutomationCredential() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), - //this is AutomationAccountName in the SDK - "account_name": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ForceNew: true, - Deprecated: "account_name has been renamed to automation_account_name for clarity and to match the azure API", - ConflictsWith: []string{"automation_account_name"}, - ValidateFunc: azure.ValidateAutomationAccountName(), - }, - "automation_account_name": { - Type: schema.TypeString, - Optional: true, //todo change to required once account_name has been removed - Computed: true, // todo remove once account_name has been removed - ForceNew: true, - ConflictsWith: []string{"account_name"}, // todo remove once account_name has been removed - ValidateFunc: azure.ValidateAutomationAccountName(), + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: azure.ValidateAutomationAccountName(), }, "username": { @@ -90,13 +77,7 @@ func resourceArmAutomationCredentialCreateUpdate(d *schema.ResourceData, meta in name := d.Get("name").(string) resGroup := d.Get("resource_group_name").(string) - // todo remove this once `account_name` is removed - accountName := "" - if v, ok := d.GetOk("automation_account_name"); ok { - accountName = v.(string) - } else if v, ok := d.GetOk("account_name"); ok { - accountName = v.(string) - } + accountName := d.Get("automation_account_name").(string) if features.ShouldResourcesBeImported() && d.IsNewResource() { existing, err := client.Get(ctx, resGroup, accountName, name) @@ -168,7 +149,6 @@ func resourceArmAutomationCredentialRead(d *schema.ResourceData, meta interface{ d.Set("name", resp.Name) d.Set("resource_group_name", resGroup) d.Set("automation_account_name", accountName) - d.Set("account_name", accountName) if props := resp.CredentialProperties; props != nil { d.Set("username", props.UserName) } diff --git a/azurerm/internal/services/automation/resource_arm_automation_schedule.go b/azurerm/internal/services/automation/resource_arm_automation_schedule.go index dd889645a0b85..e89b2d8a7178a 100644 --- a/azurerm/internal/services/automation/resource_arm_automation_schedule.go +++ b/azurerm/internal/services/automation/resource_arm_automation_schedule.go @@ -49,23 +49,12 @@ func resourceArmAutomationSchedule() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), - //this is AutomationAccountName in the SDK - "account_name": { - Type: schema.TypeString, - Optional: true, - Computed: true, - Deprecated: "account_name has been renamed to automation_account_name for clarity and to match the azure API", - ConflictsWith: []string{"automation_account_name"}, - ValidateFunc: azure.ValidateAutomationAccountName(), - }, - "automation_account_name": { - Type: schema.TypeString, - Optional: true, //todo change to required once account_name has been removed - Computed: true, - //ForceNew: true, //todo this needs to come back once account_name has been removed - ConflictsWith: []string{"account_name"}, - ValidateFunc: azure.ValidateAutomationAccountName(), + Type: schema.TypeString, + Required: true, + Computed: true, + ForceNew: true, + ValidateFunc: azure.ValidateAutomationAccountName(), }, "frequency": { @@ -206,24 +195,6 @@ func resourceArmAutomationSchedule() *schema.Resource { return fmt.Errorf("`monthly_occurrence` can only be set when frequency is `Month`") } - _, hasAccount := diff.GetOk("automation_account_name") - _, hasAutomationAccountWeb := diff.GetOk("account_name") - if !hasAccount && !hasAutomationAccountWeb { - return fmt.Errorf("`automation_account_name` must be set") - } - - //if automation_account_name changed or account_name changed to or from nil force a new resource - //remove once we remove the deprecated property - oAan, nAan := diff.GetChange("automation_account_name") - if oAan != "" && nAan != "" { - diff.ForceNew("automation_account_name") - } - - oAn, nAn := diff.GetChange("account_name") - if oAn != "" && nAn != "" { - diff.ForceNew("account_name") - } - return nil }, } @@ -238,14 +209,7 @@ func resourceArmAutomationScheduleCreateUpdate(d *schema.ResourceData, meta inte name := d.Get("name").(string) resGroup := d.Get("resource_group_name").(string) - //CustomizeDiff should ensure one of these two is set - // todo remove this once `account_name` is removed - accountName := "" - if v, ok := d.GetOk("automation_account_name"); ok { - accountName = v.(string) - } else if v, ok := d.GetOk("account_name"); ok { - accountName = v.(string) - } + accountName := d.Get("automation_account_name").(string) if features.ShouldResourcesBeImported() && d.IsNewResource() { existing, err := client.Get(ctx, resGroup, accountName, name) @@ -350,7 +314,6 @@ func resourceArmAutomationScheduleRead(d *schema.ResourceData, meta interface{}) d.Set("name", resp.Name) d.Set("resource_group_name", resGroup) d.Set("automation_account_name", accountName) - d.Set("account_name", accountName) // todo remove once `account_name` is removed d.Set("frequency", string(resp.Frequency)) if v := resp.StartTime; v != nil { diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_account_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_account_test.go index a44de6d452e4f..f2d6252cce6fe 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_account_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_account_test.go @@ -2,7 +2,6 @@ package tests import ( "fmt" - "regexp" "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" @@ -36,47 +35,6 @@ func TestAccAzureRMAutomationAccount_basic(t *testing.T) { }) } -// Remove in 2.0 -func TestAccAzureRMAutomationAccount_basicClassic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_automation_account", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMAutomationAccountDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMAutomationAccount_basicClassic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMAutomationAccountExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.name", "Basic"), - resource.TestCheckResourceAttrSet(data.ResourceName, "dsc_server_endpoint"), - resource.TestCheckResourceAttrSet(data.ResourceName, "dsc_primary_access_key"), - resource.TestCheckResourceAttrSet(data.ResourceName, "dsc_secondary_access_key"), - ), - }, - data.ImportStep(), - }, - }) -} - -// Remove in 2.0 -func TestAccAzureRMAutomationAccount_basicNotDefined(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_automation_account", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMAutomationAccountDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMAutomationAccount_basicNotDefined(data), - ExpectError: regexp.MustCompile("either 'sku_name' or 'sku' must be defined in the configuration file"), - }, - }, - }) -} - func TestAccAzureRMAutomationAccount_requiresImport(t *testing.T) { if !features.ShouldResourcesBeImported() { t.Skip("Skipping since resources aren't required to be imported") @@ -200,42 +158,6 @@ resource "azurerm_automation_account" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } -// Remove in 2.0 -func testAccAzureRMAutomationAccount_basicClassic(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_automation_account" "test" { - name = "acctest-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "Basic" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - -// Remove in 2.0 -func testAccAzureRMAutomationAccount_basicNotDefined(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_automation_account" "test" { - name = "acctest-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - func testAccAzureRMAutomationAccount_requiresImport(data acceptance.TestData) string { template := testAccAzureRMAutomationAccount_basic(data) return fmt.Sprintf(` diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index da2deff1552e6..e7aaca896b1ec 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -225,6 +225,10 @@ The deprecated `ip_address_list` field in the `backend_address_pool` block will The default value for the `body` field within the `match` block will change from `*` to an empty string. +### Resource: `azurerm_automation_account` + +The deprecated `sku` block has been replaced by the `sku_name` field and will be removed. + ### Resource: `azurerm_automation_credential` The deprecated `account_name` field will be removed. This has been deprecated in favour of the `automation_account_name` field. From ef5a2b76e416aa587637c9dc0ed99fdfe2a46d8e Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Mon, 17 Feb 2020 22:17:27 -0800 Subject: [PATCH 181/498] Remove deadcode --- .../services/dns/resource_arm_dns_ns_record.go | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/azurerm/internal/services/dns/resource_arm_dns_ns_record.go b/azurerm/internal/services/dns/resource_arm_dns_ns_record.go index 99a2eff1a6da5..77ff7a4c4846a 100644 --- a/azurerm/internal/services/dns/resource_arm_dns_ns_record.go +++ b/azurerm/internal/services/dns/resource_arm_dns_ns_record.go @@ -180,21 +180,6 @@ func resourceArmDnsNsRecordDelete(d *schema.ResourceData, meta interface{}) erro return nil } -//TODO: remove this once we remove the `record` attribute -func flattenAzureRmDnsNsRecordsSet(records *[]dns.NsRecord) []map[string]interface{} { - results := make([]map[string]interface{}, 0, len(*records)) - - if records != nil { - for _, record := range *records { - nsRecord := make(map[string]interface{}) - nsRecord["nsdname"] = *record.Nsdname - results = append(results, nsRecord) - } - } - - return results -} - func flattenAzureRmDnsNsRecords(records *[]dns.NsRecord) []string { results := make([]string, 0, len(*records)) From 5851764e2b813ee970603fa66f38c61bc27a69ac Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 18 Feb 2020 07:31:25 +0100 Subject: [PATCH 182/498] updating to include #5797 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 117366c22c229..84c2c7339a68f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ BREAKING CHANGES: * `azurerm_azuread_application` - This resource has been removed since it was deprecated [GH-5748] * `azurerm_azuread_service_principal_password` - This resource has been removed since it was deprecated [GH-5748] * `azurerm_azuread_service_principal` - This resource has been removed since it was deprecated [GH-5748] +* `azurerm_cognitive_account` - removing the deprecated `sku_name` block [GH-5797] * `azurerm_container_service` - This resource has been removed since it was deprecated [GH-5709] * `azurerm_iot_dps` - This resource has been removed since it was deprecated [GH-5753] * `azurerm_iot_dps_certificate` - This resource has been removed since it was deprecated [GH-5753] From 15eb7351bc763ffbf26788926e17e035cd6f9e9b Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 18 Feb 2020 11:55:57 +0100 Subject: [PATCH 183/498] r/subnet: removing the inline `route_table_id` and `network_security_group_id` fields --- ...rce_arm_kubernetes_cluster_network_test.go | 17 - ...e_arm_kubernetes_cluster_node_pool_test.go | 5 - .../resource_arm_databricks_workspace_test.go | 8 - .../services/network/data_source_subnet.go | 39 +- .../services/network/resource_arm_subnet.go | 314 ++++----- .../network/tests/data_source_subnet_test.go | 189 +++-- ...arm_subnet_nat_gateway_association_test.go | 107 ++- ...network_security_group_association_test.go | 102 ++- ...arm_subnet_route_table_association_test.go | 118 +++- .../network/tests/resource_arm_subnet_test.go | 659 ++++-------------- .../resource_arm_virtual_network_test.go | 84 --- website/docs/d/subnet.html.markdown | 1 - website/docs/r/subnet.html.markdown | 11 +- ...k_security_group_association.html.markdown | 1 - 14 files changed, 628 insertions(+), 1027 deletions(-) diff --git a/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_network_test.go b/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_network_test.go index 1e40fe777f51c..e42a2ed19ecff 100644 --- a/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_network_test.go +++ b/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_network_test.go @@ -595,11 +595,6 @@ resource "azurerm_subnet" "test" { resource_group_name = azurerm_resource_group.test.name virtual_network_name = azurerm_virtual_network.test.name address_prefix = "10.1.0.0/24" - - # TODO: remove in 2.0 - lifecycle { - ignore_changes = ["route_table_id"] - } } resource "azurerm_kubernetes_cluster" "test" { @@ -667,11 +662,6 @@ resource "azurerm_subnet" "test" { resource_group_name = azurerm_resource_group.test.name virtual_network_name = azurerm_virtual_network.test.name address_prefix = "10.1.0.0/24" - - # TODO: remove in 2.0 - lifecycle { - ignore_changes = ["route_table_id"] - } } resource "azurerm_subnet_route_table_association" "test" { @@ -802,7 +792,6 @@ resource "azurerm_subnet" "test" { resource_group_name = azurerm_resource_group.test.name virtual_network_name = azurerm_virtual_network.test.name address_prefix = "10.1.0.0/24" - route_table_id = azurerm_route_table.test.id } resource "azurerm_subnet_route_table_association" "test" { @@ -894,11 +883,6 @@ resource "azurerm_subnet" "test" { resource_group_name = azurerm_resource_group.test.name virtual_network_name = azurerm_virtual_network.test.name address_prefix = "172.0.2.0/24" - - # TODO: remove in 2.0 - lifecycle { - ignore_changes = ["route_table_id"] - } } resource "azurerm_kubernetes_cluster" "test" { @@ -1062,7 +1046,6 @@ resource "azurerm_subnet" "test" { resource_group_name = azurerm_resource_group.test.name virtual_network_name = azurerm_virtual_network.test.name address_prefix = "10.1.0.0/24" - route_table_id = azurerm_route_table.test.id } resource "azurerm_subnet_route_table_association" "test" { diff --git a/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_node_pool_test.go b/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_node_pool_test.go index 800c1bbbe403b..3bc04511a7733 100644 --- a/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_node_pool_test.go +++ b/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_node_pool_test.go @@ -1079,11 +1079,6 @@ resource "azurerm_subnet" "test" { resource_group_name = azurerm_resource_group.test.name virtual_network_name = azurerm_virtual_network.test.name address_prefix = "10.1.0.0/24" - - # TODO: remove in 2.0 - lifecycle { - ignore_changes = ["route_table_id"] - } } resource "azurerm_subnet_route_table_association" "test" { diff --git a/azurerm/internal/services/databricks/tests/resource_arm_databricks_workspace_test.go b/azurerm/internal/services/databricks/tests/resource_arm_databricks_workspace_test.go index 65bd9fbb5ce8e..79c28089bfb24 100644 --- a/azurerm/internal/services/databricks/tests/resource_arm_databricks_workspace_test.go +++ b/azurerm/internal/services/databricks/tests/resource_arm_databricks_workspace_test.go @@ -308,10 +308,6 @@ resource "azurerm_subnet" "public" { ] } } - - lifecycle { - ignore_changes = ["network_security_group_id"] - } } resource "azurerm_subnet" "private" { @@ -333,10 +329,6 @@ resource "azurerm_subnet" "private" { ] } } - - lifecycle { - ignore_changes = ["network_security_group_id"] - } } resource "azurerm_network_security_group" "nsg" { diff --git a/azurerm/internal/services/network/data_source_subnet.go b/azurerm/internal/services/network/data_source_subnet.go index befd916815880..752579d715852 100644 --- a/azurerm/internal/services/network/data_source_subnet.go +++ b/azurerm/internal/services/network/data_source_subnet.go @@ -2,7 +2,6 @@ package network import ( "fmt" - "strings" "time" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -51,13 +50,6 @@ func dataSourceArmSubnet() *schema.Resource { Computed: true, }, - "ip_configurations": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Schema{Type: schema.TypeString}, - Set: schema.HashString, - }, - "service_endpoints": { Type: schema.TypeList, Computed: true, @@ -104,32 +96,23 @@ func dataSourceArmSubnetRead(d *schema.ResourceData, meta interface{}) error { if props := resp.SubnetPropertiesFormat; props != nil { d.Set("address_prefix", props.AddressPrefix) - if pe := props.PrivateEndpointNetworkPolicies; pe != nil { - d.Set("enforce_private_link_endpoint_network_policies", strings.EqualFold("Disabled", *pe)) - } - - if ps := props.PrivateLinkServiceNetworkPolicies; ps != nil { - d.Set("enforce_private_link_service_network_policies", strings.EqualFold("Disabled", *ps)) - } - - if props.NetworkSecurityGroup != nil { - d.Set("network_security_group_id", props.NetworkSecurityGroup.ID) - } else { - d.Set("network_security_group_id", "") - } + d.Set("enforce_private_link_endpoint_network_policies", flattenSubnetPrivateLinkNetworkPolicy(props.PrivateEndpointNetworkPolicies)) + d.Set("enforce_private_link_service_network_policies", flattenSubnetPrivateLinkNetworkPolicy(props.PrivateLinkServiceNetworkPolicies)) - if props.RouteTable != nil { - d.Set("route_table_id", props.RouteTable.ID) - } else { - d.Set("route_table_id", "") + networkSecurityGroupId := "" + if props.NetworkSecurityGroup != nil && props.NetworkSecurityGroup.ID != nil { + networkSecurityGroupId = *props.NetworkSecurityGroup.ID } + d.Set("network_security_group_id", networkSecurityGroupId) - if err := d.Set("ip_configurations", flattenSubnetIPConfigurations(props.IPConfigurations)); err != nil { - return err + routeTableId := "" + if props.RouteTable != nil && props.RouteTable.ID != nil { + routeTableId = *props.RouteTable.ID } + d.Set("route_table_id", routeTableId) if err := d.Set("service_endpoints", flattenSubnetServiceEndpoints(props.ServiceEndpoints)); err != nil { - return err + return fmt.Errorf("Error setting `service_endpoints`: %+v", err) } } diff --git a/azurerm/internal/services/network/resource_arm_subnet.go b/azurerm/internal/services/network/resource_arm_subnet.go index 725b51482d26a..d7d38b7e309b9 100644 --- a/azurerm/internal/services/network/resource_arm_subnet.go +++ b/azurerm/internal/services/network/resource_arm_subnet.go @@ -22,9 +22,9 @@ var SubnetResourceName = "azurerm_subnet" func resourceArmSubnet() *schema.Resource { return &schema.Resource{ - Create: resourceArmSubnetCreateUpdate, + Create: resourceArmSubnetCreate, Read: resourceArmSubnetRead, - Update: resourceArmSubnetCreateUpdate, + Update: resourceArmSubnetUpdate, Delete: resourceArmSubnetDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, @@ -57,26 +57,6 @@ func resourceArmSubnet() *schema.Resource { Required: true, }, - "network_security_group_id": { - Type: schema.TypeString, - Optional: true, - Deprecated: "Use the `azurerm_subnet_network_security_group_association` resource instead.", - }, - - "route_table_id": { - Type: schema.TypeString, - Optional: true, - Deprecated: "Use the `azurerm_subnet_route_table_association` resource instead.", - }, - - "ip_configurations": { - Type: schema.TypeSet, - Optional: true, - Computed: true, - Elem: &schema.Schema{Type: schema.TypeString}, - Set: schema.HashString, - }, - "service_endpoints": { Type: schema.TypeList, Optional: true, @@ -119,10 +99,10 @@ func resourceArmSubnet() *schema.Resource { "Microsoft.Web/serverFarms", }, false), }, + "actions": { Type: schema.TypeList, Optional: true, - Computed: true, ConfigMode: schema.SchemaConfigModeAttr, Elem: &schema.Schema{ Type: schema.TypeString, @@ -157,7 +137,8 @@ func resourceArmSubnet() *schema.Resource { } } -func resourceArmSubnetCreateUpdate(d *schema.ResourceData, meta interface{}) error { +// TODO: refactor the create/flatten functions +func resourceArmSubnetCreate(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Network.SubnetsClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -168,7 +149,7 @@ func resourceArmSubnetCreateUpdate(d *schema.ResourceData, meta interface{}) err vnetName := d.Get("virtual_network_name").(string) resGroup := d.Get("resource_group_name").(string) - if features.ShouldResourcesBeImported() && d.IsNewResource() { + if features.ShouldResourcesBeImported() { existing, err := client.Get(ctx, resGroup, vnetName, name, "") if err != nil { if !utils.ResponseWasNotFound(existing.Response) { @@ -186,71 +167,22 @@ func resourceArmSubnetCreateUpdate(d *schema.ResourceData, meta interface{}) err locks.ByName(vnetName, VirtualNetworkResourceName) defer locks.UnlockByName(vnetName, VirtualNetworkResourceName) - properties := network.SubnetPropertiesFormat{ - AddressPrefix: &addressPrefix, - } - - if v, ok := d.GetOk("enforce_private_link_service_network_policies"); ok { - // To enable private endpoints you must disable the network policies for the - // subnet because Network policies like network security groups are not - // supported by private endpoints. - if v.(bool) { - properties.PrivateLinkServiceNetworkPolicies = utils.String("Disabled") - } - } + privateEndpointNetworkPolicies := d.Get("enforce_private_link_endpoint_network_policies").(bool) + privateLinkServiceNetworkPolicies := d.Get("enforce_private_link_service_network_policies").(bool) - if v, ok := d.GetOk("network_security_group_id"); ok { - nsgId := v.(string) - properties.NetworkSecurityGroup = &network.SecurityGroup{ - ID: &nsgId, - } - - parsedNsgId, err := ParseNetworkSecurityGroupID(nsgId) - if err != nil { - return err - } - - locks.ByName(parsedNsgId.Name, networkSecurityGroupResourceName) - defer locks.UnlockByName(parsedNsgId.Name, networkSecurityGroupResourceName) - } else { - properties.NetworkSecurityGroup = nil - } - - if v, ok := d.GetOk("route_table_id"); ok { - rtId := v.(string) - properties.RouteTable = &network.RouteTable{ - ID: &rtId, - } - - parsedRouteTableId, err := ParseRouteTableID(rtId) - if err != nil { - return err - } + serviceEndpointsRaw := d.Get("service_endpoints").([]interface{}) + properties := network.SubnetPropertiesFormat{ + AddressPrefix: &addressPrefix, + ServiceEndpoints: expandSubnetServiceEndpoints(serviceEndpointsRaw), - locks.ByName(parsedRouteTableId.Name, routeTableResourceName) - defer locks.UnlockByName(parsedRouteTableId.Name, routeTableResourceName) - } else { - properties.RouteTable = nil - } - - if v, ok := d.GetOk("enforce_private_link_endpoint_network_policies"); ok { - // This is strange logic, but to get the schema to make sense for the end user - // I exposed it with the same name that the Azure CLI does to be consistent - // between the tool sets, which means true == Disabled. - // - // To enable private endpoints you must disable the network policies for the - // subnet because Network policies like network security groups are not - // supported by private endpoints. - if v.(bool) { - properties.PrivateEndpointNetworkPolicies = utils.String("Disabled") - } + // To enable private endpoints you must disable the network policies for the subnet because + // Network policies like network security groups are not supported by private endpoints. + PrivateEndpointNetworkPolicies: expandSubnetPrivateLinkNetworkPolicy(privateEndpointNetworkPolicies), + PrivateLinkServiceNetworkPolicies: expandSubnetPrivateLinkNetworkPolicy(privateLinkServiceNetworkPolicies), } - serviceEndpoints := expandSubnetServiceEndpoints(d) - properties.ServiceEndpoints = &serviceEndpoints - - delegations := expandSubnetDelegation(d) - properties.Delegations = &delegations + delegationsRaw := d.Get("delegation").([]interface{}) + properties.Delegations = expandSubnetDelegation(delegationsRaw) subnet := network.Subnet{ Name: &name, @@ -279,6 +211,73 @@ func resourceArmSubnetCreateUpdate(d *schema.ResourceData, meta interface{}) err return resourceArmSubnetRead(d, meta) } +func resourceArmSubnetUpdate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Network.SubnetsClient + ctx, cancel := timeouts.ForUpdate(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := azure.ParseAzureResourceID(d.Id()) + if err != nil { + return err + } + resourceGroup := id.ResourceGroup + networkName := id.Path["virtualNetworks"] + name := id.Path["subnets"] + + existing, err := client.Get(ctx, resourceGroup, networkName, name, "") + if err != nil { + return fmt.Errorf("Error retrieving existing Subnet %q (Virtual Network %q / Resource Group %q): %+v", name, networkName, resourceGroup, err) + } + + if existing.SubnetPropertiesFormat == nil { + return fmt.Errorf("Error retrieving existing Subnet %q (Virtual Network %q / Resource Group %q): `properties` was nil", name, networkName, resourceGroup) + } + + // TODO: locking on the NSG/Route Table if applicable + + props := *existing.SubnetPropertiesFormat + + if d.HasChange("address_prefix") { + props.AddressPrefix = utils.String(d.Get("address_prefix").(string)) + } + + if d.HasChange("delegation") { + delegationsRaw := d.Get("delegation").([]interface{}) + props.Delegations = expandSubnetDelegation(delegationsRaw) + } + + if d.HasChange("enforce_private_link_endpoint_network_policies") { + v := d.Get("enforce_private_link_endpoint_network_policies").(bool) + props.PrivateEndpointNetworkPolicies = expandSubnetPrivateLinkNetworkPolicy(v) + } + + if d.HasChange("enforce_private_link_service_network_policies") { + v := d.Get("enforce_private_link_service_network_policies").(bool) + props.PrivateLinkServiceNetworkPolicies = expandSubnetPrivateLinkNetworkPolicy(v) + } + + if d.HasChange("service_endpoints") { + serviceEndpointsRaw := d.Get("service_endpoints").([]interface{}) + props.ServiceEndpoints = expandSubnetServiceEndpoints(serviceEndpointsRaw) + } + + subnet := network.Subnet{ + Name: utils.String(name), + SubnetPropertiesFormat: &props, + } + + future, err := client.CreateOrUpdate(ctx, resourceGroup, networkName, name, subnet) + if err != nil { + return fmt.Errorf("Error updating Subnet %q (Virtual Network %q / Resource Group %q): %+v", name, networkName, resourceGroup, err) + } + + if err := future.WaitForCompletionRef(ctx, client.Client); err != nil { + return fmt.Errorf("Error waiting for update of Subnet %q (Virtual Network %q / Resource Group %q): %+v", name, networkName, resourceGroup, err) + } + + return resourceArmSubnetRead(d, meta) +} + func resourceArmSubnetRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Network.SubnetsClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) @@ -288,71 +287,38 @@ func resourceArmSubnetRead(d *schema.ResourceData, meta interface{}) error { if err != nil { return err } - resGroup := id.ResourceGroup - vnetName := id.Path["virtualNetworks"] + resourceGroup := id.ResourceGroup + networkName := id.Path["virtualNetworks"] name := id.Path["subnets"] - resp, err := client.Get(ctx, resGroup, vnetName, name, "") + resp, err := client.Get(ctx, resourceGroup, networkName, name, "") if err != nil { if utils.ResponseWasNotFound(resp.Response) { d.SetId("") return nil } - return fmt.Errorf("Error making Read request on Azure Subnet %q: %+v", name, err) + return fmt.Errorf("Error retrieving Subnet %q (Virtual Network %q / Resource Group %q): %+v", name, networkName, resourceGroup, err) } d.Set("name", name) - d.Set("resource_group_name", resGroup) - d.Set("virtual_network_name", vnetName) + d.Set("resource_group_name", resourceGroup) + d.Set("virtual_network_name", networkName) if props := resp.SubnetPropertiesFormat; props != nil { d.Set("address_prefix", props.AddressPrefix) - if p := props.PrivateLinkServiceNetworkPolicies; p != nil { - // To enable private endpoints you must disable the network policies for the - // subnet because Network policies like network security groups are not - // supported by private endpoints. - - d.Set("enforce_private_link_service_network_policies", strings.EqualFold("Disabled", *p)) - } - - var securityGroupId *string - if props.NetworkSecurityGroup != nil { - securityGroupId = props.NetworkSecurityGroup.ID - } - d.Set("network_security_group_id", securityGroupId) - - var routeTableId string - if props.RouteTable != nil && props.RouteTable.ID != nil { - routeTableId = *props.RouteTable.ID + delegation := flattenSubnetDelegation(props.Delegations) + if err := d.Set("delegation", delegation); err != nil { + return fmt.Errorf("Error flattening `delegation`: %+v", err) } - d.Set("route_table_id", routeTableId) - ips := flattenSubnetIPConfigurations(props.IPConfigurations) - if err := d.Set("ip_configurations", ips); err != nil { - return err - } + d.Set("enforce_private_link_endpoint_network_policies", flattenSubnetPrivateLinkNetworkPolicy(props.PrivateEndpointNetworkPolicies)) + d.Set("enforce_private_link_service_network_policies", flattenSubnetPrivateLinkNetworkPolicy(props.PrivateLinkServiceNetworkPolicies)) serviceEndpoints := flattenSubnetServiceEndpoints(props.ServiceEndpoints) if err := d.Set("service_endpoints", serviceEndpoints); err != nil { - return err - } - - // This is strange logic, but to get the schema to make sense for the end user - // I exposed it with the same name that the Azure CLI does to be consistent - // between the tool sets, which means true == Disabled. - // - // To enable private endpoints you must disable the network policies for the - // subnet because Network policies like network security groups are not - // supported by private endpoints. - if privateEndpointNetworkPolicies := props.PrivateEndpointNetworkPolicies; privateEndpointNetworkPolicies != nil { - d.Set("enforce_private_link_endpoint_network_policies", *privateEndpointNetworkPolicies == "Disabled") - } - - delegation := flattenSubnetDelegation(props.Delegations) - if err := d.Set("delegation", delegation); err != nil { - return fmt.Errorf("Error flattening `delegation`: %+v", err) + return fmt.Errorf("Error setting `service_endpoints`: %+v", err) } } @@ -368,55 +334,32 @@ func resourceArmSubnetDelete(d *schema.ResourceData, meta interface{}) error { if err != nil { return err } - resGroup := id.ResourceGroup + resourceGroup := id.ResourceGroup name := id.Path["subnets"] - vnetName := id.Path["virtualNetworks"] + networkName := id.Path["virtualNetworks"] - if v, ok := d.GetOk("network_security_group_id"); ok { - networkSecurityGroupId := v.(string) - parsedNetworkSecurityGroupId, err2 := ParseNetworkSecurityGroupID(networkSecurityGroupId) - if err2 != nil { - return err2 - } - - locks.ByName(parsedNetworkSecurityGroupId.Name, networkSecurityGroupResourceName) - defer locks.UnlockByName(parsedNetworkSecurityGroupId.Name, networkSecurityGroupResourceName) - } - - if v, ok := d.GetOk("route_table_id"); ok { - rtId := v.(string) - parsedRouteTableId, err2 := ParseRouteTableID(rtId) - if err2 != nil { - return err2 - } - - locks.ByName(parsedRouteTableId.Name, routeTableResourceName) - defer locks.UnlockByName(parsedRouteTableId.Name, routeTableResourceName) - } - - locks.ByName(vnetName, VirtualNetworkResourceName) - defer locks.UnlockByName(vnetName, VirtualNetworkResourceName) + locks.ByName(networkName, VirtualNetworkResourceName) + defer locks.UnlockByName(networkName, VirtualNetworkResourceName) locks.ByName(name, SubnetResourceName) defer locks.UnlockByName(name, SubnetResourceName) - future, err := client.Delete(ctx, resGroup, vnetName, name) + future, err := client.Delete(ctx, resourceGroup, networkName, name) if err != nil { - return fmt.Errorf("Error deleting Subnet %q (Virtual Network %q / Resource Group %q): %+v", name, vnetName, resGroup, err) + return fmt.Errorf("Error deleting Subnet %q (Virtual Network %q / Resource Group %q): %+v", name, networkName, resourceGroup, err) } if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for completion for Subnet %q (Virtual Network %q / Resource Group %q): %+v", name, vnetName, resGroup, err) + return fmt.Errorf("Error waiting for deletion of Subnet %q (Virtual Network %q / Resource Group %q): %+v", name, networkName, resourceGroup, err) } return nil } -func expandSubnetServiceEndpoints(d *schema.ResourceData) []network.ServiceEndpointPropertiesFormat { - serviceEndpoints := d.Get("service_endpoints").([]interface{}) +func expandSubnetServiceEndpoints(input []interface{}) *[]network.ServiceEndpointPropertiesFormat { endpoints := make([]network.ServiceEndpointPropertiesFormat, 0) - for _, svcEndpointRaw := range serviceEndpoints { + for _, svcEndpointRaw := range input { if svc, ok := svcEndpointRaw.(string); ok { endpoint := network.ServiceEndpointPropertiesFormat{ Service: &svc, @@ -425,7 +368,7 @@ func expandSubnetServiceEndpoints(d *schema.ResourceData) []network.ServiceEndpo } } - return endpoints + return &endpoints } func flattenSubnetServiceEndpoints(serviceEndpoints *[]network.ServiceEndpointPropertiesFormat) []string { @@ -444,23 +387,10 @@ func flattenSubnetServiceEndpoints(serviceEndpoints *[]network.ServiceEndpointPr return endpoints } -func flattenSubnetIPConfigurations(ipConfigurations *[]network.IPConfiguration) []string { - ips := make([]string, 0) - - if ipConfigurations != nil { - for _, ip := range *ipConfigurations { - ips = append(ips, *ip.ID) - } - } - - return ips -} - -func expandSubnetDelegation(d *schema.ResourceData) []network.Delegation { - delegations := d.Get("delegation").([]interface{}) +func expandSubnetDelegation(input []interface{}) *[]network.Delegation { retDelegations := make([]network.Delegation, 0) - for _, deleValue := range delegations { + for _, deleValue := range input { deleData := deleValue.(map[string]interface{}) deleName := deleData["name"].(string) srvDelegations := deleData["service_delegation"].([]interface{}) @@ -485,7 +415,7 @@ func expandSubnetDelegation(d *schema.ResourceData) []network.Delegation { retDelegations = append(retDelegations, retDelegation) } - return retDelegations + return &retDelegations } func flattenSubnetDelegation(delegations *[]network.Delegation) []interface{} { @@ -522,3 +452,27 @@ func flattenSubnetDelegation(delegations *[]network.Delegation) []interface{} { return retDeles } + +// TODO: confirm this logic below + +func expandSubnetPrivateLinkNetworkPolicy(enabled bool) *string { + // This is strange logic, but to get the schema to make sense for the end user + // I exposed it with the same name that the Azure CLI does to be consistent + // between the tool sets, which means true == Disabled. + if enabled { + return utils.String("Disabled") + } + + return utils.String("Enabled") +} + +func flattenSubnetPrivateLinkNetworkPolicy(input *string) bool { + // This is strange logic, but to get the schema to make sense for the end user + // I exposed it with the same name that the Azure CLI does to be consistent + // between the tool sets, which means true == Disabled. + if input == nil { + return false + } + + return strings.EqualFold(*input, "Disabled") +} diff --git a/azurerm/internal/services/network/tests/data_source_subnet_test.go b/azurerm/internal/services/network/tests/data_source_subnet_test.go index 89440f431cfa2..c6f4fa89a1127 100644 --- a/azurerm/internal/services/network/tests/data_source_subnet_test.go +++ b/azurerm/internal/services/network/tests/data_source_subnet_test.go @@ -8,7 +8,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" ) -func TestAccDataSourceAzureRMSubnet_basic(t *testing.T) { +func TestAccDataSourceSubnet_basic(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_subnet", "test") resource.ParallelTest(t, resource.TestCase{ @@ -16,7 +16,7 @@ func TestAccDataSourceAzureRMSubnet_basic(t *testing.T) { Providers: acceptance.SupportedProviders, Steps: []resource.TestStep{ { - Config: testAccDataSourceAzureRMSubnet_basic(data), + Config: testAccDataSourceSubnet_basic(data), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(data.ResourceName, "name"), resource.TestCheckResourceAttrSet(data.ResourceName, "resource_group_name"), @@ -30,7 +30,7 @@ func TestAccDataSourceAzureRMSubnet_basic(t *testing.T) { }) } -func TestAccDataSourceAzureRMSubnet_networkSecurityGroup(t *testing.T) { +func TestAccDataSourceSubnet_networkSecurityGroup(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_subnet", "test") resource.ParallelTest(t, resource.TestCase{ @@ -38,7 +38,11 @@ func TestAccDataSourceAzureRMSubnet_networkSecurityGroup(t *testing.T) { Providers: acceptance.SupportedProviders, Steps: []resource.TestStep{ { - Config: testAccDataSourceAzureRMSubnet_networkSecurityGroup(data), + // since the network security group association is a separate resource this forces it + Config: testAccDataSourceSubnet_networkSecurityGroupDependencies(data), + }, + { + Config: testAccDataSourceSubnet_networkSecurityGroup(data), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(data.ResourceName, "name"), resource.TestCheckResourceAttrSet(data.ResourceName, "resource_group_name"), @@ -52,7 +56,7 @@ func TestAccDataSourceAzureRMSubnet_networkSecurityGroup(t *testing.T) { }) } -func TestAccDataSourceAzureRMSubnet_routeTable(t *testing.T) { +func TestAccDataSourceSubnet_routeTable(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_subnet", "test") resource.ParallelTest(t, resource.TestCase{ @@ -60,21 +64,25 @@ func TestAccDataSourceAzureRMSubnet_routeTable(t *testing.T) { Providers: acceptance.SupportedProviders, Steps: []resource.TestStep{ { - Config: testAccDataSourceAzureRMSubnet_routeTable(data), + // since the route table association is a separate resource this forces it + Config: testAccDataSourceSubnet_routeTableDependencies(data), + }, + { + Config: testAccDataSourceSubnet_routeTable(data), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(data.ResourceName, "name"), resource.TestCheckResourceAttrSet(data.ResourceName, "resource_group_name"), resource.TestCheckResourceAttrSet(data.ResourceName, "virtual_network_name"), resource.TestCheckResourceAttrSet(data.ResourceName, "address_prefix"), - resource.TestCheckResourceAttr(data.ResourceName, "network_security_group_id", ""), resource.TestCheckResourceAttrSet(data.ResourceName, "route_table_id"), + resource.TestCheckResourceAttr(data.ResourceName, "network_security_group_id", ""), ), }, }, }) } -func TestAccDataSourceAzureRMSubnet_serviceEndpoints(t *testing.T) { +func TestAccDataSourceSubnet_serviceEndpoints(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_subnet", "test") resource.ParallelTest(t, resource.TestCase{ @@ -82,7 +90,7 @@ func TestAccDataSourceAzureRMSubnet_serviceEndpoints(t *testing.T) { Providers: acceptance.SupportedProviders, Steps: []resource.TestStep{ { - Config: testAccDataSourceAzureRMSubnet_serviceEndpoints(data), + Config: testAccDataSourceSubnet_serviceEndpoint(data), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(data.ResourceName, "name"), resource.TestCheckResourceAttrSet(data.ResourceName, "resource_group_name"), @@ -99,46 +107,35 @@ func TestAccDataSourceAzureRMSubnet_serviceEndpoints(t *testing.T) { }) } -func testAccDataSourceAzureRMSubnet_basic(data acceptance.TestData) string { +func testAccDataSourceSubnet_basic(data acceptance.TestData) string { + template := testAccDataSourceSubnet_template(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctest%d-rg" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctest%d-vn" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "acctest%d-private" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.0.0/24" -} +%s data "azurerm_subnet" "test" { - name = "${azurerm_subnet.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" + name = azurerm_subnet.test.name + virtual_network_name = azurerm_subnet.test.virtual_network_name + resource_group_name = azurerm_subnet.test.resource_group_name } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) +`, template) } -func testAccDataSourceAzureRMSubnet_networkSecurityGroup(data acceptance.TestData) string { +func testAccDataSourceSubnet_networkSecurityGroupDependencies(data acceptance.TestData) string { + template := testAccDataSourceSubnet_template(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctest%d-rg" - location = "%s" +%s + +resource "azurerm_subnet" "test" { + name = "internal" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name + address_prefix = "10.0.0.0/24" } resource "azurerm_network_security_group" "test" { name = "acctestnsg%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name security_rule { name = "test123" @@ -153,98 +150,96 @@ resource "azurerm_network_security_group" "test" { } } -resource "azurerm_virtual_network" "test" { - name = "acctest%d-vn" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" +resource "azurerm_subnet_network_security_group_association" "test" { + subnet_id = azurerm_subnet.test.id + network_security_group_id = azurerm_network_security_group.test.id } - -resource "azurerm_subnet" "test" { - name = "acctest%d-private" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.0.0/24" - network_security_group_id = "${azurerm_network_security_group.test.id}" +`, template, data.RandomInteger) } +func testAccDataSourceSubnet_networkSecurityGroup(data acceptance.TestData) string { + template := testAccDataSourceSubnet_networkSecurityGroupDependencies(data) + return fmt.Sprintf(` +%s + data "azurerm_subnet" "test" { - name = "${azurerm_subnet.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" + name = azurerm_subnet.test.name + virtual_network_name = azurerm_subnet.test.virtual_network_name + resource_group_name = azurerm_subnet.test.resource_group_name } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, template) } -func testAccDataSourceAzureRMSubnet_routeTable(data acceptance.TestData) string { +func testAccDataSourceSubnet_routeTableDependencies(data acceptance.TestData) string { + template := testAccDataSourceSubnet_template(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" +%s + +resource "azurerm_subnet" "test" { + name = "internal" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name + address_prefix = "10.0.0.0/24" } resource "azurerm_route_table" "test" { - name = "acctest-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + name = "acctestrt-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name route { - name = "acctest-%d" + name = "first" address_prefix = "10.100.0.0/14" next_hop_type = "VirtualAppliance" next_hop_in_ip_address = "10.10.1.1" } } -resource "azurerm_virtual_network" "test" { - name = "acctestvirtnet%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" +resource "azurerm_subnet_route_table_association" "test" { + subnet_id = azurerm_subnet.test.id + route_table_id = azurerm_route_table.test.id +} +`, template, data.RandomInteger) } -resource "azurerm_subnet" "test" { - name = "acctestsubnet%d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" - route_table_id = "${azurerm_route_table.test.id}" +func testAccDataSourceSubnet_routeTable(data acceptance.TestData) string { + template := testAccDataSourceSubnet_routeTableDependencies(data) + return fmt.Sprintf(` +%s + +data "azurerm_subnet" "test" { + name = azurerm_subnet.test.name + virtual_network_name = azurerm_subnet.test.virtual_network_name + resource_group_name = azurerm_subnet.test.resource_group_name +} +`, template) } +func testAccDataSourceSubnet_serviceEndpoint(data acceptance.TestData) string { + template := testAccAzureRMSubnet_serviceEndpointsUpdated(data) + return fmt.Sprintf(` +%s + data "azurerm_subnet" "test" { - name = "${azurerm_subnet.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" + name = azurerm_subnet.test.name + virtual_network_name = azurerm_subnet.test.virtual_network_name + resource_group_name = azurerm_subnet.test.resource_group_name } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, template) } -func testAccDataSourceAzureRMSubnet_serviceEndpoints(data acceptance.TestData) string { +func testAccDataSourceSubnet_template(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" + name = "acctest%d-rg" location = "%s" } resource "azurerm_virtual_network" "test" { - name = "acctestvirtnet%d" + name = "acctest%d-vn" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "acctestsubnet%d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" - service_endpoints = ["Microsoft.Sql", "Microsoft.Storage"] -} - -data "azurerm_subnet" "test" { - name = "${azurerm_subnet.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } diff --git a/azurerm/internal/services/network/tests/resource_arm_subnet_nat_gateway_association_test.go b/azurerm/internal/services/network/tests/resource_arm_subnet_nat_gateway_association_test.go index 86ff7f597aca1..2a2f2c12fdc7f 100644 --- a/azurerm/internal/services/network/tests/resource_arm_subnet_nat_gateway_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_subnet_nat_gateway_association_test.go @@ -55,7 +55,7 @@ func TestAccAzureRMSubnetNatGatewayAssociation_requiresImport(t *testing.T) { }, { Config: testAccAzureRMSubnetNatGatewayAssociation_requiresImport(data), - ExpectError: acceptance.RequiresImportError(""), + ExpectError: acceptance.RequiresImportError(data.ResourceType), }, }, }) @@ -83,6 +83,33 @@ func TestAccAzureRMSubnetNatGatewayAssociation_deleted(t *testing.T) { }) } +func TestAccAzureRMSubnetNatGatewayAssociation_updateSubnet(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_subnet_nat_gateway_association", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + // intentional since this is a virtual resource + CheckDestroy: testCheckAzureRMSubnetDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMSubnetNatGatewayAssociation_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMSubnetNatGatewayAssociationExists(data.ResourceName), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMSubnetNatGatewayAssociation_updateSubnet(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMSubnetNatGatewayAssociationExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + func testCheckAzureRMSubnetNatGatewayAssociationExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).Network.SubnetsClient @@ -207,37 +234,22 @@ func testCheckAzureRMSubnetHasNoNatGateways(resourceName string) resource.TestCh } func testAccAzureRMSubnetNatGatewayAssociation_basic(data acceptance.TestData) string { + template := testAccAzureRMSubnetNatGatewayAssociation_template(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-network-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} +%s resource "azurerm_subnet" "test" { - name = "acctestsubnet-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" + name = "internal" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name address_prefix = "10.0.2.0/24" } -resource "azurerm_nat_gateway" "test" { - name = "acctest-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - resource "azurerm_subnet_nat_gateway_association" "test" { - subnet_id = "${azurerm_subnet.test.id}" - nat_gateway_id = "${azurerm_nat_gateway.test.id}" + subnet_id = azurerm_subnet.test.id + nat_gateway_id = azurerm_nat_gateway.test.id } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, template) } func testAccAzureRMSubnetNatGatewayAssociation_requiresImport(data acceptance.TestData) string { @@ -246,8 +258,51 @@ func testAccAzureRMSubnetNatGatewayAssociation_requiresImport(data acceptance.Te %s resource "azurerm_subnet_nat_gateway_association" "import" { - subnet_id = "${azurerm_subnet_nat_gateway_association.test.subnet_id}" - nat_gateway_id = "${azurerm_subnet_nat_gateway_association.test.nat_gateway_id}" + subnet_id = azurerm_subnet_nat_gateway_association.test.subnet_id + nat_gateway_id = azurerm_subnet_nat_gateway_association.test.nat_gateway_id +} +`, template) +} + +func testAccAzureRMSubnetNatGatewayAssociation_updateSubnet(data acceptance.TestData) string { + template := testAccAzureRMSubnetNatGatewayAssociation_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_subnet" "test" { + name = "internal" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name + address_prefix = "10.0.2.0/24" + + enforce_private_link_endpoint_network_policies = true +} + +resource "azurerm_subnet_nat_gateway_association" "test" { + subnet_id = azurerm_subnet.test.id + nat_gateway_id = azurerm_nat_gateway.test.id } `, template) } + +func testAccAzureRMSubnetNatGatewayAssociation_template(data acceptance.TestData) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-network-%d" + location = "%s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctestvn-%d" + address_space = ["10.0.0.0/16"] + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name +} + +resource "azurerm_nat_gateway" "test" { + name = "acctest-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) +} diff --git a/azurerm/internal/services/network/tests/resource_arm_subnet_network_security_group_association_test.go b/azurerm/internal/services/network/tests/resource_arm_subnet_network_security_group_association_test.go index 016a9e30c9610..960cc88e7c944 100644 --- a/azurerm/internal/services/network/tests/resource_arm_subnet_network_security_group_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_subnet_network_security_group_association_test.go @@ -61,6 +61,33 @@ func TestAccAzureRMSubnetNetworkSecurityGroupAssociation_requiresImport(t *testi }) } +func TestAccAzureRMSubnetNetworkSecurityGroupAssociation_updateSubnet(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_subnet_network_security_group_association", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + // intentional as this is a Virtual Resource + CheckDestroy: testCheckAzureRMSubnetDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMSubnetNetworkSecurityGroupAssociation_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMSubnetNetworkSecurityGroupAssociationExists(data.ResourceName), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMSubnetNetworkSecurityGroupAssociation_updateSubnet(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMSubnetNetworkSecurityGroupAssociationExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + func TestAccAzureRMSubnetNetworkSecurityGroupAssociation_deleted(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_subnet_network_security_group_association", "test") @@ -212,6 +239,58 @@ func testCheckAzureRMSubnetHasNoNetworkSecurityGroup(resourceName string) resour } func testAccAzureRMSubnetNetworkSecurityGroupAssociation_basic(data acceptance.TestData) string { + template := testAccAzureRMSubnetNetworkSecurityGroupAssociation_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_subnet" "test" { + name = "internal" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name + address_prefix = "10.0.2.0/24" +} + +resource "azurerm_subnet_network_security_group_association" "test" { + subnet_id = azurerm_subnet.test.id + network_security_group_id = azurerm_network_security_group.test.id +} +`, template) +} + +func testAccAzureRMSubnetNetworkSecurityGroupAssociation_requiresImport(data acceptance.TestData) string { + template := testAccAzureRMSubnetNetworkSecurityGroupAssociation_basic(data) + return fmt.Sprintf(` +%s + +resource "azurerm_subnet_network_security_group_association" "internal" { + subnet_id = azurerm_subnet_network_security_group_association.test.subnet_id + network_security_group_id = azurerm_subnet_network_security_group_association.test.network_security_group_id +} +`, template) +} + +func testAccAzureRMSubnetNetworkSecurityGroupAssociation_updateSubnet(data acceptance.TestData) string { + template := testAccAzureRMSubnetNetworkSecurityGroupAssociation_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_subnet" "test" { + name = "internal" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name + address_prefix = "10.0.2.0/24" + + enforce_private_link_endpoint_network_policies = true +} + +resource "azurerm_subnet_network_security_group_association" "test" { + subnet_id = azurerm_subnet.test.id + network_security_group_id = azurerm_network_security_group.test.id +} +`, template) +} + +func testAccAzureRMSubnetNetworkSecurityGroupAssociation_template(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" @@ -225,14 +304,6 @@ resource "azurerm_virtual_network" "test" { resource_group_name = "${azurerm_resource_group.test.name}" } -resource "azurerm_subnet" "test" { - name = "acctestsubnet%d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" - network_security_group_id = "${azurerm_network_security_group.test.id}" -} - resource "azurerm_network_security_group" "test" { name = "acctestnsg%d" location = "${azurerm_resource_group.test.location}" @@ -250,18 +321,5 @@ resource "azurerm_network_security_group" "test" { destination_address_prefix = "*" } } - -resource "azurerm_subnet_network_security_group_association" "test" { - subnet_id = "${azurerm_subnet.test.id}" - network_security_group_id = "${azurerm_network_security_group.test.id}" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - -func testAccAzureRMSubnetNetworkSecurityGroupAssociation_requiresImport(data acceptance.TestData) string { - template := testAccAzureRMSubnetNetworkSecurityGroupAssociation_basic(data) - return fmt.Sprintf(` -%s - -`, template) +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) } diff --git a/azurerm/internal/services/network/tests/resource_arm_subnet_route_table_association_test.go b/azurerm/internal/services/network/tests/resource_arm_subnet_route_table_association_test.go index b6602d29c7f6e..8e539fcc3080a 100644 --- a/azurerm/internal/services/network/tests/resource_arm_subnet_route_table_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_subnet_route_table_association_test.go @@ -32,6 +32,7 @@ func TestAccAzureRMSubnetRouteTableAssociation_basic(t *testing.T) { }, }) } + func TestAccAzureRMSubnetRouteTableAssociation_requiresImport(t *testing.T) { if !features.ShouldResourcesBeImported() { t.Skip("Skipping since resources aren't required to be imported") @@ -54,12 +55,39 @@ func TestAccAzureRMSubnetRouteTableAssociation_requiresImport(t *testing.T) { }, { Config: testAccAzureRMSubnetRouteTableAssociation_requiresImport(data), - ExpectError: acceptance.RequiresImportError(""), + ExpectError: acceptance.RequiresImportError("azurerm_subnet_route_table_association"), }, }, }) } +func TestAccAzureRMSubnetRouteTableAssociation_updateSubnet(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_subnet_route_table_association", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + // intentional since this is a Virtual Resource + CheckDestroy: testCheckAzureRMSubnetDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMSubnetRouteTableAssociation_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMSubnetRouteTableAssociationExists(data.ResourceName), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMSubnetRouteTableAssociation_updateSubnet(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMSubnetRouteTableAssociationExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + func TestAccAzureRMSubnetRouteTableAssociation_deleted(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_subnet_route_table_association", "test") @@ -211,45 +239,22 @@ func testCheckAzureRMSubnetHasNoRouteTable(resourceName string) resource.TestChe } func testAccAzureRMSubnetRouteTableAssociation_basic(data acceptance.TestData) string { + template := testAccAzureRMSubnetRouteTableAssociation_template(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvirtnet%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} +%s resource "azurerm_subnet" "test" { - name = "acctestsubnet%d" + name = "internal" resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" - route_table_id = "${azurerm_route_table.test.id}" -} - -resource "azurerm_route_table" "test" { - name = "acctest-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - route { - name = "acctest-%d" - address_prefix = "10.100.0.0/14" - next_hop_type = "VirtualAppliance" - next_hop_in_ip_address = "10.10.1.1" - } } resource "azurerm_subnet_route_table_association" "test" { - subnet_id = "${azurerm_subnet.test.id}" - route_table_id = "${azurerm_route_table.test.id}" + subnet_id = azurerm_subnet.test.id + route_table_id = azurerm_route_table.test.id } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, template) } func testAccAzureRMSubnetRouteTableAssociation_requiresImport(data acceptance.TestData) string { @@ -258,8 +263,57 @@ func testAccAzureRMSubnetRouteTableAssociation_requiresImport(data acceptance.Te %s resource "azurerm_subnet_route_table_association" "import" { - subnet_id = "${azurerm_subnet_route_table_association.test.subnet_id}" - route_table_id = "${azurerm_subnet_route_table_association.test.route_table_id}" + subnet_id = azurerm_subnet_route_table_association.test.subnet_id + route_table_id = azurerm_subnet_route_table_association.test.route_table_id +} +`, template) +} + +func testAccAzureRMSubnetRouteTableAssociation_updateSubnet(data acceptance.TestData) string { + template := testAccAzureRMSubnetRouteTableAssociation_template(data) + return fmt.Sprintf(` +%s +resource "azurerm_subnet" "test" { + name = "internal" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name + address_prefix = "10.0.2.0/24" + + enforce_private_link_endpoint_network_policies = true +} + +resource "azurerm_subnet_route_table_association" "test" { + subnet_id = azurerm_subnet.test.id + route_table_id = azurerm_route_table.test.id } `, template) } + +func testAccAzureRMSubnetRouteTableAssociation_template(data acceptance.TestData) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctestvirtnet%d" + address_space = ["10.0.0.0/16"] + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name +} + +resource "azurerm_route_table" "test" { + name = "acctest-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + + route { + name = "first" + address_prefix = "10.100.0.0/14" + next_hop_type = "VirtualAppliance" + next_hop_in_ip_address = "10.10.1.1" + } +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) +} diff --git a/azurerm/internal/services/network/tests/resource_arm_subnet_test.go b/azurerm/internal/services/network/tests/resource_arm_subnet_test.go index d2334f1eecb29..e7804d863aefe 100644 --- a/azurerm/internal/services/network/tests/resource_arm_subnet_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_subnet_test.go @@ -3,7 +3,6 @@ package tests import ( "fmt" "log" - "strings" "testing" "github.com/hashicorp/go-azure-helpers/response" @@ -61,7 +60,7 @@ func TestAccAzureRMSubnet_requiresImport(t *testing.T) { }) } -func TestAccAzureRMSubnet_delegation(t *testing.T) { +func TestAccAzureRMSubnet_disappears(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_subnet", "test") resource.ParallelTest(t, resource.TestCase{ @@ -70,17 +69,18 @@ func TestAccAzureRMSubnet_delegation(t *testing.T) { CheckDestroy: testCheckAzureRMSubnetDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMSubnet_delegation(data), + Config: testAccAzureRMSubnet_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMSubnetExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "delegation.#", "1"), + testCheckAzureRMSubnetDisappears(data.ResourceName), ), + ExpectNonEmptyPlan: true, }, }, }) } -func TestAccAzureRMSubnet_delegationComputedActions(t *testing.T) { +func TestAccAzureRMSubnet_delegation(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_subnet", "test") resource.ParallelTest(t, resource.TestCase{ @@ -89,42 +89,38 @@ func TestAccAzureRMSubnet_delegationComputedActions(t *testing.T) { CheckDestroy: testCheckAzureRMSubnetDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMSubnet_delegationComputedActions(data), + Config: testAccAzureRMSubnet_delegation(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMSubnetExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "delegation.#", "1"), ), }, - }, - }) -} - -func TestAccAzureRMSubnet_routeTableUpdate(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_subnet", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMSubnetDestroy, - Steps: []resource.TestStep{ + data.ImportStep(), { - Config: testAccAzureRMSubnet_routeTable(data), + Config: testAccAzureRMSubnet_delegationUpdated(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMSubnetExists(data.ResourceName), ), }, - + data.ImportStep(), + { + Config: testAccAzureRMSubnet_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMSubnetExists(data.ResourceName), + ), + }, + data.ImportStep(), { - Config: testAccAzureRMSubnet_updatedRouteTable(data), + Config: testAccAzureRMSubnet_delegation(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMSubnetRouteTableExists(data.ResourceName, fmt.Sprintf("acctest-%d", data.RandomInteger)), + testCheckAzureRMSubnetExists(data.ResourceName), ), }, + data.ImportStep(), }, }) } -func TestAccAzureRMSubnet_routeTableRemove(t *testing.T) { +func TestAccAzureRMSubnet_enforcePrivateLinkEndpointNetworkPolicies(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_subnet", "test") resource.ParallelTest(t, resource.TestCase{ @@ -133,17 +129,23 @@ func TestAccAzureRMSubnet_routeTableRemove(t *testing.T) { CheckDestroy: testCheckAzureRMSubnetDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMSubnet_routeTable(data), + Config: testAccAzureRMSubnet_enforcePrivateLinkEndpointNetworkPolicies(data, true), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMSubnetExists(data.ResourceName), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMSubnet_enforcePrivateLinkEndpointNetworkPolicies(data, false), Check: resource.ComposeTestCheckFunc( testCheckAzureRMSubnetExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "route_table_id"), ), }, + data.ImportStep(), { - Config: testAccAzureRMSubnet_routeTableUnlinked(data), + Config: testAccAzureRMSubnet_enforcePrivateLinkEndpointNetworkPolicies(data, true), Check: resource.ComposeTestCheckFunc( testCheckAzureRMSubnetExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "route_table_id", ""), ), }, data.ImportStep(), @@ -151,7 +153,7 @@ func TestAccAzureRMSubnet_routeTableRemove(t *testing.T) { }) } -func TestAccAzureRMSubnet_removeNetworkSecurityGroup(t *testing.T) { +func TestAccAzureRMSubnet_enforcePrivateLinkServiceNetworkPolicies(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_subnet", "test") resource.ParallelTest(t, resource.TestCase{ @@ -160,44 +162,31 @@ func TestAccAzureRMSubnet_removeNetworkSecurityGroup(t *testing.T) { CheckDestroy: testCheckAzureRMSubnetDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMSubnet_networkSecurityGroup(data), + Config: testAccAzureRMSubnet_enforcePrivateLinkServiceNetworkPolicies(data, true), Check: resource.ComposeTestCheckFunc( testCheckAzureRMSubnetExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "network_security_group_id"), ), }, + data.ImportStep(), { - Config: testAccAzureRMSubnet_networkSecurityGroupDetached(data), + Config: testAccAzureRMSubnet_enforcePrivateLinkServiceNetworkPolicies(data, false), Check: resource.ComposeTestCheckFunc( testCheckAzureRMSubnetExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "network_security_group_id", ""), ), }, data.ImportStep(), - }, - }) -} - -func TestAccAzureRMSubnet_bug7986(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_subnet", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMSubnetDestroy, - Steps: []resource.TestStep{ { - Config: testAccAzureRMSubnet_bug7986(data), + Config: testAccAzureRMSubnet_enforcePrivateLinkServiceNetworkPolicies(data, true), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMSubnetExists("azurerm_subnet.first"), - testCheckAzureRMSubnetExists("azurerm_subnet.second"), + testCheckAzureRMSubnetExists(data.ResourceName), ), }, + data.ImportStep(), }, }) } -func TestAccAzureRMSubnet_bug15204(t *testing.T) { +func TestAccAzureRMSubnet_serviceEndpoints(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_subnet", "test") resource.ParallelTest(t, resource.TestCase{ @@ -206,55 +195,39 @@ func TestAccAzureRMSubnet_bug15204(t *testing.T) { CheckDestroy: testCheckAzureRMSubnetDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMSubnet_bug15204(data), + Config: testAccAzureRMSubnet_serviceEndpoints(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMSubnetExists(data.ResourceName), ), }, - }, - }) -} - -func TestAccAzureRMSubnet_disappears(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_subnet", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMSubnetDestroy, - Steps: []resource.TestStep{ + data.ImportStep(), { + Config: testAccAzureRMSubnet_serviceEndpointsUpdated(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMSubnetExists(data.ResourceName), + ), + }, + data.ImportStep(), + { + // remove them Config: testAccAzureRMSubnet_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMSubnetExists(data.ResourceName), - testCheckAzureRMSubnetDisappears(data.ResourceName), ), - ExpectNonEmptyPlan: true, }, - }, - }) -} - -func TestAccAzureRMSubnet_serviceEndpoints(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_subnet", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMSubnetDestroy, - Steps: []resource.TestStep{ + data.ImportStep(), { Config: testAccAzureRMSubnet_serviceEndpoints(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMSubnetExists("azurerm_subnet.test"), - resource.TestCheckResourceAttr(data.ResourceName, "service_endpoints.#", "2"), + testCheckAzureRMSubnetExists(data.ResourceName), ), }, + data.ImportStep(), }, }) } -func TestAccAzureRMSubnet_serviceEndpointsVNetUpdate(t *testing.T) { +func TestAccAzureRMSubnet_updateAddressPrefix(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_subnet", "test") resource.ParallelTest(t, resource.TestCase{ @@ -263,19 +236,19 @@ func TestAccAzureRMSubnet_serviceEndpointsVNetUpdate(t *testing.T) { CheckDestroy: testCheckAzureRMSubnetDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMSubnet_serviceEndpoints(data), + Config: testAccAzureRMSubnet_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMSubnetExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "service_endpoints.#", "2"), ), }, + data.ImportStep(), { - Config: testAccAzureRMSubnet_serviceEndpointsVNetUpdate(data), + Config: testAccAzureRMSubnet_updatedAddressPrefix(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMSubnetExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "service_endpoints.#", "2"), ), }, + data.ImportStep(), }, }) } @@ -313,57 +286,6 @@ func testCheckAzureRMSubnetExists(resourceName string) resource.TestCheckFunc { } } -func testCheckAzureRMSubnetRouteTableExists(resourceName string, routeTableId string) resource.TestCheckFunc { - return func(s *terraform.State) error { - networksClient := acceptance.AzureProvider.Meta().(*clients.Client).Network.VnetClient - subnetsClient := acceptance.AzureProvider.Meta().(*clients.Client).Network.SubnetsClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - // Ensure we have enough information in state to look up in API - rs, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %s", resourceName) - } - - log.Printf("[INFO] Checking Subnet update.") - - subnetName := rs.Primary.Attributes["name"] - vnetName := rs.Primary.Attributes["virtual_network_name"] - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for subnet: %s", subnetName) - } - - vnetResp, vnetErr := networksClient.Get(ctx, resourceGroup, vnetName, "") - if vnetErr != nil { - return fmt.Errorf("Bad: Get on vnetClient: %+v", vnetErr) - } - - if vnetResp.Subnets == nil { - return fmt.Errorf("Bad: Vnet %q (resource group: %q) does not have subnets after update", vnetName, resourceGroup) - } - - resp, err := subnetsClient.Get(ctx, resourceGroup, vnetName, subnetName, "") - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - return fmt.Errorf("Bad: Subnet %q (resource group: %q) does not exist", subnetName, resourceGroup) - } - - return fmt.Errorf("Bad: Get on subnetClient: %+v", err) - } - - if resp.RouteTable == nil { - return fmt.Errorf("Bad: Subnet %q (resource group: %q) does not contain route tables after update", subnetName, resourceGroup) - } - - if !strings.Contains(*resp.RouteTable.ID, routeTableId) { - return fmt.Errorf("Bad: Subnet %q (resource group: %q) does not have route table %q", subnetName, resourceGroup, routeTableId) - } - - return nil - } -} - func testCheckAzureRMSubnetDisappears(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).Network.SubnetsClient @@ -423,451 +345,162 @@ func testCheckAzureRMSubnetDestroy(s *terraform.State) error { } func testAccAzureRMSubnet_basic(data acceptance.TestData) string { + template := testAccAzureRMSubnet_template(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvirtnet%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} +%s resource "azurerm_subnet" "test" { - name = "acctestsubnet%d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" + name = "internal" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name address_prefix = "10.0.2.0/24" } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) -} - -func testAccAzureRMSubnet_requiresImport(data acceptance.TestData) string { - template := testAccAzureRMSubnet_basic(data) - return fmt.Sprintf(` -%s - -resource "azurerm_subnet" "import" { - name = "${azurerm_subnet.test.name}" - resource_group_name = "${azurerm_subnet.test.resource_group_name}" - virtual_network_name = "${azurerm_subnet.test.virtual_network_name}" - address_prefix = "${azurerm_subnet.test.address_prefix}" -} `, template) } func testAccAzureRMSubnet_delegation(data acceptance.TestData) string { + template := testAccAzureRMSubnet_template(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvirtnet%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} +%s resource "azurerm_subnet" "test" { - name = "acctestsubnet%d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" + name = "internal" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name address_prefix = "10.0.2.0/24" delegation { - name = "acctestdelegation" + name = "first" service_delegation { name = "Microsoft.ContainerInstance/containerGroups" - actions = ["Microsoft.Network/virtualNetworks/subnets/action"] + actions = [ + "Microsoft.Network/virtualNetworks/subnets/action", + ] } } } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) +`, template) } -func testAccAzureRMSubnet_delegationComputedActions(data acceptance.TestData) string { +func testAccAzureRMSubnet_delegationUpdated(data acceptance.TestData) string { + template := testAccAzureRMSubnet_template(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvirtnet%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} +%s resource "azurerm_subnet" "test" { - name = "acctestsubnet%d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" + name = "internal" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name address_prefix = "10.0.2.0/24" delegation { - name = "acctestdelegation" + name = "first" service_delegation { - name = "Microsoft.Sql/managedInstances" + name = "Microsoft.Databricks/workspaces" + actions = [ + "Microsoft.Network/virtualNetworks/subnets/action", + "Microsoft.Network/virtualNetworks/subnets/prepareNetworkPolicies/action", + "Microsoft.Network/virtualNetworks/subnets/unprepareNetworkPolicies/action", + ] } } } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) -} - -func testAccAzureRMSubnet_routeTable(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvirtnet%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "acctestsubnet%d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" - route_table_id = "${azurerm_route_table.test.id}" -} - -resource "azurerm_route_table" "test" { - name = "acctest-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - route { - name = "acctest-%d" - address_prefix = "10.100.0.0/14" - next_hop_type = "VirtualAppliance" - next_hop_in_ip_address = "10.10.1.1" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, template) } -func testAccAzureRMSubnet_routeTableUnlinked(data acceptance.TestData) string { +func testAccAzureRMSubnet_enforcePrivateLinkEndpointNetworkPolicies(data acceptance.TestData, enabled bool) string { + template := testAccAzureRMSubnet_template(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvirtnet%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} +%s resource "azurerm_subnet" "test" { - name = "acctestsubnet%d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" + name = "internal" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name address_prefix = "10.0.2.0/24" - route_table_id = "" -} - -resource "azurerm_route_table" "test" { - name = "acctest-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - route { - name = "acctest-%d" - address_prefix = "10.100.0.0/14" - next_hop_type = "VirtualAppliance" - next_hop_in_ip_address = "10.10.1.1" - } + enforce_private_link_endpoint_network_policies = %t } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, template, enabled) } -func testAccAzureRMSubnet_updatedRouteTable(data acceptance.TestData) string { +func testAccAzureRMSubnet_enforcePrivateLinkServiceNetworkPolicies(data acceptance.TestData, enabled bool) string { + template := testAccAzureRMSubnet_template(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" - - tags = { - environment = "Testing" - } -} - -resource "azurerm_network_security_group" "test_secgroup" { - name = "acctest-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - security_rule { - name = "acctest-%d" - priority = 100 - direction = "Inbound" - access = "Allow" - protocol = "Tcp" - source_port_range = "*" - destination_port_range = "*" - source_address_prefix = "*" - destination_address_prefix = "*" - } - - tags = { - environment = "Testing" - } -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvirtnet%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - tags = { - environment = "Testing" - } -} +%s resource "azurerm_subnet" "test" { - name = "acctestsubnet%d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" + name = "internal" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name address_prefix = "10.0.2.0/24" - route_table_id = "${azurerm_route_table.test.id}" -} - -resource "azurerm_route_table" "test" { - name = "acctest-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - route { - name = "acctest-%d" - address_prefix = "10.100.0.0/14" - next_hop_type = "VirtualAppliance" - next_hop_in_ip_address = "10.10.1.1" - } - - tags = { - environment = "Testing" - } + enforce_private_link_service_network_policies = %t } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, template, enabled) } -func testAccAzureRMSubnet_networkSecurityGroup(data acceptance.TestData) string { +func testAccAzureRMSubnet_requiresImport(data acceptance.TestData) string { + template := testAccAzureRMSubnet_basic(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctest%d-rg" - location = "%s" -} - -resource "azurerm_network_security_group" "test" { - name = "acctestnsg%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - security_rule { - name = "test123" - priority = 100 - direction = "Inbound" - access = "Allow" - protocol = "Tcp" - source_port_range = "*" - destination_port_range = "*" - source_address_prefix = "*" - destination_address_prefix = "*" - } -} - -resource "azurerm_virtual_network" "test" { - name = "acctest%d-vn" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} +%s -resource "azurerm_subnet" "test" { - name = "acctest%d-private" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.0.0/24" - network_security_group_id = "${azurerm_network_security_group.test.id}" +resource "azurerm_subnet" "import" { + name = azurerm_subnet.test.name + resource_group_name = azurerm_subnet.test.resource_group_name + virtual_network_name = azurerm_subnet.test.virtual_network_name + address_prefix = azurerm_subnet.test.address_prefix } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, template) } -func testAccAzureRMSubnet_networkSecurityGroupDetached(data acceptance.TestData) string { +func testAccAzureRMSubnet_serviceEndpoints(data acceptance.TestData) string { + template := testAccAzureRMSubnet_template(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctest%d-rg" - location = "%s" -} - -resource "azurerm_network_security_group" "test" { - name = "acctestnsg%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - security_rule { - name = "test123" - priority = 100 - direction = "Inbound" - access = "Allow" - protocol = "Tcp" - source_port_range = "*" - destination_port_range = "*" - source_address_prefix = "*" - destination_address_prefix = "*" - } -} - -resource "azurerm_virtual_network" "test" { - name = "acctest%d-vn" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} +%s resource "azurerm_subnet" "test" { - name = "acctest%d-private" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.0.0/24" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - -func testAccAzureRMSubnet_bug7986(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctest%d-rg" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctest%d-vn" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_route_table" "first" { - name = "acctest%d-private-1" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - route { - name = "acctest%d-private-1" - address_prefix = "0.0.0.0/0" - next_hop_type = "None" - } -} - -resource "azurerm_subnet" "first" { - name = "acctest%d-private-1" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.0.0/24" - route_table_id = "${azurerm_route_table.first.id}" -} - -resource "azurerm_route_table" "second" { - name = "acctest%d-private-2" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - route { - name = "acctest%d-private-2" - address_prefix = "0.0.0.0/0" - next_hop_type = "None" - } -} - -resource "azurerm_subnet" "second" { - name = "acctest%d-private-2" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.1.0/24" - route_table_id = "${azurerm_route_table.second.id}" + name = "internal" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name + address_prefix = "10.0.2.0/24" + service_endpoints = ["Microsoft.Sql"] } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, template) } -func testAccAzureRMSubnet_bug15204(data acceptance.TestData) string { +func testAccAzureRMSubnet_serviceEndpointsUpdated(data acceptance.TestData) string { + template := testAccAzureRMSubnet_template(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctest-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvn-%d" - address_space = ["10.85.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_network_security_group" "test" { - name = "acctestnsg-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_route_table" "test" { - name = "acctestrt-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} +%s resource "azurerm_subnet" "test" { - name = "acctestsubnet-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.85.9.0/24" - route_table_id = "${azurerm_route_table.test.id}" - network_security_group_id = "${azurerm_network_security_group.test.id}" + name = "internal" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name + address_prefix = "10.0.2.0/24" + service_endpoints = ["Microsoft.Sql", "Microsoft.Storage"] } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, template) } -func testAccAzureRMSubnet_serviceEndpoints(data acceptance.TestData) string { +func testAccAzureRMSubnet_updatedAddressPrefix(data acceptance.TestData) string { + template := testAccAzureRMSubnet_template(data) return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvirtnet%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} +%s resource "azurerm_subnet" "test" { - name = "acctestsubnet%d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" - service_endpoints = ["Microsoft.Sql", "Microsoft.Storage"] + name = "internal" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name + address_prefix = "10.0.3.0/24" } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) +`, template) } -func testAccAzureRMSubnet_serviceEndpointsVNetUpdate(data acceptance.TestData) string { +func testAccAzureRMSubnet_template(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" @@ -877,20 +510,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_virtual_network" "test" { name = "acctestvirtnet%d" address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - tags = { - Environment = "Staging" - } -} - -resource "azurerm_subnet" "test" { - name = "acctestsubnet%d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" - service_endpoints = ["Microsoft.Sql", "Microsoft.Storage"] + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } diff --git a/azurerm/internal/services/network/tests/resource_arm_virtual_network_test.go b/azurerm/internal/services/network/tests/resource_arm_virtual_network_test.go index 353cda16a364c..f146d94925120 100644 --- a/azurerm/internal/services/network/tests/resource_arm_virtual_network_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_virtual_network_test.go @@ -163,24 +163,6 @@ func TestAccAzureRMVirtualNetwork_withTags(t *testing.T) { }) } -func TestAccAzureRMVirtualNetwork_bug373(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_virtual_network", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMVirtualNetworkDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMVirtualNetwork_bug373(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualNetworkExists(data.ResourceName), - ), - }, - }, - }) -} - func testCheckAzureRMVirtualNetworkExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).Network.VnetClient @@ -416,69 +398,3 @@ resource "azurerm_virtual_network" "test" { } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } - -func testAccAzureRMVirtualNetwork_bug373(data acceptance.TestData) string { - return fmt.Sprintf(` -variable "environment" { - default = "TestVirtualNetworkBug373" -} - -variable "network_cidr" { - default = "10.0.0.0/16" -} - -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "${azurerm_resource_group.test.name}-vnet" - resource_group_name = "${azurerm_resource_group.test.name}" - address_space = ["${var.network_cidr}"] - location = "${azurerm_resource_group.test.location}" - - tags = { - environment = "${var.environment}" - } -} - -resource "azurerm_subnet" "public" { - name = "${azurerm_resource_group.test.name}-subnet-public" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.1.0/24" - network_security_group_id = "${azurerm_network_security_group.test.id}" -} - -resource "azurerm_subnet" "private" { - name = "${azurerm_resource_group.test.name}-subnet-private" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" - network_security_group_id = "${azurerm_network_security_group.test.id}" -} - -resource "azurerm_network_security_group" "test" { - name = "default-network-sg" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - security_rule { - name = "default-allow-all" - priority = 100 - direction = "Inbound" - access = "Allow" - protocol = "*" - source_port_range = "*" - destination_port_range = "*" - source_address_prefix = "${var.network_cidr}" - destination_address_prefix = "*" - } - - tags = { - environment = "${var.environment}" - } -} -`, data.RandomInteger, data.Locations.Primary) -} diff --git a/website/docs/d/subnet.html.markdown b/website/docs/d/subnet.html.markdown index 60d911819d0ca..73ea02db1300d 100644 --- a/website/docs/d/subnet.html.markdown +++ b/website/docs/d/subnet.html.markdown @@ -37,7 +37,6 @@ output "subnet_id" { * `enforce_private_link_service_network_policies` - Enable or Disable network policies on private link service in the subnet. * `network_security_group_id` - The ID of the Network Security Group associated with the subnet. * `route_table_id` - The ID of the Route Table associated with this subnet. -* `ip_configurations` - The collection of IP Configurations with IPs within this subnet. * `service_endpoints` - A list of Service Endpoints within this subnet. * `enforce_private_link_endpoint_network_policies` - Enable or Disable network policies for the private link endpoint on the subnet. * `enforce_private_link_service_network_policies` - Enable or Disable network policies for the private link service on the subnet. diff --git a/website/docs/r/subnet.html.markdown b/website/docs/r/subnet.html.markdown index 6fc59355fd16e..fe9a8c257c955 100644 --- a/website/docs/r/subnet.html.markdown +++ b/website/docs/r/subnet.html.markdown @@ -59,11 +59,7 @@ The following arguments are supported: * `address_prefix` - (Required) The address prefix to use for the subnet. -* `network_security_group_id` - (Optional / **Deprecated**) The ID of the Network Security Group to associate with the subnet. - --> **NOTE:** At this time Subnet `<->` Network Security Group associations need to be configured both using this field (which is now Deprecated) and using the `azurerm_subnet_network_security_group_association` resource. This field is deprecated and will be removed in favour of that resource in the next major version (2.0) of the AzureRM Provider. - -* `service_endpoints` - (Optional) The list of Service endpoints to associate with the subnet. Possible values include: `Microsoft.AzureActiveDirectory`, `Microsoft.AzureCosmosDB`, `Microsoft.ContainerRegistry`, `Microsoft.EventHub`, `Microsoft.KeyVault`, `Microsoft.ServiceBus`, `Microsoft.Sql`, `Microsoft.Storage` and `Microsoft.Web`. +--- * `delegation` - (Optional) One or more `delegation` blocks as defined below. @@ -71,10 +67,12 @@ The following arguments are supported: -> **NOTE:** Network policies, like network security groups (NSG), are not supported for Private Link Endpoints or Private Link Services. In order to deploy a Private Link Endpoint on a given subnet, you must set the `enforce_private_link_endpoint_network_policies` attribute to `true`. This setting is only applicable for the Private Link Endpoint, for all other resources in the subnet access is controlled based on the `network_security_group_id`. -* `enforce_private_link_service_network_policies` - (Optional) Enable or Disable network policies for the private link service on the subnet. Default valule is `false`. Conflicts with enforce_private_link_endpoint_network_policies. +* `enforce_private_link_service_network_policies` - (Optional) Enable or Disable network policies for the private link service on the subnet. Default valule is `false`. Conflicts with `enforce_private_link_endpoint_network_policies`. -> **NOTE:** In order to deploy a Private Link Service on a given subnet, you must set the `enforce_private_link_service_network_policies` attribute to `true`. This setting is only applicable for the Private Link Service, for all other resources in the subnet access is controlled based on the `network_security_group_id`. +* `service_endpoints` - (Optional) The list of Service endpoints to associate with the subnet. Possible values include: `Microsoft.AzureActiveDirectory`, `Microsoft.AzureCosmosDB`, `Microsoft.ContainerRegistry`, `Microsoft.EventHub`, `Microsoft.KeyVault`, `Microsoft.ServiceBus`, `Microsoft.Sql`, `Microsoft.Storage` and `Microsoft.Web`. + --- A `delegation` block supports the following: @@ -100,7 +98,6 @@ A `service_delegation` block supports the following: The following attributes are exported: * `id` - The subnet ID. -* `ip_configurations` - The collection of IP Configurations with IPs within this subnet. * `name` - The name of the subnet. * `resource_group_name` - The name of the resource group in which the subnet is created in. * `virtual_network_name` - The name of the virtual network in which the subnet is created in diff --git a/website/docs/r/subnet_network_security_group_association.html.markdown b/website/docs/r/subnet_network_security_group_association.html.markdown index 7872e2b1642ae..8ffd34c507768 100644 --- a/website/docs/r/subnet_network_security_group_association.html.markdown +++ b/website/docs/r/subnet_network_security_group_association.html.markdown @@ -33,7 +33,6 @@ resource "azurerm_subnet" "example" { resource_group_name = azurerm_resource_group.example.name virtual_network_name = azurerm_virtual_network.example.name address_prefix = "10.0.2.0/24" - network_security_group_id = azurerm_network_security_group.example.id } resource "azurerm_network_security_group" "example" { From 13796b7be541f01a8cb93d16cfcdbec485b0f83e Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 18 Feb 2020 12:03:52 +0100 Subject: [PATCH 184/498] r/route_table: removing an obsolete test This is now managed/tested in the association resource --- .../tests/resource_arm_route_table_test.go | 127 ------------------ 1 file changed, 127 deletions(-) diff --git a/azurerm/internal/services/network/tests/resource_arm_route_table_test.go b/azurerm/internal/services/network/tests/resource_arm_route_table_test.go index e69d34553a312..b84133563c553 100644 --- a/azurerm/internal/services/network/tests/resource_arm_route_table_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_route_table_test.go @@ -265,34 +265,6 @@ func TestAccAzureRMRouteTable_multipleRoutes(t *testing.T) { }) } -func TestAccAzureRMRouteTable_withTagsSubnet(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_route_table", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRouteTableDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRouteTable_withTagsSubnet(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMRouteTableExists("azurerm_route_table.test"), - testCheckAzureRMSubnetExists("azurerm_subnet.subnet1"), - resource.TestCheckResourceAttrSet("azurerm_subnet.subnet1", "route_table_id"), - ), - }, - { - Config: testAccAzureRMRouteTable_withAddTagsSubnet(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMRouteTableExists("azurerm_route_table.test"), - testCheckAzureRMSubnetExists("azurerm_subnet.subnet1"), - resource.TestCheckResourceAttrSet("azurerm_subnet.subnet1", "route_table_id"), - ), - }, - }, - }) -} - func testCheckAzureRMRouteTableExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[resourceName] @@ -582,102 +554,3 @@ resource "azurerm_route_table" "test" { } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } - -func testAccAzureRMRouteTable_withTagsSubnet(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" - - tags = { - environment = "staging" - } -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvirtnet%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - address_space = ["10.0.0.0/16"] - - tags = { - environment = "staging" - } -} - -resource "azurerm_subnet" "subnet1" { - name = "subnet1" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.1.0/24" - route_table_id = "${azurerm_route_table.test.id}" -} - -resource "azurerm_route_table" "test" { - name = "acctestrt%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - route { - name = "route1" - address_prefix = "10.1.0.0/16" - next_hop_type = "vnetlocal" - } - - tags = { - environment = "staging" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) -} - -func testAccAzureRMRouteTable_withAddTagsSubnet(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" - - tags = { - environment = "staging" - cloud = "Azure" - } -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvirtnet%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - address_space = ["10.0.0.0/16"] - - tags = { - environment = "staging" - cloud = "Azure" - } -} - -resource "azurerm_subnet" "subnet1" { - name = "subnet1" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.1.0/24" - route_table_id = "${azurerm_route_table.test.id}" -} - -resource "azurerm_route_table" "test" { - name = "acctestrt%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - route { - name = "route1" - address_prefix = "10.1.0.0/16" - next_hop_type = "vnetlocal" - } - - tags = { - environment = "staging" - cloud = "Azure" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) -} From c3863db2ad8557cd703be85ba01ac8e763e06b11 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 18 Feb 2020 12:08:45 +0100 Subject: [PATCH 185/498] r/subnet: removing the old network_security_group_id field from the docs --- website/docs/r/subnet.html.markdown | 4 ++-- .../r/subnet_network_security_group_association.html.markdown | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/website/docs/r/subnet.html.markdown b/website/docs/r/subnet.html.markdown index fe9a8c257c955..8b0f2b293da8d 100644 --- a/website/docs/r/subnet.html.markdown +++ b/website/docs/r/subnet.html.markdown @@ -65,11 +65,11 @@ The following arguments are supported: * `enforce_private_link_endpoint_network_policies` - (Optional) Enable or Disable network policies for the private link endpoint on the subnet. Default valule is `false`. Conflicts with enforce_private_link_service_network_policies. --> **NOTE:** Network policies, like network security groups (NSG), are not supported for Private Link Endpoints or Private Link Services. In order to deploy a Private Link Endpoint on a given subnet, you must set the `enforce_private_link_endpoint_network_policies` attribute to `true`. This setting is only applicable for the Private Link Endpoint, for all other resources in the subnet access is controlled based on the `network_security_group_id`. +-> **NOTE:** Network policies, like network security groups (NSG), are not supported for Private Link Endpoints or Private Link Services. In order to deploy a Private Link Endpoint on a given subnet, you must set the `enforce_private_link_endpoint_network_policies` attribute to `true`. This setting is only applicable for the Private Link Endpoint, for all other resources in the subnet access is controlled based via the Network Security Group which can be configured using the `azurerm_subnet_network_security_group_association` resource. * `enforce_private_link_service_network_policies` - (Optional) Enable or Disable network policies for the private link service on the subnet. Default valule is `false`. Conflicts with `enforce_private_link_endpoint_network_policies`. --> **NOTE:** In order to deploy a Private Link Service on a given subnet, you must set the `enforce_private_link_service_network_policies` attribute to `true`. This setting is only applicable for the Private Link Service, for all other resources in the subnet access is controlled based on the `network_security_group_id`. +-> **NOTE:** In order to deploy a Private Link Service on a given subnet, you must set the `enforce_private_link_service_network_policies` attribute to `true`. This setting is only applicable for the Private Link Service, for all other resources in the subnet access is controlled based on the Network Security Group which can be configured using the `azurerm_subnet_network_security_group_association` resource. * `service_endpoints` - (Optional) The list of Service endpoints to associate with the subnet. Possible values include: `Microsoft.AzureActiveDirectory`, `Microsoft.AzureCosmosDB`, `Microsoft.ContainerRegistry`, `Microsoft.EventHub`, `Microsoft.KeyVault`, `Microsoft.ServiceBus`, `Microsoft.Sql`, `Microsoft.Storage` and `Microsoft.Web`. diff --git a/website/docs/r/subnet_network_security_group_association.html.markdown b/website/docs/r/subnet_network_security_group_association.html.markdown index 8ffd34c507768..5259f4d0da244 100644 --- a/website/docs/r/subnet_network_security_group_association.html.markdown +++ b/website/docs/r/subnet_network_security_group_association.html.markdown @@ -11,8 +11,6 @@ description: |- Associates a [Network Security Group](network_security_group.html) with a [Subnet](subnet.html) within a [Virtual Network](virtual_network.html). --> **NOTE:** Subnet `<->` Network Security Group associations currently need to be configured on both this resource and using the `network_security_group_id` field on the `azurerm_subnet` resource. The next major version of the AzureRM Provider (2.0) will remove the `network_security_group_id` field from the `azurerm_subnet` resource such that this resource is used to link resources in future. - ## Example Usage ```hcl From 1310177ce5c98469fc3d7ece4d305acce21215b0 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 18 Feb 2020 12:11:29 +0100 Subject: [PATCH 186/498] linting --- .../internal/services/network/network_interface.go | 8 ++++---- .../network/resource_arm_network_interface.go | 14 +++++--------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/azurerm/internal/services/network/network_interface.go b/azurerm/internal/services/network/network_interface.go index dd29bb6aa188e..0f5c25a97bd4e 100644 --- a/azurerm/internal/services/network/network_interface.go +++ b/azurerm/internal/services/network/network_interface.go @@ -29,10 +29,10 @@ func parseFieldsFromNetworkInterface(input network.InterfacePropertiesFormat) ne return output } - applicationSecurityGroupIds := make(map[string]struct{}, 0) - applicationGatewayBackendAddressPoolIds := make(map[string]struct{}, 0) - loadBalancerBackendAddressPoolIds := make(map[string]struct{}, 0) - loadBalancerInboundNatRuleIds := make(map[string]struct{}, 0) + applicationSecurityGroupIds := make(map[string]struct{}) + applicationGatewayBackendAddressPoolIds := make(map[string]struct{}) + loadBalancerBackendAddressPoolIds := make(map[string]struct{}) + loadBalancerInboundNatRuleIds := make(map[string]struct{}) if input.IPConfigurations != nil { for _, v := range *input.IPConfigurations { diff --git a/azurerm/internal/services/network/resource_arm_network_interface.go b/azurerm/internal/services/network/resource_arm_network_interface.go index 92f606503b841..4b4c388d54994 100644 --- a/azurerm/internal/services/network/resource_arm_network_interface.go +++ b/azurerm/internal/services/network/resource_arm_network_interface.go @@ -236,7 +236,7 @@ func resourceArmNetworkInterfaceCreate(d *schema.ResourceData, meta interface{}) } lockingDetails, err := determineResourcesToLockFromIPConfiguration(ipConfigs) if err != nil { - return fmt.Errorf("Error determing locking details: %+v", err) + return fmt.Errorf("Error determining locking details: %+v", err) } lockingDetails.lock() @@ -344,7 +344,7 @@ func resourceArmNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{}) } lockingDetails, err := determineResourcesToLockFromIPConfiguration(ipConfigs) if err != nil { - return fmt.Errorf("Error determing locking details: %+v", err) + return fmt.Errorf("Error determining locking details: %+v", err) } lockingDetails.lock() @@ -501,7 +501,7 @@ func resourceArmNetworkInterfaceDelete(d *schema.ResourceData, meta interface{}) lockingDetails, err := determineResourcesToLockFromIPConfiguration(props.IPConfigurations) if err != nil { - return fmt.Errorf("Error determing locking details: %+v", err) + return fmt.Errorf("Error determining locking details: %+v", err) } lockingDetails.lock() @@ -645,13 +645,9 @@ func expandNetworkInterfaceDnsServers(input []interface{}) []string { } func flattenNetworkInterfaceDnsServers(input *[]string) []string { - output := make([]string, 0) if input == nil { - return output + return make([]string, 0) } - for _, v := range *input { - output = append(output, v) - } - return output + return *input } From d0de7627d90c491f199f65a5a3e6c64894d899c0 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 18 Feb 2020 12:27:44 +0100 Subject: [PATCH 187/498] fixing the linting --- website/docs/r/private_endpoint.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/private_endpoint.html.markdown b/website/docs/r/private_endpoint.html.markdown index d590fd957bbc3..2a0c8428d9717 100644 --- a/website/docs/r/private_endpoint.html.markdown +++ b/website/docs/r/private_endpoint.html.markdown @@ -88,7 +88,7 @@ resource "azurerm_private_endpoint" "example" { location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name subnet_id = azurerm_subnet.endpoint.id - + private_service_connection { name = "example-privateserviceconnection" private_connection_resource_id = azurerm_private_link_service.example.id From 86f3905b03c678d56374dac7c237d161324fd91e Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 18 Feb 2020 12:29:17 +0100 Subject: [PATCH 188/498] r/subnet: fixing the broken test --- .../internal/services/network/tests/resource_arm_subnet_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/network/tests/resource_arm_subnet_test.go b/azurerm/internal/services/network/tests/resource_arm_subnet_test.go index e7804d863aefe..e428fd039070a 100644 --- a/azurerm/internal/services/network/tests/resource_arm_subnet_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_subnet_test.go @@ -400,7 +400,7 @@ resource "azurerm_subnet" "test" { service_delegation { name = "Microsoft.Databricks/workspaces" actions = [ - "Microsoft.Network/virtualNetworks/subnets/action", + "Microsoft.Network/virtualNetworks/subnets/join/action", "Microsoft.Network/virtualNetworks/subnets/prepareNetworkPolicies/action", "Microsoft.Network/virtualNetworks/subnets/unprepareNetworkPolicies/action", ] From 56e9065fd78c54e1861b1180581d3084d98bc079 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Tue, 18 Feb 2020 12:22:06 +0000 Subject: [PATCH 189/498] Fixup tests --- .../resource_arm_automation_job_schedule.go | 35 +++++++++++-------- ...esource_arm_automation_certificate_test.go | 1 - ...source_arm_automation_job_schedule_test.go | 1 + 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/azurerm/internal/services/automation/resource_arm_automation_job_schedule.go b/azurerm/internal/services/automation/resource_arm_automation_job_schedule.go index 469de5a3e3721..44bab456468d5 100644 --- a/azurerm/internal/services/automation/resource_arm_automation_job_schedule.go +++ b/azurerm/internal/services/automation/resource_arm_automation_job_schedule.go @@ -6,6 +6,8 @@ import ( "strings" "time" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" + "github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" uuid "github.com/satori/go.uuid" @@ -86,9 +88,10 @@ func resourceArmAutomationJobSchedule() *schema.Resource { }, "job_schedule_id": { - Type: schema.TypeString, - Optional: true, - Computed: true, + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validate.UUID, }, }, } @@ -102,17 +105,21 @@ func resourceArmAutomationJobScheduleCreate(d *schema.ResourceData, meta interfa log.Printf("[INFO] preparing arguments for AzureRM Automation Job Schedule creation.") jobScheduleUUID := uuid.NewV4() - resGroup := d.Get("resource_group_name").(string) + if jobScheduleID, ok := d.GetOk("job_schedule_id"); ok { + jobScheduleUUID = uuid.FromStringOrNil(jobScheduleID.(string)) + } + + resourceGroup := d.Get("resource_group_name").(string) accountName := d.Get("automation_account_name").(string) runbookName := d.Get("runbook_name").(string) scheduleName := d.Get("schedule_name").(string) if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, resGroup, accountName, jobScheduleUUID) + existing, err := client.Get(ctx, resourceGroup, accountName, jobScheduleUUID) if err != nil { if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing Automation Job Schedule %q (Account %q / Resource Group %q): %s", jobScheduleUUID, accountName, resGroup, err) + return fmt.Errorf("Error checking for presence of existing Automation Job Schedule %q (Account %q / Resource Group %q): %s", jobScheduleUUID, accountName, resourceGroup, err) } } @@ -148,17 +155,17 @@ func resourceArmAutomationJobScheduleCreate(d *schema.ResourceData, meta interfa properties.RunOn = &value } - if _, err := client.Create(ctx, resGroup, accountName, jobScheduleUUID, parameters); err != nil { + if _, err := client.Create(ctx, resourceGroup, accountName, jobScheduleUUID, parameters); err != nil { return err } - read, err := client.Get(ctx, resGroup, accountName, jobScheduleUUID) + read, err := client.Get(ctx, resourceGroup, accountName, jobScheduleUUID) if err != nil { return err } if read.ID == nil { - return fmt.Errorf("Cannot read Automation Job Schedule '%s' (Account %q / Resource Group %s) ID", jobScheduleUUID, accountName, resGroup) + return fmt.Errorf("Cannot read Automation Job Schedule '%s' (Account %q / Resource Group %s) ID", jobScheduleUUID, accountName, resourceGroup) } d.SetId(*read.ID) @@ -178,10 +185,10 @@ func resourceArmAutomationJobScheduleRead(d *schema.ResourceData, meta interface jobScheduleID := id.Path["jobSchedules"] jobScheduleUUID := uuid.FromStringOrNil(jobScheduleID) - resGroup := id.ResourceGroup + resourceGroup := id.ResourceGroup accountName := id.Path["automationAccounts"] - resp, err := client.Get(ctx, resGroup, accountName, jobScheduleUUID) + resp, err := client.Get(ctx, resourceGroup, accountName, jobScheduleUUID) if err != nil { if utils.ResponseWasNotFound(resp.Response) { d.SetId("") @@ -192,7 +199,7 @@ func resourceArmAutomationJobScheduleRead(d *schema.ResourceData, meta interface } d.Set("job_schedule_id", resp.JobScheduleID) - d.Set("resource_group_name", resGroup) + d.Set("resource_group_name", resourceGroup) d.Set("automation_account_name", accountName) d.Set("runbook_name", resp.JobScheduleProperties.Runbook.Name) d.Set("schedule_name", resp.JobScheduleProperties.Schedule.Name) @@ -224,10 +231,10 @@ func resourceArmAutomationJobScheduleDelete(d *schema.ResourceData, meta interfa jobScheduleID := id.Path["jobSchedules"] jobScheduleUUID := uuid.FromStringOrNil(jobScheduleID) - resGroup := id.ResourceGroup + resourceGroup := id.ResourceGroup accountName := id.Path["automationAccounts"] - resp, err := client.Delete(ctx, resGroup, accountName, jobScheduleUUID) + resp, err := client.Delete(ctx, resourceGroup, accountName, jobScheduleUUID) if err != nil { if !utils.ResponseWasNotFound(resp) { return fmt.Errorf("Error issuing AzureRM delete request for Automation Job Schedule '%s': %+v", jobScheduleUUID, err) diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_certificate_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_certificate_test.go index 0e7aeec998267..6d4e06d529cd2 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_certificate_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_certificate_test.go @@ -204,7 +204,6 @@ resource "azurerm_automation_certificate" "import" { resource_group_name = azurerm_automation_certificate.test.resource_group_name automation_account_name = azurerm_automation_certificate.test.automation_account_name base64 = azurerm_automation_certificate.test.base64 - thumbprint = azurerm_automation_certificate.test.thumbprint } `, template) } diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_job_schedule_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_job_schedule_test.go index 98bf5410a4942..32fc5d00ab295 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_job_schedule_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_job_schedule_test.go @@ -299,6 +299,7 @@ resource "azurerm_automation_job_schedule" "import" { automation_account_name = "${azurerm_automation_job_schedule.test.automation_account_name}" schedule_name = "${azurerm_automation_job_schedule.test.schedule_name}" runbook_name = "${azurerm_automation_job_schedule.test.runbook_name}" + job_schedule_id = "${azurerm_automation_job_schedule.test.job_schedule_id}" } `, template) } From 1d1008e3f7ace203eaef1478d778a0d26bd430e3 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 18 Feb 2020 13:27:46 +0100 Subject: [PATCH 190/498] linting --- .../services/network/tests/resource_arm_subnet_test.go | 4 ++-- ...ubnet_network_security_group_association.html.markdown | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/azurerm/internal/services/network/tests/resource_arm_subnet_test.go b/azurerm/internal/services/network/tests/resource_arm_subnet_test.go index e428fd039070a..3e72723ecf97d 100644 --- a/azurerm/internal/services/network/tests/resource_arm_subnet_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_subnet_test.go @@ -373,7 +373,7 @@ resource "azurerm_subnet" "test" { name = "first" service_delegation { - name = "Microsoft.ContainerInstance/containerGroups" + name = "Microsoft.ContainerInstance/containerGroups" actions = [ "Microsoft.Network/virtualNetworks/subnets/action", ] @@ -398,7 +398,7 @@ resource "azurerm_subnet" "test" { name = "first" service_delegation { - name = "Microsoft.Databricks/workspaces" + name = "Microsoft.Databricks/workspaces" actions = [ "Microsoft.Network/virtualNetworks/subnets/join/action", "Microsoft.Network/virtualNetworks/subnets/prepareNetworkPolicies/action", diff --git a/website/docs/r/subnet_network_security_group_association.html.markdown b/website/docs/r/subnet_network_security_group_association.html.markdown index 5259f4d0da244..c172e34286136 100644 --- a/website/docs/r/subnet_network_security_group_association.html.markdown +++ b/website/docs/r/subnet_network_security_group_association.html.markdown @@ -27,10 +27,10 @@ resource "azurerm_virtual_network" "example" { } resource "azurerm_subnet" "example" { - name = "frontend" - resource_group_name = azurerm_resource_group.example.name - virtual_network_name = azurerm_virtual_network.example.name - address_prefix = "10.0.2.0/24" + name = "frontend" + resource_group_name = azurerm_resource_group.example.name + virtual_network_name = azurerm_virtual_network.example.name + address_prefix = "10.0.2.0/24" } resource "azurerm_network_security_group" "example" { From 065ef3172b00e0ca78d323464334948c6480dd0b Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 18 Feb 2020 13:29:10 +0100 Subject: [PATCH 191/498] linting --- azurerm/internal/services/network/network_interface.go | 2 +- .../network/tests/resource_arm_network_interface_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/network/network_interface.go b/azurerm/internal/services/network/network_interface.go index 0f5c25a97bd4e..798b38580bb45 100644 --- a/azurerm/internal/services/network/network_interface.go +++ b/azurerm/internal/services/network/network_interface.go @@ -22,7 +22,7 @@ func parseFieldsFromNetworkInterface(input network.InterfacePropertiesFormat) ne var mapToSlice = func(input map[string]struct{}) []string { output := make([]string, 0) - for id, _ := range input { + for id := range input { output = append(output, id) } diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go index 3ec528f8615a5..47ccf8ca5d295 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go @@ -547,7 +547,7 @@ resource "azurerm_network_interface" "test" { name = "acctestni-%d" location = azurerm_resource_group.test.location resource_group_name = azurerm_resource_group.test.name - internal_dns_name_label = "acctestni-%s-%s" + internal_dns_name_label = "acctestni-%s-%s" ip_configuration { name = "primary" From 1584c8f9a8d00d472fbc68b8b27b49ff67c8d262 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 18 Feb 2020 13:36:39 +0100 Subject: [PATCH 192/498] r/api_management_api_(operation|schema): fixing the tests --- ...e_arm_api_management_api_operation_test.go | 1 - ...urce_arm_api_management_api_schema_test.go | 32 +++++++++---------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_test.go index bf2fd8babfee4..b6f49aaf5039d 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_test.go @@ -239,7 +239,6 @@ resource "azurerm_api_management_api_operation" "test" { } func testAccAzureRMApiManagementApiOperation_requiresImport(data acceptance.TestData) string { - //template := testAccAzureRMApiManagementApiOperation_template(data) template := testAccAzureRMApiManagementApiOperation_basic(data) return fmt.Sprintf(` %s diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_schema_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_schema_test.go index cead65cccb6ad..193082f8decb7 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_schema_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_schema_test.go @@ -118,30 +118,30 @@ func testAccAzureRMApiManagementApiSchema_basic(data acceptance.TestData) string %s resource "azurerm_api_management_api_schema" "test" { - api_name = "${azurerm_api_management_api.test.name}" - api_management_name = "${azurerm_api_management_api.test.api_management_name}" - resource_group_name = "${azurerm_api_management_api.test.resource_group_name}" + api_name = azurerm_api_management_api.test.name + api_management_name = azurerm_api_management_api.test.api_management_name + resource_group_name = azurerm_api_management_api.test.resource_group_name schema_id = "acctestSchema%d" content_type = "application/vnd.ms-azure-apim.xsd+xml" - value = "${file("testdata/api_management_api_schema.xml")}" + value = file("testdata/api_management_api_schema.xml") } `, template, data.RandomInteger) } func testAccAzureRMApiManagementApiSchema_requiresImport(data acceptance.TestData) string { - template := testAccAzureRMApiManagementApiSchema_template(data) + template := testAccAzureRMApiManagementApiSchema_basic(data) return fmt.Sprintf(` %s resource "azurerm_api_management_api_schema" "import" { - api_name = "${azurerm_api_management_api.test.name}" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - schema_id = "acctestSchema%d" - content_type = "application/vnd.ms-azure-apim.xsd+xml" - value = "${file("testdata/api_management_api_schema.xml")}" + api_name = azurerm_api_management_api_schema.test.name + api_management_name = azurerm_api_management_api_schema.test.api_management_name + resource_group_name = azurerm_api_management_api_schema.test.resource_group_name + schema_id = azurerm_api_management_api_schema.test.schema_id + content_type = azurerm_api_management_api_schema.test.content_type + value = azurerm_api_management_api_schema.test.value } -`, template, data.RandomInteger) +`, template) } func testAccAzureRMApiManagementApiSchema_template(data acceptance.TestData) string { @@ -153,8 +153,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" @@ -162,8 +162,8 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_api" "test" { name = "acctestapi-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name display_name = "api1" path = "api1" protocols = ["https"] From 012e1a948007a31362edb09640507af9094dc48f Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 18 Feb 2020 13:43:07 +0100 Subject: [PATCH 193/498] r/devspace: switching to use `default_node_pool` --- .../resource_arm_devspace_controller_test.go | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/azurerm/internal/services/devspace/tests/resource_arm_devspace_controller_test.go b/azurerm/internal/services/devspace/tests/resource_arm_devspace_controller_test.go index ff7972fb838e3..e968c6bcc18f6 100644 --- a/azurerm/internal/services/devspace/tests/resource_arm_devspace_controller_test.go +++ b/azurerm/internal/services/devspace/tests/resource_arm_devspace_controller_test.go @@ -146,10 +146,10 @@ resource "azurerm_kubernetes_cluster" "test" { } } - agent_pool_profile { - name = "default" - count = "1" - vm_size = "Standard_DS2_v2" + default_node_pool { + name = "default" + node_count = 1 + vm_size = "Standard_DS2_v2" } service_principal { @@ -160,12 +160,11 @@ resource "azurerm_kubernetes_cluster" "test" { resource "azurerm_devspace_controller" "test" { name = "acctestdsc%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - target_container_host_resource_id = "${azurerm_kubernetes_cluster.test.id}" - target_container_host_credentials_base64 = "${base64encode(azurerm_kubernetes_cluster.test.kube_config_raw)}" - - sku_name = "S1" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + target_container_host_resource_id = azurerm_kubernetes_cluster.test.id + target_container_host_credentials_base64 = base64encode(azurerm_kubernetes_cluster.test.kube_config_raw) + sku_name = "S1" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, clientId, clientSecret, data.RandomInteger) } @@ -176,12 +175,12 @@ func testAccAzureRMDevSpaceController_requiresImport(data acceptance.TestData, c %s resource "azurerm_devspace_controller" "import" { - name = "${azurerm_devspace_controller.test.name}" - location = "${azurerm_devspace_controller.test.location}" - resource_group_name = "${azurerm_devspace_controller.test.resource_group_name}" - target_container_host_resource_id = "${azurerm_kubernetes_cluster.test.id}" - target_container_host_credentials_base64 = "${base64encode(azurerm_kubernetes_cluster.test.kube_config_raw)}" - sku_name = "${base64encode(azurerm_kubernetes_cluster.test.sku_name)}" + name = azurerm_devspace_controller.test.name + location = azurerm_devspace_controller.test.location + resource_group_name = azurerm_devspace_controller.test.resource_group_name + target_container_host_resource_id = azurerm_devspace_controller.test.target_container_host_resource_id + target_container_host_credentials_base64 = base64encode(azurerm_kubernetes_cluster.test.kube_config_raw) + sku_name = azurerm_devspace_controller.test.sku_name } `, template) } From f445802f81e66bd68629c95ed3d76bd0d6e88cc4 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 18 Feb 2020 14:37:51 +0100 Subject: [PATCH 194/498] r/dns_zone: removing tests covering the deprecated fields --- .../services/dns/data_source_dns_zone.go | 32 ------- .../services/dns/resource_arm_dns_zone.go | 84 +------------------ .../dns/tests/resource_arm_dns_zone_test.go | 42 ---------- website/docs/d/dns_zone.html.markdown | 2 - website/docs/r/dns_zone.html.markdown | 4 - 5 files changed, 1 insertion(+), 163 deletions(-) diff --git a/azurerm/internal/services/dns/data_source_dns_zone.go b/azurerm/internal/services/dns/data_source_dns_zone.go index 4ee9f56b3eff2..3c4586a34e8a4 100644 --- a/azurerm/internal/services/dns/data_source_dns_zone.go +++ b/azurerm/internal/services/dns/data_source_dns_zone.go @@ -51,18 +51,6 @@ func dataSourceArmDnsZone() *schema.Resource { Set: schema.HashString, }, - "registration_virtual_network_ids": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Schema{Type: schema.TypeString}, - }, - - "resolution_virtual_network_ids": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Schema{Type: schema.TypeString}, - }, - "tags": tags.SchemaDataSource(), }, } @@ -109,26 +97,6 @@ func dataSourceArmDnsZoneRead(d *schema.ResourceData, meta interface{}) error { d.Set("number_of_record_sets", props.NumberOfRecordSets) d.Set("max_number_of_record_sets", props.MaxNumberOfRecordSets) - registrationVNets := make([]string, 0) - if rvns := props.RegistrationVirtualNetworks; rvns != nil { - for _, rvn := range *rvns { - registrationVNets = append(registrationVNets, *rvn.ID) - } - } - if err := d.Set("registration_virtual_network_ids", registrationVNets); err != nil { - return err - } - - resolutionVNets := make([]string, 0) - if rvns := props.ResolutionVirtualNetworks; rvns != nil { - for _, rvn := range *rvns { - resolutionVNets = append(resolutionVNets, *rvn.ID) - } - } - if err := d.Set("resolution_virtual_network_ids", resolutionVNets); err != nil { - return err - } - nameServers := make([]string, 0) if ns := props.NameServers; ns != nil { nameServers = *ns diff --git a/azurerm/internal/services/dns/resource_arm_dns_zone.go b/azurerm/internal/services/dns/resource_arm_dns_zone.go index a073ae37bcf95..53d04a030d38e 100644 --- a/azurerm/internal/services/dns/resource_arm_dns_zone.go +++ b/azurerm/internal/services/dns/resource_arm_dns_zone.go @@ -59,18 +59,6 @@ func resourceArmDnsZone() *schema.Resource { Set: schema.HashString, }, - "registration_virtual_network_ids": { - Type: schema.TypeList, - Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, - }, - - "resolution_virtual_network_ids": { - Type: schema.TypeList, - Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, - }, - "tags": tags.Schema(), }, } @@ -100,22 +88,14 @@ func resourceArmDnsZoneCreateUpdate(d *schema.ResourceData, meta interface{}) er location := "global" t := d.Get("tags").(map[string]interface{}) - registrationVirtualNetworkIds := expandDnsZoneRegistrationVirtualNetworkIds(d) - resolutionVirtualNetworkIds := expandDnsZoneResolutionVirtualNetworkIds(d) - parameters := dns.Zone{ Location: &location, Tags: tags.Expand(t), - ZoneProperties: &dns.ZoneProperties{ - RegistrationVirtualNetworks: registrationVirtualNetworkIds, - ResolutionVirtualNetworks: resolutionVirtualNetworkIds, - }, } etag := "" ifNoneMatch := "" // set to empty to allow updates to records after creation - _, err := client.CreateOrUpdate(ctx, resGroup, name, parameters, etag, ifNoneMatch) - if err != nil { + if _, err := client.CreateOrUpdate(ctx, resGroup, name, parameters, etag, ifNoneMatch); err != nil { return fmt.Errorf("Error creating/updating DNS Zone %q (Resource Group %q): %s", name, resGroup, err) } @@ -160,16 +140,6 @@ func resourceArmDnsZoneRead(d *schema.ResourceData, meta interface{}) error { d.Set("number_of_record_sets", resp.NumberOfRecordSets) d.Set("max_number_of_record_sets", resp.MaxNumberOfRecordSets) - registrationVirtualNetworks := flattenDnsZoneRegistrationVirtualNetworkIDs(resp.RegistrationVirtualNetworks) - if err := d.Set("registration_virtual_network_ids", registrationVirtualNetworks); err != nil { - return err - } - - resolutionVirtualNetworks := flattenDnsZoneResolutionVirtualNetworkIDs(resp.ResolutionVirtualNetworks) - if err := d.Set("resolution_virtual_network_ids", resolutionVirtualNetworks); err != nil { - return err - } - nameServers := make([]string, 0) if s := resp.NameServers; s != nil { nameServers = *s @@ -212,55 +182,3 @@ func resourceArmDnsZoneDelete(d *schema.ResourceData, meta interface{}) error { return nil } - -func expandDnsZoneResolutionVirtualNetworkIds(d *schema.ResourceData) *[]dns.SubResource { - resolutionVirtualNetworks := d.Get("resolution_virtual_network_ids").([]interface{}) - - resolutionVNetSubResources := make([]dns.SubResource, 0, len(resolutionVirtualNetworks)) - for _, rvn := range resolutionVirtualNetworks { - id := rvn.(string) - resolutionVNetSubResources = append(resolutionVNetSubResources, dns.SubResource{ - ID: &id, - }) - } - - return &resolutionVNetSubResources -} - -func flattenDnsZoneRegistrationVirtualNetworkIDs(input *[]dns.SubResource) []string { - registrationVirtualNetworks := make([]string, 0) - - if input != nil { - for _, rvn := range *input { - registrationVirtualNetworks = append(registrationVirtualNetworks, *rvn.ID) - } - } - - return registrationVirtualNetworks -} - -func expandDnsZoneRegistrationVirtualNetworkIds(d *schema.ResourceData) *[]dns.SubResource { - registrationVirtualNetworks := d.Get("registration_virtual_network_ids").([]interface{}) - - registrationVNetSubResources := make([]dns.SubResource, 0) - for _, rvn := range registrationVirtualNetworks { - id := rvn.(string) - registrationVNetSubResources = append(registrationVNetSubResources, dns.SubResource{ - ID: &id, - }) - } - - return ®istrationVNetSubResources -} - -func flattenDnsZoneResolutionVirtualNetworkIDs(input *[]dns.SubResource) []string { - resolutionVirtualNetworks := make([]string, 0) - - if input != nil { - for _, rvn := range *input { - resolutionVirtualNetworks = append(resolutionVirtualNetworks, *rvn.ID) - } - } - - return resolutionVirtualNetworks -} diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_zone_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_zone_test.go index fc0302a2997c1..b886117ae7de1 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_zone_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_zone_test.go @@ -58,25 +58,6 @@ func TestAccAzureRMDnsZone_requiresImport(t *testing.T) { }) } -func TestAccAzureRMDnsZone_withVNets(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_dns_zone", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMDnsZoneDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMDnsZone_withVNets(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMDnsZoneExists(data.ResourceName), - ), - }, - data.ImportStep(), - }, - }) -} - func TestAccAzureRMDnsZone_withTags(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_dns_zone", "test") @@ -187,29 +168,6 @@ resource "azurerm_dns_zone" "import" { `, template) } -func testAccAzureRMDnsZone_withVNets(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG_%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvnet%d" - location = "%s" - resource_group_name = "${azurerm_resource_group.test.name}" - address_space = ["10.0.0.0/16"] - dns_servers = ["168.63.129.16"] -} - -resource "azurerm_dns_zone" "test" { - name = "acctestzone%d.com" - resource_group_name = "${azurerm_resource_group.test.name}" - registration_virtual_network_ids = ["${azurerm_virtual_network.test.id}"] -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - func testAccAzureRMDnsZone_withTags(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { diff --git a/website/docs/d/dns_zone.html.markdown b/website/docs/d/dns_zone.html.markdown index dbeac7e854005..a44ce44651b75 100644 --- a/website/docs/d/dns_zone.html.markdown +++ b/website/docs/d/dns_zone.html.markdown @@ -38,8 +38,6 @@ in your subscription that matches `name` will be returned. * `max_number_of_record_sets` - Maximum number of Records in the zone. * `number_of_record_sets` - The number of records already in the zone. * `name_servers` - A list of values that make up the NS record for the zone. -* `registration_virtual_network_ids` - A list of Virtual Network ID's that register hostnames in this DNS zone. -* `resolution_virtual_network_ids` - A list of Virtual Network ID's that resolve records in this DNS zone. * `tags` - A mapping of tags to assign to the EventHub Namespace. ## Timeouts diff --git a/website/docs/r/dns_zone.html.markdown b/website/docs/r/dns_zone.html.markdown index 230d4da6e0aa3..21ef3b8166f9f 100644 --- a/website/docs/r/dns_zone.html.markdown +++ b/website/docs/r/dns_zone.html.markdown @@ -36,10 +36,6 @@ The following arguments are supported: * `resource_group_name` - (Required) Specifies the resource group where the resource exists. Changing this forces a new resource to be created. -* `registration_virtual_network_ids` - (Optional) A list of Virtual Network ID's that register hostnames in this DNS zone. This field can only be set when `zone_type` is set to `Private`. - -* `resolution_virtual_network_ids` - (Optional) A list of Virtual Network ID's that resolve records in this DNS zone. This field can only be set when `zone_type` is set to `Private`. - * `tags` - (Optional) A mapping of tags to assign to the resource. ## Attributes Reference From aeda0b669d58b972fd537fa03d5aab6af0ce2f10 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 18 Feb 2020 14:38:04 +0100 Subject: [PATCH 195/498] r/dns_ns_record: fixing a bug during update ``` $ TF_ACC=1 go test -v ./azurerm/internal/services/dns/tests/ -timeout=60m -run=TestAccAzureRMDnsNsRecord_withTags === RUN TestAccAzureRMDnsNsRecord_withTags === PAUSE TestAccAzureRMDnsNsRecord_withTags === CONT TestAccAzureRMDnsNsRecord_withTags --- PASS: TestAccAzureRMDnsNsRecord_withTags (137.86s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/dns/tests 137.899s ``` --- .../dns/resource_arm_dns_ns_record.go | 112 +++++++++++++----- 1 file changed, 84 insertions(+), 28 deletions(-) diff --git a/azurerm/internal/services/dns/resource_arm_dns_ns_record.go b/azurerm/internal/services/dns/resource_arm_dns_ns_record.go index 77ff7a4c4846a..efb3e9a2fb062 100644 --- a/azurerm/internal/services/dns/resource_arm_dns_ns_record.go +++ b/azurerm/internal/services/dns/resource_arm_dns_ns_record.go @@ -18,9 +18,9 @@ import ( func resourceArmDnsNsRecord() *schema.Resource { return &schema.Resource{ - Create: resourceArmDnsNsRecordCreateUpdate, + Create: resourceArmDnsNsRecordCreate, Read: resourceArmDnsNsRecordRead, - Update: resourceArmDnsNsRecordCreateUpdate, + Update: resourceArmDnsNsRecordUpdate, Delete: resourceArmDnsNsRecordDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, @@ -45,12 +45,15 @@ func resourceArmDnsNsRecord() *schema.Resource { "zone_name": { Type: schema.TypeString, Required: true, + ForceNew: true, }, "records": { Type: schema.TypeList, Required: true, - Elem: &schema.Schema{Type: schema.TypeString}, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, }, "ttl": { @@ -68,16 +71,16 @@ func resourceArmDnsNsRecord() *schema.Resource { } } -func resourceArmDnsNsRecordCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceArmDnsNsRecordCreate(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Dns.RecordSetsClient - ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) + ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) defer cancel() name := d.Get("name").(string) resGroup := d.Get("resource_group_name").(string) zoneName := d.Get("zone_name").(string) - if features.ShouldResourcesBeImported() && d.IsNewResource() { + if features.ShouldResourcesBeImported() { existing, err := client.Get(ctx, resGroup, zoneName, name, dns.NS) if err != nil { if !utils.ResponseWasNotFound(existing.Response) { @@ -93,19 +96,22 @@ func resourceArmDnsNsRecordCreateUpdate(d *schema.ResourceData, meta interface{} ttl := int64(d.Get("ttl").(int)) t := d.Get("tags").(map[string]interface{}) + recordsRaw := d.Get("records").([]interface{}) + records := expandAzureRmDnsNsRecords(recordsRaw) + parameters := dns.RecordSet{ Name: &name, RecordSetProperties: &dns.RecordSetProperties{ Metadata: tags.Expand(t), TTL: &ttl, - NsRecords: expandAzureRmDnsNsRecords(d), + NsRecords: records, }, } eTag := "" ifNoneMatch := "" // set to empty to allow updates to records after creation if _, err := client.CreateOrUpdate(ctx, resGroup, zoneName, name, dns.NS, parameters, eTag, ifNoneMatch); err != nil { - return fmt.Errorf("Error creating/updating DNS NS Record %q (Zone %q / Resource Group %q): %s", name, zoneName, resGroup, err) + return fmt.Errorf("Error creating DNS NS Record %q (Zone %q / Resource Group %q): %s", name, zoneName, resGroup, err) } resp, err := client.Get(ctx, resGroup, zoneName, name, dns.NS) @@ -122,6 +128,53 @@ func resourceArmDnsNsRecordCreateUpdate(d *schema.ResourceData, meta interface{} return resourceArmDnsNsRecordRead(d, meta) } +func resourceArmDnsNsRecordUpdate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Dns.RecordSetsClient + ctx, cancel := timeouts.ForUpdate(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := azure.ParseAzureResourceID(d.Id()) + if err != nil { + return err + } + + resGroup := id.ResourceGroup + name := id.Path["NS"] + zoneName := id.Path["dnszones"] + + existing, err := client.Get(ctx, resGroup, zoneName, name, dns.NS) + if err != nil { + return fmt.Errorf("Error retrieving NS %q (DNS Zone %q / Resource Group %q): %+v", name, zoneName, resGroup, err) + } + + if existing.RecordSetProperties == nil { + return fmt.Errorf("Error retrieving NS %q (DNS Zone %q / Resource Group %q): `properties` was nil", name, zoneName, resGroup) + } + + if d.HasChange("records") { + recordsRaw := d.Get("records").([]interface{}) + records := expandAzureRmDnsNsRecords(recordsRaw) + existing.RecordSetProperties.NsRecords = records + } + + if d.HasChange("tags") { + t := d.Get("tags").(map[string]interface{}) + existing.RecordSetProperties.Metadata = tags.Expand(t) + } + + if d.HasChange("ttl") { + existing.RecordSetProperties.TTL = utils.Int64(int64(d.Get("ttl").(int))) + } + + eTag := "" + ifNoneMatch := "" // set to empty to allow updates to records after creation + if _, err := client.CreateOrUpdate(ctx, resGroup, zoneName, name, dns.NS, existing, eTag, ifNoneMatch); err != nil { + return fmt.Errorf("Error updating DNS NS Record %q (Zone %q / Resource Group %q): %s", name, zoneName, resGroup, err) + } + + return resourceArmDnsNsRecordRead(d, meta) +} + func resourceArmDnsNsRecordRead(d *schema.ResourceData, meta interface{}) error { dnsClient := meta.(*clients.Client).Dns.RecordSetsClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) @@ -151,8 +204,11 @@ func resourceArmDnsNsRecordRead(d *schema.ResourceData, meta interface{}) error d.Set("ttl", resp.TTL) d.Set("fqdn", resp.Fqdn) - if err := d.Set("records", flattenAzureRmDnsNsRecords(resp.NsRecords)); err != nil { - return fmt.Errorf("Error settings `records`: %+v", err) + if props := resp.RecordSetProperties; props != nil { + if err := d.Set("records", flattenAzureRmDnsNsRecords(props.NsRecords)); err != nil { + return fmt.Errorf("Error settings `records`: %+v", err) + } + } return tags.FlattenAndSet(d, resp.Metadata) @@ -180,33 +236,33 @@ func resourceArmDnsNsRecordDelete(d *schema.ResourceData, meta interface{}) erro return nil } -func flattenAzureRmDnsNsRecords(records *[]dns.NsRecord) []string { - results := make([]string, 0, len(*records)) +func flattenAzureRmDnsNsRecords(records *[]dns.NsRecord) []interface{} { + if records == nil { + return []interface{}{} + } - if records != nil { - for _, record := range *records { - results = append(results, *record.Nsdname) + results := make([]interface{}, 0) + for _, record := range *records { + if record.Nsdname == nil { + continue } + + results = append(results, *record.Nsdname) } return results } -func expandAzureRmDnsNsRecords(d *schema.ResourceData) *[]dns.NsRecord { - var records []dns.NsRecord +func expandAzureRmDnsNsRecords(input []interface{}) *[]dns.NsRecord { + records := make([]dns.NsRecord, len(input)) + for i, v := range input { + record := v.(string) - if d.HasChange("records") { - recordStrings := d.Get("records").([]interface{}) - records = make([]dns.NsRecord, len(recordStrings)) - for i, v := range recordStrings { - record := v.(string) - - nsRecord := dns.NsRecord{ - Nsdname: &record, - } - - records[i] = nsRecord + nsRecord := dns.NsRecord{ + Nsdname: &record, } + + records[i] = nsRecord } return &records } From b1b0e5dc49f6e71ecdffeb500214ff05d215b15a Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 18 Feb 2020 14:41:40 +0100 Subject: [PATCH 196/498] r/eventhub: updating the test config to account for the storage container no longer taking the rg name --- .../services/eventhub/tests/resource_arm_eventhub_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_test.go b/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_test.go index bdd3e5ec21dd2..c52913edad794 100644 --- a/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_test.go +++ b/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_test.go @@ -518,7 +518,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "acctest" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } From 869a1069c2f7a3e42f2736a6452ab7faa35645a2 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 18 Feb 2020 14:50:28 +0100 Subject: [PATCH 197/498] updating to include #5784 --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84c2c7339a68f..5543e491ec30d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ FEATURES: * **Requires Import:** The Azure Provider now checks for the presence of an existing resource prior to creating it - which means that if you try and create a resource which already exists (without importing it) you'll be prompted to import this into the state. * **New Resource:** `azurerm_linux_virtual_machine` [GH-5705] * **New Resource:** `azurerm_linux_virtual_machine_scale_set` [GH-5705] +* **New Resource:** `azurerm_network_interface_security_group_association` [GH-5784] * **New Resource:** `azurerm_virtual_machine_scale_set_extension` [GH-5705] * **New Resource:** `azurerm_windows_virtual_machine` [GH-5705] * **New Resource:** `azurerm_windows_virtual_machine_scale_set` [GH-5705] @@ -47,6 +48,14 @@ BREAKING CHANGES: * `azurerm_maps_account` - the `sku_name` field is now case-sensitive [GH-5776] * `azurerm_mariadb_server` - removing the `sku` block since it's been deprecated in favour of the `sku_name` field [GH-5777] * `azurerm_mssql_elasticpool` - removing the deprecated `elastic_pool_properties` block [GH-5744] +* `azurerm_network_interface` - the `dns_servers` field now respects ordering [GH-5784] +* `azurerm_network_interface` - removing the deprecated `application_gateway_backend_address_pools_ids` field from the `ip_configurations` block [GH-5784] +* `azurerm_network_interface` - removing the deprecated `application_security_group_ids ` field from the `ip_configurations` block [GH-5784] +* `azurerm_network_interface` - removing the deprecated `load_balancer_backend_address_pools_ids ` field from the `ip_configurations` block [GH-5784] +* `azurerm_network_interface` - removing the deprecated `load_balancer_inbound_nat_rules_ids ` field from the `ip_configurations` block [GH-5784] +* `azurerm_network_interface` - removing the deprecated `internal_fqdn` field [GH-5784] +* `azurerm_network_interface` - removing the `network_security_group_id` field in favour of a new split-out resource `azurerm_network_interface_security_group_association` [GH-5784] +* `azurerm_network_interface` - the `virtual_machine_id` field is now computed-only since it's not setable [GH-5784] * `azurerm_notification_hub_namesapce` - removing the `sku` block in favour of the `sku_name` argument [GH-5722] * `azurerm_postgresql_server` - removing the `sku` block which has been deprecated in favour of the `sku_name` field [GH-5721] * `azurerm_relay_namespace` - removing the `sku` block in favour of the `sku_name` field [GH-5719] From 90f782400d66f74b04ca9ab6f3cba21b6fb9b5ef Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 18 Feb 2020 14:52:26 +0100 Subject: [PATCH 198/498] moving the bug fix to the bug fixes section --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5543e491ec30d..c6ddfa91a9049 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,7 +48,6 @@ BREAKING CHANGES: * `azurerm_maps_account` - the `sku_name` field is now case-sensitive [GH-5776] * `azurerm_mariadb_server` - removing the `sku` block since it's been deprecated in favour of the `sku_name` field [GH-5777] * `azurerm_mssql_elasticpool` - removing the deprecated `elastic_pool_properties` block [GH-5744] -* `azurerm_network_interface` - the `dns_servers` field now respects ordering [GH-5784] * `azurerm_network_interface` - removing the deprecated `application_gateway_backend_address_pools_ids` field from the `ip_configurations` block [GH-5784] * `azurerm_network_interface` - removing the deprecated `application_security_group_ids ` field from the `ip_configurations` block [GH-5784] * `azurerm_network_interface` - removing the deprecated `load_balancer_backend_address_pools_ids ` field from the `ip_configurations` block [GH-5784] @@ -83,6 +82,7 @@ IMPROVEMENTS: BUG FIXES: * `azurerm_linux_virtual_machine` - using the delete custom timeout during deletion [GH-5764] +* `azurerm_network_interface` - the `dns_servers` field now respects ordering [GH-5784] * `azurerm_public_ip_prefix` - fixing the validation for the `prefix_length` to match the Azure API [GH-5693] * `azurerm_role_assignment` - validating that the `name` is a UUID [GH-5624] * `azurerm_signalr_service` - ensuring the SignalR segment is parsed in the correct case [GH-5737] From 33aa01f315b636e1d8f3f926d4e0cbe77c7f1819 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 18 Feb 2020 14:58:15 +0100 Subject: [PATCH 199/498] dns: updating the tests to match the fields always being set --- .../services/dns/resource_arm_dns_cname_record.go | 8 +------- .../services/dns/tests/resource_arm_dns_a_record_test.go | 2 +- .../dns/tests/resource_arm_dns_cname_record_test.go | 4 ++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/azurerm/internal/services/dns/resource_arm_dns_cname_record.go b/azurerm/internal/services/dns/resource_arm_dns_cname_record.go index 715bdc968812e..9d62608bc817a 100644 --- a/azurerm/internal/services/dns/resource_arm_dns_cname_record.go +++ b/azurerm/internal/services/dns/resource_arm_dns_cname_record.go @@ -47,12 +47,6 @@ func resourceArmDnsCNameRecord() *schema.Resource { Required: true, }, - "records": { - Type: schema.TypeString, - Optional: true, - Removed: "Use `record` instead. This attribute will be removed in a future version", - }, - "record": { Type: schema.TypeString, Optional: true, @@ -73,7 +67,7 @@ func resourceArmDnsCNameRecord() *schema.Resource { Type: schema.TypeString, Optional: true, ValidateFunc: azure.ValidateResourceID, - ConflictsWith: []string{"records"}, + ConflictsWith: []string{"record"}, }, "tags": tags.Schema(), diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_a_record_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_a_record_test.go index 81d1c015abb51..e3ed5c60671ab 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_a_record_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_a_record_test.go @@ -163,7 +163,7 @@ func TestAccAzureRMDnsARecord_RecordsToAlias(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsARecordExists(data.ResourceName), resource.TestCheckResourceAttrPair(data.ResourceName, "target_resource_id", targetResourceName, "id"), - resource.TestCheckNoResourceAttr(data.ResourceName, "records"), + resource.TestCheckResourceAttr(data.ResourceName, "records.#", "0"), ), }, data.ImportStep(), diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_cname_record_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_cname_record_test.go index 3e33c95bdcfe1..0e630f6e2fba9 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_cname_record_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_cname_record_test.go @@ -180,7 +180,7 @@ func TestAccAzureRMDnsCNameRecord_RecordToAlias(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsCNameRecordExists(data.ResourceName), resource.TestCheckResourceAttrPair(data.ResourceName, "target_resource_id", targetResourceName, "id"), - resource.TestCheckNoResourceAttr(data.ResourceName, "record"), + resource.TestCheckResourceAttr(data.ResourceName, "record", ""), ), }, data.ImportStep(), @@ -208,7 +208,7 @@ func TestAccAzureRMDnsCNameRecord_AliasToRecord(t *testing.T) { Config: testAccAzureRMDnsCNameRecord_AliasToRecordUpdate(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsCNameRecordExists(data.ResourceName), - resource.TestCheckNoResourceAttr(data.ResourceName, "target_resource_id"), + resource.TestCheckResourceAttr(data.ResourceName, "target_resource_id", ""), ), }, data.ImportStep(), From 23bef270c237836838efee2a18fdd8c3a098c10d Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 18 Feb 2020 15:14:16 +0100 Subject: [PATCH 200/498] updating to include #5795 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6ddfa91a9049..ab42ea3cf4c74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ BREAKING CHANGES: * `azurerm_azuread_service_principal` - This resource has been removed since it was deprecated [GH-5748] * `azurerm_cognitive_account` - removing the deprecated `sku_name` block [GH-5797] * `azurerm_container_service` - This resource has been removed since it was deprecated [GH-5709] +* `azurerm_devspace_controller` - removing the deprecated `sku` block [GH-5795] * `azurerm_iot_dps` - This resource has been removed since it was deprecated [GH-5753] * `azurerm_iot_dps_certificate` - This resource has been removed since it was deprecated [GH-5753] * `azurerm_key_vault` - removing the `sku` block since this has been deprecated in favour of the `sku_name` field [GH-5774] From f5e686b3dcbb80cf3e66dbc81b08493b9f8c1098 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 18 Feb 2020 16:30:03 +0100 Subject: [PATCH 201/498] r/mysql_server: fixing the tests --- .../mysql/tests/resource_arm_mysql_server_test.go | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go b/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go index 267d9ea4315da..942b7d50b67e2 100644 --- a/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go +++ b/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go @@ -131,7 +131,7 @@ func TestAccAzureRMMySQLServer_basicFiveSevenUpdated(t *testing.T) { Config: testAccAzureRMMySQLServer_basicFiveSeven(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMMySQLServerExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.name", "GP_Gen5_2"), + resource.TestCheckResourceAttr(data.ResourceName, "sku_name", "GP_Gen5_2"), resource.TestCheckResourceAttr(data.ResourceName, "version", "5.7"), resource.TestCheckResourceAttr(data.ResourceName, "storage_profile.0.storage_mb", "51200"), resource.TestCheckResourceAttr(data.ResourceName, "administrator_login", "acctestun"), @@ -141,7 +141,7 @@ func TestAccAzureRMMySQLServer_basicFiveSevenUpdated(t *testing.T) { Config: testAccAzureRMMySQLServer_basicFiveSevenUpdated(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMMySQLServerExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.name", "GP_Gen5_4"), + resource.TestCheckResourceAttr(data.ResourceName, "sku_name", "GP_Gen5_4"), resource.TestCheckResourceAttr(data.ResourceName, "version", "5.7"), resource.TestCheckResourceAttr(data.ResourceName, "storage_profile.0.storage_mb", "640000"), resource.TestCheckResourceAttr(data.ResourceName, "administrator_login", "acctestun"), @@ -164,10 +164,7 @@ func TestAccAzureRMMySQLServer_updateSKU(t *testing.T) { Config: testAccAzureRMMySQLServer_basicEightZero(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMMySQLServerExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.name", "GP_Gen5_32"), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.capacity", "32"), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.tier", "GeneralPurpose"), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.family", "Gen5"), + resource.TestCheckResourceAttr(data.ResourceName, "sku_name", "GP_Gen5_32"), resource.TestCheckResourceAttr(data.ResourceName, "storage_profile.0.storage_mb", "640000"), resource.TestCheckResourceAttr(data.ResourceName, "administrator_login", "acctestun"), ), @@ -176,10 +173,7 @@ func TestAccAzureRMMySQLServer_updateSKU(t *testing.T) { Config: testAccAzureRMMySQLServer_basicFiveSevenUpdated(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMMySQLServerExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.name", "MO_Gen5_16"), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.capacity", "16"), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.tier", "MemoryOptimized"), - resource.TestCheckResourceAttr(data.ResourceName, "sku.0.family", "Gen5"), + resource.TestCheckResourceAttr(data.ResourceName, "sku_name", "MO_Gen5_16"), resource.TestCheckResourceAttr(data.ResourceName, "storage_profile.0.storage_mb", "4194304"), resource.TestCheckResourceAttr(data.ResourceName, "administrator_login", "acctestun"), ), From 35745e966495d67590daeb299d9284a1ff59c5d5 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 18 Feb 2020 17:05:28 +0100 Subject: [PATCH 202/498] updating to include #5793 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab42ea3cf4c74..5023c78c482a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,11 @@ BREAKING CHANGES: * `azurerm_cognitive_account` - removing the deprecated `sku_name` block [GH-5797] * `azurerm_container_service` - This resource has been removed since it was deprecated [GH-5709] * `azurerm_devspace_controller` - removing the deprecated `sku` block [GH-5795] +* `azurerm_eventhub` - removing the deprecated `location` field [GH-5793] +* `azurerm_eventhub_authorization_rule` - removing the deprecated `location` field [GH-5793] +* `azurerm_eventhub_consumer_group` - removing the deprecated `location` field [GH-5793] +* `azurerm_eventhub_namespace` - removing the deprecated `kafka_enabled` field since this is now managed by Azure [GH-5793] +* `azurerm_eventhub_namespace_authorization_rule` - removing the deprecated `location` field [GH-5793] * `azurerm_iot_dps` - This resource has been removed since it was deprecated [GH-5753] * `azurerm_iot_dps_certificate` - This resource has been removed since it was deprecated [GH-5753] * `azurerm_key_vault` - removing the `sku` block since this has been deprecated in favour of the `sku_name` field [GH-5774] From 9bf29c09a2d28c41cd65855333c5346ecebc5d5b Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 18 Feb 2020 16:58:06 +0100 Subject: [PATCH 203/498] r/mysqL_server: fixing assertions --- .../services/mysql/tests/resource_arm_mysql_server_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go b/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go index 942b7d50b67e2..a61082e0afd7e 100644 --- a/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go +++ b/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go @@ -164,8 +164,8 @@ func TestAccAzureRMMySQLServer_updateSKU(t *testing.T) { Config: testAccAzureRMMySQLServer_basicEightZero(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMMySQLServerExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "sku_name", "GP_Gen5_32"), - resource.TestCheckResourceAttr(data.ResourceName, "storage_profile.0.storage_mb", "640000"), + resource.TestCheckResourceAttr(data.ResourceName, "sku_name", "GP_Gen5_2"), + resource.TestCheckResourceAttr(data.ResourceName, "storage_profile.0.storage_mb", "51200"), resource.TestCheckResourceAttr(data.ResourceName, "administrator_login", "acctestun"), ), }, @@ -173,7 +173,7 @@ func TestAccAzureRMMySQLServer_updateSKU(t *testing.T) { Config: testAccAzureRMMySQLServer_basicFiveSevenUpdated(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMMySQLServerExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "sku_name", "MO_Gen5_16"), + resource.TestCheckResourceAttr(data.ResourceName, "sku_name", "GP_Gen5_4"), resource.TestCheckResourceAttr(data.ResourceName, "storage_profile.0.storage_mb", "4194304"), resource.TestCheckResourceAttr(data.ResourceName, "administrator_login", "acctestun"), ), From 30be1a4814ac27439fed08660f94c9187f830257 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 18 Feb 2020 17:14:39 +0100 Subject: [PATCH 204/498] linting --- azurerm/internal/services/dns/resource_arm_dns_ns_record.go | 1 - 1 file changed, 1 deletion(-) diff --git a/azurerm/internal/services/dns/resource_arm_dns_ns_record.go b/azurerm/internal/services/dns/resource_arm_dns_ns_record.go index efb3e9a2fb062..f1d6791083711 100644 --- a/azurerm/internal/services/dns/resource_arm_dns_ns_record.go +++ b/azurerm/internal/services/dns/resource_arm_dns_ns_record.go @@ -208,7 +208,6 @@ func resourceArmDnsNsRecordRead(d *schema.ResourceData, meta interface{}) error if err := d.Set("records", flattenAzureRmDnsNsRecords(props.NsRecords)); err != nil { return fmt.Errorf("Error settings `records`: %+v", err) } - } return tags.FlattenAndSet(d, resp.Metadata) From 44842538a8c06b1a5e06d696c357750ff7b0ce32 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 18 Feb 2020 17:20:45 +0100 Subject: [PATCH 205/498] updating to include #5523 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5023c78c482a2..f022bb8780874 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ FEATURES: * **Custom Timeouts:** - all resources within the Azure Provider now allow configuring custom timeouts - please [see Terraform's Timeout documentation](https://www.terraform.io/docs/configuration/resources.html#operation-timeouts) and the documentation in each data source resource for more information. * **Requires Import:** The Azure Provider now checks for the presence of an existing resource prior to creating it - which means that if you try and create a resource which already exists (without importing it) you'll be prompted to import this into the state. +* **New Resource:** `azurerm_express_route_gateway` [GH-5523] * **New Resource:** `azurerm_linux_virtual_machine` [GH-5705] * **New Resource:** `azurerm_linux_virtual_machine_scale_set` [GH-5705] * **New Resource:** `azurerm_network_interface_security_group_association` [GH-5784] From 22431e69ad6dd26fba2d5f25ca56c9bfcfd2e44a Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 18 Feb 2020 17:24:36 +0100 Subject: [PATCH 206/498] r/express_route_gateway: fixes from #5523 --- .../network/tests/resource_arm_express_route_gateway_test.go | 1 + website/docs/r/express_route_gateway.html.markdown | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go index ff468064d7fab..0551bd246dc9e 100644 --- a/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go @@ -183,6 +183,7 @@ resource "azurerm_express_route_gateway" "import" { name = azurerm_express_route_gateway.test.name resource_group_name = azurerm_express_route_gateway.test.name location = azurerm_express_route_gateway.test.location + virtual_hub_id = azurerm_express_route_gateway.test.virtual_hub_id scale_units = azurerm_express_route_gateway.test.scale_units } `, template) diff --git a/website/docs/r/express_route_gateway.html.markdown b/website/docs/r/express_route_gateway.html.markdown index 27900d800de6e..0630498168445 100644 --- a/website/docs/r/express_route_gateway.html.markdown +++ b/website/docs/r/express_route_gateway.html.markdown @@ -37,7 +37,7 @@ resource "azurerm_express_route_gateway" "example" { resource_group_name = azurerm_resource_group.example.name location = azurerm_resource_group.example.location virtual_hub_id = azurerm_virtual_hub.example.id - scale_unts = 1 + scale_units = 1 tags = { environment = "Production" From 513968cf8517c9c9f4f64ac6a7f2710be2942112 Mon Sep 17 00:00:00 2001 From: Jack Batzner Date: Tue, 18 Feb 2020 10:25:00 -0600 Subject: [PATCH 207/498] New data source: 'azurerm_eventhub_authorization_rule' === RUN TestAccDataSourceAzureRMEventHubAuthorizationRule === PAUSE TestAccDataSourceAzureRMEventHubAuthorizationRule === CONT TestAccDataSourceAzureRMEventHubAuthorizationRule --- PASS: TestAccDataSourceAzureRMEventHubAuthorizationRule (291.84s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/eventhub/tests 292.144s --- ...data_source_eventhub_authorization_rule.go | 108 ++++++++++++++++++ .../services/eventhub/registration.go | 1 + ...source_eventhub_authorization_rule_test.go | 48 ++++++++ website/azurerm.erb | 4 + .../eventhub_authorization_rule.html.markdown | 52 +++++++++ 5 files changed, 213 insertions(+) create mode 100644 azurerm/internal/services/eventhub/data_source_eventhub_authorization_rule.go create mode 100644 azurerm/internal/services/eventhub/tests/data_source_eventhub_authorization_rule_test.go create mode 100644 website/docs/d/eventhub_authorization_rule.html.markdown diff --git a/azurerm/internal/services/eventhub/data_source_eventhub_authorization_rule.go b/azurerm/internal/services/eventhub/data_source_eventhub_authorization_rule.go new file mode 100644 index 0000000000000..79e64fe3b6f65 --- /dev/null +++ b/azurerm/internal/services/eventhub/data_source_eventhub_authorization_rule.go @@ -0,0 +1,108 @@ +package eventhub + +import ( + "fmt" + "time" + + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func dataSourceEventHubAuthorizationRule() *schema.Resource { + return &schema.Resource{ + Read: dataSourceEventHubAuthorizationRuleRead, + + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(5 * time.Minute), + }, + + Schema: azure.EventHubAuthorizationRuleSchemaFrom(map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ValidateFunc: azure.ValidateEventHubAuthorizationRuleName(), + }, + + "namespace_name": { + Type: schema.TypeString, + Required: true, + ValidateFunc: azure.ValidateEventHubNamespaceName(), + }, + + "eventhub_name": { + Type: schema.TypeString, + Required: true, + ValidateFunc: azure.ValidateEventHubName(), + }, + + "primary_key": { + Type: schema.TypeString, + Computed: true, + Sensitive: true, + }, + + "secondary_key": { + Type: schema.TypeString, + Computed: true, + Sensitive: true, + }, + + "primary_connection_string": { + Type: schema.TypeString, + Computed: true, + Sensitive: true, + }, + + "secondary_connection_string": { + Type: schema.TypeString, + Computed: true, + Sensitive: true, + }, + + "resource_group_name": azure.SchemaResourceGroupNameForDataSource(), + + "location": azure.SchemaLocationForDataSource(), + }), + } +} + +func dataSourceEventHubAuthorizationRuleRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Eventhub.EventHubsClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + name := d.Get("name").(string) + resourceGroup := d.Get("resource_group_name").(string) + eventHubName := d.Get("eventhub_name").(string) + namespaceName := d.Get("namespace_name").(string) + + resp, err := client.GetAuthorizationRule(ctx, resourceGroup, namespaceName, eventHubName, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Error: EventHub Authorization Rule %q (Resource Group %q) was not found", name, resourceGroup) + } + return fmt.Errorf("Error: EventHub Authorization Rule %s: %+v", name, err) + } + + d.SetId(*resp.ID) + + d.Set("name", name) + d.Set("eventhub_name", eventHubName) + d.Set("namespace_name", namespaceName) + d.Set("resource_group_name", resourceGroup) + + keysResp, err := client.ListKeys(ctx, resourceGroup, namespaceName, eventHubName, name) + if err != nil { + return fmt.Errorf("Error making Read request on Azure EventHub Authorization Rule List Keys %s: %+v", name, err) + } + + d.Set("primary_key", keysResp.PrimaryKey) + d.Set("secondary_key", keysResp.SecondaryKey) + d.Set("primary_connection_string", keysResp.PrimaryConnectionString) + d.Set("secondary_connection_string", keysResp.SecondaryConnectionString) + + return nil +} diff --git a/azurerm/internal/services/eventhub/registration.go b/azurerm/internal/services/eventhub/registration.go index 330cd1b2f89de..b1e9dc3f4d783 100644 --- a/azurerm/internal/services/eventhub/registration.go +++ b/azurerm/internal/services/eventhub/registration.go @@ -14,6 +14,7 @@ func (r Registration) Name() 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_eventhub_authorization_rule": dataSourceEventHubAuthorizationRule(), "azurerm_eventhub_consumer_group": dataSourceEventHubConsumerGroup(), "azurerm_eventhub_namespace": dataSourceEventHubNamespace(), "azurerm_eventhub_namespace_authorization_rule": dataSourceEventHubNamespaceAuthorizationRule(), diff --git a/azurerm/internal/services/eventhub/tests/data_source_eventhub_authorization_rule_test.go b/azurerm/internal/services/eventhub/tests/data_source_eventhub_authorization_rule_test.go new file mode 100644 index 0000000000000..64ed69fc41630 --- /dev/null +++ b/azurerm/internal/services/eventhub/tests/data_source_eventhub_authorization_rule_test.go @@ -0,0 +1,48 @@ +package tests + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" +) + +func TestAccDataSourceAzureRMEventHubAuthorizationRule(t *testing.T) { + data := acceptance.BuildTestData(t, "data.azurerm_eventhub_authorization_rule", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMEventHubAuthorizationRuleDestroy, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAzureRMEventHubAuthorizationRule_base(data, true, true, true), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMEventHubAuthorizationRuleExists(data.ResourceName), + resource.TestCheckResourceAttrSet(data.ResourceName, "name"), + resource.TestCheckResourceAttrSet(data.ResourceName, "namespace_name"), + resource.TestCheckResourceAttrSet(data.ResourceName, "eventhub_name"), + resource.TestCheckResourceAttrSet(data.ResourceName, "primary_key"), + resource.TestCheckResourceAttrSet(data.ResourceName, "secondary_key"), + resource.TestCheckResourceAttrSet(data.ResourceName, "primary_connection_string"), + resource.TestCheckResourceAttrSet(data.ResourceName, "secondary_connection_string"), + ), + }, + }, + }) +} + +func testAccDataSourceAzureRMEventHubAuthorizationRule_base(data acceptance.TestData, listen, send, manage bool) string { + template := testAccAzureRMEventHubAuthorizationRule_base(data, listen, send, manage) + return fmt.Sprintf(` +%s + +data "azurerm_eventhub_authorization_rule" "test" { + name = "${azurerm_eventhub_authorization_rule.test.name}" + namespace_name = "${azurerm_eventhub_namespace.test.name}" + eventhub_name = "${azurerm_eventhub.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" +} +`, template) +} diff --git a/website/azurerm.erb b/website/azurerm.erb index 53e29d7672411..da54debf49181 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -186,6 +186,10 @@ azurerm_disk_encryption_set +
  • + azurerm_eventhub_authorization_rule +
    • +
  • azurerm_eventhub_consumer_group
    • diff --git a/website/docs/d/eventhub_authorization_rule.html.markdown b/website/docs/d/eventhub_authorization_rule.html.markdown new file mode 100644 index 0000000000000..01af5625ab12b --- /dev/null +++ b/website/docs/d/eventhub_authorization_rule.html.markdown @@ -0,0 +1,52 @@ +--- +subcategory: "Messaging" +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_eventhub_authorization_rule" +description: |- + Gets information about an Event Hubs Authorization Rule within an Event Hub. +--- + +# azurerm_eventhub_authorization_rule + +Use this data source to access information about an existing Event Hubs Authorization Rule within an Event Hub. + +## Example Usage + +```hcl +data "azurerm_eventhub_authorization_rule" "test" { + name = "test" + namespace_name = "${azurerm_eventhub_namespace.test.name}" + eventhub_name = "${azurerm_eventhub.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" +} +``` + +## Argument Reference + +* `name` - Specifies the name of the EventHub Authorization Rule resource. be created. + +* `namespace_name` - Specifies the name of the grandparent EventHub Namespace. + +* `eventhub_name` - Specifies the name of the EventHub. + +* `resource_group_name` - The name of the resource group in which the EventHub Authorization Rule's grandparent Namespace exists. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The EventHub ID. + +* `primary_key` - The Primary Key for the Event Hubs Authorization Rule. + +* `primary_connection_string` - The Primary Connection String for the Event Hubs Authorization Rule. + +* `secondary_key` - The Secondary Key for the Event Hubs Authorization Rule. + +* `secondary_connection_string` - The Secondary Connection String for the Event Hubs Authorization Rule. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: + +* `read` - (Defaults to 5 minutes) Used when retrieving the EventHub Authorization Rule. \ No newline at end of file From b7327f0a79b5030c4da9494a442d3218cf96cd9a Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 18 Feb 2020 17:27:05 +0100 Subject: [PATCH 208/498] linting --- .../network/tests/data_source_subnet_test.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/azurerm/internal/services/network/tests/data_source_subnet_test.go b/azurerm/internal/services/network/tests/data_source_subnet_test.go index c6f4fa89a1127..c4aab9677713c 100644 --- a/azurerm/internal/services/network/tests/data_source_subnet_test.go +++ b/azurerm/internal/services/network/tests/data_source_subnet_test.go @@ -126,10 +126,10 @@ func testAccDataSourceSubnet_networkSecurityGroupDependencies(data acceptance.Te %s resource "azurerm_subnet" "test" { - name = "internal" - resource_group_name = azurerm_resource_group.test.name - virtual_network_name = azurerm_virtual_network.test.name - address_prefix = "10.0.0.0/24" + name = "internal" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name + address_prefix = "10.0.0.0/24" } resource "azurerm_network_security_group" "test" { @@ -176,10 +176,10 @@ func testAccDataSourceSubnet_routeTableDependencies(data acceptance.TestData) st %s resource "azurerm_subnet" "test" { - name = "internal" - resource_group_name = azurerm_resource_group.test.name - virtual_network_name = azurerm_virtual_network.test.name - address_prefix = "10.0.0.0/24" + name = "internal" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name + address_prefix = "10.0.0.0/24" } resource "azurerm_route_table" "test" { From 2621110bee11054e479874277001f12f63125938 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Tue, 18 Feb 2020 09:00:57 -0800 Subject: [PATCH 209/498] Remove computed from required --- .../services/automation/resource_arm_automation_schedule.go | 1 - 1 file changed, 1 deletion(-) diff --git a/azurerm/internal/services/automation/resource_arm_automation_schedule.go b/azurerm/internal/services/automation/resource_arm_automation_schedule.go index e89b2d8a7178a..da4b12fc03a19 100644 --- a/azurerm/internal/services/automation/resource_arm_automation_schedule.go +++ b/azurerm/internal/services/automation/resource_arm_automation_schedule.go @@ -52,7 +52,6 @@ func resourceArmAutomationSchedule() *schema.Resource { "automation_account_name": { Type: schema.TypeString, Required: true, - Computed: true, ForceNew: true, ValidateFunc: azure.ValidateAutomationAccountName(), }, From 3063c5f97fdbc2f22a8006d66933b81baea046c0 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Tue, 18 Feb 2020 17:28:07 +0000 Subject: [PATCH 210/498] Test fixups --- ...urce_arm_cosmosdb_account_failover_test.go | 48 +++++++++---------- .../resource_arm_cosmosdb_account_test.go | 3 +- ...urce_arm_cosmosdb_gremlin_database_test.go | 6 +-- ...esource_arm_cosmosdb_gremlin_graph_test.go | 13 +++++ 4 files changed, 42 insertions(+), 28 deletions(-) diff --git a/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_failover_test.go b/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_failover_test.go index 92cf8e8ad0643..ffd39ec016a8f 100644 --- a/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_failover_test.go +++ b/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_failover_test.go @@ -153,9 +153,9 @@ resource "azurerm_cosmosdb_account" "test" { consistency_level = "BoundedStaleness" } - failover_policy { - location = "${azurerm_resource_group.test.location}" - priority = 0 + geo_location { + location = "${azurerm_resource_group.test.location}" + failover_priority = 0 } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) @@ -180,9 +180,9 @@ resource "azurerm_cosmosdb_account" "test" { max_staleness_prefix = 200 } - failover_policy { - location = "${azurerm_resource_group.test.location}" - priority = 0 + geo_location { + location = "${azurerm_resource_group.test.location}" + failover_priority = 0 } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) @@ -205,9 +205,9 @@ resource "azurerm_cosmosdb_account" "test" { consistency_level = "Eventual" } - failover_policy { - location = "${azurerm_resource_group.test.location}" - priority = 0 + geo_location { + location = "${azurerm_resource_group.test.location}" + failover_priority = 0 } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) @@ -230,9 +230,9 @@ resource "azurerm_cosmosdb_account" "test" { consistency_level = "Session" } - failover_policy { - location = "${azurerm_resource_group.test.location}" - priority = 0 + geo_location { + location = "${azurerm_resource_group.test.location}" + failover_priority = 0 } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) @@ -256,9 +256,9 @@ resource "azurerm_cosmosdb_account" "test" { consistency_level = "BoundedStaleness" } - failover_policy { - location = "${azurerm_resource_group.test.location}" - priority = 0 + geo_location { + location = "${azurerm_resource_group.test.location}" + failover_priority = 0 } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) @@ -281,9 +281,9 @@ resource "azurerm_cosmosdb_account" "test" { consistency_level = "Strong" } - failover_policy { - location = "${azurerm_resource_group.test.location}" - priority = 0 + geo_location { + location = "${azurerm_resource_group.test.location}" + failover_priority = 0 } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) @@ -308,14 +308,14 @@ resource "azurerm_cosmosdb_account" "test" { max_staleness_prefix = 101101 } - failover_policy { - location = "${azurerm_resource_group.test.location}" - priority = 0 + geo_location { + location = "${azurerm_resource_group.test.location}" + failover_priority = 0 } - failover_policy { - location = "%s" - priority = 1 + geo_location { + location = "%s" + failover_priority = 1 } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.Locations.Secondary) diff --git a/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go b/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go index 1cf1b45825d57..bcc2ab06169b8 100644 --- a/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go +++ b/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go @@ -108,7 +108,7 @@ func TestAccAzureRMCosmosDBAccount_requiresImport(t *testing.T) { CheckDestroy: testCheckAzureRMCosmosDBAccountDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMCosmosDBAccount_basic(data, "", documentdb.Eventual), + Config: testAccAzureRMCosmosDBAccount_basic(data, "GlobalDocumentDB", documentdb.Eventual), Check: resource.ComposeAggregateTestCheckFunc( checkAccAzureRMCosmosDBAccount_basic(data, documentdb.Eventual, 1), ), @@ -524,6 +524,7 @@ resource "azurerm_cosmosdb_account" "test" { consistency_policy { consistency_level = "%[4]s" + max_interval_seconds = 300 max_staleness_prefix = 170000 } diff --git a/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_gremlin_database_test.go b/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_gremlin_database_test.go index 6034bda6d8d67..b4a3f56f13ed8 100644 --- a/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_gremlin_database_test.go +++ b/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_gremlin_database_test.go @@ -161,9 +161,9 @@ func testAccAzureRMCosmosDatabase_requiresImport(data acceptance.TestData) strin %s resource "azurerm_cosmosdb_gremlin_database" "import" { - name = "${azurerm_cosmosdb_database.test.name}" - resource_group_name = "${azurerm_cosmosdb_database.test.resource_group_name}" - account_name = "${azurerm_cosmosdb_database.test.account_name}" + name = "${azurerm_cosmosdb_gremlin_database.test.name}" + resource_group_name = "${azurerm_cosmosdb_gremlin_database.test.resource_group_name}" + account_name = "${azurerm_cosmosdb_gremlin_database.test.account_name}" } `, testAccAzureRMCosmosGremlinDatabase_basic(data)) } diff --git a/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_gremlin_graph_test.go b/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_gremlin_graph_test.go index d8256add53ce2..b95dbdc18dd24 100644 --- a/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_gremlin_graph_test.go +++ b/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_gremlin_graph_test.go @@ -219,6 +219,19 @@ resource "azurerm_cosmosdb_gremlin_graph" "import" { resource_group_name = "${azurerm_cosmosdb_account.test.resource_group_name}" account_name = "${azurerm_cosmosdb_account.test.name}" database_name = "${azurerm_cosmosdb_gremlin_database.test.name}" + + index_policy { + automatic = true + indexing_mode = "Consistent" + included_paths = ["/*"] + excluded_paths = ["/\"_etag\"/?"] + } + + conflict_resolution_policy { + mode = "LastWriterWins" + conflict_resolution_path = "/_ts" + } + } `, testAccAzureRMCosmosDbGremlinGraph_basic(data)) } From 30941feb995a125eb46a96b93ecc538c0c1438d4 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Tue, 18 Feb 2020 17:38:30 +0000 Subject: [PATCH 211/498] config typo fix --- .../services/cosmos/tests/resource_arm_cosmosdb_account_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go b/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go index bcc2ab06169b8..dd99f1f65b3a6 100644 --- a/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go +++ b/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go @@ -524,7 +524,7 @@ resource "azurerm_cosmosdb_account" "test" { consistency_policy { consistency_level = "%[4]s" - max_interval_seconds = 300 + max_interval_in_seconds = 300 max_staleness_prefix = 170000 } From a229843e646377c8d188eb233deb86b739973b0b Mon Sep 17 00:00:00 2001 From: jackofallops Date: Tue, 18 Feb 2020 17:45:51 +0000 Subject: [PATCH 212/498] Linting --- .../cosmos/tests/resource_arm_cosmosdb_account_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go b/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go index dd99f1f65b3a6..15f4bfea25dac 100644 --- a/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go +++ b/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go @@ -523,9 +523,9 @@ resource "azurerm_cosmosdb_account" "test" { kind = "%[3]s" consistency_policy { - consistency_level = "%[4]s" + consistency_level = "%[4]s" max_interval_in_seconds = 300 - max_staleness_prefix = 170000 + max_staleness_prefix = 170000 } is_virtual_network_filter_enabled = true From 7304cafedc92791813ea0a1adb0e8a33a2b443fb Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 18 Feb 2020 18:54:12 +0100 Subject: [PATCH 213/498] website: removing link to a dead link --- website/docs/r/express_route_gateway.html.markdown | 2 -- 1 file changed, 2 deletions(-) diff --git a/website/docs/r/express_route_gateway.html.markdown b/website/docs/r/express_route_gateway.html.markdown index 27900d800de6e..5e05e958a7fda 100644 --- a/website/docs/r/express_route_gateway.html.markdown +++ b/website/docs/r/express_route_gateway.html.markdown @@ -69,8 +69,6 @@ The following attributes are exported: ### Timeouts -~> **Note:** Custom Timeouts are available [as an opt-in Beta in version 1.43 of the Azure Provider](/docs/providers/azurerm/guides/2.0-beta.html) and will be enabled by default in version 2.0 of the Azure Provider. - The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: * `create` - (Defaults to 60 minutes) Used when creating the ExpressRoute Gateway. From 4ceb471f62d2f3583913ee40ef65f6b88bbc294a Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 18 Feb 2020 19:08:14 +0100 Subject: [PATCH 214/498] updating to include #5794 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f022bb8780874..9576baade728c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,9 @@ BREAKING CHANGES: * Data Source: `azurerm_app_service_plan` - the deprecated `properties` block has been removed since these properties have been moved to the top level [GH-5717] * Data Source: `azurerm_azuread_application` - This data source has been removed since it was deprecated [GH-5748] * Data Source: `azurerm_azuread_service_principal` - This data source has been removed since it was deprecated [GH-5748] +* Data Source: `azurerm_dns_zone` - removing the deprecated `zone_type` field [GH-5794] +* Data Source: `azurerm_dns_zone` - removing the deprecated `registration_virtual_network_ids` field [GH-5794] +* Data Source: `azurerm_dns_zone` - removing the deprecated `resolution_virtual_network_ids` field [GH-5794] * Data Source: `azurerm_key_vault` - removing the `sku` block since this has been deprecated in favour of the `sku_name` field [GH-5774] * Data Source: `azurerm_key_vault_key` - removing the deprecated `vault_uri` field [GH-5774] * Data Source: `azurerm_key_vault_secret` - removing the deprecated `vault_uri` field [GH-5774] @@ -37,6 +40,11 @@ BREAKING CHANGES: * `azurerm_cognitive_account` - removing the deprecated `sku_name` block [GH-5797] * `azurerm_container_service` - This resource has been removed since it was deprecated [GH-5709] * `azurerm_devspace_controller` - removing the deprecated `sku` block [GH-5795] +* `azurerm_dns_cname_record` - removing the deprecated `records` field [GH-5794] +* `azurerm_dns_ns_record` - removing the deprecated `records` field [GH-5794] +* `azurerm_dns_zone` - removing the deprecated `zone_type` field [GH-5794] +* `azurerm_dns_zone` - removing the deprecated `registration_virtual_network_ids` field [GH-5794] +* `azurerm_dns_zone` - removing the deprecated `resolution_virtual_network_ids` field [GH-5794] * `azurerm_eventhub` - removing the deprecated `location` field [GH-5793] * `azurerm_eventhub_authorization_rule` - removing the deprecated `location` field [GH-5793] * `azurerm_eventhub_consumer_group` - removing the deprecated `location` field [GH-5793] From 6a91c4546583c243f1afc3237a7a979325638158 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 18 Feb 2020 19:13:23 +0100 Subject: [PATCH 215/498] updating to include #5743 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9576baade728c..f390dc0b740c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,6 +63,7 @@ BREAKING CHANGES: * `azurerm_maps_account` - the `sku_name` field is now case-sensitive [GH-5776] * `azurerm_mariadb_server` - removing the `sku` block since it's been deprecated in favour of the `sku_name` field [GH-5777] * `azurerm_mssql_elasticpool` - removing the deprecated `elastic_pool_properties` block [GH-5744] +* `azurerm_mysql_server` - removing the deprecated `sku` block [GH-5743] * `azurerm_network_interface` - removing the deprecated `application_gateway_backend_address_pools_ids` field from the `ip_configurations` block [GH-5784] * `azurerm_network_interface` - removing the deprecated `application_security_group_ids ` field from the `ip_configurations` block [GH-5784] * `azurerm_network_interface` - removing the deprecated `load_balancer_backend_address_pools_ids ` field from the `ip_configurations` block [GH-5784] From 044cbbc01da69ca7ec580f1ffa3cb6c7099f1a2e Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 18 Feb 2020 19:16:34 +0100 Subject: [PATCH 216/498] updating to include #5805 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f390dc0b740c7..b66a3bda6291f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ FEATURES: * **Custom Timeouts:** - all resources within the Azure Provider now allow configuring custom timeouts - please [see Terraform's Timeout documentation](https://www.terraform.io/docs/configuration/resources.html#operation-timeouts) and the documentation in each data source resource for more information. * **Requires Import:** The Azure Provider now checks for the presence of an existing resource prior to creating it - which means that if you try and create a resource which already exists (without importing it) you'll be prompted to import this into the state. +* **New Data Source:** `azurerm_eventhub_authorization_rule` [GH-5805] * **New Resource:** `azurerm_express_route_gateway` [GH-5523] * **New Resource:** `azurerm_linux_virtual_machine` [GH-5705] * **New Resource:** `azurerm_linux_virtual_machine_scale_set` [GH-5705] From 339a7272a83abc79f59618dd2d826ae63fe63794 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 18 Feb 2020 19:18:02 +0100 Subject: [PATCH 217/498] r/express_route_gateway: tweaking the timeouts --- .../services/network/resource_arm_express_route_gateway.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azurerm/internal/services/network/resource_arm_express_route_gateway.go b/azurerm/internal/services/network/resource_arm_express_route_gateway.go index 731594d7fd24f..43c00367718e1 100644 --- a/azurerm/internal/services/network/resource_arm_express_route_gateway.go +++ b/azurerm/internal/services/network/resource_arm_express_route_gateway.go @@ -30,10 +30,10 @@ func resourceArmExpressRouteGateway() *schema.Resource { }, Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(60 * time.Minute), + Create: schema.DefaultTimeout(90 * time.Minute), Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(60 * time.Minute), - Delete: schema.DefaultTimeout(60 * time.Minute), + Update: schema.DefaultTimeout(90 * time.Minute), + Delete: schema.DefaultTimeout(90 * time.Minute), }, Schema: map[string]*schema.Schema{ From 847d34bb81fd30cd13e0d92f75658e96ffb336e7 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 18 Feb 2020 19:51:12 +0100 Subject: [PATCH 218/498] updating to include #5801 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b66a3bda6291f..62474e85b2fbe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ BREAKING CHANGES: * Data Source: `azurerm_key_vault_secret` - removing the deprecated `vault_uri` field [GH-5774] * Data Source: `azurerm_role_definition` - removing the alias `VirtualMachineContributor` which has been deprecated in favour of the full name `Virtual Machine Contributor` [GH-5733] * Data Source: `azurerm_scheduler_job_collection` - This data source has been removed since it was deprecated [GH-5712] +* Data Source: `azurerm_subnet` - removing the deprecated `ip_configuration` field [GH-5801] * `azurerm_app_service_plan` - the deprecated `properties` block has been removed since these properties have been moved to the top level [GH-5717] * `azurerm_application_gateway` - updating the default value for the `body` field within the `match` block from `*` to an empty string [GH-5752] * `azurerm_availability_set` - updating the default value for `managed` from `false` to `true` [GH-5724] @@ -87,6 +88,10 @@ BREAKING CHANGES: * `azurerm_storage_queue` - removing the deprecated `resource_group_name` field [GH-5710] * `azurerm_storage_share` - removing the deprecated `resource_group_name` field [GH-5710] * `azurerm_storage_table` - removing the deprecated `resource_group_name` field [GH-5710] +* `azurerm_subnet` - removing the deprecated `ip_configuration` field [GH-5801] +* `azurerm_subnet` - removing the deprecated `network_security_group_id` field [GH-5801] +* `azurerm_subnet` - removing the deprecated `route_table_id` field [GH-5801] +* `azurerm_subnet` - making the `actions` list within the `service_delegation` block within the `service_endpoints` block non-computed [GH-5801] IMPROVEMENTS: @@ -94,6 +99,7 @@ IMPROVEMENTS: * `azurerm_dedicated_host` - support for setting `sku_name` to `DSv3-Type2` and `ESv3-Type2` [GH-5768] * `azurerm_storage_account` - support for configuring the `static_website` block [GH-5649] * `azurerm_storage_account` - support for configuring `cors_rules` within the `blob_properties` block [GH-5425] +* `azurerm_subnet` - support for delta updates [GH-5801] * `azurerm_windows_virtual_machine` - fixing a bug when provisioning from a Shared Gallery image [GH-5661] BUG FIXES: @@ -103,6 +109,8 @@ BUG FIXES: * `azurerm_public_ip_prefix` - fixing the validation for the `prefix_length` to match the Azure API [GH-5693] * `azurerm_role_assignment` - validating that the `name` is a UUID [GH-5624] * `azurerm_signalr_service` - ensuring the SignalR segment is parsed in the correct case [GH-5737] +* `azurerm_subnet` - supporting updating of the `enforce_private_link_endpoint_network_policies` field [GH-5801] +* `azurerm_subnet` - supporting updating of the `enforce_private_link_service_network_policies` field [GH-5801] * `azurerm_windows_virtual_machine` - using the delete custom timeout during deletion [GH-5764] --- From 4808d93321e3f83d5748641f599fb6e05d8f862c Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 18 Feb 2020 20:00:33 +0100 Subject: [PATCH 219/498] r/api_management_api_operation: support for Requires Import --- .../resource_arm_api_management_api_operation.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/azurerm/internal/services/apimanagement/resource_arm_api_management_api_operation.go b/azurerm/internal/services/apimanagement/resource_arm_api_management_api_operation.go index e4fd0bfb28081..8bb615228573c 100644 --- a/azurerm/internal/services/apimanagement/resource_arm_api_management_api_operation.go +++ b/azurerm/internal/services/apimanagement/resource_arm_api_management_api_operation.go @@ -8,7 +8,9 @@ import ( "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2018-01-01/apimanagement" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -117,6 +119,19 @@ func resourceArmApiManagementApiOperationCreateUpdate(d *schema.ResourceData, me apiId := d.Get("api_name").(string) operationId := d.Get("operation_id").(string) + if features.ShouldResourcesBeImported() && d.IsNewResource() { + existing, err := client.Get(ctx, resourceGroup, serviceName, apiId, operationId) + if err != nil { + if !utils.ResponseWasNotFound(existing.Response) { + return fmt.Errorf("Error checking for presence of existing Operation %q (API %q / API Management Service %q / Resource Group %q): %s", operationId, apiId, serviceName, resourceGroup, err) + } + } + + if existing.ID != nil && *existing.ID != "" { + return tf.ImportAsExistsError("azurerm_api_management_api_operation", *existing.ID) + } + } + description := d.Get("description").(string) displayName := d.Get("display_name").(string) method := d.Get("method").(string) From 96e55dfe290c501fd528324e2dd93de8e0f90678 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 18 Feb 2020 20:07:29 +0100 Subject: [PATCH 220/498] r/storage_account: updating the default for `enable_https_traffic_only` to `true` Fixes #5010 --- .../internal/services/storage/resource_arm_storage_account.go | 1 + website/docs/r/storage_account.html.markdown | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/azurerm/internal/services/storage/resource_arm_storage_account.go b/azurerm/internal/services/storage/resource_arm_storage_account.go index 6c915fb7d4809..e7faa93212012 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account.go @@ -158,6 +158,7 @@ func resourceArmStorageAccount() *schema.Resource { "enable_https_traffic_only": { Type: schema.TypeBool, Optional: true, + Default: true, }, "is_hns_enabled": { diff --git a/website/docs/r/storage_account.html.markdown b/website/docs/r/storage_account.html.markdown index ff6179cdf6bb8..50da869e31bd6 100644 --- a/website/docs/r/storage_account.html.markdown +++ b/website/docs/r/storage_account.html.markdown @@ -97,7 +97,7 @@ The following arguments are supported: * `enable_file_encryption` - (Optional) Boolean flag which controls if Encryption Services are enabled for File storage, see [here](https://azure.microsoft.com/en-us/documentation/articles/storage-service-encryption/) for more information. Defaults to `true`. * `enable_https_traffic_only` - (Optional) Boolean flag which forces HTTPS if enabled, see [here](https://docs.microsoft.com/en-us/azure/storage/storage-require-secure-transfer/) - for more information. + for more information. Defaults to `true`. * `is_hns_enabled` - (Optional) Is Hierarchical Namespace enabled? This can be used with Azure Data Lake Storage Gen 2 ([see here for more information](https://docs.microsoft.com/en-us/azure/storage/blobs/data-lake-storage-quickstart-create-account/)). Changing this forces a new resource to be created. From ab37947c30057711d588c2ee9d187964faf1a5a4 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 18 Feb 2020 20:12:47 +0100 Subject: [PATCH 221/498] docs: adding to the upgrade guide --- website/docs/guides/2.0-upgrade-guide.html.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index da2deff1552e6..af509ce58c50f 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -498,6 +498,8 @@ The deprecated `account_type` field will be removed. This has been split into th The deprecated `enable_advanced_threat_protection` field will be removed. This functionality has been move in the more general `azurerm_advanced_threat_protection` resource. +The default value for the field `enable_https_traffic_only` has changed from `false` to `true`. + ### Resource: `azurerm_storage_blob` The deprecated `attempts` field will be removed, since Terraform now handles retries automatically. From 637fab5f01fb657c700b33f828ec3a4eacca3b72 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Tue, 18 Feb 2020 20:21:52 +0100 Subject: [PATCH 222/498] updating to include #5781 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62474e85b2fbe..68ede6be31f03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,10 @@ BREAKING CHANGES: * Data Source: `azurerm_subnet` - removing the deprecated `ip_configuration` field [GH-5801] * `azurerm_app_service_plan` - the deprecated `properties` block has been removed since these properties have been moved to the top level [GH-5717] * `azurerm_application_gateway` - updating the default value for the `body` field within the `match` block from `*` to an empty string [GH-5752] +* `azurerm_automation_account` - removing the `sku` block which has been deprecated in favour of the `sku_name` field [GH-5781] +* `azurerm_automation_credential` - removing the deprecated `account_name` field [GH-5781] +* `azurerm_automation_runbook` - removing the deprecated `account_name` field [GH-5781] +* `azurerm_automation_schedule` - removing the deprecated `account_name` field [GH-5781] * `azurerm_availability_set` - updating the default value for `managed` from `false` to `true` [GH-5724] * `azurerm_azuread_application` - This resource has been removed since it was deprecated [GH-5748] * `azurerm_azuread_service_principal_password` - This resource has been removed since it was deprecated [GH-5748] From 7f48f3a1a9f698fb8627f4ab2b55096382a485e1 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Tue, 18 Feb 2020 14:11:13 -0800 Subject: [PATCH 223/498] Update test cases --- azurerm/internal/provider/features.go | 22 +++++++++---------- .../tests/data_source_key_vault_test.go | 2 +- .../tests/resource_arm_key_vault_test.go | 8 +++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/azurerm/internal/provider/features.go b/azurerm/internal/provider/features.go index 709bd29687404..8e26707224973 100644 --- a/azurerm/internal/provider/features.go +++ b/azurerm/internal/provider/features.go @@ -34,18 +34,18 @@ func schemaFeatures() *schema.Schema { Required: true, }, }, + }, + }, - "key_vault": { - Type: schema.TypeList, - Optional: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "purge_soft_delete_on_destroy": { - Type: schema.TypeBool, - Required: true, - }, - }, + "key_vault": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "purge_soft_delete_on_destroy": { + Type: schema.TypeBool, + Required: true, }, }, }, diff --git a/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go b/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go index cefa1addb401e..4ef5f6ba12fa5 100644 --- a/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go @@ -108,7 +108,7 @@ func TestAccDataSourceAzureRMKeyVault_softDelete(t *testing.T) { resource.TestCheckResourceAttr(data.ResourceName, "access_policy.0.secret_permissions.0", "set"), resource.TestCheckResourceAttr(data.ResourceName, "network_acls.#", "1"), resource.TestCheckResourceAttr(data.ResourceName, "network_acls.0.default_action", "Allow"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "0") + resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "0"), ), }, { diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go index 0e5eb626b83d8..0699025aef01b 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go @@ -847,7 +847,7 @@ func testAccAzureRMKeyVault_generateAccessPolicyConfigs(accountNum int) string { return fmt.Sprintf(` access_policy { - tenant_id = "${data.azurerm_client_config.current.tenant_id}" + tenant_id = data.azurerm_client_config.current.tenant_id object_id = "%s" key_permissions = ["get", "create", "delete", "list", "restore", "recover", "unwrapkey", "wrapkey", "purge", "encrypt", "decrypt", "sign", "verify"] @@ -878,9 +878,9 @@ resource "azurerm_resource_group" "test" { resource "azurerm_key_vault" "test" { name = "vault%d" provider = azurerm.keyVault - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - tenant_id = "${data.azurerm_client_config.current.tenant_id}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + tenant_id = data.azurerm_client_config.current.tenant_id soft_delete_enabled = true purge_protection_enabled = false From 0added90d846283d3aa2fbdc6a3cb6d06698d2bd Mon Sep 17 00:00:00 2001 From: aqche <39076898+aqche@users.noreply.github.com> Date: Tue, 18 Feb 2020 16:25:36 -0800 Subject: [PATCH 224/498] Update azurerm/internal/services/sql/resource_arm_sql_database.go Co-Authored-By: Tom Harvey --- azurerm/internal/services/sql/resource_arm_sql_database.go | 1 - 1 file changed, 1 deletion(-) diff --git a/azurerm/internal/services/sql/resource_arm_sql_database.go b/azurerm/internal/services/sql/resource_arm_sql_database.go index 1f65c65fa817e..3a88fd06588d7 100644 --- a/azurerm/internal/services/sql/resource_arm_sql_database.go +++ b/azurerm/internal/services/sql/resource_arm_sql_database.go @@ -321,7 +321,6 @@ func resourceArmSqlDatabase() *schema.Resource { "zone_redundant": { Type: schema.TypeBool, Optional: true, - Computed: true, }, "tags": tags.Schema(), From 816bc1c2cefe28f49a080601d12a0d1537eebec8 Mon Sep 17 00:00:00 2001 From: aqche <39076898+aqche@users.noreply.github.com> Date: Tue, 18 Feb 2020 16:25:43 -0800 Subject: [PATCH 225/498] Update azurerm/internal/services/sql/resource_arm_sql_database.go Co-Authored-By: Tom Harvey --- azurerm/internal/services/sql/resource_arm_sql_database.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/sql/resource_arm_sql_database.go b/azurerm/internal/services/sql/resource_arm_sql_database.go index 3a88fd06588d7..799fa5c373403 100644 --- a/azurerm/internal/services/sql/resource_arm_sql_database.go +++ b/azurerm/internal/services/sql/resource_arm_sql_database.go @@ -582,7 +582,7 @@ func resourceArmSqlDatabaseRead(d *schema.ResourceData, meta interface{}) error if zoneRedundant := props.ZoneRedundant; zoneRedundant != nil { d.Set("zone_redundant", zoneRedundant) - } + d.Set("zone_redundant", props.ZoneRedundant) } return tags.FlattenAndSet(d, resp.Tags) From 94dfc85062c533800a1aa0dcbab799be71a480e5 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Tue, 18 Feb 2020 17:23:07 -0800 Subject: [PATCH 226/498] Fix test case --- .../services/keyvault/tests/data_source_key_vault_test.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go b/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go index 4ef5f6ba12fa5..c4efe633cb460 100644 --- a/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go @@ -100,14 +100,7 @@ func TestAccDataSourceAzureRMKeyVault_softDelete(t *testing.T) { testCheckAzureRMKeyVaultExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "soft_delete_enabled", "true"), resource.TestCheckResourceAttr(data.ResourceName, "purge_protection_enabled", "false"), - resource.TestCheckResourceAttrSet(data.ResourceName, "tenant_id"), resource.TestCheckResourceAttrSet(data.ResourceName, "sku_name"), - resource.TestCheckResourceAttrSet(data.ResourceName, "access_policy.0.tenant_id"), - resource.TestCheckResourceAttrSet(data.ResourceName, "access_policy.0.object_id"), - resource.TestCheckResourceAttr(data.ResourceName, "access_policy.0.key_permissions.0", "create"), - resource.TestCheckResourceAttr(data.ResourceName, "access_policy.0.secret_permissions.0", "set"), - resource.TestCheckResourceAttr(data.ResourceName, "network_acls.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "network_acls.0.default_action", "Allow"), resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "0"), ), }, From e5f358a7f0de105303d27781f955eef96953fe5c Mon Sep 17 00:00:00 2001 From: Austin Cheung Date: Tue, 18 Feb 2020 17:27:08 -0800 Subject: [PATCH 227/498] address review --- .../internal/services/sql/resource_arm_sql_database.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/azurerm/internal/services/sql/resource_arm_sql_database.go b/azurerm/internal/services/sql/resource_arm_sql_database.go index 799fa5c373403..930b0d0ca4216 100644 --- a/azurerm/internal/services/sql/resource_arm_sql_database.go +++ b/azurerm/internal/services/sql/resource_arm_sql_database.go @@ -356,6 +356,7 @@ func resourceArmSqlDatabaseCreateUpdate(d *schema.ResourceData, meta interface{} resourceGroup := d.Get("resource_group_name").(string) location := azure.NormalizeLocation(d.Get("location").(string)) createMode := d.Get("create_mode").(string) + zoneRedundant := d.Get("zone_redundant").(bool) t := d.Get("tags").(map[string]interface{}) if features.ShouldResourcesBeImported() && d.IsNewResource() { @@ -379,7 +380,8 @@ func resourceArmSqlDatabaseCreateUpdate(d *schema.ResourceData, meta interface{} properties := sql.Database{ Location: utils.String(location), DatabaseProperties: &sql.DatabaseProperties{ - CreateMode: sql.CreateMode(createMode), + CreateMode: sql.CreateMode(createMode), + ZoneRedundant: utils.Bool(zoneRedundant), }, Tags: tags.Expand(t), } @@ -454,10 +456,6 @@ func resourceArmSqlDatabaseCreateUpdate(d *schema.ResourceData, meta interface{} properties.DatabaseProperties.ReadScale = sql.ReadScaleDisabled } - if v, ok := d.GetOkExists("zone_redundant"); ok { - properties.DatabaseProperties.ZoneRedundant = utils.Bool(v.(bool)) - } - // The requested Service Objective Name does not match the requested Service Objective Id. if d.HasChange("requested_service_objective_name") && !d.HasChange("requested_service_objective_id") { properties.DatabaseProperties.RequestedServiceObjectiveID = nil @@ -580,8 +578,6 @@ func resourceArmSqlDatabaseRead(d *schema.ResourceData, meta interface{}) error d.Set("read_scale", false) } - if zoneRedundant := props.ZoneRedundant; zoneRedundant != nil { - d.Set("zone_redundant", zoneRedundant) d.Set("zone_redundant", props.ZoneRedundant) } From b1d5967dfd78eaa4930fcb9190aae04ca43538a1 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Tue, 18 Feb 2020 20:33:36 -0800 Subject: [PATCH 228/498] Update iothub to 2.0 (#5790) --- .../services/iothub/resource_arm_iothub.go | 16 +----- .../resource_arm_iothub_consumer_group.go | 2 +- .../iothub/resource_arm_iothub_dps.go | 15 +----- .../resource_arm_iothub_fallback_route.go | 11 ++-- ...resource_arm_iothub_consumer_group_test.go | 1 - ...esource_arm_iothub_dps_certificate_test.go | 6 +-- ...rm_iothub_dps_shared_access_policy_test.go | 2 +- .../tests/resource_arm_iothub_dps_test.go | 4 +- ...ource_arm_iothub_endpoint_eventhub_test.go | 1 - ...m_iothub_endpoint_servicebus_queue_test.go | 1 - ...m_iothub_endpoint_servicebus_topic_test.go | 1 - ..._iothub_endpoint_storage_container_test.go | 2 - ...resource_arm_iothub_fallback_route_test.go | 50 ++----------------- .../tests/resource_arm_iothub_route_test.go | 2 - ...ce_arm_iothub_shared_access_policy_test.go | 2 - .../iothub/tests/resource_arm_iothub_test.go | 3 -- .../mysql/resource_arm_mysql_configuration.go | 3 ++ .../resource_arm_postgresql_configuration.go | 3 ++ .../guides/2.0-upgrade-guide.html.markdown | 4 ++ website/docs/r/iothub.html.markdown | 4 +- website/docs/r/iothub_dps.html.markdown | 2 - .../r/iothub_dps_certificate.html.markdown | 2 +- .../r/iothub_fallback_route.html.markdown | 6 ++- .../docs/r/mysql_configuration.html.markdown | 4 ++ .../r/postgresql_configuration.html.markdown | 4 ++ 25 files changed, 41 insertions(+), 110 deletions(-) diff --git a/azurerm/internal/services/iothub/resource_arm_iothub.go b/azurerm/internal/services/iothub/resource_arm_iothub.go index 82501ef838a71..270efa6c597c5 100644 --- a/azurerm/internal/services/iothub/resource_arm_iothub.go +++ b/azurerm/internal/services/iothub/resource_arm_iothub.go @@ -94,20 +94,7 @@ func resourceArmIotHub() *schema.Resource { string(devices.S1), string(devices.S2), string(devices.S3), - }, true), // todo 2.0 make this case sensitive (all constants?) - }, - - "tier": { - Type: schema.TypeString, - Optional: true, - Computed: true, - Deprecated: "This property is no longer required and will be removed in version 2.0 of the provider", - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validation.StringInSlice([]string{ - string(devices.Basic), - string(devices.Free), - string(devices.Standard), - }, true), + }, false), }, "capacity": { @@ -880,7 +867,6 @@ func flattenIoTHubSku(input *devices.IotHubSkuInfo) []interface{} { output := make(map[string]interface{}) output["name"] = string(input.Name) - output["tier"] = string(input.Tier) if capacity := input.Capacity; capacity != nil { output["capacity"] = int(*capacity) } diff --git a/azurerm/internal/services/iothub/resource_arm_iothub_consumer_group.go b/azurerm/internal/services/iothub/resource_arm_iothub_consumer_group.go index 709c914bd1050..4c99cecd2ca17 100644 --- a/azurerm/internal/services/iothub/resource_arm_iothub_consumer_group.go +++ b/azurerm/internal/services/iothub/resource_arm_iothub_consumer_group.go @@ -69,7 +69,7 @@ func resourceArmIotHubConsumerGroupCreate(d *schema.ResourceData, meta interface resourceGroup := d.Get("resource_group_name").(string) if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, resourceGroup, name) + existing, err := client.GetEventHubConsumerGroup(ctx, resourceGroup, iotHubName, endpointName, name) if err != nil { if !utils.ResponseWasNotFound(existing.Response) { return fmt.Errorf("Error checking for presence of existing Consumer Group %q (Endpoint %q / IoTHub %q / Resource Group %q): %s", name, endpointName, iotHubName, resourceGroup, err) diff --git a/azurerm/internal/services/iothub/resource_arm_iothub_dps.go b/azurerm/internal/services/iothub/resource_arm_iothub_dps.go index 6313b3283c119..b475b62120a71 100644 --- a/azurerm/internal/services/iothub/resource_arm_iothub_dps.go +++ b/azurerm/internal/services/iothub/resource_arm_iothub_dps.go @@ -73,19 +73,7 @@ func resourceArmIotHubDPS() *schema.Resource { string(devices.S1), string(devices.S2), string(devices.S3), - }, true), // todo 2.0 make this case sensitive - }, - - "tier": { - Type: schema.TypeString, - Optional: true, - Computed: true, - Deprecated: "This property is no longer required and will be removed in version 2.0 of the provider", - ValidateFunc: validation.StringInSlice([]string{ - string(devices.Basic), - string(devices.Free), - string(devices.Standard), - }, true), + }, false), }, "capacity": { @@ -354,7 +342,6 @@ func flattenIoTHubDPSSku(input *iothub.IotDpsSkuInfo) []interface{} { output := make(map[string]interface{}) output["name"] = string(input.Name) - output["tier"] = input.Tier if capacity := input.Capacity; capacity != nil { output["capacity"] = int(*capacity) } diff --git a/azurerm/internal/services/iothub/resource_arm_iothub_fallback_route.go b/azurerm/internal/services/iothub/resource_arm_iothub_fallback_route.go index 29d6958880488..d40021cdece11 100644 --- a/azurerm/internal/services/iothub/resource_arm_iothub_fallback_route.go +++ b/azurerm/internal/services/iothub/resource_arm_iothub_fallback_route.go @@ -7,10 +7,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/preview/iothub/mgmt/2018-12-01-preview/devices" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/locks" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" @@ -90,17 +88,15 @@ func resourceArmIotHubFallbackRouteCreateUpdate(d *schema.ResourceData, meta int return fmt.Errorf("Error loading IotHub %q (Resource Group %q): %+v", iothubName, resourceGroup, err) } + // NOTE: this resource intentionally doesn't support Requires Import + // since a fallback route is created by default + routing := iothub.Properties.Routing if routing == nil { routing = &devices.RoutingProperties{} } - resourceId := fmt.Sprintf("%s/FallbackRoute/defined", *iothub.ID) - if d.IsNewResource() && routing.FallbackRoute != nil && features.ShouldResourcesBeImported() { - return tf.ImportAsExistsError("azurerm_iothub_fallback_route", resourceId) - } - routing.FallbackRoute = &devices.FallbackRouteProperties{ Source: utils.String(string(devices.RoutingSourceDeviceMessages)), Condition: utils.String(d.Get("condition").(string)), @@ -117,6 +113,7 @@ func resourceArmIotHubFallbackRouteCreateUpdate(d *schema.ResourceData, meta int return fmt.Errorf("Error waiting for the completion of the creating/updating of IotHub %q (Resource Group %q): %+v", iothubName, resourceGroup, err) } + resourceId := fmt.Sprintf("%s/FallbackRoute/defined", *iothub.ID) d.SetId(resourceId) return resourceArmIotHubFallbackRouteRead(d, meta) diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_consumer_group_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_consumer_group_test.go index ac1bbf31e1b94..96aed6a0a3bad 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_consumer_group_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_consumer_group_test.go @@ -148,7 +148,6 @@ resource "azurerm_iothub" "test" { sku { name = "B1" - tier = "Basic" capacity = "1" } diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_certificate_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_certificate_test.go index e0d00abc3b9ca..db890d56597f7 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_certificate_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_certificate_test.go @@ -52,7 +52,7 @@ func TestAccAzureRMIotHubDPSCertificate_requiresImport(t *testing.T) { }, { Config: testAccAzureRMIotHubDPSCertificate_requiresImport(data), - ExpectError: acceptance.RequiresImportError("azurerm_iothubdps"), + ExpectError: acceptance.RequiresImportError("azurerm_iothub_dps_certificate"), }, }, }) @@ -169,11 +169,11 @@ resource "azurerm_iothub_dps_certificate" "test" { } func testAccAzureRMIotHubDPSCertificate_requiresImport(data acceptance.TestData) string { - template := testAccAzureRMIotHubDPS_basic(data) + template := testAccAzureRMIotHubDPSCertificate_basic(data) return fmt.Sprintf(` %s -resource "azurerm_iothub_dps_certificate" "test" { +resource "azurerm_iothub_dps_certificate" "import" { name = "${azurerm_iothub_dps_certificate.test.name}" resource_group_name = "${azurerm_resource_group.test.name}" iot_dps_name = "${azurerm_iothub_dps.test.name}" diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_shared_access_policy_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_shared_access_policy_test.go index 6cb1cbf874502..320ab1e84076c 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_shared_access_policy_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_shared_access_policy_test.go @@ -240,7 +240,7 @@ func testCheckAzureRMIotHubDpsSharedAccessPolicyDestroy(s *terraform.State) erro for _, sharedAccessPolicy := range *resp.Properties.AuthorizationPolicies { if *sharedAccessPolicy.KeyName == keyName { - return fmt.Errorf("Bad: Shared Access Policy %s still exists on IoTHb DPS %s", keyName, iothubDpsName) + return fmt.Errorf("Bad: Shared Access Policy %s still exists on IoTHub DPS %s", keyName, iothubDpsName) } } } diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_test.go index d56e7fa952b27..c9ac2571f4e81 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_test.go @@ -56,7 +56,7 @@ func TestAccAzureRMIotHubDPS_requiresImport(t *testing.T) { }, { Config: testAccAzureRMIotHubDPS_requiresImport(data), - ExpectError: acceptance.RequiresImportError("azurerm_iothubdps"), + ExpectError: acceptance.RequiresImportError("azurerm_iothub_dps"), }, }, }) @@ -119,7 +119,7 @@ func testCheckAzureRMIotHubDPSDestroy(s *terraform.State) error { ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_iothubdps" { + if rs.Type != "azurerm_iothub_dps" { continue } diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_eventhub_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_eventhub_test.go index 5292024f84136..a0358028964d3 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_eventhub_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_eventhub_test.go @@ -99,7 +99,6 @@ resource "azurerm_iothub" "test" { sku { name = "B1" - tier = "Basic" capacity = "1" } diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_servicebus_queue_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_servicebus_queue_test.go index fb9f0c74f1ea9..2248687779c1a 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_servicebus_queue_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_servicebus_queue_test.go @@ -100,7 +100,6 @@ resource "azurerm_iothub" "test" { sku { name = "B1" - tier = "Basic" capacity = "1" } diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_servicebus_topic_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_servicebus_topic_test.go index fa96e4dc1638f..50478bc5c65f1 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_servicebus_topic_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_servicebus_topic_test.go @@ -98,7 +98,6 @@ resource "azurerm_iothub" "test" { sku { name = "B1" - tier = "Basic" capacity = "1" } diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_storage_container_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_storage_container_test.go index 90120fa25e590..1625fdb80dd20 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_storage_container_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_storage_container_test.go @@ -80,7 +80,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "acctestcont" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } @@ -92,7 +91,6 @@ resource "azurerm_iothub" "test" { sku { name = "B1" - tier = "Basic" capacity = "1" } diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_fallback_route_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_fallback_route_test.go index 1e82148defed5..67f158625aee1 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_fallback_route_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_fallback_route_test.go @@ -9,10 +9,12 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) +// NOTE: this resource intentionally doesn't support Requires Import +// since a fallback route is created by default + func TestAccAzureRMIotHubFallbackRoute_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_iothub_fallback_route", "test") @@ -32,33 +34,6 @@ func TestAccAzureRMIotHubFallbackRoute_basic(t *testing.T) { }) } -func TestAccAzureRMIotHubFallbackRoute_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - - data := acceptance.BuildTestData(t, "azurerm_iothub_fallback_route", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMIotHubDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMIotHubFallbackRoute_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMIotHubFallbackRouteExists(data.ResourceName), - ), - }, - { - Config: testAccAzureRMIotHubFallbackRoute_requiresImport(data), - ExpectError: acceptance.RequiresImportError("azurerm_iothub_fallback_route"), - }, - }, - }) -} - func TestAccAzureRMIotHubFallbackRoute_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_iothub_fallback_route", "test") @@ -148,23 +123,6 @@ func testCheckAzureRMIotHubFallbackRouteExists(resourceName string) resource.Tes } } -func testAccAzureRMIotHubFallbackRoute_requiresImport(data acceptance.TestData) string { - template := testAccAzureRMIotHub_basic(data) - return fmt.Sprintf(` -%s - -resource "azurerm_iothub_fallback_route" "import" { - resource_group_name = "${azurerm_resource_group.test.name}" - iothub_name = "${azurerm_iothub.test.name}" - - source = "DeviceMessages" - condition = "true" - endpoint_names = ["${azurerm_iothub_endpoint_storage_container.test.name}"] - enabled = true -} -`, template) -} - func testAccAzureRMIotHubFallbackRoute_basic(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { @@ -182,7 +140,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "test-%[1]d" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } @@ -243,7 +200,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "test-%[1]d" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_route_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_route_test.go index eb1a49a39b94f..4dea04f7e3d5d 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_route_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_route_test.go @@ -205,7 +205,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "test%[1]d" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } @@ -269,7 +268,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "test%[1]d" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_shared_access_policy_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_shared_access_policy_test.go index e25dff79f6aa9..85b681994d394 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_shared_access_policy_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_shared_access_policy_test.go @@ -96,7 +96,6 @@ resource "azurerm_iothub" "test" { sku { name = "B1" - tier = "Basic" capacity = "1" } @@ -146,7 +145,6 @@ resource "azurerm_iothub" "test" { sku { name = "B1" - tier = "Basic" capacity = "1" } diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_test.go index e1fae76b447ea..e7da8ddbb1f67 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_test.go @@ -251,7 +251,6 @@ resource "azurerm_iothub" "import" { sku { name = "B1" - tier = "Basic" capacity = "1" } @@ -333,7 +332,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "test" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } @@ -461,7 +459,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "test" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } diff --git a/azurerm/internal/services/mysql/resource_arm_mysql_configuration.go b/azurerm/internal/services/mysql/resource_arm_mysql_configuration.go index 7b0744e7d22de..ea1cd6e80ad2c 100644 --- a/azurerm/internal/services/mysql/resource_arm_mysql_configuration.go +++ b/azurerm/internal/services/mysql/resource_arm_mysql_configuration.go @@ -73,6 +73,9 @@ func resourceArmMySQLConfigurationCreate(d *schema.ResourceData, meta interface{ }, } + // NOTE: this resource intentionally doesn't support Requires Import + // since a fallback route is created by default + future, err := client.CreateOrUpdate(ctx, resourceGroup, serverName, name, properties) if err != nil { return fmt.Errorf("Error issuing create/update request for MySQL Configuration %s (resource group %s, server name %s): %v", name, resourceGroup, serverName, err) diff --git a/azurerm/internal/services/postgres/resource_arm_postgresql_configuration.go b/azurerm/internal/services/postgres/resource_arm_postgresql_configuration.go index 3a3327b8d834d..f7720a3b116b1 100644 --- a/azurerm/internal/services/postgres/resource_arm_postgresql_configuration.go +++ b/azurerm/internal/services/postgres/resource_arm_postgresql_configuration.go @@ -73,6 +73,9 @@ func resourceArmPostgreSQLConfigurationCreateUpdate(d *schema.ResourceData, meta }, } + // NOTE: this resource intentionally doesn't support Requires Import + // since a fallback route is created by default + future, err := client.CreateOrUpdate(ctx, resGroup, serverName, name, properties) if err != nil { return err diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index da2deff1552e6..8162ad36e148c 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -327,10 +327,14 @@ The deprecated `internal_public_ip_address_id` field in the `ip_configuration` b The deprecated `sku.tier` property will be remove. +The `sku.name` property is now case sensitive. + ### Resource: `azurerm_iothub_dps` The deprecated `sku.tier` property will be remove. +The `sku.name` property is now case sensitive. + ### Resource: `azurerm_iot_dps` This resource has been renamed to `azurerm_iothub_dps` which is available from v1.37 of the AzureRM Provider - instructions on [how to migrate are available in this guide](https://terraform.io/docs/providers/azurerm/guides/migrating-between-renamed-resources.html). As such this resource will be removed. diff --git a/website/docs/r/iothub.html.markdown b/website/docs/r/iothub.html.markdown index 81a9d99c731be..79e6495f0b9cf 100644 --- a/website/docs/r/iothub.html.markdown +++ b/website/docs/r/iothub.html.markdown @@ -145,12 +145,10 @@ A `sku` block supports the following: * `name` - (Required) The name of the sku. Possible values are `B1`, `B2`, `B3`, `F1`, `S1`, `S2`, and `S3`. -* `tier` - (Required) The billing tier for the IoT Hub. Possible values are `Basic`, `Free` or `Standard`. +* `capacity` - (Required) The number of provisioned IoT Hub units. ~> **NOTE:** Only one IotHub can be on the `Free` tier per subscription. -* `capacity` - (Required) The number of provisioned IoT Hub units. - --- An `endpoint` block supports the following: diff --git a/website/docs/r/iothub_dps.html.markdown b/website/docs/r/iothub_dps.html.markdown index d071151ec821f..23c660e8e4734 100644 --- a/website/docs/r/iothub_dps.html.markdown +++ b/website/docs/r/iothub_dps.html.markdown @@ -52,8 +52,6 @@ A `sku` block supports the following: * `name` - (Required) The name of the sku. Possible values are `B1`, `B2`, `B3`, `F1`, `S1`, `S2`, and `S3`. -* `tier` - (Required) The billing tier for the IoT Device Provisioning Service. Possible values are `Basic`, `Free` or `Standard`. - * `capacity` - (Required) The number of provisioned IoT Device Provisioning Service units. --- diff --git a/website/docs/r/iothub_dps_certificate.html.markdown b/website/docs/r/iothub_dps_certificate.html.markdown index b6feabaee5df7..18654984dbb41 100644 --- a/website/docs/r/iothub_dps_certificate.html.markdown +++ b/website/docs/r/iothub_dps_certificate.html.markdown @@ -8,7 +8,7 @@ description: |- # azurerm_iothub_dps_certificate -Manages an IotHub Device Provisioning Service Certificate. +Manages an IotHub Device Provisioning Service Certificate. ## Example Usage diff --git a/website/docs/r/iothub_fallback_route.html.markdown b/website/docs/r/iothub_fallback_route.html.markdown index 1d8d47bd1af06..eba7e7676b64a 100644 --- a/website/docs/r/iothub_fallback_route.html.markdown +++ b/website/docs/r/iothub_fallback_route.html.markdown @@ -10,7 +10,11 @@ description: |- Manages an IotHub Fallback Route -~> **NOTE:** Fallback route can be defined either directly on the `azurerm_iothub` resource, or using the `azurerm_iothub_fallback_route` resource - but the two cannot be used together. If both are used against the same IoTHub, spurious changes will occur. +## Disclaimers + +~> **Note:** Fallback route can be defined either directly on the `azurerm_iothub` resource, or using the `azurerm_iothub_fallback_route` resource - but the two cannot be used together. If both are used against the same IoTHub, spurious changes will occur. + +~> **Note:** Since this resource is provisioned by default, the Azure Provider will not check for the presence of an existing resource prior to attempting to create it. ## Example Usage diff --git a/website/docs/r/mysql_configuration.html.markdown b/website/docs/r/mysql_configuration.html.markdown index 5d3ff29267817..7310442f5435f 100644 --- a/website/docs/r/mysql_configuration.html.markdown +++ b/website/docs/r/mysql_configuration.html.markdown @@ -10,6 +10,10 @@ description: |- Sets a MySQL Configuration value on a MySQL Server. +## Disclaimers + +~> **Note:** Since this resource is provisioned by default, the Azure Provider will not check for the presence of an existing resource prior to attempting to create it. + ## Example Usage ```hcl diff --git a/website/docs/r/postgresql_configuration.html.markdown b/website/docs/r/postgresql_configuration.html.markdown index 9f5b97ae9a842..c71033835c309 100644 --- a/website/docs/r/postgresql_configuration.html.markdown +++ b/website/docs/r/postgresql_configuration.html.markdown @@ -10,6 +10,10 @@ description: |- Sets a PostgreSQL Configuration value on a PostgreSQL Server. +## Disclaimers + +~> **Note:** Since this resource is provisioned by default, the Azure Provider will not check for the presence of an existing resource prior to attempting to create it. + ## Example Usage ```hcl From e5c0a46595e27210a9d587d614d26ed8d63f38c1 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Tue, 18 Feb 2020 20:45:20 -0800 Subject: [PATCH 229/498] Update Changelog for #5790 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68ede6be31f03..a65ad70b61d42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,8 @@ BREAKING CHANGES: * `azurerm_eventhub_namespace_authorization_rule` - removing the deprecated `location` field [GH-5793] * `azurerm_iot_dps` - This resource has been removed since it was deprecated [GH-5753] * `azurerm_iot_dps_certificate` - This resource has been removed since it was deprecated [GH-5753] +* `azurerm_iothub`- The deprecated `sku.tier` property will be removed. [GH-5790] +* `azurerm_iothub_dps` - The deprecated `sku.tier` property will be removed. [GH-5790] * `azurerm_key_vault` - removing the `sku` block since this has been deprecated in favour of the `sku_name` field [GH-5774] * `azurerm_key_vault_access_policy` - removing the deprecated field `vault_name` which has been superseded by the `key_vault_id` field [GH-5774] * `azurerm_key_vault_access_policy` - removing the deprecated field `resource_group_name ` which has been superseded by the `key_vault_id` field [GH-5774] From 91cb073670511b4084ce2ea037693ff9d9de4203 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Tue, 18 Feb 2020 20:48:12 -0800 Subject: [PATCH 230/498] Update the frontdoor package to 2.0 (#5792) --- azurerm/internal/services/frontdoor/resource_arm_frontdoor.go | 3 +-- website/docs/guides/2.0-upgrade-guide.html.markdown | 4 ++++ website/docs/r/frontdoor.html.markdown | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/azurerm/internal/services/frontdoor/resource_arm_frontdoor.go b/azurerm/internal/services/frontdoor/resource_arm_frontdoor.go index 2af4efdfb7df6..9110245f8b438 100644 --- a/azurerm/internal/services/frontdoor/resource_arm_frontdoor.go +++ b/azurerm/internal/services/frontdoor/resource_arm_frontdoor.go @@ -195,7 +195,6 @@ func resourceArmFrontDoor() *schema.Resource { Type: schema.TypeString, Optional: true, }, - // TODO: In 2.0 Switch default value from MatchRequest to HTTPSOnly #4627 "forwarding_protocol": { Type: schema.TypeString, Optional: true, @@ -204,7 +203,7 @@ func resourceArmFrontDoor() *schema.Resource { string(frontdoor.HTTPSOnly), string(frontdoor.MatchRequest), }, false), - Default: string(frontdoor.MatchRequest), + Default: string(frontdoor.HTTPSOnly), }, }, }, diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index 8162ad36e148c..89f9c5a2c5990 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -323,6 +323,10 @@ The deprecated `location` field will be removed, since this is no longer used. The deprecated `internal_public_ip_address_id` field in the `ip_configuration` block will be removed. This field has been replaced by the `public_ip_address_id` field in the `ip_configuration` block. +### Resource: `azurerm_frontdoor` + +The `forwarding_protocol` property now defaults to `HttpsOnly` + ### Resource: `azurerm_iothub` The deprecated `sku.tier` property will be remove. diff --git a/website/docs/r/frontdoor.html.markdown b/website/docs/r/frontdoor.html.markdown index b2aa75e52092f..5c364650603f8 100644 --- a/website/docs/r/frontdoor.html.markdown +++ b/website/docs/r/frontdoor.html.markdown @@ -205,7 +205,7 @@ The `forwarding_configuration` block supports the following: * `custom_forwarding_path` - (Optional) Path to use when constructing the request to forward to the backend. This functions as a URL Rewrite. Default behavior preserves the URL path. -* `forwarding_protocol` - (Optional) Protocol to use when redirecting. Valid options are `HttpOnly`, `HttpsOnly`, or `MatchRequest`. Defaults to `MatchRequest`. +* `forwarding_protocol` - (Optional) Protocol to use when redirecting. Valid options are `HttpOnly`, `HttpsOnly`, or `MatchRequest`. Defaults to `HttpsOnly`. --- From 93234e90515edcb603bab58024fab501964d8901 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Tue, 18 Feb 2020 20:49:51 -0800 Subject: [PATCH 231/498] Update changelog for #5792 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a65ad70b61d42..5bf933ada72d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,6 +56,7 @@ BREAKING CHANGES: * `azurerm_eventhub_consumer_group` - removing the deprecated `location` field [GH-5793] * `azurerm_eventhub_namespace` - removing the deprecated `kafka_enabled` field since this is now managed by Azure [GH-5793] * `azurerm_eventhub_namespace_authorization_rule` - removing the deprecated `location` field [GH-5793] +* `azurerm_frontdoor` - The `forwarding_protocol` property now defaults to `HttpsOnly` [GH-5792] * `azurerm_iot_dps` - This resource has been removed since it was deprecated [GH-5753] * `azurerm_iot_dps_certificate` - This resource has been removed since it was deprecated [GH-5753] * `azurerm_iothub`- The deprecated `sku.tier` property will be removed. [GH-5790] From f93ca4ca0d5bdbe443fd9da2b19500f0f739249a Mon Sep 17 00:00:00 2001 From: jackofallops Date: Wed, 19 Feb 2020 07:00:35 +0000 Subject: [PATCH 232/498] test fixes --- .../services/cosmos/tests/resource_arm_cosmosdb_account_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go b/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go index 15f4bfea25dac..57f10050fe6ad 100644 --- a/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go +++ b/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go @@ -445,7 +445,7 @@ resource "azurerm_cosmosdb_account" "import" { failover_priority = "${azurerm_cosmosdb_account.geo_location.0.location}" } } -`, testAccAzureRMCosmosDBAccount_basic(data, "", consistency)) +`, testAccAzureRMCosmosDBAccount_basic(data, "GlobalDocumentDB", consistency)) } func testAccAzureRMCosmosDBAccount_consistency(data acceptance.TestData, kind documentdb.DatabaseAccountKind, consistency documentdb.DefaultConsistencyLevel, interval, staleness int) string { From 720edf844df8bac07231829229bcf16fccf7f60b Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Wed, 19 Feb 2020 08:19:43 +0100 Subject: [PATCH 233/498] updating to include #5808 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bf933ada72d9..fbe25256c0288 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -87,6 +87,7 @@ BREAKING CHANGES: * `azurerm_scheduler_job_collection` - This resource has been removed since it was deprecated [GH-5712] * `azurerm_storage_account` - removing the deprecated `account_type` field [GH-5710] * `azurerm_storage_account` - removing the deprecated `enable_advanced_threat_protection` field [GH-5710] +* `azurerm_storage_account` - updating the default value for `enable_https_traffic_only` from `false` to `true` [GH-5808] * `azurerm_storage_blob` - making the `type` field case-sensitive [GH-5710] * `azurerm_storage_blob` - removing the deprecated `attempts` field [GH-5710] * `azurerm_storage_blob` - removing the deprecated `resource_group_name` field [GH-5710] From 8e8f3e4bf673bb722719bad423444d8e5275de1b Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Wed, 19 Feb 2020 08:13:01 +0100 Subject: [PATCH 234/498] auth: using the correct authorizer for the service principals client fixes a bug introduced in #5748 --- azurerm/internal/services/authorization/client/client.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/authorization/client/client.go b/azurerm/internal/services/authorization/client/client.go index 756528480fa72..155708bebb0bb 100644 --- a/azurerm/internal/services/authorization/client/client.go +++ b/azurerm/internal/services/authorization/client/client.go @@ -19,8 +19,8 @@ func NewClient(o *common.ClientOptions) *Client { roleDefinitionsClient := authorization.NewRoleDefinitionsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&roleDefinitionsClient.Client, o.ResourceManagerAuthorizer) - servicePrincipalsClient := graphrbac.NewServicePrincipalsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) - o.ConfigureClient(&servicePrincipalsClient.Client, o.ResourceManagerAuthorizer) + servicePrincipalsClient := graphrbac.NewServicePrincipalsClientWithBaseURI(o.GraphEndpoint, o.TenantID) + o.ConfigureClient(&servicePrincipalsClient.Client, o.GraphAuthorizer) return &Client{ RoleAssignmentsClient: &roleAssignmentsClient, From 71b5494b32e854b553dc43b30cfa5ca9e80d855d Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Wed, 19 Feb 2020 09:57:52 +0100 Subject: [PATCH 235/498] updating to include #5772 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fbe25256c0288..ec4a4c5779a77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -105,6 +105,7 @@ IMPROVEMENTS: * Data Source: `azurerm_kubernetes_service_version` - support for filtering of preview releases [GH-5662] * `azurerm_dedicated_host` - support for setting `sku_name` to `DSv3-Type2` and `ESv3-Type2` [GH-5768] +* `azurerm_sql_database` - support for configuring `zone_redundant` [GH-5772] * `azurerm_storage_account` - support for configuring the `static_website` block [GH-5649] * `azurerm_storage_account` - support for configuring `cors_rules` within the `blob_properties` block [GH-5425] * `azurerm_subnet` - support for delta updates [GH-5801] From f518e1bad04b90f9284852d4c87baed1b5bb3bf3 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Wed, 19 Feb 2020 10:44:03 +0000 Subject: [PATCH 236/498] removed deprecated recoveryservices resources. Updated datasource and docs --- ..._vm.go => data_source_backup_policy_vm.go} | 2 +- .../services/recoveryservices/registration.go | 36 +- .../resource_arm_recovery_services_fabric.go | 164 ---- ...e_arm_recovery_services_network_mapping.go | 216 ----- ...urce_arm_recovery_services_protected_vm.go | 283 ------- ..._recovery_services_protection_container.go | 162 ---- ...y_services_protection_container_mapping.go | 203 ----- ..._recovery_services_protection_policy_vm.go | 764 ------------------ ...rce_arm_recovery_services_replicated_vm.go | 353 -------- ...rm_recovery_services_replication_policy.go | 215 ----- ...very_services_protection_policy_vm_test.go | 16 +- ...ource_arm_recovery_services_fabric_test.go | 113 --- ..._recovery_services_network_mapping_test.go | 161 ---- ...arm_recovery_services_protected_vm_test.go | 642 --------------- ...vices_protection_container_mapping_test.go | 158 ---- ...very_services_protection_container_test.go | 121 --- ...very_services_protection_policy_vm_test.go | 555 ------------- ...rm_recovery_services_replicated_vm_test.go | 269 ------ ...covery_services_replication_policy_test.go | 113 --- website/azurerm.erb | 40 +- ..._vm.markdown => backup_policy_vm.markdown} | 4 +- .../guides/2.0-upgrade-guide.html.markdown | 32 + .../r/recovery_network_mapping.html.markdown | 114 --- .../r/recovery_services_fabric.html.markdown | 76 -- .../r/recovery_services_protected_vm.markdown | 87 -- ...ervices_protection_container.html.markdown | 83 -- ...protection_container_mapping.html.markdown | 121 --- ...ery_services_protection_policy_vm.markdown | 159 ---- ...overy_services_replicated_vm.html.markdown | 232 ------ ..._services_replication_policy.html.markdown | 74 -- 30 files changed, 61 insertions(+), 5507 deletions(-) rename azurerm/internal/services/recoveryservices/{data_source_recovery_services_protection_policy_vm.go => data_source_backup_policy_vm.go} (96%) delete mode 100644 azurerm/internal/services/recoveryservices/resource_arm_recovery_services_fabric.go delete mode 100644 azurerm/internal/services/recoveryservices/resource_arm_recovery_services_network_mapping.go delete mode 100644 azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protected_vm.go delete mode 100644 azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_container.go delete mode 100644 azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_container_mapping.go delete mode 100644 azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_policy_vm.go delete mode 100644 azurerm/internal/services/recoveryservices/resource_arm_recovery_services_replicated_vm.go delete mode 100644 azurerm/internal/services/recoveryservices/resource_arm_recovery_services_replication_policy.go delete mode 100644 azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_fabric_test.go delete mode 100644 azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_network_mapping_test.go delete mode 100644 azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protected_vm_test.go delete mode 100644 azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_container_mapping_test.go delete mode 100644 azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_container_test.go delete mode 100644 azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_policy_vm_test.go delete mode 100644 azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_replicated_vm_test.go delete mode 100644 azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_replication_policy_test.go rename website/docs/d/{recovery_services_protection_policy_vm.markdown => backup_policy_vm.markdown} (89%) delete mode 100644 website/docs/r/recovery_network_mapping.html.markdown delete mode 100644 website/docs/r/recovery_services_fabric.html.markdown delete mode 100644 website/docs/r/recovery_services_protected_vm.markdown delete mode 100644 website/docs/r/recovery_services_protection_container.html.markdown delete mode 100644 website/docs/r/recovery_services_protection_container_mapping.html.markdown delete mode 100644 website/docs/r/recovery_services_protection_policy_vm.markdown delete mode 100644 website/docs/r/recovery_services_replicated_vm.html.markdown delete mode 100644 website/docs/r/recovery_services_replication_policy.html.markdown diff --git a/azurerm/internal/services/recoveryservices/data_source_recovery_services_protection_policy_vm.go b/azurerm/internal/services/recoveryservices/data_source_backup_policy_vm.go similarity index 96% rename from azurerm/internal/services/recoveryservices/data_source_recovery_services_protection_policy_vm.go rename to azurerm/internal/services/recoveryservices/data_source_backup_policy_vm.go index 401ff7fa38a9a..e427c0f329c4f 100644 --- a/azurerm/internal/services/recoveryservices/data_source_recovery_services_protection_policy_vm.go +++ b/azurerm/internal/services/recoveryservices/data_source_backup_policy_vm.go @@ -14,7 +14,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func dataSourceArmRecoveryServicesProtectionPolicyVm() *schema.Resource { +func dataSourceArmBackupPolicyVm() *schema.Resource { return &schema.Resource{ Read: dataSourceArmRecoveryServicesProtectionPolicyVmRead, diff --git a/azurerm/internal/services/recoveryservices/registration.go b/azurerm/internal/services/recoveryservices/registration.go index c2c497c382169..b9c2507e91223 100644 --- a/azurerm/internal/services/recoveryservices/registration.go +++ b/azurerm/internal/services/recoveryservices/registration.go @@ -14,33 +14,25 @@ func (r Registration) Name() 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_recovery_services_vault": dataSourceArmRecoveryServicesVault(), - "azurerm_recovery_services_protection_policy_vm": dataSourceArmRecoveryServicesProtectionPolicyVm(), + "azurerm_recovery_services_vault": dataSourceArmRecoveryServicesVault(), + "azurerm_backup_policy_vm": dataSourceArmBackupPolicyVm(), } } // SupportedResources returns the supported Resources supported by this Service func (r Registration) SupportedResources() map[string]*schema.Resource { return map[string]*schema.Resource{ - "azurerm_backup_container_storage_account": resourceArmBackupProtectionContainerStorageAccount(), - "azurerm_backup_policy_file_share": resourceArmBackupProtectionPolicyFileShare(), - "azurerm_backup_protected_file_share": resourceArmBackupProtectedFileShare(), - "azurerm_backup_protected_vm": resourceArmRecoveryServicesBackupProtectedVM(), - "azurerm_backup_policy_vm": resourceArmBackupProtectionPolicyVM(), - "azurerm_recovery_network_mapping": resourceArmRecoveryServicesNetworkMapping(), - "azurerm_recovery_replicated_vm": resourceArmRecoveryServicesReplicatedVm(), - "azurerm_recovery_services_fabric": resourceArmRecoveryServicesFabric(), - "azurerm_recovery_services_protected_vm": resourceArmRecoveryServicesProtectedVm(), - "azurerm_recovery_services_protection_container": resourceArmRecoveryServicesProtectionContainer(), - "azurerm_recovery_services_protection_container_mapping": resourceArmRecoveryServicesProtectionContainerMapping(), - "azurerm_recovery_services_protection_policy_vm": resourceArmRecoveryServicesProtectionPolicyVm(), - "azurerm_recovery_services_replication_policy": resourceArmRecoveryServicesReplicationPolicy(), - "azurerm_recovery_services_vault": resourceArmRecoveryServicesVault(), - "azurerm_site_recovery_fabric": resourceArmSiteRecoveryFabric(), - "azurerm_site_recovery_network_mapping": resourceArmSiteRecoveryNetworkMapping(), - "azurerm_site_recovery_protection_container": resourceArmSiteRecoveryProtectionContainer(), - "azurerm_site_recovery_protection_container_mapping": resourceArmSiteRecoveryProtectionContainerMapping(), - "azurerm_site_recovery_replicated_vm": resourceArmSiteRecoveryReplicatedVM(), - "azurerm_site_recovery_replication_policy": resourceArmSiteRecoveryReplicationPolicy(), + "azurerm_backup_container_storage_account": resourceArmBackupProtectionContainerStorageAccount(), + "azurerm_backup_policy_file_share": resourceArmBackupProtectionPolicyFileShare(), + "azurerm_backup_protected_file_share": resourceArmBackupProtectedFileShare(), + "azurerm_backup_protected_vm": resourceArmRecoveryServicesBackupProtectedVM(), + "azurerm_backup_policy_vm": resourceArmBackupProtectionPolicyVM(), + "azurerm_recovery_services_vault": resourceArmRecoveryServicesVault(), + "azurerm_site_recovery_fabric": resourceArmSiteRecoveryFabric(), + "azurerm_site_recovery_network_mapping": resourceArmSiteRecoveryNetworkMapping(), + "azurerm_site_recovery_protection_container": resourceArmSiteRecoveryProtectionContainer(), + "azurerm_site_recovery_protection_container_mapping": resourceArmSiteRecoveryProtectionContainerMapping(), + "azurerm_site_recovery_replicated_vm": resourceArmSiteRecoveryReplicatedVM(), + "azurerm_site_recovery_replication_policy": resourceArmSiteRecoveryReplicationPolicy(), } } diff --git a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_fabric.go b/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_fabric.go deleted file mode 100644 index bb0d6e00b0b8f..0000000000000 --- a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_fabric.go +++ /dev/null @@ -1,164 +0,0 @@ -package recoveryservices - -import ( - "fmt" - "time" - - "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2018-01-10/siterecovery" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmRecoveryServicesFabric() *schema.Resource { - return &schema.Resource{ - DeprecationMessage: "`azurerm_recovery_services_fabric` resource is deprecated in favor of `azurerm_site_recovery_fabric` and will be removed in v2.0 of the AzureRM Provider", - Create: resourceArmRecoveryServicesFabricCreate, - Read: resourceArmRecoveryServicesFabricRead, - Update: nil, - Delete: resourceArmRecoveryServicesFabricDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "resource_group_name": azure.SchemaResourceGroupName(), - - "recovery_vault_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateRecoveryServicesVaultName, - }, - "location": azure.SchemaLocation(), - }, - } -} - -func resourceArmRecoveryServicesFabricCreate(d *schema.ResourceData, meta interface{}) error { - resGroup := d.Get("resource_group_name").(string) - vaultName := d.Get("recovery_vault_name").(string) - location := azure.NormalizeLocation(d.Get("location").(string)) - name := d.Get("name").(string) - - client := meta.(*clients.Client).RecoveryServices.FabricClient(resGroup, vaultName) - ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) - defer cancel() - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, name) - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing rec overy services fabric %s (vault %s): %+v", name, vaultName, err) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_resource_group", azure.HandleAzureSdkForGoBug2824(*existing.ID)) - } - } - - parameters := siterecovery.FabricCreationInput{ - Properties: &siterecovery.FabricCreationInputProperties{ - CustomDetails: siterecovery.AzureFabricCreationInput{ - InstanceType: "Azure", - Location: &location, - }, - }, - } - - future, err := client.Create(ctx, name, parameters) - if err != nil { - return fmt.Errorf("Error creating recovery services fabric %s (vault %s): %+v", name, vaultName, err) - } - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error creating recovery services fabric %s (vault %s): %+v", name, vaultName, err) - } - - resp, err := client.Get(ctx, name) - if err != nil { - return fmt.Errorf("Error retrieving recovery services fabric %s (vault %s): %+v", name, vaultName, err) - } - - d.SetId(azure.HandleAzureSdkForGoBug2824(*resp.ID)) - - return resourceArmRecoveryServicesFabricRead(d, meta) -} - -func resourceArmRecoveryServicesFabricRead(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - name := id.Path["replicationFabrics"] - - client := meta.(*clients.Client).RecoveryServices.FabricClient(resGroup, vaultName) - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - resp, err := client.Get(ctx, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil - } - return fmt.Errorf("Error making Read request on recovery services fabric %s (vault %s): %+v", name, vaultName, err) - } - - d.Set("name", resp.Name) - d.Set("resource_group_name", resGroup) - if props := resp.Properties; props != nil { - if azureDetails, isAzureDetails := props.CustomDetails.AsAzureFabricSpecificDetails(); isAzureDetails { - d.Set("location", azureDetails.Location) - } - } - d.Set("recovery_vault_name", vaultName) - return nil -} - -func resourceArmRecoveryServicesFabricDelete(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - name := id.Path["replicationFabrics"] - - client := meta.(*clients.Client).RecoveryServices.FabricClient(resGroup, vaultName) - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - future, err := client.Delete(ctx, name) - if err != nil { - return fmt.Errorf("Error deleting recovery services fabric %s (vault %s): %+v", name, vaultName, err) - } - - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for deletion of recovery services fabric %s (vault %s): %+v", name, vaultName, err) - } - - return nil -} diff --git a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_network_mapping.go b/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_network_mapping.go deleted file mode 100644 index fc6a4d24a3ba8..0000000000000 --- a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_network_mapping.go +++ /dev/null @@ -1,216 +0,0 @@ -package recoveryservices - -import ( - "fmt" - "time" - - "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2018-01-10/siterecovery" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmRecoveryServicesNetworkMapping() *schema.Resource { - return &schema.Resource{ - DeprecationMessage: "`azurerm_recovery_network_mapping` resource is deprecated in favor of `azurerm_site_recovery_network_mapping` and will be removed in v2.0 of the AzureRM Provider", - Create: resourceArmRecoveryNetworkMappingCreate, - Read: resourceArmRecoveryNetworkMappingRead, - Delete: resourceArmRecoveryNetworkMappingDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "resource_group_name": azure.SchemaResourceGroupName(), - - "recovery_vault_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateRecoveryServicesVaultName, - }, - "source_recovery_fabric_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "target_recovery_fabric_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "source_network_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - "target_network_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - }, - } -} - -func resourceArmRecoveryNetworkMappingCreate(d *schema.ResourceData, meta interface{}) error { - resGroup := d.Get("resource_group_name").(string) - vaultName := d.Get("recovery_vault_name").(string) - fabricName := d.Get("source_recovery_fabric_name").(string) - targetFabricName := d.Get("target_recovery_fabric_name").(string) - sourceNetworkId := d.Get("source_network_id").(string) - targetNetworkId := d.Get("target_network_id").(string) - name := d.Get("name").(string) - - client := meta.(*clients.Client).RecoveryServices.NetworkMappingClient(resGroup, vaultName) - ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) - defer cancel() - - //get network name from id - parsedSourceNetworkId, err := azure.ParseAzureResourceID(sourceNetworkId) - if err != nil { - return fmt.Errorf("[ERROR] Unable to parse source_network_id '%s' (network mapping %s): %+v", sourceNetworkId, name, err) - } - sourceNetworkName, hasName := parsedSourceNetworkId.Path["virtualNetworks"] - if !hasName { - sourceNetworkName, hasName = parsedSourceNetworkId.Path["virtualnetworks"] // Handle that different APIs return different ID casings - if !hasName { - return fmt.Errorf("[ERROR] parsed source_network_id '%s' doesn't contain 'virtualnetworks'", parsedSourceNetworkId) - } - } - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, fabricName, sourceNetworkName, name) - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing recovery services fabric %s (vault %s): %+v", name, vaultName, err) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_recovery_network_mapping", azure.HandleAzureSdkForGoBug2824(*existing.ID)) - } - } - - var parameters = siterecovery.CreateNetworkMappingInput{ - Properties: &siterecovery.CreateNetworkMappingInputProperties{ - RecoveryNetworkID: &targetNetworkId, - RecoveryFabricName: &targetFabricName, - FabricSpecificDetails: siterecovery.AzureToAzureCreateNetworkMappingInput{ - PrimaryNetworkID: &sourceNetworkId, - }, - }, - } - future, err := client.Create(ctx, fabricName, sourceNetworkName, name, parameters) - if err != nil { - return fmt.Errorf("Error creating recovery network mapping %s (vault %s): %+v", name, vaultName, err) - } - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error creating recovery network mapping %s (vault %s): %+v", name, vaultName, err) - } - - resp, err := client.Get(ctx, fabricName, sourceNetworkName, name) - if err != nil { - return fmt.Errorf("Error retrieving recovery network mapping %s (vault %s): %+v", name, vaultName, err) - } - - d.SetId(azure.HandleAzureSdkForGoBug2824(*resp.ID)) - - return resourceArmRecoveryNetworkMappingRead(d, meta) -} - -func resourceArmRecoveryNetworkMappingRead(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - fabricName := id.Path["replicationFabrics"] - networkName := id.Path["replicationNetworks"] - name := id.Path["replicationNetworkMappings"] - - client := meta.(*clients.Client).RecoveryServices.NetworkMappingClient(resGroup, vaultName) - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - resp, err := client.Get(ctx, fabricName, networkName, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil - } - return fmt.Errorf("Error making Read request on recovery services protection container mapping %s (vault %s): %+v", name, vaultName, err) - } - - d.Set("resource_group_name", resGroup) - d.Set("recovery_vault_name", vaultName) - d.Set("source_recovery_fabric_name", fabricName) - d.Set("name", resp.Name) - if props := resp.Properties; props != nil { - d.Set("source_network_id", props.PrimaryNetworkID) - d.Set("target_network_id", props.RecoveryNetworkID) - - targetFabricId, err := azure.ParseAzureResourceID(azure.HandleAzureSdkForGoBug2824(*resp.Properties.RecoveryFabricArmID)) - if err != nil { - return err - } - d.Set("target_recovery_fabric_name", targetFabricId.Path["replicationFabrics"]) - } - - return nil -} - -func resourceArmRecoveryNetworkMappingDelete(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - fabricName := id.Path["replicationFabrics"] - networkName := id.Path["replicationNetworks"] - name := id.Path["replicationNetworkMappings"] - - client := meta.(*clients.Client).RecoveryServices.NetworkMappingClient(resGroup, vaultName) - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - future, err := client.Delete(ctx, fabricName, networkName, name) - if err != nil { - return fmt.Errorf("Error deleting recovery services protection container mapping %s (vault %s): %+v", name, vaultName, err) - } - - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for deletion of recovery services protection container mapping %s (vault %s): %+v", name, vaultName, err) - } - - return nil -} diff --git a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protected_vm.go b/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protected_vm.go deleted file mode 100644 index 68181b97366c5..0000000000000 --- a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protected_vm.go +++ /dev/null @@ -1,283 +0,0 @@ -package recoveryservices - -import ( - "context" - "fmt" - "log" - "strings" - "time" - - "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2019-05-13/backup" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmRecoveryServicesProtectedVm() *schema.Resource { - return &schema.Resource{ - DeprecationMessage: "`azurerm_recovery_services_protected_vm` resource is deprecated in favor of `azurerm_backup_protected_vm` and will be removed in v2.0 of the AzureRM Provider", - Create: resourceArmRecoveryServicesProtectedVmCreateUpdate, - Read: resourceArmRecoveryServicesProtectedVmRead, - Update: resourceArmRecoveryServicesProtectedVmCreateUpdate, - Delete: resourceArmRecoveryServicesProtectedVmDelete, - - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(80 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(80 * time.Minute), - Delete: schema.DefaultTimeout(80 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - - "resource_group_name": azure.SchemaResourceGroupName(), - - "recovery_vault_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateRecoveryServicesVaultName, - }, - - "source_vm_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - }, - - "backup_policy_id": { - Type: schema.TypeString, - Required: true, - ValidateFunc: azure.ValidateResourceID, - }, - - "tags": tags.Schema(), - }, - } -} - -func resourceArmRecoveryServicesProtectedVmCreateUpdate(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).RecoveryServices.ProtectedItemsClient - ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) - defer cancel() - - resourceGroup := d.Get("resource_group_name").(string) - t := d.Get("tags").(map[string]interface{}) - - vaultName := d.Get("recovery_vault_name").(string) - vmId := d.Get("source_vm_id").(string) - policyId := d.Get("backup_policy_id").(string) - - //get VM name from id - parsedVmId, err := azure.ParseAzureResourceID(vmId) - if err != nil { - return fmt.Errorf("[ERROR] Unable to parse source_vm_id '%s': %+v", vmId, err) - } - vmName, hasName := parsedVmId.Path["virtualMachines"] - if !hasName { - return fmt.Errorf("[ERROR] parsed source_vm_id '%s' doesn't contain 'virtualMachines'", vmId) - } - - protectedItemName := fmt.Sprintf("VM;iaasvmcontainerv2;%s;%s", parsedVmId.ResourceGroup, vmName) - containerName := fmt.Sprintf("iaasvmcontainer;iaasvmcontainerv2;%s;%s", parsedVmId.ResourceGroup, vmName) - - log.Printf("[DEBUG] Creating/updating Recovery Service Protected VM %s (resource group %q)", protectedItemName, resourceGroup) - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err2 := client.Get(ctx, vaultName, resourceGroup, "Azure", containerName, protectedItemName, "") - if err2 != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing Recovery Service Protected VM %q (Resource Group %q): %+v", protectedItemName, resourceGroup, err2) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_recovery_services_protected_vm", *existing.ID) - } - } - - item := backup.ProtectedItemResource{ - Tags: tags.Expand(t), - Properties: &backup.AzureIaaSComputeVMProtectedItem{ - PolicyID: &policyId, - ProtectedItemType: backup.ProtectedItemTypeMicrosoftClassicComputevirtualMachines, - WorkloadType: backup.DataSourceTypeVM, - SourceResourceID: utils.String(vmId), - FriendlyName: utils.String(vmName), - VirtualMachineID: utils.String(vmId), - }, - } - - if _, err = client.CreateOrUpdate(ctx, vaultName, resourceGroup, "Azure", containerName, protectedItemName, item); err != nil { - return fmt.Errorf("Error creating/updating Recovery Service Protected VM %q (Resource Group %q): %+v", protectedItemName, resourceGroup, err) - } - - resp, err := resourceArmRecoveryServicesProtectedVmWaitForStateCreateUpdate(ctx, client, vaultName, resourceGroup, containerName, protectedItemName, policyId, d) - if err != nil { - return err - } - - id := strings.Replace(*resp.ID, "Subscriptions", "subscriptions", 1) // This code is a workaround for this bug https://github.com/Azure/azure-sdk-for-go/issues/2824 - d.SetId(id) - - return resourceArmRecoveryServicesProtectedVmRead(d, meta) -} - -func resourceArmRecoveryServicesProtectedVmRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).RecoveryServices.ProtectedItemsClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - protectedItemName := id.Path["protectedItems"] - vaultName := id.Path["vaults"] - resourceGroup := id.ResourceGroup - containerName := id.Path["protectionContainers"] - - log.Printf("[DEBUG] Reading Recovery Service Protected VM %q (resource group %q)", protectedItemName, resourceGroup) - - resp, err := client.Get(ctx, vaultName, resourceGroup, "Azure", containerName, protectedItemName, "") - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil - } - - return fmt.Errorf("Error making Read request on Recovery Service Protected VM %q (Resource Group %q): %+v", protectedItemName, resourceGroup, err) - } - - d.Set("resource_group_name", resourceGroup) - d.Set("recovery_vault_name", vaultName) - - if properties := resp.Properties; properties != nil { - if vm, ok := properties.AsAzureIaaSComputeVMProtectedItem(); ok { - d.Set("source_vm_id", vm.SourceResourceID) - - if v := vm.PolicyID; v != nil { - d.Set("backup_policy_id", strings.Replace(*v, "Subscriptions", "subscriptions", 1)) - } - } - } - - return tags.FlattenAndSet(d, resp.Tags) -} - -func resourceArmRecoveryServicesProtectedVmDelete(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).RecoveryServices.ProtectedItemsClient - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - protectedItemName := id.Path["protectedItems"] - resourceGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - containerName := id.Path["protectionContainers"] - - log.Printf("[DEBUG] Deleting Recovery Service Protected Item %q (resource group %q)", protectedItemName, resourceGroup) - - resp, err := client.Delete(ctx, vaultName, resourceGroup, "Azure", containerName, protectedItemName) - if err != nil { - if !utils.ResponseWasNotFound(resp) { - return fmt.Errorf("Error issuing delete request for Recovery Service Protected VM %q (Resource Group %q): %+v", protectedItemName, resourceGroup, err) - } - } - - if _, err := resourceArmRecoveryServicesProtectedVmWaitForDeletion(ctx, client, vaultName, resourceGroup, containerName, protectedItemName, "", d); err != nil { - return err - } - - return nil -} - -func resourceArmRecoveryServicesProtectedVmWaitForStateCreateUpdate(ctx context.Context, client *backup.ProtectedItemsClient, vaultName, resourceGroup, containerName, protectedItemName string, policyId string, d *schema.ResourceData) (backup.ProtectedItemResource, error) { - state := &resource.StateChangeConf{ - MinTimeout: 30 * time.Second, - Delay: 10 * time.Second, - Pending: []string{"NotFound"}, - Target: []string{"Found"}, - Refresh: resourceArmRecoveryServicesProtectedVmRefreshFunc(ctx, client, vaultName, resourceGroup, containerName, protectedItemName, policyId, true), - } - - if d.IsNewResource() { - state.Timeout = d.Timeout(schema.TimeoutCreate) - } else { - state.Timeout = d.Timeout(schema.TimeoutUpdate) - } - - resp, err := state.WaitForState() - if err != nil { - i, _ := resp.(backup.ProtectedItemResource) - return i, fmt.Errorf("Error waiting for the Recovery Service Protected VM %q to be true (Resource Group %q) to provision: %+v", protectedItemName, resourceGroup, err) - } - - return resp.(backup.ProtectedItemResource), nil -} - -func resourceArmRecoveryServicesProtectedVmWaitForDeletion(ctx context.Context, client *backup.ProtectedItemsClient, vaultName, resourceGroup, containerName, protectedItemName string, policyId string, d *schema.ResourceData) (backup.ProtectedItemResource, error) { - state := &resource.StateChangeConf{ - MinTimeout: 30 * time.Second, - Delay: 10 * time.Second, - Pending: []string{"Found"}, - Target: []string{"NotFound"}, - Refresh: resourceArmRecoveryServicesProtectedVmRefreshFunc(ctx, client, vaultName, resourceGroup, containerName, protectedItemName, policyId, false), - Timeout: d.Timeout(schema.TimeoutDelete), - } - - resp, err := state.WaitForState() - if err != nil { - i, _ := resp.(backup.ProtectedItemResource) - return i, fmt.Errorf("Error waiting for the Recovery Service Protected VM %q to be false (Resource Group %q) to provision: %+v", protectedItemName, resourceGroup, err) - } - - return resp.(backup.ProtectedItemResource), nil -} - -func resourceArmRecoveryServicesProtectedVmRefreshFunc(ctx context.Context, client *backup.ProtectedItemsClient, vaultName, resourceGroup, containerName, protectedItemName string, policyId string, newResource bool) resource.StateRefreshFunc { - // TODO: split this into two functions - return func() (interface{}, string, error) { - resp, err := client.Get(ctx, vaultName, resourceGroup, "Azure", containerName, protectedItemName, "") - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - return resp, "NotFound", nil - } - - return resp, "Error", fmt.Errorf("Error making Read request on Recovery Service Protected VM %q (Resource Group %q): %+v", protectedItemName, resourceGroup, err) - } else if !newResource && policyId != "" { - if properties := resp.Properties; properties != nil { - if vm, ok := properties.AsAzureIaaSComputeVMProtectedItem(); ok { - if v := vm.PolicyID; v != nil { - if strings.Replace(*v, "Subscriptions", "subscriptions", 1) != policyId { - return resp, "NotFound", nil - } - } else { - return resp, "Error", fmt.Errorf("Error reading policy ID attribute nil on Recovery Service Protected VM %q (Resource Group %q)", protectedItemName, resourceGroup) - } - } else { - return resp, "Error", fmt.Errorf("Error reading properties on Recovery Service Protected VM %q (Resource Group %q)", protectedItemName, resourceGroup) - } - } else { - return resp, "Error", fmt.Errorf("Error reading properties on empty Recovery Service Protected VM %q (Resource Group %q)", protectedItemName, resourceGroup) - } - } - return resp, "Found", nil - } -} diff --git a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_container.go b/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_container.go deleted file mode 100644 index f31bbd4c16266..0000000000000 --- a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_container.go +++ /dev/null @@ -1,162 +0,0 @@ -package recoveryservices - -import ( - "fmt" - "time" - - "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2018-01-10/siterecovery" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmRecoveryServicesProtectionContainer() *schema.Resource { - return &schema.Resource{ - DeprecationMessage: "`azurerm_recovery_services_protection_container` resource is deprecated in favor of `azurerm_site_recovery_protection_container` and will be removed in v2.0 of the AzureRM Provider", - Create: resourceArmRecoveryServicesProtectionContainerCreate, - Read: resourceArmRecoveryServicesProtectionContainerRead, - Update: nil, - Delete: resourceArmRecoveryServicesProtectionContainerDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "resource_group_name": azure.SchemaResourceGroupName(), - - "recovery_vault_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateRecoveryServicesVaultName, - }, - "recovery_fabric_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - }, - } -} - -func resourceArmRecoveryServicesProtectionContainerCreate(d *schema.ResourceData, meta interface{}) error { - resGroup := d.Get("resource_group_name").(string) - vaultName := d.Get("recovery_vault_name").(string) - fabricName := d.Get("recovery_fabric_name").(string) - name := d.Get("name").(string) - - client := meta.(*clients.Client).RecoveryServices.ProtectionContainerClient(resGroup, vaultName) - ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) - defer cancel() - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, fabricName, name) - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing recovery services protection container %s (fabric %s): %+v", name, fabricName, err) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_recovery_services_protection_container", azure.HandleAzureSdkForGoBug2824(*existing.ID)) - } - } - - parameters := siterecovery.CreateProtectionContainerInput{ - Properties: &siterecovery.CreateProtectionContainerInputProperties{}, - } - - future, err := client.Create(ctx, fabricName, name, parameters) - if err != nil { - return fmt.Errorf("Error creating recovery services protection container %s (fabric %s): %+v", name, fabricName, err) - } - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error creating recovery services protection container %s (fabric %s): %+v", name, fabricName, err) - } - - resp, err := client.Get(ctx, fabricName, name) - if err != nil { - return fmt.Errorf("Error retrieving site recovery protection container %s (fabric %s): %+v", name, fabricName, err) - } - - d.SetId(azure.HandleAzureSdkForGoBug2824(*resp.ID)) - - return resourceArmRecoveryServicesProtectionContainerRead(d, meta) -} - -func resourceArmRecoveryServicesProtectionContainerRead(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - fabricName := id.Path["replicationFabrics"] - name := id.Path["replicationProtectionContainers"] - - client := meta.(*clients.Client).RecoveryServices.ProtectionContainerClient(resGroup, vaultName) - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - resp, err := client.Get(ctx, fabricName, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil - } - return fmt.Errorf("Error making Read request on recovery services protection container %s (fabric %s): %+v", name, fabricName, err) - } - - d.Set("name", resp.Name) - d.Set("resource_group_name", resGroup) - d.Set("recovery_vault_name", vaultName) - d.Set("recovery_fabric_name", fabricName) - return nil -} - -func resourceArmRecoveryServicesProtectionContainerDelete(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - fabricName := id.Path["replicationFabrics"] - name := id.Path["replicationProtectionContainers"] - - client := meta.(*clients.Client).RecoveryServices.ProtectionContainerClient(resGroup, vaultName) - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - future, err := client.Delete(ctx, fabricName, name) - if err != nil { - return fmt.Errorf("Error deleting recovery services protection container %s (fabric %s): %+v", name, fabricName, err) - } - - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for deletion of recovery services protection container %s (fabric %s): %+v", name, fabricName, err) - } - - return nil -} diff --git a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_container_mapping.go b/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_container_mapping.go deleted file mode 100644 index cbeea35521bf9..0000000000000 --- a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_container_mapping.go +++ /dev/null @@ -1,203 +0,0 @@ -package recoveryservices - -import ( - "fmt" - "time" - - "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2018-01-10/siterecovery" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmRecoveryServicesProtectionContainerMapping() *schema.Resource { - return &schema.Resource{ - DeprecationMessage: "`azurerm_recovery_services_protection_container_mapping` resource is deprecated in favor of `azurerm_site_recovery_protection_container_mapping` and will be removed in v2.0 of the AzureRM Provider", - Create: resourceArmRecoveryServicesContainerMappingCreate, - Read: resourceArmRecoveryServicesContainerMappingRead, - Update: nil, - Delete: resourceArmRecoveryServicesContainerMappingDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "resource_group_name": azure.SchemaResourceGroupName(), - - "recovery_vault_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateRecoveryServicesVaultName, - }, - "recovery_fabric_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "recovery_replication_policy_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - "recovery_source_protection_container_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "recovery_target_protection_container_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - }, - } -} - -func resourceArmRecoveryServicesContainerMappingCreate(d *schema.ResourceData, meta interface{}) error { - resGroup := d.Get("resource_group_name").(string) - vaultName := d.Get("recovery_vault_name").(string) - fabricName := d.Get("recovery_fabric_name").(string) - policyId := d.Get("recovery_replication_policy_id").(string) - protectionContainerName := d.Get("recovery_source_protection_container_name").(string) - targetContainerId := d.Get("recovery_target_protection_container_id").(string) - name := d.Get("name").(string) - - client := meta.(*clients.Client).RecoveryServices.ContainerMappingClient(resGroup, vaultName) - ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) - defer cancel() - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, fabricName, protectionContainerName, name) - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing recovery services protection container mapping %s (fabric %s, container %s): %+v", name, fabricName, protectionContainerName, err) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_recovery_services_protection_container_mapping", azure.HandleAzureSdkForGoBug2824(*existing.ID)) - } - } - - var parameters = siterecovery.CreateProtectionContainerMappingInput{ - Properties: &siterecovery.CreateProtectionContainerMappingInputProperties{ - TargetProtectionContainerID: &targetContainerId, - PolicyID: &policyId, - ProviderSpecificInput: siterecovery.ReplicationProviderSpecificContainerMappingInput{}, - }, - } - future, err := client.Create(ctx, fabricName, protectionContainerName, name, parameters) - if err != nil { - return fmt.Errorf("Error creating recovery services protection container mapping %s (vault %s): %+v", name, vaultName, err) - } - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error creating recovery services protection container mapping %s (vault %s): %+v", name, vaultName, err) - } - - resp, err := client.Get(ctx, fabricName, protectionContainerName, name) - if err != nil { - return fmt.Errorf("Error retrieving site recovery protection container mapping %s (vault %s): %+v", name, vaultName, err) - } - - d.SetId(azure.HandleAzureSdkForGoBug2824(*resp.ID)) - - return resourceArmRecoveryServicesContainerMappingRead(d, meta) -} - -func resourceArmRecoveryServicesContainerMappingRead(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - fabricName := id.Path["replicationFabrics"] - protectionContainerName := id.Path["replicationProtectionContainers"] - name := id.Path["replicationProtectionContainerMappings"] - - client := meta.(*clients.Client).RecoveryServices.ContainerMappingClient(resGroup, vaultName) - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - resp, err := client.Get(ctx, fabricName, protectionContainerName, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil - } - return fmt.Errorf("Error making Read request on recovery services protection container mapping %s (vault %s): %+v", name, vaultName, err) - } - - d.Set("resource_group_name", resGroup) - d.Set("recovery_vault_name", vaultName) - d.Set("recovery_fabric_name", fabricName) - d.Set("recovery_source_protection_container_name", resp.Properties.SourceProtectionContainerFriendlyName) - d.Set("name", resp.Name) - d.Set("recovery_replication_policy_id", resp.Properties.PolicyID) - d.Set("recovery_target_protection_container_id", resp.Properties.TargetProtectionContainerID) - return nil -} - -func resourceArmRecoveryServicesContainerMappingDelete(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - fabricName := id.Path["replicationFabrics"] - protectionContainerName := id.Path["replicationProtectionContainers"] - name := id.Path["replicationProtectionContainerMappings"] - instanceType := string(siterecovery.InstanceTypeBasicReplicationProviderSpecificContainerMappingInputInstanceTypeA2A) - - client := meta.(*clients.Client).RecoveryServices.ContainerMappingClient(resGroup, vaultName) - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - input := siterecovery.RemoveProtectionContainerMappingInput{ - Properties: &siterecovery.RemoveProtectionContainerMappingInputProperties{ - ProviderSpecificInput: &siterecovery.ReplicationProviderContainerUnmappingInput{ - InstanceType: &instanceType, - }, - }, - } - - future, err := client.Delete(ctx, fabricName, protectionContainerName, name, input) - if err != nil { - return fmt.Errorf("Error deleting recovery services protection container mapping %s (vault %s): %+v", name, vaultName, err) - } - - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for deletion of recovery services protection container mapping %s (vault %s): %+v", name, vaultName, err) - } - - return nil -} diff --git a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_policy_vm.go b/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_policy_vm.go deleted file mode 100644 index 9239c1d793493..0000000000000 --- a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_policy_vm.go +++ /dev/null @@ -1,764 +0,0 @@ -package recoveryservices - -import ( - "context" - "fmt" - "log" - "regexp" - "strings" - "time" - - "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2019-05-13/backup" - "github.com/Azure/go-autorest/autorest/date" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/set" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmRecoveryServicesProtectionPolicyVm() *schema.Resource { - return &schema.Resource{ - DeprecationMessage: "`azurerm_recovery_services_protection_policy_vm` resource is deprecated in favor of `azurerm_backup_policy_vm` and will be removed in v2.0 of the AzureRM Provider", - Create: resourceArmRecoveryServicesProtectionPolicyVmCreateUpdate, - Read: resourceArmRecoveryServicesProtectionPolicyVmRead, - Update: resourceArmRecoveryServicesProtectionPolicyVmCreateUpdate, - Delete: resourceArmRecoveryServicesProtectionPolicyVmDelete, - - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringMatch( - regexp.MustCompile("^[a-zA-Z][-_!a-zA-Z0-9]{2,149}$"), - "Backup Policy name must be 3 - 150 characters long, start with a letter, contain only letters and numbers.", - ), - }, - - "resource_group_name": azure.SchemaResourceGroupName(), - - "recovery_vault_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateRecoveryServicesVaultName, - }, - - "timezone": { - Type: schema.TypeString, - Optional: true, - Default: "UTC", - }, - - "backup": { - Type: schema.TypeList, - MaxItems: 1, - Required: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - - "frequency": { - Type: schema.TypeString, - Required: true, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validation.StringInSlice([]string{ - string(backup.ScheduleRunTypeDaily), - string(backup.ScheduleRunTypeWeekly), - }, true), - }, - - "time": { //applies to all backup schedules & retention times (they all must be the same) - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringMatch( - regexp.MustCompile("^([01][0-9]|[2][0-3]):([03][0])$"), //time must be on the hour or half past - "Time of day must match the format HH:mm where HH is 00-23 and mm is 00 or 30", - ), - }, - - "weekdays": { //only for weekly - Type: schema.TypeSet, - Optional: true, - Set: set.HashStringIgnoreCase, - Elem: &schema.Schema{ - Type: schema.TypeString, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validate.DayOfTheWeek(true), - }, - }, - }, - }, - }, - - "retention_daily": { - Type: schema.TypeList, - MaxItems: 1, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "count": { - Type: schema.TypeInt, - Required: true, - ValidateFunc: validation.IntBetween(1, 9999), - }, - }, - }, - }, - - "retention_weekly": { - Type: schema.TypeList, - MaxItems: 1, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "count": { - Type: schema.TypeInt, - Required: true, - ValidateFunc: validation.IntBetween(1, 9999), - }, - - "weekdays": { - Type: schema.TypeSet, - Required: true, - Set: set.HashStringIgnoreCase, - Elem: &schema.Schema{ - Type: schema.TypeString, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validate.DayOfTheWeek(true), - }, - }, - }, - }, - }, - - "retention_monthly": { - Type: schema.TypeList, - MaxItems: 1, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "count": { - Type: schema.TypeInt, - Required: true, - ValidateFunc: validation.IntBetween(1, 9999), - }, - - "weeks": { - Type: schema.TypeSet, - Required: true, - Set: set.HashStringIgnoreCase, - Elem: &schema.Schema{ - Type: schema.TypeString, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validation.StringInSlice([]string{ - string(backup.WeekOfMonthFirst), - string(backup.WeekOfMonthSecond), - string(backup.WeekOfMonthThird), - string(backup.WeekOfMonthFourth), - string(backup.WeekOfMonthLast), - }, true), - }, - }, - - "weekdays": { - Type: schema.TypeSet, - Required: true, - Set: set.HashStringIgnoreCase, - Elem: &schema.Schema{ - Type: schema.TypeString, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validate.DayOfTheWeek(true), - }, - }, - }, - }, - }, - - "retention_yearly": { - Type: schema.TypeList, - MaxItems: 1, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "count": { - Type: schema.TypeInt, - Required: true, - ValidateFunc: validation.IntBetween(1, 9999), - }, - - "months": { - Type: schema.TypeSet, - Required: true, - Set: set.HashStringIgnoreCase, - Elem: &schema.Schema{ - Type: schema.TypeString, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validate.Month(true), - }, - }, - - "weeks": { - Type: schema.TypeSet, - Required: true, - Set: set.HashStringIgnoreCase, - Elem: &schema.Schema{ - Type: schema.TypeString, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validation.StringInSlice([]string{ - string(backup.WeekOfMonthFirst), - string(backup.WeekOfMonthSecond), - string(backup.WeekOfMonthThird), - string(backup.WeekOfMonthFourth), - string(backup.WeekOfMonthLast), - }, true), - }, - }, - - "weekdays": { - Type: schema.TypeSet, - Required: true, - Set: set.HashStringIgnoreCase, - Elem: &schema.Schema{ - Type: schema.TypeString, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validate.DayOfTheWeek(true), - }, - }, - }, - }, - }, - - "tags": tags.Schema(), - }, - - //if daily, we need daily retention - //if weekly daily cannot be set, and we need weekly - CustomizeDiff: func(diff *schema.ResourceDiff, v interface{}) error { - _, hasDaily := diff.GetOk("retention_daily") - _, hasWeekly := diff.GetOk("retention_weekly") - - frequencyI, _ := diff.GetOk("backup.0.frequency") - frequency := strings.ToLower(frequencyI.(string)) - if frequency == "daily" { - if !hasDaily { - return fmt.Errorf("`retention_daily` must be set when backup.0.frequency is daily") - } - - if _, ok := diff.GetOk("backup.0.weekdays"); ok { - return fmt.Errorf("`backup.0.weekdays` should be not set when backup.0.frequency is daily") - } - } else if frequency == "weekly" { - if hasDaily { - return fmt.Errorf("`retention_daily` must be not set when backup.0.frequency is weekly") - } - if !hasWeekly { - return fmt.Errorf("`retention_weekly` must be set when backup.0.frequency is weekly") - } - } else { - return fmt.Errorf("Unrecognized value for backup.0.frequency") - } - - return nil - }, - } -} - -func resourceArmRecoveryServicesProtectionPolicyVmCreateUpdate(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).RecoveryServices.ProtectionPoliciesClient - ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) - defer cancel() - - policyName := d.Get("name").(string) - resourceGroup := d.Get("resource_group_name").(string) - vaultName := d.Get("recovery_vault_name").(string) - t := d.Get("tags").(map[string]interface{}) - - log.Printf("[DEBUG] Creating/updating Recovery Service Protection Policy %s (resource group %q)", policyName, resourceGroup) - - //getting this ready now because its shared between *everything*, time is... complicated for this resource - timeOfDay := d.Get("backup.0.time").(string) - dateOfDay, err := time.Parse(time.RFC3339, fmt.Sprintf("2018-07-30T%s:00Z", timeOfDay)) - if err != nil { - return fmt.Errorf("Error generating time from %q for policy %q (Resource Group %q): %+v", timeOfDay, policyName, resourceGroup, err) - } - times := append(make([]date.Time, 0), date.Time{Time: dateOfDay}) - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err2 := client.Get(ctx, vaultName, resourceGroup, policyName) - if err2 != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing Recovery Service Protection Policy %q (Resource Group %q): %+v", policyName, resourceGroup, err2) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_recovery_services_protection_policy_vm", *existing.ID) - } - } - - policy := backup.ProtectionPolicyResource{ - Tags: tags.Expand(t), - Properties: &backup.AzureIaaSVMProtectionPolicy{ - TimeZone: utils.String(d.Get("timezone").(string)), - BackupManagementType: backup.BackupManagementTypeAzureIaasVM, - SchedulePolicy: expandArmRecoveryServicesProtectionPolicySchedule(d, times), - RetentionPolicy: &backup.LongTermRetentionPolicy{ //SimpleRetentionPolicy only has duration property ¯\_(ツ)_/¯ - RetentionPolicyType: backup.RetentionPolicyTypeLongTermRetentionPolicy, - DailySchedule: expandArmRecoveryServicesProtectionPolicyRetentionDaily(d, times), - WeeklySchedule: expandArmRecoveryServicesProtectionPolicyRetentionWeekly(d, times), - MonthlySchedule: expandArmRecoveryServicesProtectionPolicyRetentionMonthly(d, times), - YearlySchedule: expandArmRecoveryServicesProtectionPolicyRetentionYearly(d, times), - }, - }, - } - if _, err = client.CreateOrUpdate(ctx, vaultName, resourceGroup, policyName, policy); err != nil { - return fmt.Errorf("Error creating/updating Recovery Service Protection Policy %q (Resource Group %q): %+v", policyName, resourceGroup, err) - } - - resp, err := resourceArmRecoveryServicesProtectionPolicyWaitForUpdate(ctx, client, vaultName, resourceGroup, policyName, d) - if err != nil { - return err - } - - id := strings.Replace(*resp.ID, "Subscriptions", "subscriptions", 1) - d.SetId(id) - - return resourceArmRecoveryServicesProtectionPolicyVmRead(d, meta) -} - -func resourceArmRecoveryServicesProtectionPolicyVmRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).RecoveryServices.ProtectionPoliciesClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - policyName := id.Path["backupPolicies"] - vaultName := id.Path["vaults"] - resourceGroup := id.ResourceGroup - - log.Printf("[DEBUG] Reading Recovery Service Protection Policy %q (resource group %q)", policyName, resourceGroup) - - resp, err := client.Get(ctx, vaultName, resourceGroup, policyName) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil - } - - return fmt.Errorf("Error making Read request on Recovery Service Protection Policy %q (Resource Group %q): %+v", policyName, resourceGroup, err) - } - - d.Set("name", policyName) - d.Set("resource_group_name", resourceGroup) - d.Set("recovery_vault_name", vaultName) - - if properties, ok := resp.Properties.AsAzureIaaSVMProtectionPolicy(); ok && properties != nil { - d.Set("timezone", properties.TimeZone) - - if schedule, ok := properties.SchedulePolicy.AsSimpleSchedulePolicy(); ok && schedule != nil { - if err := d.Set("backup", flattenArmRecoveryServicesProtectionPolicySchedule(schedule)); err != nil { - return fmt.Errorf("Error setting `backup`: %+v", err) - } - } - - if retention, ok := properties.RetentionPolicy.AsLongTermRetentionPolicy(); ok && retention != nil { - if s := retention.DailySchedule; s != nil { - if err := d.Set("retention_daily", flattenArmRecoveryServicesProtectionPolicyRetentionDaily(s)); err != nil { - return fmt.Errorf("Error setting `retention_daily`: %+v", err) - } - } else { - d.Set("retention_daily", nil) - } - - if s := retention.WeeklySchedule; s != nil { - if err := d.Set("retention_weekly", flattenArmRecoveryServicesProtectionPolicyRetentionWeekly(s)); err != nil { - return fmt.Errorf("Error setting `retention_weekly`: %+v", err) - } - } else { - d.Set("retention_weekly", nil) - } - - if s := retention.MonthlySchedule; s != nil { - if err := d.Set("retention_monthly", flattenArmRecoveryServicesProtectionPolicyRetentionMonthly(s)); err != nil { - return fmt.Errorf("Error setting `retention_monthly`: %+v", err) - } - } else { - d.Set("retention_monthly", nil) - } - - if s := retention.YearlySchedule; s != nil { - if err := d.Set("retention_yearly", flattenArmRecoveryServicesProtectionPolicyRetentionYearly(s)); err != nil { - return fmt.Errorf("Error setting `retention_yearly`: %+v", err) - } - } else { - d.Set("retention_yearly", nil) - } - } - } - - return tags.FlattenAndSet(d, resp.Tags) -} - -func resourceArmRecoveryServicesProtectionPolicyVmDelete(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).RecoveryServices.ProtectionPoliciesClient - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - policyName := id.Path["backupPolicies"] - resourceGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - - log.Printf("[DEBUG] Deleting Recovery Service Protected Item %q (resource group %q)", policyName, resourceGroup) - - resp, err := client.Delete(ctx, vaultName, resourceGroup, policyName) - if err != nil { - if !utils.ResponseWasNotFound(resp) { - return fmt.Errorf("Error issuing delete request for Recovery Service Protection Policy %q (Resource Group %q): %+v", policyName, resourceGroup, err) - } - } - - if _, err := resourceArmRecoveryServicesProtectionPolicyWaitForDeletion(ctx, client, vaultName, resourceGroup, policyName, d); err != nil { - return err - } - - return nil -} - -func expandArmRecoveryServicesProtectionPolicySchedule(d *schema.ResourceData, times []date.Time) *backup.SimpleSchedulePolicy { - if bb, ok := d.Get("backup").([]interface{}); ok && len(bb) > 0 { - block := bb[0].(map[string]interface{}) - - schedule := backup.SimpleSchedulePolicy{ //LongTermSchedulePolicy has no properties - SchedulePolicyType: backup.SchedulePolicyTypeSimpleSchedulePolicy, - ScheduleRunTimes: ×, - } - - if v, ok := block["frequency"].(string); ok { - schedule.ScheduleRunFrequency = backup.ScheduleRunType(v) - } - - if v, ok := block["weekdays"].(*schema.Set); ok { - days := make([]backup.DayOfWeek, 0) - for _, day := range v.List() { - days = append(days, backup.DayOfWeek(day.(string))) - } - schedule.ScheduleRunDays = &days - } - - return &schedule - } - - return nil -} - -func expandArmRecoveryServicesProtectionPolicyRetentionDaily(d *schema.ResourceData, times []date.Time) *backup.DailyRetentionSchedule { - if rb, ok := d.Get("retention_daily").([]interface{}); ok && len(rb) > 0 { - block := rb[0].(map[string]interface{}) - - return &backup.DailyRetentionSchedule{ - RetentionTimes: ×, - RetentionDuration: &backup.RetentionDuration{ - Count: utils.Int32(int32(block["count"].(int))), - DurationType: backup.RetentionDurationTypeDays, - }, - } - } - - return nil -} - -func expandArmRecoveryServicesProtectionPolicyRetentionWeekly(d *schema.ResourceData, times []date.Time) *backup.WeeklyRetentionSchedule { - if rb, ok := d.Get("retention_weekly").([]interface{}); ok && len(rb) > 0 { - block := rb[0].(map[string]interface{}) - - retention := backup.WeeklyRetentionSchedule{ - RetentionTimes: ×, - RetentionDuration: &backup.RetentionDuration{ - Count: utils.Int32(int32(block["count"].(int))), - DurationType: backup.RetentionDurationTypeWeeks, - }, - } - - if v, ok := block["weekdays"].(*schema.Set); ok { - days := make([]backup.DayOfWeek, 0) - for _, day := range v.List() { - days = append(days, backup.DayOfWeek(day.(string))) - } - retention.DaysOfTheWeek = &days - } - - return &retention - } - - return nil -} - -func expandArmRecoveryServicesProtectionPolicyRetentionMonthly(d *schema.ResourceData, times []date.Time) *backup.MonthlyRetentionSchedule { - if rb, ok := d.Get("retention_monthly").([]interface{}); ok && len(rb) > 0 { - block := rb[0].(map[string]interface{}) - - retention := backup.MonthlyRetentionSchedule{ - RetentionScheduleFormatType: backup.RetentionScheduleFormatWeekly, //this is always weekly ¯\_(ツ)_/¯ - RetentionScheduleDaily: nil, //and this is always nil.. - RetentionScheduleWeekly: expandArmRecoveryServicesProtectionPolicyRetentionWeeklyFormat(block), - RetentionTimes: ×, - RetentionDuration: &backup.RetentionDuration{ - Count: utils.Int32(int32(block["count"].(int))), - DurationType: backup.RetentionDurationTypeMonths, - }, - } - - return &retention - } - - return nil -} - -func expandArmRecoveryServicesProtectionPolicyRetentionYearly(d *schema.ResourceData, times []date.Time) *backup.YearlyRetentionSchedule { - if rb, ok := d.Get("retention_yearly").([]interface{}); ok && len(rb) > 0 { - block := rb[0].(map[string]interface{}) - - retention := backup.YearlyRetentionSchedule{ - RetentionScheduleFormatType: backup.RetentionScheduleFormatWeekly, //this is always weekly ¯\_(ツ)_/¯ - RetentionScheduleDaily: nil, //and this is always nil.. - RetentionScheduleWeekly: expandArmRecoveryServicesProtectionPolicyRetentionWeeklyFormat(block), - RetentionTimes: ×, - RetentionDuration: &backup.RetentionDuration{ - Count: utils.Int32(int32(block["count"].(int))), - DurationType: backup.RetentionDurationTypeYears, - }, - } - - if v, ok := block["months"].(*schema.Set); ok { - months := make([]backup.MonthOfYear, 0) - for _, month := range v.List() { - months = append(months, backup.MonthOfYear(month.(string))) - } - retention.MonthsOfYear = &months - } - - return &retention - } - - return nil -} - -func expandArmRecoveryServicesProtectionPolicyRetentionWeeklyFormat(block map[string]interface{}) *backup.WeeklyRetentionFormat { - weekly := backup.WeeklyRetentionFormat{} - - if v, ok := block["weekdays"].(*schema.Set); ok { - days := make([]backup.DayOfWeek, 0) - for _, day := range v.List() { - days = append(days, backup.DayOfWeek(day.(string))) - } - weekly.DaysOfTheWeek = &days - } - - if v, ok := block["weeks"].(*schema.Set); ok { - weeks := make([]backup.WeekOfMonth, 0) - for _, week := range v.List() { - weeks = append(weeks, backup.WeekOfMonth(week.(string))) - } - weekly.WeeksOfTheMonth = &weeks - } - - return &weekly -} - -func flattenArmRecoveryServicesProtectionPolicySchedule(schedule *backup.SimpleSchedulePolicy) []interface{} { - block := map[string]interface{}{} - - block["frequency"] = string(schedule.ScheduleRunFrequency) - - if times := schedule.ScheduleRunTimes; times != nil && len(*times) > 0 { - block["time"] = (*times)[0].Format("15:04") - } - - if days := schedule.ScheduleRunDays; days != nil { - weekdays := make([]interface{}, 0) - for _, d := range *days { - weekdays = append(weekdays, string(d)) - } - block["weekdays"] = schema.NewSet(schema.HashString, weekdays) - } - - return []interface{}{block} -} - -func flattenArmRecoveryServicesProtectionPolicyRetentionDaily(daily *backup.DailyRetentionSchedule) []interface{} { - block := map[string]interface{}{} - - if duration := daily.RetentionDuration; duration != nil { - if v := duration.Count; v != nil { - block["count"] = *v - } - } - - return []interface{}{block} -} - -func flattenArmRecoveryServicesProtectionPolicyRetentionWeekly(weekly *backup.WeeklyRetentionSchedule) []interface{} { - block := map[string]interface{}{} - - if duration := weekly.RetentionDuration; duration != nil { - if v := duration.Count; v != nil { - block["count"] = *v - } - } - - if days := weekly.DaysOfTheWeek; days != nil { - weekdays := make([]interface{}, 0) - for _, d := range *days { - weekdays = append(weekdays, string(d)) - } - block["weekdays"] = schema.NewSet(schema.HashString, weekdays) - } - - return []interface{}{block} -} - -func flattenArmRecoveryServicesProtectionPolicyRetentionMonthly(monthly *backup.MonthlyRetentionSchedule) []interface{} { - block := map[string]interface{}{} - - if duration := monthly.RetentionDuration; duration != nil { - if v := duration.Count; v != nil { - block["count"] = *v - } - } - - if weekly := monthly.RetentionScheduleWeekly; weekly != nil { - block["weekdays"], block["weeks"] = flattenArmRecoveryServicesProtectionPolicyRetentionWeeklyFormat(weekly) - } - - return []interface{}{block} -} - -func flattenArmRecoveryServicesProtectionPolicyRetentionYearly(yearly *backup.YearlyRetentionSchedule) []interface{} { - block := map[string]interface{}{} - - if duration := yearly.RetentionDuration; duration != nil { - if v := duration.Count; v != nil { - block["count"] = *v - } - } - - if weekly := yearly.RetentionScheduleWeekly; weekly != nil { - block["weekdays"], block["weeks"] = flattenArmRecoveryServicesProtectionPolicyRetentionWeeklyFormat(weekly) - } - - if months := yearly.MonthsOfYear; months != nil { - slice := make([]interface{}, 0) - for _, d := range *months { - slice = append(slice, string(d)) - } - block["months"] = schema.NewSet(schema.HashString, slice) - } - - return []interface{}{block} -} - -func flattenArmRecoveryServicesProtectionPolicyRetentionWeeklyFormat(retention *backup.WeeklyRetentionFormat) (weekdays, weeks *schema.Set) { - if days := retention.DaysOfTheWeek; days != nil { - slice := make([]interface{}, 0) - for _, d := range *days { - slice = append(slice, string(d)) - } - weekdays = schema.NewSet(schema.HashString, slice) - } - - if days := retention.WeeksOfTheMonth; days != nil { - slice := make([]interface{}, 0) - for _, d := range *days { - slice = append(slice, string(d)) - } - weeks = schema.NewSet(schema.HashString, slice) - } - - return weekdays, weeks -} - -func resourceArmRecoveryServicesProtectionPolicyWaitForUpdate(ctx context.Context, client *backup.ProtectionPoliciesClient, vaultName, resourceGroup, policyName string, d *schema.ResourceData) (backup.ProtectionPolicyResource, error) { - state := &resource.StateChangeConf{ - MinTimeout: 30 * time.Second, - Delay: 10 * time.Second, - Pending: []string{"NotFound"}, - Target: []string{"Found"}, - Refresh: resourceArmRecoveryServicesProtectionPolicyRefreshFunc(ctx, client, vaultName, resourceGroup, policyName), - } - - if d.IsNewResource() { - state.Timeout = d.Timeout(schema.TimeoutCreate) - } else { - state.Timeout = d.Timeout(schema.TimeoutUpdate) - } - - resp, err := state.WaitForState() - if err != nil { - return resp.(backup.ProtectionPolicyResource), fmt.Errorf("Error waiting for the Recovery Service Protection Policy %q to be true (Resource Group %q) to provision: %+v", policyName, resourceGroup, err) - } - - return resp.(backup.ProtectionPolicyResource), nil -} - -func resourceArmRecoveryServicesProtectionPolicyWaitForDeletion(ctx context.Context, client *backup.ProtectionPoliciesClient, vaultName, resourceGroup, policyName string, d *schema.ResourceData) (backup.ProtectionPolicyResource, error) { - state := &resource.StateChangeConf{ - MinTimeout: 30 * time.Second, - Delay: 10 * time.Second, - Pending: []string{"Found"}, - Target: []string{"NotFound"}, - Refresh: resourceArmRecoveryServicesProtectionPolicyRefreshFunc(ctx, client, vaultName, resourceGroup, policyName), - Timeout: d.Timeout(schema.TimeoutDelete), - } - - resp, err := state.WaitForState() - if err != nil { - return resp.(backup.ProtectionPolicyResource), fmt.Errorf("Error waiting for the Recovery Service Protection Policy %q to be false (Resource Group %q) to provision: %+v", policyName, resourceGroup, err) - } - - return resp.(backup.ProtectionPolicyResource), nil -} - -func resourceArmRecoveryServicesProtectionPolicyRefreshFunc(ctx context.Context, client *backup.ProtectionPoliciesClient, vaultName, resourceGroup, policyName string) resource.StateRefreshFunc { - return func() (interface{}, string, error) { - resp, err := client.Get(ctx, vaultName, resourceGroup, policyName) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - return resp, "NotFound", nil - } - - return resp, "Error", fmt.Errorf("Error making Read request on Recovery Service Protection Policy %q (Resource Group %q): %+v", policyName, resourceGroup, err) - } - - return resp, "Found", nil - } -} diff --git a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_replicated_vm.go b/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_replicated_vm.go deleted file mode 100644 index a93c4937d8d1c..0000000000000 --- a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_replicated_vm.go +++ /dev/null @@ -1,353 +0,0 @@ -package recoveryservices - -import ( - "bytes" - "fmt" - "strings" - "time" - - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute" - "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2018-01-10/siterecovery" - "github.com/hashicorp/terraform-plugin-sdk/helper/hashcode" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmRecoveryServicesReplicatedVm() *schema.Resource { - return &schema.Resource{ - DeprecationMessage: "`azurerm_recovery_replicated_vm` resource is deprecated in favor of `azurerm_site_recovery_replicated_vm` and will be removed in v2.0 of the AzureRM Provider", - Create: resourceArmRecoveryReplicatedItemCreate, - Read: resourceArmRecoveryReplicatedItemRead, - Delete: resourceArmRecoveryReplicatedItemDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(80 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(80 * time.Minute), - Delete: schema.DefaultTimeout(80 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "resource_group_name": azure.SchemaResourceGroupName(), - - "recovery_vault_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateRecoveryServicesVaultName, - }, - "source_recovery_fabric_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "source_vm_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - "target_recovery_fabric_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - "recovery_replication_policy_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - "source_recovery_protection_container_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "target_recovery_protection_container_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - "target_resource_group_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - "target_availability_set_id": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - "managed_disk": { - Type: schema.TypeSet, - ConfigMode: schema.SchemaConfigModeAttr, - Optional: true, - ForceNew: true, - Set: resourceArmRecoveryReplicatedVmDiskHash, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "disk_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - DiffSuppressFunc: suppress.CaseDifference, - }, - "staging_storage_account_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - "target_resource_group_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - "target_disk_type": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringInSlice([]string{ - string(compute.StandardLRS), - string(compute.PremiumLRS), - string(compute.StandardSSDLRS), - string(compute.UltraSSDLRS), - }, true), - DiffSuppressFunc: suppress.CaseDifference, - }, - "target_replica_disk_type": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringInSlice([]string{ - string(compute.StandardLRS), - string(compute.PremiumLRS), - string(compute.StandardSSDLRS), - string(compute.UltraSSDLRS), - }, true), - DiffSuppressFunc: suppress.CaseDifference, - }, - }, - }, - }, - }, - } -} - -func resourceArmRecoveryReplicatedItemCreate(d *schema.ResourceData, meta interface{}) error { - name := d.Get("name").(string) - resGroup := d.Get("resource_group_name").(string) - vaultName := d.Get("recovery_vault_name").(string) - fabricName := d.Get("source_recovery_fabric_name").(string) - sourceVmId := d.Get("source_vm_id").(string) - policyId := d.Get("recovery_replication_policy_id").(string) - sourceProtectionContainerName := d.Get("source_recovery_protection_container_name").(string) - targetProtectionContainerId := d.Get("target_recovery_protection_container_id").(string) - targetResourceGroupId := d.Get("target_resource_group_id").(string) - - var targetAvailabilitySetID *string - if id, isSet := d.GetOk("target_availability_set_id"); isSet { - tmp := id.(string) - targetAvailabilitySetID = &tmp - } else { - targetAvailabilitySetID = nil - } - - client := meta.(*clients.Client).RecoveryServices.ReplicationMigrationItemsClient(resGroup, vaultName) - ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) - defer cancel() - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, fabricName, sourceProtectionContainerName, name) - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing recovery services replicated vm %s (vault %s): %+v", name, vaultName, err) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_recovery_replicated_vm", azure.HandleAzureSdkForGoBug2824(*existing.ID)) - } - } - - managedDisks := []siterecovery.A2AVMManagedDiskInputDetails{} - - for _, raw := range d.Get("managed_disk").(*schema.Set).List() { - diskInput := raw.(map[string]interface{}) - diskId := diskInput["disk_id"].(string) - primaryStagingAzureStorageAccountID := diskInput["staging_storage_account_id"].(string) - recoveryResourceGroupId := diskInput["target_resource_group_id"].(string) - targetReplicaDiskType := diskInput["target_replica_disk_type"].(string) - targetDiskType := diskInput["target_disk_type"].(string) - - managedDisks = append(managedDisks, siterecovery.A2AVMManagedDiskInputDetails{ - DiskID: &diskId, - PrimaryStagingAzureStorageAccountID: &primaryStagingAzureStorageAccountID, - RecoveryResourceGroupID: &recoveryResourceGroupId, - RecoveryReplicaDiskAccountType: &targetReplicaDiskType, - RecoveryTargetDiskAccountType: &targetDiskType, - }) - } - - var parameters = siterecovery.EnableProtectionInput{ - Properties: &siterecovery.EnableProtectionInputProperties{ - PolicyID: &policyId, - ProviderSpecificDetails: siterecovery.A2AEnableProtectionInput{ - FabricObjectID: &sourceVmId, - RecoveryContainerID: &targetProtectionContainerId, - RecoveryResourceGroupID: &targetResourceGroupId, - RecoveryAvailabilitySetID: targetAvailabilitySetID, - VMManagedDisks: &managedDisks, - }, - }, - } - future, err := client.Create(ctx, fabricName, sourceProtectionContainerName, name, parameters) - if err != nil { - return fmt.Errorf("Error creating replicated vm %s (vault %s): %+v", name, vaultName, err) - } - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error creating replicated vm %s (vault %s): %+v", name, vaultName, err) - } - - resp, err := client.Get(ctx, fabricName, sourceProtectionContainerName, name) - if err != nil { - return fmt.Errorf("Error retrieving replicated vm %s (vault %s): %+v", name, vaultName, err) - } - - d.SetId(azure.HandleAzureSdkForGoBug2824(*resp.ID)) - - return resourceArmRecoveryReplicatedItemRead(d, meta) -} - -func resourceArmRecoveryReplicatedItemRead(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - fabricName := id.Path["replicationFabrics"] - protectionContainerName := id.Path["replicationProtectionContainers"] - name := id.Path["replicationProtectedItems"] - - client := meta.(*clients.Client).RecoveryServices.ReplicationMigrationItemsClient(resGroup, vaultName) - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - resp, err := client.Get(ctx, fabricName, protectionContainerName, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil - } - return fmt.Errorf("Error making Read request on recovery services replicated vm %s (vault %s): %+v", name, vaultName, err) - } - - d.Set("name", name) - d.Set("resource_group_name", resGroup) - d.Set("recovery_vault_name", vaultName) - d.Set("source_recovery_fabric_name", fabricName) - d.Set("target_recovery_fabric_id", resp.Properties.RecoveryFabricID) - d.Set("recovery_replication_policy_id", resp.Properties.PolicyID) - d.Set("source_recovery_protection_container_name", protectionContainerName) - d.Set("target_recovery_protection_container_id", resp.Properties.RecoveryContainerID) - - if a2aDetails, isA2a := resp.Properties.ProviderSpecificDetails.AsA2AReplicationDetails(); isA2a { - d.Set("source_vm_id", a2aDetails.FabricObjectID) - d.Set("target_resource_group_id", a2aDetails.RecoveryAzureResourceGroupID) - d.Set("target_availability_set_id", a2aDetails.RecoveryAvailabilitySet) - if a2aDetails.ProtectedManagedDisks != nil { - disksOutput := make([]interface{}, 0) - for _, disk := range *a2aDetails.ProtectedManagedDisks { - diskOutput := make(map[string]interface{}) - diskOutput["disk_id"] = *disk.DiskID - diskOutput["staging_storage_account_id"] = *disk.PrimaryStagingAzureStorageAccountID - diskOutput["target_resource_group_id"] = *disk.RecoveryResourceGroupID - diskOutput["target_replica_disk_type"] = *disk.RecoveryReplicaDiskAccountType - diskOutput["target_disk_type"] = *disk.RecoveryTargetDiskAccountType - - disksOutput = append(disksOutput, diskOutput) - } - d.Set("managed_disk", schema.NewSet(resourceArmRecoveryReplicatedVmDiskHash, disksOutput)) - } - } - - return nil -} - -func resourceArmRecoveryReplicatedItemDelete(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - fabricName := id.Path["replicationFabrics"] - protectionContainerName := id.Path["replicationProtectionContainers"] - name := id.Path["replicationProtectedItems"] - - disableProtectionInput := siterecovery.DisableProtectionInput{ - Properties: &siterecovery.DisableProtectionInputProperties{ - DisableProtectionReason: siterecovery.NotSpecified, - ReplicationProviderInput: siterecovery.DisableProtectionProviderSpecificInput{}, - }, - } - - client := meta.(*clients.Client).RecoveryServices.ReplicationMigrationItemsClient(resGroup, vaultName) - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - future, err := client.Delete(ctx, fabricName, protectionContainerName, name, disableProtectionInput) - if err != nil { - return fmt.Errorf("Error deleting recovery services replicated vm %s (vault %s): %+v", name, vaultName, err) - } - - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for deletion of recovery services replicated vm %s (vault %s): %+v", name, vaultName, err) - } - return nil -} - -func resourceArmRecoveryReplicatedVmDiskHash(v interface{}) int { - var buf bytes.Buffer - - if m, ok := v.(map[string]interface{}); ok { - if v, ok := m["disk_id"]; ok { - buf.WriteString(strings.ToLower(v.(string))) - } - } - - return hashcode.String(buf.String()) -} diff --git a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_replication_policy.go b/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_replication_policy.go deleted file mode 100644 index 2288499b6ac5d..0000000000000 --- a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_replication_policy.go +++ /dev/null @@ -1,215 +0,0 @@ -package recoveryservices - -import ( - "fmt" - "time" - - "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2018-01-10/siterecovery" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmRecoveryServicesReplicationPolicy() *schema.Resource { - return &schema.Resource{ - DeprecationMessage: "`azurerm_recovery_services_replication_policy` resource is deprecated in favor of `azurerm_site_recovery_replication_policy` and will be removed in v2.0 of the AzureRM Provider", - Create: resourceArmRecoveryServicesReplicationPolicyCreate, - Read: resourceArmRecoveryServicesReplicationPolicyRead, - Update: resourceArmRecoveryServicesReplicationPolicyUpdate, - Delete: resourceArmRecoveryServicesReplicationPolicyDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "resource_group_name": azure.SchemaResourceGroupName(), - - "recovery_vault_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateRecoveryServicesVaultName, - }, - "recovery_point_retention_in_minutes": { - Type: schema.TypeInt, - Required: true, - ForceNew: false, - ValidateFunc: validation.IntBetween(1, 365*24*60), - }, - "application_consistent_snapshot_frequency_in_minutes": { - Type: schema.TypeInt, - Required: true, - ForceNew: false, - ValidateFunc: validation.IntBetween(1, 365*24*60), - }, - }, - } -} - -func resourceArmRecoveryServicesReplicationPolicyCreate(d *schema.ResourceData, meta interface{}) error { - resGroup := d.Get("resource_group_name").(string) - vaultName := d.Get("recovery_vault_name").(string) - name := d.Get("name").(string) - - client := meta.(*clients.Client).RecoveryServices.ReplicationPoliciesClient(resGroup, vaultName) - ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) - defer cancel() - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, name) - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing recovery services replication policy %s: %+v", name, err) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_recovery_services_replication_policy", azure.HandleAzureSdkForGoBug2824(*existing.ID)) - } - } - - 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{ - Properties: &siterecovery.CreatePolicyInputProperties{ - ProviderSpecificInput: &siterecovery.A2APolicyCreationInput{ - RecoveryPointHistory: &recoveryPoint, - AppConsistentFrequencyInMinutes: &appConsitency, - MultiVMSyncStatus: siterecovery.Enable, - InstanceType: siterecovery.InstanceTypeBasicPolicyProviderSpecificInputInstanceTypeA2A, - }, - }, - } - future, err := client.Create(ctx, name, parameters) - if err != nil { - return fmt.Errorf("Error creating recovery services replication policy %s (vault %s): %+v", name, vaultName, err) - } - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error creating recovery services replication policy %s (vault %s): %+v", name, vaultName, err) - } - - resp, err := client.Get(ctx, name) - if err != nil { - return fmt.Errorf("Error retrieving site recovery replication policy %s (vault %s): %+v", name, vaultName, err) - } - - d.SetId(azure.HandleAzureSdkForGoBug2824(*resp.ID)) - - return resourceArmRecoveryServicesReplicationPolicyRead(d, meta) -} - -func resourceArmRecoveryServicesReplicationPolicyUpdate(d *schema.ResourceData, meta interface{}) error { - resGroup := d.Get("resource_group_name").(string) - vaultName := d.Get("recovery_vault_name").(string) - name := d.Get("name").(string) - - client := meta.(*clients.Client).RecoveryServices.ReplicationPoliciesClient(resGroup, vaultName) - ctx, cancel := timeouts.ForUpdate(meta.(*clients.Client).StopContext, d) - defer cancel() - - 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{ - Properties: &siterecovery.UpdatePolicyInputProperties{ - ReplicationProviderSettings: &siterecovery.A2APolicyCreationInput{ - RecoveryPointHistory: &recoveryPoint, - AppConsistentFrequencyInMinutes: &appConsitency, - MultiVMSyncStatus: siterecovery.Enable, - InstanceType: siterecovery.InstanceTypeBasicPolicyProviderSpecificInputInstanceTypeA2A, - }, - }, - } - future, err := client.Update(ctx, name, parameters) - if err != nil { - return fmt.Errorf("Error updating recovery services replication policy %s (vault %s): %+v", name, vaultName, err) - } - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error updating recovery services replication policy %s (vault %s): %+v", name, vaultName, err) - } - - resp, err := client.Get(ctx, name) - if err != nil { - return fmt.Errorf("Error retrieving site recovery replication policy %s (vault %s): %+v", name, vaultName, err) - } - - d.SetId(azure.HandleAzureSdkForGoBug2824(*resp.ID)) - - return resourceArmRecoveryServicesReplicationPolicyRead(d, meta) -} - -func resourceArmRecoveryServicesReplicationPolicyRead(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - name := id.Path["replicationPolicies"] - - client := meta.(*clients.Client).RecoveryServices.ReplicationPoliciesClient(resGroup, vaultName) - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - resp, err := client.Get(ctx, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil - } - return fmt.Errorf("Error making Read request on recovery services replication policy %s (vault %s): %+v", name, vaultName, err) - } - - d.Set("name", resp.Name) - d.Set("resource_group_name", resGroup) - d.Set("recovery_vault_name", vaultName) - if a2APolicyDetails, isA2A := resp.Properties.ProviderSpecificDetails.AsA2APolicyDetails(); isA2A { - d.Set("recovery_point_retention_in_minutes", a2APolicyDetails.RecoveryPointHistory) - d.Set("application_consistent_snapshot_frequency_in_minutes", a2APolicyDetails.AppConsistentFrequencyInMinutes) - } - return nil -} - -func resourceArmRecoveryServicesReplicationPolicyDelete(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - name := id.Path["replicationPolicies"] - - client := meta.(*clients.Client).RecoveryServices.ReplicationPoliciesClient(resGroup, vaultName) - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - future, err := client.Delete(ctx, name) - if err != nil { - return fmt.Errorf("Error deleting recovery services replication policy %s (vault %s): %+v", name, vaultName, err) - } - - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for deletion of recovery services replication policy %s (vault %s): %+v", name, vaultName, err) - } - - return nil -} diff --git a/azurerm/internal/services/recoveryservices/tests/data_source_recovery_services_protection_policy_vm_test.go b/azurerm/internal/services/recoveryservices/tests/data_source_recovery_services_protection_policy_vm_test.go index 03af8b3759efe..53136f3780ce0 100644 --- a/azurerm/internal/services/recoveryservices/tests/data_source_recovery_services_protection_policy_vm_test.go +++ b/azurerm/internal/services/recoveryservices/tests/data_source_recovery_services_protection_policy_vm_test.go @@ -8,17 +8,17 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" ) -func TestAccDataSourceAzureRMRecoveryServicesProtectionPolicyVm_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "data.azurerm_recovery_services_protection_policy_vm", "test") +func TestAccDataSourceAzureRMBackupPolicyVm_basic(t *testing.T) { + data := acceptance.BuildTestData(t, "data.azurerm_backup_policy_vm", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, Steps: []resource.TestStep{ { - Config: testAccDataSourceRecoveryServicesProtectionPolicyVm_basic(data), + Config: testAccDataSourceBackupProtectionPolicyVm_basic(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMRecoveryServicesProtectionPolicyVmExists(data.ResourceName), + testCheckAzureRMBackupProtectionPolicyVmExists(data.ResourceName), resource.TestCheckResourceAttrSet(data.ResourceName, "name"), resource.TestCheckResourceAttrSet(data.ResourceName, "recovery_vault_name"), resource.TestCheckResourceAttrSet(data.ResourceName, "resource_group_name"), @@ -29,13 +29,13 @@ func TestAccDataSourceAzureRMRecoveryServicesProtectionPolicyVm_basic(t *testing }) } -func testAccDataSourceRecoveryServicesProtectionPolicyVm_basic(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data) +func testAccDataSourceBackupProtectionPolicyVm_basic(data acceptance.TestData) string { + template := testAccAzureRMBackupProtectionPolicyVM_basicDaily(data) return fmt.Sprintf(` %s -data "azurerm_recovery_services_protection_policy_vm" "test" { - name = "${azurerm_recovery_services_protection_policy_vm.test.name}" +data "azurerm_backup_policy_vm" "test" { + name = "${azurerm_backup_policy_vm.test.name}" recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" resource_group_name = "${azurerm_resource_group.test.name}" } diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_fabric_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_fabric_test.go deleted file mode 100644 index c832d65df33a7..0000000000000 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_fabric_test.go +++ /dev/null @@ -1,113 +0,0 @@ -package tests - -import ( - "fmt" - "net/http" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" -) - -func TestAccAzureRMRecoveryFabric_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_fabric", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryFabricDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryFabric_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMRecoveryFabricExists(data.ResourceName), - ), - }, - data.ImportStep(), - }, - }) -} - -func testAccAzureRMRecoveryFabric_basic(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-recovery-%d" - location = "%s" -} - -resource "azurerm_recovery_services_vault" "test" { - name = "acctest-vault-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku = "Standard" - - soft_delete_enabled = false -} - -resource "azurerm_recovery_services_fabric" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "acctest-fabric-%d" - location = "${azurerm_resource_group.test.location}" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) -} - -func testCheckAzureRMRecoveryFabricExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - // Ensure we have enough information in state to look up in API - state, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %s", resourceName) - } - - resourceGroupName := state.Primary.Attributes["resource_group_name"] - vaultName := state.Primary.Attributes["recovery_vault_name"] - fabricName := state.Primary.Attributes["name"] - - // Ensure fabric exists in API - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.FabricClient(resourceGroupName, vaultName) - - resp, err := client.Get(ctx, fabricName) - if err != nil { - return fmt.Errorf("Bad: Get on fabricClient: %+v", err) - } - - if resp.Response.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: fabric: %q does not exist", fabricName) - } - - return nil - } -} - -func testCheckAzureRMRecoveryFabricDestroy(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_recovery_services_fabric" { - continue - } - - resourceGroupName := rs.Primary.Attributes["resource_group_name"] - vaultName := rs.Primary.Attributes["recovery_vault_name"] - resourceGroup := rs.Primary.Attributes["name"] - - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.FabricClient(resourceGroupName, vaultName) - - resp, err := client.Get(ctx, resourceGroup) - if err != nil { - return nil - } - - if resp.StatusCode != http.StatusNotFound { - return fmt.Errorf("Recovery Services Fabric still exists:\n%#v", resp.Properties) - } - } - - return nil -} diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_network_mapping_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_network_mapping_test.go deleted file mode 100644 index fb9148d2e0091..0000000000000 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_network_mapping_test.go +++ /dev/null @@ -1,161 +0,0 @@ -package tests - -import ( - "fmt" - "net/http" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" -) - -func TestAccAzureRMRecoveryNetworkMapping_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_network_mapping", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryNetworkMappingDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryNetworkMapping_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMRecoveryNetworkMappingExists(data.ResourceName), - ), - }, - data.ImportStep(), - }, - }) -} - -func testAccAzureRMRecoveryNetworkMapping_basic(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-recovery-%d-1" - location = "%s" -} - -resource "azurerm_recovery_services_vault" "test" { - name = "acctest-vault-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku = "Standard" - - soft_delete_enabled = false -} - -resource "azurerm_recovery_services_fabric" "test1" { - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "acctest-fabric1-%d" - location = "${azurerm_resource_group.test.location}" -} - -resource "azurerm_recovery_services_fabric" "test2" { - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "acctest-fabric2-%d" - location = "%s" - depends_on = ["azurerm_recovery_services_fabric.test1"] -} - -resource "azurerm_virtual_network" "test1" { - name = "network1-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - address_space = ["192.168.1.0/24"] - location = "${azurerm_recovery_services_fabric.test1.location}" -} - -resource "azurerm_virtual_network" "test2" { - name = "network2-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - address_space = ["192.168.2.0/24"] - location = "${azurerm_recovery_services_fabric.test2.location}" -} - -resource "azurerm_recovery_network_mapping" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "mapping-%d" - source_recovery_fabric_name = "${azurerm_recovery_services_fabric.test1.name}" - target_recovery_fabric_name = "${azurerm_recovery_services_fabric.test2.name}" - source_network_id = "${azurerm_virtual_network.test1.id}" - target_network_id = "${azurerm_virtual_network.test2.id}" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.Locations.Secondary, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - -func testCheckAzureRMRecoveryNetworkMappingExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - // Ensure we have enough information in state to look up in API - state, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %s", resourceName) - } - - resourceGroupName := state.Primary.Attributes["resource_group_name"] - vaultName := state.Primary.Attributes["recovery_vault_name"] - fabricName := state.Primary.Attributes["source_recovery_fabric_name"] - networkId := state.Primary.Attributes["source_network_id"] - mappingName := state.Primary.Attributes["name"] - - id, err := azure.ParseAzureResourceID(networkId) - if err != nil { - return err - } - networkName := id.Path["virtualNetworks"] - - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.NetworkMappingClient(resourceGroupName, vaultName) - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - // TODO Fix Bad: networkMapping error - resp, err := client.Get(ctx, fabricName, networkName, mappingName) - if err != nil { - if resp.Response.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: networkMapping: %q (network %q) does not exist", mappingName, networkName) - } - - return fmt.Errorf("Bad: Get on networkMappingClient: %+v", err) - } - - return nil - } -} - -func testCheckAzureRMRecoveryNetworkMappingDestroy(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_recovery_network_mapping" { - continue - } - - resourceGroupName := rs.Primary.Attributes["resource_group_name"] - vaultName := rs.Primary.Attributes["recovery_vault_name"] - fabricName := rs.Primary.Attributes["source_recovery_fabric_name"] - networkId := rs.Primary.Attributes["source_network_id"] - mappingName := rs.Primary.Attributes["name"] - - id, err := azure.ParseAzureResourceID(networkId) - if err != nil { - return err - } - networkName := id.Path["virtualNetworks"] - - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.NetworkMappingClient(resourceGroupName, vaultName) - - resp, err := client.Get(ctx, fabricName, networkName, mappingName) - if err != nil { - return nil - } - - if resp.StatusCode != http.StatusNotFound { - return fmt.Errorf("Network Mapping still exists:\n%#v", resp.Properties) - } - } - - return nil -} diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protected_vm_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protected_vm_test.go deleted file mode 100644 index 6fcb6c1e6d365..0000000000000 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protected_vm_test.go +++ /dev/null @@ -1,642 +0,0 @@ -package tests - -import ( - "fmt" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func TestAccAzureRMRecoveryServicesProtectedVm_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protected_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectedVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectedVm_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMRecoveryServicesProtectedVmExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "resource_group_name"), - ), - }, - data.ImportStep(), - { //vault cannot be deleted unless we unregister all backups - Config: testAccAzureRMRecoveryServicesProtectedVm_base(data), - Check: resource.ComposeTestCheckFunc(), - }, - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectedVm_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protected_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectedVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectedVm_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMRecoveryServicesProtectedVmExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "resource_group_name"), - ), - }, - data.RequiresImportErrorStep(testAccAzureRMRecoveryServicesProtectedVm_requiresImport), - { //vault cannot be deleted unless we unregister all backups - Config: testAccAzureRMRecoveryServicesProtectedVm_base(data), - Check: resource.ComposeTestCheckFunc(), - }, - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectedVm_separateResourceGroups(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protected_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectedVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectedVm_separateResourceGroups(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMRecoveryServicesProtectedVmExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "resource_group_name"), - ), - }, - data.ImportStep(), - { //vault cannot be deleted unless we unregister all backups - Config: testAccAzureRMRecoveryServicesProtectedVm_additionalVault(data), - Check: resource.ComposeTestCheckFunc(), - }, - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectedVm_updateBackupPolicyId(t *testing.T) { - virtualMachine := "azurerm_virtual_machine.test" - fBackupPolicyResourceName := "azurerm_recovery_services_protection_policy_vm.test" - sBackupPolicyResourceName := "azurerm_recovery_services_protection_policy_vm.test_change_backup" - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protected_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectedVmDestroy, - Steps: []resource.TestStep{ - { // Create resources and link first backup policy id - ResourceName: fBackupPolicyResourceName, - Config: testAccAzureRMRecoveryServicesProtectedVm_linkFirstBackupPolicy(data), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttrPair(data.ResourceName, "backup_policy_id", fBackupPolicyResourceName, "id"), - ), - }, - { // Modify backup policy id to the second one - // Set Destroy false to prevent error from cleaning up dangling resource - ResourceName: sBackupPolicyResourceName, - Config: testAccAzureRMRecoveryServicesProtectedVm_linkSecondBackupPolicy(data), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttrPair(data.ResourceName, "backup_policy_id", sBackupPolicyResourceName, "id"), - ), - }, - { // Remove backup policy link - // Backup policy link will need to be removed first so the VM's backup policy subsequently reverts to Default - // Azure API is quite sensitive, adding the step to control resource cleanup order - ResourceName: fBackupPolicyResourceName, - Config: testAccAzureRMRecoveryServicesProtectedVm_withVM(data), - Check: resource.ComposeTestCheckFunc(), - }, - { // Then VM can be removed - ResourceName: virtualMachine, - Config: testAccAzureRMRecoveryServicesProtectedVm_withSecondPolicy(data), - Check: resource.ComposeTestCheckFunc(), - }, - { // Remove backup policies and vault - ResourceName: data.ResourceName, - Config: testAccAzureRMRecoveryServicesProtectedVm_basePolicyTest(data), - Check: resource.ComposeTestCheckFunc(), - }, - }, - }) -} - -func testCheckAzureRMRecoveryServicesProtectedVmDestroy(s *terraform.State) error { - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ProtectedItemsClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_recovery_services_protected_vm" { - continue - } - - resourceGroup := rs.Primary.Attributes["resource_group_name"] - vaultName := rs.Primary.Attributes["recovery_vault_name"] - vmId := rs.Primary.Attributes["source_vm_id"] - - parsedVmId, err := azure.ParseAzureResourceID(vmId) - if err != nil { - return fmt.Errorf("[ERROR] Unable to parse source_vm_id '%s': %+v", vmId, err) - } - vmName, hasName := parsedVmId.Path["virtualMachines"] - if !hasName { - return fmt.Errorf("[ERROR] parsed source_vm_id '%s' doesn't contain 'virtualMachines'", vmId) - } - - protectedItemName := fmt.Sprintf("VM;iaasvmcontainerv2;%s;%s", parsedVmId.ResourceGroup, vmName) - containerName := fmt.Sprintf("iaasvmcontainer;iaasvmcontainerv2;%s;%s", parsedVmId.ResourceGroup, vmName) - - resp, err := client.Get(ctx, vaultName, resourceGroup, "Azure", containerName, protectedItemName, "") - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - return nil - } - - return err - } - - return fmt.Errorf("Recovery Services Protected VM still exists:\n%#v", resp) - } - - return nil -} - -func testCheckAzureRMRecoveryServicesProtectedVmExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ProtectedItemsClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - // Ensure we have enough information in state to look up in API - rs, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %q", resourceName) - } - - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for Recovery Services Protected VM: %q", resourceName) - } - - vaultName := rs.Primary.Attributes["recovery_vault_name"] - vmId := rs.Primary.Attributes["source_vm_id"] - - //get VM name from id - parsedVmId, err := azure.ParseAzureResourceID(vmId) - if err != nil { - return fmt.Errorf("[ERROR] Unable to parse source_vm_id '%s': %+v", vmId, err) - } - vmName, hasName := parsedVmId.Path["virtualMachines"] - if !hasName { - return fmt.Errorf("[ERROR] parsed source_vm_id '%s' doesn't contain 'virtualMachines'", vmId) - } - - protectedItemName := fmt.Sprintf("VM;iaasvmcontainerv2;%s;%s", parsedVmId.ResourceGroup, vmName) - containerName := fmt.Sprintf("iaasvmcontainer;iaasvmcontainerv2;%s;%s", parsedVmId.ResourceGroup, vmName) - - resp, err := client.Get(ctx, vaultName, resourceGroup, "Azure", containerName, protectedItemName, "") - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - return fmt.Errorf("Recovery Services Protected VM %q (resource group: %q) was not found: %+v", protectedItemName, resourceGroup, err) - } - - return fmt.Errorf("Bad: Get on recoveryServicesVaultsClient: %+v", err) - } - - return nil - } -} - -func testAccAzureRMRecoveryServicesProtectedVm_base(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-recovery-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "vnet" - location = "${azurerm_resource_group.test.location}" - address_space = ["10.0.0.0/16"] - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "acctest_subnet" - virtual_network_name = "${azurerm_virtual_network.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - address_prefix = "10.0.10.0/24" -} - -resource "azurerm_network_interface" "test" { - name = "acctest_nic" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "acctestipconfig" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - public_ip_address_id = "${azurerm_public_ip.test.id}" - } -} - -resource "azurerm_public_ip" "test" { - name = "acctest-ip" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - allocation_method = "Dynamic" - domain_name_label = "acctestip%d" -} - -resource "azurerm_storage_account" "test" { - name = "acctest%s" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - account_tier = "Standard" - account_replication_type = "LRS" -} - -resource "azurerm_managed_disk" "test" { - name = "acctest-datadisk" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - storage_account_type = "Standard_LRS" - create_option = "Empty" - disk_size_gb = "1023" -} - -resource "azurerm_virtual_machine" "test" { - name = "acctestvm" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - vm_size = "Standard_A0" - network_interface_ids = ["${azurerm_network_interface.test.id}"] - - storage_image_reference { - publisher = "Canonical" - offer = "UbuntuServer" - sku = "16.04-LTS" - version = "latest" - } - - storage_os_disk { - name = "acctest-osdisk" - managed_disk_type = "Standard_LRS" - caching = "ReadWrite" - create_option = "FromImage" - } - - storage_data_disk { - name = "acctest-datadisk" - managed_disk_id = "${azurerm_managed_disk.test.id}" - managed_disk_type = "Standard_LRS" - disk_size_gb = "${azurerm_managed_disk.test.disk_size_gb}" - create_option = "Attach" - lun = 0 - } - - os_profile { - computer_name = "acctest" - admin_username = "vmadmin" - admin_password = "Password123!@#" - } - - os_profile_linux_config { - disable_password_authentication = false - } - - boot_diagnostics { - enabled = true - storage_uri = "${azurerm_storage_account.test.primary_blob_endpoint}" - } -} - -resource "azurerm_recovery_services_vault" "test" { - name = "acctest-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku = "Standard" - - soft_delete_enabled = false -} - -resource "azurerm_recovery_services_protection_policy_vm" "test" { - name = "acctest-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - - backup { - frequency = "Daily" - time = "23:00" - } - - retention_daily { - count = 10 - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomString, data.RandomInteger, data.RandomInteger) -} - -func testAccAzureRMRecoveryServicesProtectedVm_basic(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectedVm_base(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protected_vm" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - source_vm_id = "${azurerm_virtual_machine.test.id}" - backup_policy_id = "${azurerm_recovery_services_protection_policy_vm.test.id}" -} -`, template) -} - -// For update backup policy id test -func testAccAzureRMRecoveryServicesProtectedVm_basePolicyTest(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-recovery-%d-1" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "vnet" - location = "${azurerm_resource_group.test.location}" - address_space = ["10.0.0.0/16"] - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "acctest_subnet" - virtual_network_name = "${azurerm_virtual_network.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - address_prefix = "10.0.10.0/24" -} - -resource "azurerm_network_interface" "test" { - name = "acctest_nic" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "acctestipconfig" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - public_ip_address_id = "${azurerm_public_ip.test.id}" - } -} - -resource "azurerm_public_ip" "test" { - name = "acctest-ip" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - allocation_method = "Dynamic" - domain_name_label = "acctestip%d" -} - -resource "azurerm_storage_account" "test" { - name = "acctest%s" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - account_tier = "Standard" - account_replication_type = "LRS" -} - -resource "azurerm_managed_disk" "test" { - name = "acctest-datadisk" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - storage_account_type = "Standard_LRS" - create_option = "Empty" - disk_size_gb = "1023" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomString) -} - -// For update backup policy id test -func testAccAzureRMRecoveryServicesProtectedVm_withVault(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectedVm_basePolicyTest(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_vault" "test" { - name = "acctest-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku = "Standard" - - soft_delete_enabled = false -} -`, template, data.RandomInteger) -} - -// For update backup policy id test -func testAccAzureRMRecoveryServicesProtectedVm_withFirstPolicy(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectedVm_withVault(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protection_policy_vm" "test" { - name = "acctest-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - - backup { - frequency = "Daily" - time = "23:00" - } - - retention_daily { - count = 10 - } -} -`, template, data.RandomInteger) -} - -// For update backup policy id test -func testAccAzureRMRecoveryServicesProtectedVm_withSecondPolicy(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectedVm_withFirstPolicy(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protection_policy_vm" "test_change_backup" { - name = "acctest2-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - - backup { - frequency = "Daily" - time = "23:00" - } - - retention_daily { - count = 15 - } -} -`, template, data.RandomInteger) -} - -// For update backup policy id test -func testAccAzureRMRecoveryServicesProtectedVm_withVM(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectedVm_withSecondPolicy(data) - return fmt.Sprintf(` -%s - -resource "azurerm_virtual_machine" "test" { - name = "acctestvm-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - vm_size = "Standard_A0" - network_interface_ids = ["${azurerm_network_interface.test.id}"] - delete_os_disk_on_termination = true - - storage_image_reference { - publisher = "Canonical" - offer = "UbuntuServer" - sku = "16.04-LTS" - version = "latest" - } - - storage_os_disk { - name = "acctest-osdisk" - managed_disk_type = "Standard_LRS" - caching = "ReadWrite" - create_option = "FromImage" - } - - storage_data_disk { - name = "acctest-datadisk" - managed_disk_id = "${azurerm_managed_disk.test.id}" - managed_disk_type = "Standard_LRS" - disk_size_gb = "${azurerm_managed_disk.test.disk_size_gb}" - create_option = "Attach" - lun = 0 - } - - os_profile { - computer_name = "acctest" - admin_username = "vmadmin" - admin_password = "Password123!@#" - } - - os_profile_linux_config { - disable_password_authentication = false - } - - boot_diagnostics { - enabled = true - storage_uri = "${azurerm_storage_account.test.primary_blob_endpoint}" - } -} -`, template, data.RandomInteger) -} - -// For update backup policy id test -func testAccAzureRMRecoveryServicesProtectedVm_linkFirstBackupPolicy(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectedVm_withVM(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protected_vm" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - source_vm_id = "${azurerm_virtual_machine.test.id}" - backup_policy_id = "${azurerm_recovery_services_protection_policy_vm.test.id}" -} -`, template) -} - -// For update backup policy id test -func testAccAzureRMRecoveryServicesProtectedVm_linkSecondBackupPolicy(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectedVm_withVM(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protected_vm" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - source_vm_id = "${azurerm_virtual_machine.test.id}" - backup_policy_id = "${azurerm_recovery_services_protection_policy_vm.test_change_backup.id}" -} -`, template) -} - -func testAccAzureRMRecoveryServicesProtectedVm_requiresImport(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectedVm_basic(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protected_vm" "import" { - resource_group_name = "${azurerm_recovery_services_protected_vm.test.resource_group_name}" - recovery_vault_name = "${azurerm_recovery_services_protected_vm.test.recovery_vault_name}" - source_vm_id = "${azurerm_recovery_services_protected_vm.test.source_vm_id}" - backup_policy_id = "${azurerm_recovery_services_protected_vm.test.backup_policy_id}" -} -`, template) -} - -func testAccAzureRMRecoveryServicesProtectedVm_additionalVault(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectedVm_base(data) - return fmt.Sprintf(` -%s - -resource "azurerm_resource_group" "test2" { - name = "acctestRG-recovery-%d-2" - location = "%s" -} - -resource "azurerm_recovery_services_vault" "test2" { - name = "acctest2-%d" - location = "${azurerm_resource_group.test2.location}" - resource_group_name = "${azurerm_resource_group.test2.name}" - sku = "Standard" - - soft_delete_enabled = false -} - -resource "azurerm_recovery_services_protection_policy_vm" "test2" { - name = "acctest2-%d" - resource_group_name = "${azurerm_resource_group.test2.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test2.name}" - - backup { - frequency = "Daily" - time = "23:00" - } - - retention_daily { - count = 10 - } -} -`, template, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) -} - -func testAccAzureRMRecoveryServicesProtectedVm_separateResourceGroups(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectedVm_additionalVault(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protected_vm" "test" { - resource_group_name = "${azurerm_resource_group.test2.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test2.name}" - backup_policy_id = "${azurerm_recovery_services_protection_policy_vm.test2.id}" - source_vm_id = "${azurerm_virtual_machine.test.id}" -} -`, template) -} diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_container_mapping_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_container_mapping_test.go deleted file mode 100644 index 9bd3f3eabebe8..0000000000000 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_container_mapping_test.go +++ /dev/null @@ -1,158 +0,0 @@ -package tests - -import ( - "fmt" - "net/http" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" -) - -func TestAccAzureRMRecoveryProtectionContainerMapping_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_container_mapping", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryProtectionContainerMappingDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryProtectionContainerMapping_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMRecoveryProtectionContainerMappingExists(data.ResourceName), - ), - }, - data.ImportStep(), - }, - }) -} - -func testAccAzureRMRecoveryProtectionContainerMapping_basic(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test1" { - name = "acctestRG-recovery-%d-1" - location = "%s" -} - -resource "azurerm_recovery_services_vault" "test" { - name = "acctest-vault-%d" - location = "${azurerm_resource_group.test1.location}" - resource_group_name = "${azurerm_resource_group.test1.name}" - sku = "Standard" - - soft_delete_enabled = false -} - -resource "azurerm_recovery_services_fabric" "test1" { - resource_group_name = "${azurerm_resource_group.test1.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "acctest-fabric1-%d" - location = "${azurerm_resource_group.test1.location}" -} - -resource "azurerm_recovery_services_fabric" "test2" { - resource_group_name = "${azurerm_resource_group.test1.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "acctest-fabric2-%d" - location = "%s" - depends_on = ["azurerm_recovery_services_fabric.test1"] -} - -resource "azurerm_recovery_services_protection_container" "test1" { - resource_group_name = "${azurerm_resource_group.test1.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - recovery_fabric_name = "${azurerm_recovery_services_fabric.test1.name}" - name = "acctest-protection-cont1-%d" -} - -resource "azurerm_recovery_services_protection_container" "test2" { - resource_group_name = "${azurerm_resource_group.test1.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - recovery_fabric_name = "${azurerm_recovery_services_fabric.test2.name}" - name = "acctest-protection-cont2-%d" -} - -resource "azurerm_recovery_services_replication_policy" "test" { - resource_group_name = "${azurerm_resource_group.test1.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "acctest-policy-%d" - recovery_point_retention_in_minutes = "${24 * 60}" - application_consistent_snapshot_frequency_in_minutes = "${4 * 60}" -} - -resource "azurerm_recovery_services_protection_container_mapping" "test" { - resource_group_name = "${azurerm_resource_group.test1.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - recovery_fabric_name = "${azurerm_recovery_services_fabric.test1.name}" - recovery_source_protection_container_name = "${azurerm_recovery_services_protection_container.test1.name}" - recovery_target_protection_container_id = "${azurerm_recovery_services_protection_container.test2.id}" - recovery_replication_policy_id = "${azurerm_recovery_services_replication_policy.test.id}" - name = "mapping-%d" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.Locations.Secondary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - -func testCheckAzureRMRecoveryProtectionContainerMappingExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - // Ensure we have enough information in state to look up in API - state, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %s", resourceName) - } - - resourceGroupName := state.Primary.Attributes["resource_group_name"] - vaultName := state.Primary.Attributes["recovery_vault_name"] - fabricName := state.Primary.Attributes["recovery_fabric_name"] - protectionContainerName := state.Primary.Attributes["recovery_source_protection_container_name"] - mappingName := state.Primary.Attributes["name"] - - // Ensure mapping exists in API - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ContainerMappingClient(resourceGroupName, vaultName) - - resp, err := client.Get(ctx, fabricName, protectionContainerName, mappingName) - if err != nil { - return fmt.Errorf("Bad: Get on fabricClient: %+v", err) - } - - if resp.Response.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: fabric: %q does not exist", fabricName) - } - - return nil - } -} - -func testCheckAzureRMRecoveryProtectionContainerMappingDestroy(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_recovery_services_protection_container_mapping" { - continue - } - - resourceGroupName := rs.Primary.Attributes["resource_group_name"] - vaultName := rs.Primary.Attributes["recovery_vault_name"] - fabricName := rs.Primary.Attributes["recovery_fabric_name"] - protectionContainerName := rs.Primary.Attributes["recovery_source_protection_container_name"] - mappingName := rs.Primary.Attributes["name"] - - // Ensure mapping exists in API - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ContainerMappingClient(resourceGroupName, vaultName) - - resp, err := client.Get(ctx, fabricName, protectionContainerName, mappingName) - if err != nil { - return nil - } - - if resp.StatusCode != http.StatusNotFound { - return fmt.Errorf("Container Mapping still exists:\n%#v", resp.Properties) - } - } - - return nil -} diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_container_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_container_test.go deleted file mode 100644 index 28144fd3ae13d..0000000000000 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_container_test.go +++ /dev/null @@ -1,121 +0,0 @@ -package tests - -import ( - "fmt" - "net/http" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" -) - -func TestAccAzureRMRecoveryProtectionContainer_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_container", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryProtectionContainerDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryProtectionContainer_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMRecoveryProtectionContainerExists(data.ResourceName), - ), - }, - data.ImportStep(), - }, - }) -} - -func testAccAzureRMRecoveryProtectionContainer_basic(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-recovery-%d" - location = "%s" -} - -resource "azurerm_recovery_services_vault" "test" { - name = "acctest-vault-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku = "Standard" - - soft_delete_enabled = false -} - -resource "azurerm_recovery_services_fabric" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "acctest-fabric-%d" - location = "${azurerm_resource_group.test.location}" -} - -resource "azurerm_recovery_services_protection_container" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - recovery_fabric_name = "${azurerm_recovery_services_fabric.test.name}" - name = "acctest-protection-cont-%d" -} - -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - -func testCheckAzureRMRecoveryProtectionContainerExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - state, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %s", resourceName) - } - - resourceGroupName := state.Primary.Attributes["resource_group_name"] - vaultName := state.Primary.Attributes["recovery_vault_name"] - fabricName := state.Primary.Attributes["recovery_fabric_name"] - protectionContainerName := state.Primary.Attributes["name"] - - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ProtectionContainerClient(resourceGroupName, vaultName) - - resp, err := client.Get(ctx, fabricName, protectionContainerName) - if err != nil { - return fmt.Errorf("Bad: Get on RecoveryServices.ProtectionContainerClient: %+v", err) - } - - if resp.Response.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: Protection Container: %q does not exist", fabricName) - } - - return nil - } -} - -func testCheckAzureRMRecoveryProtectionContainerDestroy(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_recovery_services_protection_container" { - continue - } - - resourceGroupName := rs.Primary.Attributes["resource_group_name"] - vaultName := rs.Primary.Attributes["recovery_vault_name"] - fabricName := rs.Primary.Attributes["recovery_fabric_name"] - protectionContainerName := rs.Primary.Attributes["name"] - - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ProtectionContainerClient(resourceGroupName, vaultName) - - resp, err := client.Get(ctx, fabricName, protectionContainerName) - if err != nil { - return nil - } - - if resp.StatusCode != http.StatusNotFound { - return fmt.Errorf("Protection Container Client still exists:\n%#v", resp.Properties) - } - } - - return nil -} diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_policy_vm_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_policy_vm_test.go deleted file mode 100644 index 06811f24f7233..0000000000000 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_policy_vm_test.go +++ /dev/null @@ -1,555 +0,0 @@ -package tests - -import ( - "fmt" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func TestAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_policy_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectionPolicyVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data.ResourceName, data.RandomInteger), - }, - data.ImportStep(), - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectionPolicyVm_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_policy_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectionPolicyVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data.ResourceName, data.RandomInteger), - }, - data.RequiresImportErrorStep(testAccAzureRMRecoveryServicesProtectionPolicyVm_requiresImport), - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectionPolicyVm_basicWeekly(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_policy_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectionPolicyVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_basicWeekly(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_basicWeekly(data.ResourceName, data.RandomInteger), - }, - data.ImportStep(), - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectionPolicyVm_completeDaily(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_policy_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectionPolicyVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_completeDaily(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_completeDaily(data.ResourceName, data.RandomInteger), - }, - data.ImportStep(), - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeekly(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_policy_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectionPolicyVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeekly(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeekly(data.ResourceName, data.RandomInteger), - }, - data.ImportStep(), - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectionPolicyVm_updateDaily(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_policy_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectionPolicyVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data.ResourceName, data.RandomInteger), - }, - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_completeDaily(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_completeDaily(data.ResourceName, data.RandomInteger), - }, - data.ImportStep(), - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectionPolicyVm_updateWeekly(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_policy_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectionPolicyVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_basicWeekly(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_basicWeekly(data.ResourceName, data.RandomInteger), - }, - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeekly(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeekly(data.ResourceName, data.RandomInteger), - }, - data.ImportStep(), - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectionPolicyVm_updateDailyToWeekly(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_policy_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectionPolicyVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data.ResourceName, data.RandomInteger), - }, - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_basicWeekly(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_basicWeekly(data.ResourceName, data.RandomInteger), - }, - data.ImportStep(), - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectionPolicyVm_updateWeeklyToDaily(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_policy_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectionPolicyVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_basicWeekly(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_basicWeekly(data.ResourceName, data.RandomInteger), - }, - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data.ResourceName, data.RandomInteger), - }, - data.ImportStep(), - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectionPolicyVm_updateWeeklyToPartial(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_policy_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectionPolicyVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeekly(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeekly(data.ResourceName, data.RandomInteger), - }, - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeeklyPartial(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeeklyPartial(data.ResourceName, data.RandomInteger), - }, - data.ImportStep(), - }, - }) -} - -func testCheckAzureRMRecoveryServicesProtectionPolicyVmDestroy(s *terraform.State) error { - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ProtectionPoliciesClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_recovery_services_protection_policy_vm" { - continue - } - - resourceGroup := rs.Primary.Attributes["resource_group_name"] - vaultName := rs.Primary.Attributes["recovery_vault_name"] - policyName := rs.Primary.Attributes["name"] - - resp, err := client.Get(ctx, vaultName, resourceGroup, policyName) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - return nil - } - - return err - } - - return fmt.Errorf("Recovery Services Vault Policy still exists:\n%#v", resp) - } - - return nil -} - -func testCheckAzureRMRecoveryServicesProtectionPolicyVmExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ProtectionPoliciesClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - // Ensure we have enough information in state to look up in API - rs, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %q", resourceName) - } - - vaultName := rs.Primary.Attributes["recovery_vault_name"] - policyName := rs.Primary.Attributes["name"] - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for Recovery Services Vault %q Policy: %q", vaultName, policyName) - } - - resp, err := client.Get(ctx, vaultName, resourceGroup, policyName) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - return fmt.Errorf("Recovery Services Vault Policy %q (resource group: %q) was not found: %+v", policyName, resourceGroup, err) - } - - return fmt.Errorf("Bad: Get on recoveryServicesVaultsClient: %+v", err) - } - - return nil - } -} - -func testAccAzureRMRecoveryServicesProtectionPolicyVm_base(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%[1]d" - location = "%[2]s" -} - -resource "azurerm_recovery_services_vault" "test" { - name = "acctest-%[1]d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku = "Standard" - - soft_delete_enabled = false -} -`, data.RandomInteger, data.Locations.Primary) -} - -func testAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectionPolicyVm_base(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protection_policy_vm" "test" { - name = "acctest-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - - backup { - frequency = "Daily" - time = "23:00" - } - - retention_daily { - count = 10 - } -} -`, template, data.RandomInteger) -} - -func testAccAzureRMRecoveryServicesProtectionPolicyVm_requiresImport(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protection_policy_vm" "import" { - name = "${azurerm_recovery_services_protection_policy_vm.test.name}" - resource_group_name = "${azurerm_recovery_services_protection_policy_vm.test.resource_group_name}" - recovery_vault_name = "${azurerm_recovery_services_protection_policy_vm.test.recovery_vault_name}" - - backup { - frequency = "Daily" - time = "23:00" - } - - retention_daily { - count = 10 - } -} -`, template) -} - -func checkAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(resourceName string, ri int) resource.TestCheckFunc { - return resource.ComposeAggregateTestCheckFunc( - testCheckAzureRMRecoveryServicesProtectionPolicyVmExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("acctest-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "resource_group_name", fmt.Sprintf("acctestRG-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "recovery_vault_name", fmt.Sprintf("acctest-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "backup.0.frequency", "Daily"), - resource.TestCheckResourceAttr(resourceName, "backup.0.time", "23:00"), - resource.TestCheckResourceAttr(resourceName, "retention_daily.0.count", "10"), - ) -} - -func testAccAzureRMRecoveryServicesProtectionPolicyVm_basicWeekly(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectionPolicyVm_base(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protection_policy_vm" "test" { - name = "acctest-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - - backup { - frequency = "Weekly" - time = "23:00" - weekdays = ["Sunday", "Wednesday"] - } - - retention_weekly { - count = 42 - weekdays = ["Sunday", "Wednesday"] - } -} -`, template, data.RandomInteger) -} - -func checkAccAzureRMRecoveryServicesProtectionPolicyVm_basicWeekly(resourceName string, ri int) resource.TestCheckFunc { - return resource.ComposeAggregateTestCheckFunc( - testCheckAzureRMRecoveryServicesProtectionPolicyVmExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("acctest-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "resource_group_name", fmt.Sprintf("acctestRG-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "recovery_vault_name", fmt.Sprintf("acctest-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "backup.0.frequency", "Weekly"), - resource.TestCheckResourceAttr(resourceName, "backup.0.time", "23:00"), - resource.TestCheckResourceAttr(resourceName, "retention_weekly.0.count", "42"), - resource.TestCheckResourceAttr(resourceName, "retention_weekly.0.weekdays.#", "2"), - ) -} - -func testAccAzureRMRecoveryServicesProtectionPolicyVm_completeDaily(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectionPolicyVm_base(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protection_policy_vm" "test" { - name = "acctest-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - - backup { - frequency = "Daily" - time = "23:00" - } - - retention_daily { - count = 10 - } - - retention_weekly { - count = 42 - weekdays = ["Sunday", "Wednesday"] - } - - retention_monthly { - count = 7 - weekdays = ["Sunday", "Wednesday"] - weeks = ["First", "Last"] - } - - retention_yearly { - count = 77 - weekdays = ["Sunday", "Wednesday"] - weeks = ["First", "Last"] - months = ["January", "July"] - } -} -`, template, data.RandomInteger) -} - -func checkAccAzureRMRecoveryServicesProtectionPolicyVm_completeDaily(resourceName string, ri int) resource.TestCheckFunc { - return resource.ComposeAggregateTestCheckFunc( - testCheckAzureRMRecoveryServicesProtectionPolicyVmExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("acctest-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "resource_group_name", fmt.Sprintf("acctestRG-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "recovery_vault_name", fmt.Sprintf("acctest-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "backup.0.frequency", "Daily"), - resource.TestCheckResourceAttr(resourceName, "backup.0.time", "23:00"), - resource.TestCheckResourceAttr(resourceName, "retention_daily.0.count", "10"), - resource.TestCheckResourceAttr(resourceName, "retention_weekly.0.count", "42"), - resource.TestCheckResourceAttr(resourceName, "retention_weekly.0.weekdays.#", "2"), - resource.TestCheckResourceAttr(resourceName, "retention_monthly.0.count", "7"), - resource.TestCheckResourceAttr(resourceName, "retention_monthly.0.weekdays.#", "2"), - resource.TestCheckResourceAttr(resourceName, "retention_monthly.0.weeks.#", "2"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.count", "77"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.weekdays.#", "2"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.weeks.#", "2"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.months.#", "2"), - ) -} - -func testAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeekly(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectionPolicyVm_base(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protection_policy_vm" "test" { - name = "acctest-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - - backup { - frequency = "Weekly" - time = "23:00" - weekdays = ["Sunday", "Wednesday", "Friday", "Saturday"] - } - - retention_weekly { - count = 42 - weekdays = ["Sunday", "Wednesday", "Friday", "Saturday"] - } - - retention_monthly { - count = 7 - weekdays = ["Sunday", "Wednesday", "Friday", "Saturday"] - weeks = ["First", "Last"] - } - - retention_yearly { - count = 77 - weekdays = ["Sunday", "Wednesday", "Friday", "Saturday"] - weeks = ["First", "Last"] - months = ["January", "July"] - } -} -`, template, data.RandomInteger) -} - -func checkAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeekly(resourceName string, ri int) resource.TestCheckFunc { - return resource.ComposeAggregateTestCheckFunc( - testCheckAzureRMRecoveryServicesProtectionPolicyVmExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("acctest-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "resource_group_name", fmt.Sprintf("acctestRG-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "recovery_vault_name", fmt.Sprintf("acctest-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "backup.0.frequency", "Weekly"), - resource.TestCheckResourceAttr(resourceName, "backup.0.time", "23:00"), - resource.TestCheckResourceAttr(resourceName, "backup.0.weekdays.#", "4"), - resource.TestCheckResourceAttr(resourceName, "retention_weekly.0.count", "42"), - resource.TestCheckResourceAttr(resourceName, "retention_weekly.0.weekdays.#", "4"), - resource.TestCheckResourceAttr(resourceName, "retention_monthly.0.count", "7"), - resource.TestCheckResourceAttr(resourceName, "retention_monthly.0.weekdays.#", "4"), - resource.TestCheckResourceAttr(resourceName, "retention_monthly.0.weeks.#", "2"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.count", "77"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.weekdays.#", "4"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.weeks.#", "2"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.months.#", "2"), - ) -} - -func testAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeeklyPartial(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectionPolicyVm_base(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protection_policy_vm" "test" { - name = "acctest-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - - backup { - frequency = "Weekly" - time = "23:00" - weekdays = ["Sunday", "Wednesday", "Friday", "Saturday"] - } - - retention_weekly { - count = 42 - weekdays = ["Sunday", "Wednesday", "Friday"] - } - - retention_monthly { - count = 7 - weekdays = ["Sunday", "Wednesday"] - weeks = ["First", "Last"] - } - - retention_yearly { - count = 77 - weekdays = ["Sunday"] - weeks = ["Last"] - months = ["January"] - } -} -`, template, data.RandomInteger) -} - -func checkAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeeklyPartial(resourceName string, ri int) resource.TestCheckFunc { - return resource.ComposeAggregateTestCheckFunc( - testCheckAzureRMRecoveryServicesProtectionPolicyVmExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("acctest-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "resource_group_name", fmt.Sprintf("acctestRG-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "recovery_vault_name", fmt.Sprintf("acctest-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "backup.0.frequency", "Weekly"), - resource.TestCheckResourceAttr(resourceName, "backup.0.time", "23:00"), - resource.TestCheckResourceAttr(resourceName, "backup.0.weekdays.#", "4"), - resource.TestCheckResourceAttr(resourceName, "retention_weekly.0.count", "42"), - resource.TestCheckResourceAttr(resourceName, "retention_weekly.0.weekdays.#", "3"), - resource.TestCheckResourceAttr(resourceName, "retention_monthly.0.count", "7"), - resource.TestCheckResourceAttr(resourceName, "retention_monthly.0.weekdays.#", "2"), - resource.TestCheckResourceAttr(resourceName, "retention_monthly.0.weeks.#", "2"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.count", "77"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.weekdays.#", "1"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.weeks.#", "1"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.months.#", "1"), - ) -} diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_replicated_vm_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_replicated_vm_test.go deleted file mode 100644 index ed035ebfd46ee..0000000000000 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_replicated_vm_test.go +++ /dev/null @@ -1,269 +0,0 @@ -package tests - -import ( - "fmt" - "net/http" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" -) - -func TestAccAzureRMRecoveryReplicatedVm_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_replicated_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryReplicatedVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryReplicatedVm_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMRecoveryReplicatedVmExists(data.ResourceName), - ), - }, - data.ImportStep(), - }, - }) -} - -func testAccAzureRMRecoveryReplicatedVm_basic(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-recovery-%d-1" - location = "%s" -} - -resource "azurerm_resource_group" "test2" { - name = "acctestRG-recovery-%d-2" - location = "%s" -} - -resource "azurerm_recovery_services_vault" "test" { - name = "acctest-vault-%d" - location = "${azurerm_resource_group.test2.location}" - resource_group_name = "${azurerm_resource_group.test2.name}" - sku = "Standard" - - soft_delete_enabled = false -} - -resource "azurerm_recovery_services_fabric" "test1" { - resource_group_name = "${azurerm_resource_group.test2.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "acctest-fabric1-%d" - location = "${azurerm_resource_group.test.location}" -} - -resource "azurerm_recovery_services_fabric" "test2" { - resource_group_name = "${azurerm_resource_group.test2.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "acctest-fabric2-%d" - location = "${azurerm_resource_group.test2.location}" - depends_on = ["azurerm_recovery_services_fabric.test1"] -} - -resource "azurerm_recovery_services_protection_container" "test1" { - resource_group_name = "${azurerm_resource_group.test2.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - recovery_fabric_name = "${azurerm_recovery_services_fabric.test1.name}" - name = "acctest-protection-cont1-%d" -} - -resource "azurerm_recovery_services_protection_container" "test2" { - resource_group_name = "${azurerm_resource_group.test2.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - recovery_fabric_name = "${azurerm_recovery_services_fabric.test2.name}" - name = "acctest-protection-cont2-%d" -} - -resource "azurerm_recovery_services_replication_policy" "test" { - resource_group_name = "${azurerm_resource_group.test2.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "acctest-policy-%d" - recovery_point_retention_in_minutes = "${24 * 60}" - application_consistent_snapshot_frequency_in_minutes = "${4 * 60}" -} - -resource "azurerm_recovery_services_protection_container_mapping" "test" { - resource_group_name = "${azurerm_resource_group.test2.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - recovery_fabric_name = "${azurerm_recovery_services_fabric.test1.name}" - recovery_source_protection_container_name = "${azurerm_recovery_services_protection_container.test1.name}" - recovery_target_protection_container_id = "${azurerm_recovery_services_protection_container.test2.id}" - recovery_replication_policy_id = "${azurerm_recovery_services_replication_policy.test.id}" - name = "mapping-%d" -} - -resource "azurerm_virtual_network" "test1" { - name = "net-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - address_space = ["192.168.1.0/24"] - location = "${azurerm_recovery_services_fabric.test1.location}" -} -resource "azurerm_subnet" "test1" { - name = "snet-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test1.name}" - address_prefix = "192.168.1.0/24" -} - - -resource "azurerm_virtual_network" "test2" { - name = "net-%d" - resource_group_name = "${azurerm_resource_group.test2.name}" - address_space = ["192.168.2.0/24"] - location = "${azurerm_recovery_services_fabric.test2.location}" -} - -resource "azurerm_recovery_network_mapping" "test" { - resource_group_name = "${azurerm_resource_group.test2.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "mapping-%d" - source_recovery_fabric_name = "${azurerm_recovery_services_fabric.test1.name}" - target_recovery_fabric_name = "${azurerm_recovery_services_fabric.test2.name}" - source_network_id = "${azurerm_virtual_network.test1.id}" - target_network_id = "${azurerm_virtual_network.test2.id}" -} - -resource "azurerm_network_interface" "test" { - name = "vm-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "vm-%d" - subnet_id = "${azurerm_subnet.test1.id}" - private_ip_address_allocation = "Dynamic" - } -} - -resource "azurerm_virtual_machine" "test" { - name = "vm-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - vm_size = "Standard_B1s" - - storage_image_reference { - publisher = "OpenLogic" - offer = "CentOS" - sku = "7.5" - version = "latest" - } - - storage_os_disk { - name = "disk-%d" - os_type = "Linux" - caching = "ReadWrite" - create_option = "FromImage" - managed_disk_type = "Premium_LRS" - } - - os_profile { - admin_username = "testadmin" - admin_password = "Password1234!" - computer_name = "vm-%d" - } - - os_profile_linux_config { - disable_password_authentication = false - - } - network_interface_ids = ["${azurerm_network_interface.test.id}"] -} - -resource "azurerm_storage_account" "test" { - name = "acct%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - account_tier = "Standard" - account_replication_type = "LRS" -} - -resource "azurerm_recovery_replicated_vm" "test" { - name = "repl-%d" - resource_group_name = "${azurerm_resource_group.test2.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - source_vm_id = "${azurerm_virtual_machine.test.id}" - source_recovery_fabric_name = "${azurerm_recovery_services_fabric.test1.name}" - recovery_replication_policy_id = "${azurerm_recovery_services_replication_policy.test.id}" - source_recovery_protection_container_name = "${azurerm_recovery_services_protection_container.test1.name}" - - target_resource_group_id = "${azurerm_resource_group.test2.id}" - target_recovery_fabric_id = "${azurerm_recovery_services_fabric.test2.id}" - target_recovery_protection_container_id = "${azurerm_recovery_services_protection_container.test2.id}" - - managed_disk { - disk_id = "${azurerm_virtual_machine.test.storage_os_disk.0.managed_disk_id}" - staging_storage_account_id = "${azurerm_storage_account.test.id}" - target_resource_group_id = "${azurerm_resource_group.test2.id}" - target_disk_type = "Premium_LRS" - target_replica_disk_type = "Premium_LRS" - } - depends_on = ["azurerm_recovery_services_protection_container_mapping.test", "azurerm_recovery_network_mapping.test"] -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.Locations.Secondary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - -func testCheckAzureRMRecoveryReplicatedVmExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - state, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %s", resourceName) - } - - resourceGroupName := state.Primary.Attributes["resource_group_name"] - vaultName := state.Primary.Attributes["recovery_vault_name"] - fabricName := state.Primary.Attributes["source_recovery_fabric_name"] - protectionContainerName := state.Primary.Attributes["source_recovery_protection_container_name"] - replicationName := state.Primary.Attributes["name"] - - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ReplicationMigrationItemsClient(resourceGroupName, vaultName) - - resp, err := client.Get(ctx, fabricName, protectionContainerName, replicationName) - if err != nil { - return fmt.Errorf("Bad: Get on RecoveryServices.ReplicationMigrationItemsClient: %+v", err) - } - - if resp.Response.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: Recovery Services Replicated VM: %q does not exist", fabricName) - } - - return nil - } -} - -func testCheckAzureRMRecoveryReplicatedVmDestroy(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_recovery_replicated_vm" { - continue - } - - resourceGroupName := rs.Primary.Attributes["resource_group_name"] - vaultName := rs.Primary.Attributes["recovery_vault_name"] - fabricName := rs.Primary.Attributes["source_recovery_fabric_name"] - protectionContainerName := rs.Primary.Attributes["source_recovery_protection_container_name"] - replicationName := rs.Primary.Attributes["name"] - - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ReplicationMigrationItemsClient(resourceGroupName, vaultName) - - resp, err := client.Get(ctx, fabricName, protectionContainerName, replicationName) - if err != nil { - return nil - } - - if resp.StatusCode != http.StatusNotFound { - return fmt.Errorf("Recovery Services Replicated VM still exists:\n%#v", resp.Properties) - } - } - - return nil -} diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_replication_policy_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_replication_policy_test.go deleted file mode 100644 index a414f13e7aa17..0000000000000 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_replication_policy_test.go +++ /dev/null @@ -1,113 +0,0 @@ -package tests - -import ( - "fmt" - "net/http" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" -) - -func TestAccAzureRMRecoveryReplicationPolicy_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_replication_policy", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryReplicationPolicyDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryReplicationPolicy_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMRecoveryReplicationPolicyExists(data.ResourceName), - ), - }, - data.ImportStep(), - }, - }) -} - -func testAccAzureRMRecoveryReplicationPolicy_basic(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-recovery-%d" - location = "%s" -} - -resource "azurerm_recovery_services_vault" "test" { - name = "acctest-vault-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku = "Standard" - - soft_delete_enabled = false -} - -resource "azurerm_recovery_services_replication_policy" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "acctest-policy-%d" - recovery_point_retention_in_minutes = "${24 * 60}" - application_consistent_snapshot_frequency_in_minutes = "${4 * 60}" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) -} - -func testCheckAzureRMRecoveryReplicationPolicyExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - // Ensure we have enough information in state to look up in API - state, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %s", resourceName) - } - - resourceGroupName := state.Primary.Attributes["resource_group_name"] - vaultName := state.Primary.Attributes["recovery_vault_name"] - policyName := state.Primary.Attributes["name"] - - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ReplicationPoliciesClient(resourceGroupName, vaultName) - - resp, err := client.Get(ctx, policyName) - if err != nil { - return fmt.Errorf("Bad: Get on RecoveryServices.ReplicationPoliciesClient: %+v", err) - } - - if resp.Response.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: Replication Policies: %q does not exist", policyName) - } - - return nil - } -} - -func testCheckAzureRMRecoveryReplicationPolicyDestroy(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_recovery_services_replication_policy" { - continue - } - - resourceGroup := rs.Primary.Attributes["resource_group_name"] - vaultName := rs.Primary.Attributes["recovery_vault_name"] - policyName := rs.Primary.Attributes["name"] - - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ReplicationPoliciesClient(resourceGroup, vaultName) - - resp, err := client.Get(ctx, policyName) - if err != nil { - return nil - } - - if resp.StatusCode != http.StatusNotFound { - return fmt.Errorf("Replication Policy still exists:\n%#v", resp.Properties) - } - } - - return nil -} diff --git a/website/azurerm.erb b/website/azurerm.erb index 13e50d7b10782..450524c095bbd 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -122,6 +122,10 @@ azurerm_availability_set +
  • + azurerm_backup_policy_vm +
    • +
  • azurerm_batch_account
    • @@ -406,10 +410,6 @@ azurerm_recovery_services_vault -
  • - azurerm_recovery_services_protection_policy_vm -
    • -
  • azurerm_redis_cache
    • @@ -2014,38 +2014,6 @@
  • Recovery Services
      -
    • - azurerm_recovery_network_mapping -
      • - -
    • - azurerm_recovery_services_fabric -
      • - -
    • - azurerm_recovery_services_protection_container -
      • - -
    • - azurerm_recovery_services_protection_container_mapping -
      • - -
    • - azurerm_recovery_services_protection_policy_vm -
      • - -
    • - azurerm_recovery_services_protected_vm -
      • - -
    • - azurerm_recovery_services_replicated_vm -
      • - -
    • - azurerm_recovery_services_replication_policy -
      • -
    • azurerm_recovery_services_vault
      • diff --git a/website/docs/d/recovery_services_protection_policy_vm.markdown b/website/docs/d/backup_policy_vm.markdown similarity index 89% rename from website/docs/d/recovery_services_protection_policy_vm.markdown rename to website/docs/d/backup_policy_vm.markdown index 18c5dce3909ce..721da2e466847 100644 --- a/website/docs/d/recovery_services_protection_policy_vm.markdown +++ b/website/docs/d/backup_policy_vm.markdown @@ -1,7 +1,7 @@ --- subcategory: "Recovery Services" layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_recovery_services_protection_policy_vm" +page_title: "Azure Resource Manager: azurerm_backup_policy_vm" description: |- Gets information about an existing Recovery Services VM Protection Policy. --- @@ -13,7 +13,7 @@ Use this data source to access information about an existing Recovery Services V ## Example Usage ```hcl -data "azurerm_recovery_services_protection_policy_vm" "policy" { +data "azurerm_backup_policy_vm" "policy" { name = "policy" recovery_vault_name = "recovery_vault" resource_group_name = "resource_group" diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index ec9400b098483..1d15c72ef7564 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -466,6 +466,38 @@ The `sku_name` field will become Required. The deprecated `public_ip_address_allocation` field will be removed. This field has been replaced by `allocation_method`. +### Resource `azurerm_recovery_replicated_vm` + +This resource was deprecated in favor of `azurerm_site_recovery_replicated_vm` and has been removed. + +### Resource `azurerm_recovery_services_fabric` + +The resource was deprecated in favor of `azurerm_site_recovery_fabric` and has been removed. + +### Resource `azurerm_recovery_services_network_mapping` + +This resource was deprecated in favor of `azurerm_site_recovery_network_mapping` and has been removed. + +### Resource `azurerm_recovery_services_protected_vm` + +This resource was deprecated in favor of `azurerm_backup_protected_vm` and has been removed. + +### Resource `azurerm_recovery_services_protection_container` + +This resource was deprecated in favor of `azurerm_site_recovery_protection_container` and has been removed. + +### Resource `azurerm_recovery_services_protection_container_mapping` + +This resource was deprecated in favor of `azurerm_site_recovery_protection_container_mapping` and has been removed. + +### Resource `azurerm_recovery_services_protection_policy_vm` + +This resource was deprecated in favor of `azurerm_backup_policy_vm` and has been removed. + +### Resource `azurerm_recovery_services_replication_policy` + +This resource was deprecated in favor of `azurerm_site_recovery_replication_policy` and has been removed. + ### Resource: `azurerm_relay_namespace` The deprecated `sku` block has been replaced by the `sku_name` field and will be removed. diff --git a/website/docs/r/recovery_network_mapping.html.markdown b/website/docs/r/recovery_network_mapping.html.markdown deleted file mode 100644 index 87eb1738b4acf..0000000000000 --- a/website/docs/r/recovery_network_mapping.html.markdown +++ /dev/null @@ -1,114 +0,0 @@ ---- -subcategory: "Recovery Services" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_recovery_network_mapping" -description: |- - Manages a site recovery network mapping on Azure. ---- - -# azurerm_recovery_network_mapping - -~> **NOTE:** This resource has been deprecated in favour of the `azurerm_site_recovery_network_mapping` resource and will be removed in the next major version of the AzureRM Provider. The new resource shares the same fields as this one, and information on migrating across [can be found in this guide](../guides/migrating-between-renamed-resources.html). - -Manages a site recovery network mapping on Azure. A network mapping decides how to translate connected netwroks when a VM is migrated from one region to another. - -## Example Usage - -```hcl -resource "azurerm_resource_group" "primary" { - name = "tfex-network-mapping-primary" - location = "West US" -} - -resource "azurerm_resource_group" "secondary" { - name = "tfex-network-mapping-secondary" - location = "East US" -} - -resource "azurerm_recovery_services_vault" "vault" { - name = "example-recovery-vault" - location = azurerm_resource_group.secondary.location - resource_group_name = azurerm_resource_group.secondary.name - sku = "Standard" -} - -resource "azurerm_recovery_services_fabric" "primary" { - name = "primary-fabric" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - location = azurerm_resource_group.primary.location -} - -resource "azurerm_recovery_services_fabric" "secondary" { - name = "secondary-fabric" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - location = azurerm_resource_group.secondary.location - depends_on = [azurerm_recovery_services_fabric.primary] # Avoids issues with crearing fabrics simultainusly -} - -resource "azurerm_virtual_network" "primary" { - name = "network1" - resource_group_name = azurerm_resource_group.primary.name - address_space = ["192.168.1.0/24"] - location = azurerm_resource_group.primary.location -} - -resource "azurerm_virtual_network" "secondary" { - name = "network2" - resource_group_name = azurerm_resource_group.secondary.name - address_space = ["192.168.2.0/24"] - location = azurerm_resource_group.secondary.location -} - -resource "azurerm_recovery_network_mapping" "recovery-mapping" { - name = "recovery-network-mapping-1" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - source_recovery_fabric_name = "primary-fabric" - target_recovery_fabric_name = "secondary-fabric" - source_network_id = azurerm_virtual_network.primary.id - target_network_id = azurerm_virtual_network.secondary.id -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required) The name of the network mapping. - -* `resource_group_name` - (Required) Name of the resource group where the vault that should be updated is located. - -* `recovery_vault_name` - (Required) The name of the vault that should be updated. - -* `source_recovery_fabric_name` - (Required) Specifies the ASR fabric where mapping should be created. - -* `target_recovery_fabric_name` - (Required) The Azure Site Recovery fabric object corresponding to the recovery Azure region. - -* `source_network_id` - (Required) The id of the primary network. - -* `target_network_id` - (Required) The id of the recovery network. - -## Attributes Reference - -In addition to the arguments above, the following attributes are exported: - -* `id` - The ID of the Site Recovery Networking Mapping. - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `create` - (Defaults to 30 minutes) Used when creating the Site Recovery Networking Mapping. -* `update` - (Defaults to 30 minutes) Used when updating the Site Recovery Networking Mapping. -* `read` - (Defaults to 5 minutes) Used when retrieving the Site Recovery Networking Mapping. -* `delete` - (Defaults to 30 minutes) Used when deleting the Site Recovery Networking Mapping. - -## Import - -Site recovery network mapping can be imported using the `resource id`, e.g. - -```shell -terraform import azurerm_recovery_network_mapping.mymapping /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.RecoveryServices/vaults/recovery-vault-name/replicationFabrics/primary-fabric-name/replicationNetworks/azureNetwork/replicationNetworkMappings/mapping-name -``` diff --git a/website/docs/r/recovery_services_fabric.html.markdown b/website/docs/r/recovery_services_fabric.html.markdown deleted file mode 100644 index 441b7dfca1805..0000000000000 --- a/website/docs/r/recovery_services_fabric.html.markdown +++ /dev/null @@ -1,76 +0,0 @@ ---- -subcategory: "Recovery Services" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_recovery_services_fabric" -description: |- - Manages a site recovery services fabric on Azure. ---- - -# azurerm_recovery_services_fabric - -~> **NOTE:** This resource has been deprecated in favour of the `azurerm_site_recovery_fabric` resource and will be removed in the next major version of the AzureRM Provider. The new resource shares the same fields as this one, and information on migrating across [can be found in this guide](../guides/migrating-between-renamed-resources.html). - -Manages a Azure recovery vault fabric. - -## Example Usage - -```hcl -resource "azurerm_resource_group" "primary" { - name = "tfex-network-mapping-primary" - location = "West US" -} - -resource "azurerm_resource_group" "secondary" { - name = "tfex-network-mapping-secondary" - location = "East US" -} - -resource "azurerm_recovery_services_vault" "vault" { - name = "example-recovery-vault" - location = azurerm_resource_group.secondary.location - resource_group_name = azurerm_resource_group.secondary.name - sku = "Standard" -} - -resource "azurerm_recovery_services_fabric" "fabric" { - name = "primary-fabric" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - location = azurerm_resource_group.primary.location -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required) The name of the network mapping. - -* `resource_group_name` - (Required) Name of the resource group where the vault that should be updated is located. - -* `recovery_vault_name` - (Required) The name of the vault that should be updated. - -* `location` - (Required) In what region should the fabric be located. - -## Attributes Reference - -In addition to the arguments above, the following attributes are exported: - -* `id` - The ID of the Site Recovery Services Fabric. - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `create` - (Defaults to 30 minutes) Used when creating the Site Recovery Services Fabric. -* `update` - (Defaults to 30 minutes) Used when updating the Site Recovery Services Fabric. -* `read` - (Defaults to 5 minutes) Used when retrieving the Site Recovery Services Fabric. -* `delete` - (Defaults to 30 minutes) Used when deleting the Site Recovery Services Fabric. - -## Import - -Site Recovery Service Fabric's can be imported using the `resource id`, e.g. - -```shell -terraform import azurerm_recovery_services_fabric.myfabric /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.RecoveryServices/vaults/recovery-vault-name/replicationFabrics/fabric-name -``` diff --git a/website/docs/r/recovery_services_protected_vm.markdown b/website/docs/r/recovery_services_protected_vm.markdown deleted file mode 100644 index ea6b45cf49b8c..0000000000000 --- a/website/docs/r/recovery_services_protected_vm.markdown +++ /dev/null @@ -1,87 +0,0 @@ ---- -subcategory: "Recovery Services" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_recovery_services_protected_vm" -description: |- - Manages an Recovery Services Protected VM. ---- - -# azurerm_recovery_services_protected_vm - -~> **NOTE:** This resource has been deprecated in favour of the `azurerm_backup_protected_vm` resource and will be removed in the next major version of the AzureRM Provider. The new resource shares the same fields as this one, and information on migrating across [can be found in this guide](../guides/migrating-between-renamed-resources.html). - -Manages an Recovery Protected VM. - -## Example Usage - -```hcl -resource "azurerm_resource_group" "example" { - name = "tfex-recovery_vault" - location = "West US" -} - -resource "azurerm_recovery_services_vault" "example" { - name = "tfex-recovery-vault" - location = "${azurerm_resource_group.example.location}" - resource_group_name = "${azurerm_resource_group.example.name}" - sku = "Standard" -} - -resource "azurerm_recovery_services_protection_policy_vm" "example" { - name = "tfex-recovery-vault-policy" - resource_group_name = "${azurerm_resource_group.example.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.example.name}" - - backup { - frequency = "Daily" - time = "23:00" - } -} - -resource "azurerm_recovery_services_protected_vm" "vm1" { - resource_group_name = "${azurerm_resource_group.example.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.example.name}" - source_vm_id = "${azurerm_virtual_machine.example.id}" - backup_policy_id = "${azurerm_recovery_services_protection_policy_vm.example.id}" -} -``` - -## Argument Reference - -The following arguments are supported: - -* `resource_group_name` - (Required) The name of the resource group in which to create the Recovery Services Protected VM. Changing this forces a new resource to be created. - -* `recovery_vault_name` - (Required) Specifies the name of the Recovery Services Vault to use. Changing this forces a new resource to be created. - -* `source_vm_id` - (Required) Specifies the ID of the VM to backup. Changing this forces a new resource to be created. - -* `backup_policy_id` - (Required) Specifies the id of the backup policy to use. - -* `tags` - (Optional) A mapping of tags to assign to the resource. - -## Attributes Reference - -The following attributes are exported: - -* `id` - The ID of the Recovery Services Protected VM. - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `create` - (Defaults to 80 minutes) Used when creating the Recovery Services Protected VM. -* `update` - (Defaults to 80 minutes) Used when updating the Recovery Services Protected VM. -* `read` - (Defaults to 5 minutes) Used when retrieving the Recovery Services Protected VM. -* `delete` - (Defaults to 80 minutes) Used when deleting the Recovery Services Protected VM. - -## Import - -Recovery Services Protected VMs can be imported using the `resource id`, e.g. - -```shell -terraform import azurerm_recovery_services_protected_vm.item1 "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.RecoveryServices/vaults/example-recovery-vault/backupFabrics/Azure/protectionContainers/iaasvmcontainer;iaasvmcontainerv2;group1;vm1/protectedItems/vm;iaasvmcontainerv2;group1;vm1" -``` - -Note the ID requires quoting as there are semicolons -m diff --git a/website/docs/r/recovery_services_protection_container.html.markdown b/website/docs/r/recovery_services_protection_container.html.markdown deleted file mode 100644 index 39dc0f10c2bd6..0000000000000 --- a/website/docs/r/recovery_services_protection_container.html.markdown +++ /dev/null @@ -1,83 +0,0 @@ ---- -subcategory: "Recovery Services" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_recovery_services_protection_container" -description: |- - Manages a site recovery services protection container on Azure. ---- - -# azurerm_recovery_services_protection_container - -~> **NOTE:** This resource has been deprecated in favour of the `azurerm_site_recovery_protection_container` resource and will be removed in the next major version of the AzureRM Provider. The new resource shares the same fields as this one, and information on migrating across [can be found in this guide](../guides/migrating-between-renamed-resources.html). - -Manages a Azure recovery vault protection container. - -## Example Usage - -```hcl -resource "azurerm_resource_group" "primary" { - name = "tfex-network-mapping-primary" - location = "West US" -} - -resource "azurerm_resource_group" "secondary" { - name = "tfex-network-mapping-secondary" - location = "East US" -} - -resource "azurerm_recovery_services_vault" "vault" { - name = "example-recovery-vault" - location = azurerm_resource_group.secondary.location - resource_group_name = azurerm_resource_group.secondary.name - sku = "Standard" -} - -resource "azurerm_recovery_services_fabric" "fabric" { - name = "primary-fabric" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - location = azurerm_resource_group.primary.location -} - -resource "azurerm_recovery_services_protection_container" "protection-container" { - name = "protection-container" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - recovery_fabric_name = azurerm_recovery_services_fabric.fabric.name -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required) The name of the network mapping. - -* `resource_group_name` - (Required) Name of the resource group where the vault that should be updated is located. - -* `recovery_vault_name` - (Required) The name of the vault that should be updated. - -* `recovery_fabric_name` - (Required) Name of fabric that should contain this protection container. - -## Attributes Reference - -In addition to the arguments above, the following attributes are exported: - -* `id` - The ID of the Recovery Services Protection Container. - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `create` - (Defaults to 30 minutes) Used when creating the Recovery Services Protection Container. -* `update` - (Defaults to 30 minutes) Used when updating the Recovery Services Protection Container. -* `read` - (Defaults to 5 minutes) Used when retrieving the Recovery Services Protection Container. -* `delete` - (Defaults to 30 minutes) Used when deleting the Recovery Services Protection Container. - -## Import - -Recovery Services Protection Containers can be imported using the `resource id`, e.g. - -```shell -terraform import azurerm_recovery_services_protection_container.mycontainer /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.RecoveryServices/vaults/recovery-vault-name/replicationFabrics/fabric-name/replicationProtectionContainers/protection-container-name -``` diff --git a/website/docs/r/recovery_services_protection_container_mapping.html.markdown b/website/docs/r/recovery_services_protection_container_mapping.html.markdown deleted file mode 100644 index 43ebdcb14ed22..0000000000000 --- a/website/docs/r/recovery_services_protection_container_mapping.html.markdown +++ /dev/null @@ -1,121 +0,0 @@ ---- -subcategory: "Recovery Services" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_recovery_services_protection_container_mapping" -description: |- - Manages a site recovery services protection container mappings on Azure. ---- - -# azurerm_recovery_services_protection_container_mapping - -~> **NOTE:** This resource has been deprecated in favour of the `azurerm_site_recovery_protection_container_mapping` resource and will be removed in the next major version of the AzureRM Provider. The new resource shares the same fields as this one, and information on migrating across [can be found in this guide](../guides/migrating-between-renamed-resources.html). - -Manages a Azure recovery vault protection container mapping. A network protection container mapping decides how to translate the protection container when a VM is migrated from one region to another. - -## Example Usage - -```hcl -resource "azurerm_resource_group" "primary" { - name = "tfex-network-mapping-primary" - location = "West US" -} - -resource "azurerm_resource_group" "secondary" { - name = "tfex-network-mapping-secondary" - location = "East US" -} - -resource "azurerm_recovery_services_vault" "vault" { - name = "example-recovery-vault" - location = azurerm_resource_group.secondary.location - resource_group_name = azurerm_resource_group.secondary.name - sku = "Standard" -} - -resource "azurerm_recovery_services_fabric" "primary" { - name = "primary-fabric" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - location = azurerm_resource_group.primary.location -} - -resource "azurerm_recovery_services_fabric" "secondary" { - name = "secondary-fabric" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - location = azurerm_resource_group.secondary.location -} - -resource "azurerm_recovery_services_protection_container" "primary" { - name = "primary-protection-container" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - recovery_fabric_name = azurerm_recovery_services_fabric.primary.name -} - -resource "azurerm_recovery_services_protection_container" "secondary" { - name = "secondary-protection-container" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - recovery_fabric_name = azurerm_recovery_services_fabric.secondary.name -} - -resource "azurerm_recovery_services_replication_policy" "policy" { - name = "policy" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - recovery_point_retention_in_minutes = 24 * 60 - application_consistent_snapshot_frequency_in_minutes = 4 * 60 -} - -resource "azurerm_recovery_services_protection_container_mapping" "container-mapping" { - name = "container-mapping" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - recovery_fabric_name = azurerm_recovery_services_fabric.primary.name - recovery_source_protection_container_name = azurerm_recovery_services_protection_container.primary.name - recovery_target_protection_container_id = azurerm_recovery_services_protection_container.secondary.id - recovery_replication_policy_id = azurerm_recovery_services_replication_policy.policy.id -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required) The name of the network mapping. - -* `resource_group_name` - (Required) Name of the resource group where the vault that should be updated is located. - -* `recovery_vault_name` - (Required) The name of the vault that should be updated. - -* `recovery_fabric_name` - (Required) Name of fabric that should contains the protection container to map. - -* `recovery_source_protection_container_name` - (Required) Name of the protection container to map. - -* `recovery_target_protection_container_id` - (Required) Id of protection container to map to. - -* `recovery_replication_policy_id` - (Required) Id of the policy to use for this mapping. - -## Attributes Reference - -In addition to the arguments above, the following attributes are exported: - -* `id` - The ID of the Recovery Services Protection Container Mapping. - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `create` - (Defaults to 30 minutes) Used when creating the Recovery Services Protection Container Mapping. -* `update` - (Defaults to 30 minutes) Used when updating the Recovery Services Protection Container Mapping. -* `read` - (Defaults to 5 minutes) Used when retrieving the Recovery Services Protection Container Mapping. -* `delete` - (Defaults to 30 minutes) Used when deleting the Recovery Services Protection Container Mapping. - -## Import - -Recovery Services Protection Container Mappings can be imported using the `resource id`, e.g. - -```shell -terraform import azurerm_recovery_services_protection_container_mapping.mymapping /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.RecoveryServices/vaults/recovery-vault-name/ -``` diff --git a/website/docs/r/recovery_services_protection_policy_vm.markdown b/website/docs/r/recovery_services_protection_policy_vm.markdown deleted file mode 100644 index da5a9ef5e60bc..0000000000000 --- a/website/docs/r/recovery_services_protection_policy_vm.markdown +++ /dev/null @@ -1,159 +0,0 @@ ---- -subcategory: "Recovery Services" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_recovery_services_protection_policy_vm" -description: |- - Manages an Recovery Services VM Protection Policy. ---- - -# azurerm_recovery_services_protection_policy_vm - -~> **NOTE:** This resource has been deprecated in favour of the `azurerm_backup_policy_vm` resource and will be removed in the next major version of the AzureRM Provider. The new resource shares the same fields as this one, and information on migrating across [can be found in this guide](../guides/migrating-between-renamed-resources.html). - -Manages an Recovery Services VM Protection Policy. - -## Example Usage - -```hcl -resource "azurerm_resource_group" "example" { - name = "tfex-recovery_vault" - location = "West US" -} - -resource "azurerm_recovery_services_vault" "example" { - name = "tfex-recovery-vault" - location = "${azurerm_resource_group.example.location}" - resource_group_name = "${azurerm_resource_group.example.name}" - sku = "Standard" -} - -resource "azurerm_recovery_services_protection_policy_vm" "example" { - name = "tfex-recovery-vault-policy" - resource_group_name = "${azurerm_resource_group.example.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.example.name}" - - timezone = "UTC" - - backup { - frequency = "Daily" - time = "23:00" - } - - retention_daily { - count = 10 - } - - retention_weekly { - count = 42 - weekdays = ["Sunday", "Wednesday", "Friday", "Saturday"] - } - - retention_monthly { - count = 7 - weekdays = ["Sunday", "Wednesday"] - weeks = ["First", "Last"] - } - - retention_yearly { - count = 77 - weekdays = ["Sunday"] - weeks = ["Last"] - months = ["January"] - } -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required) Specifies the name of the Recovery Services Vault Policy. Changing this forces a new resource to be created. - -* `resource_group_name` - (Required) The name of the resource group in which to create the Recovery Services Protected VM. Changing this forces a new resource to be created. - -* `recovery_vault_name` - (Required) Specifies the name of the Recovery Services Vault to use. Changing this forces a new resource to be created. - -* `backup` - (Required) Configures the Policy backup frequecent, times & days as documented in the `backup` block below. - -* `timezone` - (Optional) Specifies the timezone. Defaults to `UTC` - -* `retention_daily` - (Optional) Configures the policy daily retention as documented in the `retention_daily` block below. Required when backup frequency is `Daily`. - -* `retention_weekly` - (Optional) Configures the policy weekly retention as documented in the `retention_weekly` block below. Required when backup frequency is `Weekly`. - -* `retention_monthly` - (Optional) Configures the policy monthly retention as documented in the `retention_monthly` block below. - -* `retention_yearly` - (Optional) Configures the policy yearly retention as documented in the `retention_yearly` block below. - -* `tags` - (Optional) A mapping of tags to assign to the resource. - ---- - -The `backup` block supports: - -* `frequency` - (Required) Sets the backup frequency. Must be either `Daily` or`Weekly`. - -* `times` - (Required) The time of day to perform the backup in 24hour format. - -* `weekdays` - (Optional) The days of the week to perform backups on. Must be one of `Sunday`, `Monday`, `Tuesday`, `Wednesday`, `Thursday`, `Friday` or `Saturday`. - ---- - -The `retention_daily` block supports: - -* `count` - (Required) The number of daily backups to keep. Must be between `1` and `9999` - ---- - -The `retention_weekly` block supports: - -* `count` - (Required) The number of weekly backups to keep. Must be between `1` and `9999` - -* `weekdays` - (Required) The weekday backups to retain. Must be one of `Sunday`, `Monday`, `Tuesday`, `Wednesday`, `Thursday`, `Friday` or `Saturday`. - ---- - -The `retention_monthly` block supports: - -* `count` - (Required) The number of monthly backups to keep. Must be between `1` and `9999` - -* `weekdays` - (Required) The weekday backups to retain . Must be one of `Sunday`, `Monday`, `Tuesday`, `Wednesday`, `Thursday`, `Friday` or `Saturday`. - -* `weeks` - (Required) The weeks of the month to retain backups of. Must be one of `First`, `Second`, `Third`, `Fourth`, `Last`. - ---- - -The `retention_yearly` block supports: - -* `count` - (Required) The number of yearly backups to keep. Must be between `1` and `9999` - -* `weekdays` - (Required) The weekday backups to retain . Must be one of `Sunday`, `Monday`, `Tuesday`, `Wednesday`, `Thursday`, `Friday` or `Saturday`. - -* `weeks` - (Required) The weeks of the month to retain backups of. Must be one of `First`, `Second`, `Third`, `Fourth`, `Last`. - -* `months` - (Required) The months of the year to retain backups of. Must be one of `January`, `February`, `March`, `April`, `May`, `June`, `July`, `Augest`, `September`, `October`, `November` and `December`. - ---- - -## Attributes Reference - -The following attributes are exported: - -* `id` - The ID of the Recovery Services VM Protection Policy. - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `create` - (Defaults to 30 minutes) Used when creating the Recovery Services VM Protection Policy. -* `update` - (Defaults to 30 minutes) Used when updating the Recovery Services VM Protection Policy. -* `read` - (Defaults to 5 minutes) Used when retrieving the Recovery Services VM Protection Policy. -* `delete` - (Defaults to 30 minutes) Used when deleting the Recovery Services VM Protection Policy. - -## Import - -Recovery Services VM Protection Policy can be imported using the `resource id`, e.g. - -```shell -terraform import azurerm_recovery_services_protection_policy_vm.policy1 /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.RecoveryServices/vaults/example-recovery-vault/backupPolicies/policy1 -``` diff --git a/website/docs/r/recovery_services_replicated_vm.html.markdown b/website/docs/r/recovery_services_replicated_vm.html.markdown deleted file mode 100644 index 7e8a5fa8253fa..0000000000000 --- a/website/docs/r/recovery_services_replicated_vm.html.markdown +++ /dev/null @@ -1,232 +0,0 @@ ---- -subcategory: "Recovery Services" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_recovery_replicated_vm" -description: |- - Manages a site recovery services protection container mappings on Azure. ---- - -# azurerm_recovery_replicated_vm - -~> **NOTE:** This resource has been deprecated in favour of the `azurerm_site_recovery_replicated_vm` resource and will be removed in the next major version of the AzureRM Provider. The new resource shares the same fields as this one, and information on migrating across [can be found in this guide](../guides/migrating-between-renamed-resources.html). - -Manages a Azure recovery replicated vms (Azure to Azure). An replicated VM keeps a copiously updated image of the vm in another region in order to be able to start the VM in that region in case of a disaster. - -## Example Usage - -```hcl -resource "azurerm_resource_group" "primary" { - name = "tfex-replicated-vm-primary" - location = "West US" -} - -resource "azurerm_resource_group" "secondary" { - name = "tfex-replicated-vm-secondary" - location = "East US" -} - -resource "azurerm_virtual_machine" "vm" { - name = "vm" - location = azurerm_resource_group.primary.location - resource_group_name = azurerm_resource_group.primary.name - vm_size = "Standard_B1s" - network_interface_ids = [azurerm_network_interface.vm.id] - - storage_image_reference { - publisher = "OpenLogic" - offer = "CentOS" - sku = "7.5" - version = "latest" - } - - storage_os_disk { - name = "vm-os-disk" - os_type = "Linux" - caching = "ReadWrite" - create_option = "FromImage" - managed_disk_type = "Premium_LRS" - } - - os_profile { - admin_username = "test-admin-123" - admin_password = "test-pwd-123" - computer_name = "vm" - } - - os_profile_linux_config { - disable_password_authentication = false - } -} - -resource "azurerm_recovery_services_vault" "vault" { - name = "example-recovery-vault" - location = azurerm_resource_group.secondary.location - resource_group_name = azurerm_resource_group.secondary.name - sku = "Standard" -} - -resource "azurerm_recovery_services_fabric" "primary" { - name = "primary-fabric" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - location = azurerm_resource_group.primary.location -} - -resource "azurerm_recovery_services_fabric" "secondary" { - name = "secondary-fabric" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - location = azurerm_resource_group.secondary.location -} - -resource "azurerm_recovery_services_protection_container" "primary" { - name = "primary-protection-container" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - recovery_fabric_name = azurerm_recovery_services_fabric.primary.name -} - -resource "azurerm_recovery_services_protection_container" "secondary" { - name = "secondary-protection-container" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - recovery_fabric_name = azurerm_recovery_services_fabric.secondary.name -} - -resource "azurerm_recovery_services_replication_policy" "policy" { - name = "policy" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - recovery_point_retention_in_minutes = 24 * 60 - application_consistent_snapshot_frequency_in_minutes = 4 * 60 -} - -resource "azurerm_recovery_services_protection_container_mapping" "container-mapping" { - name = "container-mapping" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - recovery_fabric_name = azurerm_recovery_services_fabric.primary.name - recovery_source_protection_container_name = azurerm_recovery_services_protection_container.primary.name - recovery_target_protection_container_id = azurerm_recovery_services_protection_container.secondary.id - recovery_replication_policy_id = azurerm_recovery_services_replication_policy.policy.id -} - -resource "azurerm_storage_account" "primary" { - name = "primaryrecoverycache" - location = azurerm_resource_group.primary.location - resource_group_name = azurerm_resource_group.primary.name - account_tier = "Standard" - account_replication_type = "LRS" -} - -resource "azurerm_virtual_network" "primary" { - name = "network1" - resource_group_name = azurerm_resource_group.primary.name - address_space = ["192.168.1.0/24"] - location = azurerm_resource_group.primary.location -} - -resource "azurerm_subnet" "primary" { - name = "network1-subnet" - resource_group_name = azurerm_resource_group.primary.name - virtual_network_name = azurerm_virtual_network.primary.name - address_prefix = "192.168.1.0/24" -} - -resource "azurerm_network_interface" "vm" { - name = "vm-nic" - location = azurerm_resource_group.primary.location - resource_group_name = azurerm_resource_group.primary.name - - ip_configuration { - name = "vm" - subnet_id = azurerm_subnet.primary.id - private_ip_address_allocation = "Dynamic" - } -} - -resource "azurerm_recovery_replicated_vm" "vm-replication" { - name = "vm-replication" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - source_recovery_fabric_name = azurerm_recovery_services_fabric.primary.name - source_vm_id = azurerm_virtual_machine.vm.id - recovery_replication_policy_id = azurerm_recovery_services_replication_policy.policy.id - source_recovery_protection_container_name = azurerm_recovery_services_protection_container.primary.name - - target_resource_group_id = azurerm_resource_group.secondary.id - target_recovery_fabric_id = azurerm_recovery_services_fabric.secondary.id - target_recovery_protection_container_id = azurerm_recovery_services_protection_container.secondary.id - - managed_disk { - disk_id = azurerm_virtual_machine.vm.storage_os_disk[0].managed_disk_id - staging_storage_account_id = azurerm_storage_account.primary.id - target_resource_group_id = azurerm_resource_group.secondary.id - target_disk_type = "Premium_LRS" - target_replica_disk_type = "Premium_LRS" - } -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required) The name of the network mapping. - -* `resource_group_name` - (Required) Name of the resource group where the vault that should be updated is located. - -* `recovery_vault_name` - (Required) The name of the vault that should be updated. - -* `source_recovery_fabric_name` - (Required) Name of fabric that should contains this replication. - -* `source_vm_id` - (Required) Id of the VM to replicate - -* `source_recovery_protection_container_name` - (Required) Name of the protection container to use. - -* `target_resource_group_id` - (Required) Id of resource group where the VM should be created when a failover is done. - -* `target_recovery_fabric_id` - (Required) Id of fabric where the VM replication should be handled when a failover is done. - -* `target_recovery_protection_container_id` - (Required) Id of protection container where the VM replication should be created when a failover is done. - -* `target_availability_set_id` - (Optional) Id of availability set that the new VM should belong to when a failover is done. - -* `managed_disk` - (Required) One or more `managed_disk` block. - ---- - -A `managed_disk` block supports the following: - -* `disk_id` - (Required) Id of disk that should be replicated. - -* `staging_storage_account_id` - (Required) Storage account that should be used for caching. - -* `target_resource_group_id` - (Required) Resource group disk should belong to when a failover is done. - -* `target_disk_type` - (Required) What type should the disk be when a failover is done. - -* `target_replica_disk_type` - (Required) What type should the disk be that holds the replication data. - -## Attributes Reference - -In addition to the arguments above, the following attributes are exported: - -* `id` - The ID of the Recovery Services Replicated VM. - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `create` - (Defaults to 80 minutes) Used when creating the Recovery Services Replicated VM. -* `update` - (Defaults to 80 minutes) Used when updating the Recovery Services Replicated VM. -* `read` - (Defaults to 5 minutes) Used when retrieving the Recovery Services Replicated VM. -* `delete` - (Defaults to 80 minutes) Used when deleting the Recovery Services Replicated VM. - -## Import - -Recovery Services Replicated VM's can be imported using the `resource id`, e.g. - -```shell -terraform import azurerm_recovery_replicated_vm.vmreplication /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.RecoveryServices/vaults/recovery-vault-name/replicationFabrics/fabric-name/replicationProtectionContainers/protection-container-name/replicationProtectedItems/vm-replication-name -``` diff --git a/website/docs/r/recovery_services_replication_policy.html.markdown b/website/docs/r/recovery_services_replication_policy.html.markdown deleted file mode 100644 index 82cf328713a8d..0000000000000 --- a/website/docs/r/recovery_services_replication_policy.html.markdown +++ /dev/null @@ -1,74 +0,0 @@ ---- -subcategory: "Recovery Services" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_recovery_services_replication_policy" -description: |- - Manages a site recovery services replication policy on Azure. ---- - -# azurerm_recovery_services_replication_policy - -~> **NOTE:** This resource has been deprecated in favour of the `azurerm_site_recovery_replication_policy` resource and will be removed in the next major version of the AzureRM Provider. The new resource shares the same fields as this one, and information on migrating across [can be found in this guide](../guides/migrating-between-renamed-resources.html). - -Manages a Azure recovery vault replication policy. - -## Example Usage - -```hcl -resource "azurerm_resource_group" "secondary" { - name = "tfex-network-mapping-secondary" - location = "East US" -} - -resource "azurerm_recovery_services_vault" "vault" { - name = "example-recovery-vault" - location = azurerm_resource_group.secondary.location - resource_group_name = azurerm_resource_group.secondary.name - sku = "Standard" -} - -resource "azurerm_recovery_services_replication_policy" "policy" { - name = "policy" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - recovery_point_retention_in_minutes = 24 * 60 - application_consistent_snapshot_frequency_in_minutes = 4 * 60 -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required) The name of the network mapping. - -* `resource_group_name` - (Required) Name of the resource group where the vault that should be updated is located. - -* `recovery_vault_name` - (Required) The name of the vault that should be updated. - -* `recovery_point_retention_in_minutes` - (Required) Retain the recovery points for given time in minutes. - -* `application_consistent_snapshot_frequency_in_minutes` - (Required) Specifies the frequency(in minutes) at which to create application consistent recovery points. - -## Attributes Reference - -In addition to the arguments above, the following attributes are exported: - -* `id` - The ID of the Recovery Services Replication Policy. - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `create` - (Defaults to 30 minutes) Used when creating the Recovery Services Replication Policy. -* `update` - (Defaults to 30 minutes) Used when updating the Recovery Services Replication Policy. -* `read` - (Defaults to 5 minutes) Used when retrieving the Recovery Services Replication Policy. -* `delete` - (Defaults to 30 minutes) Used when deleting the Recovery Services Replication Policy. - -## Import - -Recovery Services Replication Policies can be imported using the `resource id`, e.g. - -```shell -terraform import azurerm_recovery_services_protection_container.mycontainer /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.RecoveryServices/vaults/recovery-vault-name/replicationPolicies/policy-name -``` From 5f57ff5c9f3cffe6e7bafd8d283a8810785de6f9 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Wed, 19 Feb 2020 12:13:21 +0100 Subject: [PATCH 237/498] updating to include #5725 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec4a4c5779a77..0543b71a7a9fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ FEATURES: BREAKING CHANGES: +* Data Source: `azurerm_api_management` - removing the deprecated `sku` block [GH-5725] * Data Source: `azurerm_app_service_plan` - the deprecated `properties` block has been removed since these properties have been moved to the top level [GH-5717] * Data Source: `azurerm_azuread_application` - This data source has been removed since it was deprecated [GH-5748] * Data Source: `azurerm_azuread_service_principal` - This data source has been removed since it was deprecated [GH-5748] @@ -33,6 +34,8 @@ BREAKING CHANGES: * Data Source: `azurerm_role_definition` - removing the alias `VirtualMachineContributor` which has been deprecated in favour of the full name `Virtual Machine Contributor` [GH-5733] * Data Source: `azurerm_scheduler_job_collection` - This data source has been removed since it was deprecated [GH-5712] * Data Source: `azurerm_subnet` - removing the deprecated `ip_configuration` field [GH-5801] +* `azurerm_api_management` - removing the deprecated `sku` block [GH-5725] +* `azurerm_api_management` - removing the deprecated fields in the `security` block [GH-5725] * `azurerm_app_service_plan` - the deprecated `properties` block has been removed since these properties have been moved to the top level [GH-5717] * `azurerm_application_gateway` - updating the default value for the `body` field within the `match` block from `*` to an empty string [GH-5752] * `azurerm_automation_account` - removing the `sku` block which has been deprecated in favour of the `sku_name` field [GH-5781] From 82c7e70a9c0e35db8f0d480ffa9fa1a2465105d7 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Wed, 19 Feb 2020 10:32:07 +0100 Subject: [PATCH 238/498] r/network_interface_application_security_group_association: removing `ip_configuration_name` --- ...on_security_group_association_migration.go | 43 ++++++ ...on_security_group_association_resource.go} | 145 +++++------------- ...curity_group_association_resource_test.go} | 55 ++++++- .../guides/2.0-upgrade-guide.html.markdown | 4 + ...n_security_group_association.html.markdown | 8 +- 5 files changed, 137 insertions(+), 118 deletions(-) create mode 100644 azurerm/internal/services/network/network_interface_application_security_group_association_migration.go rename azurerm/internal/services/network/{resource_arm_network_interface_application_security_group_association.go => network_interface_application_security_group_association_resource.go} (61%) rename azurerm/internal/services/network/tests/{resource_arm_network_interface_application_security_group_association_test.go => network_interface_application_security_group_association_resource_test.go} (84%) diff --git a/azurerm/internal/services/network/network_interface_application_security_group_association_migration.go b/azurerm/internal/services/network/network_interface_application_security_group_association_migration.go new file mode 100644 index 0000000000000..2899e7d66fc22 --- /dev/null +++ b/azurerm/internal/services/network/network_interface_application_security_group_association_migration.go @@ -0,0 +1,43 @@ +package network + +import ( + "fmt" + "log" + + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +func resourceNetworkInterfaceApplicationSecurityGroupAssociationUpgradeV0Schema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "network_interface_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: azure.ValidateResourceID, + }, + + "application_security_group_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: azure.ValidateResourceID, + }, + }, + } +} + +func resourceNetworkInterfaceApplicationSecurityGroupAssociationUpgradeV0ToV1(rawState map[string]interface{}, _ interface{}) (map[string]interface{}, error) { + // after shipping support for this Resource Azure's since changed the behaviour to require that all IP Configurations + // are connected to the same Application Security Group + applicationSecurityGroupId := rawState["application_security_group_id"].(string) + networkInterfaceId := rawState["network_interface_id"].(string) + + oldID := rawState["id"].(string) + newID := fmt.Sprintf("%s|%s", networkInterfaceId, applicationSecurityGroupId) + log.Printf("[DEBUG] Updating ID from %q to %q", oldID, newID) + + rawState["id"] = newID + return rawState, nil +} diff --git a/azurerm/internal/services/network/resource_arm_network_interface_application_security_group_association.go b/azurerm/internal/services/network/network_interface_application_security_group_association_resource.go similarity index 61% rename from azurerm/internal/services/network/resource_arm_network_interface_application_security_group_association.go rename to azurerm/internal/services/network/network_interface_application_security_group_association_resource.go index b093079d34328..77104acd8b768 100644 --- a/azurerm/internal/services/network/resource_arm_network_interface_application_security_group_association.go +++ b/azurerm/internal/services/network/network_interface_application_security_group_association_resource.go @@ -6,13 +6,10 @@ import ( "strings" "time" - "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-09-01/network" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/locks" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" @@ -27,6 +24,15 @@ func resourceArmNetworkInterfaceApplicationSecurityGroupAssociation() *schema.Re State: schema.ImportStatePassthrough, }, + SchemaVersion: 1, + StateUpgraders: []schema.StateUpgrader{ + { + Type: resourceNetworkInterfaceApplicationSecurityGroupAssociationUpgradeV0Schema().CoreConfigSchema().ImpliedType(), + Upgrade: resourceNetworkInterfaceApplicationSecurityGroupAssociationUpgradeV0ToV1, + Version: 0, + }, + }, + Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(30 * time.Minute), Read: schema.DefaultTimeout(5 * time.Minute), @@ -42,13 +48,6 @@ func resourceArmNetworkInterfaceApplicationSecurityGroupAssociation() *schema.Re ValidateFunc: azure.ValidateResourceID, }, - "ip_configuration_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "application_security_group_id": { Type: schema.TypeString, Required: true, @@ -67,7 +66,6 @@ func resourceArmNetworkInterfaceApplicationSecurityGroupAssociationCreate(d *sch log.Printf("[INFO] preparing arguments for Network Interface <-> Application Security Group Association creation.") networkInterfaceId := d.Get("network_interface_id").(string) - ipConfigurationName := d.Get("ip_configuration_name").(string) applicationSecurityGroupId := d.Get("application_security_group_id").(string) id, err := azure.ParseAzureResourceID(networkInterfaceId) @@ -94,49 +92,19 @@ func resourceArmNetworkInterfaceApplicationSecurityGroupAssociationCreate(d *sch if props == nil { return fmt.Errorf("Error: `properties` was nil for Network Interface %q (Resource Group %q)", networkInterfaceName, resourceGroup) } - - ipConfigs := props.IPConfigurations - if ipConfigs == nil { - return fmt.Errorf("Error: `properties.IPConfigurations` was nil for Network Interface %q (Resource Group %q)", networkInterfaceName, resourceGroup) - } - - c := azure.FindNetworkInterfaceIPConfiguration(props.IPConfigurations, ipConfigurationName) - if c == nil { - return fmt.Errorf("Error: IP Configuration %q was not found on Network Interface %q (Resource Group %q)", ipConfigurationName, networkInterfaceName, resourceGroup) - } - - config := *c - p := config.InterfaceIPConfigurationPropertiesFormat - if p == nil { - return fmt.Errorf("Error: `IPConfiguration.properties` was nil for Network Interface %q (Resource Group %q)", networkInterfaceName, resourceGroup) + if props.IPConfigurations == nil { + return fmt.Errorf("Error: `properties.ipConfigurations` was nil for Network Interface %q (Resource Group %q)", networkInterfaceName, resourceGroup) } - applicationSecurityGroups := make([]network.ApplicationSecurityGroup, 0) - - // first double-check it doesn't exist - if p.ApplicationSecurityGroups != nil { - for _, existingGroup := range *p.ApplicationSecurityGroups { - if id := existingGroup.ID; id != nil { - if *id == applicationSecurityGroupId { - if features.ShouldResourcesBeImported() { - return tf.ImportAsExistsError("azurerm_network_interface_application_security_group_association", *id) - } - - continue - } - - applicationSecurityGroups = append(applicationSecurityGroups, existingGroup) - } - } + info := parseFieldsFromNetworkInterface(*props) + resourceId := fmt.Sprintf("%s|%s", networkInterfaceId, applicationSecurityGroupId) + if azure.SliceContainsValue(info.applicationSecurityGroupIDs, applicationSecurityGroupId) { + return tf.ImportAsExistsError("azurerm_network_interface_application_security_group_association", resourceId) } - group := network.ApplicationSecurityGroup{ - ID: utils.String(applicationSecurityGroupId), - } - applicationSecurityGroups = append(applicationSecurityGroups, group) - p.ApplicationSecurityGroups = &applicationSecurityGroups + info.applicationSecurityGroupIDs = append(info.applicationSecurityGroupIDs, applicationSecurityGroupId) - props.IPConfigurations = azure.UpdateNetworkInterfaceIPConfiguration(config, props.IPConfigurations) + read.InterfacePropertiesFormat.IPConfigurations = mapFieldsToNetworkInterface(props.IPConfigurations, info) future, err := client.CreateOrUpdate(ctx, resourceGroup, networkInterfaceName, read) if err != nil { @@ -147,7 +115,6 @@ func resourceArmNetworkInterfaceApplicationSecurityGroupAssociationCreate(d *sch return fmt.Errorf("Error waiting for completion of Application Security Group Association for NIC %q (Resource Group %q): %+v", networkInterfaceName, resourceGroup, err) } - resourceId := fmt.Sprintf("%s/ipConfigurations/%s|%s", networkInterfaceId, ipConfigurationName, applicationSecurityGroupId) d.SetId(resourceId) return resourceArmNetworkInterfaceApplicationSecurityGroupAssociationRead(d, meta) @@ -160,7 +127,7 @@ func resourceArmNetworkInterfaceApplicationSecurityGroupAssociationRead(d *schem splitId := strings.Split(d.Id(), "|") if len(splitId) != 2 { - return fmt.Errorf("Expected ID to be in the format {networkInterfaceId}/ipConfigurations/{ipConfigurationName}|{applicationSecurityGroupId} but got %q", d.Id()) + return fmt.Errorf("Expected ID to be in the format {networkInterfaceId}|{applicationSecurityGroupId} but got %q", d.Id()) } nicID, err := azure.ParseAzureResourceID(splitId[0]) @@ -168,7 +135,6 @@ func resourceArmNetworkInterfaceApplicationSecurityGroupAssociationRead(d *schem return err } - ipConfigurationName := nicID.Path["ipConfigurations"] networkInterfaceName := nicID.Path["networkInterfaces"] resourceGroup := nicID.ResourceGroup applicationSecurityGroupId := splitId[1] @@ -187,43 +153,21 @@ func resourceArmNetworkInterfaceApplicationSecurityGroupAssociationRead(d *schem return fmt.Errorf("Error: `properties` was nil for Network Interface %q (Resource Group %q)", networkInterfaceName, resourceGroup) } - ipConfigs := nicProps.IPConfigurations - if ipConfigs == nil { - return fmt.Errorf("Error: `properties.IPConfigurations` was nil for Network Interface %q (Resource Group %q)", networkInterfaceName, resourceGroup) - } - - c := azure.FindNetworkInterfaceIPConfiguration(nicProps.IPConfigurations, ipConfigurationName) - if c == nil { - log.Printf("IP Configuration %q was not found in Network Interface %q (Resource Group %q) - removing from state!", ipConfigurationName, networkInterfaceName, resourceGroup) - d.SetId("") - return nil - } - config := *c - - found := false - if props := config.InterfaceIPConfigurationPropertiesFormat; props != nil { - if groups := props.ApplicationSecurityGroups; groups != nil { - for _, group := range *groups { - if group.ID == nil { - continue - } - - if *group.ID == applicationSecurityGroupId { - found = true - break - } - } + info := parseFieldsFromNetworkInterface(*nicProps) + exists := false + for _, groupId := range info.applicationSecurityGroupIDs { + if groupId == applicationSecurityGroupId { + exists = true } } - if !found { + if !exists { log.Printf("[DEBUG] Association between Network Interface %q (Resource Group %q) and Application Security Group %q was not found - removing from state!", networkInterfaceName, resourceGroup, applicationSecurityGroupId) d.SetId("") return nil } d.Set("application_security_group_id", applicationSecurityGroupId) - d.Set("ip_configuration_name", ipConfigurationName) d.Set("network_interface_id", read.ID) return nil @@ -236,7 +180,7 @@ func resourceArmNetworkInterfaceApplicationSecurityGroupAssociationDelete(d *sch splitId := strings.Split(d.Id(), "|") if len(splitId) != 2 { - return fmt.Errorf("Expected ID to be in the format {networkInterfaceId}/ipConfigurations/{ipConfigurationName}|{applicationSecurityGroupId} but got %q", d.Id()) + return fmt.Errorf("Expected ID to be in the format {networkInterfaceId}|{applicationSecurityGroupId} but got %q", d.Id()) } nicID, err := azure.ParseAzureResourceID(splitId[0]) @@ -244,7 +188,6 @@ func resourceArmNetworkInterfaceApplicationSecurityGroupAssociationDelete(d *sch return err } - ipConfigurationName := nicID.Path["ipConfigurations"] networkInterfaceName := nicID.Path["networkInterfaces"] resourceGroup := nicID.ResourceGroup applicationSecurityGroupId := splitId[1] @@ -261,41 +204,25 @@ func resourceArmNetworkInterfaceApplicationSecurityGroupAssociationDelete(d *sch return fmt.Errorf("Error retrieving Network Interface %q (Resource Group %q): %+v", networkInterfaceName, resourceGroup, err) } - nicProps := read.InterfacePropertiesFormat - if nicProps == nil { + props := read.InterfacePropertiesFormat + if props == nil { return fmt.Errorf("Error: `properties` was nil for Network Interface %q (Resource Group %q)", networkInterfaceName, resourceGroup) } - ipConfigs := nicProps.IPConfigurations - if ipConfigs == nil { - return fmt.Errorf("Error: `properties.IPConfigurations` was nil for Network Interface %q (Resource Group %q)", networkInterfaceName, resourceGroup) - } - - c := azure.FindNetworkInterfaceIPConfiguration(nicProps.IPConfigurations, ipConfigurationName) - if c == nil { - return fmt.Errorf("Error: IP Configuration %q was not found on Network Interface %q (Resource Group %q)", ipConfigurationName, networkInterfaceName, resourceGroup) - } - config := *c - - props := config.InterfaceIPConfigurationPropertiesFormat - if props == nil { - return fmt.Errorf("Error: Properties for IPConfiguration %q was nil for Network Interface %q (Resource Group %q)", ipConfigurationName, networkInterfaceName, resourceGroup) + if props.IPConfigurations == nil { + return fmt.Errorf("Error: `properties.ipConfigurations` was nil for Network Interface %q (Resource Group %q)", networkInterfaceName, resourceGroup) } - applicationSecurityGroups := make([]network.ApplicationSecurityGroup, 0) - if groups := props.ApplicationSecurityGroups; groups != nil { - for _, pool := range *groups { - if pool.ID == nil { - continue - } + info := parseFieldsFromNetworkInterface(*props) - if *pool.ID != applicationSecurityGroupId { - applicationSecurityGroups = append(applicationSecurityGroups, pool) - } + applicationSecurityGroupIds := make([]string, 0) + for _, v := range info.applicationSecurityGroupIDs { + if v != applicationSecurityGroupId { + applicationSecurityGroupIds = append(applicationSecurityGroupIds, v) } } - props.ApplicationSecurityGroups = &applicationSecurityGroups - nicProps.IPConfigurations = azure.UpdateNetworkInterfaceIPConfiguration(config, nicProps.IPConfigurations) + info.applicationSecurityGroupIDs = applicationSecurityGroupIds + read.InterfacePropertiesFormat.IPConfigurations = mapFieldsToNetworkInterface(props.IPConfigurations, info) future, err := client.CreateOrUpdate(ctx, resourceGroup, networkInterfaceName, read) if err != nil { diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_application_security_group_association_test.go b/azurerm/internal/services/network/tests/network_interface_application_security_group_association_resource_test.go similarity index 84% rename from azurerm/internal/services/network/tests/resource_arm_network_interface_application_security_group_association_test.go rename to azurerm/internal/services/network/tests/network_interface_application_security_group_association_resource_test.go index bd544711f3e11..b49d17802ca63 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_application_security_group_association_test.go +++ b/azurerm/internal/services/network/tests/network_interface_application_security_group_association_resource_test.go @@ -32,6 +32,25 @@ func TestAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_basic(t * }) } +func TestAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_multipleIPConfigurations(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_network_interface_application_security_group_association", "test") + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + // intentional as this is a Virtual Resource + CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_multipleIPConfigurations(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkInterfaceApplicationSecurityGroupAssociationExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + func TestAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_requiresImport(t *testing.T) { if !features.ShouldResourcesBeImported() { t.Skip("Skipping since resources aren't required to be imported") @@ -242,13 +261,43 @@ func testAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_requiresI %s resource "azurerm_network_interface_application_security_group_association" "import" { - network_interface_id = "${azurerm_network_interface_application_security_group_association.test.network_interface_id}" - ip_configuration_name = "${azurerm_network_interface_application_security_group_association.test.ip_configuration_name}" - application_security_group_id = "${azurerm_network_interface_application_security_group_association.test.application_security_group_id}" + network_interface_id = azurerm_network_interface_application_security_group_association.test.network_interface_id + application_security_group_id = azurerm_network_interface_application_security_group_association.test.application_security_group_id } `, template) } +func testAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_multipleIPConfigurations(data acceptance.TestData) string { + template := testAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_network_interface" "test" { + name = "acctestni-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + + ip_configuration { + name = "testconfiguration1" + subnet_id = azurerm_subnet.test.id + private_ip_address_allocation = "Dynamic" + } + + ip_configuration { + name = "testconfiguration2" + subnet_id = azurerm_subnet.test.id + private_ip_address_allocation = "Dynamic" + } +} + +resource "azurerm_network_interface_application_security_group_association" "test" { + network_interface_id = azurerm_network_interface.test.id + ip_configuration_name = "testconfiguration1" + application_security_group_id = azurerm_application_security_group.test.id +} +`, template, data.RandomInteger) +} + func testAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_updateNIC(data acceptance.TestData) string { template := testAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_template(data) return fmt.Sprintf(` diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index ec9400b098483..7ffbb20b2e76b 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -438,6 +438,10 @@ The `load_balancer_backend_address_pools_ids` field in the `ip_configuration` bl The `load_balancer_inbound_nat_rules_ids` field in the `ip_configuration` block will been removed. This has been replaced by the `azurerm_network_interface_nat_rule_association` resource. +### Resource: `azurerm_network_interface_application_security_group_association` + +The field `ip_configuration_name` has been removed since the same Application Security Group must now be assigned to all (IPv4) IP Configurations. + ### Resource: `azurerm_notification_hub_namespace` The deprecated `sku` block has been replaced by the `sku_name` field and will be removed. diff --git a/website/docs/r/network_interface_application_security_group_association.html.markdown b/website/docs/r/network_interface_application_security_group_association.html.markdown index 7d23d403342e5..2a09e57ec2632 100644 --- a/website/docs/r/network_interface_application_security_group_association.html.markdown +++ b/website/docs/r/network_interface_application_security_group_association.html.markdown @@ -54,7 +54,6 @@ resource "azurerm_network_interface" "example" { resource "azurerm_network_interface_application_security_group_association" "example" { network_interface_id = azurerm_network_interface.example.id - ip_configuration_name = "testconfiguration1" application_security_group_id = azurerm_application_security_group.example.id } ``` @@ -65,8 +64,6 @@ The following arguments are supported: * `network_interface_id` - (Required) The ID of the Network Interface. Changing this forces a new resource to be created. -* `ip_configuration_name` - (Required) The Name of the IP Configuration within the Network Interface which should be connected to the Application Security Group. Changing this forces a new resource to be created. - * `application_security_group_id` - (Required) The ID of the Application Security Group which this Network Interface which should be connected to. Changing this forces a new resource to be created. ## Attributes Reference @@ -88,9 +85,8 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d Associations between Network Interfaces and Application Security Groups can be imported using the `resource id`, e.g. - ```shell -terraform import azurerm_network_interface_application_security_group_association.association1 /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/microsoft.network/networkInterfaces/nic1/ipConfigurations/example|/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.Network/applicationSecurityGroups/securityGroup1 +terraform import azurerm_network_interface_application_security_group_association.association1 "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/microsoft.network/networkInterfaces/nic1|/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.Network/applicationSecurityGroups/securityGroup1" ``` --> **NOTE:** This ID is specific to Terraform - and is of the format `{networkInterfaceId}/ipConfigurations/{ipConfigurationName}|{applicationSecurityGroupId}`. +-> **NOTE:** This ID is specific to Terraform - and is of the format `{networkInterfaceId}|{applicationSecurityGroupId}`. From 42c89d8163d02fc596523870fb2b608294c31db7 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Wed, 19 Feb 2020 11:25:57 +0000 Subject: [PATCH 239/498] Docs updates --- website/docs/d/backup_policy_vm.markdown | 10 +++++----- website/docs/guides/2.0-upgrade-guide.html.markdown | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/website/docs/d/backup_policy_vm.markdown b/website/docs/d/backup_policy_vm.markdown index 721da2e466847..7df45f62b79b0 100644 --- a/website/docs/d/backup_policy_vm.markdown +++ b/website/docs/d/backup_policy_vm.markdown @@ -3,12 +3,12 @@ subcategory: "Recovery Services" layout: "azurerm" page_title: "Azure Resource Manager: azurerm_backup_policy_vm" description: |- - Gets information about an existing Recovery Services VM Protection Policy. + Gets information about an existing existing VM Backup Policy. --- -# Data Source: azurerm_recovery_services_protection_policy_vm +# Data Source: azurerm_backup_policy_vm -Use this data source to access information about an existing Recovery Services VM Protection Policy. +Use this data source to access information about an existing VM Backup Policy. ## Example Usage @@ -24,11 +24,11 @@ data "azurerm_backup_policy_vm" "policy" { The following arguments are supported: -* `name` - Specifies the name of the Recovery Services VM Protection Policy. +* `name` - Specifies the name of the VM Backup Policy. * `recovery_vault_name` - Specifies the name of the Recovery Services Vault. -* `resource_group_name` - The name of the resource group in which the Recovery Services VM Protection Policy resides. +* `resource_group_name` - The name of the resource group in which the VM Backup Policy resides. ## Attributes Reference diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index 1d15c72ef7564..be74fb5fc18c7 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -181,6 +181,10 @@ The deprecated field `internal_fqdn` will be removed. The deprecated field `network_interface_ids` will be removed. +### Data Source: `azurerm_recovery_services_protection_policy_vm` + +This Data Source is renamed to `azurerm_backup_policy_vm` in line with the name that replaces the Deprecated resource. + ### Data Source: `azurerm_role_definition` The Data Source no longer supports the alias `VirtualMachineContributor` for the Built-in role `Virtual Machine Contributor`. From 2bca57e3eaf85dfa95852f0a958759789a7b833e Mon Sep 17 00:00:00 2001 From: jackofallops Date: Wed, 19 Feb 2020 13:42:54 +0000 Subject: [PATCH 240/498] Made application_type case sensitive. Removed workaround for fixed SDK/API issue --- .../resource_arm_application_insights.go | 15 +++++---------- .../docs/guides/2.0-upgrade-guide.html.markdown | 4 ++++ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/azurerm/internal/services/applicationinsights/resource_arm_application_insights.go b/azurerm/internal/services/applicationinsights/resource_arm_application_insights.go index d596b74ee05d8..40b4d5a6d96c0 100644 --- a/azurerm/internal/services/applicationinsights/resource_arm_application_insights.go +++ b/azurerm/internal/services/applicationinsights/resource_arm_application_insights.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" @@ -48,10 +47,9 @@ func resourceArmApplicationInsights() *schema.Resource { "location": azure.SchemaLocation(), "application_type": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - DiffSuppressFunc: suppress.CaseDifference, + Type: schema.TypeString, + Required: true, + ForceNew: true, ValidateFunc: validation.StringInSlice([]string{ "web", "other", @@ -61,7 +59,7 @@ func resourceArmApplicationInsights() *schema.Resource { "store", "ios", "Node.JS", - }, true), + }, false), }, "retention_in_days": { @@ -166,10 +164,7 @@ func resourceArmApplicationInsightsCreateUpdate(d *schema.ResourceData, meta int resp, err := client.CreateOrUpdate(ctx, resGroup, name, insightProperties) if err != nil { - // @tombuildsstuff - from 2018-08-14 the Create call started returning a 201 instead of 200 - // which doesn't match the Swagger - this works around it until that's fixed - // BUG: https://github.com/Azure/azure-sdk-for-go/issues/2465 - if resp.StatusCode != http.StatusCreated { + if resp.StatusCode != http.StatusOK { return fmt.Errorf("Error creating Application Insights %q (Resource Group %q): %+v", name, resGroup, err) } } diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index 152c9a009c960..7b07837def0e6 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -225,6 +225,10 @@ The deprecated `ip_address_list` field in the `backend_address_pool` block will The default value for the `body` field within the `match` block will change from `*` to an empty string. +### Resource: `azurerm_application_insights` + +The `application_type` field now has strict case sensitivity in line with the API. + ### Resource: `azurerm_automation_account` The deprecated `sku` block has been replaced by the `sku_name` field and will be removed. From 727cbe4d9bb3f643f2dbeef6b860e76c137c70b5 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Wed, 19 Feb 2020 18:55:10 +0100 Subject: [PATCH 241/498] provider: adding a `WebsiteCategories` list to each registration --- .../internal/services/analysisservices/registration.go | 7 +++++++ azurerm/internal/services/apimanagement/registration.go | 7 +++++++ .../internal/services/appconfiguration/registration.go | 7 +++++++ .../services/applicationinsights/registration.go | 7 +++++++ azurerm/internal/services/authorization/registration.go | 7 +++++++ azurerm/internal/services/automation/registration.go | 7 +++++++ azurerm/internal/services/batch/registration.go | 7 +++++++ azurerm/internal/services/bot/registration.go | 7 +++++++ azurerm/internal/services/cdn/registration.go | 7 +++++++ azurerm/internal/services/cognitive/registration.go | 7 +++++++ azurerm/internal/services/common/service_registration.go | 3 +++ azurerm/internal/services/compute/registration.go | 7 +++++++ azurerm/internal/services/containers/registration.go | 7 +++++++ azurerm/internal/services/cosmos/registration.go | 7 +++++++ azurerm/internal/services/databricks/registration.go | 7 +++++++ azurerm/internal/services/datafactory/registration.go | 7 +++++++ azurerm/internal/services/datalake/registration.go | 7 +++++++ azurerm/internal/services/devspace/registration.go | 9 +++++++++ azurerm/internal/services/devtestlabs/registration.go | 9 ++++++++- azurerm/internal/services/dns/registration.go | 7 +++++++ azurerm/internal/services/eventgrid/registration.go | 7 +++++++ azurerm/internal/services/eventhub/registration.go | 7 +++++++ azurerm/internal/services/frontdoor/registration.go | 9 +++++++++ azurerm/internal/services/hdinsight/registration.go | 7 +++++++ azurerm/internal/services/healthcare/registration.go | 7 +++++++ azurerm/internal/services/iothub/registration.go | 7 +++++++ azurerm/internal/services/keyvault/registration.go | 7 +++++++ azurerm/internal/services/kusto/registration.go | 7 +++++++ azurerm/internal/services/loganalytics/registration.go | 7 +++++++ azurerm/internal/services/logic/registration.go | 7 +++++++ .../internal/services/managementgroup/registration.go | 7 +++++++ azurerm/internal/services/maps/registration.go | 7 +++++++ azurerm/internal/services/mariadb/registration.go | 7 +++++++ azurerm/internal/services/media/registration.go | 7 +++++++ azurerm/internal/services/monitor/registration.go | 7 +++++++ azurerm/internal/services/msi/registration.go | 7 +++++++ azurerm/internal/services/mssql/registration.go | 7 +++++++ azurerm/internal/services/mysql/registration.go | 7 +++++++ azurerm/internal/services/netapp/registration.go | 7 +++++++ azurerm/internal/services/network/registration.go | 8 ++++++++ .../internal/services/notificationhub/registration.go | 7 +++++++ azurerm/internal/services/policy/registration.go | 7 +++++++ azurerm/internal/services/portal/registration.go | 7 +++++++ azurerm/internal/services/postgres/registration.go | 7 +++++++ azurerm/internal/services/privatedns/registration.go | 7 +++++++ .../internal/services/recoveryservices/registration.go | 7 +++++++ azurerm/internal/services/redis/registration.go | 7 +++++++ azurerm/internal/services/relay/registration.go | 7 +++++++ azurerm/internal/services/resource/registration.go | 9 +++++++++ azurerm/internal/services/search/registration.go | 7 +++++++ azurerm/internal/services/securitycenter/registration.go | 7 +++++++ azurerm/internal/services/servicebus/registration.go | 8 ++++++++ azurerm/internal/services/servicefabric/registration.go | 7 +++++++ azurerm/internal/services/signalr/registration.go | 7 +++++++ azurerm/internal/services/sql/registration.go | 7 +++++++ azurerm/internal/services/storage/registration.go | 7 +++++++ .../internal/services/streamanalytics/registration.go | 7 +++++++ azurerm/internal/services/subscription/registration.go | 7 +++++++ azurerm/internal/services/trafficmanager/registration.go | 7 +++++++ azurerm/internal/services/web/registration.go | 7 +++++++ 60 files changed, 425 insertions(+), 1 deletion(-) diff --git a/azurerm/internal/services/analysisservices/registration.go b/azurerm/internal/services/analysisservices/registration.go index 0686ff1a77c99..b37fe9fbba157 100644 --- a/azurerm/internal/services/analysisservices/registration.go +++ b/azurerm/internal/services/analysisservices/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Analysis Services" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Analysis Services", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{} diff --git a/azurerm/internal/services/apimanagement/registration.go b/azurerm/internal/services/apimanagement/registration.go index 475b49493c295..40c70ea6b70d2 100644 --- a/azurerm/internal/services/apimanagement/registration.go +++ b/azurerm/internal/services/apimanagement/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "API Management" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "API Management", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/appconfiguration/registration.go b/azurerm/internal/services/appconfiguration/registration.go index 31d7af75ab0d6..dd8d1a92fe0d4 100644 --- a/azurerm/internal/services/appconfiguration/registration.go +++ b/azurerm/internal/services/appconfiguration/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "App Configuration" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "App Configuration", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{} diff --git a/azurerm/internal/services/applicationinsights/registration.go b/azurerm/internal/services/applicationinsights/registration.go index 786526aec7538..ae2acee73a023 100644 --- a/azurerm/internal/services/applicationinsights/registration.go +++ b/azurerm/internal/services/applicationinsights/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Application Insights" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Application Insights", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/authorization/registration.go b/azurerm/internal/services/authorization/registration.go index 47a95de3a2145..b403085646740 100644 --- a/azurerm/internal/services/authorization/registration.go +++ b/azurerm/internal/services/authorization/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Authorization" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Authorization", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/automation/registration.go b/azurerm/internal/services/automation/registration.go index 26bc8d7ddf132..9c3fb84ac1b0e 100644 --- a/azurerm/internal/services/automation/registration.go +++ b/azurerm/internal/services/automation/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Automation" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Automation", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/batch/registration.go b/azurerm/internal/services/batch/registration.go index d809279924bbb..64b95dd4fbd13 100644 --- a/azurerm/internal/services/batch/registration.go +++ b/azurerm/internal/services/batch/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Batch" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Batch", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/bot/registration.go b/azurerm/internal/services/bot/registration.go index a0eadf437cad2..9fe797ce7ef21 100644 --- a/azurerm/internal/services/bot/registration.go +++ b/azurerm/internal/services/bot/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Bot" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Bot", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{} diff --git a/azurerm/internal/services/cdn/registration.go b/azurerm/internal/services/cdn/registration.go index eca44985f0869..d86f10c513d89 100644 --- a/azurerm/internal/services/cdn/registration.go +++ b/azurerm/internal/services/cdn/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Cdn" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "CDN", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/cognitive/registration.go b/azurerm/internal/services/cognitive/registration.go index c21c58384d657..44651dc7584f6 100644 --- a/azurerm/internal/services/cognitive/registration.go +++ b/azurerm/internal/services/cognitive/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Cognitive Services" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Cognitive Services", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{} diff --git a/azurerm/internal/services/common/service_registration.go b/azurerm/internal/services/common/service_registration.go index f4d4336764982..193216bb88dd6 100644 --- a/azurerm/internal/services/common/service_registration.go +++ b/azurerm/internal/services/common/service_registration.go @@ -6,6 +6,9 @@ type ServiceRegistration interface { // Name is the name of this Service Name() string + // WebsiteCategories returns a list of categories which can be used for the sidebar + WebsiteCategories() []string + // SupportedDataSources returns the supported Data Sources supported by this Service SupportedDataSources() map[string]*schema.Resource diff --git a/azurerm/internal/services/compute/registration.go b/azurerm/internal/services/compute/registration.go index e6b2742b616fe..ba0f93b49a1f1 100644 --- a/azurerm/internal/services/compute/registration.go +++ b/azurerm/internal/services/compute/registration.go @@ -12,6 +12,13 @@ func (r Registration) Name() string { return "Compute" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Compute", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/containers/registration.go b/azurerm/internal/services/containers/registration.go index b25375d4616fd..edb8f6fe732b3 100644 --- a/azurerm/internal/services/containers/registration.go +++ b/azurerm/internal/services/containers/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Container Services" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Container", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/cosmos/registration.go b/azurerm/internal/services/cosmos/registration.go index 97aff3a4de0e4..ad3a4ee361ca9 100644 --- a/azurerm/internal/services/cosmos/registration.go +++ b/azurerm/internal/services/cosmos/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "CosmosDB" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "CosmosDB (DocumentDB)", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/databricks/registration.go b/azurerm/internal/services/databricks/registration.go index e68248aed3a24..e4fafb5d57eab 100644 --- a/azurerm/internal/services/databricks/registration.go +++ b/azurerm/internal/services/databricks/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "DataBricks" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Databricks", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{} diff --git a/azurerm/internal/services/datafactory/registration.go b/azurerm/internal/services/datafactory/registration.go index a47d4dd56da73..4f40b84445f68 100644 --- a/azurerm/internal/services/datafactory/registration.go +++ b/azurerm/internal/services/datafactory/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Data Factory" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Data Factory", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/datalake/registration.go b/azurerm/internal/services/datalake/registration.go index 94983780bea36..fda1870807390 100644 --- a/azurerm/internal/services/datalake/registration.go +++ b/azurerm/internal/services/datalake/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Data Lake" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Data Lake", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/devspace/registration.go b/azurerm/internal/services/devspace/registration.go index c40664b9c07f3..195ae43e43083 100644 --- a/azurerm/internal/services/devspace/registration.go +++ b/azurerm/internal/services/devspace/registration.go @@ -4,6 +4,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/schema" ) +// TODO: this can be moved into Container + type Registration struct{} // Name is the name of this Service @@ -11,6 +13,13 @@ func (r Registration) Name() string { return "DevSpaces" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "DevSpace", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{} diff --git a/azurerm/internal/services/devtestlabs/registration.go b/azurerm/internal/services/devtestlabs/registration.go index c726d8eee79de..607fa7bc4d9f9 100644 --- a/azurerm/internal/services/devtestlabs/registration.go +++ b/azurerm/internal/services/devtestlabs/registration.go @@ -8,7 +8,14 @@ type Registration struct{} // Name is the name of this Service func (r Registration) Name() string { - return "DevTestLabs" + return "Dev Test" +} + +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Dev Test", + } } // SupportedDataSources returns the supported Data Sources supported by this Service diff --git a/azurerm/internal/services/dns/registration.go b/azurerm/internal/services/dns/registration.go index 1935a8f57175d..841f7e418f264 100644 --- a/azurerm/internal/services/dns/registration.go +++ b/azurerm/internal/services/dns/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "DNS" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "DNS", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/eventgrid/registration.go b/azurerm/internal/services/eventgrid/registration.go index 5896b3ecbc6bf..f1b2feda1dc8b 100644 --- a/azurerm/internal/services/eventgrid/registration.go +++ b/azurerm/internal/services/eventgrid/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "EventGrid" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Messaging", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/eventhub/registration.go b/azurerm/internal/services/eventhub/registration.go index b1e9dc3f4d783..864c7bf8159de 100644 --- a/azurerm/internal/services/eventhub/registration.go +++ b/azurerm/internal/services/eventhub/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "EventHub" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Messaging", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/frontdoor/registration.go b/azurerm/internal/services/frontdoor/registration.go index 57231cd3b9c0e..bccd7cc0fd546 100644 --- a/azurerm/internal/services/frontdoor/registration.go +++ b/azurerm/internal/services/frontdoor/registration.go @@ -4,6 +4,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/schema" ) +// TODO: move this to the network one + type Registration struct{} // Name is the name of this Service @@ -11,6 +13,13 @@ func (r Registration) Name() string { return "FrontDoor" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Network", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{} diff --git a/azurerm/internal/services/hdinsight/registration.go b/azurerm/internal/services/hdinsight/registration.go index 7dade4b97802f..91804ab3788c6 100644 --- a/azurerm/internal/services/hdinsight/registration.go +++ b/azurerm/internal/services/hdinsight/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "HDInsight" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "HDInsight", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/healthcare/registration.go b/azurerm/internal/services/healthcare/registration.go index 19171d82ada96..d1f842d84a380 100644 --- a/azurerm/internal/services/healthcare/registration.go +++ b/azurerm/internal/services/healthcare/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Health Care" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Healthcare", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/iothub/registration.go b/azurerm/internal/services/iothub/registration.go index 62c25ce49a2f4..b01c1d4d7a93b 100644 --- a/azurerm/internal/services/iothub/registration.go +++ b/azurerm/internal/services/iothub/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "IoT Hub" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "IoT Hub", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/keyvault/registration.go b/azurerm/internal/services/keyvault/registration.go index 95c8c926102c9..d21e83053cac4 100644 --- a/azurerm/internal/services/keyvault/registration.go +++ b/azurerm/internal/services/keyvault/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "KeyVault" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Key Vault", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/kusto/registration.go b/azurerm/internal/services/kusto/registration.go index 7c6688bda6e91..41b79e6fd1898 100644 --- a/azurerm/internal/services/kusto/registration.go +++ b/azurerm/internal/services/kusto/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Kusto" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Data Explorer", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{} diff --git a/azurerm/internal/services/loganalytics/registration.go b/azurerm/internal/services/loganalytics/registration.go index eb5f604af97e4..d8c5f126a26eb 100644 --- a/azurerm/internal/services/loganalytics/registration.go +++ b/azurerm/internal/services/loganalytics/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Log Analytics" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Log Analytics", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/logic/registration.go b/azurerm/internal/services/logic/registration.go index 87508d474c8a7..7aca0d65af47d 100644 --- a/azurerm/internal/services/logic/registration.go +++ b/azurerm/internal/services/logic/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Logic" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Logic App", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/managementgroup/registration.go b/azurerm/internal/services/managementgroup/registration.go index 5c8b5f8b62bbb..05adf764bd91d 100644 --- a/azurerm/internal/services/managementgroup/registration.go +++ b/azurerm/internal/services/managementgroup/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Management Group" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Management", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/maps/registration.go b/azurerm/internal/services/maps/registration.go index fa18db129f2cd..35de16e03c77b 100644 --- a/azurerm/internal/services/maps/registration.go +++ b/azurerm/internal/services/maps/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Maps" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Maps", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/mariadb/registration.go b/azurerm/internal/services/mariadb/registration.go index 0e32545c86686..0b7789a86de3b 100644 --- a/azurerm/internal/services/mariadb/registration.go +++ b/azurerm/internal/services/mariadb/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "MariaDB" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Database", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/media/registration.go b/azurerm/internal/services/media/registration.go index fb3b61f54ba94..6d1002195dded 100644 --- a/azurerm/internal/services/media/registration.go +++ b/azurerm/internal/services/media/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Media" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Media", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{} diff --git a/azurerm/internal/services/monitor/registration.go b/azurerm/internal/services/monitor/registration.go index dfc09bd0b42dd..691f4f753c255 100644 --- a/azurerm/internal/services/monitor/registration.go +++ b/azurerm/internal/services/monitor/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Monitor" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Monitor", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/msi/registration.go b/azurerm/internal/services/msi/registration.go index 1e4a3df1a3d07..bdcb5403a12ea 100644 --- a/azurerm/internal/services/msi/registration.go +++ b/azurerm/internal/services/msi/registration.go @@ -13,6 +13,13 @@ func (r Registration) Name() string { return "Managed Service Identities" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Authorization", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/mssql/registration.go b/azurerm/internal/services/mssql/registration.go index 3cb495dca4c41..d2f13db37bc5d 100644 --- a/azurerm/internal/services/mssql/registration.go +++ b/azurerm/internal/services/mssql/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Microsoft SQL Server / SQL Azure" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Database", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/mysql/registration.go b/azurerm/internal/services/mysql/registration.go index 5e145d34c4d72..cf8e58ead01b0 100644 --- a/azurerm/internal/services/mysql/registration.go +++ b/azurerm/internal/services/mysql/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "MySQL" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Database", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{} diff --git a/azurerm/internal/services/netapp/registration.go b/azurerm/internal/services/netapp/registration.go index c1bb265794bbf..981ce6c849126 100644 --- a/azurerm/internal/services/netapp/registration.go +++ b/azurerm/internal/services/netapp/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "NetApp" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "NetApp", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/network/registration.go b/azurerm/internal/services/network/registration.go index fe2ff588ea987..53b0e69c56034 100644 --- a/azurerm/internal/services/network/registration.go +++ b/azurerm/internal/services/network/registration.go @@ -11,6 +11,14 @@ func (r Registration) Name() string { return "Network" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Load Balancer", + "Network", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/notificationhub/registration.go b/azurerm/internal/services/notificationhub/registration.go index 0d5cf5c6db60f..0859e9c37df25 100644 --- a/azurerm/internal/services/notificationhub/registration.go +++ b/azurerm/internal/services/notificationhub/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Notification Hub" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Messaging", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/policy/registration.go b/azurerm/internal/services/policy/registration.go index 1b78e83734118..3fde20e4468b7 100644 --- a/azurerm/internal/services/policy/registration.go +++ b/azurerm/internal/services/policy/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Policy" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Policy", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/portal/registration.go b/azurerm/internal/services/portal/registration.go index 8f0a6b4e399ca..ffd0850aed90f 100644 --- a/azurerm/internal/services/portal/registration.go +++ b/azurerm/internal/services/portal/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Portal" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Portal", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{} diff --git a/azurerm/internal/services/postgres/registration.go b/azurerm/internal/services/postgres/registration.go index 9c107fd251899..043f32059ebba 100644 --- a/azurerm/internal/services/postgres/registration.go +++ b/azurerm/internal/services/postgres/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "PostgreSQL" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Database", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/privatedns/registration.go b/azurerm/internal/services/privatedns/registration.go index 40421d979b0fa..37b46c37e956d 100644 --- a/azurerm/internal/services/privatedns/registration.go +++ b/azurerm/internal/services/privatedns/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Private DNS" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Private DNS", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{} diff --git a/azurerm/internal/services/recoveryservices/registration.go b/azurerm/internal/services/recoveryservices/registration.go index c2c497c382169..16724dc1d1789 100644 --- a/azurerm/internal/services/recoveryservices/registration.go +++ b/azurerm/internal/services/recoveryservices/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Recovery Services" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Recovery Services", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/redis/registration.go b/azurerm/internal/services/redis/registration.go index 1876b64539187..e3207845f05d8 100644 --- a/azurerm/internal/services/redis/registration.go +++ b/azurerm/internal/services/redis/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Redis" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Redis", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/relay/registration.go b/azurerm/internal/services/relay/registration.go index d5692c8dca53c..1e7c334402e03 100644 --- a/azurerm/internal/services/relay/registration.go +++ b/azurerm/internal/services/relay/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Relay" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Messaging", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{} diff --git a/azurerm/internal/services/resource/registration.go b/azurerm/internal/services/resource/registration.go index 156f7b6514a80..1162842afd00f 100644 --- a/azurerm/internal/services/resource/registration.go +++ b/azurerm/internal/services/resource/registration.go @@ -11,6 +11,15 @@ func (r Registration) Name() string { return "Resources" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Base", + "Management", + "Template", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/search/registration.go b/azurerm/internal/services/search/registration.go index 8d943980f5930..7b12d54ce6d75 100644 --- a/azurerm/internal/services/search/registration.go +++ b/azurerm/internal/services/search/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Search" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Search", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{} diff --git a/azurerm/internal/services/securitycenter/registration.go b/azurerm/internal/services/securitycenter/registration.go index 4a882785f5fa5..46b02ab1016d4 100644 --- a/azurerm/internal/services/securitycenter/registration.go +++ b/azurerm/internal/services/securitycenter/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Security Center" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Security Center", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{} diff --git a/azurerm/internal/services/servicebus/registration.go b/azurerm/internal/services/servicebus/registration.go index fada39cfffa32..0949cf12617c8 100644 --- a/azurerm/internal/services/servicebus/registration.go +++ b/azurerm/internal/services/servicebus/registration.go @@ -11,6 +11,14 @@ func (r Registration) Name() string { return "ServiceBus" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + // TODO: change this to ServiceBus + "Messaging", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/servicefabric/registration.go b/azurerm/internal/services/servicefabric/registration.go index 1d515febfc165..dda23c4432b39 100644 --- a/azurerm/internal/services/servicefabric/registration.go +++ b/azurerm/internal/services/servicefabric/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Service Fabric" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Service Fabric", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{} diff --git a/azurerm/internal/services/signalr/registration.go b/azurerm/internal/services/signalr/registration.go index 5f1f599261a6b..2217ed664fd25 100644 --- a/azurerm/internal/services/signalr/registration.go +++ b/azurerm/internal/services/signalr/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "SignalR" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Messaging", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/sql/registration.go b/azurerm/internal/services/sql/registration.go index c5bb17a61c8f2..0d10f298787dd 100644 --- a/azurerm/internal/services/sql/registration.go +++ b/azurerm/internal/services/sql/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "SQL" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Database", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/storage/registration.go b/azurerm/internal/services/storage/registration.go index bdf608f1635cf..d69a696c5d87d 100644 --- a/azurerm/internal/services/storage/registration.go +++ b/azurerm/internal/services/storage/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Storage" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Storage", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/streamanalytics/registration.go b/azurerm/internal/services/streamanalytics/registration.go index 2764a2feb81c4..5523f6b27f662 100644 --- a/azurerm/internal/services/streamanalytics/registration.go +++ b/azurerm/internal/services/streamanalytics/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Stream Analytics" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Stream Analytics", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/subscription/registration.go b/azurerm/internal/services/subscription/registration.go index 63943922ca60e..a24b84978d4c7 100644 --- a/azurerm/internal/services/subscription/registration.go +++ b/azurerm/internal/services/subscription/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Subscription" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Base", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/trafficmanager/registration.go b/azurerm/internal/services/trafficmanager/registration.go index 0e38ab6b6df53..75bcc75589c6b 100644 --- a/azurerm/internal/services/trafficmanager/registration.go +++ b/azurerm/internal/services/trafficmanager/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Traffic Manager" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Network", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ diff --git a/azurerm/internal/services/web/registration.go b/azurerm/internal/services/web/registration.go index d61aaa5446887..53fc4553211b6 100644 --- a/azurerm/internal/services/web/registration.go +++ b/azurerm/internal/services/web/registration.go @@ -11,6 +11,13 @@ func (r Registration) Name() string { return "Web" } +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "App Service (Web Apps)", + } +} + // SupportedDataSources returns the supported Data Sources supported by this Service func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ From fb025679be7db9c21a3a153e9f9f5e4da1c9a674 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Wed, 19 Feb 2020 18:55:41 +0100 Subject: [PATCH 242/498] website: moving FrontDoor into the Network category --- website/docs/r/frontdoor.html.markdown | 2 +- website/docs/r/frontdoor_firewall_policy.html.markdown | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/r/frontdoor.html.markdown b/website/docs/r/frontdoor.html.markdown index 5c364650603f8..ba6dc9537da78 100644 --- a/website/docs/r/frontdoor.html.markdown +++ b/website/docs/r/frontdoor.html.markdown @@ -1,5 +1,5 @@ --- -subcategory: "Front Door" +subcategory: "Network" layout: "azurerm" page_title: "Azure Resource Manager: azurerm_frontdoor" description: |- diff --git a/website/docs/r/frontdoor_firewall_policy.html.markdown b/website/docs/r/frontdoor_firewall_policy.html.markdown index 16778c4cdd9d1..c750b029d2301 100644 --- a/website/docs/r/frontdoor_firewall_policy.html.markdown +++ b/website/docs/r/frontdoor_firewall_policy.html.markdown @@ -1,5 +1,5 @@ --- -subcategory: "Front Door" +subcategory: "Network" layout: "azurerm" page_title: "Azure Resource Manager: azurerm_frontdoor_firewall_policy" description: |- From cbb29ab694c8f1bbbf886b518ee243b16dcca946 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Wed, 19 Feb 2020 18:55:57 +0100 Subject: [PATCH 243/498] categories: adding a generator to output the categories list from the provider registration --- azurerm/internal/provider/services.go | 2 + .../tools/website-categories/README.md | 18 +++++ .../internal/tools/website-categories/main.go | 81 +++++++++++++++++++ website/allowed-subcategories | 6 +- 4 files changed, 102 insertions(+), 5 deletions(-) create mode 100644 azurerm/internal/tools/website-categories/README.md create mode 100644 azurerm/internal/tools/website-categories/main.go diff --git a/azurerm/internal/provider/services.go b/azurerm/internal/provider/services.go index 0006ecf98b830..2b284eb41e51c 100644 --- a/azurerm/internal/provider/services.go +++ b/azurerm/internal/provider/services.go @@ -63,6 +63,8 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/web" ) +//go:generate go run ../tools/website-categories/main.go -path=../../../website/allowed-subcategories + func SupportedServices() []common.ServiceRegistration { return []common.ServiceRegistration{ analysisservices.Registration{}, diff --git a/azurerm/internal/tools/website-categories/README.md b/azurerm/internal/tools/website-categories/README.md new file mode 100644 index 0000000000000..feeca63cee673 --- /dev/null +++ b/azurerm/internal/tools/website-categories/README.md @@ -0,0 +1,18 @@ +## Website Categories + +This tool generates files necessary for the website from the provide registrations which already exist in code. + +This is run via go:generate whenever the "SupportedServices" array is changed so that this is kept up-to-date. + +## Example Usage + +``` +go run main.go -path=/path/to/output/file +``` + +## Arguments + +* `help` - Show help? + +* `path` - The Relative Path to the `allowed-subcategories` file used for the website + diff --git a/azurerm/internal/tools/website-categories/main.go b/azurerm/internal/tools/website-categories/main.go new file mode 100644 index 0000000000000..bbd1cea9f8579 --- /dev/null +++ b/azurerm/internal/tools/website-categories/main.go @@ -0,0 +1,81 @@ +package main + +import ( + "flag" + "fmt" + "os" + "path/filepath" + "sort" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/provider" +) + +func main() { + filePath := flag.String("path", "", "The relative path to the output file") + showHelp := flag.Bool("help", false, "Display this message") + + flag.Parse() + + if *showHelp { + flag.Usage() + return + } + + if err := run(*filePath); err != nil { + panic(err) + } +} + +func run(outputFileName string) error { + websiteCategories := make([]string, 0) + + // get a distinct list + for _, service := range provider.SupportedServices() { + for _, category := range service.WebsiteCategories() { + if contains(websiteCategories, category) { + continue + } + + websiteCategories = append(websiteCategories, category) + } + } + + // sort them + sort.Strings(websiteCategories) + + outputPath, err := filepath.Abs(outputFileName) + if err != nil { + panic(err) + } + + // output that string to the file + file, err := os.Create(outputPath) + if err != nil { + panic(err) + } + if os.IsExist(err) { + os.Remove(outputPath) + file, err = os.Create(outputPath) + if err != nil { + panic(err) + } + } + defer file.Close() + + // dump them to a file + for _, category := range websiteCategories { + file.WriteString(fmt.Sprintf("%s\n", category)) + } + + return file.Sync() +} + +func contains(input []string, value string) bool { + for _, v := range input { + if v == value { + return true + } + } + + return false +} diff --git a/website/allowed-subcategories b/website/allowed-subcategories index e595a80455edf..f47257ee534a8 100644 --- a/website/allowed-subcategories +++ b/website/allowed-subcategories @@ -5,10 +5,8 @@ App Service (Web Apps) Application Insights Authorization Automation -Azure Active Directory Base Batch -Beta Bot CDN Cognitive Services @@ -23,7 +21,6 @@ Database Databricks Dev Test DevSpace -Front Door HDInsight Healthcare IoT Hub @@ -43,10 +40,9 @@ Portal Private DNS Recovery Services Redis -Scheduler Search Security Center Service Fabric Storage Stream Analytics -Template \ No newline at end of file +Template From edfae43757cf62a90e9afa360bc3c81f50a86aa3 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Wed, 19 Feb 2020 19:05:54 +0100 Subject: [PATCH 244/498] makefile: hooking up the categories generator --- GNUmakefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/GNUmakefile b/GNUmakefile index b819f3fe933b7..c8893dee148ad 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -20,7 +20,7 @@ tools: GO111MODULE=off go get -u github.com/bflad/tfproviderdocs GO111MODULE=off go get -u github.com/katbyte/terrafmt -build: fmtcheck +build: fmtcheck generate go install build-docker: @@ -37,6 +37,9 @@ fmtcheck: @sh "$(CURDIR)/scripts/gofmtcheck.sh" @sh "$(CURDIR)/scripts/timeouts.sh" +generate: + go generate ./azurerm/internal/provider/ + goimports: @echo "==> Fixing imports code with goimports..." goimports -w $(PKG_NAME)/ From 701be8759b18cca389c8fdf6694d9d1ba505315f Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Wed, 19 Feb 2020 11:04:16 -0800 Subject: [PATCH 245/498] Move log_analytics to 2.0 (#5775) --- ...source_arm_log_analytics_linked_service.go | 66 ++---------------- ...e_arm_log_analytics_linked_service_test.go | 69 +------------------ ...log_analytics_linked_service.html.markdown | 10 +-- 3 files changed, 6 insertions(+), 139 deletions(-) diff --git a/azurerm/internal/services/loganalytics/resource_arm_log_analytics_linked_service.go b/azurerm/internal/services/loganalytics/resource_arm_log_analytics_linked_service.go index a97b22fc6eda7..bf56266af5f69 100644 --- a/azurerm/internal/services/loganalytics/resource_arm_log_analytics_linked_service.go +++ b/azurerm/internal/services/loganalytics/resource_arm_log_analytics_linked_service.go @@ -58,32 +58,10 @@ func resourceArmLogAnalyticsLinkedService() *schema.Resource { }, "resource_id": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - ConflictsWith: []string{"linked_service_properties.0"}, - }, - - "linked_service_properties": { - Type: schema.TypeList, - Optional: true, - Computed: true, - ForceNew: true, - ConflictsWith: []string{"resource_id"}, - MaxItems: 1, - Deprecated: "This property has been deprecated in favour of the 'resource_id' property and will be removed in version 2.0 of the provider", - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "resource_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - }, - }, - }, + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: azure.ValidateResourceID, }, // Exported properties @@ -122,13 +100,6 @@ func resourceArmLogAnalyticsLinkedServiceCreateUpdate(d *schema.ResourceData, me } resourceId := d.Get("resource_id").(string) - if resourceId == "" { - props := d.Get("linked_service_properties").([]interface{}) - resourceId = expandLogAnalyticsLinkedServiceProperties(props) - if resourceId == "" { - return fmt.Errorf("A `resource_id` must be specified either using the `resource_id` field at the top level or within the `linked_service_properties` block") - } - } t := d.Get("tags").(map[string]interface{}) parameters := operationalinsights.LinkedService{ @@ -187,11 +158,6 @@ func resourceArmLogAnalyticsLinkedServiceRead(d *schema.ResourceData, meta inter d.Set("resource_id", props.ResourceID) } - linkedServiceProperties := flattenLogAnalyticsLinkedServiceProperties(resp.LinkedServiceProperties) - if err := d.Set("linked_service_properties", linkedServiceProperties); err != nil { - return fmt.Errorf("Error setting `linked_service_properties`: %+v", err) - } - return tags.FlattenAndSet(d, resp.Tags) } @@ -220,27 +186,3 @@ func resourceArmLogAnalyticsLinkedServiceDelete(d *schema.ResourceData, meta int return nil } - -func expandLogAnalyticsLinkedServiceProperties(input []interface{}) string { - if len(input) == 0 { - return "" - } - - props := input[0].(map[string]interface{}) - return props["resource_id"].(string) -} - -func flattenLogAnalyticsLinkedServiceProperties(input *operationalinsights.LinkedServiceProperties) []interface{} { - if input == nil { - return []interface{}{} - } - - properties := make(map[string]interface{}) - - // resource id linked service - if resourceID := input.ResourceID; resourceID != nil { - properties["resource_id"] = interface{}(*resourceID) - } - - return []interface{}{properties} -} diff --git a/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_linked_service_test.go b/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_linked_service_test.go index d2bf0d4afb052..ad5fd994d3086 100644 --- a/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_linked_service_test.go +++ b/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_linked_service_test.go @@ -3,7 +3,6 @@ package tests import ( "fmt" "net/http" - "regexp" "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" @@ -85,43 +84,6 @@ func TestAccAzureRMLogAnalyticsLinkedService_complete(t *testing.T) { }) } -// Deprecated - remove in 2.0 -func TestAccAzureRMLogAnalyticsLinkedService_noResourceID(t *testing.T) { - data := acceptance.BuildTestData(t, "ignored", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMLogAnalyticsLinkedServiceDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMLogAnalyticsLinkedService_noResourceID(data), - ExpectError: regexp.MustCompile("A `resource_id` must be specified either using the `resource_id` field at the top level or within the `linked_service_properties` block"), - }, - }, - }) -} - -// Deprecated - remove in 2.0 -func TestAccAzureRMLogAnalyticsLinkedService_linkedServiceProperties(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_log_analytics_linked_service", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMLogAnalyticsLinkedServiceDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMLogAnalyticsLinkedService_linkedServiceProperties(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMLogAnalyticsLinkedServiceExists(data.ResourceName), - ), - }, - data.ImportStep(), - }, - }) -} - func testCheckAzureRMLogAnalyticsLinkedServiceDestroy(s *terraform.State) error { conn := acceptance.AzureProvider.Meta().(*clients.Client).LogAnalytics.LinkedServicesClient ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext @@ -224,33 +186,6 @@ resource "azurerm_log_analytics_linked_service" "test" { `, template) } -func testAccAzureRMLogAnalyticsLinkedService_noResourceID(data acceptance.TestData) string { - template := testAccAzureRMLogAnalyticsLinkedService_template(data) - return fmt.Sprintf(` -%s - -resource "azurerm_log_analytics_linked_service" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - workspace_name = "${azurerm_log_analytics_workspace.test.name}" -} -`, template) -} - -func testAccAzureRMLogAnalyticsLinkedService_linkedServiceProperties(data acceptance.TestData) string { - template := testAccAzureRMLogAnalyticsLinkedService_template(data) - return fmt.Sprintf(` -%s - -resource "azurerm_log_analytics_linked_service" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - workspace_name = "${azurerm_log_analytics_workspace.test.name}" - linked_service_properties { - resource_id = "${azurerm_automation_account.test.id}" - } -} -`, template) -} - func testAccAzureRMLogAnalyticsLinkedService_template(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { @@ -263,9 +198,7 @@ resource "azurerm_automation_account" "test" { location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - sku { - name = "Basic" - } + sku_name = "Basic" tags = { Environment = "Test" diff --git a/website/docs/r/log_analytics_linked_service.html.markdown b/website/docs/r/log_analytics_linked_service.html.markdown index 83ea9e5675300..cf774e12acfbc 100644 --- a/website/docs/r/log_analytics_linked_service.html.markdown +++ b/website/docs/r/log_analytics_linked_service.html.markdown @@ -57,18 +57,10 @@ The following arguments are supported: * `linked_service_name` - (Optional) Name of the type of linkedServices resource to connect to the Log Analytics Workspace specified in `workspace_name`. Currently it defaults to and only supports `automation` as a value. Changing this forces a new resource to be created. -* `resource_id` - (Optional) The ID of the Resource that will be linked to the workspace. - -* `linked_service_properties` - (Optional **Deprecated**) A `linked_service_properties` block as defined below. +* `resource_id` - (Required) The ID of the Resource that will be linked to the workspace. Changing this forces a new resource to be created. * `tags` - (Optional) A mapping of tags to assign to the resource. ---- - -`linked_service_properties` supports the following: - -* `resource_id` - (Optional **Deprecated**) The resource id of the resource that will be linked to the workspace. This field has been deprecated in favour of the top-level `resource_id` field and will be removed in v2.0 of the AzureRM Provider. - ## Attributes Reference The following attributes are exported: From a265a795aa7a24ed775d3c7b0c0a7dbb87bd64bb Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Wed, 19 Feb 2020 12:05:02 -0800 Subject: [PATCH 246/498] Update Changelog for #5775 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0543b71a7a9fb..732ff572121e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -72,6 +72,7 @@ BREAKING CHANGES: * `azurerm_key_vault_secret` - removing the deprecated `vault_uri` field [GH-5774] * `azurerm_kubernetes_cluster` - updating the default value for `load_balancer_sku` to `Standard` from `Basic` [GH-5747] * `azurerm_log_analytics_workspace_linked_service` - This resource has been removed since it was deprecated [GH-5754] +* `azurerm_log_analytics_linked_service` - The `resource_id` field has been moved from the `linked_service_properties` block to the top-level and the deprecated field `linked_service_properties` will be removed. This has been replaced by the `resource_id` resource [GH-5775] * `azurerm_maps_account` - the `sku_name` field is now case-sensitive [GH-5776] * `azurerm_mariadb_server` - removing the `sku` block since it's been deprecated in favour of the `sku_name` field [GH-5777] * `azurerm_mssql_elasticpool` - removing the deprecated `elastic_pool_properties` block [GH-5744] From 86772534257e287131eaac34dd02a15d14c57f2a Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Wed, 19 Feb 2020 15:07:18 -0800 Subject: [PATCH 247/498] 2.0-compute (#5811) --- .../internal/services/compute/registration.go | 5 + .../compute/resource_arm_managed_disk.go | 28 +- .../resource_arm_virtual_machine_extension.go | 77 ++--- .../compute/tests/data_source_image_test.go | 2 - .../tests/data_source_virtual_machine_test.go | 1 - .../compute/tests/resource_arm_image_test.go | 6 - .../tests/resource_arm_managed_disk_test.go | 48 --- .../tests/resource_arm_snapshot_test.go | 1 - ...urce_arm_virtual_machine_extension_test.go | 277 ++---------------- ...urce_arm_virtual_machine_scale_set_test.go | 35 --- .../resource_arm_virtual_machine_test.go | 5 - ...rm_virtual_machine_unmanaged_disks_test.go | 27 -- .../internal/services/compute/validation.go | 9 + .../guides/2.0-upgrade-guide.html.markdown | 12 + .../r/virtual_machine_extension.html.markdown | 13 +- 15 files changed, 70 insertions(+), 476 deletions(-) diff --git a/azurerm/internal/services/compute/registration.go b/azurerm/internal/services/compute/registration.go index e6b2742b616fe..a7f460ca9856f 100644 --- a/azurerm/internal/services/compute/registration.go +++ b/azurerm/internal/services/compute/registration.go @@ -50,6 +50,11 @@ func (r Registration) SupportedResources() map[string]*schema.Resource { "azurerm_virtual_machine_extension": resourceArmVirtualMachineExtension(), "azurerm_virtual_machine_scale_set": resourceArmVirtualMachineScaleSet(), "azurerm_virtual_machine": resourceArmVirtualMachine(), + "azurerm_linux_virtual_machine": resourceLinuxVirtualMachine(), + "azurerm_linux_virtual_machine_scale_set": resourceArmLinuxVirtualMachineScaleSet(), + "azurerm_virtual_machine_scale_set_extension": resourceArmVirtualMachineScaleSetExtension(), + "azurerm_windows_virtual_machine": resourceWindowsVirtualMachine(), + "azurerm_windows_virtual_machine_scale_set": resourceArmWindowsVirtualMachineScaleSet(), } // 2.0 resources diff --git a/azurerm/internal/services/compute/resource_arm_managed_disk.go b/azurerm/internal/services/compute/resource_arm_managed_disk.go index 14069bbed7480..7e212c7c8f100 100644 --- a/azurerm/internal/services/compute/resource_arm_managed_disk.go +++ b/azurerm/internal/services/compute/resource_arm_managed_disk.go @@ -60,8 +60,7 @@ func resourceArmManagedDisk() *schema.Resource { string(compute.PremiumLRS), string(compute.StandardSSDLRS), string(compute.UltraSSDLRS), - // TODO: make this case-sensitive in 2.0 - }, true), + }, false), DiffSuppressFunc: suppress.CaseDifference, }, @@ -75,8 +74,7 @@ func resourceArmManagedDisk() *schema.Resource { string(compute.FromImage), string(compute.Import), string(compute.Restore), - // TODO: make this case-sensitive in 2.0 - }, true), + }, false), }, "source_uri": { @@ -115,12 +113,10 @@ func resourceArmManagedDisk() *schema.Resource { }, "disk_size_gb": { - Type: schema.TypeInt, - Optional: true, - Computed: true, - // TODO: update this in 2.0 so that the minimum size is 1 - // since users looking to use `0` should be using `null` instead - ValidateFunc: validateDiskSizeGB, + Type: schema.TypeInt, + Optional: true, + Computed: true, + ValidateFunc: validateManagedDiskSizeGB, }, "disk_iops_read_write": { @@ -183,14 +179,7 @@ func resourceArmManagedDiskCreateUpdate(d *schema.ResourceData, meta interface{} osType := d.Get("os_type").(string) t := d.Get("tags").(map[string]interface{}) zones := azure.ExpandZones(d.Get("zones").([]interface{})) - - // TODO: simplify this to a cast in 2.0 once this becomes case-insensitive - var skuName compute.DiskStorageAccountTypes - for _, v := range compute.PossibleDiskStorageAccountTypesValues() { - if strings.EqualFold(storageAccountType, string(v)) { - skuName = v - } - } + skuName := compute.DiskStorageAccountTypes(storageAccountType) props := &compute.DiskProperties{ CreationData: &compute.CreationData{ @@ -207,8 +196,7 @@ func resourceArmManagedDiskCreateUpdate(d *schema.ResourceData, meta interface{} props.DiskSizeGB = &diskSize } - // TODO: make this case-sensitive in 2.0 - if strings.EqualFold(storageAccountType, string(compute.UltraSSDLRS)) { + if storageAccountType == string(compute.UltraSSDLRS) { if d.HasChange("disk_iops_read_write") { v := d.Get("disk_iops_read_write") diskIOPS := int64(v.(int)) diff --git a/azurerm/internal/services/compute/resource_arm_virtual_machine_extension.go b/azurerm/internal/services/compute/resource_arm_virtual_machine_extension.go index fa276da4ffab9..a82a381c07359 100644 --- a/azurerm/internal/services/compute/resource_arm_virtual_machine_extension.go +++ b/azurerm/internal/services/compute/resource_arm_virtual_machine_extension.go @@ -41,19 +41,9 @@ func resourceArmVirtualMachineExtension() *schema.Resource { ForceNew: true, }, - // TODO: Remove in 2.0 - "virtual_machine_name": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ForceNew: true, - Deprecated: "This field has been deprecated in favor of `virtual_machine_id` - will be removed in 2.0 of the Azure Provider", - }, - "virtual_machine_id": { Type: schema.TypeString, - Optional: true, - Computed: true, + Required: true, ForceNew: true, ValidateFunc: ValidateVirtualMachineID, }, @@ -94,19 +84,6 @@ func resourceArmVirtualMachineExtension() *schema.Resource { DiffSuppressFunc: structure.SuppressJsonDiff, }, - // TODO: Remove location and resource_group_name in 2.0 - "location": { - Type: schema.TypeString, - ForceNew: true, - Optional: true, - Computed: true, - StateFunc: azure.NormalizeLocation, - DiffSuppressFunc: azure.SuppressLocationDiff, - Deprecated: "location is no longer used", - }, - - "resource_group_name": azure.SchemaResourceGroupNameDeprecated(), - "tags": tags.Schema(), }, } @@ -119,39 +96,26 @@ func resourceArmVirtualMachineExtensionsCreateUpdate(d *schema.ResourceData, met defer cancel() name := d.Get("name").(string) - var virtualMachineName, resourceGroup, location string - if virtualMachineId, ok := d.GetOk("virtual_machine_id"); ok { - v, err := ParseVirtualMachineID(virtualMachineId.(string)) - if err != nil { - return fmt.Errorf("Error parsing Virtual Machine ID %q: %+v", virtualMachineId, err) - } - - virtualMachineName = v.Name - resourceGroup = v.ResourceGroup + virtualMachineId := d.Get("virtual_machine_id").(string) + v, err := ParseVirtualMachineID(virtualMachineId) + if err != nil { + return fmt.Errorf("Error parsing Virtual Machine ID %q: %+v", virtualMachineId, err) + } - virtualMachine, err := vmClient.Get(ctx, resourceGroup, virtualMachineName, "") - if err != nil { - return fmt.Errorf("Error getting Virtual Machine %q (Resource Group %q): %+v", name, resourceGroup, err) - } + virtualMachineName := v.Name + resourceGroup := v.ResourceGroup - if location = *virtualMachine.Location; location == "" { - return fmt.Errorf("Error reading location of Virtual Machine %q", virtualMachineName) - } - } else { - if vm, ok := d.GetOk("virtual_machine_name"); !ok { - return fmt.Errorf("Error, one of `virtual_machine_name` (deprecated) or `virtual_machine_id` (preferred) required.") - } else { - virtualMachineName = vm.(string) - resourceGroup = d.Get("resource_group_name").(string) - if resourceGroup == "" { - return fmt.Errorf("`resource_group_name` must be specified if `virtual_machine_id` is not used") - } + virtualMachine, err := vmClient.Get(ctx, resourceGroup, virtualMachineName, "") + if err != nil { + return fmt.Errorf("Error getting Virtual Machine %q (Resource Group %q): %+v", name, resourceGroup, err) + } - location = azure.NormalizeLocation(d.Get("location").(string)) - if location == "" { - return fmt.Errorf("`location` must be specified if `virtual_machine_id` is not used") - } - } + location := "" + if virtualMachine.Location != nil { + location = *virtualMachine.Location + } + if location == "" { + return fmt.Errorf("Error reading location of Virtual Machine %q", virtualMachineName) } if features.ShouldResourcesBeImported() && d.IsNewResource() { @@ -247,9 +211,6 @@ func resourceArmVirtualMachineExtensionsRead(d *schema.ResourceData, meta interf } d.Set("virtual_machine_id", virtualMachine.ID) - if location := virtualMachine.Location; location != nil { - d.Set("location", azure.NormalizeLocation(*location)) - } resp, err := vmExtensionClient.Get(ctx, resourceGroup, vmName, name, "") if err != nil { @@ -261,8 +222,6 @@ func resourceArmVirtualMachineExtensionsRead(d *schema.ResourceData, meta interf } d.Set("name", resp.Name) - d.Set("virtual_machine_name", vmName) - d.Set("resource_group_name", resourceGroup) if props := resp.VirtualMachineExtensionProperties; props != nil { d.Set("publisher", props.Publisher) diff --git a/azurerm/internal/services/compute/tests/data_source_image_test.go b/azurerm/internal/services/compute/tests/data_source_image_test.go index 42414e19d92ac..15aa62841485f 100644 --- a/azurerm/internal/services/compute/tests/data_source_image_test.go +++ b/azurerm/internal/services/compute/tests/data_source_image_test.go @@ -116,7 +116,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "vhds" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "blob" } @@ -245,7 +244,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "vhds" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "blob" } diff --git a/azurerm/internal/services/compute/tests/data_source_virtual_machine_test.go b/azurerm/internal/services/compute/tests/data_source_virtual_machine_test.go index 3b2f2adf064e1..1914293cf59b8 100644 --- a/azurerm/internal/services/compute/tests/data_source_virtual_machine_test.go +++ b/azurerm/internal/services/compute/tests/data_source_virtual_machine_test.go @@ -68,7 +68,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "vhds" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } diff --git a/azurerm/internal/services/compute/tests/resource_arm_image_test.go b/azurerm/internal/services/compute/tests/resource_arm_image_test.go index 15fa23a9391bd..c6525b37fbafe 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_image_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_image_test.go @@ -555,7 +555,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "vhds" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "blob" } @@ -661,7 +660,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "vhds" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "blob" } @@ -809,7 +807,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "vhds" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "blob" } @@ -910,7 +907,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "vhds" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "blob" } @@ -1292,7 +1288,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "vhds" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "blob" } @@ -1393,7 +1388,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "vhds" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "blob" } diff --git a/azurerm/internal/services/compute/tests/resource_arm_managed_disk_test.go b/azurerm/internal/services/compute/tests/resource_arm_managed_disk_test.go index 8ff810035dcbe..4530331de32c8 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_managed_disk_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_managed_disk_test.go @@ -210,30 +210,6 @@ func TestAccAzureRMManagedDisk_encryption(t *testing.T) { }) } -func TestAccAzureRMManagedDisk_NonStandardCasing(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_managed_disk", "test") - var d compute.Disk - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMManagedDiskDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMManagedDisk_nonStandardCasing(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMManagedDiskExists(data.ResourceName, &d, true), - ), - }, - { - Config: testAccAzureRMManagedDisk_nonStandardCasing(data), - PlanOnly: true, - ExpectNonEmptyPlan: false, - }, - }, - }) -} - func TestAccAzureRMManagedDisk_importEmpty_withZone(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_managed_disk", "test") var d compute.Disk @@ -566,7 +542,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "vhds" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } @@ -648,29 +623,6 @@ resource "azurerm_managed_disk" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } -func testAccAzureRMManagedDisk_nonStandardCasing(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_managed_disk" "test" { - name = "acctestd-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - storage_account_type = "standard_lrs" - create_option = "Empty" - disk_size_gb = "1" - - tags = { - environment = "acctest" - cost-center = "ops" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - func testAccAzureRMManagedDisk_platformImage(data acceptance.TestData) string { return fmt.Sprintf(` data "azurerm_platform_image" "test" { diff --git a/azurerm/internal/services/compute/tests/resource_arm_snapshot_test.go b/azurerm/internal/services/compute/tests/resource_arm_snapshot_test.go index c4424d2c1de4c..732846f7135f2 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_snapshot_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_snapshot_test.go @@ -532,7 +532,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "vhds" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } diff --git a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_extension_test.go b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_extension_test.go index d409269fac98d..efaf1fbffe8ad 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_extension_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_extension_test.go @@ -11,6 +11,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/compute" ) func TestAccAzureRMVirtualMachineExtension_basic(t *testing.T) { @@ -41,35 +42,6 @@ func TestAccAzureRMVirtualMachineExtension_basic(t *testing.T) { }) } -// TODO: Remove in 2.0 -func TestAccAzureRMVirtualMachineExtension_deprecated(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_virtual_machine_extension", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMVirtualMachineExtensionDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMVirtualMachineExtension_deprecated(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineExtensionExists(data.ResourceName), - resource.TestMatchResourceAttr(data.ResourceName, "settings", regexp.MustCompile("hostname")), - ), - }, - data.ImportStep("protected_settings"), - { - Config: testAccAzureRMVirtualMachineExtension_deprecatedUpdate(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineExtensionExists(data.ResourceName), - resource.TestMatchResourceAttr(data.ResourceName, "settings", regexp.MustCompile("whoami")), - ), - }, - data.ImportStep("protected_settings"), - }, - }) -} - func TestAccAzureRMVirtualMachineExtension_requiresImport(t *testing.T) { if !features.ShouldResourcesBeImported() { t.Skip("Skipping since resources aren't required to be imported") @@ -149,7 +121,12 @@ func testCheckAzureRMVirtualMachineExtensionExists(resourceName string) resource } name := rs.Primary.Attributes["name"] - vmName := rs.Primary.Attributes["virtual_machine_name"] + vmId := rs.Primary.Attributes["virtual_machine_id"] + v, err := compute.ParseVirtualMachineID(vmId) + if err != nil { + return fmt.Errorf("Error parsing Virtual Machine ID %q: %+v", vmId, err) + } + vmName := v.Name resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, vmName, name, "") @@ -175,7 +152,12 @@ func testCheckAzureRMVirtualMachineExtensionDestroy(s *terraform.State) error { } name := rs.Primary.Attributes["name"] - vmName := rs.Primary.Attributes["virtual_machine_name"] + vmId := rs.Primary.Attributes["virtual_machine_id"] + v, err := compute.ParseVirtualMachineID(vmId) + if err != nil { + return fmt.Errorf("Error parsing Virtual Machine ID %q: %+v", vmId, err) + } + vmName := v.Name resourceGroup := rs.Primary.Attributes["resource_group_name"] resp, err := client.Get(ctx, resourceGroup, vmName, name, "") @@ -239,7 +221,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "vhds" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } @@ -296,113 +277,6 @@ SETTINGS `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) } -// TODO: Remove in 2.0 - this test config covers the name & location inputs -func testAccAzureRMVirtualMachineExtension_deprecated(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "acctsub-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" -} - -resource "azurerm_network_interface" "test" { - name = "acctni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - } -} - -resource "azurerm_storage_account" "test" { - name = "accsa%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - account_tier = "Standard" - account_replication_type = "LRS" - - tags = { - environment = "staging" - } -} - -resource "azurerm_storage_container" "test" { - name = "vhds" - resource_group_name = "${azurerm_resource_group.test.name}" - storage_account_name = "${azurerm_storage_account.test.name}" - container_access_type = "private" -} - -resource "azurerm_virtual_machine" "test" { - name = "acctvm-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - network_interface_ids = ["${azurerm_network_interface.test.id}"] - vm_size = "Standard_F2" - - storage_image_reference { - publisher = "Canonical" - offer = "UbuntuServer" - sku = "16.04-LTS" - version = "latest" - } - - storage_os_disk { - name = "myosdisk1" - vhd_uri = "${azurerm_storage_account.test.primary_blob_endpoint}${azurerm_storage_container.test.name}/myosdisk1.vhd" - caching = "ReadWrite" - create_option = "FromImage" - } - - os_profile { - computer_name = "hostname%d" - admin_username = "testadmin" - admin_password = "Password1234!" - } - - os_profile_linux_config { - disable_password_authentication = false - } -} - -resource "azurerm_virtual_machine_extension" "test" { - name = "acctvme-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_machine_name = "${azurerm_virtual_machine.test.name}" - publisher = "Microsoft.Azure.Extensions" - type = "CustomScript" - type_handler_version = "2.0" - - settings = < 32767 { + errors = append(errors, fmt.Errorf( + "The `disk_size_gb` can only be between 0 and 32767")) + } + return warnings, errors +} + func validateDedicatedHostGroupName() func(i interface{}, k string) (warnings []string, errors []error) { return validation.StringMatch(regexp.MustCompile(`^[^_\W][\w-.]{0,78}[\w]$`), "") } diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index 152c9a009c960..7c660c017d4f8 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -416,6 +416,14 @@ This resource has been renamed to `azurerm_log_analytics_linked_service` which i The deprecated field `linked_service_properties` will be removed. This has been replaced by the `resource_id` resource. +### Resource: `azurerm_managed_disk` + +The `storage_account_type` property is now case sensitive. + +The `create_option` property is now case sensitive. + +The `disk_size_gb` property minimum is now `1` instead of `0`. + ### Resource: `azurerm_maps_account` The `sku_name` field is now case sensitive. @@ -550,6 +558,10 @@ Splitting the Virtual Machine resource in two allows us to both provide finer-gr The existing `azurerm_virtual_machine` Resource will continue to be available in it's current form, however it will eventually be deprecated and we recommend using the new resources going forward. +### Resource: `azurerm_virtual_machine_extension` + +The deprecated `virtual_machine_name`, `location`, and `resource_group_name` field will be removed in favor of `virtual_machine_id`. + ### Resource: `azurerm_virtual_machine_scale_set` The `azurerm_virtual_machine_scale_set` resource will be deprecated in favour of two new resources: `azurerm_linux_virtual_machine_scale_set` and `azurerm_windows_virtual_machine_scale_set`. diff --git a/website/docs/r/virtual_machine_extension.html.markdown b/website/docs/r/virtual_machine_extension.html.markdown index bbd33c8df9691..305a0a0f1f11a 100644 --- a/website/docs/r/virtual_machine_extension.html.markdown +++ b/website/docs/r/virtual_machine_extension.html.markdown @@ -132,18 +132,7 @@ The following arguments are supported: * `name` - (Required) The name of the virtual machine extension peering. Changing this forces a new resource to be created. -* `location` - (Optional / **Deprecated**) The location where the extension is created. Changing - this forces a new resource to be created. - -* `resource_group_name` - (Optional / **Deprecated**) The name of the resource group in which to - create the virtual network. Changing this forces a new resource to be - created. - -* `virtual_machine_name` - (Optional / **Deprecated**) The name of the virtual machine. Changing - this forces a new resource to be created. - -* `virtual_machine_id` - (Optional) The resource ID of the virtual machine. This value replaces - `location`, `resource_group_name` and `virtual_machine_name`. Changing this forces a new +* `virtual_machine_id` - (Required) The resource ID of the virtual machine. Changing this forces a new resource to be created * `publisher` - (Required) The publisher of the extension, available publishers From 9f53e4e61844d347658bc335213ab720aa98b130 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Wed, 19 Feb 2020 15:17:53 -0800 Subject: [PATCH 248/498] Final deprecations --- azurerm/helpers/azure/location.go | 11 - azurerm/helpers/azure/resource_group.go | 9 - azurerm/internal/provider/provider.go | 3 +- .../data_source_client_config.go | 23 -- .../tests/data_source_client_config_test.go | 2 - .../compute/resource_arm_managed_disk.go | 8 +- .../resource_arm_virtual_machine_extension.go | 73 +--- ...urce_arm_virtual_machine_extension_test.go | 273 +-------------- .../data_source_kubernetes_cluster.go | 7 - .../containers/kubernetes_nodepool.go | 7 +- .../resource_arm_container_group.go | 84 +---- .../resource_arm_container_registry.go | 21 -- .../resource_arm_kubernetes_cluster.go | 315 +----------------- .../resource_arm_container_group_test.go | 22 +- ...urce_arm_kubernetes_cluster_legacy_test.go | 123 ------- .../resource_arm_kubernetes_cluster_test.go | 4 - .../network/data_source_network_interface.go | 7 - .../data_source_private_link_service.go | 12 - .../network/data_source_virtual_network.go | 12 - .../resource_arm_application_gateway.go | 82 ----- .../services/network/resource_arm_firewall.go | 21 +- .../resource_arm_lb_backend_address_pool.go | 2 - .../network/resource_arm_lb_nat_pool.go | 2 - .../network/resource_arm_lb_nat_rule.go | 2 - .../services/network/resource_arm_lb_probe.go | 2 - .../services/network/resource_arm_lb_rule.go | 2 - .../resource_arm_private_link_service.go | 16 - .../network/resource_arm_public_ip.go | 33 +- .../network/resource_arm_virtual_wan.go | 7 - .../resource_arm_application_gateway_test.go | 100 ------ .../tests/resource_arm_firewall_test.go | 72 ---- ..._loadbalancer_backend_address_pool_test.go | 4 - ...resource_arm_loadbalancer_nat_pool_test.go | 8 - ...resource_arm_loadbalancer_nat_rule_test.go | 17 +- .../resource_arm_loadbalancer_probe_test.go | 16 +- .../resource_arm_loadbalancer_rule_test.go | 24 +- .../tests/resource_arm_public_ip_test.go | 47 --- .../resource_arm_storage_table_migration.go | 2 +- azurerm/internal/tags/schema.go | 4 - website/docs/d/client_config.html.markdown | 8 - .../guides/2.0-upgrade-guide.html.markdown | 6 + .../docs/r/application_gateway.html.markdown | 7 - website/docs/r/container_group.html.markdown | 4 - .../docs/r/kubernetes_cluster.html.markdown | 50 --- .../r/virtual_machine_extension.html.markdown | 3 - 45 files changed, 78 insertions(+), 1479 deletions(-) delete mode 100644 azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_legacy_test.go diff --git a/azurerm/helpers/azure/location.go b/azurerm/helpers/azure/location.go index 15213c617abe9..8690718f83f2b 100644 --- a/azurerm/helpers/azure/location.go +++ b/azurerm/helpers/azure/location.go @@ -35,17 +35,6 @@ func SchemaLocationForDataSource() *schema.Schema { } } -func SchemaLocationDeprecated() *schema.Schema { - return &schema.Schema{ - Type: schema.TypeString, - ForceNew: true, - Optional: true, - StateFunc: NormalizeLocation, - DiffSuppressFunc: SuppressLocationDiff, - Deprecated: "location is no longer used", - } -} - // azure.NormalizeLocation is a function which normalises human-readable region/location // names (e.g. "West US") to the values used and returned by the Azure API (e.g. "westus"). // In state we track the API internal version as it is easier to go from the human form diff --git a/azurerm/helpers/azure/resource_group.go b/azurerm/helpers/azure/resource_group.go index 7f6a5bf712516..8eba7a93d1965 100644 --- a/azurerm/helpers/azure/resource_group.go +++ b/azurerm/helpers/azure/resource_group.go @@ -18,15 +18,6 @@ func SchemaResourceGroupName() *schema.Schema { } } -func SchemaResourceGroupNameDeprecated() *schema.Schema { - return &schema.Schema{ - Type: schema.TypeString, - Optional: true, - Computed: true, - Deprecated: "This field has been deprecated and is no longer used - will be removed in 2.0 of the Azure Provider", - } -} - func SchemaResourceGroupNameDiffSuppress() *schema.Schema { return &schema.Schema{ Type: schema.TypeString, diff --git a/azurerm/internal/provider/provider.go b/azurerm/internal/provider/provider.go index 275bd38598dea..6a77a27de8fc1 100644 --- a/azurerm/internal/provider/provider.go +++ b/azurerm/internal/provider/provider.go @@ -138,8 +138,7 @@ func AzureProvider() terraform.ResourceProvider { "disable_correlation_request_id": { Type: schema.TypeBool, Optional: true, - // TODO: add an ARM_ prefix in 2.0w - DefaultFunc: schema.EnvDefaultFunc("DISABLE_CORRELATION_REQUEST_ID", false), + DefaultFunc: schema.EnvDefaultFunc("ARM_DISABLE_CORRELATION_REQUEST_ID", false), Description: "This will disable the x-ms-correlation-request-id header.", }, diff --git a/azurerm/internal/services/authorization/data_source_client_config.go b/azurerm/internal/services/authorization/data_source_client_config.go index 165e183611fa4..21d1a7a613d4f 100644 --- a/azurerm/internal/services/authorization/data_source_client_config.go +++ b/azurerm/internal/services/authorization/data_source_client_config.go @@ -4,7 +4,6 @@ import ( "fmt" "time" - "github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" @@ -38,17 +37,6 @@ func dataSourceArmClientConfig() *schema.Resource { Type: schema.TypeString, Computed: true, }, - - "service_principal_application_id": { - Type: schema.TypeString, - Computed: true, - Deprecated: "This has been deprecated in favour of the `client_id` property", - }, - "service_principal_object_id": { - Type: schema.TypeString, - Computed: true, - Deprecated: "This has been deprecated in favour of the unified `authenticated_object_id` property", - }, }, } } @@ -58,7 +46,6 @@ func dataSourceArmClientConfigRead(d *schema.ResourceData, meta interface{}) err ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() - var servicePrincipal *graphrbac.ServicePrincipal if client.Account.AuthenticatedAsAServicePrincipal { spClient := client.Authorization.ServicePrincipalsClient // Application & Service Principal is 1:1 per tenant. Since we know the appId (client_id) @@ -73,8 +60,6 @@ func dataSourceArmClientConfigRead(d *schema.ResourceData, meta interface{}) err if listResult.Values() == nil || len(listResult.Values()) != 1 { return fmt.Errorf("Unexpected Service Principal query result: %#v", listResult.Values()) } - - servicePrincipal = &(listResult.Values())[0] } d.SetId(time.Now().UTC().String()) @@ -83,13 +68,5 @@ func dataSourceArmClientConfigRead(d *schema.ResourceData, meta interface{}) err d.Set("subscription_id", client.Account.SubscriptionId) d.Set("tenant_id", client.Account.TenantId) - if principal := servicePrincipal; principal != nil { - d.Set("service_principal_application_id", client.Account.ClientId) - d.Set("service_principal_object_id", principal.ObjectID) - } else { - d.Set("service_principal_application_id", "") - d.Set("service_principal_object_id", "") - } - return nil } diff --git a/azurerm/internal/services/authorization/tests/data_source_client_config_test.go b/azurerm/internal/services/authorization/tests/data_source_client_config_test.go index 859f5fbcd718d..f33d956d2d3db 100644 --- a/azurerm/internal/services/authorization/tests/data_source_client_config_test.go +++ b/azurerm/internal/services/authorization/tests/data_source_client_config_test.go @@ -27,8 +27,6 @@ func TestAccDataSourceAzureRMClientConfig_basic(t *testing.T) { resource.TestCheckResourceAttr(data.ResourceName, "tenant_id", tenantId), resource.TestCheckResourceAttr(data.ResourceName, "subscription_id", subscriptionId), testAzureRMClientConfigGUIDAttr(data.ResourceName, "object_id"), - testAzureRMClientConfigGUIDAttr(data.ResourceName, "service_principal_application_id"), - testAzureRMClientConfigGUIDAttr(data.ResourceName, "service_principal_object_id"), ), }, }, diff --git a/azurerm/internal/services/compute/resource_arm_managed_disk.go b/azurerm/internal/services/compute/resource_arm_managed_disk.go index 14069bbed7480..8d92442a3fba2 100644 --- a/azurerm/internal/services/compute/resource_arm_managed_disk.go +++ b/azurerm/internal/services/compute/resource_arm_managed_disk.go @@ -60,8 +60,7 @@ func resourceArmManagedDisk() *schema.Resource { string(compute.PremiumLRS), string(compute.StandardSSDLRS), string(compute.UltraSSDLRS), - // TODO: make this case-sensitive in 2.0 - }, true), + }, false), DiffSuppressFunc: suppress.CaseDifference, }, @@ -75,8 +74,7 @@ func resourceArmManagedDisk() *schema.Resource { string(compute.FromImage), string(compute.Import), string(compute.Restore), - // TODO: make this case-sensitive in 2.0 - }, true), + }, false), }, "source_uri": { @@ -118,8 +116,6 @@ func resourceArmManagedDisk() *schema.Resource { Type: schema.TypeInt, Optional: true, Computed: true, - // TODO: update this in 2.0 so that the minimum size is 1 - // since users looking to use `0` should be using `null` instead ValidateFunc: validateDiskSizeGB, }, diff --git a/azurerm/internal/services/compute/resource_arm_virtual_machine_extension.go b/azurerm/internal/services/compute/resource_arm_virtual_machine_extension.go index fa276da4ffab9..0bdaf8fa88c82 100644 --- a/azurerm/internal/services/compute/resource_arm_virtual_machine_extension.go +++ b/azurerm/internal/services/compute/resource_arm_virtual_machine_extension.go @@ -41,19 +41,9 @@ func resourceArmVirtualMachineExtension() *schema.Resource { ForceNew: true, }, - // TODO: Remove in 2.0 - "virtual_machine_name": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ForceNew: true, - Deprecated: "This field has been deprecated in favor of `virtual_machine_id` - will be removed in 2.0 of the Azure Provider", - }, - "virtual_machine_id": { Type: schema.TypeString, - Optional: true, - Computed: true, + Required: true, ForceNew: true, ValidateFunc: ValidateVirtualMachineID, }, @@ -94,19 +84,6 @@ func resourceArmVirtualMachineExtension() *schema.Resource { DiffSuppressFunc: structure.SuppressJsonDiff, }, - // TODO: Remove location and resource_group_name in 2.0 - "location": { - Type: schema.TypeString, - ForceNew: true, - Optional: true, - Computed: true, - StateFunc: azure.NormalizeLocation, - DiffSuppressFunc: azure.SuppressLocationDiff, - Deprecated: "location is no longer used", - }, - - "resource_group_name": azure.SchemaResourceGroupNameDeprecated(), - "tags": tags.Schema(), }, } @@ -119,39 +96,22 @@ func resourceArmVirtualMachineExtensionsCreateUpdate(d *schema.ResourceData, met defer cancel() name := d.Get("name").(string) - var virtualMachineName, resourceGroup, location string - if virtualMachineId, ok := d.GetOk("virtual_machine_id"); ok { - v, err := ParseVirtualMachineID(virtualMachineId.(string)) - if err != nil { - return fmt.Errorf("Error parsing Virtual Machine ID %q: %+v", virtualMachineId, err) - } - - virtualMachineName = v.Name - resourceGroup = v.ResourceGroup + virtualMachineId, err := ParseVirtualMachineID(d.Get("virtual_machine_id").(string)) + if err != nil { + return fmt.Errorf("Error parsing Virtual Machine ID %q: %+v", virtualMachineId, err) + } - virtualMachine, err := vmClient.Get(ctx, resourceGroup, virtualMachineName, "") - if err != nil { - return fmt.Errorf("Error getting Virtual Machine %q (Resource Group %q): %+v", name, resourceGroup, err) - } + virtualMachineName := virtualMachineId.Name + resourceGroup := virtualMachineId.ResourceGroup - if location = *virtualMachine.Location; location == "" { - return fmt.Errorf("Error reading location of Virtual Machine %q", virtualMachineName) - } - } else { - if vm, ok := d.GetOk("virtual_machine_name"); !ok { - return fmt.Errorf("Error, one of `virtual_machine_name` (deprecated) or `virtual_machine_id` (preferred) required.") - } else { - virtualMachineName = vm.(string) - resourceGroup = d.Get("resource_group_name").(string) - if resourceGroup == "" { - return fmt.Errorf("`resource_group_name` must be specified if `virtual_machine_id` is not used") - } + virtualMachine, err := vmClient.Get(ctx, resourceGroup, virtualMachineName, "") + if err != nil { + return fmt.Errorf("Error getting Virtual Machine %q (Resource Group %q): %+v", name, resourceGroup, err) + } - location = azure.NormalizeLocation(d.Get("location").(string)) - if location == "" { - return fmt.Errorf("`location` must be specified if `virtual_machine_id` is not used") - } - } + location := *virtualMachine.Location + if location == "" { + return fmt.Errorf("Error reading location of Virtual Machine %q", virtualMachineName) } if features.ShouldResourcesBeImported() && d.IsNewResource() { @@ -247,9 +207,6 @@ func resourceArmVirtualMachineExtensionsRead(d *schema.ResourceData, meta interf } d.Set("virtual_machine_id", virtualMachine.ID) - if location := virtualMachine.Location; location != nil { - d.Set("location", azure.NormalizeLocation(*location)) - } resp, err := vmExtensionClient.Get(ctx, resourceGroup, vmName, name, "") if err != nil { @@ -261,8 +218,6 @@ func resourceArmVirtualMachineExtensionsRead(d *schema.ResourceData, meta interf } d.Set("name", resp.Name) - d.Set("virtual_machine_name", vmName) - d.Set("resource_group_name", resourceGroup) if props := resp.VirtualMachineExtensionProperties; props != nil { d.Set("publisher", props.Publisher) diff --git a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_extension_test.go b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_extension_test.go index d409269fac98d..3dedef8e8b98a 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_extension_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_extension_test.go @@ -2,6 +2,7 @@ package tests import ( "fmt" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/compute" "net/http" "regexp" "testing" @@ -41,35 +42,6 @@ func TestAccAzureRMVirtualMachineExtension_basic(t *testing.T) { }) } -// TODO: Remove in 2.0 -func TestAccAzureRMVirtualMachineExtension_deprecated(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_virtual_machine_extension", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMVirtualMachineExtensionDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMVirtualMachineExtension_deprecated(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineExtensionExists(data.ResourceName), - resource.TestMatchResourceAttr(data.ResourceName, "settings", regexp.MustCompile("hostname")), - ), - }, - data.ImportStep("protected_settings"), - { - Config: testAccAzureRMVirtualMachineExtension_deprecatedUpdate(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMVirtualMachineExtensionExists(data.ResourceName), - resource.TestMatchResourceAttr(data.ResourceName, "settings", regexp.MustCompile("whoami")), - ), - }, - data.ImportStep("protected_settings"), - }, - }) -} - func TestAccAzureRMVirtualMachineExtension_requiresImport(t *testing.T) { if !features.ShouldResourcesBeImported() { t.Skip("Skipping since resources aren't required to be imported") @@ -149,8 +121,12 @@ func testCheckAzureRMVirtualMachineExtensionExists(resourceName string) resource } name := rs.Primary.Attributes["name"] - vmName := rs.Primary.Attributes["virtual_machine_name"] - resourceGroup := rs.Primary.Attributes["resource_group_name"] + virtualMachineId, err := compute.ParseVirtualMachineID(rs.Primary.Attributes["virtual_machine_id"]) + if err != nil { + return fmt.Errorf("Error parsing Virtual Machine ID %q: %+v", virtualMachineId, err) + } + vmName := virtualMachineId.Name + resourceGroup := virtualMachineId.ResourceGroup resp, err := client.Get(ctx, resourceGroup, vmName, name, "") if err != nil { @@ -175,8 +151,12 @@ func testCheckAzureRMVirtualMachineExtensionDestroy(s *terraform.State) error { } name := rs.Primary.Attributes["name"] - vmName := rs.Primary.Attributes["virtual_machine_name"] - resourceGroup := rs.Primary.Attributes["resource_group_name"] + virtualMachineId, err := compute.ParseVirtualMachineID(rs.Primary.Attributes["virtual_machine_id"]) + if err != nil { + return fmt.Errorf("Error parsing Virtual Machine ID %q: %+v", virtualMachineId, err) + } + vmName := virtualMachineId.Name + resourceGroup := virtualMachineId.ResourceGroup resp, err := client.Get(ctx, resourceGroup, vmName, name, "") @@ -296,113 +276,6 @@ SETTINGS `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) } -// TODO: Remove in 2.0 - this test config covers the name & location inputs -func testAccAzureRMVirtualMachineExtension_deprecated(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "acctsub-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" -} - -resource "azurerm_network_interface" "test" { - name = "acctni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - } -} - -resource "azurerm_storage_account" "test" { - name = "accsa%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - account_tier = "Standard" - account_replication_type = "LRS" - - tags = { - environment = "staging" - } -} - -resource "azurerm_storage_container" "test" { - name = "vhds" - resource_group_name = "${azurerm_resource_group.test.name}" - storage_account_name = "${azurerm_storage_account.test.name}" - container_access_type = "private" -} - -resource "azurerm_virtual_machine" "test" { - name = "acctvm-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - network_interface_ids = ["${azurerm_network_interface.test.id}"] - vm_size = "Standard_F2" - - storage_image_reference { - publisher = "Canonical" - offer = "UbuntuServer" - sku = "16.04-LTS" - version = "latest" - } - - storage_os_disk { - name = "myosdisk1" - vhd_uri = "${azurerm_storage_account.test.primary_blob_endpoint}${azurerm_storage_container.test.name}/myosdisk1.vhd" - caching = "ReadWrite" - create_option = "FromImage" - } - - os_profile { - computer_name = "hostname%d" - admin_username = "testadmin" - admin_password = "Password1234!" - } - - os_profile_linux_config { - disable_password_authentication = false - } -} - -resource "azurerm_virtual_machine_extension" "test" { - name = "acctvme-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_machine_name = "${azurerm_virtual_machine.test.name}" - publisher = "Microsoft.Azure.Extensions" - type = "CustomScript" - type_handler_version = "2.0" - - settings = < 0 { - profile.MaxPods = utils.Int32(maxPods) - } - - vnetSubnetID := config["vnet_subnet_id"].(string) - if vnetSubnetID != "" { - profile.VnetSubnetID = utils.String(vnetSubnetID) - } - - if maxCount := int32(config["max_count"].(int)); maxCount > 0 { - profile.MaxCount = utils.Int32(maxCount) - } - - if minCount := int32(config["min_count"].(int)); minCount > 0 { - profile.MinCount = utils.Int32(minCount) - } - - if enableAutoScalingItf := config["enable_auto_scaling"]; enableAutoScalingItf != nil { - profile.EnableAutoScaling = utils.Bool(enableAutoScalingItf.(bool)) - - // Auto scaling will change the number of nodes, but the original count number should not be sent again. - // This avoid the cluster being resized after creation. - if *profile.EnableAutoScaling && !isNewResource { - profile.Count = nil - } - } - - if availabilityZones := utils.ExpandStringSlice(config["availability_zones"].([]interface{})); len(*availabilityZones) > 0 { - profile.AvailabilityZones = availabilityZones - } - - if *profile.EnableAutoScaling && (profile.MinCount == nil || profile.MaxCount == nil) { - return nil, fmt.Errorf("Can't create an AKS cluster with autoscaling enabled but not setting min_count or max_count") - } - - if nodeTaints := utils.ExpandStringSlice(config["node_taints"].([]interface{})); len(*nodeTaints) > 0 { - profile.NodeTaints = nodeTaints - } - - if enableNodePublicIP := config["enable_node_public_ip"]; enableNodePublicIP != nil { - profile.EnableNodePublicIP = utils.Bool(enableNodePublicIP.(bool)) - } - - profiles = append(profiles, profile) - } - - return profiles, nil -} - -func flattenKubernetesClusterAgentPoolProfiles(profiles *[]containerservice.ManagedClusterAgentPoolProfile, fqdn *string) []interface{} { - if profiles == nil { - return []interface{}{} - } - - agentPoolProfiles := make([]interface{}, 0) - - for _, profile := range *profiles { - count := 0 - if profile.Count != nil { - count = int(*profile.Count) - } - - enableAutoScaling := false - if profile.EnableAutoScaling != nil { - enableAutoScaling = *profile.EnableAutoScaling - } - - fqdnVal := "" - if fqdn != nil { - // temporarily persist the parent FQDN here until `fqdn` is removed from the `agent_pool_profile` - fqdnVal = *fqdn - } - - maxCount := 0 - if profile.MaxCount != nil { - maxCount = int(*profile.MaxCount) - } - - maxPods := 0 - if profile.MaxPods != nil { - maxPods = int(*profile.MaxPods) - } - - minCount := 0 - if profile.MinCount != nil { - minCount = int(*profile.MinCount) - } - - name := "" - if profile.Name != nil { - name = *profile.Name - } - - osDiskSizeGB := 0 - if profile.OsDiskSizeGB != nil { - osDiskSizeGB = int(*profile.OsDiskSizeGB) - } - - subnetId := "" - if profile.VnetSubnetID != nil { - subnetId = *profile.VnetSubnetID - } - - enableNodePublicIP := false - if profile.EnableNodePublicIP != nil { - enableNodePublicIP = *profile.EnableNodePublicIP - } - - agentPoolProfile := map[string]interface{}{ - "availability_zones": utils.FlattenStringSlice(profile.AvailabilityZones), - "count": count, - "enable_auto_scaling": enableAutoScaling, - "enable_node_public_ip": enableNodePublicIP, - "max_count": maxCount, - "max_pods": maxPods, - "min_count": minCount, - "name": name, - "node_taints": utils.FlattenStringSlice(profile.NodeTaints), - "os_disk_size_gb": osDiskSizeGB, - "os_type": string(profile.OsType), - "type": string(profile.Type), - "vm_size": string(profile.VMSize), - "vnet_subnet_id": subnetId, - - // TODO: remove in 2.0 - "fqdn": fqdnVal, - } - - agentPoolProfiles = append(agentPoolProfiles, agentPoolProfile) - } - - return agentPoolProfiles -} - func expandKubernetesClusterLinuxProfile(input []interface{}) *containerservice.LinuxProfile { if len(input) == 0 { return nil diff --git a/azurerm/internal/services/containers/tests/resource_arm_container_group_test.go b/azurerm/internal/services/containers/tests/resource_arm_container_group_test.go index 8eb29403cb457..8a5eec235d382 100644 --- a/azurerm/internal/services/containers/tests/resource_arm_container_group_test.go +++ b/azurerm/internal/services/containers/tests/resource_arm_container_group_test.go @@ -128,7 +128,7 @@ func TestAccAzureRMContainerGroup_imageRegistryCredentialsUpdate(t *testing.T) { resource.TestCheckResourceAttr(data.ResourceName, "image_registry_credential.1.server", "mine.acr.io"), resource.TestCheckResourceAttr(data.ResourceName, "image_registry_credential.1.username", "acrusername"), resource.TestCheckResourceAttr(data.ResourceName, "image_registry_credential.1.password", "acrpassword"), - resource.TestCheckResourceAttr(data.ResourceName, "container.0.port", "5443"), + resource.TestCheckResourceAttr(data.ResourceName, "container.0.ports.#", "1"), resource.TestCheckResourceAttr(data.ResourceName, "container.0.protocol", "UDP"), ), }, @@ -185,7 +185,7 @@ func TestAccAzureRMContainerGroup_linuxBasic(t *testing.T) { testCheckAzureRMContainerGroupExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "container.#", "1"), resource.TestCheckResourceAttr(data.ResourceName, "os_type", "Linux"), - resource.TestCheckResourceAttr(data.ResourceName, "container.0.port", "80"), + resource.TestCheckResourceAttr(data.ResourceName, "container.0.ports.#", "1"), ), }, data.ImportStep( @@ -264,7 +264,6 @@ func TestAccAzureRMContainerGroup_linuxComplete(t *testing.T) { testCheckAzureRMContainerGroupExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "container.#", "1"), resource.TestCheckResourceAttr(data.ResourceName, "container.0.ports.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "container.0.command", "/bin/bash -c ls"), resource.TestCheckResourceAttr(data.ResourceName, "container.0.commands.#", "3"), resource.TestCheckResourceAttr(data.ResourceName, "container.0.commands.0", "/bin/bash"), resource.TestCheckResourceAttr(data.ResourceName, "container.0.commands.1", "-c"), @@ -338,7 +337,7 @@ func TestAccAzureRMContainerGroup_virtualNetwork(t *testing.T) { resource.TestCheckNoResourceAttr(data.ResourceName, "identity"), resource.TestCheckResourceAttr(data.ResourceName, "container.#", "1"), resource.TestCheckResourceAttr(data.ResourceName, "os_type", "Linux"), - resource.TestCheckResourceAttr(data.ResourceName, "container.0.port", "80"), + resource.TestCheckResourceAttr(data.ResourceName, "container.0.ports.#", "1"), resource.TestCheckResourceAttr(data.ResourceName, "ip_address_type", "Private"), resource.TestCheckResourceAttrSet(data.ResourceName, "network_profile_id"), ), @@ -383,7 +382,6 @@ func TestAccAzureRMContainerGroup_windowsComplete(t *testing.T) { testCheckAzureRMContainerGroupExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "container.#", "1"), resource.TestCheckResourceAttr(data.ResourceName, "container.0.ports.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "container.0.command", "cmd.exe echo hi"), resource.TestCheckResourceAttr(data.ResourceName, "container.0.commands.#", "3"), resource.TestCheckResourceAttr(data.ResourceName, "container.0.commands.0", "cmd.exe"), resource.TestCheckResourceAttr(data.ResourceName, "container.0.commands.1", "echo"), @@ -623,8 +621,10 @@ resource "azurerm_container_group" "test" { image = "microsoft/aci-helloworld:latest" cpu = "0.5" memory = "0.5" - port = 5443 - protocol = "UDP" + ports { + port = 5443 + protocol = "UDP" + } } image_registry_credential { @@ -724,7 +724,9 @@ resource "azurerm_container_group" "test" { image = "microsoft/aci-helloworld:latest" cpu = "0.5" memory = "0.5" - port = 80 + ports { + port = 80 + } } diagnostics { @@ -843,7 +845,9 @@ resource "azurerm_container_group" "test" { image = "microsoft/aci-helloworld:latest" cpu = "0.5" memory = "0.5" - port = 80 + ports { + port = 80 + } } tags = { diff --git a/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_legacy_test.go b/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_legacy_test.go deleted file mode 100644 index a3a324b2552a9..0000000000000 --- a/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_legacy_test.go +++ /dev/null @@ -1,123 +0,0 @@ -package tests - -import ( - "fmt" - "os" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" -) - -// NOTE: all of the tests in this file are for functionality which will be removed in 2.0 - -func TestAccAzureRMKubernetesCluster_legacyAgentPoolProfileAvailabilitySet(t *testing.T) { - checkIfShouldRunTestsIndividually(t) - testAccAzureRMKubernetesCluster_legacyAgentPoolProfileAvailabilitySet(t) -} - -func testAccAzureRMKubernetesCluster_legacyAgentPoolProfileAvailabilitySet(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_kubernetes_cluster", "test") - clientId := os.Getenv("ARM_CLIENT_ID") - clientSecret := os.Getenv("ARM_CLIENT_SECRET") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMKubernetesClusterDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMKubernetesCluster_legacyAgentPoolProfileAvailabilitySetConfig(data, clientId, clientSecret), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMKubernetesClusterExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "agent_pool_profile.0.type", "AvailabilitySet"), - ), - // since users are prompted to move to `default_node_pool` - ExpectNonEmptyPlan: true, - }, - }, - }) -} - -func TestAccAzureRMKubernetesCluster_legacyAgentPoolProfileVMSS(t *testing.T) { - checkIfShouldRunTestsIndividually(t) - testAccAzureRMKubernetesCluster_legacyAgentPoolProfileVMSS(t) -} - -func testAccAzureRMKubernetesCluster_legacyAgentPoolProfileVMSS(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_kubernetes_cluster", "test") - clientId := os.Getenv("ARM_CLIENT_ID") - clientSecret := os.Getenv("ARM_CLIENT_SECRET") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMKubernetesClusterDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMKubernetesCluster_legacyAgentPoolProfileVMSSConfig(data, clientId, clientSecret), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMKubernetesClusterExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "agent_pool_profile.0.type", "VirtualMachineScaleSets"), - ), - // since users are prompted to move to `default_node_pool` - ExpectNonEmptyPlan: true, - }, - }, - }) -} - -func testAccAzureRMKubernetesCluster_legacyAgentPoolProfileAvailabilitySetConfig(data acceptance.TestData, clientId string, clientSecret string) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_kubernetes_cluster" "test" { - name = "acctestaks%d" - location = azurerm_resource_group.test.location - resource_group_name = azurerm_resource_group.test.name - dns_prefix = "acctestaks%d" - - agent_pool_profile { - name = "default" - count = 1 - vm_size = "Standard_DS2_v2" - } - - service_principal { - client_id = "%s" - client_secret = "%s" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, clientId, clientSecret) -} - -func testAccAzureRMKubernetesCluster_legacyAgentPoolProfileVMSSConfig(data acceptance.TestData, clientId string, clientSecret string) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_kubernetes_cluster" "test" { - name = "acctestaks%d" - location = azurerm_resource_group.test.location - resource_group_name = azurerm_resource_group.test.name - dns_prefix = "acctestaks%d" - - agent_pool_profile { - name = "default" - count = 1 - type = "VirtualMachineScaleSets" - vm_size = "Standard_DS2_v2" - } - - service_principal { - client_id = "%s" - client_secret = "%s" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, clientId, clientSecret) -} diff --git a/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_test.go b/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_test.go index 0b947d9648ce9..bee56efc903c3 100644 --- a/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_test.go +++ b/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_test.go @@ -37,10 +37,6 @@ func TestAccAzureRMKubernetes_all(t *testing.T) { "roleBasedAccessControl": testAccAzureRMKubernetesCluster_roleBasedAccessControl, "roleBasedAccessControlAAD": testAccAzureRMKubernetesCluster_roleBasedAccessControlAAD, }, - "legacy": { - "legacyAgentPoolProfileAvailabilitySet": testAccAzureRMKubernetesCluster_legacyAgentPoolProfileAvailabilitySet, - "legacyAgentPoolProfileVMSS": testAccAzureRMKubernetesCluster_legacyAgentPoolProfileVMSS, - }, "network": { "advancedNetworkingKubenet": testAccAzureRMKubernetesCluster_advancedNetworkingKubenet, "advancedNetworkingKubenetComplete": testAccAzureRMKubernetesCluster_advancedNetworkingKubenetComplete, diff --git a/azurerm/internal/services/network/data_source_network_interface.go b/azurerm/internal/services/network/data_source_network_interface.go index aac8054521939..e1a0ea6df3469 100644 --- a/azurerm/internal/services/network/data_source_network_interface.go +++ b/azurerm/internal/services/network/data_source_network_interface.go @@ -138,12 +138,6 @@ func dataSourceArmNetworkInterface() *schema.Resource { Set: schema.HashString, }, - "internal_fqdn": { - Type: schema.TypeString, - Deprecated: "This field has been removed by Azure", - Computed: true, - }, - "enable_accelerated_networking": { Type: schema.TypeBool, Computed: true, @@ -232,7 +226,6 @@ func dataSourceArmNetworkInterfaceRead(d *schema.ResourceData, meta interface{}) dnsServers = *s } - d.Set("internal_fqdn", dnsSettings.InternalFqdn) d.Set("internal_dns_name_label", dnsSettings.InternalDNSNameLabel) } diff --git a/azurerm/internal/services/network/data_source_private_link_service.go b/azurerm/internal/services/network/data_source_private_link_service.go index 3d35d3ebcab61..a6bc847934f29 100644 --- a/azurerm/internal/services/network/data_source_private_link_service.go +++ b/azurerm/internal/services/network/data_source_private_link_service.go @@ -89,13 +89,6 @@ func dataSourceArmPrivateLinkService() *schema.Resource { Computed: true, }, - "network_interface_ids": { - Type: schema.TypeList, - Computed: true, - Deprecated: "This field has been deprecated and will be removed in version 2.0 of the Azure Provider", - Elem: &schema.Schema{Type: schema.TypeString}, - }, - "tags": tags.SchemaDataSource(), }, } @@ -149,11 +142,6 @@ func dataSourceArmPrivateLinkServiceRead(d *schema.ResourceData, meta interface{ return fmt.Errorf("Error setting `load_balancer_frontend_ip_configuration_ids`: %+v", err) } } - if props.NetworkInterfaces != nil { - if err := d.Set("network_interface_ids", dataSourceFlattenArmPrivateLinkServiceInterface(props.NetworkInterfaces)); err != nil { - return fmt.Errorf("Error setting `network_interface_ids`: %+v", err) - } - } } if resp.ID == nil || *resp.ID == "" { diff --git a/azurerm/internal/services/network/data_source_virtual_network.go b/azurerm/internal/services/network/data_source_virtual_network.go index 2890b6e5d6ff3..dca55e7f23f64 100644 --- a/azurerm/internal/services/network/data_source_virtual_network.go +++ b/azurerm/internal/services/network/data_source_virtual_network.go @@ -32,15 +32,6 @@ func dataSourceArmVirtualNetwork() *schema.Resource { "location": azure.SchemaLocationForDataSource(), - "address_spaces": { - Type: schema.TypeList, - Computed: true, - Deprecated: "This resource has been deprecated in favour of `address_space` to be more consistent with the `azurerm_virtual_network` resource", - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - "address_space": { Type: schema.TypeList, Computed: true, @@ -104,9 +95,6 @@ func dataSourceArmVnetRead(d *schema.ResourceData, meta interface{}) error { if props := resp.VirtualNetworkPropertiesFormat; props != nil { if as := props.AddressSpace; as != nil { - if err := d.Set("address_spaces", utils.FlattenStringSlice(as.AddressPrefixes)); err != nil { // todo remove in 2.0 - return fmt.Errorf("error setting `address_spaces`: %v", err) - } if err := d.Set("address_space", utils.FlattenStringSlice(as.AddressPrefixes)); err != nil { return fmt.Errorf("error setting `address_space`: %v", err) } diff --git a/azurerm/internal/services/network/resource_arm_application_gateway.go b/azurerm/internal/services/network/resource_arm_application_gateway.go index 6d113a17c0475..9d07a483dcade 100644 --- a/azurerm/internal/services/network/resource_arm_application_gateway.go +++ b/azurerm/internal/services/network/resource_arm_application_gateway.go @@ -113,7 +113,6 @@ func resourceArmApplicationGateway() *schema.Resource { "fqdns": { Type: schema.TypeList, Optional: true, - Computed: true, MinItems: 1, Elem: &schema.Schema{ Type: schema.TypeString, @@ -123,7 +122,6 @@ func resourceArmApplicationGateway() *schema.Resource { "ip_addresses": { Type: schema.TypeList, Optional: true, - Computed: true, MinItems: 1, Elem: &schema.Schema{ Type: schema.TypeString, @@ -131,31 +129,6 @@ func resourceArmApplicationGateway() *schema.Resource { }, }, - // TODO: remove in 2.0 - "fqdn_list": { - Type: schema.TypeList, - Optional: true, - Computed: true, - Deprecated: "`fqdn_list` has been deprecated in favour of the `fqdns` field", - MinItems: 1, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - - // TODO: remove in 2.0 - "ip_address_list": { - Type: schema.TypeList, - Optional: true, - Computed: true, - Deprecated: "`ip_address_list` has been deprecated in favour of the `ip_addresses` field", - MinItems: 1, - Elem: &schema.Schema{ - Type: schema.TypeString, - ValidateFunc: validate.IPv4Address, - }, - }, - "id": { Type: schema.TypeString, Computed: true, @@ -755,23 +728,6 @@ func resourceArmApplicationGateway() *schema.Resource { }, }, - // TODO: remove in 2.0 - "disabled_ssl_protocols": { - Type: schema.TypeList, - Optional: true, - Computed: true, - Deprecated: "has been replaced by `ssl_policy`.`disabled_protocols`", - Elem: &schema.Schema{ - Type: schema.TypeString, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validation.StringInSlice([]string{ - string(network.TLSv10), - string(network.TLSv11), - string(network.TLSv12), - }, true), - }, - }, - "ssl_policy": { Type: schema.TypeList, Optional: true, @@ -781,7 +737,6 @@ func resourceArmApplicationGateway() *schema.Resource { "disabled_protocols": { Type: schema.TypeList, Optional: true, - Computed: true, Elem: &schema.Schema{ Type: schema.TypeString, ValidateFunc: validation.StringInSlice([]string{ @@ -1573,10 +1528,6 @@ func resourceArmApplicationGatewayRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("Error setting `backend_http_settings`: %+v", setErr) } - if setErr := d.Set("disabled_ssl_protocols", flattenApplicationGatewayDisabledSSLProtocols(props.SslPolicy)); setErr != nil { - return fmt.Errorf("Error setting `disabled_ssl_protocols`: %+v", setErr) - } - if setErr := d.Set("ssl_policy", flattenApplicationGatewaySslPolicy(props.SslPolicy)); setErr != nil { return fmt.Errorf("Error setting `ssl_policy`: %+v", setErr) } @@ -1887,21 +1838,6 @@ func expandApplicationGatewayBackendAddressPools(d *schema.ResourceData) *[]netw }) } - if len(backendAddresses) == 0 { - // TODO: remove in 2.0 - for _, ip := range v["ip_address_list"].([]interface{}) { - backendAddresses = append(backendAddresses, network.ApplicationGatewayBackendAddress{ - IPAddress: utils.String(ip.(string)), - }) - } - // TODO: remove in 2.0 - for _, ip := range v["fqdn_list"].([]interface{}) { - backendAddresses = append(backendAddresses, network.ApplicationGatewayBackendAddress{ - Fqdn: utils.String(ip.(string)), - }) - } - } - name := v["name"].(string) output := network.ApplicationGatewayBackendAddressPool{ Name: utils.String(name), @@ -1941,10 +1877,6 @@ func flattenApplicationGatewayBackendAddressPools(input *[]network.ApplicationGa output := map[string]interface{}{ "fqdns": fqdnList, "ip_addresses": ipAddressList, - - // TODO: deprecated - remove in 2.0 - "ip_address_list": ipAddressList, - "fqdn_list": fqdnList, } if config.ID != nil { @@ -2190,25 +2122,11 @@ func expandApplicationGatewaySslPolicy(d *schema.ResourceData) *network.Applicat disabledSSLPolicies := make([]network.ApplicationGatewaySslProtocol, 0) vs := d.Get("ssl_policy").([]interface{}) - vsdsp := d.Get("disabled_ssl_protocols").([]interface{}) - - if len(vsdsp) == 0 && len(vs) == 0 { - policy = network.ApplicationGatewaySslPolicy{ - DisabledSslProtocols: &disabledSSLPolicies, - } - } - - for _, policy := range vsdsp { - disabledSSLPolicies = append(disabledSSLPolicies, network.ApplicationGatewaySslProtocol(policy.(string))) - } if len(vs) > 0 { v := vs[0].(map[string]interface{}) policyType := network.ApplicationGatewaySslPolicyType(v["policy_type"].(string)) - // reset disabledSSLPolicies here to always use the new disabled_protocols block in favor of disabled_ssl_protocols - disabledSSLPolicies = disabledSSLPolicies[:0] - for _, policy := range v["disabled_protocols"].([]interface{}) { disabledSSLPolicies = append(disabledSSLPolicies, network.ApplicationGatewaySslProtocol(policy.(string))) } diff --git a/azurerm/internal/services/network/resource_arm_firewall.go b/azurerm/internal/services/network/resource_arm_firewall.go index c825d2e914d8d..ca9438284f48c 100644 --- a/azurerm/internal/services/network/resource_arm_firewall.go +++ b/azurerm/internal/services/network/resource_arm_firewall.go @@ -66,17 +66,9 @@ func resourceArmFirewall() *schema.Resource { ForceNew: true, ValidateFunc: validateAzureFirewallSubnetName, }, - "internal_public_ip_address_id": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ValidateFunc: azure.ValidateResourceID, - Deprecated: "This field has been deprecated in favour of the `public_ip_address_id` property to better match the Azure SDK.", - }, "public_ip_address_id": { Type: schema.TypeString, - Optional: true, - Computed: true, + Required: true, ValidateFunc: azure.ValidateResourceID, }, "private_ip_address": { @@ -310,15 +302,7 @@ func expandArmFirewallIPConfigurations(d *schema.ResourceData) (*[]network.Azure data := configRaw.(map[string]interface{}) name := data["name"].(string) subnetId := data["subnet_id"].(string) - - pubID, exist := data["internal_public_ip_address_id"].(string) - if !exist || pubID == "" { - pubID, exist = data["public_ip_address_id"].(string) - } - - if !exist || pubID == "" { - return nil, nil, nil, fmt.Errorf("one of `internal_public_ip_address_id` or `public_ip_address_id` must be set") - } + pubID := data["public_ip_address_id"].(string) ipConfig := network.AzureFirewallIPConfiguration{ Name: utils.String(name), @@ -384,7 +368,6 @@ func flattenArmFirewallIPConfigurations(input *[]network.AzureFirewallIPConfigur if pip := props.PublicIPAddress; pip != nil { if id := pip.ID; id != nil { - afIPConfig["internal_public_ip_address_id"] = *id afIPConfig["public_ip_address_id"] = *id } } diff --git a/azurerm/internal/services/network/resource_arm_lb_backend_address_pool.go b/azurerm/internal/services/network/resource_arm_lb_backend_address_pool.go index 66294b426b369..5b23a7bfa3f1b 100644 --- a/azurerm/internal/services/network/resource_arm_lb_backend_address_pool.go +++ b/azurerm/internal/services/network/resource_arm_lb_backend_address_pool.go @@ -41,8 +41,6 @@ func resourceArmLoadBalancerBackendAddressPool() *schema.Resource { ValidateFunc: validation.StringIsNotEmpty, }, - "location": azure.SchemaLocationDeprecated(), - "resource_group_name": azure.SchemaResourceGroupName(), "loadbalancer_id": { diff --git a/azurerm/internal/services/network/resource_arm_lb_nat_pool.go b/azurerm/internal/services/network/resource_arm_lb_nat_pool.go index 40120ba98367e..c437eae427588 100644 --- a/azurerm/internal/services/network/resource_arm_lb_nat_pool.go +++ b/azurerm/internal/services/network/resource_arm_lb_nat_pool.go @@ -45,8 +45,6 @@ func resourceArmLoadBalancerNatPool() *schema.Resource { ValidateFunc: validation.StringIsNotEmpty, }, - "location": azure.SchemaLocationDeprecated(), - "resource_group_name": azure.SchemaResourceGroupName(), "loadbalancer_id": { diff --git a/azurerm/internal/services/network/resource_arm_lb_nat_rule.go b/azurerm/internal/services/network/resource_arm_lb_nat_rule.go index e45c680d45132..e62b4278656d5 100644 --- a/azurerm/internal/services/network/resource_arm_lb_nat_rule.go +++ b/azurerm/internal/services/network/resource_arm_lb_nat_rule.go @@ -46,8 +46,6 @@ func resourceArmLoadBalancerNatRule() *schema.Resource { ValidateFunc: validation.StringIsNotEmpty, }, - "location": azure.SchemaLocationDeprecated(), - "resource_group_name": azure.SchemaResourceGroupName(), "loadbalancer_id": { diff --git a/azurerm/internal/services/network/resource_arm_lb_probe.go b/azurerm/internal/services/network/resource_arm_lb_probe.go index 19d6336b3d541..15cc869d7f8e8 100644 --- a/azurerm/internal/services/network/resource_arm_lb_probe.go +++ b/azurerm/internal/services/network/resource_arm_lb_probe.go @@ -44,8 +44,6 @@ func resourceArmLoadBalancerProbe() *schema.Resource { ValidateFunc: validation.StringIsNotEmpty, }, - "location": azure.SchemaLocationDeprecated(), - "resource_group_name": azure.SchemaResourceGroupName(), "loadbalancer_id": { diff --git a/azurerm/internal/services/network/resource_arm_lb_rule.go b/azurerm/internal/services/network/resource_arm_lb_rule.go index a09cdf1dae140..855fb0e77cc0b 100644 --- a/azurerm/internal/services/network/resource_arm_lb_rule.go +++ b/azurerm/internal/services/network/resource_arm_lb_rule.go @@ -46,8 +46,6 @@ func resourceArmLoadBalancerRule() *schema.Resource { ValidateFunc: ValidateArmLoadBalancerRuleName, }, - "location": azure.SchemaLocationDeprecated(), - "resource_group_name": azure.SchemaResourceGroupName(), "loadbalancer_id": { diff --git a/azurerm/internal/services/network/resource_arm_private_link_service.go b/azurerm/internal/services/network/resource_arm_private_link_service.go index b2e1f8c5a6212..075d08d41c575 100644 --- a/azurerm/internal/services/network/resource_arm_private_link_service.go +++ b/azurerm/internal/services/network/resource_arm_private_link_service.go @@ -136,17 +136,6 @@ func resourceArmPrivateLinkService() *schema.Resource { Computed: true, }, - "network_interface_ids": { - Type: schema.TypeSet, - Computed: true, - Deprecated: "This field is deprecated and be removed in version 2.0 of the Azure Provider", - Elem: &schema.Schema{ - Type: schema.TypeString, - ValidateFunc: azure.ValidateResourceID, - }, - Set: schema.HashString, - }, - "tags": tags.Schema(), }, @@ -298,11 +287,6 @@ func resourceArmPrivateLinkServiceRead(d *schema.ResourceData, meta interface{}) if err := d.Set("load_balancer_frontend_ip_configuration_ids", flattenArmPrivateLinkServiceFrontendIPConfiguration(props.LoadBalancerFrontendIPConfigurations)); err != nil { return fmt.Errorf("Error setting `load_balancer_frontend_ip_configuration_ids`: %+v", err) } - - // TODO: remove in 2.0 - if err := d.Set("network_interface_ids", flattenArmPrivateLinkServiceInterface(props.NetworkInterfaces)); err != nil { - return fmt.Errorf("Error setting `network_interface_ids`: %+v", err) - } } return tags.FlattenAndSet(d, resp.Tags) diff --git a/azurerm/internal/services/network/resource_arm_public_ip.go b/azurerm/internal/services/network/resource_arm_public_ip.go index 0b1c6bfacde37..3812caed14c26 100644 --- a/azurerm/internal/services/network/resource_arm_public_ip.go +++ b/azurerm/internal/services/network/resource_arm_public_ip.go @@ -16,7 +16,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/state" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -62,31 +61,14 @@ func resourceArmPublicIp() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), "allocation_method": { - Type: schema.TypeString, - //Required: true, //revert in 2.0 - Optional: true, - Computed: true, // remove in 2.0 - ConflictsWith: []string{"public_ip_address_allocation"}, + Type: schema.TypeString, + Required: true, ValidateFunc: validation.StringInSlice([]string{ string(network.Static), string(network.Dynamic), }, false), }, - "public_ip_address_allocation": { - Type: schema.TypeString, - Optional: true, - DiffSuppressFunc: suppress.CaseDifference, - StateFunc: state.IgnoreCase, - ConflictsWith: []string{"allocation_method"}, - Computed: true, - Deprecated: "this property has been deprecated in favor of `allocation_method` to better match the api", - ValidateFunc: validation.StringInSlice([]string{ - string(network.Static), - string(network.Dynamic), - }, true), - }, - "ip_version": { Type: schema.TypeString, Optional: true, @@ -168,15 +150,7 @@ func resourceArmPublicIpCreateUpdate(d *schema.ResourceData, meta interface{}) e zones := azure.ExpandZones(d.Get("zones").([]interface{})) idleTimeout := d.Get("idle_timeout_in_minutes").(int) ipVersion := network.IPVersion(d.Get("ip_version").(string)) - - ipAllocationMethod := "" - if v, ok := d.GetOk("allocation_method"); ok { - ipAllocationMethod = v.(string) - } else if v, ok := d.GetOk("public_ip_address_allocation"); ok { - ipAllocationMethod = v.(string) - } else { - return fmt.Errorf("Either `allocation_method` or `public_ip_address_allocation` must be specified.") - } + ipAllocationMethod := d.Get("allocation_method").(string) if strings.EqualFold(string(ipVersion), string(network.IPv6)) { if strings.EqualFold(ipAllocationMethod, "static") { @@ -299,7 +273,6 @@ func resourceArmPublicIpRead(d *schema.ResourceData, meta interface{}) error { } if props := resp.PublicIPAddressPropertiesFormat; props != nil { - d.Set("public_ip_address_allocation", string(props.PublicIPAllocationMethod)) d.Set("allocation_method", string(props.PublicIPAllocationMethod)) d.Set("ip_version", string(props.PublicIPAddressVersion)) diff --git a/azurerm/internal/services/network/resource_arm_virtual_wan.go b/azurerm/internal/services/network/resource_arm_virtual_wan.go index 0fd574bf28150..13dc3b71bade2 100644 --- a/azurerm/internal/services/network/resource_arm_virtual_wan.go +++ b/azurerm/internal/services/network/resource_arm_virtual_wan.go @@ -78,13 +78,6 @@ func resourceArmVirtualWan() *schema.Resource { }, "tags": tags.Schema(), - - // Remove in 2.0 - "security_provider_name": { - Type: schema.TypeString, - Optional: true, - Deprecated: "This field has been removed by Azure and will be removed in version 2.0 of the Azure Provider", - }, }, } } diff --git a/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go index 23f8163487fbf..73dc260c6cfba 100644 --- a/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go @@ -817,26 +817,6 @@ func TestAccAzureRMApplicationGateway_sslPolicy_disabledProtocols(t *testing.T) }) } -func TestAccAzureRMApplicationGateway_disabledSslProtocols(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_application_gateway", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMApplicationGatewayDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMApplicationGateway_disabledSslProtocols(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMApplicationGatewayExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "disabled_ssl_protocols.0", "TLSv1_0"), - resource.TestCheckResourceAttr(data.ResourceName, "disabled_ssl_protocols.1", "TLSv1_1"), - ), - }, - }, - }) -} - func TestAccAzureRMApplicationGateway_cookieAffinity(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_application_gateway", "test") @@ -3897,86 +3877,6 @@ resource "azurerm_application_gateway" "test" { `, template, data.RandomInteger, data.RandomInteger) } -func testAccAzureRMApplicationGateway_disabledSslProtocols(data acceptance.TestData) string { - template := testAccAzureRMApplicationGateway_template(data) - return fmt.Sprintf(` -%s -# since these variables are re-used - a locals block makes this more maintainable -locals { - backend_address_pool_name = "${azurerm_virtual_network.test.name}-beap" - frontend_port_name = "${azurerm_virtual_network.test.name}-feport" - frontend_ip_configuration_name = "${azurerm_virtual_network.test.name}-feip" - http_setting_name = "${azurerm_virtual_network.test.name}-be-htst" - listener_name = "${azurerm_virtual_network.test.name}-httplstn" - request_routing_rule_name = "${azurerm_virtual_network.test.name}-rqrt" -} - -resource "azurerm_public_ip" "test_standard" { - name = "acctest-pubip-%d-standard" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku = "Standard" - allocation_method = "Static" -} - -resource "azurerm_application_gateway" "test" { - name = "acctestag-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - - sku { - name = "Standard_v2" - tier = "Standard_v2" - capacity = 1 - } - - disabled_ssl_protocols = ["TLSv1_0", "TLSv1_1"] - - gateway_ip_configuration { - name = "my-gateway-ip-configuration" - subnet_id = "${azurerm_subnet.test.id}" - } - - frontend_port { - name = "${local.frontend_port_name}" - port = 80 - } - - frontend_ip_configuration { - name = "${local.frontend_ip_configuration_name}" - public_ip_address_id = "${azurerm_public_ip.test_standard.id}" - } - - backend_address_pool { - name = "${local.backend_address_pool_name}" - } - - backend_http_settings { - name = "${local.http_setting_name}" - cookie_based_affinity = "Disabled" - port = 80 - protocol = "Http" - request_timeout = 1 - } - - http_listener { - name = "${local.listener_name}" - frontend_ip_configuration_name = "${local.frontend_ip_configuration_name}" - frontend_port_name = "${local.frontend_port_name}" - protocol = "Http" - } - - request_routing_rule { - name = "${local.request_routing_rule_name}" - rule_type = "Basic" - http_listener_name = "${local.listener_name}" - backend_address_pool_name = "${local.backend_address_pool_name}" - backend_http_settings_name = "${local.http_setting_name}" - } -} -`, template, data.RandomInteger, data.RandomInteger) -} - func testAccAzureRMApplicationGateway_template(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { diff --git a/azurerm/internal/services/network/tests/resource_arm_firewall_test.go b/azurerm/internal/services/network/tests/resource_arm_firewall_test.go index 67772e4550fb3..19d435f9fc4bb 100644 --- a/azurerm/internal/services/network/tests/resource_arm_firewall_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_firewall_test.go @@ -50,35 +50,6 @@ func TestValidateFirewallName(t *testing.T) { } } -func TestAccAzureRMFirewall_basicOld(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_firewall", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMFirewallDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMFirewall_basicOld(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMFirewallExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "ip_configuration.0.name", "configuration"), - resource.TestCheckResourceAttrSet(data.ResourceName, "ip_configuration.0.private_ip_address"), - ), - }, - { - Config: testAccAzureRMFirewall_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMFirewallExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "ip_configuration.0.name", "configuration"), - resource.TestCheckResourceAttrSet(data.ResourceName, "ip_configuration.0.private_ip_address"), - ), - }, - data.ImportStep(), - }, - }) -} - func TestAccAzureRMFirewall_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_firewall", "test") @@ -318,49 +289,6 @@ func testCheckAzureRMFirewallDestroy(s *terraform.State) error { return nil } -func testAccAzureRMFirewall_basicOld(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvirtnet%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "AzureFirewallSubnet" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.1.0/24" -} - -resource "azurerm_public_ip" "test" { - name = "acctestpip%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - allocation_method = "Static" - sku = "Standard" -} - -resource "azurerm_firewall" "test" { - name = "acctestfirewall%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "configuration" - subnet_id = "${azurerm_subnet.test.id}" - internal_public_ip_address_id = "${azurerm_public_ip.test.id}" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - func testAccAzureRMFirewall_basic(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { diff --git a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_backend_address_pool_test.go b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_backend_address_pool_test.go index a41442d0d2142..cd38cbbdf82d5 100644 --- a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_backend_address_pool_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_backend_address_pool_test.go @@ -44,8 +44,6 @@ func TestAccAzureRMLoadBalancerBackEndAddressPool_basic(t *testing.T) { ResourceName: "azurerm_lb.test", ImportState: true, ImportStateVerify: true, - // location is deprecated and was never actually used - ImportStateVerifyIgnore: []string{"location"}, }, }, }) @@ -214,7 +212,6 @@ resource "azurerm_lb" "test" { } resource "azurerm_lb_backend_address_pool" "test" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "%s" @@ -230,7 +227,6 @@ func testAccAzureRMLoadBalancerBackEndAddressPool_requiresImport(data acceptance resource "azurerm_lb_backend_address_pool" "import" { name = "${azurerm_lb_backend_address_pool.test.name}" loadbalancer_id = "${azurerm_lb_backend_address_pool.test.loadbalancer_id}" - location = "${azurerm_lb_backend_address_pool.test.location}" resource_group_name = "${azurerm_lb_backend_address_pool.test.resource_group_name}" } `, template) diff --git a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_pool_test.go b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_pool_test.go index fc3cab1156c0f..fee39d3140431 100644 --- a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_pool_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_pool_test.go @@ -44,8 +44,6 @@ func TestAccAzureRMLoadBalancerNatPool_basic(t *testing.T) { ResourceName: "azurerm_lb.test", ImportState: true, ImportStateVerify: true, - // location is deprecated and was never actually used - ImportStateVerifyIgnore: []string{"location"}, }, }, }) @@ -258,7 +256,6 @@ resource "azurerm_lb" "test" { } resource "azurerm_lb_nat_pool" "test" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "%s" @@ -279,7 +276,6 @@ func testAccAzureRMLoadBalancerNatPool_requiresImport(data acceptance.TestData, resource "azurerm_lb_nat_pool" "import" { name = "${azurerm_lb_nat_pool.test.name}" loadbalancer_id = "${azurerm_lb_nat_pool.test.loadbalancer_id}" - location = "${azurerm_lb_nat_pool.test.location}" resource_group_name = "${azurerm_lb_nat_pool.test.resource_group_name}" frontend_ip_configuration_name = "${azurerm_lb_nat_pool.test.frontend_ip_configuration_name}" protocol = "Tcp" @@ -344,7 +340,6 @@ resource "azurerm_lb" "test" { } resource "azurerm_lb_nat_pool" "test" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "%s" @@ -357,7 +352,6 @@ resource "azurerm_lb_nat_pool" "test" { } resource "azurerm_lb_nat_pool" "test2" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "%s" @@ -397,7 +391,6 @@ resource "azurerm_lb" "test" { } resource "azurerm_lb_nat_pool" "test" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "%s" @@ -409,7 +402,6 @@ resource "azurerm_lb_nat_pool" "test" { } resource "azurerm_lb_nat_pool" "test2" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_rule_test.go b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_rule_test.go index 175c35b16ef8f..e738394f0af6d 100644 --- a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_rule_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_rule_test.go @@ -39,7 +39,7 @@ func TestAccAzureRMLoadBalancerNatRule_basic(t *testing.T) { resource.TestCheckResourceAttr(data.ResourceName, "id", natRuleId), ), }, - data.ImportStep("location"), // todo remove location in 2.0 + data.ImportStep(), }, }) } @@ -68,7 +68,7 @@ func TestAccAzureRMLoadBalancerNatRule_complete(t *testing.T) { resource.TestCheckResourceAttr(data.ResourceName, "id", natRuleId), ), }, - data.ImportStep("location"), + data.ImportStep(), }, }) } @@ -97,7 +97,7 @@ func TestAccAzureRMLoadBalancerNatRule_update(t *testing.T) { resource.TestCheckResourceAttr(data.ResourceName, "id", natRuleId), ), }, - data.ImportStep("location"), + data.ImportStep(), { Config: testAccAzureRMLoadBalancerNatRule_complete(data, natRuleName), Check: resource.ComposeTestCheckFunc( @@ -107,7 +107,7 @@ func TestAccAzureRMLoadBalancerNatRule_update(t *testing.T) { "azurerm_lb_nat_rule.test", "id", natRuleId), ), }, - data.ImportStep("location"), + data.ImportStep(), { Config: testAccAzureRMLoadBalancerNatRule_basic(data, natRuleName, "Standard"), Check: resource.ComposeTestCheckFunc( @@ -116,7 +116,7 @@ func TestAccAzureRMLoadBalancerNatRule_update(t *testing.T) { resource.TestCheckResourceAttr(data.ResourceName, "id", natRuleId), ), }, - data.ImportStep("location"), + data.ImportStep(), }, }) } @@ -335,7 +335,6 @@ func testAccAzureRMLoadBalancerNatRule_basic(data acceptance.TestData, natRuleNa %s resource "azurerm_lb_nat_rule" "test" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "%s" @@ -353,7 +352,6 @@ func testAccAzureRMLoadBalancerNatRule_complete(data acceptance.TestData, natRul resource "azurerm_lb_nat_rule" "test" { name = "%s" - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" @@ -378,7 +376,6 @@ func testAccAzureRMLoadBalancerNatRule_requiresImport(data acceptance.TestData, resource "azurerm_lb_nat_rule" "import" { name = "${azurerm_lb_nat_rule.test.name}" loadbalancer_id = "${azurerm_lb_nat_rule.test.loadbalancer_id}" - location = "${azurerm_lb_nat_rule.test.location}" resource_group_name = "${azurerm_lb_nat_rule.test.resource_group_name}" frontend_ip_configuration_name = "${azurerm_lb_nat_rule.test.frontend_ip_configuration_name}" protocol = "Tcp" @@ -393,7 +390,6 @@ func testAccAzureRMLoadBalancerNatRule_multipleRules(data acceptance.TestData, n %s resource "azurerm_lb_nat_rule" "test" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "%s" @@ -404,7 +400,6 @@ resource "azurerm_lb_nat_rule" "test" { } resource "azurerm_lb_nat_rule" "test2" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "%s" @@ -420,7 +415,6 @@ func testAccAzureRMLoadBalancerNatRule_multipleRulesUpdate(data acceptance.TestD return fmt.Sprintf(` %s resource "azurerm_lb_nat_rule" "test" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "%s" @@ -431,7 +425,6 @@ resource "azurerm_lb_nat_rule" "test" { } resource "azurerm_lb_nat_rule" "test2" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_probe_test.go b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_probe_test.go index bbc310957bcb4..7efc594abb9d5 100644 --- a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_probe_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_probe_test.go @@ -40,13 +40,7 @@ func TestAccAzureRMLoadBalancerProbe_basic(t *testing.T) { "azurerm_lb_probe.test", "id", probeId), ), }, - { - ResourceName: "azurerm_lb.test", - ImportState: true, - ImportStateVerify: true, - // location is deprecated and was never actually used - ImportStateVerifyIgnore: []string{"location"}, - }, + data.ImportStep(), }, }) } @@ -289,7 +283,6 @@ resource "azurerm_lb" "test" { } resource "azurerm_lb_probe" "test" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "%s" @@ -306,7 +299,6 @@ func testAccAzureRMLoadBalancerProbe_requiresImport(data acceptance.TestData, na resource "azurerm_lb_probe" "import" { name = "${azurerm_lb_probe.test.name}" loadbalancer_id = "${azurerm_lb_probe.test.loadbalancer_id}" - location = "${azurerm_lb_probe.test.location}" resource_group_name = "${azurerm_lb_probe.test.resource_group_name}" port = 22 } @@ -366,7 +358,6 @@ resource "azurerm_lb" "test" { } resource "azurerm_lb_probe" "test" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "%s" @@ -374,7 +365,6 @@ resource "azurerm_lb_probe" "test" { } resource "azurerm_lb_probe" "test2" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "%s" @@ -409,7 +399,6 @@ resource "azurerm_lb" "test" { } resource "azurerm_lb_probe" "test" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "%s" @@ -417,7 +406,6 @@ resource "azurerm_lb_probe" "test" { } resource "azurerm_lb_probe" "test2" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "%s" @@ -452,7 +440,6 @@ resource "azurerm_lb" "test" { } resource "azurerm_lb_probe" "test" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "%s" @@ -489,7 +476,6 @@ resource "azurerm_lb" "test" { } resource "azurerm_lb_probe" "test" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_rule_test.go b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_rule_test.go index 202f83f150a2f..669d7a3428f91 100644 --- a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_rule_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_rule_test.go @@ -96,7 +96,7 @@ func TestAccAzureRMLoadBalancerRule_basic(t *testing.T) { "azurerm_lb_rule.test", "id", lbRule_id), ), }, - data.ImportStep("location"), // todo remove location in 2.0 + data.ImportStep(), }, }) } @@ -125,7 +125,7 @@ func TestAccAzureRMLoadBalancerRule_complete(t *testing.T) { "azurerm_lb_rule.test", "id", lbRule_id), ), }, - data.ImportStep("location"), // todo remove location in 2.0 + data.ImportStep(), }, }) } @@ -154,7 +154,7 @@ func TestAccAzureRMLoadBalancerRule_update(t *testing.T) { "azurerm_lb_rule.test", "id", lbRule_id), ), }, - data.ImportStep("location"), // todo remove location in 2.0 + data.ImportStep(), { Config: testAccAzureRMLoadBalancerRule_complete(data, lbRuleName), Check: resource.ComposeTestCheckFunc( @@ -164,7 +164,7 @@ func TestAccAzureRMLoadBalancerRule_update(t *testing.T) { "azurerm_lb_rule.test", "id", lbRule_id), ), }, - data.ImportStep("location"), // todo remove location in 2.0 + data.ImportStep(), { Config: testAccAzureRMLoadBalancerRule_basic(data, lbRuleName, "Basic"), Check: resource.ComposeTestCheckFunc( @@ -174,7 +174,7 @@ func TestAccAzureRMLoadBalancerRule_update(t *testing.T) { "azurerm_lb_rule.test", "id", lbRule_id), ), }, - data.ImportStep("location"), // todo remove location in 2.0 + data.ImportStep(), }, }) } @@ -304,7 +304,7 @@ func TestAccAzureRMLoadBalancerRule_updateMultipleRules(t *testing.T) { resource.TestCheckResourceAttr("azurerm_lb_rule.test2", "backend_port", "3390"), ), }, - data.ImportStep("location"), // todo remove location in 2.0 + data.ImportStep(), { Config: testAccAzureRMLoadBalancerRule_multipleRulesUpdate(data, lbRuleName, lbRule2Name), Check: resource.ComposeTestCheckFunc( @@ -317,7 +317,7 @@ func TestAccAzureRMLoadBalancerRule_updateMultipleRules(t *testing.T) { resource.TestCheckResourceAttr("azurerm_lb_rule.test2", "backend_port", "3391"), ), }, - data.ImportStep("location"), // todo remove location in 2.0 + data.ImportStep(), }, }) } @@ -435,7 +435,6 @@ func testAccAzureRMLoadBalancerRule_basic(data acceptance.TestData, lbRuleName, %s resource "azurerm_lb_rule" "test" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "%s" @@ -453,7 +452,6 @@ func testAccAzureRMLoadBalancerRule_complete(data acceptance.TestData, lbRuleNam resource "azurerm_lb_rule" "test" { name = "%s" - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" @@ -478,7 +476,6 @@ func testAccAzureRMLoadBalancerRule_requiresImport(data acceptance.TestData, nam resource "azurerm_lb_rule" "import" { name = "${azurerm_lb_rule.test.name}" - location = "${azurerm_lb_rule.test.location}" resource_group_name = "${azurerm_lb_rule.test.resource_group_name}" loadbalancer_id = "${azurerm_lb_rule.test.loadbalancer_id}" frontend_ip_configuration_name = "${azurerm_lb_rule.test.frontend_ip_configuration_name}" @@ -496,14 +493,12 @@ func testAccAzureRMLoadBalancerRule_inconsistentRead(data acceptance.TestData, b resource "azurerm_lb_backend_address_pool" "teset" { name = "%s" - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" } resource "azurerm_lb_probe" "test" { name = "%s" - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" protocol = "Tcp" @@ -512,7 +507,6 @@ resource "azurerm_lb_probe" "test" { resource "azurerm_lb_rule" "test" { name = "%s" - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" protocol = "Tcp" @@ -528,7 +522,6 @@ func testAccAzureRMLoadBalancerRule_multipleRules(data acceptance.TestData, lbRu %s resource "azurerm_lb_rule" "test" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "%s" @@ -539,7 +532,6 @@ resource "azurerm_lb_rule" "test" { } resource "azurerm_lb_rule" "test2" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "%s" @@ -556,7 +548,6 @@ func testAccAzureRMLoadBalancerRule_multipleRulesUpdate(data acceptance.TestData %s resource "azurerm_lb_rule" "test" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "%s" @@ -567,7 +558,6 @@ resource "azurerm_lb_rule" "test" { } resource "azurerm_lb_rule" "test2" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_public_ip_test.go b/azurerm/internal/services/network/tests/resource_arm_public_ip_test.go index 837ad33717494..8d528be65ab4d 100644 --- a/azurerm/internal/services/network/tests/resource_arm_public_ip_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_public_ip_test.go @@ -66,37 +66,6 @@ func TestAccAzureRMPublicIpStatic_requiresImport(t *testing.T) { }) } -func TestAccAzureRMPublicIpStatic_basicOld(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_public_ip", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMPublicIpDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMPublicIPStatic_basicOld(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMPublicIpExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "ip_address"), - resource.TestCheckResourceAttr(data.ResourceName, "public_ip_address_allocation", "Static"), - resource.TestCheckResourceAttr(data.ResourceName, "ip_version", "IPv4"), - ), - }, - { - Config: testAccAzureRMPublicIPStatic_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMPublicIpExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "ip_address"), - resource.TestCheckResourceAttr(data.ResourceName, "allocation_method", "Static"), - resource.TestCheckResourceAttr(data.ResourceName, "ip_version", "IPv4"), - ), - }, - data.ImportStep(), - }, - }) -} - func TestAccAzureRMPublicIpStatic_zones(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_public_ip", "test") @@ -558,22 +527,6 @@ resource "azurerm_public_ip" "import" { `, testAccAzureRMPublicIPStatic_basic(data)) } -func testAccAzureRMPublicIPStatic_basicOld(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_public_ip" "test" { - name = "acctestpublicip-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - public_ip_address_allocation = "Static" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - func testAccAzureRMPublicIPStatic_withZone(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { diff --git a/azurerm/internal/services/storage/resource_arm_storage_table_migration.go b/azurerm/internal/services/storage/resource_arm_storage_table_migration.go index e6cb71ba0da07..d5ad2d88fcca9 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_table_migration.go +++ b/azurerm/internal/services/storage/resource_arm_storage_table_migration.go @@ -26,7 +26,7 @@ func ResourceStorageTableStateResourceV0V1() *schema.Resource { ForceNew: true, ValidateFunc: ValidateArmStorageAccountName, }, - "resource_group_name": azure.SchemaResourceGroupNameDeprecated(), + "resource_group_name": azure.SchemaResourceGroupName(), "acl": { Type: schema.TypeSet, Optional: true, diff --git a/azurerm/internal/tags/schema.go b/azurerm/internal/tags/schema.go index b80a551f117ab..b38a25c1407e2 100644 --- a/azurerm/internal/tags/schema.go +++ b/azurerm/internal/tags/schema.go @@ -21,8 +21,6 @@ func ForceNewSchema() *schema.Schema { return &schema.Schema{ Type: schema.TypeMap, Optional: true, - // TODO: remove "Computed" in 2.0 - Computed: true, ForceNew: true, ValidateFunc: Validate, Elem: &schema.Schema{ @@ -36,8 +34,6 @@ func Schema() *schema.Schema { return &schema.Schema{ Type: schema.TypeMap, Optional: true, - // TODO: remove "Computed" in 2.0 - Computed: true, ValidateFunc: Validate, Elem: &schema.Schema{ Type: schema.TypeString, diff --git a/website/docs/d/client_config.html.markdown b/website/docs/d/client_config.html.markdown index 7bbdd012b2653..f63a262ce5c9c 100644 --- a/website/docs/d/client_config.html.markdown +++ b/website/docs/d/client_config.html.markdown @@ -34,14 +34,6 @@ There are no arguments available for this data source. --- -~> **Note:** the following fields are only available when authenticating via a Service Principal (as opposed to using the Azure CLI) and have been deprecated: - -* `service_principal_application_id` is the Service Principal Application ID (same as `client_id`). -* `service_principal_object_id` is the Service Principal Object ID (now available via `object_id`). - -~> **Note:** To better understand "application" and "service principal", please read -[Application and service principal objects in Azure Active Directory](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects). - ## Timeouts The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index 152c9a009c960..6db2b4eadefff 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -225,6 +225,8 @@ The deprecated `ip_address_list` field in the `backend_address_pool` block will The default value for the `body` field within the `match` block will change from `*` to an empty string. +The deprecated `disabled_ssl_protocols` field will be removed in favour of `ssl_policy`.`disabled_protocols` + ### Resource: `azurerm_automation_account` The deprecated `sku` block has been replaced by the `sku_name` field and will be removed. @@ -363,6 +365,10 @@ The `service_principal` will be changing from a Set to a List, which will allow The deprecated `location` field will be removed, since this is no longer used. +### Resource: `azurerm_lb_nat_pool` + +The deprecated `location` field will be removed, since this is no longer used. + ### Resource: `azurerm_lb_nat_probe` The deprecated `location` field will be removed, since this is no longer used. diff --git a/website/docs/r/application_gateway.html.markdown b/website/docs/r/application_gateway.html.markdown index bf82ef35af581..70240d8b3c21c 100644 --- a/website/docs/r/application_gateway.html.markdown +++ b/website/docs/r/application_gateway.html.markdown @@ -151,9 +151,6 @@ The following arguments are supported: * `trusted_root_certificate` - (Optional) One or more `trusted_root_certificate` blocks as defined below. -* `disabled_ssl_protocols` - (Optional / **Deprecated**) A list of SSL Protocols which should be disabled on this Application Gateway. Possible values are `TLSv1_0`, `TLSv1_1` and `TLSv1_2`. -~> **NOTE:** `disabled_ssl_protocols ` has been deprecated in favour of `disabled_protocols` in the `ssl_policy` block. - * `ssl_policy` (Optional) a `ssl policy` block as defined below. * `enable_http2` - (Optional) Is HTTP2 enabled on the application gateway resource? Defaults to `false`. @@ -206,12 +203,8 @@ A `backend_address_pool` block supports the following: * `fqdns` - (Optional) A list of FQDN's which should be part of the Backend Address Pool. -* `fqdn_list` - (Optional **Deprecated**) A list of FQDN's which should be part of the Backend Address Pool. This field has been deprecated in favour of `fqdns` and will be removed in v2.0 of the AzureRM Provider. - * `ip_addresses` - (Optional) A list of IP Addresses which should be part of the Backend Address Pool. -* `ip_address_list` - (Optional **Deprecated**) A list of IP Addresses which should be part of the Backend Address Pool. This field has been deprecated in favour of `ip_addresses` and will be removed in v2.0 of the AzureRM Provider. - --- A `backend_http_settings` block supports the following: diff --git a/website/docs/r/container_group.html.markdown b/website/docs/r/container_group.html.markdown index cf5fc059d2c03..1e6dbcf327338 100644 --- a/website/docs/r/container_group.html.markdown +++ b/website/docs/r/container_group.html.markdown @@ -129,10 +129,6 @@ A `container` block supports: * `liveness_probe` - (Optional) The definition of a readiness probe for this container as documented in the `liveness_probe` block below. Changing this forces a new resource to be created. -* `command` - (Optional) A command line to be run on the container. Changing this forces a new resource to be created. - -~> **NOTE:** The field `command` has been deprecated in favor of `commands` to better match the API. - * `commands` - (Optional) A list of commands which should be run on the container. Changing this forces a new resource to be created. * `volume` - (Optional) The definition of a volume mount for this container as documented in the `volume` block below. Changing this forces a new resource to be created. diff --git a/website/docs/r/kubernetes_cluster.html.markdown b/website/docs/r/kubernetes_cluster.html.markdown index cafa7ce36a4f3..c8b599827b0f8 100644 --- a/website/docs/r/kubernetes_cluster.html.markdown +++ b/website/docs/r/kubernetes_cluster.html.markdown @@ -73,10 +73,6 @@ The following arguments are supported: * `service_principal` - (Required) A `service_principal` block as documented below. -* `agent_pool_profile` - (Optional) One or more `agent_pool_profile` blocks as defined below. - -~> **NOTE:** The `agent_pool_profile` block has been superseded by the `default_node_pool` block and will be removed in 2.0. For additional node pools beyond default, see [azurerm_kubernetes_cluster_node_pool](https://www.terraform.io/docs/providers/azurerm/r/kubernetes_cluster_node_pool.html). - * `addon_profile` - (Optional) A `addon_profile` block as defined below. * `api_server_authorized_ip_ranges` - (Optional) The IP ranges to whitelist for incoming traffic to the masters. @@ -158,48 +154,6 @@ A `addon_profile` block supports the following: --- -A `agent_pool_profile` block supports the following: - -~> **NOTE:** The `agent_pool_profile` block has been superseded by the `default_node_pool` block and will be removed in 2.0. For additional node pools beyond default, see [azurerm_kubernetes_cluster_node_pool](https://www.terraform.io/docs/providers/azurerm/r/kubernetes_cluster_node_pool.html). - -* `name` - (Required) Unique name of the Agent Pool Profile in the context of the Subscription and Resource Group. Changing this forces a new resource to be created. - -* `count` - (Optional) Number of Agents (VMs) in the Pool. Possible values must be in the range of 1 to 100 (inclusive). Defaults to `1`. - --> **NOTE:** If you're using AutoScaling, you may wish to use [Terraform's `ignore_changes` functionality](https://www.terraform.io/docs/configuration/resources.html#ignore_changes) to ignore changes to this field. - -* `vm_size` - (Required) The size of each VM in the Agent Pool (e.g. `Standard_F1`). Changing this forces a new resource to be created. - -* `availability_zones` - (Optional) Availability zones for nodes. The property `type` of the `agent_pool_profile` must be set to `VirtualMachineScaleSets` in order to use availability zones. - --> **NOTE:** To configure Availability Zones the `load_balancer_sku` must be set to `Standard` - -* `enable_auto_scaling` - (Optional) Whether to enable [auto-scaler](https://docs.microsoft.com/en-us/azure/aks/cluster-autoscaler). Note that auto scaling feature requires the that the `type` is set to `VirtualMachineScaleSets` - -* `enable_node_public_ip` - (Optional) Should each node have a Public IP Address? Changing this forces a new resource to be created. - -* `min_count` - (Optional) Minimum number of nodes for auto-scaling. - -* `max_count` - (Optional) Maximum number of nodes for auto-scaling. - -* `max_pods` - (Optional) The maximum number of pods that can run on each agent. Changing this forces a new resource to be created. - -* `node_taints` - (Optional) A list of Kubernetes taints which should be applied to nodes in the agent pool (e.g `key=value:NoSchedule`) - -* `os_disk_size_gb` - (Optional) The Agent Operating System disk size in GB. Changing this forces a new resource to be created. - -* `os_type` - (Optional) The Operating System used for the Agents. Possible values are `Linux` and `Windows`. Changing this forces a new resource to be created. Defaults to `Linux`. - -* `type` - (Optional) Type of the Agent Pool. Possible values are `AvailabilitySet` and `VirtualMachineScaleSets`. Changing this forces a new resource to be created. Defaults to `AvailabilitySet`. - -* `vnet_subnet_id` - (Optional) The ID of the Subnet where the Agents in the Pool should be provisioned. Changing this forces a new resource to be created. - --> **NOTE:** At this time the `vnet_subnet_id` must be the same for all node pools in the cluster - -~> **NOTE:** A route table must be configured on this Subnet. - ---- - A `azure_active_directory` block supports the following: * `client_app_id` - (Required) The Client ID of an Azure Active Directory Application. @@ -245,8 +199,6 @@ A `default_node_pool` block supports the following: * `type` - (Optional) The type of Node Pool which should be created. Possible values are `AvailabilitySet` and `VirtualMachineScaleSets`. Defaults to `VirtualMachineScaleSets`. --> **NOTE:** This default value differs from the default value for the `agent_pool_profile` block and matches a change to the default within AKS. - * `vnet_subnet_id` - (Required) The ID of a Subnet where the Kubernetes Node Pool should exist. Changing this forces a new resource to be created. ~> **NOTE:** A Route Table must be configured on this Subnet. @@ -297,8 +249,6 @@ A `network_profile` block supports the following: * `network_plugin` - (Required) Network plugin to use for networking. Currently supported values are `azure` and `kubenet`. Changing this forces a new resource to be created. --> **NOTE:** When `network_plugin` is set to `azure` - the `vnet_subnet_id` field in the `agent_pool_profile` block must be set and `pod_cidr` must not be set. - * `network_policy` - (Optional) Sets up network policy to be used with Azure CNI. [Network policy allows us to control the traffic flow between pods](https://docs.microsoft.com/en-us/azure/aks/use-network-policies). This field can only be set when `network_plugin` is set to `azure`. Currently supported values are `calico` and `azure`. Changing this forces a new resource to be created. * `dns_service_ip` - (Optional) IP address within the Kubernetes service address range that will be used by cluster service discovery (kube-dns). This is required when `network_plugin` is set to `azure`. Changing this forces a new resource to be created. diff --git a/website/docs/r/virtual_machine_extension.html.markdown b/website/docs/r/virtual_machine_extension.html.markdown index bbd33c8df9691..d8dd14f4049b4 100644 --- a/website/docs/r/virtual_machine_extension.html.markdown +++ b/website/docs/r/virtual_machine_extension.html.markdown @@ -139,9 +139,6 @@ The following arguments are supported: create the virtual network. Changing this forces a new resource to be created. -* `virtual_machine_name` - (Optional / **Deprecated**) The name of the virtual machine. Changing - this forces a new resource to be created. - * `virtual_machine_id` - (Optional) The resource ID of the virtual machine. This value replaces `location`, `resource_group_name` and `virtual_machine_name`. Changing this forces a new resource to be created From 03bed3e91abbf7a5a3abffe64a5812ce8caa954b Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Wed, 19 Feb 2020 16:56:16 -0800 Subject: [PATCH 249/498] removing deadcode --- azurerm/internal/provider/provider.go | 4 ++-- .../containers/resource_arm_container_group.go | 3 --- .../network/data_source_private_link_service.go | 15 --------------- .../network/resource_arm_application_gateway.go | 13 ------------- .../network/resource_arm_private_link_service.go | 15 --------------- azurerm/internal/tags/schema.go | 8 ++++---- 6 files changed, 6 insertions(+), 52 deletions(-) diff --git a/azurerm/internal/provider/provider.go b/azurerm/internal/provider/provider.go index 6a77a27de8fc1..f55a6173d813a 100644 --- a/azurerm/internal/provider/provider.go +++ b/azurerm/internal/provider/provider.go @@ -136,8 +136,8 @@ func AzureProvider() terraform.ResourceProvider { }, "disable_correlation_request_id": { - Type: schema.TypeBool, - Optional: true, + Type: schema.TypeBool, + Optional: true, DefaultFunc: schema.EnvDefaultFunc("ARM_DISABLE_CORRELATION_REQUEST_ID", false), Description: "This will disable the x-ms-correlation-request-id header.", }, diff --git a/azurerm/internal/services/containers/resource_arm_container_group.go b/azurerm/internal/services/containers/resource_arm_container_group.go index 1a66593bb6818..423a9cabc7d5a 100644 --- a/azurerm/internal/services/containers/resource_arm_container_group.go +++ b/azurerm/internal/services/containers/resource_arm_container_group.go @@ -243,7 +243,6 @@ func resourceArmContainerGroup() *schema.Resource { Type: schema.TypeSet, Optional: true, ForceNew: true, - Computed: true, // TODO does this still need to be computed? Set: resourceArmContainerGroupPortsHash, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -251,7 +250,6 @@ func resourceArmContainerGroup() *schema.Resource { Type: schema.TypeInt, Optional: true, ForceNew: true, - Computed: true, // TODO does this still need to be computed? ValidateFunc: validate.PortNumber, }, @@ -259,7 +257,6 @@ func resourceArmContainerGroup() *schema.Resource { Type: schema.TypeString, Optional: true, ForceNew: true, - Computed: true, // TODO does this still need to be computed? Default: string(containerinstance.TCP), ValidateFunc: validation.StringInSlice([]string{ string(containerinstance.TCP), diff --git a/azurerm/internal/services/network/data_source_private_link_service.go b/azurerm/internal/services/network/data_source_private_link_service.go index a6bc847934f29..cccd3fd6cdf44 100644 --- a/azurerm/internal/services/network/data_source_private_link_service.go +++ b/azurerm/internal/services/network/data_source_private_link_service.go @@ -166,18 +166,3 @@ func dataSourceFlattenArmPrivateLinkServiceFrontendIPConfiguration(input *[]netw return results } - -func dataSourceFlattenArmPrivateLinkServiceInterface(input *[]network.Interface) []string { - results := make([]string, 0) - if input == nil { - return results - } - - for _, item := range *input { - if id := item.ID; id != nil { - results = append(results, *id) - } - } - - return results -} diff --git a/azurerm/internal/services/network/resource_arm_application_gateway.go b/azurerm/internal/services/network/resource_arm_application_gateway.go index 9d07a483dcade..8ae7763cfe934 100644 --- a/azurerm/internal/services/network/resource_arm_application_gateway.go +++ b/azurerm/internal/services/network/resource_arm_application_gateway.go @@ -2194,19 +2194,6 @@ func flattenApplicationGatewaySslPolicy(input *network.ApplicationGatewaySslPoli return results } -func flattenApplicationGatewayDisabledSSLProtocols(input *network.ApplicationGatewaySslPolicy) []interface{} { - results := make([]interface{}, 0) - if input == nil || input.DisabledSslProtocols == nil { - return results - } - - for _, v := range *input.DisabledSslProtocols { - results = append(results, string(v)) - } - - return results -} - func expandApplicationGatewayHTTPListeners(d *schema.ResourceData, gatewayID string) *[]network.ApplicationGatewayHTTPListener { vs := d.Get("http_listener").([]interface{}) results := make([]network.ApplicationGatewayHTTPListener, 0) diff --git a/azurerm/internal/services/network/resource_arm_private_link_service.go b/azurerm/internal/services/network/resource_arm_private_link_service.go index 075d08d41c575..23efec6c50d6f 100644 --- a/azurerm/internal/services/network/resource_arm_private_link_service.go +++ b/azurerm/internal/services/network/resource_arm_private_link_service.go @@ -438,21 +438,6 @@ func flattenArmPrivateLinkServiceFrontendIPConfiguration(input *[]network.Fronte return results } -func flattenArmPrivateLinkServiceInterface(input *[]network.Interface) *schema.Set { - results := &schema.Set{F: schema.HashString} - if input == nil { - return results - } - - for _, item := range *input { - if id := item.ID; id != nil { - results.Add(*id) - } - } - - return results -} - func privateLinkServiceWaitForReadyRefreshFunc(ctx context.Context, client *network.PrivateLinkServicesClient, resourceGroupName string, name string) resource.StateRefreshFunc { return func() (interface{}, string, error) { res, err := client.Get(ctx, resourceGroupName, name, "") diff --git a/azurerm/internal/tags/schema.go b/azurerm/internal/tags/schema.go index b38a25c1407e2..71b4e065dfe6c 100644 --- a/azurerm/internal/tags/schema.go +++ b/azurerm/internal/tags/schema.go @@ -19,8 +19,8 @@ func SchemaDataSource() *schema.Schema { // require recreation of the resource func ForceNewSchema() *schema.Schema { return &schema.Schema{ - Type: schema.TypeMap, - Optional: true, + Type: schema.TypeMap, + Optional: true, ForceNew: true, ValidateFunc: Validate, Elem: &schema.Schema{ @@ -32,8 +32,8 @@ func ForceNewSchema() *schema.Schema { // Schema returns the Schema used for Tags func Schema() *schema.Schema { return &schema.Schema{ - Type: schema.TypeMap, - Optional: true, + Type: schema.TypeMap, + Optional: true, ValidateFunc: Validate, Elem: &schema.Schema{ Type: schema.TypeString, From f0f23374a10e65bb5278be9b3b96489bf5beccee Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 20 Feb 2020 07:37:12 +0100 Subject: [PATCH 250/498] linting --- azurerm/internal/tools/website-categories/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/tools/website-categories/main.go b/azurerm/internal/tools/website-categories/main.go index bbd1cea9f8579..da56440aaccb0 100644 --- a/azurerm/internal/tools/website-categories/main.go +++ b/azurerm/internal/tools/website-categories/main.go @@ -64,7 +64,7 @@ func run(outputFileName string) error { // dump them to a file for _, category := range websiteCategories { - file.WriteString(fmt.Sprintf("%s\n", category)) + _, _ = file.WriteString(fmt.Sprintf("%s\n", category)) } return file.Sync() From c60f91afff817ec2c1e7f7ee3427b8c27a4ae7ca Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 20 Feb 2020 07:38:10 +0100 Subject: [PATCH 251/498] updating the readme --- azurerm/internal/tools/website-categories/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/tools/website-categories/README.md b/azurerm/internal/tools/website-categories/README.md index feeca63cee673..1f6eb4fcf46ba 100644 --- a/azurerm/internal/tools/website-categories/README.md +++ b/azurerm/internal/tools/website-categories/README.md @@ -1,6 +1,6 @@ ## Website Categories -This tool generates files necessary for the website from the provide registrations which already exist in code. +This tool generates files necessary for the website from the service registrations which already exist in code. This is run via go:generate whenever the "SupportedServices" array is changed so that this is kept up-to-date. From 013b066d1f5b6ed7d3608f6f422e5ca5467fe4e6 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 20 Feb 2020 07:44:03 +0100 Subject: [PATCH 252/498] tooling: removing a panic --- azurerm/internal/tools/website-categories/main.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azurerm/internal/tools/website-categories/main.go b/azurerm/internal/tools/website-categories/main.go index da56440aaccb0..31c1439cfb399 100644 --- a/azurerm/internal/tools/website-categories/main.go +++ b/azurerm/internal/tools/website-categories/main.go @@ -45,19 +45,19 @@ func run(outputFileName string) error { outputPath, err := filepath.Abs(outputFileName) if err != nil { - panic(err) + return err } // output that string to the file file, err := os.Create(outputPath) if err != nil { - panic(err) + return err } if os.IsExist(err) { os.Remove(outputPath) file, err = os.Create(outputPath) if err != nil { - panic(err) + return err } } defer file.Close() From 7a50ed141e969a3eee89f393693cc4063259a384 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 20 Feb 2020 07:50:15 +0100 Subject: [PATCH 253/498] r/firewall: upping the timeouts to 90m --- azurerm/internal/services/network/resource_arm_firewall.go | 6 +++--- website/docs/r/firewall.html.markdown | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/azurerm/internal/services/network/resource_arm_firewall.go b/azurerm/internal/services/network/resource_arm_firewall.go index c825d2e914d8d..e4b7ca661fdc7 100644 --- a/azurerm/internal/services/network/resource_arm_firewall.go +++ b/azurerm/internal/services/network/resource_arm_firewall.go @@ -32,10 +32,10 @@ func resourceArmFirewall() *schema.Resource { }, Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(40 * time.Minute), + Create: schema.DefaultTimeout(90 * time.Minute), Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(40 * time.Minute), - Delete: schema.DefaultTimeout(40 * time.Minute), + Update: schema.DefaultTimeout(90 * time.Minute), + Delete: schema.DefaultTimeout(90 * time.Minute), }, Schema: map[string]*schema.Schema{ diff --git a/website/docs/r/firewall.html.markdown b/website/docs/r/firewall.html.markdown index 738577908c1c1..94d51e34e29d0 100644 --- a/website/docs/r/firewall.html.markdown +++ b/website/docs/r/firewall.html.markdown @@ -108,10 +108,10 @@ A `ip_configuration` block exports the following: The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: -* `create` - (Defaults to 40 minutes) Used when creating the Firewall. -* `update` - (Defaults to 40 minutes) Used when updating the Firewall. +* `create` - (Defaults to 90 minutes) Used when creating the Firewall. +* `update` - (Defaults to 90 minutes) Used when updating the Firewall. * `read` - (Defaults to 5 minutes) Used when retrieving the Firewall. -* `delete` - (Defaults to 40 minutes) Used when deleting the Firewall. +* `delete` - (Defaults to 90 minutes) Used when deleting the Firewall. ## Import From a9a9cdca2a786829246c0cd14df97f4217cf5862 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 20 Feb 2020 07:50:30 +0100 Subject: [PATCH 254/498] r/network_interface_application_security_group_association: fixing the tests --- ...ace_application_security_group_association_resource_test.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/azurerm/internal/services/network/tests/network_interface_application_security_group_association_resource_test.go b/azurerm/internal/services/network/tests/network_interface_application_security_group_association_resource_test.go index b49d17802ca63..c460ed18b5a44 100644 --- a/azurerm/internal/services/network/tests/network_interface_application_security_group_association_resource_test.go +++ b/azurerm/internal/services/network/tests/network_interface_application_security_group_association_resource_test.go @@ -249,7 +249,6 @@ resource "azurerm_network_interface" "test" { resource "azurerm_network_interface_application_security_group_association" "test" { network_interface_id = azurerm_network_interface.test.id - ip_configuration_name = "testconfiguration1" application_security_group_id = azurerm_application_security_group.test.id } `, template, data.RandomInteger) @@ -292,7 +291,6 @@ resource "azurerm_network_interface" "test" { resource "azurerm_network_interface_application_security_group_association" "test" { network_interface_id = azurerm_network_interface.test.id - ip_configuration_name = "testconfiguration1" application_security_group_id = azurerm_application_security_group.test.id } `, template, data.RandomInteger) @@ -324,7 +322,6 @@ resource "azurerm_network_interface" "test" { resource "azurerm_network_interface_application_security_group_association" "test" { network_interface_id = azurerm_network_interface.test.id - ip_configuration_name = "testconfiguration1" application_security_group_id = azurerm_application_security_group.test.id } `, template, data.RandomInteger) From 29b05a9e3f4c4860cd0d7257487131219f3b45d6 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 20 Feb 2020 08:03:12 +0100 Subject: [PATCH 255/498] r/recovery_services_vault: using the requested cloud rather than the default Fixes #5818 --- azurerm/internal/services/recoveryservices/client/client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/recoveryservices/client/client.go b/azurerm/internal/services/recoveryservices/client/client.go index 39f6742ce031b..f4a8e0fb8c29f 100644 --- a/azurerm/internal/services/recoveryservices/client/client.go +++ b/azurerm/internal/services/recoveryservices/client/client.go @@ -23,7 +23,7 @@ type Client struct { } func NewClient(o *common.ClientOptions) *Client { - vaultConfigsClient := backup.NewResourceVaultConfigsClient(o.SubscriptionId) + vaultConfigsClient := backup.NewResourceVaultConfigsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&vaultConfigsClient.Client, o.ResourceManagerAuthorizer) vaultsClient := recoveryservices.NewVaultsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) From df63038827f5fd35de9c48bb4f007e8e9b84b50d Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 20 Feb 2020 08:43:47 +0100 Subject: [PATCH 256/498] r/network_interface_application_security_group_association: missed the assertion --- ...ecurity_group_association_resource_test.go | 43 ++++++++----------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/azurerm/internal/services/network/tests/network_interface_application_security_group_association_resource_test.go b/azurerm/internal/services/network/tests/network_interface_application_security_group_association_resource_test.go index c460ed18b5a44..c3ac747686e9a 100644 --- a/azurerm/internal/services/network/tests/network_interface_application_security_group_association_resource_test.go +++ b/azurerm/internal/services/network/tests/network_interface_application_security_group_association_resource_test.go @@ -144,25 +144,20 @@ func testCheckAzureRMNetworkInterfaceApplicationSecurityGroupAssociationExists(r nicName := nicID.Path["networkInterfaces"] resourceGroup := nicID.ResourceGroup applicationSecurityGroupId := rs.Primary.Attributes["application_security_group_id"] - ipConfigurationName := rs.Primary.Attributes["ip_configuration_name"] read, err := client.Get(ctx, resourceGroup, nicName, "") if err != nil { return fmt.Errorf("Error retrieving Network Interface %q (Resource Group %q): %+v", nicName, resourceGroup, err) } - c := azure.FindNetworkInterfaceIPConfiguration(read.InterfacePropertiesFormat.IPConfigurations, ipConfigurationName) - if c == nil { - return fmt.Errorf("IP Configuration %q wasn't found for Network Interface %q (Resource Group %q)", ipConfigurationName, nicName, resourceGroup) - } - config := *c - found := false - if config.InterfaceIPConfigurationPropertiesFormat.ApplicationSecurityGroups != nil { - for _, group := range *config.InterfaceIPConfigurationPropertiesFormat.ApplicationSecurityGroups { - if *group.ID == applicationSecurityGroupId { - found = true - break + for _, config := range *read.InterfacePropertiesFormat.IPConfigurations { + if config.ApplicationSecurityGroups != nil { + for _, group := range *config.ApplicationSecurityGroups { + if *group.ID == applicationSecurityGroupId { + found = true + break + } } } } @@ -194,28 +189,26 @@ func testCheckAzureRMNetworkInterfaceApplicationSecurityGroupAssociationDisappea nicName := nicID.Path["networkInterfaces"] resourceGroup := nicID.ResourceGroup applicationSecurityGroupId := rs.Primary.Attributes["application_security_group_id"] - ipConfigurationName := rs.Primary.Attributes["ip_configuration_name"] read, err := client.Get(ctx, resourceGroup, nicName, "") if err != nil { return fmt.Errorf("Error retrieving Network Interface %q (Resource Group %q): %+v", nicName, resourceGroup, err) } - c := azure.FindNetworkInterfaceIPConfiguration(read.InterfacePropertiesFormat.IPConfigurations, ipConfigurationName) - if c == nil { - return fmt.Errorf("IP Configuration %q wasn't found for Network Interface %q (Resource Group %q)", ipConfigurationName, nicName, resourceGroup) - } - config := *c - - updatedGroups := make([]network.ApplicationSecurityGroup, 0) - if config.InterfaceIPConfigurationPropertiesFormat.ApplicationSecurityGroups != nil { - for _, group := range *config.InterfaceIPConfigurationPropertiesFormat.ApplicationSecurityGroups { - if *group.ID != applicationSecurityGroupId { - updatedGroups = append(updatedGroups, group) + configs := *read.InterfacePropertiesFormat.IPConfigurations + for _, config := range configs { + if config.ApplicationSecurityGroups != nil { + groups := make([]network.ApplicationSecurityGroup, 0) + for _, group := range *config.ApplicationSecurityGroups { + if *group.ID != applicationSecurityGroupId { + groups = append(groups, group) + } } + config.ApplicationSecurityGroups = &groups } } - config.InterfaceIPConfigurationPropertiesFormat.ApplicationSecurityGroups = &updatedGroups + + read.InterfacePropertiesFormat.IPConfigurations = &configs future, err := client.CreateOrUpdate(ctx, resourceGroup, nicName, read) if err != nil { From 84f698cdfab06722e3414b8fa869cd14814e3630 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Thu, 20 Feb 2020 08:52:37 +0000 Subject: [PATCH 257/498] PR suggestion fix --- .../resource_arm_application_insights.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/azurerm/internal/services/applicationinsights/resource_arm_application_insights.go b/azurerm/internal/services/applicationinsights/resource_arm_application_insights.go index 40b4d5a6d96c0..e348c038a7984 100644 --- a/azurerm/internal/services/applicationinsights/resource_arm_application_insights.go +++ b/azurerm/internal/services/applicationinsights/resource_arm_application_insights.go @@ -162,11 +162,9 @@ func resourceArmApplicationInsightsCreateUpdate(d *schema.ResourceData, meta int Tags: tags.Expand(t), } - resp, err := client.CreateOrUpdate(ctx, resGroup, name, insightProperties) + _, err := client.CreateOrUpdate(ctx, resGroup, name, insightProperties) if err != nil { - if resp.StatusCode != http.StatusOK { - return fmt.Errorf("Error creating Application Insights %q (Resource Group %q): %+v", name, resGroup, err) - } + return fmt.Errorf("Error creating Application Insights %q (Resource Group %q): %+v", name, resGroup, err) } read, err := client.Get(ctx, resGroup, name) From bedcbfefda7954fb7baf535acab1dc32a9feab58 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 20 Feb 2020 09:52:47 +0100 Subject: [PATCH 258/498] r/network_interface_application_security_group_association: fixing the tests --- ...rface_application_security_group_association_resource_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/azurerm/internal/services/network/tests/network_interface_application_security_group_association_resource_test.go b/azurerm/internal/services/network/tests/network_interface_application_security_group_association_resource_test.go index c3ac747686e9a..e92fc4e98f0ba 100644 --- a/azurerm/internal/services/network/tests/network_interface_application_security_group_association_resource_test.go +++ b/azurerm/internal/services/network/tests/network_interface_application_security_group_association_resource_test.go @@ -273,6 +273,7 @@ resource "azurerm_network_interface" "test" { name = "testconfiguration1" subnet_id = azurerm_subnet.test.id private_ip_address_allocation = "Dynamic" + primary = true } ip_configuration { From 5c8951812d65320afe6d463d6de4dc455c8ec33a Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Thu, 20 Feb 2020 10:57:20 +0100 Subject: [PATCH 259/498] updating to include #5815 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 732ff572121e4..8aca40448b880 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -83,6 +83,7 @@ BREAKING CHANGES: * `azurerm_network_interface` - removing the deprecated `load_balancer_inbound_nat_rules_ids ` field from the `ip_configurations` block [GH-5784] * `azurerm_network_interface` - removing the deprecated `internal_fqdn` field [GH-5784] * `azurerm_network_interface` - removing the `network_security_group_id` field in favour of a new split-out resource `azurerm_network_interface_security_group_association` [GH-5784] +* `azurerm_network_interface_application_security_group_association` - removing the `ip_configuration_name` field associations between Network Interfaces and Application Security Groups now need to be made to all IP Configurations [GH-5815] * `azurerm_network_interface` - the `virtual_machine_id` field is now computed-only since it's not setable [GH-5784] * `azurerm_notification_hub_namesapce` - removing the `sku` block in favour of the `sku_name` argument [GH-5722] * `azurerm_postgresql_server` - removing the `sku` block which has been deprecated in favour of the `sku_name` field [GH-5721] From a581836788b60fd4d900c6a9076f833077f330e9 Mon Sep 17 00:00:00 2001 From: Steve <11830746+jackofallops@users.noreply.github.com> Date: Thu, 20 Feb 2020 10:49:00 +0000 Subject: [PATCH 260/498] Updated for 5817 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8aca40448b880..2a758a626c9e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -118,6 +118,7 @@ IMPROVEMENTS: BUG FIXES: +* `azurerm_application_insights` - the `application_type` field is now case sensitive as documented [GH-5817] * `azurerm_linux_virtual_machine` - using the delete custom timeout during deletion [GH-5764] * `azurerm_network_interface` - the `dns_servers` field now respects ordering [GH-5784] * `azurerm_public_ip_prefix` - fixing the validation for the `prefix_length` to match the Azure API [GH-5693] From d9156c287a535e2bb348969d16e23990d4a23e99 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Thu, 20 Feb 2020 11:09:11 +0000 Subject: [PATCH 261/498] Updated app_service SDK version --- azurerm/helpers/azure/app_service.go | 73 +- .../azure/app_service_schedule_backup.go | 2 +- azurerm/helpers/azure/web.go | 2 +- .../internal/services/web/client/client.go | 2 +- ...ta_source_app_service_certificate_order.go | 2 +- .../services/web/resource_arm_app_service.go | 2 +- .../resource_arm_app_service_active_slot.go | 2 +- .../resource_arm_app_service_certificate.go | 2 +- ...ource_arm_app_service_certificate_order.go | 2 +- ...arm_app_service_custom_hostname_binding.go | 2 +- .../web/resource_arm_app_service_plan.go | 2 +- .../web/resource_arm_app_service_slot.go | 2 +- ...ce_arm_app_service_source_control_token.go | 2 +- ...ervice_virtual_network_swift_connection.go | 2 +- .../services/web/resource_arm_function_app.go | 2 +- .../web/tests/data_source_app_service_test.go | 3 +- .../resource_arm_app_service_slot_test.go | 28 +- .../tests/resource_arm_app_service_test.go | 28 +- .../{2018-02-01 => 2019-08-01}/web/apps.go | 4843 ++++++----------- .../web/appservicecertificateorders.go | 80 +- .../web/appserviceenvironments.go | 1479 ++--- .../web/appserviceplans.go | 367 +- .../web/certificateregistrationprovider.go | 5 +- .../web/certificates.go | 24 +- .../{2018-02-01 => 2019-08-01}/web/client.go | 153 +- .../web/deletedwebapps.go | 12 +- .../web/diagnostics.go | 196 +- .../web/domainregistrationprovider.go | 5 +- .../{2018-02-01 => 2019-08-01}/web/domains.go | 70 +- .../{2018-02-01 => 2019-08-01}/web/models.go | 1344 +++-- .../web/provider.go | 14 +- .../web/recommendations.go | 63 +- .../web/resourcehealthmetadata.go | 25 +- .../web/topleveldomains.go | 12 +- .../{2018-02-01 => 2019-08-01}/web/version.go | 2 +- vendor/modules.txt | 2 +- 36 files changed, 3068 insertions(+), 5788 deletions(-) rename vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/{2018-02-01 => 2019-08-01}/web/apps.go (91%) rename vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/{2018-02-01 => 2019-08-01}/web/appservicecertificateorders.go (97%) rename vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/{2018-02-01 => 2019-08-01}/web/appserviceenvironments.go (80%) rename vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/{2018-02-01 => 2019-08-01}/web/appserviceplans.go (88%) rename vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/{2018-02-01 => 2019-08-01}/web/certificateregistrationprovider.go (97%) rename vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/{2018-02-01 => 2019-08-01}/web/certificates.go (97%) rename vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/{2018-02-01 => 2019-08-01}/web/client.go (91%) rename vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/{2018-02-01 => 2019-08-01}/web/deletedwebapps.go (97%) rename vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/{2018-02-01 => 2019-08-01}/web/diagnostics.go (94%) rename vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/{2018-02-01 => 2019-08-01}/web/domainregistrationprovider.go (97%) rename vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/{2018-02-01 => 2019-08-01}/web/domains.go (97%) rename vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/{2018-02-01 => 2019-08-01}/web/models.go (97%) rename vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/{2018-02-01 => 2019-08-01}/web/provider.go (97%) rename vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/{2018-02-01 => 2019-08-01}/web/recommendations.go (97%) rename vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/{2018-02-01 => 2019-08-01}/web/resourcehealthmetadata.go (97%) rename vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/{2018-02-01 => 2019-08-01}/web/topleveldomains.go (97%) rename vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/{2018-02-01 => 2019-08-01}/web/version.go (94%) diff --git a/azurerm/helpers/azure/app_service.go b/azurerm/helpers/azure/app_service.go index f53c0fc555498..925220fdc5b60 100644 --- a/azurerm/helpers/azure/app_service.go +++ b/azurerm/helpers/azure/app_service.go @@ -2,12 +2,12 @@ package azure import ( "fmt" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "log" - "net" "regexp" "strings" - "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web" + "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" @@ -225,7 +225,6 @@ func SchemaAppServiceIdentity() *schema.Schema { ValidateFunc: validation.StringInSlice([]string{ string(web.ManagedServiceIdentityTypeNone), string(web.ManagedServiceIdentityTypeSystemAssigned), - string(web.ManagedServiceIdentityTypeSystemAssignedUserAssigned), string(web.ManagedServiceIdentityTypeUserAssigned), }, true), DiffSuppressFunc: suppress.CaseDifference, @@ -304,23 +303,13 @@ func SchemaAppServiceSiteConfig() *schema.Schema { "ip_address": { Type: schema.TypeString, Optional: true, + ValidateFunc: validate.CIDR, }, "virtual_network_subnet_id": { Type: schema.TypeString, Optional: true, ValidateFunc: validation.StringIsNotEmpty, }, - "subnet_mask": { - Type: schema.TypeString, - Optional: true, - Computed: true, - // TODO we should fix this in 2.0 - // This attribute was made with the assumption that `ip_address` was the only valid option - // but `virtual_network_subnet_id` is being added and doesn't need a `subnet_mask`. - // We'll assume a default of "255.255.255.255" in the expand code when `ip_address` is specified - // and `subnet_mask` is not. - // Default: "255.255.255.255", - }, }, }, }, @@ -477,11 +466,6 @@ func SchemaAppServiceSiteConfig() *schema.Schema { }, false), }, - "virtual_network_name": { - Type: schema.TypeString, - Optional: true, - }, - "cors": SchemaWebCorsSettings(), "auto_swap_slot_name": { @@ -689,10 +673,6 @@ func SchemaAppServiceDataSourceSiteConfig() *schema.Schema { Type: schema.TypeString, Computed: true, }, - "subnet_mask": { - Type: schema.TypeString, - Computed: true, - }, }, }, }, @@ -777,11 +757,6 @@ func SchemaAppServiceDataSourceSiteConfig() *schema.Schema { Computed: true, }, - "virtual_network_name": { - Type: schema.TypeString, - Computed: true, - }, - "cors": { Type: schema.TypeList, Computed: true, @@ -1334,7 +1309,7 @@ func ExpandAppServiceIdentity(input []interface{}) *web.ManagedServiceIdentity { Type: identityType, } - if managedServiceIdentity.Type == web.ManagedServiceIdentityTypeUserAssigned || managedServiceIdentity.Type == web.ManagedServiceIdentityTypeSystemAssignedUserAssigned { + if managedServiceIdentity.Type == web.ManagedServiceIdentityTypeUserAssigned { managedServiceIdentity.UserAssignedIdentities = identityIds } @@ -1439,31 +1414,16 @@ func ExpandAppServiceSiteConfig(input interface{}) (*web.SiteConfig, error) { ipAddress := restriction["ip_address"].(string) vNetSubnetID := restriction["virtual_network_subnet_id"].(string) if vNetSubnetID != "" && ipAddress != "" { - return siteConfig, fmt.Errorf(fmt.Sprintf("only one of `ip_address` or `virtual_network_subnet_id` can set set for `site_config.0.ip_restriction.%d`", i)) + return siteConfig, fmt.Errorf(fmt.Sprintf("only one of `ip_address` or `virtual_network_subnet_id` can be set for `site_config.0.ip_restriction.%d`", i)) } if vNetSubnetID == "" && ipAddress == "" { - return siteConfig, fmt.Errorf(fmt.Sprintf("one of `ip_address` or `virtual_network_subnet_id` must be set set for `site_config.0.ip_restriction.%d`", i)) + return siteConfig, fmt.Errorf(fmt.Sprintf("one of `ip_address` or `virtual_network_subnet_id` must be set for `site_config.0.ip_restriction.%d`", i)) } ipSecurityRestriction := web.IPSecurityRestriction{} if ipAddress != "" { - mask := restriction["subnet_mask"].(string) - if mask == "" { - mask = "255.255.255.255" - } - // the 2018-02-01 API expects a blank subnet mask and an IP address in CIDR format: a.b.c.d/x - // so translate the IP and mask if necessary - restrictionMask := "" - cidrAddress := ipAddress - if mask != "" { - ipNet := net.IPNet{IP: net.ParseIP(ipAddress), Mask: net.IPMask(net.ParseIP(mask))} - cidrAddress = ipNet.String() - } else if !strings.Contains(ipAddress, "/") { - cidrAddress += "/32" - } - ipSecurityRestriction.IPAddress = &cidrAddress - ipSecurityRestriction.SubnetMask = &restrictionMask + ipSecurityRestriction.IPAddress = &ipAddress } if vNetSubnetID != "" { @@ -1519,10 +1479,6 @@ func ExpandAppServiceSiteConfig(input interface{}) (*web.SiteConfig, error) { siteConfig.MinTLSVersion = web.SupportedTLSVersions(v.(string)) } - if v, ok := config["virtual_network_name"]; ok { - siteConfig.VnetName = utils.String(v.(string)) - } - if v, ok := config["cors"]; ok { corsSettings := v.(interface{}) expand := ExpandWebCorsSettings(corsSettings) @@ -1588,18 +1544,7 @@ func FlattenAppServiceSiteConfig(input *web.SiteConfig) []interface{} { for _, v := range *vs { block := make(map[string]interface{}) if ip := v.IPAddress; ip != nil { - // the 2018-02-01 API uses CIDR format (a.b.c.d/x), so translate that back to IP and mask - if strings.Contains(*ip, "/") { - ipAddr, ipNet, _ := net.ParseCIDR(*ip) - block["ip_address"] = ipAddr.String() - mask := net.IP(ipNet.Mask) - block["subnet_mask"] = mask.String() - } else { block["ip_address"] = *ip - } - } - if subnet := v.SubnetMask; subnet != nil { - block["subnet_mask"] = *subnet } if vNetSubnetID := v.VnetSubnetResourceID; vNetSubnetID != nil { block["virtual_network_subnet_id"] = *vNetSubnetID @@ -1643,10 +1588,6 @@ func FlattenAppServiceSiteConfig(input *web.SiteConfig) []interface{} { result["windows_fx_version"] = *input.WindowsFxVersion } - if input.VnetName != nil { - result["virtual_network_name"] = *input.VnetName - } - result["scm_type"] = string(input.ScmType) result["ftps_state"] = string(input.FtpsState) result["min_tls_version"] = string(input.MinTLSVersion) diff --git a/azurerm/helpers/azure/app_service_schedule_backup.go b/azurerm/helpers/azure/app_service_schedule_backup.go index 0a91e3789518f..43ae08d1f309f 100644 --- a/azurerm/helpers/azure/app_service_schedule_backup.go +++ b/azurerm/helpers/azure/app_service_schedule_backup.go @@ -9,7 +9,7 @@ import ( "github.com/Azure/go-autorest/autorest/date" - "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web" + "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" ) diff --git a/azurerm/helpers/azure/web.go b/azurerm/helpers/azure/web.go index 6be741438c01f..1b7b313c8d689 100644 --- a/azurerm/helpers/azure/web.go +++ b/azurerm/helpers/azure/web.go @@ -1,7 +1,7 @@ package azure import ( - "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web" + "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) diff --git a/azurerm/internal/services/web/client/client.go b/azurerm/internal/services/web/client/client.go index e22e812d66f39..696f8b593547b 100644 --- a/azurerm/internal/services/web/client/client.go +++ b/azurerm/internal/services/web/client/client.go @@ -1,7 +1,7 @@ package client import ( - "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web" + "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common" ) diff --git a/azurerm/internal/services/web/data_source_app_service_certificate_order.go b/azurerm/internal/services/web/data_source_app_service_certificate_order.go index 0ac3e79626bdd..e765287e1f77f 100644 --- a/azurerm/internal/services/web/data_source_app_service_certificate_order.go +++ b/azurerm/internal/services/web/data_source_app_service_certificate_order.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web" + "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" diff --git a/azurerm/internal/services/web/resource_arm_app_service.go b/azurerm/internal/services/web/resource_arm_app_service.go index d907ee58c8286..aabd8628fd0c7 100644 --- a/azurerm/internal/services/web/resource_arm_app_service.go +++ b/azurerm/internal/services/web/resource_arm_app_service.go @@ -6,7 +6,7 @@ import ( "regexp" "time" - "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web" + "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" diff --git a/azurerm/internal/services/web/resource_arm_app_service_active_slot.go b/azurerm/internal/services/web/resource_arm_app_service_active_slot.go index 88697029b67ab..75b23f20eac48 100644 --- a/azurerm/internal/services/web/resource_arm_app_service_active_slot.go +++ b/azurerm/internal/services/web/resource_arm_app_service_active_slot.go @@ -5,7 +5,7 @@ import ( "log" "time" - "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web" + "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" diff --git a/azurerm/internal/services/web/resource_arm_app_service_certificate.go b/azurerm/internal/services/web/resource_arm_app_service_certificate.go index 681db3e18d836..a5f53a00502a5 100644 --- a/azurerm/internal/services/web/resource_arm_app_service_certificate.go +++ b/azurerm/internal/services/web/resource_arm_app_service_certificate.go @@ -6,7 +6,7 @@ import ( "log" "time" - "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web" + "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" diff --git a/azurerm/internal/services/web/resource_arm_app_service_certificate_order.go b/azurerm/internal/services/web/resource_arm_app_service_certificate_order.go index 593b3775b80b7..5141427558b2b 100644 --- a/azurerm/internal/services/web/resource_arm_app_service_certificate_order.go +++ b/azurerm/internal/services/web/resource_arm_app_service_certificate_order.go @@ -5,7 +5,7 @@ import ( "log" "time" - "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web" + "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" diff --git a/azurerm/internal/services/web/resource_arm_app_service_custom_hostname_binding.go b/azurerm/internal/services/web/resource_arm_app_service_custom_hostname_binding.go index 2037d8dccdb3a..9c18cba5c3f19 100644 --- a/azurerm/internal/services/web/resource_arm_app_service_custom_hostname_binding.go +++ b/azurerm/internal/services/web/resource_arm_app_service_custom_hostname_binding.go @@ -5,7 +5,7 @@ import ( "log" "time" - "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web" + "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" diff --git a/azurerm/internal/services/web/resource_arm_app_service_plan.go b/azurerm/internal/services/web/resource_arm_app_service_plan.go index db32dd0b5efde..3a40be35b8a13 100644 --- a/azurerm/internal/services/web/resource_arm_app_service_plan.go +++ b/azurerm/internal/services/web/resource_arm_app_service_plan.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web" + "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" diff --git a/azurerm/internal/services/web/resource_arm_app_service_slot.go b/azurerm/internal/services/web/resource_arm_app_service_slot.go index 95dcad0e97d20..6ad4b0559af2c 100644 --- a/azurerm/internal/services/web/resource_arm_app_service_slot.go +++ b/azurerm/internal/services/web/resource_arm_app_service_slot.go @@ -5,7 +5,7 @@ import ( "log" "time" - "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web" + "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" diff --git a/azurerm/internal/services/web/resource_arm_app_service_source_control_token.go b/azurerm/internal/services/web/resource_arm_app_service_source_control_token.go index 31eb13c9270c1..16db92efa5983 100644 --- a/azurerm/internal/services/web/resource_arm_app_service_source_control_token.go +++ b/azurerm/internal/services/web/resource_arm_app_service_source_control_token.go @@ -5,7 +5,7 @@ import ( "log" "time" - "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web" + "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" diff --git a/azurerm/internal/services/web/resource_arm_app_service_virtual_network_swift_connection.go b/azurerm/internal/services/web/resource_arm_app_service_virtual_network_swift_connection.go index 015aafc93d4c7..47c6963be53b5 100644 --- a/azurerm/internal/services/web/resource_arm_app_service_virtual_network_swift_connection.go +++ b/azurerm/internal/services/web/resource_arm_app_service_virtual_network_swift_connection.go @@ -6,7 +6,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network" - "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web" + "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" diff --git a/azurerm/internal/services/web/resource_arm_function_app.go b/azurerm/internal/services/web/resource_arm_function_app.go index 223d9d127804c..6d195e3340712 100644 --- a/azurerm/internal/services/web/resource_arm_function_app.go +++ b/azurerm/internal/services/web/resource_arm_function_app.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web" + "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" diff --git a/azurerm/internal/services/web/tests/data_source_app_service_test.go b/azurerm/internal/services/web/tests/data_source_app_service_test.go index cc22b0e566560..b94041087df63 100644 --- a/azurerm/internal/services/web/tests/data_source_app_service_test.go +++ b/azurerm/internal/services/web/tests/data_source_app_service_test.go @@ -129,8 +129,7 @@ func TestAccDataSourceAzureRMAppService_ipRestriction(t *testing.T) { { Config: testAccDataSourceAppService_ipRestriction(data), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.ip_address", "10.10.10.10"), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.subnet_mask", "255.255.255.255"), + resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.ip_address", "10.10.10.10/32"), ), }, }, 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 0151370bbfe63..a291366212b45 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 @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web" + "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" @@ -699,8 +699,7 @@ func TestAccAzureRMAppServiceSlot_oneIpRestriction(t *testing.T) { Config: testAccAzureRMAppServiceSlot_oneIpRestriction(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMAppServiceSlotExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.ip_address", "10.10.10.10"), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.subnet_mask", "255.255.255.255"), + resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.ip_address", "10.10.10.10/32"), ), }, }, @@ -774,14 +773,10 @@ func TestAccAzureRMAppServiceSlot_manyIpRestrictions(t *testing.T) { Config: testAccAzureRMAppServiceSlot_manyIpRestrictions(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMAppServiceSlotExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.ip_address", "10.10.10.10"), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.subnet_mask", "255.255.255.255"), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.1.ip_address", "20.20.20.0"), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.1.subnet_mask", "255.255.255.0"), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.2.ip_address", "30.30.0.0"), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.2.subnet_mask", "255.255.0.0"), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.3.ip_address", "192.168.1.2"), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.3.subnet_mask", "255.255.255.0"), + resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.ip_address", "10.10.10.10/32"), + resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.1.ip_address", "20.20.20.0/24"), + resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.2.ip_address", "30.30.0.0/16"), + resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.3.ip_address", "192.168.1.2/24"), ), }, }, @@ -2822,22 +2817,19 @@ resource "azurerm_app_service_slot" "test" { site_config { ip_restriction { - ip_address = "10.10.10.10" + ip_address = "10.10.10.10/32" } ip_restriction { - ip_address = "20.20.20.0" - subnet_mask = "255.255.255.0" + ip_address = "20.20.20.0/24" } ip_restriction { - ip_address = "30.30.0.0" - subnet_mask = "255.255.0.0" + ip_address = "30.30.0.0/16" } ip_restriction { - ip_address = "192.168.1.2" - subnet_mask = "255.255.255.0" + ip_address = "192.168.1.2/24" } } } 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 5b12241488558..e237d706a6b1c 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 @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web" + "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" @@ -559,8 +559,7 @@ func TestAccAzureRMAppService_oneIpRestriction(t *testing.T) { Config: testAccAzureRMAppService_oneIpRestriction(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMAppServiceExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.ip_address", "10.10.10.10"), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.subnet_mask", "255.255.255.255"), + resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.ip_address", "10.10.10.10/32"), ), }, data.ImportStep(), @@ -632,14 +631,10 @@ func TestAccAzureRMAppService_manyIpRestrictions(t *testing.T) { Config: testAccAzureRMAppService_manyIpRestrictions(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMAppServiceExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.ip_address", "10.10.10.10"), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.subnet_mask", "255.255.255.255"), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.1.ip_address", "20.20.20.0"), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.1.subnet_mask", "255.255.255.0"), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.2.ip_address", "30.30.0.0"), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.2.subnet_mask", "255.255.0.0"), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.3.ip_address", "192.168.1.2"), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.3.subnet_mask", "255.255.255.0"), + resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.0.ip_address", "10.10.10.10/32"), + resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.1.ip_address", "20.20.20.0/24"), + resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.2.ip_address", "30.30.0.0/16"), + resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.ip_restriction.3.ip_address", "192.168.1.2/24"), ), }, data.ImportStep(), @@ -2768,22 +2763,19 @@ resource "azurerm_app_service" "test" { site_config { ip_restriction { - ip_address = "10.10.10.10" + ip_address = "10.10.10.10/32" } ip_restriction { - ip_address = "20.20.20.0" - subnet_mask = "255.255.255.0" + ip_address = "20.20.20.0/24" } ip_restriction { - ip_address = "30.30.0.0" - subnet_mask = "255.255.0.0" + ip_address = "30.30.0.0/16" } ip_restriction { - ip_address = "192.168.1.2" - subnet_mask = "255.255.255.0" + ip_address = "192.168.1.2/24" } } } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/apps.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/apps.go similarity index 91% rename from vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/apps.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/apps.go index 1baca4d707353..73392ff1c4d61 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/apps.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/apps.go @@ -41,7 +41,7 @@ func NewAppsClientWithBaseURI(baseURI string, subscriptionID string) AppsClient return AppsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// AddPremierAddOn updates a named add-on of an app. +// AddPremierAddOn description for Updates a named add-on of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -96,7 +96,7 @@ func (client AppsClient) AddPremierAddOnPreparer(ctx context.Context, resourceGr "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -131,7 +131,7 @@ func (client AppsClient) AddPremierAddOnResponder(resp *http.Response) (result P return } -// AddPremierAddOnSlot updates a named add-on of an app. +// AddPremierAddOnSlot description for Updates a named add-on of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -189,7 +189,7 @@ func (client AppsClient) AddPremierAddOnSlotPreparer(ctx context.Context, resour "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -224,7 +224,7 @@ func (client AppsClient) AddPremierAddOnSlotResponder(resp *http.Response) (resu return } -// AnalyzeCustomHostname analyze a custom hostname. +// AnalyzeCustomHostname description for Analyze a custom hostname. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -277,7 +277,7 @@ func (client AppsClient) AnalyzeCustomHostnamePreparer(ctx context.Context, reso "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -313,7 +313,7 @@ func (client AppsClient) AnalyzeCustomHostnameResponder(resp *http.Response) (re return } -// AnalyzeCustomHostnameSlot analyze a custom hostname. +// AnalyzeCustomHostnameSlot description for Analyze a custom hostname. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -368,7 +368,7 @@ func (client AppsClient) AnalyzeCustomHostnameSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -404,7 +404,8 @@ func (client AppsClient) AnalyzeCustomHostnameSlotResponder(resp *http.Response) return } -// ApplySlotConfigToProduction applies the configuration settings from the target slot onto the current slot. +// ApplySlotConfigToProduction description for Applies the configuration settings from the target slot onto the current +// slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -460,7 +461,7 @@ func (client AppsClient) ApplySlotConfigToProductionPreparer(ctx context.Context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -494,7 +495,8 @@ func (client AppsClient) ApplySlotConfigToProductionResponder(resp *http.Respons return } -// ApplySlotConfigurationSlot applies the configuration settings from the target slot onto the current slot. +// ApplySlotConfigurationSlot description for Applies the configuration settings from the target slot onto the current +// slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -552,7 +554,7 @@ func (client AppsClient) ApplySlotConfigurationSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -586,7 +588,7 @@ func (client AppsClient) ApplySlotConfigurationSlotResponder(resp *http.Response return } -// Backup creates a backup of an app. +// Backup description for Creates a backup of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -648,7 +650,7 @@ func (client AppsClient) BackupPreparer(ctx context.Context, resourceGroupName s "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -683,7 +685,7 @@ func (client AppsClient) BackupResponder(resp *http.Response) (result BackupItem return } -// BackupSlot creates a backup of an app. +// BackupSlot description for Creates a backup of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -748,7 +750,7 @@ func (client AppsClient) BackupSlotPreparer(ctx context.Context, resourceGroupNa "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -783,7 +785,209 @@ func (client AppsClient) BackupSlotResponder(resp *http.Response) (result Backup return } -// CreateDeployment create a deployment for an app, or a deployment slot. +// CopyProductionSlot description for Copies a deployment slot to another deployment slot of an app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// copySlotEntity - JSON object that contains the target slot name and site config properties to override the +// source slot config. See example. +func (client AppsClient) CopyProductionSlot(ctx context.Context, resourceGroupName string, name string, copySlotEntity CsmCopySlotEntity) (result AppsCopyProductionSlotFuture, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.CopyProductionSlot") + defer func() { + sc := -1 + if result.Response() != nil { + sc = result.Response().StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}, + {TargetValue: copySlotEntity, + Constraints: []validation.Constraint{{Target: "copySlotEntity.TargetSlot", Name: validation.Null, Rule: true, Chain: nil}, + {Target: "copySlotEntity.SiteConfig", Name: validation.Null, Rule: true, + Chain: []validation.Constraint{{Target: "copySlotEntity.SiteConfig.Push", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "copySlotEntity.SiteConfig.Push.PushSettingsProperties", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "copySlotEntity.SiteConfig.Push.PushSettingsProperties.IsPushEnabled", Name: validation.Null, Rule: true, Chain: nil}}}, + }}, + {Target: "copySlotEntity.SiteConfig.PreWarmedInstanceCount", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "copySlotEntity.SiteConfig.PreWarmedInstanceCount", Name: validation.InclusiveMaximum, Rule: int64(10), Chain: nil}, + {Target: "copySlotEntity.SiteConfig.PreWarmedInstanceCount", Name: validation.InclusiveMinimum, Rule: int64(0), Chain: nil}, + }}, + }}}}}); err != nil { + return result, validation.NewError("web.AppsClient", "CopyProductionSlot", err.Error()) + } + + req, err := client.CopyProductionSlotPreparer(ctx, resourceGroupName, name, copySlotEntity) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppsClient", "CopyProductionSlot", nil, "Failure preparing request") + return + } + + result, err = client.CopyProductionSlotSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppsClient", "CopyProductionSlot", result.Response(), "Failure sending request") + return + } + + return +} + +// CopyProductionSlotPreparer prepares the CopyProductionSlot request. +func (client AppsClient) CopyProductionSlotPreparer(ctx context.Context, resourceGroupName string, name string, copySlotEntity CsmCopySlotEntity) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "name": autorest.Encode("path", name), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-08-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slotcopy", pathParameters), + autorest.WithJSON(copySlotEntity), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CopyProductionSlotSender sends the CopyProductionSlot request. The method will close the +// http.Response Body if it receives an error. +func (client AppsClient) CopyProductionSlotSender(req *http.Request) (future AppsCopyProductionSlotFuture, err error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, sd...) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// CopyProductionSlotResponder handles the response to the CopyProductionSlot request. The method always +// closes the http.Response Body. +func (client AppsClient) CopyProductionSlotResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), + autorest.ByClosing()) + result.Response = resp + return +} + +// CopySlotSlot description for Copies a deployment slot to another deployment slot of an app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// copySlotEntity - JSON object that contains the target slot name and site config properties to override the +// source slot config. See example. +// slot - name of the source slot. If a slot is not specified, the production slot is used as the source slot. +func (client AppsClient) CopySlotSlot(ctx context.Context, resourceGroupName string, name string, copySlotEntity CsmCopySlotEntity, slot string) (result AppsCopySlotSlotFuture, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.CopySlotSlot") + defer func() { + sc := -1 + if result.Response() != nil { + sc = result.Response().StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}, + {TargetValue: copySlotEntity, + Constraints: []validation.Constraint{{Target: "copySlotEntity.TargetSlot", Name: validation.Null, Rule: true, Chain: nil}, + {Target: "copySlotEntity.SiteConfig", Name: validation.Null, Rule: true, + Chain: []validation.Constraint{{Target: "copySlotEntity.SiteConfig.Push", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "copySlotEntity.SiteConfig.Push.PushSettingsProperties", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "copySlotEntity.SiteConfig.Push.PushSettingsProperties.IsPushEnabled", Name: validation.Null, Rule: true, Chain: nil}}}, + }}, + {Target: "copySlotEntity.SiteConfig.PreWarmedInstanceCount", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "copySlotEntity.SiteConfig.PreWarmedInstanceCount", Name: validation.InclusiveMaximum, Rule: int64(10), Chain: nil}, + {Target: "copySlotEntity.SiteConfig.PreWarmedInstanceCount", Name: validation.InclusiveMinimum, Rule: int64(0), Chain: nil}, + }}, + }}}}}); err != nil { + return result, validation.NewError("web.AppsClient", "CopySlotSlot", err.Error()) + } + + req, err := client.CopySlotSlotPreparer(ctx, resourceGroupName, name, copySlotEntity, slot) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppsClient", "CopySlotSlot", nil, "Failure preparing request") + return + } + + result, err = client.CopySlotSlotSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppsClient", "CopySlotSlot", result.Response(), "Failure sending request") + return + } + + return +} + +// CopySlotSlotPreparer prepares the CopySlotSlot request. +func (client AppsClient) CopySlotSlotPreparer(ctx context.Context, resourceGroupName string, name string, copySlotEntity CsmCopySlotEntity, slot string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "name": autorest.Encode("path", name), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "slot": autorest.Encode("path", slot), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-08-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/slotcopy", pathParameters), + autorest.WithJSON(copySlotEntity), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CopySlotSlotSender sends the CopySlotSlot request. The method will close the +// http.Response Body if it receives an error. +func (client AppsClient) CopySlotSlotSender(req *http.Request) (future AppsCopySlotSlotFuture, err error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, sd...) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// CopySlotSlotResponder handles the response to the CopySlotSlot request. The method always +// closes the http.Response Body. +func (client AppsClient) CopySlotSlotResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), + autorest.ByClosing()) + result.Response = resp + return +} + +// CreateDeployment description for Create a deployment for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -838,7 +1042,7 @@ func (client AppsClient) CreateDeploymentPreparer(ctx context.Context, resourceG "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -873,7 +1077,7 @@ func (client AppsClient) CreateDeploymentResponder(resp *http.Response) (result return } -// CreateDeploymentSlot create a deployment for an app, or a deployment slot. +// CreateDeploymentSlot description for Create a deployment for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -931,7 +1135,7 @@ func (client AppsClient) CreateDeploymentSlotPreparer(ctx context.Context, resou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -966,7 +1170,7 @@ func (client AppsClient) CreateDeploymentSlotResponder(resp *http.Response) (res return } -// CreateFunction create function for web site, or a deployment slot. +// CreateFunction description for Create function for web site, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -1015,7 +1219,7 @@ func (client AppsClient) CreateFunctionPreparer(ctx context.Context, resourceGro "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1056,7 +1260,7 @@ func (client AppsClient) CreateFunctionResponder(resp *http.Response) (result Fu return } -// CreateInstanceFunctionSlot create function for web site, or a deployment slot. +// CreateInstanceFunctionSlot description for Create function for web site, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -1107,7 +1311,7 @@ func (client AppsClient) CreateInstanceFunctionSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1148,7 +1352,7 @@ func (client AppsClient) CreateInstanceFunctionSlotResponder(resp *http.Response return } -// CreateInstanceMSDeployOperation invoke the MSDeploy web app extension. +// CreateInstanceMSDeployOperation description for Invoke the MSDeploy web app extension. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -1197,7 +1401,7 @@ func (client AppsClient) CreateInstanceMSDeployOperationPreparer(ctx context.Con "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1238,7 +1442,7 @@ func (client AppsClient) CreateInstanceMSDeployOperationResponder(resp *http.Res return } -// CreateInstanceMSDeployOperationSlot invoke the MSDeploy web app extension. +// CreateInstanceMSDeployOperationSlot description for Invoke the MSDeploy web app extension. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -1289,7 +1493,7 @@ func (client AppsClient) CreateInstanceMSDeployOperationSlotPreparer(ctx context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1330,7 +1534,7 @@ func (client AppsClient) CreateInstanceMSDeployOperationSlotResponder(resp *http return } -// CreateMSDeployOperation invoke the MSDeploy web app extension. +// CreateMSDeployOperation description for Invoke the MSDeploy web app extension. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -1377,7 +1581,7 @@ func (client AppsClient) CreateMSDeployOperationPreparer(ctx context.Context, re "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1418,7 +1622,7 @@ func (client AppsClient) CreateMSDeployOperationResponder(resp *http.Response) ( return } -// CreateMSDeployOperationSlot invoke the MSDeploy web app extension. +// CreateMSDeployOperationSlot description for Invoke the MSDeploy web app extension. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -1467,7 +1671,7 @@ func (client AppsClient) CreateMSDeployOperationSlotPreparer(ctx context.Context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1508,7 +1712,8 @@ func (client AppsClient) CreateMSDeployOperationSlotResponder(resp *http.Respons return } -// CreateOrUpdate creates a new web, mobile, or API app in an existing resource group, or updates an existing app. +// CreateOrUpdate description for Creates a new web, mobile, or API app in an existing resource group, or updates an +// existing app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - unique name of the app to create or update. To create or update a deployment slot, use the {slot} @@ -1537,9 +1742,9 @@ func (client AppsClient) CreateOrUpdate(ctx context.Context, resourceGroupName s Chain: []validation.Constraint{{Target: "siteEnvelope.SiteProperties.SiteConfig.Push.PushSettingsProperties", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "siteEnvelope.SiteProperties.SiteConfig.Push.PushSettingsProperties.IsPushEnabled", Name: validation.Null, Rule: true, Chain: nil}}}, }}, - {Target: "siteEnvelope.SiteProperties.SiteConfig.ReservedInstanceCount", Name: validation.Null, Rule: false, - Chain: []validation.Constraint{{Target: "siteEnvelope.SiteProperties.SiteConfig.ReservedInstanceCount", Name: validation.InclusiveMaximum, Rule: int64(10), Chain: nil}, - {Target: "siteEnvelope.SiteProperties.SiteConfig.ReservedInstanceCount", Name: validation.InclusiveMinimum, Rule: int64(0), Chain: nil}, + {Target: "siteEnvelope.SiteProperties.SiteConfig.PreWarmedInstanceCount", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "siteEnvelope.SiteProperties.SiteConfig.PreWarmedInstanceCount", Name: validation.InclusiveMaximum, Rule: int64(10), Chain: nil}, + {Target: "siteEnvelope.SiteProperties.SiteConfig.PreWarmedInstanceCount", Name: validation.InclusiveMinimum, Rule: int64(0), Chain: nil}, }}, }}, {Target: "siteEnvelope.SiteProperties.CloningInfo", Name: validation.Null, Rule: false, @@ -1571,7 +1776,7 @@ func (client AppsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGro "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1612,7 +1817,7 @@ func (client AppsClient) CreateOrUpdateResponder(resp *http.Response) (result Si return } -// CreateOrUpdateConfiguration updates the configuration of an app. +// CreateOrUpdateConfiguration description for Updates the configuration of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -1639,9 +1844,9 @@ func (client AppsClient) CreateOrUpdateConfiguration(ctx context.Context, resour Chain: []validation.Constraint{{Target: "siteConfig.SiteConfig.Push.PushSettingsProperties", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "siteConfig.SiteConfig.Push.PushSettingsProperties.IsPushEnabled", Name: validation.Null, Rule: true, Chain: nil}}}, }}, - {Target: "siteConfig.SiteConfig.ReservedInstanceCount", Name: validation.Null, Rule: false, - Chain: []validation.Constraint{{Target: "siteConfig.SiteConfig.ReservedInstanceCount", Name: validation.InclusiveMaximum, Rule: int64(10), Chain: nil}, - {Target: "siteConfig.SiteConfig.ReservedInstanceCount", Name: validation.InclusiveMinimum, Rule: int64(0), Chain: nil}, + {Target: "siteConfig.SiteConfig.PreWarmedInstanceCount", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "siteConfig.SiteConfig.PreWarmedInstanceCount", Name: validation.InclusiveMaximum, Rule: int64(10), Chain: nil}, + {Target: "siteConfig.SiteConfig.PreWarmedInstanceCount", Name: validation.InclusiveMinimum, Rule: int64(0), Chain: nil}, }}, }}}}}); err != nil { return result, validation.NewError("web.AppsClient", "CreateOrUpdateConfiguration", err.Error()) @@ -1676,7 +1881,7 @@ func (client AppsClient) CreateOrUpdateConfigurationPreparer(ctx context.Context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1711,7 +1916,7 @@ func (client AppsClient) CreateOrUpdateConfigurationResponder(resp *http.Respons return } -// CreateOrUpdateConfigurationSlot updates the configuration of an app. +// CreateOrUpdateConfigurationSlot description for Updates the configuration of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -1740,9 +1945,9 @@ func (client AppsClient) CreateOrUpdateConfigurationSlot(ctx context.Context, re Chain: []validation.Constraint{{Target: "siteConfig.SiteConfig.Push.PushSettingsProperties", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "siteConfig.SiteConfig.Push.PushSettingsProperties.IsPushEnabled", Name: validation.Null, Rule: true, Chain: nil}}}, }}, - {Target: "siteConfig.SiteConfig.ReservedInstanceCount", Name: validation.Null, Rule: false, - Chain: []validation.Constraint{{Target: "siteConfig.SiteConfig.ReservedInstanceCount", Name: validation.InclusiveMaximum, Rule: int64(10), Chain: nil}, - {Target: "siteConfig.SiteConfig.ReservedInstanceCount", Name: validation.InclusiveMinimum, Rule: int64(0), Chain: nil}, + {Target: "siteConfig.SiteConfig.PreWarmedInstanceCount", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "siteConfig.SiteConfig.PreWarmedInstanceCount", Name: validation.InclusiveMaximum, Rule: int64(10), Chain: nil}, + {Target: "siteConfig.SiteConfig.PreWarmedInstanceCount", Name: validation.InclusiveMinimum, Rule: int64(0), Chain: nil}, }}, }}}}}); err != nil { return result, validation.NewError("web.AppsClient", "CreateOrUpdateConfigurationSlot", err.Error()) @@ -1778,7 +1983,7 @@ func (client AppsClient) CreateOrUpdateConfigurationSlotPreparer(ctx context.Con "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1813,8 +2018,8 @@ func (client AppsClient) CreateOrUpdateConfigurationSlotResponder(resp *http.Res return } -// CreateOrUpdateDomainOwnershipIdentifier creates a domain ownership identifier for web app, or updates an existing -// ownership identifier. +// CreateOrUpdateDomainOwnershipIdentifier description for Creates a domain ownership identifier for web app, or +// updates an existing ownership identifier. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -1869,7 +2074,7 @@ func (client AppsClient) CreateOrUpdateDomainOwnershipIdentifierPreparer(ctx con "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1904,8 +2109,8 @@ func (client AppsClient) CreateOrUpdateDomainOwnershipIdentifierResponder(resp * return } -// CreateOrUpdateDomainOwnershipIdentifierSlot creates a domain ownership identifier for web app, or updates an -// existing ownership identifier. +// CreateOrUpdateDomainOwnershipIdentifierSlot description for Creates a domain ownership identifier for web app, or +// updates an existing ownership identifier. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -1963,7 +2168,7 @@ func (client AppsClient) CreateOrUpdateDomainOwnershipIdentifierSlotPreparer(ctx "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1998,193 +2203,7 @@ func (client AppsClient) CreateOrUpdateDomainOwnershipIdentifierSlotResponder(re return } -// CreateOrUpdateFunctionSecret add or update a function secret. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - site name. -// functionName - the name of the function. -// keyName - the name of the key. -// key - the key to create or update -func (client AppsClient) CreateOrUpdateFunctionSecret(ctx context.Context, resourceGroupName string, name string, functionName string, keyName string, key KeyInfo) (result KeyInfo, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.CreateOrUpdateFunctionSecret") - defer func() { - sc := -1 - if result.Response.Response != nil { - sc = result.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "CreateOrUpdateFunctionSecret", err.Error()) - } - - req, err := client.CreateOrUpdateFunctionSecretPreparer(ctx, resourceGroupName, name, functionName, keyName, key) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "CreateOrUpdateFunctionSecret", nil, "Failure preparing request") - return - } - - resp, err := client.CreateOrUpdateFunctionSecretSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppsClient", "CreateOrUpdateFunctionSecret", resp, "Failure sending request") - return - } - - result, err = client.CreateOrUpdateFunctionSecretResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "CreateOrUpdateFunctionSecret", resp, "Failure responding to request") - } - - return -} - -// CreateOrUpdateFunctionSecretPreparer prepares the CreateOrUpdateFunctionSecret request. -func (client AppsClient) CreateOrUpdateFunctionSecretPreparer(ctx context.Context, resourceGroupName string, name string, functionName string, keyName string, key KeyInfo) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "functionName": autorest.Encode("path", functionName), - "keyName": autorest.Encode("path", keyName), - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsContentType("application/json; charset=utf-8"), - autorest.AsPut(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/functions/{functionName}/keys/{keyName}", pathParameters), - autorest.WithJSON(key), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// CreateOrUpdateFunctionSecretSender sends the CreateOrUpdateFunctionSecret request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) CreateOrUpdateFunctionSecretSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// CreateOrUpdateFunctionSecretResponder handles the response to the CreateOrUpdateFunctionSecret request. The method always -// closes the http.Response Body. -func (client AppsClient) CreateOrUpdateFunctionSecretResponder(resp *http.Response) (result KeyInfo, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// CreateOrUpdateFunctionSecretSlot add or update a function secret. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - site name. -// functionName - the name of the function. -// keyName - the name of the key. -// slot - name of the deployment slot. -// key - the key to create or update -func (client AppsClient) CreateOrUpdateFunctionSecretSlot(ctx context.Context, resourceGroupName string, name string, functionName string, keyName string, slot string, key KeyInfo) (result KeyInfo, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.CreateOrUpdateFunctionSecretSlot") - defer func() { - sc := -1 - if result.Response.Response != nil { - sc = result.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "CreateOrUpdateFunctionSecretSlot", err.Error()) - } - - req, err := client.CreateOrUpdateFunctionSecretSlotPreparer(ctx, resourceGroupName, name, functionName, keyName, slot, key) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "CreateOrUpdateFunctionSecretSlot", nil, "Failure preparing request") - return - } - - resp, err := client.CreateOrUpdateFunctionSecretSlotSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppsClient", "CreateOrUpdateFunctionSecretSlot", resp, "Failure sending request") - return - } - - result, err = client.CreateOrUpdateFunctionSecretSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "CreateOrUpdateFunctionSecretSlot", resp, "Failure responding to request") - } - - return -} - -// CreateOrUpdateFunctionSecretSlotPreparer prepares the CreateOrUpdateFunctionSecretSlot request. -func (client AppsClient) CreateOrUpdateFunctionSecretSlotPreparer(ctx context.Context, resourceGroupName string, name string, functionName string, keyName string, slot string, key KeyInfo) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "functionName": autorest.Encode("path", functionName), - "keyName": autorest.Encode("path", keyName), - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "slot": autorest.Encode("path", slot), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsContentType("application/json; charset=utf-8"), - autorest.AsPut(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/functions/{functionName}/keys/{keyName}", pathParameters), - autorest.WithJSON(key), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// CreateOrUpdateFunctionSecretSlotSender sends the CreateOrUpdateFunctionSecretSlot request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) CreateOrUpdateFunctionSecretSlotSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// CreateOrUpdateFunctionSecretSlotResponder handles the response to the CreateOrUpdateFunctionSecretSlot request. The method always -// closes the http.Response Body. -func (client AppsClient) CreateOrUpdateFunctionSecretSlotResponder(resp *http.Response) (result KeyInfo, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// CreateOrUpdateHostNameBinding creates a hostname binding for an app. +// CreateOrUpdateHostNameBinding description for Creates a hostname binding for an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -2239,7 +2258,7 @@ func (client AppsClient) CreateOrUpdateHostNameBindingPreparer(ctx context.Conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -2274,7 +2293,7 @@ func (client AppsClient) CreateOrUpdateHostNameBindingResponder(resp *http.Respo return } -// CreateOrUpdateHostNameBindingSlot creates a hostname binding for an app. +// CreateOrUpdateHostNameBindingSlot description for Creates a hostname binding for an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -2332,7 +2351,7 @@ func (client AppsClient) CreateOrUpdateHostNameBindingSlotPreparer(ctx context.C "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -2367,193 +2386,7 @@ func (client AppsClient) CreateOrUpdateHostNameBindingSlotResponder(resp *http.R return } -// CreateOrUpdateHostSecret add or update a host level secret. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - site name. -// keyType - the type of host key. -// keyName - the name of the key. -// key - the key to create or update -func (client AppsClient) CreateOrUpdateHostSecret(ctx context.Context, resourceGroupName string, name string, keyType string, keyName string, key KeyInfo) (result KeyInfo, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.CreateOrUpdateHostSecret") - defer func() { - sc := -1 - if result.Response.Response != nil { - sc = result.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "CreateOrUpdateHostSecret", err.Error()) - } - - req, err := client.CreateOrUpdateHostSecretPreparer(ctx, resourceGroupName, name, keyType, keyName, key) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "CreateOrUpdateHostSecret", nil, "Failure preparing request") - return - } - - resp, err := client.CreateOrUpdateHostSecretSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppsClient", "CreateOrUpdateHostSecret", resp, "Failure sending request") - return - } - - result, err = client.CreateOrUpdateHostSecretResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "CreateOrUpdateHostSecret", resp, "Failure responding to request") - } - - return -} - -// CreateOrUpdateHostSecretPreparer prepares the CreateOrUpdateHostSecret request. -func (client AppsClient) CreateOrUpdateHostSecretPreparer(ctx context.Context, resourceGroupName string, name string, keyType string, keyName string, key KeyInfo) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "keyName": autorest.Encode("path", keyName), - "keyType": autorest.Encode("path", keyType), - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsContentType("application/json; charset=utf-8"), - autorest.AsPut(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/host/default/{keyType}/{keyName}", pathParameters), - autorest.WithJSON(key), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// CreateOrUpdateHostSecretSender sends the CreateOrUpdateHostSecret request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) CreateOrUpdateHostSecretSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// CreateOrUpdateHostSecretResponder handles the response to the CreateOrUpdateHostSecret request. The method always -// closes the http.Response Body. -func (client AppsClient) CreateOrUpdateHostSecretResponder(resp *http.Response) (result KeyInfo, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// CreateOrUpdateHostSecretSlot add or update a host level secret. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - site name. -// keyType - the type of host key. -// keyName - the name of the key. -// slot - name of the deployment slot. -// key - the key to create or update -func (client AppsClient) CreateOrUpdateHostSecretSlot(ctx context.Context, resourceGroupName string, name string, keyType string, keyName string, slot string, key KeyInfo) (result KeyInfo, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.CreateOrUpdateHostSecretSlot") - defer func() { - sc := -1 - if result.Response.Response != nil { - sc = result.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "CreateOrUpdateHostSecretSlot", err.Error()) - } - - req, err := client.CreateOrUpdateHostSecretSlotPreparer(ctx, resourceGroupName, name, keyType, keyName, slot, key) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "CreateOrUpdateHostSecretSlot", nil, "Failure preparing request") - return - } - - resp, err := client.CreateOrUpdateHostSecretSlotSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppsClient", "CreateOrUpdateHostSecretSlot", resp, "Failure sending request") - return - } - - result, err = client.CreateOrUpdateHostSecretSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "CreateOrUpdateHostSecretSlot", resp, "Failure responding to request") - } - - return -} - -// CreateOrUpdateHostSecretSlotPreparer prepares the CreateOrUpdateHostSecretSlot request. -func (client AppsClient) CreateOrUpdateHostSecretSlotPreparer(ctx context.Context, resourceGroupName string, name string, keyType string, keyName string, slot string, key KeyInfo) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "keyName": autorest.Encode("path", keyName), - "keyType": autorest.Encode("path", keyType), - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "slot": autorest.Encode("path", slot), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsContentType("application/json; charset=utf-8"), - autorest.AsPut(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/host/default/{keyType}/{keyName}", pathParameters), - autorest.WithJSON(key), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// CreateOrUpdateHostSecretSlotSender sends the CreateOrUpdateHostSecretSlot request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) CreateOrUpdateHostSecretSlotSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// CreateOrUpdateHostSecretSlotResponder handles the response to the CreateOrUpdateHostSecretSlot request. The method always -// closes the http.Response Body. -func (client AppsClient) CreateOrUpdateHostSecretSlotResponder(resp *http.Response) (result KeyInfo, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// CreateOrUpdateHybridConnection creates a new Hybrid Connection using a Service Bus relay. +// CreateOrUpdateHybridConnection description for Creates a new Hybrid Connection using a Service Bus relay. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -2610,7 +2443,7 @@ func (client AppsClient) CreateOrUpdateHybridConnectionPreparer(ctx context.Cont "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -2645,7 +2478,7 @@ func (client AppsClient) CreateOrUpdateHybridConnectionResponder(resp *http.Resp return } -// CreateOrUpdateHybridConnectionSlot creates a new Hybrid Connection using a Service Bus relay. +// CreateOrUpdateHybridConnectionSlot description for Creates a new Hybrid Connection using a Service Bus relay. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -2704,7 +2537,7 @@ func (client AppsClient) CreateOrUpdateHybridConnectionSlotPreparer(ctx context. "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -2739,7 +2572,7 @@ func (client AppsClient) CreateOrUpdateHybridConnectionSlotResponder(resp *http. return } -// CreateOrUpdatePublicCertificate creates a hostname binding for an app. +// CreateOrUpdatePublicCertificate description for Creates a hostname binding for an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -2795,7 +2628,7 @@ func (client AppsClient) CreateOrUpdatePublicCertificatePreparer(ctx context.Con "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -2830,7 +2663,7 @@ func (client AppsClient) CreateOrUpdatePublicCertificateResponder(resp *http.Res return } -// CreateOrUpdatePublicCertificateSlot creates a hostname binding for an app. +// CreateOrUpdatePublicCertificateSlot description for Creates a hostname binding for an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -2889,7 +2722,7 @@ func (client AppsClient) CreateOrUpdatePublicCertificateSlotPreparer(ctx context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -2924,8 +2757,8 @@ func (client AppsClient) CreateOrUpdatePublicCertificateSlotResponder(resp *http return } -// CreateOrUpdateRelayServiceConnection creates a new hybrid connection configuration (PUT), or updates an existing one -// (PATCH). +// CreateOrUpdateRelayServiceConnection description for Creates a new hybrid connection configuration (PUT), or updates +// an existing one (PATCH). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -2980,7 +2813,7 @@ func (client AppsClient) CreateOrUpdateRelayServiceConnectionPreparer(ctx contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -3015,8 +2848,8 @@ func (client AppsClient) CreateOrUpdateRelayServiceConnectionResponder(resp *htt return } -// CreateOrUpdateRelayServiceConnectionSlot creates a new hybrid connection configuration (PUT), or updates an existing -// one (PATCH). +// CreateOrUpdateRelayServiceConnectionSlot description for Creates a new hybrid connection configuration (PUT), or +// updates an existing one (PATCH). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -3074,7 +2907,7 @@ func (client AppsClient) CreateOrUpdateRelayServiceConnectionSlotPreparer(ctx co "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -3109,7 +2942,8 @@ func (client AppsClient) CreateOrUpdateRelayServiceConnectionSlotResponder(resp return } -// CreateOrUpdateSlot creates a new web, mobile, or API app in an existing resource group, or updates an existing app. +// CreateOrUpdateSlot description for Creates a new web, mobile, or API app in an existing resource group, or updates +// an existing app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - unique name of the app to create or update. To create or update a deployment slot, use the {slot} @@ -3140,9 +2974,9 @@ func (client AppsClient) CreateOrUpdateSlot(ctx context.Context, resourceGroupNa Chain: []validation.Constraint{{Target: "siteEnvelope.SiteProperties.SiteConfig.Push.PushSettingsProperties", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "siteEnvelope.SiteProperties.SiteConfig.Push.PushSettingsProperties.IsPushEnabled", Name: validation.Null, Rule: true, Chain: nil}}}, }}, - {Target: "siteEnvelope.SiteProperties.SiteConfig.ReservedInstanceCount", Name: validation.Null, Rule: false, - Chain: []validation.Constraint{{Target: "siteEnvelope.SiteProperties.SiteConfig.ReservedInstanceCount", Name: validation.InclusiveMaximum, Rule: int64(10), Chain: nil}, - {Target: "siteEnvelope.SiteProperties.SiteConfig.ReservedInstanceCount", Name: validation.InclusiveMinimum, Rule: int64(0), Chain: nil}, + {Target: "siteEnvelope.SiteProperties.SiteConfig.PreWarmedInstanceCount", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "siteEnvelope.SiteProperties.SiteConfig.PreWarmedInstanceCount", Name: validation.InclusiveMaximum, Rule: int64(10), Chain: nil}, + {Target: "siteEnvelope.SiteProperties.SiteConfig.PreWarmedInstanceCount", Name: validation.InclusiveMinimum, Rule: int64(0), Chain: nil}, }}, }}, {Target: "siteEnvelope.SiteProperties.CloningInfo", Name: validation.Null, Rule: false, @@ -3175,7 +3009,7 @@ func (client AppsClient) CreateOrUpdateSlotPreparer(ctx context.Context, resourc "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -3216,7 +3050,7 @@ func (client AppsClient) CreateOrUpdateSlotResponder(resp *http.Response) (resul return } -// CreateOrUpdateSourceControl updates the source control configuration of an app. +// CreateOrUpdateSourceControl description for Updates the source control configuration of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -3263,7 +3097,7 @@ func (client AppsClient) CreateOrUpdateSourceControlPreparer(ctx context.Context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -3304,7 +3138,7 @@ func (client AppsClient) CreateOrUpdateSourceControlResponder(resp *http.Respons return } -// CreateOrUpdateSourceControlSlot updates the source control configuration of an app. +// CreateOrUpdateSourceControlSlot description for Updates the source control configuration of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -3354,7 +3188,7 @@ func (client AppsClient) CreateOrUpdateSourceControlSlotPreparer(ctx context.Con "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -3395,9 +3229,9 @@ func (client AppsClient) CreateOrUpdateSourceControlSlotResponder(resp *http.Res return } -// CreateOrUpdateSwiftVirtualNetworkConnection integrates this Web App with a Virtual Network. This requires that 1) -// "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been -// delegated, and is not +// CreateOrUpdateSwiftVirtualNetworkConnection description for Integrates this Web App with a Virtual Network. This +// requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has +// already been delegated, and is not // in use by another App Service Plan other than the one this App is in. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. @@ -3451,7 +3285,7 @@ func (client AppsClient) CreateOrUpdateSwiftVirtualNetworkConnectionPreparer(ctx "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -3486,9 +3320,9 @@ func (client AppsClient) CreateOrUpdateSwiftVirtualNetworkConnectionResponder(re return } -// CreateOrUpdateSwiftVirtualNetworkConnectionSlot integrates this Web App with a Virtual Network. This requires that -// 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been -// delegated, and is not +// CreateOrUpdateSwiftVirtualNetworkConnectionSlot description for Integrates this Web App with a Virtual Network. This +// requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has +// already been delegated, and is not // in use by another App Service Plan other than the one this App is in. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. @@ -3545,7 +3379,7 @@ func (client AppsClient) CreateOrUpdateSwiftVirtualNetworkConnectionSlotPreparer "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -3580,8 +3414,8 @@ func (client AppsClient) CreateOrUpdateSwiftVirtualNetworkConnectionSlotResponde return } -// CreateOrUpdateVnetConnection adds a Virtual Network connection to an app or slot (PUT) or updates the connection -// properties (PATCH). +// CreateOrUpdateVnetConnection description for Adds a Virtual Network connection to an app or slot (PUT) or updates +// the connection properties (PATCH). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -3636,7 +3470,7 @@ func (client AppsClient) CreateOrUpdateVnetConnectionPreparer(ctx context.Contex "vnetName": autorest.Encode("path", vnetName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -3671,7 +3505,8 @@ func (client AppsClient) CreateOrUpdateVnetConnectionResponder(resp *http.Respon return } -// CreateOrUpdateVnetConnectionGateway adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). +// CreateOrUpdateVnetConnectionGateway description for Adds a gateway to a connected Virtual Network (PUT) or updates +// it (PATCH). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -3731,7 +3566,7 @@ func (client AppsClient) CreateOrUpdateVnetConnectionGatewayPreparer(ctx context "vnetName": autorest.Encode("path", vnetName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -3766,7 +3601,8 @@ func (client AppsClient) CreateOrUpdateVnetConnectionGatewayResponder(resp *http return } -// CreateOrUpdateVnetConnectionGatewaySlot adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). +// CreateOrUpdateVnetConnectionGatewaySlot description for Adds a gateway to a connected Virtual Network (PUT) or +// updates it (PATCH). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -3829,7 +3665,7 @@ func (client AppsClient) CreateOrUpdateVnetConnectionGatewaySlotPreparer(ctx con "vnetName": autorest.Encode("path", vnetName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -3864,8 +3700,8 @@ func (client AppsClient) CreateOrUpdateVnetConnectionGatewaySlotResponder(resp * return } -// CreateOrUpdateVnetConnectionSlot adds a Virtual Network connection to an app or slot (PUT) or updates the connection -// properties (PATCH). +// CreateOrUpdateVnetConnectionSlot description for Adds a Virtual Network connection to an app or slot (PUT) or +// updates the connection properties (PATCH). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -3923,7 +3759,7 @@ func (client AppsClient) CreateOrUpdateVnetConnectionSlotPreparer(ctx context.Co "vnetName": autorest.Encode("path", vnetName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -3958,7 +3794,7 @@ func (client AppsClient) CreateOrUpdateVnetConnectionSlotResponder(resp *http.Re return } -// Delete deletes a web, mobile, or API app, or one of the deployment slots. +// Delete description for Deletes a web, mobile, or API app, or one of the deployment slots. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app to delete. @@ -4013,7 +3849,7 @@ func (client AppsClient) DeletePreparer(ctx context.Context, resourceGroupName s "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -4051,7 +3887,7 @@ func (client AppsClient) DeleteResponder(resp *http.Response) (result autorest.R return } -// DeleteBackup deletes a backup of an app by its ID. +// DeleteBackup description for Deletes a backup of an app by its ID. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -4105,7 +3941,7 @@ func (client AppsClient) DeleteBackupPreparer(ctx context.Context, resourceGroup "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -4137,7 +3973,7 @@ func (client AppsClient) DeleteBackupResponder(resp *http.Response) (result auto return } -// DeleteBackupConfiguration deletes the backup configuration of an app. +// DeleteBackupConfiguration description for Deletes the backup configuration of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -4189,7 +4025,7 @@ func (client AppsClient) DeleteBackupConfigurationPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -4221,7 +4057,7 @@ func (client AppsClient) DeleteBackupConfigurationResponder(resp *http.Response) return } -// DeleteBackupConfigurationSlot deletes the backup configuration of an app. +// DeleteBackupConfigurationSlot description for Deletes the backup configuration of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -4276,7 +4112,7 @@ func (client AppsClient) DeleteBackupConfigurationSlotPreparer(ctx context.Conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -4308,7 +4144,7 @@ func (client AppsClient) DeleteBackupConfigurationSlotResponder(resp *http.Respo return } -// DeleteBackupSlot deletes a backup of an app by its ID. +// DeleteBackupSlot description for Deletes a backup of an app by its ID. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -4365,7 +4201,7 @@ func (client AppsClient) DeleteBackupSlotPreparer(ctx context.Context, resourceG "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -4397,7 +4233,7 @@ func (client AppsClient) DeleteBackupSlotResponder(resp *http.Response) (result return } -// DeleteContinuousWebJob delete a continuous web job by its ID for an app, or a deployment slot. +// DeleteContinuousWebJob description for Delete a continuous web job by its ID for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -4451,7 +4287,7 @@ func (client AppsClient) DeleteContinuousWebJobPreparer(ctx context.Context, res "webJobName": autorest.Encode("path", webJobName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -4483,7 +4319,7 @@ func (client AppsClient) DeleteContinuousWebJobResponder(resp *http.Response) (r return } -// DeleteContinuousWebJobSlot delete a continuous web job by its ID for an app, or a deployment slot. +// DeleteContinuousWebJobSlot description for Delete a continuous web job by its ID for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -4540,7 +4376,7 @@ func (client AppsClient) DeleteContinuousWebJobSlotPreparer(ctx context.Context, "webJobName": autorest.Encode("path", webJobName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -4572,7 +4408,7 @@ func (client AppsClient) DeleteContinuousWebJobSlotResponder(resp *http.Response return } -// DeleteDeployment delete a deployment by its ID for an app, or a deployment slot. +// DeleteDeployment description for Delete a deployment by its ID for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -4626,7 +4462,7 @@ func (client AppsClient) DeleteDeploymentPreparer(ctx context.Context, resourceG "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -4658,7 +4494,7 @@ func (client AppsClient) DeleteDeploymentResponder(resp *http.Response) (result return } -// DeleteDeploymentSlot delete a deployment by its ID for an app, or a deployment slot. +// DeleteDeploymentSlot description for Delete a deployment by its ID for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -4715,7 +4551,7 @@ func (client AppsClient) DeleteDeploymentSlotPreparer(ctx context.Context, resou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -4747,7 +4583,7 @@ func (client AppsClient) DeleteDeploymentSlotResponder(resp *http.Response) (res return } -// DeleteDomainOwnershipIdentifier deletes a domain ownership identifier for a web app. +// DeleteDomainOwnershipIdentifier description for Deletes a domain ownership identifier for a web app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -4801,7 +4637,7 @@ func (client AppsClient) DeleteDomainOwnershipIdentifierPreparer(ctx context.Con "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -4833,7 +4669,7 @@ func (client AppsClient) DeleteDomainOwnershipIdentifierResponder(resp *http.Res return } -// DeleteDomainOwnershipIdentifierSlot deletes a domain ownership identifier for a web app. +// DeleteDomainOwnershipIdentifierSlot description for Deletes a domain ownership identifier for a web app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -4890,7 +4726,7 @@ func (client AppsClient) DeleteDomainOwnershipIdentifierSlotPreparer(ctx context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -4922,7 +4758,7 @@ func (client AppsClient) DeleteDomainOwnershipIdentifierSlotResponder(resp *http return } -// DeleteFunction delete a function for web site, or a deployment slot. +// DeleteFunction description for Delete a function for web site, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -4976,7 +4812,7 @@ func (client AppsClient) DeleteFunctionPreparer(ctx context.Context, resourceGro "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -5008,185 +4844,7 @@ func (client AppsClient) DeleteFunctionResponder(resp *http.Response) (result au return } -// DeleteFunctionSecret delete a function secret. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - site name. -// functionName - the name of the function. -// keyName - the name of the key. -func (client AppsClient) DeleteFunctionSecret(ctx context.Context, resourceGroupName string, name string, functionName string, keyName string) (result autorest.Response, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.DeleteFunctionSecret") - defer func() { - sc := -1 - if result.Response != nil { - sc = result.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "DeleteFunctionSecret", err.Error()) - } - - req, err := client.DeleteFunctionSecretPreparer(ctx, resourceGroupName, name, functionName, keyName) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "DeleteFunctionSecret", nil, "Failure preparing request") - return - } - - resp, err := client.DeleteFunctionSecretSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "web.AppsClient", "DeleteFunctionSecret", resp, "Failure sending request") - return - } - - result, err = client.DeleteFunctionSecretResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "DeleteFunctionSecret", resp, "Failure responding to request") - } - - return -} - -// DeleteFunctionSecretPreparer prepares the DeleteFunctionSecret request. -func (client AppsClient) DeleteFunctionSecretPreparer(ctx context.Context, resourceGroupName string, name string, functionName string, keyName string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "functionName": autorest.Encode("path", functionName), - "keyName": autorest.Encode("path", keyName), - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsDelete(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/functions/{functionName}/keys/{keyName}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// DeleteFunctionSecretSender sends the DeleteFunctionSecret request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) DeleteFunctionSecretSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// DeleteFunctionSecretResponder handles the response to the DeleteFunctionSecret request. The method always -// closes the http.Response Body. -func (client AppsClient) DeleteFunctionSecretResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent, http.StatusNotFound), - autorest.ByClosing()) - result.Response = resp - return -} - -// DeleteFunctionSecretSlot delete a function secret. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - site name. -// functionName - the name of the function. -// keyName - the name of the key. -// slot - name of the deployment slot. -func (client AppsClient) DeleteFunctionSecretSlot(ctx context.Context, resourceGroupName string, name string, functionName string, keyName string, slot string) (result autorest.Response, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.DeleteFunctionSecretSlot") - defer func() { - sc := -1 - if result.Response != nil { - sc = result.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "DeleteFunctionSecretSlot", err.Error()) - } - - req, err := client.DeleteFunctionSecretSlotPreparer(ctx, resourceGroupName, name, functionName, keyName, slot) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "DeleteFunctionSecretSlot", nil, "Failure preparing request") - return - } - - resp, err := client.DeleteFunctionSecretSlotSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "web.AppsClient", "DeleteFunctionSecretSlot", resp, "Failure sending request") - return - } - - result, err = client.DeleteFunctionSecretSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "DeleteFunctionSecretSlot", resp, "Failure responding to request") - } - - return -} - -// DeleteFunctionSecretSlotPreparer prepares the DeleteFunctionSecretSlot request. -func (client AppsClient) DeleteFunctionSecretSlotPreparer(ctx context.Context, resourceGroupName string, name string, functionName string, keyName string, slot string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "functionName": autorest.Encode("path", functionName), - "keyName": autorest.Encode("path", keyName), - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "slot": autorest.Encode("path", slot), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsDelete(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/functions/{functionName}/keys/{keyName}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// DeleteFunctionSecretSlotSender sends the DeleteFunctionSecretSlot request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) DeleteFunctionSecretSlotSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// DeleteFunctionSecretSlotResponder handles the response to the DeleteFunctionSecretSlot request. The method always -// closes the http.Response Body. -func (client AppsClient) DeleteFunctionSecretSlotResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent, http.StatusNotFound), - autorest.ByClosing()) - result.Response = resp - return -} - -// DeleteHostNameBinding deletes a hostname binding for an app. +// DeleteHostNameBinding description for Deletes a hostname binding for an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -5240,7 +4898,7 @@ func (client AppsClient) DeleteHostNameBindingPreparer(ctx context.Context, reso "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -5272,7 +4930,7 @@ func (client AppsClient) DeleteHostNameBindingResponder(resp *http.Response) (re return } -// DeleteHostNameBindingSlot deletes a hostname binding for an app. +// DeleteHostNameBindingSlot description for Deletes a hostname binding for an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -5329,7 +4987,7 @@ func (client AppsClient) DeleteHostNameBindingSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -5361,185 +5019,7 @@ func (client AppsClient) DeleteHostNameBindingSlotResponder(resp *http.Response) return } -// DeleteHostSecret delete a host level secret. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - site name. -// keyType - the type of host key. -// keyName - the name of the key. -func (client AppsClient) DeleteHostSecret(ctx context.Context, resourceGroupName string, name string, keyType string, keyName string) (result autorest.Response, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.DeleteHostSecret") - defer func() { - sc := -1 - if result.Response != nil { - sc = result.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "DeleteHostSecret", err.Error()) - } - - req, err := client.DeleteHostSecretPreparer(ctx, resourceGroupName, name, keyType, keyName) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "DeleteHostSecret", nil, "Failure preparing request") - return - } - - resp, err := client.DeleteHostSecretSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "web.AppsClient", "DeleteHostSecret", resp, "Failure sending request") - return - } - - result, err = client.DeleteHostSecretResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "DeleteHostSecret", resp, "Failure responding to request") - } - - return -} - -// DeleteHostSecretPreparer prepares the DeleteHostSecret request. -func (client AppsClient) DeleteHostSecretPreparer(ctx context.Context, resourceGroupName string, name string, keyType string, keyName string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "keyName": autorest.Encode("path", keyName), - "keyType": autorest.Encode("path", keyType), - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsDelete(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/host/default/{keyType}/{keyName}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// DeleteHostSecretSender sends the DeleteHostSecret request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) DeleteHostSecretSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// DeleteHostSecretResponder handles the response to the DeleteHostSecret request. The method always -// closes the http.Response Body. -func (client AppsClient) DeleteHostSecretResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent, http.StatusNotFound), - autorest.ByClosing()) - result.Response = resp - return -} - -// DeleteHostSecretSlot delete a host level secret. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - site name. -// keyType - the type of host key. -// keyName - the name of the key. -// slot - name of the deployment slot. -func (client AppsClient) DeleteHostSecretSlot(ctx context.Context, resourceGroupName string, name string, keyType string, keyName string, slot string) (result autorest.Response, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.DeleteHostSecretSlot") - defer func() { - sc := -1 - if result.Response != nil { - sc = result.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "DeleteHostSecretSlot", err.Error()) - } - - req, err := client.DeleteHostSecretSlotPreparer(ctx, resourceGroupName, name, keyType, keyName, slot) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "DeleteHostSecretSlot", nil, "Failure preparing request") - return - } - - resp, err := client.DeleteHostSecretSlotSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "web.AppsClient", "DeleteHostSecretSlot", resp, "Failure sending request") - return - } - - result, err = client.DeleteHostSecretSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "DeleteHostSecretSlot", resp, "Failure responding to request") - } - - return -} - -// DeleteHostSecretSlotPreparer prepares the DeleteHostSecretSlot request. -func (client AppsClient) DeleteHostSecretSlotPreparer(ctx context.Context, resourceGroupName string, name string, keyType string, keyName string, slot string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "keyName": autorest.Encode("path", keyName), - "keyType": autorest.Encode("path", keyType), - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "slot": autorest.Encode("path", slot), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsDelete(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/host/default/{keyType}/{keyName}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// DeleteHostSecretSlotSender sends the DeleteHostSecretSlot request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) DeleteHostSecretSlotSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// DeleteHostSecretSlotResponder handles the response to the DeleteHostSecretSlot request. The method always -// closes the http.Response Body. -func (client AppsClient) DeleteHostSecretSlotResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent, http.StatusNotFound), - autorest.ByClosing()) - result.Response = resp - return -} - -// DeleteHybridConnection removes a Hybrid Connection from this site. +// DeleteHybridConnection description for Removes a Hybrid Connection from this site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -5595,7 +5075,7 @@ func (client AppsClient) DeleteHybridConnectionPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -5627,7 +5107,7 @@ func (client AppsClient) DeleteHybridConnectionResponder(resp *http.Response) (r return } -// DeleteHybridConnectionSlot removes a Hybrid Connection from this site. +// DeleteHybridConnectionSlot description for Removes a Hybrid Connection from this site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -5685,7 +5165,7 @@ func (client AppsClient) DeleteHybridConnectionSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -5717,7 +5197,7 @@ func (client AppsClient) DeleteHybridConnectionSlotResponder(resp *http.Response return } -// DeleteInstanceFunctionSlot delete a function for web site, or a deployment slot. +// DeleteInstanceFunctionSlot description for Delete a function for web site, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -5773,7 +5253,7 @@ func (client AppsClient) DeleteInstanceFunctionSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -5805,8 +5285,8 @@ func (client AppsClient) DeleteInstanceFunctionSlotResponder(resp *http.Response return } -// DeleteInstanceProcess terminate a process by its ID for a web site, or a deployment slot, or specific scaled-out -// instance in a web site. +// DeleteInstanceProcess description for Terminate a process by its ID for a web site, or a deployment slot, or +// specific scaled-out instance in a web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -5863,7 +5343,7 @@ func (client AppsClient) DeleteInstanceProcessPreparer(ctx context.Context, reso "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -5895,8 +5375,8 @@ func (client AppsClient) DeleteInstanceProcessResponder(resp *http.Response) (re return } -// DeleteInstanceProcessSlot terminate a process by its ID for a web site, or a deployment slot, or specific scaled-out -// instance in a web site. +// DeleteInstanceProcessSlot description for Terminate a process by its ID for a web site, or a deployment slot, or +// specific scaled-out instance in a web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -5956,7 +5436,7 @@ func (client AppsClient) DeleteInstanceProcessSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -5988,7 +5468,7 @@ func (client AppsClient) DeleteInstanceProcessSlotResponder(resp *http.Response) return } -// DeletePremierAddOn delete a premier add-on from an app. +// DeletePremierAddOn description for Delete a premier add-on from an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -6042,7 +5522,7 @@ func (client AppsClient) DeletePremierAddOnPreparer(ctx context.Context, resourc "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -6074,7 +5554,7 @@ func (client AppsClient) DeletePremierAddOnResponder(resp *http.Response) (resul return } -// DeletePremierAddOnSlot delete a premier add-on from an app. +// DeletePremierAddOnSlot description for Delete a premier add-on from an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -6131,7 +5611,7 @@ func (client AppsClient) DeletePremierAddOnSlotPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -6163,8 +5643,8 @@ func (client AppsClient) DeletePremierAddOnSlotResponder(resp *http.Response) (r return } -// DeleteProcess terminate a process by its ID for a web site, or a deployment slot, or specific scaled-out instance in -// a web site. +// DeleteProcess description for Terminate a process by its ID for a web site, or a deployment slot, or specific +// scaled-out instance in a web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -6218,7 +5698,7 @@ func (client AppsClient) DeleteProcessPreparer(ctx context.Context, resourceGrou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -6250,8 +5730,8 @@ func (client AppsClient) DeleteProcessResponder(resp *http.Response) (result aut return } -// DeleteProcessSlot terminate a process by its ID for a web site, or a deployment slot, or specific scaled-out -// instance in a web site. +// DeleteProcessSlot description for Terminate a process by its ID for a web site, or a deployment slot, or specific +// scaled-out instance in a web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -6308,7 +5788,7 @@ func (client AppsClient) DeleteProcessSlotPreparer(ctx context.Context, resource "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -6340,7 +5820,7 @@ func (client AppsClient) DeleteProcessSlotResponder(resp *http.Response) (result return } -// DeletePublicCertificate deletes a hostname binding for an app. +// DeletePublicCertificate description for Deletes a hostname binding for an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -6394,7 +5874,7 @@ func (client AppsClient) DeletePublicCertificatePreparer(ctx context.Context, re "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -6426,7 +5906,7 @@ func (client AppsClient) DeletePublicCertificateResponder(resp *http.Response) ( return } -// DeletePublicCertificateSlot deletes a hostname binding for an app. +// DeletePublicCertificateSlot description for Deletes a hostname binding for an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -6483,7 +5963,7 @@ func (client AppsClient) DeletePublicCertificateSlotPreparer(ctx context.Context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -6515,7 +5995,7 @@ func (client AppsClient) DeletePublicCertificateSlotResponder(resp *http.Respons return } -// DeleteRelayServiceConnection deletes a relay service connection by its name. +// DeleteRelayServiceConnection description for Deletes a relay service connection by its name. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -6569,7 +6049,7 @@ func (client AppsClient) DeleteRelayServiceConnectionPreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -6601,7 +6081,7 @@ func (client AppsClient) DeleteRelayServiceConnectionResponder(resp *http.Respon return } -// DeleteRelayServiceConnectionSlot deletes a relay service connection by its name. +// DeleteRelayServiceConnectionSlot description for Deletes a relay service connection by its name. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -6658,7 +6138,7 @@ func (client AppsClient) DeleteRelayServiceConnectionSlotPreparer(ctx context.Co "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -6690,7 +6170,7 @@ func (client AppsClient) DeleteRelayServiceConnectionSlotResponder(resp *http.Re return } -// DeleteSiteExtension remove a site extension from a web site, or a deployment slot. +// DeleteSiteExtension description for Remove a site extension from a web site, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -6744,7 +6224,7 @@ func (client AppsClient) DeleteSiteExtensionPreparer(ctx context.Context, resour "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -6776,7 +6256,7 @@ func (client AppsClient) DeleteSiteExtensionResponder(resp *http.Response) (resu return } -// DeleteSiteExtensionSlot remove a site extension from a web site, or a deployment slot. +// DeleteSiteExtensionSlot description for Remove a site extension from a web site, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -6833,7 +6313,7 @@ func (client AppsClient) DeleteSiteExtensionSlotPreparer(ctx context.Context, re "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -6865,7 +6345,7 @@ func (client AppsClient) DeleteSiteExtensionSlotResponder(resp *http.Response) ( return } -// DeleteSlot deletes a web, mobile, or API app, or one of the deployment slots. +// DeleteSlot description for Deletes a web, mobile, or API app, or one of the deployment slots. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app to delete. @@ -6922,7 +6402,7 @@ func (client AppsClient) DeleteSlotPreparer(ctx context.Context, resourceGroupNa "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -6960,7 +6440,7 @@ func (client AppsClient) DeleteSlotResponder(resp *http.Response) (result autore return } -// DeleteSourceControl deletes the source control configuration of an app. +// DeleteSourceControl description for Deletes the source control configuration of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -7012,7 +6492,7 @@ func (client AppsClient) DeleteSourceControlPreparer(ctx context.Context, resour "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -7044,7 +6524,7 @@ func (client AppsClient) DeleteSourceControlResponder(resp *http.Response) (resu return } -// DeleteSourceControlSlot deletes the source control configuration of an app. +// DeleteSourceControlSlot description for Deletes the source control configuration of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -7099,7 +6579,7 @@ func (client AppsClient) DeleteSourceControlSlotPreparer(ctx context.Context, re "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -7131,7 +6611,8 @@ func (client AppsClient) DeleteSourceControlSlotResponder(resp *http.Response) ( return } -// DeleteSwiftVirtualNetwork deletes a Swift Virtual Network connection from an app (or deployment slot). +// DeleteSwiftVirtualNetwork description for Deletes a Swift Virtual Network connection from an app (or deployment +// slot). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -7183,7 +6664,7 @@ func (client AppsClient) DeleteSwiftVirtualNetworkPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -7215,7 +6696,8 @@ func (client AppsClient) DeleteSwiftVirtualNetworkResponder(resp *http.Response) return } -// DeleteSwiftVirtualNetworkSlot deletes a Swift Virtual Network connection from an app (or deployment slot). +// DeleteSwiftVirtualNetworkSlot description for Deletes a Swift Virtual Network connection from an app (or deployment +// slot). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -7270,7 +6752,7 @@ func (client AppsClient) DeleteSwiftVirtualNetworkSlotPreparer(ctx context.Conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -7302,7 +6784,7 @@ func (client AppsClient) DeleteSwiftVirtualNetworkSlotResponder(resp *http.Respo return } -// DeleteTriggeredWebJob delete a triggered web job by its ID for an app, or a deployment slot. +// DeleteTriggeredWebJob description for Delete a triggered web job by its ID for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -7356,7 +6838,7 @@ func (client AppsClient) DeleteTriggeredWebJobPreparer(ctx context.Context, reso "webJobName": autorest.Encode("path", webJobName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -7388,13 +6870,13 @@ func (client AppsClient) DeleteTriggeredWebJobResponder(resp *http.Response) (re return } -// DeleteTriggeredWebJobSlot delete a triggered web job by its ID for an app, or a deployment slot. +// DeleteTriggeredWebJobSlot description for Delete a triggered web job by its ID for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. // webJobName - name of Web Job. -// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the -// production slot. +// slot - name of the deployment slot. If a slot is not specified, the API deletes web job for the production +// slot. func (client AppsClient) DeleteTriggeredWebJobSlot(ctx context.Context, resourceGroupName string, name string, webJobName string, slot string) (result autorest.Response, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.DeleteTriggeredWebJobSlot") @@ -7445,7 +6927,7 @@ func (client AppsClient) DeleteTriggeredWebJobSlotPreparer(ctx context.Context, "webJobName": autorest.Encode("path", webJobName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -7477,7 +6959,8 @@ func (client AppsClient) DeleteTriggeredWebJobSlotResponder(resp *http.Response) return } -// DeleteVnetConnection deletes a connection from an app (or deployment slot to a named virtual network. +// DeleteVnetConnection description for Deletes a connection from an app (or deployment slot to a named virtual +// network. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -7531,7 +7014,7 @@ func (client AppsClient) DeleteVnetConnectionPreparer(ctx context.Context, resou "vnetName": autorest.Encode("path", vnetName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -7563,7 +7046,8 @@ func (client AppsClient) DeleteVnetConnectionResponder(resp *http.Response) (res return } -// DeleteVnetConnectionSlot deletes a connection from an app (or deployment slot to a named virtual network. +// DeleteVnetConnectionSlot description for Deletes a connection from an app (or deployment slot to a named virtual +// network. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -7620,7 +7104,7 @@ func (client AppsClient) DeleteVnetConnectionSlotPreparer(ctx context.Context, r "vnetName": autorest.Encode("path", vnetName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -7652,8 +7136,8 @@ func (client AppsClient) DeleteVnetConnectionSlotResponder(resp *http.Response) return } -// DiscoverBackup discovers an existing app backup that can be restored from a blob in Azure storage. Use this to get -// information about the databases stored in a backup. +// DiscoverBackup description for Discovers an existing app backup that can be restored from a blob in Azure storage. +// Use this to get information about the databases stored in a backup. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -7711,7 +7195,7 @@ func (client AppsClient) DiscoverBackupPreparer(ctx context.Context, resourceGro "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -7746,8 +7230,8 @@ func (client AppsClient) DiscoverBackupResponder(resp *http.Response) (result Re return } -// DiscoverBackupSlot discovers an existing app backup that can be restored from a blob in Azure storage. Use this to -// get information about the databases stored in a backup. +// DiscoverBackupSlot description for Discovers an existing app backup that can be restored from a blob in Azure +// storage. Use this to get information about the databases stored in a backup. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -7808,7 +7292,7 @@ func (client AppsClient) DiscoverBackupSlotPreparer(ctx context.Context, resourc "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -7843,7 +7327,8 @@ func (client AppsClient) DiscoverBackupSlotResponder(resp *http.Response) (resul return } -// GenerateNewSitePublishingPassword generates a new publishing password for an app (or deployment slot, if specified). +// GenerateNewSitePublishingPassword description for Generates a new publishing password for an app (or deployment +// slot, if specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -7895,7 +7380,7 @@ func (client AppsClient) GenerateNewSitePublishingPasswordPreparer(ctx context.C "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -7927,8 +7412,8 @@ func (client AppsClient) GenerateNewSitePublishingPasswordResponder(resp *http.R return } -// GenerateNewSitePublishingPasswordSlot generates a new publishing password for an app (or deployment slot, if -// specified). +// GenerateNewSitePublishingPasswordSlot description for Generates a new publishing password for an app (or deployment +// slot, if specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -7983,7 +7468,7 @@ func (client AppsClient) GenerateNewSitePublishingPasswordSlotPreparer(ctx conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -8015,7 +7500,7 @@ func (client AppsClient) GenerateNewSitePublishingPasswordSlotResponder(resp *ht return } -// Get gets the details of a web, mobile, or API app. +// Get description for Gets the details of a web, mobile, or API app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -8067,7 +7552,7 @@ func (client AppsClient) GetPreparer(ctx context.Context, resourceGroupName stri "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -8100,7 +7585,179 @@ func (client AppsClient) GetResponder(resp *http.Response) (result Site, err err return } -// GetAuthSettings gets the Authentication/Authorization settings of an app. +// GetAppSettingKeyVaultReference description for Gets the config reference and status of an app +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// appSettingKey - app Setting key name. +func (client AppsClient) GetAppSettingKeyVaultReference(ctx context.Context, resourceGroupName string, name string, appSettingKey string) (result KeyVaultReferenceResource, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.GetAppSettingKeyVaultReference") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("web.AppsClient", "GetAppSettingKeyVaultReference", err.Error()) + } + + req, err := client.GetAppSettingKeyVaultReferencePreparer(ctx, resourceGroupName, name, appSettingKey) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppsClient", "GetAppSettingKeyVaultReference", nil, "Failure preparing request") + return + } + + resp, err := client.GetAppSettingKeyVaultReferenceSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "web.AppsClient", "GetAppSettingKeyVaultReference", resp, "Failure sending request") + return + } + + result, err = client.GetAppSettingKeyVaultReferenceResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppsClient", "GetAppSettingKeyVaultReference", resp, "Failure responding to request") + } + + return +} + +// GetAppSettingKeyVaultReferencePreparer prepares the GetAppSettingKeyVaultReference request. +func (client AppsClient) GetAppSettingKeyVaultReferencePreparer(ctx context.Context, resourceGroupName string, name string, appSettingKey string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "appSettingKey": autorest.Encode("path", appSettingKey), + "name": autorest.Encode("path", name), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-08-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/configreferences/appsettings/{appSettingKey}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetAppSettingKeyVaultReferenceSender sends the GetAppSettingKeyVaultReference request. The method will close the +// http.Response Body if it receives an error. +func (client AppsClient) GetAppSettingKeyVaultReferenceSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// GetAppSettingKeyVaultReferenceResponder handles the response to the GetAppSettingKeyVaultReference request. The method always +// closes the http.Response Body. +func (client AppsClient) GetAppSettingKeyVaultReferenceResponder(resp *http.Response) (result KeyVaultReferenceResource, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// GetAppSettingsKeyVaultReferences description for Gets the config reference app settings and status of an app +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +func (client AppsClient) GetAppSettingsKeyVaultReferences(ctx context.Context, resourceGroupName string, name string) (result KeyVaultReferenceCollection, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.GetAppSettingsKeyVaultReferences") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("web.AppsClient", "GetAppSettingsKeyVaultReferences", err.Error()) + } + + req, err := client.GetAppSettingsKeyVaultReferencesPreparer(ctx, resourceGroupName, name) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppsClient", "GetAppSettingsKeyVaultReferences", nil, "Failure preparing request") + return + } + + resp, err := client.GetAppSettingsKeyVaultReferencesSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "web.AppsClient", "GetAppSettingsKeyVaultReferences", resp, "Failure sending request") + return + } + + result, err = client.GetAppSettingsKeyVaultReferencesResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppsClient", "GetAppSettingsKeyVaultReferences", resp, "Failure responding to request") + } + + return +} + +// GetAppSettingsKeyVaultReferencesPreparer prepares the GetAppSettingsKeyVaultReferences request. +func (client AppsClient) GetAppSettingsKeyVaultReferencesPreparer(ctx context.Context, resourceGroupName string, name string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "name": autorest.Encode("path", name), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-08-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/configreferences/appsettings", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetAppSettingsKeyVaultReferencesSender sends the GetAppSettingsKeyVaultReferences request. The method will close the +// http.Response Body if it receives an error. +func (client AppsClient) GetAppSettingsKeyVaultReferencesSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// GetAppSettingsKeyVaultReferencesResponder handles the response to the GetAppSettingsKeyVaultReferences request. The method always +// closes the http.Response Body. +func (client AppsClient) GetAppSettingsKeyVaultReferencesResponder(resp *http.Response) (result KeyVaultReferenceCollection, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// GetAuthSettings description for Gets the Authentication/Authorization settings of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -8152,7 +7809,7 @@ func (client AppsClient) GetAuthSettingsPreparer(ctx context.Context, resourceGr "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -8185,7 +7842,7 @@ func (client AppsClient) GetAuthSettingsResponder(resp *http.Response) (result S return } -// GetAuthSettingsSlot gets the Authentication/Authorization settings of an app. +// GetAuthSettingsSlot description for Gets the Authentication/Authorization settings of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -8240,7 +7897,7 @@ func (client AppsClient) GetAuthSettingsSlotPreparer(ctx context.Context, resour "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -8273,7 +7930,7 @@ func (client AppsClient) GetAuthSettingsSlotResponder(resp *http.Response) (resu return } -// GetBackupConfiguration gets the backup configuration of an app. +// GetBackupConfiguration description for Gets the backup configuration of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -8325,7 +7982,7 @@ func (client AppsClient) GetBackupConfigurationPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -8358,7 +8015,7 @@ func (client AppsClient) GetBackupConfigurationResponder(resp *http.Response) (r return } -// GetBackupConfigurationSlot gets the backup configuration of an app. +// GetBackupConfigurationSlot description for Gets the backup configuration of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -8413,7 +8070,7 @@ func (client AppsClient) GetBackupConfigurationSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -8446,7 +8103,7 @@ func (client AppsClient) GetBackupConfigurationSlotResponder(resp *http.Response return } -// GetBackupStatus gets a backup of an app by its ID. +// GetBackupStatus description for Gets a backup of an app by its ID. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -8500,7 +8157,7 @@ func (client AppsClient) GetBackupStatusPreparer(ctx context.Context, resourceGr "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -8533,7 +8190,7 @@ func (client AppsClient) GetBackupStatusResponder(resp *http.Response) (result B return } -// GetBackupStatusSlot gets a backup of an app by its ID. +// GetBackupStatusSlot description for Gets a backup of an app by its ID. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -8590,7 +8247,7 @@ func (client AppsClient) GetBackupStatusSlotPreparer(ctx context.Context, resour "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -8623,8 +8280,8 @@ func (client AppsClient) GetBackupStatusSlotResponder(resp *http.Response) (resu return } -// GetConfiguration gets the configuration of an app, such as platform version and bitness, default documents, virtual -// applications, Always On, etc. +// GetConfiguration description for Gets the configuration of an app, such as platform version and bitness, default +// documents, virtual applications, Always On, etc. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -8676,7 +8333,7 @@ func (client AppsClient) GetConfigurationPreparer(ctx context.Context, resourceG "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -8709,8 +8366,8 @@ func (client AppsClient) GetConfigurationResponder(resp *http.Response) (result return } -// GetConfigurationSlot gets the configuration of an app, such as platform version and bitness, default documents, -// virtual applications, Always On, etc. +// GetConfigurationSlot description for Gets the configuration of an app, such as platform version and bitness, default +// documents, virtual applications, Always On, etc. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -8765,7 +8422,7 @@ func (client AppsClient) GetConfigurationSlotPreparer(ctx context.Context, resou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -8798,7 +8455,7 @@ func (client AppsClient) GetConfigurationSlotResponder(resp *http.Response) (res return } -// GetConfigurationSnapshot gets a snapshot of the configuration of an app at a previous point in time. +// GetConfigurationSnapshot description for Gets a snapshot of the configuration of an app at a previous point in time. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -8852,7 +8509,7 @@ func (client AppsClient) GetConfigurationSnapshotPreparer(ctx context.Context, r "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -8885,7 +8542,8 @@ func (client AppsClient) GetConfigurationSnapshotResponder(resp *http.Response) return } -// GetConfigurationSnapshotSlot gets a snapshot of the configuration of an app at a previous point in time. +// GetConfigurationSnapshotSlot description for Gets a snapshot of the configuration of an app at a previous point in +// time. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -8942,7 +8600,7 @@ func (client AppsClient) GetConfigurationSnapshotSlotPreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -8975,7 +8633,7 @@ func (client AppsClient) GetConfigurationSnapshotSlotResponder(resp *http.Respon return } -// GetContainerLogsZip gets the ZIP archived docker log files for the given site +// GetContainerLogsZip description for Gets the ZIP archived docker log files for the given site // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -9027,7 +8685,7 @@ func (client AppsClient) GetContainerLogsZipPreparer(ctx context.Context, resour "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -9059,7 +8717,7 @@ func (client AppsClient) GetContainerLogsZipResponder(resp *http.Response) (resu return } -// GetContainerLogsZipSlot gets the ZIP archived docker log files for the given site +// GetContainerLogsZipSlot description for Gets the ZIP archived docker log files for the given site // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -9113,7 +8771,7 @@ func (client AppsClient) GetContainerLogsZipSlotPreparer(ctx context.Context, re "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -9145,7 +8803,7 @@ func (client AppsClient) GetContainerLogsZipSlotResponder(resp *http.Response) ( return } -// GetContinuousWebJob gets a continuous web job by its ID for an app, or a deployment slot. +// GetContinuousWebJob description for Gets a continuous web job by its ID for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -9199,7 +8857,7 @@ func (client AppsClient) GetContinuousWebJobPreparer(ctx context.Context, resour "webJobName": autorest.Encode("path", webJobName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -9232,7 +8890,7 @@ func (client AppsClient) GetContinuousWebJobResponder(resp *http.Response) (resu return } -// GetContinuousWebJobSlot gets a continuous web job by its ID for an app, or a deployment slot. +// GetContinuousWebJobSlot description for Gets a continuous web job by its ID for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -9289,7 +8947,7 @@ func (client AppsClient) GetContinuousWebJobSlotPreparer(ctx context.Context, re "webJobName": autorest.Encode("path", webJobName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -9322,7 +8980,7 @@ func (client AppsClient) GetContinuousWebJobSlotResponder(resp *http.Response) ( return } -// GetDeployment get a deployment by its ID for an app, or a deployment slot. +// GetDeployment description for Get a deployment by its ID for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -9376,7 +9034,7 @@ func (client AppsClient) GetDeploymentPreparer(ctx context.Context, resourceGrou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -9409,7 +9067,7 @@ func (client AppsClient) GetDeploymentResponder(resp *http.Response) (result Dep return } -// GetDeploymentSlot get a deployment by its ID for an app, or a deployment slot. +// GetDeploymentSlot description for Get a deployment by its ID for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -9466,7 +9124,7 @@ func (client AppsClient) GetDeploymentSlotPreparer(ctx context.Context, resource "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -9499,7 +9157,7 @@ func (client AppsClient) GetDeploymentSlotResponder(resp *http.Response) (result return } -// GetDiagnosticLogsConfiguration gets the logging configuration of an app. +// GetDiagnosticLogsConfiguration description for Gets the logging configuration of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -9551,7 +9209,7 @@ func (client AppsClient) GetDiagnosticLogsConfigurationPreparer(ctx context.Cont "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -9584,7 +9242,7 @@ func (client AppsClient) GetDiagnosticLogsConfigurationResponder(resp *http.Resp return } -// GetDiagnosticLogsConfigurationSlot gets the logging configuration of an app. +// GetDiagnosticLogsConfigurationSlot description for Gets the logging configuration of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -9639,7 +9297,7 @@ func (client AppsClient) GetDiagnosticLogsConfigurationSlotPreparer(ctx context. "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -9672,7 +9330,7 @@ func (client AppsClient) GetDiagnosticLogsConfigurationSlotResponder(resp *http. return } -// GetDomainOwnershipIdentifier get domain ownership identifier for web app. +// GetDomainOwnershipIdentifier description for Get domain ownership identifier for web app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -9726,7 +9384,7 @@ func (client AppsClient) GetDomainOwnershipIdentifierPreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -9759,7 +9417,7 @@ func (client AppsClient) GetDomainOwnershipIdentifierResponder(resp *http.Respon return } -// GetDomainOwnershipIdentifierSlot get domain ownership identifier for web app. +// GetDomainOwnershipIdentifierSlot description for Get domain ownership identifier for web app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -9816,7 +9474,7 @@ func (client AppsClient) GetDomainOwnershipIdentifierSlotPreparer(ctx context.Co "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -9849,7 +9507,7 @@ func (client AppsClient) GetDomainOwnershipIdentifierSlotResponder(resp *http.Re return } -// GetFunction get function information by its ID for web site, or a deployment slot. +// GetFunction description for Get function information by its ID for web site, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -9903,7 +9561,7 @@ func (client AppsClient) GetFunctionPreparer(ctx context.Context, resourceGroupN "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -9936,7 +9594,7 @@ func (client AppsClient) GetFunctionResponder(resp *http.Response) (result Funct return } -// GetFunctionsAdminToken fetch a short lived token that can be exchanged for a master key. +// GetFunctionsAdminToken description for Fetch a short lived token that can be exchanged for a master key. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -9988,7 +9646,7 @@ func (client AppsClient) GetFunctionsAdminTokenPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -10021,7 +9679,7 @@ func (client AppsClient) GetFunctionsAdminTokenResponder(resp *http.Response) (r return } -// GetFunctionsAdminTokenSlot fetch a short lived token that can be exchanged for a master key. +// GetFunctionsAdminTokenSlot description for Fetch a short lived token that can be exchanged for a master key. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -10075,7 +9733,7 @@ func (client AppsClient) GetFunctionsAdminTokenSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -10108,7 +9766,7 @@ func (client AppsClient) GetFunctionsAdminTokenSlotResponder(resp *http.Response return } -// GetHostNameBinding get the named hostname binding for an app (or deployment slot, if specified). +// GetHostNameBinding description for Get the named hostname binding for an app (or deployment slot, if specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -10162,7 +9820,7 @@ func (client AppsClient) GetHostNameBindingPreparer(ctx context.Context, resourc "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -10195,7 +9853,7 @@ func (client AppsClient) GetHostNameBindingResponder(resp *http.Response) (resul return } -// GetHostNameBindingSlot get the named hostname binding for an app (or deployment slot, if specified). +// GetHostNameBindingSlot description for Get the named hostname binding for an app (or deployment slot, if specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -10252,7 +9910,7 @@ func (client AppsClient) GetHostNameBindingSlotPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -10285,7 +9943,7 @@ func (client AppsClient) GetHostNameBindingSlotResponder(resp *http.Response) (r return } -// GetHybridConnection retrieves a specific Service Bus Hybrid Connection used by this Web App. +// GetHybridConnection description for Retrieves a specific Service Bus Hybrid Connection used by this Web App. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -10341,7 +9999,7 @@ func (client AppsClient) GetHybridConnectionPreparer(ctx context.Context, resour "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -10374,7 +10032,7 @@ func (client AppsClient) GetHybridConnectionResponder(resp *http.Response) (resu return } -// GetHybridConnectionSlot retrieves a specific Service Bus Hybrid Connection used by this Web App. +// GetHybridConnectionSlot description for Retrieves a specific Service Bus Hybrid Connection used by this Web App. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -10432,7 +10090,7 @@ func (client AppsClient) GetHybridConnectionSlotPreparer(ctx context.Context, re "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -10465,7 +10123,7 @@ func (client AppsClient) GetHybridConnectionSlotResponder(resp *http.Response) ( return } -// GetInstanceFunctionSlot get function information by its ID for web site, or a deployment slot. +// GetInstanceFunctionSlot description for Get function information by its ID for web site, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -10521,7 +10179,7 @@ func (client AppsClient) GetInstanceFunctionSlotPreparer(ctx context.Context, re "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -10554,7 +10212,181 @@ func (client AppsClient) GetInstanceFunctionSlotResponder(resp *http.Response) ( return } -// GetInstanceMSDeployLog get the MSDeploy Log for the last MSDeploy operation. +// GetInstanceInfo description for Gets all scale-out instances of an app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +func (client AppsClient) GetInstanceInfo(ctx context.Context, resourceGroupName string, name string, instanceID string) (result SiteInstanceStatus, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.GetInstanceInfo") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("web.AppsClient", "GetInstanceInfo", err.Error()) + } + + req, err := client.GetInstanceInfoPreparer(ctx, resourceGroupName, name, instanceID) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppsClient", "GetInstanceInfo", nil, "Failure preparing request") + return + } + + resp, err := client.GetInstanceInfoSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "web.AppsClient", "GetInstanceInfo", resp, "Failure sending request") + return + } + + result, err = client.GetInstanceInfoResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppsClient", "GetInstanceInfo", resp, "Failure responding to request") + } + + return +} + +// GetInstanceInfoPreparer prepares the GetInstanceInfo request. +func (client AppsClient) GetInstanceInfoPreparer(ctx context.Context, resourceGroupName string, name string, instanceID string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "instanceId": autorest.Encode("path", instanceID), + "name": autorest.Encode("path", name), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-08-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/instances/{instanceId}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetInstanceInfoSender sends the GetInstanceInfo request. The method will close the +// http.Response Body if it receives an error. +func (client AppsClient) GetInstanceInfoSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// GetInstanceInfoResponder handles the response to the GetInstanceInfo request. The method always +// closes the http.Response Body. +func (client AppsClient) GetInstanceInfoResponder(resp *http.Response) (result SiteInstanceStatus, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// GetInstanceInfoSlot description for Gets all scale-out instances of an app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API gets the production slot instances. +func (client AppsClient) GetInstanceInfoSlot(ctx context.Context, resourceGroupName string, name string, instanceID string, slot string) (result SiteInstanceStatus, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.GetInstanceInfoSlot") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("web.AppsClient", "GetInstanceInfoSlot", err.Error()) + } + + req, err := client.GetInstanceInfoSlotPreparer(ctx, resourceGroupName, name, instanceID, slot) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppsClient", "GetInstanceInfoSlot", nil, "Failure preparing request") + return + } + + resp, err := client.GetInstanceInfoSlotSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "web.AppsClient", "GetInstanceInfoSlot", resp, "Failure sending request") + return + } + + result, err = client.GetInstanceInfoSlotResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppsClient", "GetInstanceInfoSlot", resp, "Failure responding to request") + } + + return +} + +// GetInstanceInfoSlotPreparer prepares the GetInstanceInfoSlot request. +func (client AppsClient) GetInstanceInfoSlotPreparer(ctx context.Context, resourceGroupName string, name string, instanceID string, slot string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "instanceId": autorest.Encode("path", instanceID), + "name": autorest.Encode("path", name), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "slot": autorest.Encode("path", slot), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-08-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetInstanceInfoSlotSender sends the GetInstanceInfoSlot request. The method will close the +// http.Response Body if it receives an error. +func (client AppsClient) GetInstanceInfoSlotSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// GetInstanceInfoSlotResponder handles the response to the GetInstanceInfoSlot request. The method always +// closes the http.Response Body. +func (client AppsClient) GetInstanceInfoSlotResponder(resp *http.Response) (result SiteInstanceStatus, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// GetInstanceMSDeployLog description for Get the MSDeploy Log for the last MSDeploy operation. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -10608,7 +10440,7 @@ func (client AppsClient) GetInstanceMSDeployLogPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -10641,7 +10473,7 @@ func (client AppsClient) GetInstanceMSDeployLogResponder(resp *http.Response) (r return } -// GetInstanceMSDeployLogSlot get the MSDeploy Log for the last MSDeploy operation. +// GetInstanceMSDeployLogSlot description for Get the MSDeploy Log for the last MSDeploy operation. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -10697,7 +10529,7 @@ func (client AppsClient) GetInstanceMSDeployLogSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -10730,7 +10562,7 @@ func (client AppsClient) GetInstanceMSDeployLogSlotResponder(resp *http.Response return } -// GetInstanceMsDeployStatus get the status of the last MSDeploy operation. +// GetInstanceMsDeployStatus description for Get the status of the last MSDeploy operation. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -10784,7 +10616,7 @@ func (client AppsClient) GetInstanceMsDeployStatusPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -10817,7 +10649,7 @@ func (client AppsClient) GetInstanceMsDeployStatusResponder(resp *http.Response) return } -// GetInstanceMsDeployStatusSlot get the status of the last MSDeploy operation. +// GetInstanceMsDeployStatusSlot description for Get the status of the last MSDeploy operation. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -10873,7 +10705,7 @@ func (client AppsClient) GetInstanceMsDeployStatusSlotPreparer(ctx context.Conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -10906,7 +10738,8 @@ func (client AppsClient) GetInstanceMsDeployStatusSlotResponder(resp *http.Respo return } -// GetInstanceProcess get process information by its ID for a specific scaled-out instance in a web site. +// GetInstanceProcess description for Get process information by its ID for a specific scaled-out instance in a web +// site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -10963,7 +10796,7 @@ func (client AppsClient) GetInstanceProcessPreparer(ctx context.Context, resourc "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -10996,7 +10829,8 @@ func (client AppsClient) GetInstanceProcessResponder(resp *http.Response) (resul return } -// GetInstanceProcessDump get a memory dump of a process by its ID for a specific scaled-out instance in a web site. +// GetInstanceProcessDump description for Get a memory dump of a process by its ID for a specific scaled-out instance +// in a web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -11053,7 +10887,7 @@ func (client AppsClient) GetInstanceProcessDumpPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -11085,8 +10919,8 @@ func (client AppsClient) GetInstanceProcessDumpResponder(resp *http.Response) (r return } -// GetInstanceProcessDumpSlot get a memory dump of a process by its ID for a specific scaled-out instance in a web -// site. +// GetInstanceProcessDumpSlot description for Get a memory dump of a process by its ID for a specific scaled-out +// instance in a web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -11146,7 +10980,7 @@ func (client AppsClient) GetInstanceProcessDumpSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -11178,7 +11012,8 @@ func (client AppsClient) GetInstanceProcessDumpSlotResponder(resp *http.Response return } -// GetInstanceProcessModule get process information by its ID for a specific scaled-out instance in a web site. +// GetInstanceProcessModule description for Get process information by its ID for a specific scaled-out instance in a +// web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -11237,7 +11072,7 @@ func (client AppsClient) GetInstanceProcessModulePreparer(ctx context.Context, r "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -11270,7 +11105,8 @@ func (client AppsClient) GetInstanceProcessModuleResponder(resp *http.Response) return } -// GetInstanceProcessModuleSlot get process information by its ID for a specific scaled-out instance in a web site. +// GetInstanceProcessModuleSlot description for Get process information by its ID for a specific scaled-out instance in +// a web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -11332,7 +11168,7 @@ func (client AppsClient) GetInstanceProcessModuleSlotPreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -11365,7 +11201,8 @@ func (client AppsClient) GetInstanceProcessModuleSlotResponder(resp *http.Respon return } -// GetInstanceProcessSlot get process information by its ID for a specific scaled-out instance in a web site. +// GetInstanceProcessSlot description for Get process information by its ID for a specific scaled-out instance in a web +// site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -11425,7 +11262,7 @@ func (client AppsClient) GetInstanceProcessSlotPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -11458,197 +11295,8 @@ func (client AppsClient) GetInstanceProcessSlotResponder(resp *http.Response) (r return } -// GetInstanceProcessThread get thread information by Thread ID for a specific process, in a specific scaled-out -// instance in a web site. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - site name. -// processID - pID. -// threadID - tID. -// instanceID - ID of a specific scaled-out instance. This is the value of the name property in the JSON -// response from "GET api/sites/{siteName}/instances". -func (client AppsClient) GetInstanceProcessThread(ctx context.Context, resourceGroupName string, name string, processID string, threadID string, instanceID string) (result ProcessThreadInfo, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.GetInstanceProcessThread") - defer func() { - sc := -1 - if result.Response.Response != nil { - sc = result.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "GetInstanceProcessThread", err.Error()) - } - - req, err := client.GetInstanceProcessThreadPreparer(ctx, resourceGroupName, name, processID, threadID, instanceID) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "GetInstanceProcessThread", nil, "Failure preparing request") - return - } - - resp, err := client.GetInstanceProcessThreadSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppsClient", "GetInstanceProcessThread", resp, "Failure sending request") - return - } - - result, err = client.GetInstanceProcessThreadResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "GetInstanceProcessThread", resp, "Failure responding to request") - } - - return -} - -// GetInstanceProcessThreadPreparer prepares the GetInstanceProcessThread request. -func (client AppsClient) GetInstanceProcessThreadPreparer(ctx context.Context, resourceGroupName string, name string, processID string, threadID string, instanceID string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "instanceId": autorest.Encode("path", instanceID), - "name": autorest.Encode("path", name), - "processId": autorest.Encode("path", processID), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - "threadId": autorest.Encode("path", threadID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/instances/{instanceId}/processes/{processId}/threads/{threadId}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// GetInstanceProcessThreadSender sends the GetInstanceProcessThread request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) GetInstanceProcessThreadSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// GetInstanceProcessThreadResponder handles the response to the GetInstanceProcessThread request. The method always -// closes the http.Response Body. -func (client AppsClient) GetInstanceProcessThreadResponder(resp *http.Response) (result ProcessThreadInfo, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNotFound), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// GetInstanceProcessThreadSlot get thread information by Thread ID for a specific process, in a specific scaled-out -// instance in a web site. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - site name. -// processID - pID. -// threadID - tID. -// slot - name of the deployment slot. If a slot is not specified, the API returns deployments for the -// production slot. -// instanceID - ID of a specific scaled-out instance. This is the value of the name property in the JSON -// response from "GET api/sites/{siteName}/instances". -func (client AppsClient) GetInstanceProcessThreadSlot(ctx context.Context, resourceGroupName string, name string, processID string, threadID string, slot string, instanceID string) (result ProcessThreadInfo, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.GetInstanceProcessThreadSlot") - defer func() { - sc := -1 - if result.Response.Response != nil { - sc = result.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "GetInstanceProcessThreadSlot", err.Error()) - } - - req, err := client.GetInstanceProcessThreadSlotPreparer(ctx, resourceGroupName, name, processID, threadID, slot, instanceID) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "GetInstanceProcessThreadSlot", nil, "Failure preparing request") - return - } - - resp, err := client.GetInstanceProcessThreadSlotSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppsClient", "GetInstanceProcessThreadSlot", resp, "Failure sending request") - return - } - - result, err = client.GetInstanceProcessThreadSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "GetInstanceProcessThreadSlot", resp, "Failure responding to request") - } - - return -} - -// GetInstanceProcessThreadSlotPreparer prepares the GetInstanceProcessThreadSlot request. -func (client AppsClient) GetInstanceProcessThreadSlotPreparer(ctx context.Context, resourceGroupName string, name string, processID string, threadID string, slot string, instanceID string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "instanceId": autorest.Encode("path", instanceID), - "name": autorest.Encode("path", name), - "processId": autorest.Encode("path", processID), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "slot": autorest.Encode("path", slot), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - "threadId": autorest.Encode("path", threadID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/processes/{processId}/threads/{threadId}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// GetInstanceProcessThreadSlotSender sends the GetInstanceProcessThreadSlot request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) GetInstanceProcessThreadSlotSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// GetInstanceProcessThreadSlotResponder handles the response to the GetInstanceProcessThreadSlot request. The method always -// closes the http.Response Body. -func (client AppsClient) GetInstanceProcessThreadSlotResponder(resp *http.Response) (result ProcessThreadInfo, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNotFound), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// GetMigrateMySQLStatus returns the status of MySql in app migration, if one is active, and whether or not MySql in -// app is enabled +// GetMigrateMySQLStatus description for Returns the status of MySql in app migration, if one is active, and whether or +// not MySql in app is enabled // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -11700,7 +11348,7 @@ func (client AppsClient) GetMigrateMySQLStatusPreparer(ctx context.Context, reso "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -11733,8 +11381,8 @@ func (client AppsClient) GetMigrateMySQLStatusResponder(resp *http.Response) (re return } -// GetMigrateMySQLStatusSlot returns the status of MySql in app migration, if one is active, and whether or not MySql -// in app is enabled +// GetMigrateMySQLStatusSlot description for Returns the status of MySql in app migration, if one is active, and +// whether or not MySql in app is enabled // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -11788,7 +11436,7 @@ func (client AppsClient) GetMigrateMySQLStatusSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -11821,7 +11469,7 @@ func (client AppsClient) GetMigrateMySQLStatusSlotResponder(resp *http.Response) return } -// GetMSDeployLog get the MSDeploy Log for the last MSDeploy operation. +// GetMSDeployLog description for Get the MSDeploy Log for the last MSDeploy operation. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -11873,7 +11521,7 @@ func (client AppsClient) GetMSDeployLogPreparer(ctx context.Context, resourceGro "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -11906,7 +11554,7 @@ func (client AppsClient) GetMSDeployLogResponder(resp *http.Response) (result MS return } -// GetMSDeployLogSlot get the MSDeploy Log for the last MSDeploy operation. +// GetMSDeployLogSlot description for Get the MSDeploy Log for the last MSDeploy operation. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -11960,7 +11608,7 @@ func (client AppsClient) GetMSDeployLogSlotPreparer(ctx context.Context, resourc "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -11993,7 +11641,7 @@ func (client AppsClient) GetMSDeployLogSlotResponder(resp *http.Response) (resul return } -// GetMSDeployStatus get the status of the last MSDeploy operation. +// GetMSDeployStatus description for Get the status of the last MSDeploy operation. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -12045,7 +11693,7 @@ func (client AppsClient) GetMSDeployStatusPreparer(ctx context.Context, resource "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -12078,7 +11726,7 @@ func (client AppsClient) GetMSDeployStatusResponder(resp *http.Response) (result return } -// GetMSDeployStatusSlot get the status of the last MSDeploy operation. +// GetMSDeployStatusSlot description for Get the status of the last MSDeploy operation. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -12132,7 +11780,7 @@ func (client AppsClient) GetMSDeployStatusSlotPreparer(ctx context.Context, reso "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -12165,7 +11813,8 @@ func (client AppsClient) GetMSDeployStatusSlotResponder(resp *http.Response) (re return } -// GetNetworkTraceOperation gets a named operation for a network trace capturing (or deployment slot, if specified). +// GetNetworkTraceOperation description for Gets a named operation for a network trace capturing (or deployment slot, +// if specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -12219,7 +11868,7 @@ func (client AppsClient) GetNetworkTraceOperationPreparer(ctx context.Context, r "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -12252,8 +11901,8 @@ func (client AppsClient) GetNetworkTraceOperationResponder(resp *http.Response) return } -// GetNetworkTraceOperationSlot gets a named operation for a network trace capturing (or deployment slot, if -// specified). +// GetNetworkTraceOperationSlot description for Gets a named operation for a network trace capturing (or deployment +// slot, if specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -12310,7 +11959,7 @@ func (client AppsClient) GetNetworkTraceOperationSlotPreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -12343,8 +11992,8 @@ func (client AppsClient) GetNetworkTraceOperationSlotResponder(resp *http.Respon return } -// GetNetworkTraceOperationSlotV2 gets a named operation for a network trace capturing (or deployment slot, if -// specified). +// GetNetworkTraceOperationSlotV2 description for Gets a named operation for a network trace capturing (or deployment +// slot, if specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -12401,7 +12050,7 @@ func (client AppsClient) GetNetworkTraceOperationSlotV2Preparer(ctx context.Cont "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -12434,7 +12083,8 @@ func (client AppsClient) GetNetworkTraceOperationSlotV2Responder(resp *http.Resp return } -// GetNetworkTraceOperationV2 gets a named operation for a network trace capturing (or deployment slot, if specified). +// GetNetworkTraceOperationV2 description for Gets a named operation for a network trace capturing (or deployment slot, +// if specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -12488,7 +12138,7 @@ func (client AppsClient) GetNetworkTraceOperationV2Preparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -12521,7 +12171,8 @@ func (client AppsClient) GetNetworkTraceOperationV2Responder(resp *http.Response return } -// GetNetworkTraces gets a named operation for a network trace capturing (or deployment slot, if specified). +// GetNetworkTraces description for Gets a named operation for a network trace capturing (or deployment slot, if +// specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -12575,7 +12226,7 @@ func (client AppsClient) GetNetworkTracesPreparer(ctx context.Context, resourceG "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -12608,7 +12259,8 @@ func (client AppsClient) GetNetworkTracesResponder(resp *http.Response) (result return } -// GetNetworkTracesSlot gets a named operation for a network trace capturing (or deployment slot, if specified). +// GetNetworkTracesSlot description for Gets a named operation for a network trace capturing (or deployment slot, if +// specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -12665,7 +12317,7 @@ func (client AppsClient) GetNetworkTracesSlotPreparer(ctx context.Context, resou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -12698,7 +12350,8 @@ func (client AppsClient) GetNetworkTracesSlotResponder(resp *http.Response) (res return } -// GetNetworkTracesSlotV2 gets a named operation for a network trace capturing (or deployment slot, if specified). +// GetNetworkTracesSlotV2 description for Gets a named operation for a network trace capturing (or deployment slot, if +// specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -12755,7 +12408,7 @@ func (client AppsClient) GetNetworkTracesSlotV2Preparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -12788,7 +12441,8 @@ func (client AppsClient) GetNetworkTracesSlotV2Responder(resp *http.Response) (r return } -// GetNetworkTracesV2 gets a named operation for a network trace capturing (or deployment slot, if specified). +// GetNetworkTracesV2 description for Gets a named operation for a network trace capturing (or deployment slot, if +// specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -12842,7 +12496,7 @@ func (client AppsClient) GetNetworkTracesV2Preparer(ctx context.Context, resourc "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -12875,7 +12529,7 @@ func (client AppsClient) GetNetworkTracesV2Responder(resp *http.Response) (resul return } -// GetPremierAddOn gets a named add-on of an app. +// GetPremierAddOn description for Gets a named add-on of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -12929,7 +12583,7 @@ func (client AppsClient) GetPremierAddOnPreparer(ctx context.Context, resourceGr "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -12962,7 +12616,7 @@ func (client AppsClient) GetPremierAddOnResponder(resp *http.Response) (result P return } -// GetPremierAddOnSlot gets a named add-on of an app. +// GetPremierAddOnSlot description for Gets a named add-on of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -13019,7 +12673,7 @@ func (client AppsClient) GetPremierAddOnSlotPreparer(ctx context.Context, resour "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -13052,8 +12706,8 @@ func (client AppsClient) GetPremierAddOnSlotResponder(resp *http.Response) (resu return } -// GetPrivateAccess gets data around private site access enablement and authorized Virtual Networks that can access the -// site. +// GetPrivateAccess description for Gets data around private site access enablement and authorized Virtual Networks +// that can access the site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -13105,7 +12759,7 @@ func (client AppsClient) GetPrivateAccessPreparer(ctx context.Context, resourceG "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -13138,8 +12792,8 @@ func (client AppsClient) GetPrivateAccessResponder(resp *http.Response) (result return } -// GetPrivateAccessSlot gets data around private site access enablement and authorized Virtual Networks that can access -// the site. +// GetPrivateAccessSlot description for Gets data around private site access enablement and authorized Virtual Networks +// that can access the site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -13193,7 +12847,7 @@ func (client AppsClient) GetPrivateAccessSlotPreparer(ctx context.Context, resou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -13226,7 +12880,7 @@ func (client AppsClient) GetPrivateAccessSlotResponder(resp *http.Response) (res return } -// GetProcess get process information by its ID for a specific scaled-out instance in a web site. +// GetProcess description for Get process information by its ID for a specific scaled-out instance in a web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -13280,7 +12934,7 @@ func (client AppsClient) GetProcessPreparer(ctx context.Context, resourceGroupNa "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -13313,7 +12967,8 @@ func (client AppsClient) GetProcessResponder(resp *http.Response) (result Proces return } -// GetProcessDump get a memory dump of a process by its ID for a specific scaled-out instance in a web site. +// GetProcessDump description for Get a memory dump of a process by its ID for a specific scaled-out instance in a web +// site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -13367,7 +13022,7 @@ func (client AppsClient) GetProcessDumpPreparer(ctx context.Context, resourceGro "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -13399,7 +13054,8 @@ func (client AppsClient) GetProcessDumpResponder(resp *http.Response) (result Re return } -// GetProcessDumpSlot get a memory dump of a process by its ID for a specific scaled-out instance in a web site. +// GetProcessDumpSlot description for Get a memory dump of a process by its ID for a specific scaled-out instance in a +// web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -13456,7 +13112,7 @@ func (client AppsClient) GetProcessDumpSlotPreparer(ctx context.Context, resourc "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -13488,7 +13144,7 @@ func (client AppsClient) GetProcessDumpSlotResponder(resp *http.Response) (resul return } -// GetProcessModule get process information by its ID for a specific scaled-out instance in a web site. +// GetProcessModule description for Get process information by its ID for a specific scaled-out instance in a web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -13544,7 +13200,7 @@ func (client AppsClient) GetProcessModulePreparer(ctx context.Context, resourceG "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -13577,7 +13233,8 @@ func (client AppsClient) GetProcessModuleResponder(resp *http.Response) (result return } -// GetProcessModuleSlot get process information by its ID for a specific scaled-out instance in a web site. +// GetProcessModuleSlot description for Get process information by its ID for a specific scaled-out instance in a web +// site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -13636,7 +13293,7 @@ func (client AppsClient) GetProcessModuleSlotPreparer(ctx context.Context, resou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -13669,7 +13326,7 @@ func (client AppsClient) GetProcessModuleSlotResponder(resp *http.Response) (res return } -// GetProcessSlot get process information by its ID for a specific scaled-out instance in a web site. +// GetProcessSlot description for Get process information by its ID for a specific scaled-out instance in a web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -13726,7 +13383,7 @@ func (client AppsClient) GetProcessSlotPreparer(ctx context.Context, resourceGro "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -13759,190 +13416,7 @@ func (client AppsClient) GetProcessSlotResponder(resp *http.Response) (result Pr return } -// GetProcessThread get thread information by Thread ID for a specific process, in a specific scaled-out instance in a -// web site. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - site name. -// processID - pID. -// threadID - tID. -func (client AppsClient) GetProcessThread(ctx context.Context, resourceGroupName string, name string, processID string, threadID string) (result ProcessThreadInfo, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.GetProcessThread") - defer func() { - sc := -1 - if result.Response.Response != nil { - sc = result.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "GetProcessThread", err.Error()) - } - - req, err := client.GetProcessThreadPreparer(ctx, resourceGroupName, name, processID, threadID) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "GetProcessThread", nil, "Failure preparing request") - return - } - - resp, err := client.GetProcessThreadSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppsClient", "GetProcessThread", resp, "Failure sending request") - return - } - - result, err = client.GetProcessThreadResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "GetProcessThread", resp, "Failure responding to request") - } - - return -} - -// GetProcessThreadPreparer prepares the GetProcessThread request. -func (client AppsClient) GetProcessThreadPreparer(ctx context.Context, resourceGroupName string, name string, processID string, threadID string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "name": autorest.Encode("path", name), - "processId": autorest.Encode("path", processID), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - "threadId": autorest.Encode("path", threadID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/processes/{processId}/threads/{threadId}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// GetProcessThreadSender sends the GetProcessThread request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) GetProcessThreadSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// GetProcessThreadResponder handles the response to the GetProcessThread request. The method always -// closes the http.Response Body. -func (client AppsClient) GetProcessThreadResponder(resp *http.Response) (result ProcessThreadInfo, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNotFound), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// GetProcessThreadSlot get thread information by Thread ID for a specific process, in a specific scaled-out instance -// in a web site. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - site name. -// processID - pID. -// threadID - tID. -// slot - name of the deployment slot. If a slot is not specified, the API returns deployments for the -// production slot. -func (client AppsClient) GetProcessThreadSlot(ctx context.Context, resourceGroupName string, name string, processID string, threadID string, slot string) (result ProcessThreadInfo, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.GetProcessThreadSlot") - defer func() { - sc := -1 - if result.Response.Response != nil { - sc = result.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "GetProcessThreadSlot", err.Error()) - } - - req, err := client.GetProcessThreadSlotPreparer(ctx, resourceGroupName, name, processID, threadID, slot) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "GetProcessThreadSlot", nil, "Failure preparing request") - return - } - - resp, err := client.GetProcessThreadSlotSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppsClient", "GetProcessThreadSlot", resp, "Failure sending request") - return - } - - result, err = client.GetProcessThreadSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "GetProcessThreadSlot", resp, "Failure responding to request") - } - - return -} - -// GetProcessThreadSlotPreparer prepares the GetProcessThreadSlot request. -func (client AppsClient) GetProcessThreadSlotPreparer(ctx context.Context, resourceGroupName string, name string, processID string, threadID string, slot string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "name": autorest.Encode("path", name), - "processId": autorest.Encode("path", processID), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "slot": autorest.Encode("path", slot), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - "threadId": autorest.Encode("path", threadID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/processes/{processId}/threads/{threadId}", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// GetProcessThreadSlotSender sends the GetProcessThreadSlot request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) GetProcessThreadSlotSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// GetProcessThreadSlotResponder handles the response to the GetProcessThreadSlot request. The method always -// closes the http.Response Body. -func (client AppsClient) GetProcessThreadSlotResponder(resp *http.Response) (result ProcessThreadInfo, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNotFound), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// GetPublicCertificate get the named public certificate for an app (or deployment slot, if specified). +// GetPublicCertificate description for Get the named public certificate for an app (or deployment slot, if specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -13996,7 +13470,7 @@ func (client AppsClient) GetPublicCertificatePreparer(ctx context.Context, resou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -14029,7 +13503,8 @@ func (client AppsClient) GetPublicCertificateResponder(resp *http.Response) (res return } -// GetPublicCertificateSlot get the named public certificate for an app (or deployment slot, if specified). +// GetPublicCertificateSlot description for Get the named public certificate for an app (or deployment slot, if +// specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -14086,7 +13561,7 @@ func (client AppsClient) GetPublicCertificateSlotPreparer(ctx context.Context, r "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -14119,7 +13594,7 @@ func (client AppsClient) GetPublicCertificateSlotResponder(resp *http.Response) return } -// GetRelayServiceConnection gets a hybrid connection configuration by its name. +// GetRelayServiceConnection description for Gets a hybrid connection configuration by its name. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -14173,7 +13648,7 @@ func (client AppsClient) GetRelayServiceConnectionPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -14206,7 +13681,7 @@ func (client AppsClient) GetRelayServiceConnectionResponder(resp *http.Response) return } -// GetRelayServiceConnectionSlot gets a hybrid connection configuration by its name. +// GetRelayServiceConnectionSlot description for Gets a hybrid connection configuration by its name. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -14263,7 +13738,7 @@ func (client AppsClient) GetRelayServiceConnectionSlotPreparer(ctx context.Conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -14296,7 +13771,7 @@ func (client AppsClient) GetRelayServiceConnectionSlotResponder(resp *http.Respo return } -// GetSiteExtension get site extension information by its ID for a web site, or a deployment slot. +// GetSiteExtension description for Get site extension information by its ID for a web site, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -14350,7 +13825,7 @@ func (client AppsClient) GetSiteExtensionPreparer(ctx context.Context, resourceG "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -14383,13 +13858,12 @@ func (client AppsClient) GetSiteExtensionResponder(resp *http.Response) (result return } -// GetSiteExtensionSlot get site extension information by its ID for a web site, or a deployment slot. +// GetSiteExtensionSlot description for Get site extension information by its ID for a web site, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. // siteExtensionID - site extension name. -// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the -// production slot. +// slot - name of the deployment slot. If a slot is not specified, the API uses the production slot. func (client AppsClient) GetSiteExtensionSlot(ctx context.Context, resourceGroupName string, name string, siteExtensionID string, slot string) (result SiteExtensionInfo, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.GetSiteExtensionSlot") @@ -14440,7 +13914,7 @@ func (client AppsClient) GetSiteExtensionSlotPreparer(ctx context.Context, resou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -14473,7 +13947,7 @@ func (client AppsClient) GetSiteExtensionSlotResponder(resp *http.Response) (res return } -// GetSitePhpErrorLogFlag gets web app's event logs. +// GetSitePhpErrorLogFlag description for Gets web app's event logs. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -14525,7 +13999,7 @@ func (client AppsClient) GetSitePhpErrorLogFlagPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -14558,7 +14032,7 @@ func (client AppsClient) GetSitePhpErrorLogFlagResponder(resp *http.Response) (r return } -// GetSitePhpErrorLogFlagSlot gets web app's event logs. +// GetSitePhpErrorLogFlagSlot description for Gets web app's event logs. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -14612,7 +14086,7 @@ func (client AppsClient) GetSitePhpErrorLogFlagSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -14645,7 +14119,7 @@ func (client AppsClient) GetSitePhpErrorLogFlagSlotResponder(resp *http.Response return } -// GetSlot gets the details of a web, mobile, or API app. +// GetSlot description for Gets the details of a web, mobile, or API app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -14699,7 +14173,7 @@ func (client AppsClient) GetSlotPreparer(ctx context.Context, resourceGroupName "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -14732,7 +14206,7 @@ func (client AppsClient) GetSlotResponder(resp *http.Response) (result Site, err return } -// GetSourceControl gets the source control configuration of an app. +// GetSourceControl description for Gets the source control configuration of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -14784,7 +14258,7 @@ func (client AppsClient) GetSourceControlPreparer(ctx context.Context, resourceG "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -14817,7 +14291,7 @@ func (client AppsClient) GetSourceControlResponder(resp *http.Response) (result return } -// GetSourceControlSlot gets the source control configuration of an app. +// GetSourceControlSlot description for Gets the source control configuration of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -14872,7 +14346,7 @@ func (client AppsClient) GetSourceControlSlotPreparer(ctx context.Context, resou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -14905,7 +14379,7 @@ func (client AppsClient) GetSourceControlSlotResponder(resp *http.Response) (res return } -// GetSwiftVirtualNetworkConnection gets a Swift Virtual Network connection. +// GetSwiftVirtualNetworkConnection description for Gets a Swift Virtual Network connection. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -14957,7 +14431,7 @@ func (client AppsClient) GetSwiftVirtualNetworkConnectionPreparer(ctx context.Co "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -14990,7 +14464,7 @@ func (client AppsClient) GetSwiftVirtualNetworkConnectionResponder(resp *http.Re return } -// GetSwiftVirtualNetworkConnectionSlot gets a Swift Virtual Network connection. +// GetSwiftVirtualNetworkConnectionSlot description for Gets a Swift Virtual Network connection. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -15045,7 +14519,7 @@ func (client AppsClient) GetSwiftVirtualNetworkConnectionSlotPreparer(ctx contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -15078,7 +14552,7 @@ func (client AppsClient) GetSwiftVirtualNetworkConnectionSlotResponder(resp *htt return } -// GetTriggeredWebJob gets a triggered web job by its ID for an app, or a deployment slot. +// GetTriggeredWebJob description for Gets a triggered web job by its ID for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -15132,7 +14606,7 @@ func (client AppsClient) GetTriggeredWebJobPreparer(ctx context.Context, resourc "webJobName": autorest.Encode("path", webJobName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -15165,7 +14639,8 @@ func (client AppsClient) GetTriggeredWebJobResponder(resp *http.Response) (resul return } -// GetTriggeredWebJobHistory gets a triggered web job's history by its ID for an app, , or a deployment slot. +// GetTriggeredWebJobHistory description for Gets a triggered web job's history by its ID for an app, , or a deployment +// slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -15221,7 +14696,7 @@ func (client AppsClient) GetTriggeredWebJobHistoryPreparer(ctx context.Context, "webJobName": autorest.Encode("path", webJobName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -15254,14 +14729,14 @@ func (client AppsClient) GetTriggeredWebJobHistoryResponder(resp *http.Response) return } -// GetTriggeredWebJobHistorySlot gets a triggered web job's history by its ID for an app, , or a deployment slot. +// GetTriggeredWebJobHistorySlot description for Gets a triggered web job's history by its ID for an app, , or a +// deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. // webJobName - name of Web Job. // ID - history ID. -// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the -// production slot. +// slot - name of the deployment slot. If a slot is not specified, the API uses the production slot. func (client AppsClient) GetTriggeredWebJobHistorySlot(ctx context.Context, resourceGroupName string, name string, webJobName string, ID string, slot string) (result TriggeredJobHistory, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.GetTriggeredWebJobHistorySlot") @@ -15313,7 +14788,7 @@ func (client AppsClient) GetTriggeredWebJobHistorySlotPreparer(ctx context.Conte "webJobName": autorest.Encode("path", webJobName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -15346,13 +14821,12 @@ func (client AppsClient) GetTriggeredWebJobHistorySlotResponder(resp *http.Respo return } -// GetTriggeredWebJobSlot gets a triggered web job by its ID for an app, or a deployment slot. +// GetTriggeredWebJobSlot description for Gets a triggered web job by its ID for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. // webJobName - name of Web Job. -// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the -// production slot. +// slot - name of the deployment slot. If a slot is not specified, the API uses the production slot. func (client AppsClient) GetTriggeredWebJobSlot(ctx context.Context, resourceGroupName string, name string, webJobName string, slot string) (result TriggeredWebJob, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.GetTriggeredWebJobSlot") @@ -15403,7 +14877,7 @@ func (client AppsClient) GetTriggeredWebJobSlotPreparer(ctx context.Context, res "webJobName": autorest.Encode("path", webJobName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -15436,7 +14910,7 @@ func (client AppsClient) GetTriggeredWebJobSlotResponder(resp *http.Response) (r return } -// GetVnetConnection gets a virtual network the app (or deployment slot) is connected to by name. +// GetVnetConnection description for Gets a virtual network the app (or deployment slot) is connected to by name. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -15490,7 +14964,7 @@ func (client AppsClient) GetVnetConnectionPreparer(ctx context.Context, resource "vnetName": autorest.Encode("path", vnetName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -15523,7 +14997,7 @@ func (client AppsClient) GetVnetConnectionResponder(resp *http.Response) (result return } -// GetVnetConnectionGateway gets an app's Virtual Network gateway. +// GetVnetConnectionGateway description for Gets an app's Virtual Network gateway. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -15579,7 +15053,7 @@ func (client AppsClient) GetVnetConnectionGatewayPreparer(ctx context.Context, r "vnetName": autorest.Encode("path", vnetName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -15612,7 +15086,7 @@ func (client AppsClient) GetVnetConnectionGatewayResponder(resp *http.Response) return } -// GetVnetConnectionGatewaySlot gets an app's Virtual Network gateway. +// GetVnetConnectionGatewaySlot description for Gets an app's Virtual Network gateway. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -15671,7 +15145,7 @@ func (client AppsClient) GetVnetConnectionGatewaySlotPreparer(ctx context.Contex "vnetName": autorest.Encode("path", vnetName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -15704,7 +15178,7 @@ func (client AppsClient) GetVnetConnectionGatewaySlotResponder(resp *http.Respon return } -// GetVnetConnectionSlot gets a virtual network the app (or deployment slot) is connected to by name. +// GetVnetConnectionSlot description for Gets a virtual network the app (or deployment slot) is connected to by name. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -15761,7 +15235,7 @@ func (client AppsClient) GetVnetConnectionSlotPreparer(ctx context.Context, reso "vnetName": autorest.Encode("path", vnetName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -15794,7 +15268,7 @@ func (client AppsClient) GetVnetConnectionSlotResponder(resp *http.Response) (re return } -// GetWebJob get webjob information for an app, or a deployment slot. +// GetWebJob description for Get webjob information for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -15848,7 +15322,7 @@ func (client AppsClient) GetWebJobPreparer(ctx context.Context, resourceGroupNam "webJobName": autorest.Encode("path", webJobName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -15881,7 +15355,7 @@ func (client AppsClient) GetWebJobResponder(resp *http.Response) (result Job, er return } -// GetWebJobSlot get webjob information for an app, or a deployment slot. +// GetWebJobSlot description for Get webjob information for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -15938,7 +15412,7 @@ func (client AppsClient) GetWebJobSlotPreparer(ctx context.Context, resourceGrou "webJobName": autorest.Encode("path", webJobName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -15971,7 +15445,7 @@ func (client AppsClient) GetWebJobSlotResponder(resp *http.Response) (result Job return } -// GetWebSiteContainerLogs gets the last lines of docker logs for the given site +// GetWebSiteContainerLogs description for Gets the last lines of docker logs for the given site // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -16023,7 +15497,7 @@ func (client AppsClient) GetWebSiteContainerLogsPreparer(ctx context.Context, re "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -16055,7 +15529,7 @@ func (client AppsClient) GetWebSiteContainerLogsResponder(resp *http.Response) ( return } -// GetWebSiteContainerLogsSlot gets the last lines of docker logs for the given site +// GetWebSiteContainerLogsSlot description for Gets the last lines of docker logs for the given site // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -16109,7 +15583,7 @@ func (client AppsClient) GetWebSiteContainerLogsSlotPreparer(ctx context.Context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -16141,7 +15615,7 @@ func (client AppsClient) GetWebSiteContainerLogsSlotResponder(resp *http.Respons return } -// InstallSiteExtension install site extension on a web site, or a deployment slot. +// InstallSiteExtension description for Install site extension on a web site, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -16189,7 +15663,7 @@ func (client AppsClient) InstallSiteExtensionPreparer(ctx context.Context, resou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -16228,13 +15702,12 @@ func (client AppsClient) InstallSiteExtensionResponder(resp *http.Response) (res return } -// InstallSiteExtensionSlot install site extension on a web site, or a deployment slot. +// InstallSiteExtensionSlot description for Install site extension on a web site, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. // siteExtensionID - site extension name. -// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the -// production slot. +// slot - name of the deployment slot. If a slot is not specified, the API uses the production slot. func (client AppsClient) InstallSiteExtensionSlot(ctx context.Context, resourceGroupName string, name string, siteExtensionID string, slot string) (result AppsInstallSiteExtensionSlotFuture, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.InstallSiteExtensionSlot") @@ -16279,7 +15752,7 @@ func (client AppsClient) InstallSiteExtensionSlotPreparer(ctx context.Context, r "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -16318,7 +15791,7 @@ func (client AppsClient) InstallSiteExtensionSlotResponder(resp *http.Response) return } -// IsCloneable shows whether an app can be cloned to another resource group or subscription. +// IsCloneable description for Shows whether an app can be cloned to another resource group or subscription. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -16370,7 +15843,7 @@ func (client AppsClient) IsCloneablePreparer(ctx context.Context, resourceGroupN "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -16403,7 +15876,7 @@ func (client AppsClient) IsCloneableResponder(resp *http.Response) (result SiteC return } -// IsCloneableSlot shows whether an app can be cloned to another resource group or subscription. +// IsCloneableSlot description for Shows whether an app can be cloned to another resource group or subscription. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -16457,7 +15930,7 @@ func (client AppsClient) IsCloneableSlotPreparer(ctx context.Context, resourceGr "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -16490,7 +15963,7 @@ func (client AppsClient) IsCloneableSlotResponder(resp *http.Response) (result S return } -// List get all apps for a subscription. +// List description for Get all apps for a subscription. func (client AppsClient) List(ctx context.Context) (result AppCollectionPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.List") @@ -16530,7 +16003,7 @@ func (client AppsClient) ListPreparer(ctx context.Context) (*http.Request, error "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -16600,7 +16073,7 @@ func (client AppsClient) ListComplete(ctx context.Context) (result AppCollection return } -// ListApplicationSettings gets the application settings of an app. +// ListApplicationSettings description for Gets the application settings of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -16652,7 +16125,7 @@ func (client AppsClient) ListApplicationSettingsPreparer(ctx context.Context, re "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -16685,7 +16158,7 @@ func (client AppsClient) ListApplicationSettingsResponder(resp *http.Response) ( return } -// ListApplicationSettingsSlot gets the application settings of an app. +// ListApplicationSettingsSlot description for Gets the application settings of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -16740,7 +16213,7 @@ func (client AppsClient) ListApplicationSettingsSlotPreparer(ctx context.Context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -16773,7 +16246,7 @@ func (client AppsClient) ListApplicationSettingsSlotResponder(resp *http.Respons return } -// ListAzureStorageAccounts gets the Azure storage account configurations of an app. +// ListAzureStorageAccounts description for Gets the Azure storage account configurations of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -16825,7 +16298,7 @@ func (client AppsClient) ListAzureStorageAccountsPreparer(ctx context.Context, r "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -16858,7 +16331,7 @@ func (client AppsClient) ListAzureStorageAccountsResponder(resp *http.Response) return } -// ListAzureStorageAccountsSlot gets the Azure storage account configurations of an app. +// ListAzureStorageAccountsSlot description for Gets the Azure storage account configurations of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -16913,7 +16386,7 @@ func (client AppsClient) ListAzureStorageAccountsSlotPreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -16946,7 +16419,7 @@ func (client AppsClient) ListAzureStorageAccountsSlotResponder(resp *http.Respon return } -// ListBackups gets existing backups of an app. +// ListBackups description for Gets existing backups of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -16999,7 +16472,7 @@ func (client AppsClient) ListBackupsPreparer(ctx context.Context, resourceGroupN "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -17069,7 +16542,7 @@ func (client AppsClient) ListBackupsComplete(ctx context.Context, resourceGroupN return } -// ListBackupsSlot gets existing backups of an app. +// ListBackupsSlot description for Gets existing backups of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -17125,7 +16598,7 @@ func (client AppsClient) ListBackupsSlotPreparer(ctx context.Context, resourceGr "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -17195,9 +16668,9 @@ func (client AppsClient) ListBackupsSlotComplete(ctx context.Context, resourceGr return } -// ListBackupStatusSecrets gets status of a web app backup that may be in progress, including secrets associated with -// the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is -// passed in the request body. +// ListBackupStatusSecrets description for Gets status of a web app backup that may be in progress, including secrets +// associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup +// if a new URL is passed in the request body. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -17261,7 +16734,7 @@ func (client AppsClient) ListBackupStatusSecretsPreparer(ctx context.Context, re "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -17296,9 +16769,9 @@ func (client AppsClient) ListBackupStatusSecretsResponder(resp *http.Response) ( return } -// ListBackupStatusSecretsSlot gets status of a web app backup that may be in progress, including secrets associated -// with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new -// URL is passed in the request body. +// ListBackupStatusSecretsSlot description for Gets status of a web app backup that may be in progress, including +// secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for +// the backup if a new URL is passed in the request body. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -17364,7 +16837,7 @@ func (client AppsClient) ListBackupStatusSecretsSlotPreparer(ctx context.Context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -17399,7 +16872,7 @@ func (client AppsClient) ListBackupStatusSecretsSlotResponder(resp *http.Respons return } -// ListByResourceGroup gets all web, mobile, and API apps in the specified resource group. +// ListByResourceGroup description for Gets all web, mobile, and API apps in the specified resource group. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // includeSlots - specify true to include deployment slots in results. The default is false, @@ -17452,7 +16925,7 @@ func (client AppsClient) ListByResourceGroupPreparer(ctx context.Context, resour "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -17525,7 +16998,7 @@ func (client AppsClient) ListByResourceGroupComplete(ctx context.Context, resour return } -// ListConfigurations list the configurations of an app +// ListConfigurations description for List the configurations of an app // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -17578,7 +17051,7 @@ func (client AppsClient) ListConfigurationsPreparer(ctx context.Context, resourc "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -17648,8 +17121,8 @@ func (client AppsClient) ListConfigurationsComplete(ctx context.Context, resourc return } -// ListConfigurationSnapshotInfo gets a list of web app configuration snapshots identifiers. Each element of the list -// contains a timestamp and the ID of the snapshot. +// ListConfigurationSnapshotInfo description for Gets a list of web app configuration snapshots identifiers. Each +// element of the list contains a timestamp and the ID of the snapshot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -17702,7 +17175,7 @@ func (client AppsClient) ListConfigurationSnapshotInfoPreparer(ctx context.Conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -17772,8 +17245,8 @@ func (client AppsClient) ListConfigurationSnapshotInfoComplete(ctx context.Conte return } -// ListConfigurationSnapshotInfoSlot gets a list of web app configuration snapshots identifiers. Each element of the -// list contains a timestamp and the ID of the snapshot. +// ListConfigurationSnapshotInfoSlot description for Gets a list of web app configuration snapshots identifiers. Each +// element of the list contains a timestamp and the ID of the snapshot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -17829,7 +17302,7 @@ func (client AppsClient) ListConfigurationSnapshotInfoSlotPreparer(ctx context.C "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -17899,7 +17372,7 @@ func (client AppsClient) ListConfigurationSnapshotInfoSlotComplete(ctx context.C return } -// ListConfigurationsSlot list the configurations of an app +// ListConfigurationsSlot description for List the configurations of an app // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -17955,7 +17428,7 @@ func (client AppsClient) ListConfigurationsSlotPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -18025,7 +17498,7 @@ func (client AppsClient) ListConfigurationsSlotComplete(ctx context.Context, res return } -// ListConnectionStrings gets the connection strings of an app. +// ListConnectionStrings description for Gets the connection strings of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -18077,7 +17550,7 @@ func (client AppsClient) ListConnectionStringsPreparer(ctx context.Context, reso "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -18110,7 +17583,7 @@ func (client AppsClient) ListConnectionStringsResponder(resp *http.Response) (re return } -// ListConnectionStringsSlot gets the connection strings of an app. +// ListConnectionStringsSlot description for Gets the connection strings of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -18165,7 +17638,7 @@ func (client AppsClient) ListConnectionStringsSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -18198,7 +17671,7 @@ func (client AppsClient) ListConnectionStringsSlotResponder(resp *http.Response) return } -// ListContinuousWebJobs list continuous web jobs for an app, or a deployment slot. +// ListContinuousWebJobs description for List continuous web jobs for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -18251,7 +17724,7 @@ func (client AppsClient) ListContinuousWebJobsPreparer(ctx context.Context, reso "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -18321,7 +17794,7 @@ func (client AppsClient) ListContinuousWebJobsComplete(ctx context.Context, reso return } -// ListContinuousWebJobsSlot list continuous web jobs for an app, or a deployment slot. +// ListContinuousWebJobsSlot description for List continuous web jobs for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -18377,7 +17850,7 @@ func (client AppsClient) ListContinuousWebJobsSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -18447,7 +17920,7 @@ func (client AppsClient) ListContinuousWebJobsSlotComplete(ctx context.Context, return } -// ListDeploymentLog list deployment log for specific deployment for an app, or a deployment slot. +// ListDeploymentLog description for List deployment log for specific deployment for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -18502,7 +17975,7 @@ func (client AppsClient) ListDeploymentLogPreparer(ctx context.Context, resource "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -18535,7 +18008,7 @@ func (client AppsClient) ListDeploymentLogResponder(resp *http.Response) (result return } -// ListDeploymentLogSlot list deployment log for specific deployment for an app, or a deployment slot. +// ListDeploymentLogSlot description for List deployment log for specific deployment for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -18593,7 +18066,7 @@ func (client AppsClient) ListDeploymentLogSlotPreparer(ctx context.Context, reso "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -18626,7 +18099,7 @@ func (client AppsClient) ListDeploymentLogSlotResponder(resp *http.Response) (re return } -// ListDeployments list deployments for an app, or a deployment slot. +// ListDeployments description for List deployments for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -18679,7 +18152,7 @@ func (client AppsClient) ListDeploymentsPreparer(ctx context.Context, resourceGr "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -18749,7 +18222,7 @@ func (client AppsClient) ListDeploymentsComplete(ctx context.Context, resourceGr return } -// ListDeploymentsSlot list deployments for an app, or a deployment slot. +// ListDeploymentsSlot description for List deployments for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -18805,7 +18278,7 @@ func (client AppsClient) ListDeploymentsSlotPreparer(ctx context.Context, resour "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -18875,7 +18348,7 @@ func (client AppsClient) ListDeploymentsSlotComplete(ctx context.Context, resour return } -// ListDomainOwnershipIdentifiers lists ownership identifiers for domain associated with web app. +// ListDomainOwnershipIdentifiers description for Lists ownership identifiers for domain associated with web app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -18928,7 +18401,7 @@ func (client AppsClient) ListDomainOwnershipIdentifiersPreparer(ctx context.Cont "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -18998,7 +18471,7 @@ func (client AppsClient) ListDomainOwnershipIdentifiersComplete(ctx context.Cont return } -// ListDomainOwnershipIdentifiersSlot lists ownership identifiers for domain associated with web app. +// ListDomainOwnershipIdentifiersSlot description for Lists ownership identifiers for domain associated with web app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -19054,7 +18527,7 @@ func (client AppsClient) ListDomainOwnershipIdentifiersSlotPreparer(ctx context. "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -19124,183 +18597,7 @@ func (client AppsClient) ListDomainOwnershipIdentifiersSlotComplete(ctx context. return } -// ListFunctionKeys get function keys for a function in a web site, or a deployment slot. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - site name. -// functionName - function name. -func (client AppsClient) ListFunctionKeys(ctx context.Context, resourceGroupName string, name string, functionName string) (result StringDictionary, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListFunctionKeys") - defer func() { - sc := -1 - if result.Response.Response != nil { - sc = result.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "ListFunctionKeys", err.Error()) - } - - req, err := client.ListFunctionKeysPreparer(ctx, resourceGroupName, name, functionName) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListFunctionKeys", nil, "Failure preparing request") - return - } - - resp, err := client.ListFunctionKeysSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListFunctionKeys", resp, "Failure sending request") - return - } - - result, err = client.ListFunctionKeysResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListFunctionKeys", resp, "Failure responding to request") - } - - return -} - -// ListFunctionKeysPreparer prepares the ListFunctionKeys request. -func (client AppsClient) ListFunctionKeysPreparer(ctx context.Context, resourceGroupName string, name string, functionName string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "functionName": autorest.Encode("path", functionName), - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsPost(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/functions/{functionName}/listkeys", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListFunctionKeysSender sends the ListFunctionKeys request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) ListFunctionKeysSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// ListFunctionKeysResponder handles the response to the ListFunctionKeys request. The method always -// closes the http.Response Body. -func (client AppsClient) ListFunctionKeysResponder(resp *http.Response) (result StringDictionary, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// ListFunctionKeysSlot get function keys for a function in a web site, or a deployment slot. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - site name. -// functionName - function name. -// slot - name of the deployment slot. -func (client AppsClient) ListFunctionKeysSlot(ctx context.Context, resourceGroupName string, name string, functionName string, slot string) (result StringDictionary, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListFunctionKeysSlot") - defer func() { - sc := -1 - if result.Response.Response != nil { - sc = result.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "ListFunctionKeysSlot", err.Error()) - } - - req, err := client.ListFunctionKeysSlotPreparer(ctx, resourceGroupName, name, functionName, slot) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListFunctionKeysSlot", nil, "Failure preparing request") - return - } - - resp, err := client.ListFunctionKeysSlotSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListFunctionKeysSlot", resp, "Failure sending request") - return - } - - result, err = client.ListFunctionKeysSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListFunctionKeysSlot", resp, "Failure responding to request") - } - - return -} - -// ListFunctionKeysSlotPreparer prepares the ListFunctionKeysSlot request. -func (client AppsClient) ListFunctionKeysSlotPreparer(ctx context.Context, resourceGroupName string, name string, functionName string, slot string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "functionName": autorest.Encode("path", functionName), - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "slot": autorest.Encode("path", slot), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsPost(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/functions/{functionName}/listkeys", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListFunctionKeysSlotSender sends the ListFunctionKeysSlot request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) ListFunctionKeysSlotSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// ListFunctionKeysSlotResponder handles the response to the ListFunctionKeysSlot request. The method always -// closes the http.Response Body. -func (client AppsClient) ListFunctionKeysSlotResponder(resp *http.Response) (result StringDictionary, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// ListFunctions list the functions for a web site, or a deployment slot. +// ListFunctions description for List the functions for a web site, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -19353,7 +18650,7 @@ func (client AppsClient) ListFunctionsPreparer(ctx context.Context, resourceGrou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -19423,7 +18720,7 @@ func (client AppsClient) ListFunctionsComplete(ctx context.Context, resourceGrou return } -// ListFunctionSecrets get function secrets for a function in a web site, or a deployment slot. +// ListFunctionSecrets description for Get function secrets for a function in a web site, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -19477,7 +18774,7 @@ func (client AppsClient) ListFunctionSecretsPreparer(ctx context.Context, resour "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -19510,7 +18807,7 @@ func (client AppsClient) ListFunctionSecretsResponder(resp *http.Response) (resu return } -// ListFunctionSecretsSlot get function secrets for a function in a web site, or a deployment slot. +// ListFunctionSecretsSlot description for Get function secrets for a function in a web site, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -19566,7 +18863,7 @@ func (client AppsClient) ListFunctionSecretsSlotPreparer(ctx context.Context, re "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -19599,179 +18896,7 @@ func (client AppsClient) ListFunctionSecretsSlotResponder(resp *http.Response) ( return } -// ListHostKeys get host secrets for a function app. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - site name. -func (client AppsClient) ListHostKeys(ctx context.Context, resourceGroupName string, name string) (result HostKeys, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListHostKeys") - defer func() { - sc := -1 - if result.Response.Response != nil { - sc = result.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "ListHostKeys", err.Error()) - } - - req, err := client.ListHostKeysPreparer(ctx, resourceGroupName, name) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListHostKeys", nil, "Failure preparing request") - return - } - - resp, err := client.ListHostKeysSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListHostKeys", resp, "Failure sending request") - return - } - - result, err = client.ListHostKeysResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListHostKeys", resp, "Failure responding to request") - } - - return -} - -// ListHostKeysPreparer prepares the ListHostKeys request. -func (client AppsClient) ListHostKeysPreparer(ctx context.Context, resourceGroupName string, name string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsPost(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/host/default/listkeys", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListHostKeysSender sends the ListHostKeys request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) ListHostKeysSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// ListHostKeysResponder handles the response to the ListHostKeys request. The method always -// closes the http.Response Body. -func (client AppsClient) ListHostKeysResponder(resp *http.Response) (result HostKeys, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// ListHostKeysSlot get host secrets for a function app. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - site name. -// slot - name of the deployment slot. -func (client AppsClient) ListHostKeysSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result HostKeys, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListHostKeysSlot") - defer func() { - sc := -1 - if result.Response.Response != nil { - sc = result.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "ListHostKeysSlot", err.Error()) - } - - req, err := client.ListHostKeysSlotPreparer(ctx, resourceGroupName, name, slot) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListHostKeysSlot", nil, "Failure preparing request") - return - } - - resp, err := client.ListHostKeysSlotSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListHostKeysSlot", resp, "Failure sending request") - return - } - - result, err = client.ListHostKeysSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListHostKeysSlot", resp, "Failure responding to request") - } - - return -} - -// ListHostKeysSlotPreparer prepares the ListHostKeysSlot request. -func (client AppsClient) ListHostKeysSlotPreparer(ctx context.Context, resourceGroupName string, name string, slot string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "slot": autorest.Encode("path", slot), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsPost(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/host/default/listkeys", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListHostKeysSlotSender sends the ListHostKeysSlot request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) ListHostKeysSlotSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// ListHostKeysSlotResponder handles the response to the ListHostKeysSlot request. The method always -// closes the http.Response Body. -func (client AppsClient) ListHostKeysSlotResponder(resp *http.Response) (result HostKeys, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// ListHostNameBindings get hostname bindings for an app or a deployment slot. +// ListHostNameBindings description for Get hostname bindings for an app or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -19824,7 +18949,7 @@ func (client AppsClient) ListHostNameBindingsPreparer(ctx context.Context, resou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -19894,7 +19019,7 @@ func (client AppsClient) ListHostNameBindingsComplete(ctx context.Context, resou return } -// ListHostNameBindingsSlot get hostname bindings for an app or a deployment slot. +// ListHostNameBindingsSlot description for Get hostname bindings for an app or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -19950,7 +19075,7 @@ func (client AppsClient) ListHostNameBindingsSlotPreparer(ctx context.Context, r "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -20020,187 +19145,7 @@ func (client AppsClient) ListHostNameBindingsSlotComplete(ctx context.Context, r return } -// ListHybridConnectionKeys gets the send key name and value for a Hybrid Connection. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - the name of the web app. -// namespaceName - the namespace for this hybrid connection. -// relayName - the relay name for this hybrid connection. -func (client AppsClient) ListHybridConnectionKeys(ctx context.Context, resourceGroupName string, name string, namespaceName string, relayName string) (result HybridConnectionKey, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListHybridConnectionKeys") - defer func() { - sc := -1 - if result.Response.Response != nil { - sc = result.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "ListHybridConnectionKeys", err.Error()) - } - - req, err := client.ListHybridConnectionKeysPreparer(ctx, resourceGroupName, name, namespaceName, relayName) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListHybridConnectionKeys", nil, "Failure preparing request") - return - } - - resp, err := client.ListHybridConnectionKeysSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListHybridConnectionKeys", resp, "Failure sending request") - return - } - - result, err = client.ListHybridConnectionKeysResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListHybridConnectionKeys", resp, "Failure responding to request") - } - - return -} - -// ListHybridConnectionKeysPreparer prepares the ListHybridConnectionKeys request. -func (client AppsClient) ListHybridConnectionKeysPreparer(ctx context.Context, resourceGroupName string, name string, namespaceName string, relayName string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "name": autorest.Encode("path", name), - "namespaceName": autorest.Encode("path", namespaceName), - "relayName": autorest.Encode("path", relayName), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsPost(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/hybridConnectionNamespaces/{namespaceName}/relays/{relayName}/listKeys", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListHybridConnectionKeysSender sends the ListHybridConnectionKeys request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) ListHybridConnectionKeysSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// ListHybridConnectionKeysResponder handles the response to the ListHybridConnectionKeys request. The method always -// closes the http.Response Body. -func (client AppsClient) ListHybridConnectionKeysResponder(resp *http.Response) (result HybridConnectionKey, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// ListHybridConnectionKeysSlot gets the send key name and value for a Hybrid Connection. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - the name of the web app. -// namespaceName - the namespace for this hybrid connection. -// relayName - the relay name for this hybrid connection. -// slot - the name of the slot for the web app. -func (client AppsClient) ListHybridConnectionKeysSlot(ctx context.Context, resourceGroupName string, name string, namespaceName string, relayName string, slot string) (result HybridConnectionKey, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListHybridConnectionKeysSlot") - defer func() { - sc := -1 - if result.Response.Response != nil { - sc = result.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "ListHybridConnectionKeysSlot", err.Error()) - } - - req, err := client.ListHybridConnectionKeysSlotPreparer(ctx, resourceGroupName, name, namespaceName, relayName, slot) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListHybridConnectionKeysSlot", nil, "Failure preparing request") - return - } - - resp, err := client.ListHybridConnectionKeysSlotSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListHybridConnectionKeysSlot", resp, "Failure sending request") - return - } - - result, err = client.ListHybridConnectionKeysSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListHybridConnectionKeysSlot", resp, "Failure responding to request") - } - - return -} - -// ListHybridConnectionKeysSlotPreparer prepares the ListHybridConnectionKeysSlot request. -func (client AppsClient) ListHybridConnectionKeysSlotPreparer(ctx context.Context, resourceGroupName string, name string, namespaceName string, relayName string, slot string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "name": autorest.Encode("path", name), - "namespaceName": autorest.Encode("path", namespaceName), - "relayName": autorest.Encode("path", relayName), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "slot": autorest.Encode("path", slot), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsPost(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/hybridConnectionNamespaces/{namespaceName}/relays/{relayName}/listKeys", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListHybridConnectionKeysSlotSender sends the ListHybridConnectionKeysSlot request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) ListHybridConnectionKeysSlotSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// ListHybridConnectionKeysSlotResponder handles the response to the ListHybridConnectionKeysSlot request. The method always -// closes the http.Response Body. -func (client AppsClient) ListHybridConnectionKeysSlotResponder(resp *http.Response) (result HybridConnectionKey, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// ListHybridConnections retrieves all Service Bus Hybrid Connections used by this Web App. +// ListHybridConnections description for Retrieves all Service Bus Hybrid Connections used by this Web App. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -20252,7 +19197,7 @@ func (client AppsClient) ListHybridConnectionsPreparer(ctx context.Context, reso "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -20285,7 +19230,7 @@ func (client AppsClient) ListHybridConnectionsResponder(resp *http.Response) (re return } -// ListHybridConnectionsSlot retrieves all Service Bus Hybrid Connections used by this Web App. +// ListHybridConnectionsSlot description for Retrieves all Service Bus Hybrid Connections used by this Web App. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -20339,7 +19284,7 @@ func (client AppsClient) ListHybridConnectionsSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -20372,7 +19317,7 @@ func (client AppsClient) ListHybridConnectionsSlotResponder(resp *http.Response) return } -// ListInstanceFunctionsSlot list the functions for a web site, or a deployment slot. +// ListInstanceFunctionsSlot description for List the functions for a web site, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -20427,7 +19372,7 @@ func (client AppsClient) ListInstanceFunctionsSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -20497,7 +19442,7 @@ func (client AppsClient) ListInstanceFunctionsSlotComplete(ctx context.Context, return } -// ListInstanceIdentifiers gets all scale-out instances of an app. +// ListInstanceIdentifiers description for Gets all scale-out instances of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -20550,7 +19495,7 @@ func (client AppsClient) ListInstanceIdentifiersPreparer(ctx context.Context, re "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -20620,7 +19565,7 @@ func (client AppsClient) ListInstanceIdentifiersComplete(ctx context.Context, re return } -// ListInstanceIdentifiersSlot gets all scale-out instances of an app. +// ListInstanceIdentifiersSlot description for Gets all scale-out instances of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -20675,7 +19620,7 @@ func (client AppsClient) ListInstanceIdentifiersSlotPreparer(ctx context.Context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -20745,8 +19690,8 @@ func (client AppsClient) ListInstanceIdentifiersSlotComplete(ctx context.Context return } -// ListInstanceProcesses get list of processes for a web site, or a deployment slot, or for a specific scaled-out -// instance in a web site. +// ListInstanceProcesses description for Get list of processes for a web site, or a deployment slot, or for a specific +// scaled-out instance in a web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -20802,7 +19747,7 @@ func (client AppsClient) ListInstanceProcessesPreparer(ctx context.Context, reso "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -20872,8 +19817,8 @@ func (client AppsClient) ListInstanceProcessesComplete(ctx context.Context, reso return } -// ListInstanceProcessesSlot get list of processes for a web site, or a deployment slot, or for a specific scaled-out -// instance in a web site. +// ListInstanceProcessesSlot description for Get list of processes for a web site, or a deployment slot, or for a +// specific scaled-out instance in a web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -20932,7 +19877,7 @@ func (client AppsClient) ListInstanceProcessesSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -21002,8 +19947,8 @@ func (client AppsClient) ListInstanceProcessesSlotComplete(ctx context.Context, return } -// ListInstanceProcessModules list module information for a process by its ID for a specific scaled-out instance in a -// web site. +// ListInstanceProcessModules description for List module information for a process by its ID for a specific scaled-out +// instance in a web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -21061,7 +20006,7 @@ func (client AppsClient) ListInstanceProcessModulesPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -21131,8 +20076,8 @@ func (client AppsClient) ListInstanceProcessModulesComplete(ctx context.Context, return } -// ListInstanceProcessModulesSlot list module information for a process by its ID for a specific scaled-out instance in -// a web site. +// ListInstanceProcessModulesSlot description for List module information for a process by its ID for a specific +// scaled-out instance in a web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -21193,7 +20138,7 @@ func (client AppsClient) ListInstanceProcessModulesSlotPreparer(ctx context.Cont "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -21263,7 +20208,8 @@ func (client AppsClient) ListInstanceProcessModulesSlotComplete(ctx context.Cont return } -// ListInstanceProcessThreads list the threads in a process by its ID for a specific scaled-out instance in a web site. +// ListInstanceProcessThreads description for List the threads in a process by its ID for a specific scaled-out +// instance in a web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -21321,7 +20267,7 @@ func (client AppsClient) ListInstanceProcessThreadsPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -21391,8 +20337,8 @@ func (client AppsClient) ListInstanceProcessThreadsComplete(ctx context.Context, return } -// ListInstanceProcessThreadsSlot list the threads in a process by its ID for a specific scaled-out instance in a web -// site. +// ListInstanceProcessThreadsSlot description for List the threads in a process by its ID for a specific scaled-out +// instance in a web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -21453,7 +20399,7 @@ func (client AppsClient) ListInstanceProcessThreadsSlotPreparer(ctx context.Cont "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -21523,7 +20469,7 @@ func (client AppsClient) ListInstanceProcessThreadsSlotComplete(ctx context.Cont return } -// ListMetadata gets the metadata of an app. +// ListMetadata description for Gets the metadata of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -21575,7 +20521,7 @@ func (client AppsClient) ListMetadataPreparer(ctx context.Context, resourceGroup "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -21608,7 +20554,7 @@ func (client AppsClient) ListMetadataResponder(resp *http.Response) (result Stri return } -// ListMetadataSlot gets the metadata of an app. +// ListMetadataSlot description for Gets the metadata of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -21663,7 +20609,7 @@ func (client AppsClient) ListMetadataSlotPreparer(ctx context.Context, resourceG "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -21696,525 +20642,7 @@ func (client AppsClient) ListMetadataSlotResponder(resp *http.Response) (result return } -// ListMetricDefinitions gets all metric definitions of an app (or deployment slot, if specified). -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - name of the app. -func (client AppsClient) ListMetricDefinitions(ctx context.Context, resourceGroupName string, name string) (result ResourceMetricDefinitionCollectionPage, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListMetricDefinitions") - defer func() { - sc := -1 - if result.rmdc.Response.Response != nil { - sc = result.rmdc.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "ListMetricDefinitions", err.Error()) - } - - result.fn = client.listMetricDefinitionsNextResults - req, err := client.ListMetricDefinitionsPreparer(ctx, resourceGroupName, name) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListMetricDefinitions", nil, "Failure preparing request") - return - } - - resp, err := client.ListMetricDefinitionsSender(req) - if err != nil { - result.rmdc.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListMetricDefinitions", resp, "Failure sending request") - return - } - - result.rmdc, err = client.ListMetricDefinitionsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListMetricDefinitions", resp, "Failure responding to request") - } - - return -} - -// ListMetricDefinitionsPreparer prepares the ListMetricDefinitions request. -func (client AppsClient) ListMetricDefinitionsPreparer(ctx context.Context, resourceGroupName string, name string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/metricdefinitions", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListMetricDefinitionsSender sends the ListMetricDefinitions request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) ListMetricDefinitionsSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// ListMetricDefinitionsResponder handles the response to the ListMetricDefinitions request. The method always -// closes the http.Response Body. -func (client AppsClient) ListMetricDefinitionsResponder(resp *http.Response) (result ResourceMetricDefinitionCollection, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// listMetricDefinitionsNextResults retrieves the next set of results, if any. -func (client AppsClient) listMetricDefinitionsNextResults(ctx context.Context, lastResults ResourceMetricDefinitionCollection) (result ResourceMetricDefinitionCollection, err error) { - req, err := lastResults.resourceMetricDefinitionCollectionPreparer(ctx) - if err != nil { - return result, autorest.NewErrorWithError(err, "web.AppsClient", "listMetricDefinitionsNextResults", nil, "Failure preparing next results request") - } - if req == nil { - return - } - resp, err := client.ListMetricDefinitionsSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - return result, autorest.NewErrorWithError(err, "web.AppsClient", "listMetricDefinitionsNextResults", resp, "Failure sending next results request") - } - result, err = client.ListMetricDefinitionsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "listMetricDefinitionsNextResults", resp, "Failure responding to next results request") - } - return -} - -// ListMetricDefinitionsComplete enumerates all values, automatically crossing page boundaries as required. -func (client AppsClient) ListMetricDefinitionsComplete(ctx context.Context, resourceGroupName string, name string) (result ResourceMetricDefinitionCollectionIterator, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListMetricDefinitions") - defer func() { - sc := -1 - if result.Response().Response.Response != nil { - sc = result.page.Response().Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - result.page, err = client.ListMetricDefinitions(ctx, resourceGroupName, name) - return -} - -// ListMetricDefinitionsSlot gets all metric definitions of an app (or deployment slot, if specified). -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - name of the app. -// slot - name of the deployment slot. If a slot is not specified, the API will get metric definitions of the -// production slot. -func (client AppsClient) ListMetricDefinitionsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result ResourceMetricDefinitionCollectionPage, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListMetricDefinitionsSlot") - defer func() { - sc := -1 - if result.rmdc.Response.Response != nil { - sc = result.rmdc.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "ListMetricDefinitionsSlot", err.Error()) - } - - result.fn = client.listMetricDefinitionsSlotNextResults - req, err := client.ListMetricDefinitionsSlotPreparer(ctx, resourceGroupName, name, slot) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListMetricDefinitionsSlot", nil, "Failure preparing request") - return - } - - resp, err := client.ListMetricDefinitionsSlotSender(req) - if err != nil { - result.rmdc.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListMetricDefinitionsSlot", resp, "Failure sending request") - return - } - - result.rmdc, err = client.ListMetricDefinitionsSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListMetricDefinitionsSlot", resp, "Failure responding to request") - } - - return -} - -// ListMetricDefinitionsSlotPreparer prepares the ListMetricDefinitionsSlot request. -func (client AppsClient) ListMetricDefinitionsSlotPreparer(ctx context.Context, resourceGroupName string, name string, slot string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "slot": autorest.Encode("path", slot), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/metricdefinitions", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListMetricDefinitionsSlotSender sends the ListMetricDefinitionsSlot request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) ListMetricDefinitionsSlotSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// ListMetricDefinitionsSlotResponder handles the response to the ListMetricDefinitionsSlot request. The method always -// closes the http.Response Body. -func (client AppsClient) ListMetricDefinitionsSlotResponder(resp *http.Response) (result ResourceMetricDefinitionCollection, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// listMetricDefinitionsSlotNextResults retrieves the next set of results, if any. -func (client AppsClient) listMetricDefinitionsSlotNextResults(ctx context.Context, lastResults ResourceMetricDefinitionCollection) (result ResourceMetricDefinitionCollection, err error) { - req, err := lastResults.resourceMetricDefinitionCollectionPreparer(ctx) - if err != nil { - return result, autorest.NewErrorWithError(err, "web.AppsClient", "listMetricDefinitionsSlotNextResults", nil, "Failure preparing next results request") - } - if req == nil { - return - } - resp, err := client.ListMetricDefinitionsSlotSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - return result, autorest.NewErrorWithError(err, "web.AppsClient", "listMetricDefinitionsSlotNextResults", resp, "Failure sending next results request") - } - result, err = client.ListMetricDefinitionsSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "listMetricDefinitionsSlotNextResults", resp, "Failure responding to next results request") - } - return -} - -// ListMetricDefinitionsSlotComplete enumerates all values, automatically crossing page boundaries as required. -func (client AppsClient) ListMetricDefinitionsSlotComplete(ctx context.Context, resourceGroupName string, name string, slot string) (result ResourceMetricDefinitionCollectionIterator, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListMetricDefinitionsSlot") - defer func() { - sc := -1 - if result.Response().Response.Response != nil { - sc = result.page.Response().Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - result.page, err = client.ListMetricDefinitionsSlot(ctx, resourceGroupName, name, slot) - return -} - -// ListMetrics gets performance metrics of an app (or deployment slot, if specified). -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - name of the app. -// details - specify "true" to include metric details in the response. It is "false" by default. -// filter - return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value -// eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq -// 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'. -func (client AppsClient) ListMetrics(ctx context.Context, resourceGroupName string, name string, details *bool, filter string) (result ResourceMetricCollectionPage, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListMetrics") - defer func() { - sc := -1 - if result.rmc.Response.Response != nil { - sc = result.rmc.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "ListMetrics", err.Error()) - } - - result.fn = client.listMetricsNextResults - req, err := client.ListMetricsPreparer(ctx, resourceGroupName, name, details, filter) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListMetrics", nil, "Failure preparing request") - return - } - - resp, err := client.ListMetricsSender(req) - if err != nil { - result.rmc.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListMetrics", resp, "Failure sending request") - return - } - - result.rmc, err = client.ListMetricsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListMetrics", resp, "Failure responding to request") - } - - return -} - -// ListMetricsPreparer prepares the ListMetrics request. -func (client AppsClient) ListMetricsPreparer(ctx context.Context, resourceGroupName string, name string, details *bool, filter string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - if details != nil { - queryParameters["details"] = autorest.Encode("query", *details) - } - if len(filter) > 0 { - queryParameters["$filter"] = filter - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/metrics", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListMetricsSender sends the ListMetrics request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) ListMetricsSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// ListMetricsResponder handles the response to the ListMetrics request. The method always -// closes the http.Response Body. -func (client AppsClient) ListMetricsResponder(resp *http.Response) (result ResourceMetricCollection, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// listMetricsNextResults retrieves the next set of results, if any. -func (client AppsClient) listMetricsNextResults(ctx context.Context, lastResults ResourceMetricCollection) (result ResourceMetricCollection, err error) { - req, err := lastResults.resourceMetricCollectionPreparer(ctx) - if err != nil { - return result, autorest.NewErrorWithError(err, "web.AppsClient", "listMetricsNextResults", nil, "Failure preparing next results request") - } - if req == nil { - return - } - resp, err := client.ListMetricsSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - return result, autorest.NewErrorWithError(err, "web.AppsClient", "listMetricsNextResults", resp, "Failure sending next results request") - } - result, err = client.ListMetricsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "listMetricsNextResults", resp, "Failure responding to next results request") - } - return -} - -// ListMetricsComplete enumerates all values, automatically crossing page boundaries as required. -func (client AppsClient) ListMetricsComplete(ctx context.Context, resourceGroupName string, name string, details *bool, filter string) (result ResourceMetricCollectionIterator, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListMetrics") - defer func() { - sc := -1 - if result.Response().Response.Response != nil { - sc = result.page.Response().Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - result.page, err = client.ListMetrics(ctx, resourceGroupName, name, details, filter) - return -} - -// ListMetricsSlot gets performance metrics of an app (or deployment slot, if specified). -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - name of the app. -// slot - name of the deployment slot. If a slot is not specified, the API will get metrics of the production -// slot. -// details - specify "true" to include metric details in the response. It is "false" by default. -// filter - return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value -// eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq -// 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'. -func (client AppsClient) ListMetricsSlot(ctx context.Context, resourceGroupName string, name string, slot string, details *bool, filter string) (result ResourceMetricCollectionPage, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListMetricsSlot") - defer func() { - sc := -1 - if result.rmc.Response.Response != nil { - sc = result.rmc.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "ListMetricsSlot", err.Error()) - } - - result.fn = client.listMetricsSlotNextResults - req, err := client.ListMetricsSlotPreparer(ctx, resourceGroupName, name, slot, details, filter) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListMetricsSlot", nil, "Failure preparing request") - return - } - - resp, err := client.ListMetricsSlotSender(req) - if err != nil { - result.rmc.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListMetricsSlot", resp, "Failure sending request") - return - } - - result.rmc, err = client.ListMetricsSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListMetricsSlot", resp, "Failure responding to request") - } - - return -} - -// ListMetricsSlotPreparer prepares the ListMetricsSlot request. -func (client AppsClient) ListMetricsSlotPreparer(ctx context.Context, resourceGroupName string, name string, slot string, details *bool, filter string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "slot": autorest.Encode("path", slot), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - if details != nil { - queryParameters["details"] = autorest.Encode("query", *details) - } - if len(filter) > 0 { - queryParameters["$filter"] = filter - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/metrics", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListMetricsSlotSender sends the ListMetricsSlot request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) ListMetricsSlotSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// ListMetricsSlotResponder handles the response to the ListMetricsSlot request. The method always -// closes the http.Response Body. -func (client AppsClient) ListMetricsSlotResponder(resp *http.Response) (result ResourceMetricCollection, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// listMetricsSlotNextResults retrieves the next set of results, if any. -func (client AppsClient) listMetricsSlotNextResults(ctx context.Context, lastResults ResourceMetricCollection) (result ResourceMetricCollection, err error) { - req, err := lastResults.resourceMetricCollectionPreparer(ctx) - if err != nil { - return result, autorest.NewErrorWithError(err, "web.AppsClient", "listMetricsSlotNextResults", nil, "Failure preparing next results request") - } - if req == nil { - return - } - resp, err := client.ListMetricsSlotSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - return result, autorest.NewErrorWithError(err, "web.AppsClient", "listMetricsSlotNextResults", resp, "Failure sending next results request") - } - result, err = client.ListMetricsSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "listMetricsSlotNextResults", resp, "Failure responding to next results request") - } - return -} - -// ListMetricsSlotComplete enumerates all values, automatically crossing page boundaries as required. -func (client AppsClient) ListMetricsSlotComplete(ctx context.Context, resourceGroupName string, name string, slot string, details *bool, filter string) (result ResourceMetricCollectionIterator, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListMetricsSlot") - defer func() { - sc := -1 - if result.Response().Response.Response != nil { - sc = result.page.Response().Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - result.page, err = client.ListMetricsSlot(ctx, resourceGroupName, name, slot, details, filter) - return -} - -// ListNetworkFeatures gets all network features used by the app (or deployment slot, if specified). +// ListNetworkFeatures description for Gets all network features used by the app (or deployment slot, if specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -22268,7 +20696,7 @@ func (client AppsClient) ListNetworkFeaturesPreparer(ctx context.Context, resour "view": autorest.Encode("path", view), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -22301,7 +20729,8 @@ func (client AppsClient) ListNetworkFeaturesResponder(resp *http.Response) (resu return } -// ListNetworkFeaturesSlot gets all network features used by the app (or deployment slot, if specified). +// ListNetworkFeaturesSlot description for Gets all network features used by the app (or deployment slot, if +// specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -22358,7 +20787,7 @@ func (client AppsClient) ListNetworkFeaturesSlotPreparer(ctx context.Context, re "view": autorest.Encode("path", view), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -22391,7 +20820,7 @@ func (client AppsClient) ListNetworkFeaturesSlotResponder(resp *http.Response) ( return } -// ListPerfMonCounters gets perfmon counters for web app. +// ListPerfMonCounters description for Gets perfmon counters for web app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -22447,7 +20876,7 @@ func (client AppsClient) ListPerfMonCountersPreparer(ctx context.Context, resour "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -22520,7 +20949,7 @@ func (client AppsClient) ListPerfMonCountersComplete(ctx context.Context, resour return } -// ListPerfMonCountersSlot gets perfmon counters for web app. +// ListPerfMonCountersSlot description for Gets perfmon counters for web app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -22578,7 +21007,7 @@ func (client AppsClient) ListPerfMonCountersSlotPreparer(ctx context.Context, re "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -22651,7 +21080,7 @@ func (client AppsClient) ListPerfMonCountersSlotComplete(ctx context.Context, re return } -// ListPremierAddOns gets the premier add-ons of an app. +// ListPremierAddOns description for Gets the premier add-ons of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -22703,7 +21132,7 @@ func (client AppsClient) ListPremierAddOnsPreparer(ctx context.Context, resource "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -22736,7 +21165,7 @@ func (client AppsClient) ListPremierAddOnsResponder(resp *http.Response) (result return } -// ListPremierAddOnsSlot gets the premier add-ons of an app. +// ListPremierAddOnsSlot description for Gets the premier add-ons of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -22791,7 +21220,7 @@ func (client AppsClient) ListPremierAddOnsSlotPreparer(ctx context.Context, reso "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -22824,8 +21253,8 @@ func (client AppsClient) ListPremierAddOnsSlotResponder(resp *http.Response) (re return } -// ListProcesses get list of processes for a web site, or a deployment slot, or for a specific scaled-out instance in a -// web site. +// ListProcesses description for Get list of processes for a web site, or a deployment slot, or for a specific +// scaled-out instance in a web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -22878,7 +21307,7 @@ func (client AppsClient) ListProcessesPreparer(ctx context.Context, resourceGrou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -22948,8 +21377,8 @@ func (client AppsClient) ListProcessesComplete(ctx context.Context, resourceGrou return } -// ListProcessesSlot get list of processes for a web site, or a deployment slot, or for a specific scaled-out instance -// in a web site. +// ListProcessesSlot description for Get list of processes for a web site, or a deployment slot, or for a specific +// scaled-out instance in a web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -23005,7 +21434,7 @@ func (client AppsClient) ListProcessesSlotPreparer(ctx context.Context, resource "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -23075,7 +21504,8 @@ func (client AppsClient) ListProcessesSlotComplete(ctx context.Context, resource return } -// ListProcessModules list module information for a process by its ID for a specific scaled-out instance in a web site. +// ListProcessModules description for List module information for a process by its ID for a specific scaled-out +// instance in a web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -23130,7 +21560,7 @@ func (client AppsClient) ListProcessModulesPreparer(ctx context.Context, resourc "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -23200,8 +21630,8 @@ func (client AppsClient) ListProcessModulesComplete(ctx context.Context, resourc return } -// ListProcessModulesSlot list module information for a process by its ID for a specific scaled-out instance in a web -// site. +// ListProcessModulesSlot description for List module information for a process by its ID for a specific scaled-out +// instance in a web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -23259,7 +21689,7 @@ func (client AppsClient) ListProcessModulesSlotPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -23329,7 +21759,8 @@ func (client AppsClient) ListProcessModulesSlotComplete(ctx context.Context, res return } -// ListProcessThreads list the threads in a process by its ID for a specific scaled-out instance in a web site. +// ListProcessThreads description for List the threads in a process by its ID for a specific scaled-out instance in a +// web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -23384,7 +21815,7 @@ func (client AppsClient) ListProcessThreadsPreparer(ctx context.Context, resourc "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -23454,7 +21885,8 @@ func (client AppsClient) ListProcessThreadsComplete(ctx context.Context, resourc return } -// ListProcessThreadsSlot list the threads in a process by its ID for a specific scaled-out instance in a web site. +// ListProcessThreadsSlot description for List the threads in a process by its ID for a specific scaled-out instance in +// a web site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -23512,7 +21944,7 @@ func (client AppsClient) ListProcessThreadsSlotPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -23582,7 +22014,7 @@ func (client AppsClient) ListProcessThreadsSlotComplete(ctx context.Context, res return } -// ListPublicCertificates get public certificates for an app or a deployment slot. +// ListPublicCertificates description for Get public certificates for an app or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -23635,7 +22067,7 @@ func (client AppsClient) ListPublicCertificatesPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -23705,7 +22137,7 @@ func (client AppsClient) ListPublicCertificatesComplete(ctx context.Context, res return } -// ListPublicCertificatesSlot get public certificates for an app or a deployment slot. +// ListPublicCertificatesSlot description for Get public certificates for an app or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -23761,7 +22193,7 @@ func (client AppsClient) ListPublicCertificatesSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -23831,7 +22263,7 @@ func (client AppsClient) ListPublicCertificatesSlotComplete(ctx context.Context, return } -// ListPublishingCredentials gets the Git/FTP publishing credentials of an app. +// ListPublishingCredentials description for Gets the Git/FTP publishing credentials of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -23877,7 +22309,7 @@ func (client AppsClient) ListPublishingCredentialsPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -23916,7 +22348,7 @@ func (client AppsClient) ListPublishingCredentialsResponder(resp *http.Response) return } -// ListPublishingCredentialsSlot gets the Git/FTP publishing credentials of an app. +// ListPublishingCredentialsSlot description for Gets the Git/FTP publishing credentials of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -23965,7 +22397,7 @@ func (client AppsClient) ListPublishingCredentialsSlotPreparer(ctx context.Conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -24004,7 +22436,8 @@ func (client AppsClient) ListPublishingCredentialsSlotResponder(resp *http.Respo return } -// ListPublishingProfileXMLWithSecrets gets the publishing profile for an app (or deployment slot, if specified). +// ListPublishingProfileXMLWithSecrets description for Gets the publishing profile for an app (or deployment slot, if +// specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -24058,7 +22491,7 @@ func (client AppsClient) ListPublishingProfileXMLWithSecretsPreparer(ctx context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -24092,7 +22525,8 @@ func (client AppsClient) ListPublishingProfileXMLWithSecretsResponder(resp *http return } -// ListPublishingProfileXMLWithSecretsSlot gets the publishing profile for an app (or deployment slot, if specified). +// ListPublishingProfileXMLWithSecretsSlot description for Gets the publishing profile for an app (or deployment slot, +// if specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -24149,7 +22583,7 @@ func (client AppsClient) ListPublishingProfileXMLWithSecretsSlotPreparer(ctx con "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -24183,7 +22617,8 @@ func (client AppsClient) ListPublishingProfileXMLWithSecretsSlotResponder(resp * return } -// ListRelayServiceConnections gets hybrid connections configured for an app (or deployment slot, if specified). +// ListRelayServiceConnections description for Gets hybrid connections configured for an app (or deployment slot, if +// specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -24235,7 +22670,7 @@ func (client AppsClient) ListRelayServiceConnectionsPreparer(ctx context.Context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -24268,7 +22703,8 @@ func (client AppsClient) ListRelayServiceConnectionsResponder(resp *http.Respons return } -// ListRelayServiceConnectionsSlot gets hybrid connections configured for an app (or deployment slot, if specified). +// ListRelayServiceConnectionsSlot description for Gets hybrid connections configured for an app (or deployment slot, +// if specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -24323,7 +22759,7 @@ func (client AppsClient) ListRelayServiceConnectionsSlotPreparer(ctx context.Con "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -24356,7 +22792,256 @@ func (client AppsClient) ListRelayServiceConnectionsSlotResponder(resp *http.Res return } -// ListSiteExtensions get list of siteextensions for a web site, or a deployment slot. +// ListSiteBackups description for Gets existing backups of an app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +func (client AppsClient) ListSiteBackups(ctx context.Context, resourceGroupName string, name string) (result BackupItemCollectionPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListSiteBackups") + defer func() { + sc := -1 + if result.bic.Response.Response != nil { + sc = result.bic.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("web.AppsClient", "ListSiteBackups", err.Error()) + } + + result.fn = client.listSiteBackupsNextResults + req, err := client.ListSiteBackupsPreparer(ctx, resourceGroupName, name) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppsClient", "ListSiteBackups", nil, "Failure preparing request") + return + } + + resp, err := client.ListSiteBackupsSender(req) + if err != nil { + result.bic.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "web.AppsClient", "ListSiteBackups", resp, "Failure sending request") + return + } + + result.bic, err = client.ListSiteBackupsResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppsClient", "ListSiteBackups", resp, "Failure responding to request") + } + + return +} + +// ListSiteBackupsPreparer prepares the ListSiteBackups request. +func (client AppsClient) ListSiteBackupsPreparer(ctx context.Context, resourceGroupName string, name string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "name": autorest.Encode("path", name), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-08-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/listbackups", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSiteBackupsSender sends the ListSiteBackups request. The method will close the +// http.Response Body if it receives an error. +func (client AppsClient) ListSiteBackupsSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// ListSiteBackupsResponder handles the response to the ListSiteBackups request. The method always +// closes the http.Response Body. +func (client AppsClient) ListSiteBackupsResponder(resp *http.Response) (result BackupItemCollection, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listSiteBackupsNextResults retrieves the next set of results, if any. +func (client AppsClient) listSiteBackupsNextResults(ctx context.Context, lastResults BackupItemCollection) (result BackupItemCollection, err error) { + req, err := lastResults.backupItemCollectionPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "web.AppsClient", "listSiteBackupsNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSiteBackupsSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "web.AppsClient", "listSiteBackupsNextResults", resp, "Failure sending next results request") + } + result, err = client.ListSiteBackupsResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppsClient", "listSiteBackupsNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListSiteBackupsComplete enumerates all values, automatically crossing page boundaries as required. +func (client AppsClient) ListSiteBackupsComplete(ctx context.Context, resourceGroupName string, name string) (result BackupItemCollectionIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListSiteBackups") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.ListSiteBackups(ctx, resourceGroupName, name) + return +} + +// ListSiteBackupsSlot description for Gets existing backups of an app. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the app. +// slot - name of the deployment slot. If a slot is not specified, the API will get backups of the production +// slot. +func (client AppsClient) ListSiteBackupsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result BackupItemCollectionPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListSiteBackupsSlot") + defer func() { + sc := -1 + if result.bic.Response.Response != nil { + sc = result.bic.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("web.AppsClient", "ListSiteBackupsSlot", err.Error()) + } + + result.fn = client.listSiteBackupsSlotNextResults + req, err := client.ListSiteBackupsSlotPreparer(ctx, resourceGroupName, name, slot) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppsClient", "ListSiteBackupsSlot", nil, "Failure preparing request") + return + } + + resp, err := client.ListSiteBackupsSlotSender(req) + if err != nil { + result.bic.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "web.AppsClient", "ListSiteBackupsSlot", resp, "Failure sending request") + return + } + + result.bic, err = client.ListSiteBackupsSlotResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppsClient", "ListSiteBackupsSlot", resp, "Failure responding to request") + } + + return +} + +// ListSiteBackupsSlotPreparer prepares the ListSiteBackupsSlot request. +func (client AppsClient) ListSiteBackupsSlotPreparer(ctx context.Context, resourceGroupName string, name string, slot string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "name": autorest.Encode("path", name), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "slot": autorest.Encode("path", slot), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-08-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/listbackups", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSiteBackupsSlotSender sends the ListSiteBackupsSlot request. The method will close the +// http.Response Body if it receives an error. +func (client AppsClient) ListSiteBackupsSlotSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// ListSiteBackupsSlotResponder handles the response to the ListSiteBackupsSlot request. The method always +// closes the http.Response Body. +func (client AppsClient) ListSiteBackupsSlotResponder(resp *http.Response) (result BackupItemCollection, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listSiteBackupsSlotNextResults retrieves the next set of results, if any. +func (client AppsClient) listSiteBackupsSlotNextResults(ctx context.Context, lastResults BackupItemCollection) (result BackupItemCollection, err error) { + req, err := lastResults.backupItemCollectionPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "web.AppsClient", "listSiteBackupsSlotNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSiteBackupsSlotSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "web.AppsClient", "listSiteBackupsSlotNextResults", resp, "Failure sending next results request") + } + result, err = client.ListSiteBackupsSlotResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppsClient", "listSiteBackupsSlotNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListSiteBackupsSlotComplete enumerates all values, automatically crossing page boundaries as required. +func (client AppsClient) ListSiteBackupsSlotComplete(ctx context.Context, resourceGroupName string, name string, slot string) (result BackupItemCollectionIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListSiteBackupsSlot") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.ListSiteBackupsSlot(ctx, resourceGroupName, name, slot) + return +} + +// ListSiteExtensions description for Get list of siteextensions for a web site, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -24409,7 +23094,7 @@ func (client AppsClient) ListSiteExtensionsPreparer(ctx context.Context, resourc "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -24479,12 +23164,11 @@ func (client AppsClient) ListSiteExtensionsComplete(ctx context.Context, resourc return } -// ListSiteExtensionsSlot get list of siteextensions for a web site, or a deployment slot. +// ListSiteExtensionsSlot description for Get list of siteextensions for a web site, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. -// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the -// production slot. +// slot - name of the deployment slot. If a slot is not specified, the API uses the production slot. func (client AppsClient) ListSiteExtensionsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result SiteExtensionInfoCollectionPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListSiteExtensionsSlot") @@ -24535,7 +23219,7 @@ func (client AppsClient) ListSiteExtensionsSlotPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -24605,7 +23289,7 @@ func (client AppsClient) ListSiteExtensionsSlotComplete(ctx context.Context, res return } -// ListSitePushSettings gets the Push settings associated with web app. +// ListSitePushSettings description for Gets the Push settings associated with web app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -24657,7 +23341,7 @@ func (client AppsClient) ListSitePushSettingsPreparer(ctx context.Context, resou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -24690,7 +23374,7 @@ func (client AppsClient) ListSitePushSettingsResponder(resp *http.Response) (res return } -// ListSitePushSettingsSlot gets the Push settings associated with web app. +// ListSitePushSettingsSlot description for Gets the Push settings associated with web app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -24744,7 +23428,7 @@ func (client AppsClient) ListSitePushSettingsSlotPreparer(ctx context.Context, r "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -24777,8 +23461,8 @@ func (client AppsClient) ListSitePushSettingsSlotResponder(resp *http.Response) return } -// ListSlotConfigurationNames gets the names of app settings and connection strings that stick to the slot (not -// swapped). +// ListSlotConfigurationNames description for Gets the names of app settings and connection strings that stick to the +// slot (not swapped). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -24830,7 +23514,7 @@ func (client AppsClient) ListSlotConfigurationNamesPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -24863,7 +23547,8 @@ func (client AppsClient) ListSlotConfigurationNamesResponder(resp *http.Response return } -// ListSlotDifferencesFromProduction get the difference in configuration settings between two web app slots. +// ListSlotDifferencesFromProduction description for Get the difference in configuration settings between two web app +// slots. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -24920,7 +23605,7 @@ func (client AppsClient) ListSlotDifferencesFromProductionPreparer(ctx context.C "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -24992,7 +23677,7 @@ func (client AppsClient) ListSlotDifferencesFromProductionComplete(ctx context.C return } -// ListSlotDifferencesSlot get the difference in configuration settings between two web app slots. +// ListSlotDifferencesSlot description for Get the difference in configuration settings between two web app slots. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -25051,7 +23736,7 @@ func (client AppsClient) ListSlotDifferencesSlotPreparer(ctx context.Context, re "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -25123,7 +23808,7 @@ func (client AppsClient) ListSlotDifferencesSlotComplete(ctx context.Context, re return } -// ListSlots gets an app's deployment slots. +// ListSlots description for Gets an app's deployment slots. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -25176,7 +23861,7 @@ func (client AppsClient) ListSlotsPreparer(ctx context.Context, resourceGroupNam "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -25246,7 +23931,7 @@ func (client AppsClient) ListSlotsComplete(ctx context.Context, resourceGroupNam return } -// ListSnapshots returns all Snapshots to the user. +// ListSnapshots description for Returns all Snapshots to the user. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - website Name. @@ -25299,7 +23984,7 @@ func (client AppsClient) ListSnapshotsPreparer(ctx context.Context, resourceGrou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -25369,7 +24054,7 @@ func (client AppsClient) ListSnapshotsComplete(ctx context.Context, resourceGrou return } -// ListSnapshotsFromDRSecondary returns all Snapshots to the user from DRSecondary endpoint. +// ListSnapshotsFromDRSecondary description for Returns all Snapshots to the user from DRSecondary endpoint. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - website Name. @@ -25422,7 +24107,7 @@ func (client AppsClient) ListSnapshotsFromDRSecondaryPreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -25492,7 +24177,7 @@ func (client AppsClient) ListSnapshotsFromDRSecondaryComplete(ctx context.Contex return } -// ListSnapshotsFromDRSecondarySlot returns all Snapshots to the user from DRSecondary endpoint. +// ListSnapshotsFromDRSecondarySlot description for Returns all Snapshots to the user from DRSecondary endpoint. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - website Name. @@ -25547,7 +24232,7 @@ func (client AppsClient) ListSnapshotsFromDRSecondarySlotPreparer(ctx context.Co "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -25617,7 +24302,7 @@ func (client AppsClient) ListSnapshotsFromDRSecondarySlotComplete(ctx context.Co return } -// ListSnapshotsSlot returns all Snapshots to the user. +// ListSnapshotsSlot description for Returns all Snapshots to the user. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - website Name. @@ -25672,7 +24357,7 @@ func (client AppsClient) ListSnapshotsSlotPreparer(ctx context.Context, resource "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -25742,7 +24427,7 @@ func (client AppsClient) ListSnapshotsSlotComplete(ctx context.Context, resource return } -// ListSyncFunctionTriggers this is to allow calling via powershell and ARM template. +// ListSyncFunctionTriggers description for This is to allow calling via powershell and ARM template. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -25794,7 +24479,7 @@ func (client AppsClient) ListSyncFunctionTriggersPreparer(ctx context.Context, r "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -25827,7 +24512,7 @@ func (client AppsClient) ListSyncFunctionTriggersResponder(resp *http.Response) return } -// ListSyncFunctionTriggersSlot this is to allow calling via powershell and ARM template. +// ListSyncFunctionTriggersSlot description for This is to allow calling via powershell and ARM template. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -25881,7 +24566,7 @@ func (client AppsClient) ListSyncFunctionTriggersSlotPreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -25914,177 +24599,7 @@ func (client AppsClient) ListSyncFunctionTriggersSlotResponder(resp *http.Respon return } -// ListSyncStatus this is to allow calling via powershell and ARM template. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - name of the app. -func (client AppsClient) ListSyncStatus(ctx context.Context, resourceGroupName string, name string) (result autorest.Response, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListSyncStatus") - defer func() { - sc := -1 - if result.Response != nil { - sc = result.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "ListSyncStatus", err.Error()) - } - - req, err := client.ListSyncStatusPreparer(ctx, resourceGroupName, name) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListSyncStatus", nil, "Failure preparing request") - return - } - - resp, err := client.ListSyncStatusSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListSyncStatus", resp, "Failure sending request") - return - } - - result, err = client.ListSyncStatusResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListSyncStatus", resp, "Failure responding to request") - } - - return -} - -// ListSyncStatusPreparer prepares the ListSyncStatus request. -func (client AppsClient) ListSyncStatusPreparer(ctx context.Context, resourceGroupName string, name string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsPost(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/host/default/listsyncstatus", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListSyncStatusSender sends the ListSyncStatus request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) ListSyncStatusSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// ListSyncStatusResponder handles the response to the ListSyncStatus request. The method always -// closes the http.Response Body. -func (client AppsClient) ListSyncStatusResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent), - autorest.ByClosing()) - result.Response = resp - return -} - -// ListSyncStatusSlot this is to allow calling via powershell and ARM template. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - name of the app. -// slot - name of the deployment slot. -func (client AppsClient) ListSyncStatusSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result autorest.Response, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListSyncStatusSlot") - defer func() { - sc := -1 - if result.Response != nil { - sc = result.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "ListSyncStatusSlot", err.Error()) - } - - req, err := client.ListSyncStatusSlotPreparer(ctx, resourceGroupName, name, slot) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListSyncStatusSlot", nil, "Failure preparing request") - return - } - - resp, err := client.ListSyncStatusSlotSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListSyncStatusSlot", resp, "Failure sending request") - return - } - - result, err = client.ListSyncStatusSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "ListSyncStatusSlot", resp, "Failure responding to request") - } - - return -} - -// ListSyncStatusSlotPreparer prepares the ListSyncStatusSlot request. -func (client AppsClient) ListSyncStatusSlotPreparer(ctx context.Context, resourceGroupName string, name string, slot string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "slot": autorest.Encode("path", slot), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsPost(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/host/default/listsyncstatus", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListSyncStatusSlotSender sends the ListSyncStatusSlot request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) ListSyncStatusSlotSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// ListSyncStatusSlotResponder handles the response to the ListSyncStatusSlot request. The method always -// closes the http.Response Body. -func (client AppsClient) ListSyncStatusSlotResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent), - autorest.ByClosing()) - result.Response = resp - return -} - -// ListTriggeredWebJobHistory list a triggered web job's history for an app, or a deployment slot. +// ListTriggeredWebJobHistory description for List a triggered web job's history for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -26139,7 +24654,7 @@ func (client AppsClient) ListTriggeredWebJobHistoryPreparer(ctx context.Context, "webJobName": autorest.Encode("path", webJobName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -26209,13 +24724,12 @@ func (client AppsClient) ListTriggeredWebJobHistoryComplete(ctx context.Context, return } -// ListTriggeredWebJobHistorySlot list a triggered web job's history for an app, or a deployment slot. +// ListTriggeredWebJobHistorySlot description for List a triggered web job's history for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. // webJobName - name of Web Job. -// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the -// production slot. +// slot - name of the deployment slot. If a slot is not specified, the API uses the production slot. func (client AppsClient) ListTriggeredWebJobHistorySlot(ctx context.Context, resourceGroupName string, name string, webJobName string, slot string) (result TriggeredJobHistoryCollectionPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListTriggeredWebJobHistorySlot") @@ -26267,7 +24781,7 @@ func (client AppsClient) ListTriggeredWebJobHistorySlotPreparer(ctx context.Cont "webJobName": autorest.Encode("path", webJobName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -26337,7 +24851,7 @@ func (client AppsClient) ListTriggeredWebJobHistorySlotComplete(ctx context.Cont return } -// ListTriggeredWebJobs list triggered web jobs for an app, or a deployment slot. +// ListTriggeredWebJobs description for List triggered web jobs for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -26390,7 +24904,7 @@ func (client AppsClient) ListTriggeredWebJobsPreparer(ctx context.Context, resou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -26460,7 +24974,7 @@ func (client AppsClient) ListTriggeredWebJobsComplete(ctx context.Context, resou return } -// ListTriggeredWebJobsSlot list triggered web jobs for an app, or a deployment slot. +// ListTriggeredWebJobsSlot description for List triggered web jobs for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -26516,7 +25030,7 @@ func (client AppsClient) ListTriggeredWebJobsSlotPreparer(ctx context.Context, r "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -26586,7 +25100,7 @@ func (client AppsClient) ListTriggeredWebJobsSlotComplete(ctx context.Context, r return } -// ListUsages gets the quota usage information of an app (or deployment slot, if specified). +// ListUsages description for Gets the quota usage information of an app (or deployment slot, if specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -26642,7 +25156,7 @@ func (client AppsClient) ListUsagesPreparer(ctx context.Context, resourceGroupNa "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -26715,7 +25229,7 @@ func (client AppsClient) ListUsagesComplete(ctx context.Context, resourceGroupNa return } -// ListUsagesSlot gets the quota usage information of an app (or deployment slot, if specified). +// ListUsagesSlot description for Gets the quota usage information of an app (or deployment slot, if specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -26774,7 +25288,7 @@ func (client AppsClient) ListUsagesSlotPreparer(ctx context.Context, resourceGro "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -26847,7 +25361,7 @@ func (client AppsClient) ListUsagesSlotComplete(ctx context.Context, resourceGro return } -// ListVnetConnections gets the virtual networks the app (or deployment slot) is connected to. +// ListVnetConnections description for Gets the virtual networks the app (or deployment slot) is connected to. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -26899,7 +25413,7 @@ func (client AppsClient) ListVnetConnectionsPreparer(ctx context.Context, resour "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -26932,7 +25446,7 @@ func (client AppsClient) ListVnetConnectionsResponder(resp *http.Response) (resu return } -// ListVnetConnectionsSlot gets the virtual networks the app (or deployment slot) is connected to. +// ListVnetConnectionsSlot description for Gets the virtual networks the app (or deployment slot) is connected to. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -26987,7 +25501,7 @@ func (client AppsClient) ListVnetConnectionsSlotPreparer(ctx context.Context, re "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -27020,7 +25534,7 @@ func (client AppsClient) ListVnetConnectionsSlotResponder(resp *http.Response) ( return } -// ListWebJobs list webjobs for an app, or a deployment slot. +// ListWebJobs description for List webjobs for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -27073,7 +25587,7 @@ func (client AppsClient) ListWebJobsPreparer(ctx context.Context, resourceGroupN "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -27143,7 +25657,7 @@ func (client AppsClient) ListWebJobsComplete(ctx context.Context, resourceGroupN return } -// ListWebJobsSlot list webjobs for an app, or a deployment slot. +// ListWebJobsSlot description for List webjobs for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -27199,7 +25713,7 @@ func (client AppsClient) ListWebJobsSlotPreparer(ctx context.Context, resourceGr "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -27269,7 +25783,7 @@ func (client AppsClient) ListWebJobsSlotComplete(ctx context.Context, resourceGr return } -// MigrateMySQL migrates a local (in-app) MySql database to a remote MySql database. +// MigrateMySQL description for Migrates a local (in-app) MySql database to a remote MySql database. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -27319,7 +25833,7 @@ func (client AppsClient) MigrateMySQLPreparer(ctx context.Context, resourceGroup "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -27360,7 +25874,7 @@ func (client AppsClient) MigrateMySQLResponder(resp *http.Response) (result Oper return } -// MigrateStorage restores a web app. +// MigrateStorage description for Restores a web app. // Parameters: // subscriptionName - azure subscription. // resourceGroupName - name of the resource group to which the resource belongs. @@ -27413,7 +25927,7 @@ func (client AppsClient) MigrateStoragePreparer(ctx context.Context, subscriptio "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, "subscriptionName": autorest.Encode("query", subscriptionName), @@ -27455,8 +25969,8 @@ func (client AppsClient) MigrateStorageResponder(resp *http.Response) (result St return } -// PutPrivateAccessVnet sets data around private site access enablement and authorized Virtual Networks that can access -// the site. +// PutPrivateAccessVnet description for Sets data around private site access enablement and authorized Virtual Networks +// that can access the site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -27509,7 +26023,7 @@ func (client AppsClient) PutPrivateAccessVnetPreparer(ctx context.Context, resou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -27544,8 +26058,8 @@ func (client AppsClient) PutPrivateAccessVnetResponder(resp *http.Response) (res return } -// PutPrivateAccessVnetSlot sets data around private site access enablement and authorized Virtual Networks that can -// access the site. +// PutPrivateAccessVnetSlot description for Sets data around private site access enablement and authorized Virtual +// Networks that can access the site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -27600,7 +26114,7 @@ func (client AppsClient) PutPrivateAccessVnetSlotPreparer(ctx context.Context, r "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -27635,7 +26149,7 @@ func (client AppsClient) PutPrivateAccessVnetSlotResponder(resp *http.Response) return } -// RecoverSiteConfigurationSnapshot reverts the configuration of an app to a previous snapshot. +// RecoverSiteConfigurationSnapshot description for Reverts the configuration of an app to a previous snapshot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -27689,7 +26203,7 @@ func (client AppsClient) RecoverSiteConfigurationSnapshotPreparer(ctx context.Co "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -27721,7 +26235,7 @@ func (client AppsClient) RecoverSiteConfigurationSnapshotResponder(resp *http.Re return } -// RecoverSiteConfigurationSnapshotSlot reverts the configuration of an app to a previous snapshot. +// RecoverSiteConfigurationSnapshotSlot description for Reverts the configuration of an app to a previous snapshot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -27778,7 +26292,7 @@ func (client AppsClient) RecoverSiteConfigurationSnapshotSlotPreparer(ctx contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -27810,8 +26324,8 @@ func (client AppsClient) RecoverSiteConfigurationSnapshotSlotResponder(resp *htt return } -// ResetProductionSlotConfig resets the configuration settings of the current slot if they were previously modified by -// calling the API with POST. +// ResetProductionSlotConfig description for Resets the configuration settings of the current slot if they were +// previously modified by calling the API with POST. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -27863,7 +26377,7 @@ func (client AppsClient) ResetProductionSlotConfigPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -27895,8 +26409,8 @@ func (client AppsClient) ResetProductionSlotConfigResponder(resp *http.Response) return } -// ResetSlotConfigurationSlot resets the configuration settings of the current slot if they were previously modified by -// calling the API with POST. +// ResetSlotConfigurationSlot description for Resets the configuration settings of the current slot if they were +// previously modified by calling the API with POST. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -27951,7 +26465,7 @@ func (client AppsClient) ResetSlotConfigurationSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -27983,7 +26497,7 @@ func (client AppsClient) ResetSlotConfigurationSlotResponder(resp *http.Response return } -// Restart restarts an app (or deployment slot, if specified). +// Restart description for Restarts an app (or deployment slot, if specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -28039,7 +26553,7 @@ func (client AppsClient) RestartPreparer(ctx context.Context, resourceGroupName "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -28077,7 +26591,7 @@ func (client AppsClient) RestartResponder(resp *http.Response) (result autorest. return } -// RestartSlot restarts an app (or deployment slot, if specified). +// RestartSlot description for Restarts an app (or deployment slot, if specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -28135,7 +26649,7 @@ func (client AppsClient) RestartSlotPreparer(ctx context.Context, resourceGroupN "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -28173,7 +26687,7 @@ func (client AppsClient) RestartSlotResponder(resp *http.Response) (result autor return } -// Restore restores a specific backup to another app (or deployment slot, if specified). +// Restore description for Restores a specific backup to another app (or deployment slot, if specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -28227,7 +26741,7 @@ func (client AppsClient) RestorePreparer(ctx context.Context, resourceGroupName "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -28267,7 +26781,7 @@ func (client AppsClient) RestoreResponder(resp *http.Response) (result autorest. return } -// RestoreFromBackupBlob restores an app from a backup blob in Azure Storage. +// RestoreFromBackupBlob description for Restores an app from a backup blob in Azure Storage. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -28319,7 +26833,7 @@ func (client AppsClient) RestoreFromBackupBlobPreparer(ctx context.Context, reso "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -28359,7 +26873,7 @@ func (client AppsClient) RestoreFromBackupBlobResponder(resp *http.Response) (re return } -// RestoreFromBackupBlobSlot restores an app from a backup blob in Azure Storage. +// RestoreFromBackupBlobSlot description for Restores an app from a backup blob in Azure Storage. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -28414,7 +26928,7 @@ func (client AppsClient) RestoreFromBackupBlobSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -28454,7 +26968,7 @@ func (client AppsClient) RestoreFromBackupBlobSlotResponder(resp *http.Response) return } -// RestoreFromDeletedApp restores a deleted web app to this web app. +// RestoreFromDeletedApp description for Restores a deleted web app to this web app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -28501,7 +27015,7 @@ func (client AppsClient) RestoreFromDeletedAppPreparer(ctx context.Context, reso "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -28541,7 +27055,7 @@ func (client AppsClient) RestoreFromDeletedAppResponder(resp *http.Response) (re return } -// RestoreFromDeletedAppSlot restores a deleted web app to this web app. +// RestoreFromDeletedAppSlot description for Restores a deleted web app to this web app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -28590,7 +27104,7 @@ func (client AppsClient) RestoreFromDeletedAppSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -28630,7 +27144,7 @@ func (client AppsClient) RestoreFromDeletedAppSlotResponder(resp *http.Response) return } -// RestoreSlot restores a specific backup to another app (or deployment slot, if specified). +// RestoreSlot description for Restores a specific backup to another app (or deployment slot, if specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -28687,7 +27201,7 @@ func (client AppsClient) RestoreSlotPreparer(ctx context.Context, resourceGroupN "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -28727,7 +27241,7 @@ func (client AppsClient) RestoreSlotResponder(resp *http.Response) (result autor return } -// RestoreSnapshot restores a web app from a snapshot. +// RestoreSnapshot description for Restores a web app from a snapshot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -28778,7 +27292,7 @@ func (client AppsClient) RestoreSnapshotPreparer(ctx context.Context, resourceGr "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -28818,7 +27332,7 @@ func (client AppsClient) RestoreSnapshotResponder(resp *http.Response) (result a return } -// RestoreSnapshotSlot restores a web app from a snapshot. +// RestoreSnapshotSlot description for Restores a web app from a snapshot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -28871,7 +27385,7 @@ func (client AppsClient) RestoreSnapshotSlotPreparer(ctx context.Context, resour "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -28911,7 +27425,7 @@ func (client AppsClient) RestoreSnapshotSlotResponder(resp *http.Response) (resu return } -// RunTriggeredWebJob run a triggered web job for an app, or a deployment slot. +// RunTriggeredWebJob description for Run a triggered web job for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -28965,7 +27479,7 @@ func (client AppsClient) RunTriggeredWebJobPreparer(ctx context.Context, resourc "webJobName": autorest.Encode("path", webJobName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -28997,13 +27511,12 @@ func (client AppsClient) RunTriggeredWebJobResponder(resp *http.Response) (resul return } -// RunTriggeredWebJobSlot run a triggered web job for an app, or a deployment slot. +// RunTriggeredWebJobSlot description for Run a triggered web job for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. // webJobName - name of Web Job. -// slot - name of the deployment slot. If a slot is not specified, the API deletes a deployment for the -// production slot. +// slot - name of the deployment slot. If a slot is not specified, the API uses the production slot. func (client AppsClient) RunTriggeredWebJobSlot(ctx context.Context, resourceGroupName string, name string, webJobName string, slot string) (result autorest.Response, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.RunTriggeredWebJobSlot") @@ -29054,7 +27567,7 @@ func (client AppsClient) RunTriggeredWebJobSlotPreparer(ctx context.Context, res "webJobName": autorest.Encode("path", webJobName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -29086,7 +27599,7 @@ func (client AppsClient) RunTriggeredWebJobSlotResponder(resp *http.Response) (r return } -// Start starts an app (or deployment slot, if specified). +// Start description for Starts an app (or deployment slot, if specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -29138,7 +27651,7 @@ func (client AppsClient) StartPreparer(ctx context.Context, resourceGroupName st "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -29170,7 +27683,7 @@ func (client AppsClient) StartResponder(resp *http.Response) (result autorest.Re return } -// StartContinuousWebJob start a continuous web job for an app, or a deployment slot. +// StartContinuousWebJob description for Start a continuous web job for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -29224,7 +27737,7 @@ func (client AppsClient) StartContinuousWebJobPreparer(ctx context.Context, reso "webJobName": autorest.Encode("path", webJobName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -29256,7 +27769,7 @@ func (client AppsClient) StartContinuousWebJobResponder(resp *http.Response) (re return } -// StartContinuousWebJobSlot start a continuous web job for an app, or a deployment slot. +// StartContinuousWebJobSlot description for Start a continuous web job for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -29313,7 +27826,7 @@ func (client AppsClient) StartContinuousWebJobSlotPreparer(ctx context.Context, "webJobName": autorest.Encode("path", webJobName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -29345,7 +27858,7 @@ func (client AppsClient) StartContinuousWebJobSlotResponder(resp *http.Response) return } -// StartNetworkTrace start capturing network packets for the site. +// StartNetworkTrace description for Start capturing network packets for the site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -29394,7 +27907,7 @@ func (client AppsClient) StartNetworkTracePreparer(ctx context.Context, resource "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -29442,7 +27955,7 @@ func (client AppsClient) StartNetworkTraceResponder(resp *http.Response) (result return } -// StartNetworkTraceSlot start capturing network packets for the site. +// StartNetworkTraceSlot description for Start capturing network packets for the site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -29493,7 +28006,7 @@ func (client AppsClient) StartNetworkTraceSlotPreparer(ctx context.Context, reso "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -29541,7 +28054,7 @@ func (client AppsClient) StartNetworkTraceSlotResponder(resp *http.Response) (re return } -// StartSlot starts an app (or deployment slot, if specified). +// StartSlot description for Starts an app (or deployment slot, if specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -29595,7 +28108,7 @@ func (client AppsClient) StartSlotPreparer(ctx context.Context, resourceGroupNam "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -29627,7 +28140,7 @@ func (client AppsClient) StartSlotResponder(resp *http.Response) (result autores return } -// StartWebSiteNetworkTrace start capturing network packets for the site (To be deprecated). +// StartWebSiteNetworkTrace description for Start capturing network packets for the site (To be deprecated). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -29682,7 +28195,7 @@ func (client AppsClient) StartWebSiteNetworkTracePreparer(ctx context.Context, r "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -29724,7 +28237,7 @@ func (client AppsClient) StartWebSiteNetworkTraceResponder(resp *http.Response) return } -// StartWebSiteNetworkTraceOperation start capturing network packets for the site. +// StartWebSiteNetworkTraceOperation description for Start capturing network packets for the site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -29773,7 +28286,7 @@ func (client AppsClient) StartWebSiteNetworkTraceOperationPreparer(ctx context.C "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -29821,7 +28334,7 @@ func (client AppsClient) StartWebSiteNetworkTraceOperationResponder(resp *http.R return } -// StartWebSiteNetworkTraceOperationSlot start capturing network packets for the site. +// StartWebSiteNetworkTraceOperationSlot description for Start capturing network packets for the site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -29872,7 +28385,7 @@ func (client AppsClient) StartWebSiteNetworkTraceOperationSlotPreparer(ctx conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -29920,7 +28433,7 @@ func (client AppsClient) StartWebSiteNetworkTraceOperationSlotResponder(resp *ht return } -// StartWebSiteNetworkTraceSlot start capturing network packets for the site (To be deprecated). +// StartWebSiteNetworkTraceSlot description for Start capturing network packets for the site (To be deprecated). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -29977,7 +28490,7 @@ func (client AppsClient) StartWebSiteNetworkTraceSlotPreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -30019,7 +28532,7 @@ func (client AppsClient) StartWebSiteNetworkTraceSlotResponder(resp *http.Respon return } -// Stop stops an app (or deployment slot, if specified). +// Stop description for Stops an app (or deployment slot, if specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -30071,7 +28584,7 @@ func (client AppsClient) StopPreparer(ctx context.Context, resourceGroupName str "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -30103,7 +28616,7 @@ func (client AppsClient) StopResponder(resp *http.Response) (result autorest.Res return } -// StopContinuousWebJob stop a continuous web job for an app, or a deployment slot. +// StopContinuousWebJob description for Stop a continuous web job for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -30157,7 +28670,7 @@ func (client AppsClient) StopContinuousWebJobPreparer(ctx context.Context, resou "webJobName": autorest.Encode("path", webJobName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -30189,7 +28702,7 @@ func (client AppsClient) StopContinuousWebJobResponder(resp *http.Response) (res return } -// StopContinuousWebJobSlot stop a continuous web job for an app, or a deployment slot. +// StopContinuousWebJobSlot description for Stop a continuous web job for an app, or a deployment slot. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site name. @@ -30246,7 +28759,7 @@ func (client AppsClient) StopContinuousWebJobSlotPreparer(ctx context.Context, r "webJobName": autorest.Encode("path", webJobName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -30278,7 +28791,7 @@ func (client AppsClient) StopContinuousWebJobSlotResponder(resp *http.Response) return } -// StopNetworkTrace stop ongoing capturing network packets for the site. +// StopNetworkTrace description for Stop ongoing capturing network packets for the site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -30330,7 +28843,7 @@ func (client AppsClient) StopNetworkTracePreparer(ctx context.Context, resourceG "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -30362,7 +28875,7 @@ func (client AppsClient) StopNetworkTraceResponder(resp *http.Response) (result return } -// StopNetworkTraceSlot stop ongoing capturing network packets for the site. +// StopNetworkTraceSlot description for Stop ongoing capturing network packets for the site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -30416,7 +28929,7 @@ func (client AppsClient) StopNetworkTraceSlotPreparer(ctx context.Context, resou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -30448,7 +28961,7 @@ func (client AppsClient) StopNetworkTraceSlotResponder(resp *http.Response) (res return } -// StopSlot stops an app (or deployment slot, if specified). +// StopSlot description for Stops an app (or deployment slot, if specified). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -30502,7 +29015,7 @@ func (client AppsClient) StopSlotPreparer(ctx context.Context, resourceGroupName "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -30534,7 +29047,7 @@ func (client AppsClient) StopSlotResponder(resp *http.Response) (result autorest return } -// StopWebSiteNetworkTrace stop ongoing capturing network packets for the site. +// StopWebSiteNetworkTrace description for Stop ongoing capturing network packets for the site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -30586,7 +29099,7 @@ func (client AppsClient) StopWebSiteNetworkTracePreparer(ctx context.Context, re "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -30618,7 +29131,7 @@ func (client AppsClient) StopWebSiteNetworkTraceResponder(resp *http.Response) ( return } -// StopWebSiteNetworkTraceSlot stop ongoing capturing network packets for the site. +// StopWebSiteNetworkTraceSlot description for Stop ongoing capturing network packets for the site. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -30672,7 +29185,7 @@ func (client AppsClient) StopWebSiteNetworkTraceSlotPreparer(ctx context.Context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -30704,7 +29217,7 @@ func (client AppsClient) StopWebSiteNetworkTraceSlotResponder(resp *http.Respons return } -// SwapSlotSlot swaps two deployment slots of an app. +// SwapSlotSlot description for Swaps two deployment slots of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -30756,7 +29269,7 @@ func (client AppsClient) SwapSlotSlotPreparer(ctx context.Context, resourceGroup "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -30796,7 +29309,7 @@ func (client AppsClient) SwapSlotSlotResponder(resp *http.Response) (result auto return } -// SwapSlotWithProduction swaps two deployment slots of an app. +// SwapSlotWithProduction description for Swaps two deployment slots of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -30846,7 +29359,7 @@ func (client AppsClient) SwapSlotWithProductionPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -30886,177 +29399,7 @@ func (client AppsClient) SwapSlotWithProductionResponder(resp *http.Response) (r return } -// SyncFunctions syncs function trigger metadata to the management database -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - name of the app. -func (client AppsClient) SyncFunctions(ctx context.Context, resourceGroupName string, name string) (result autorest.Response, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.SyncFunctions") - defer func() { - sc := -1 - if result.Response != nil { - sc = result.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "SyncFunctions", err.Error()) - } - - req, err := client.SyncFunctionsPreparer(ctx, resourceGroupName, name) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "SyncFunctions", nil, "Failure preparing request") - return - } - - resp, err := client.SyncFunctionsSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "web.AppsClient", "SyncFunctions", resp, "Failure sending request") - return - } - - result, err = client.SyncFunctionsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "SyncFunctions", resp, "Failure responding to request") - } - - return -} - -// SyncFunctionsPreparer prepares the SyncFunctions request. -func (client AppsClient) SyncFunctionsPreparer(ctx context.Context, resourceGroupName string, name string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsPost(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/host/default/sync", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// SyncFunctionsSender sends the SyncFunctions request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) SyncFunctionsSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// SyncFunctionsResponder handles the response to the SyncFunctions request. The method always -// closes the http.Response Body. -func (client AppsClient) SyncFunctionsResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent), - autorest.ByClosing()) - result.Response = resp - return -} - -// SyncFunctionsSlot syncs function trigger metadata to the management database -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - name of the app. -// slot - name of the deployment slot. -func (client AppsClient) SyncFunctionsSlot(ctx context.Context, resourceGroupName string, name string, slot string) (result autorest.Response, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.SyncFunctionsSlot") - defer func() { - sc := -1 - if result.Response != nil { - sc = result.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppsClient", "SyncFunctionsSlot", err.Error()) - } - - req, err := client.SyncFunctionsSlotPreparer(ctx, resourceGroupName, name, slot) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "SyncFunctionsSlot", nil, "Failure preparing request") - return - } - - resp, err := client.SyncFunctionsSlotSender(req) - if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "web.AppsClient", "SyncFunctionsSlot", resp, "Failure sending request") - return - } - - result, err = client.SyncFunctionsSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppsClient", "SyncFunctionsSlot", resp, "Failure responding to request") - } - - return -} - -// SyncFunctionsSlotPreparer prepares the SyncFunctionsSlot request. -func (client AppsClient) SyncFunctionsSlotPreparer(ctx context.Context, resourceGroupName string, name string, slot string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "slot": autorest.Encode("path", slot), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsPost(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/host/default/sync", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// SyncFunctionsSlotSender sends the SyncFunctionsSlot request. The method will close the -// http.Response Body if it receives an error. -func (client AppsClient) SyncFunctionsSlotSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// SyncFunctionsSlotResponder handles the response to the SyncFunctionsSlot request. The method always -// closes the http.Response Body. -func (client AppsClient) SyncFunctionsSlotResponder(resp *http.Response) (result autorest.Response, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent), - autorest.ByClosing()) - result.Response = resp - return -} - -// SyncFunctionTriggers syncs function trigger metadata to the management database +// SyncFunctionTriggers description for Syncs function trigger metadata to the scale controller // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -31108,7 +29451,7 @@ func (client AppsClient) SyncFunctionTriggersPreparer(ctx context.Context, resou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -31140,7 +29483,7 @@ func (client AppsClient) SyncFunctionTriggersResponder(resp *http.Response) (res return } -// SyncFunctionTriggersSlot syncs function trigger metadata to the management database +// SyncFunctionTriggersSlot description for Syncs function trigger metadata to the scale controller // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -31194,7 +29537,7 @@ func (client AppsClient) SyncFunctionTriggersSlotPreparer(ctx context.Context, r "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -31226,7 +29569,7 @@ func (client AppsClient) SyncFunctionTriggersSlotResponder(resp *http.Response) return } -// SyncRepository sync web app repository. +// SyncRepository description for Sync web app repository. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -31278,7 +29621,7 @@ func (client AppsClient) SyncRepositoryPreparer(ctx context.Context, resourceGro "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -31310,7 +29653,7 @@ func (client AppsClient) SyncRepositoryResponder(resp *http.Response) (result au return } -// SyncRepositorySlot sync web app repository. +// SyncRepositorySlot description for Sync web app repository. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -31364,7 +29707,7 @@ func (client AppsClient) SyncRepositorySlotPreparer(ctx context.Context, resourc "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -31396,7 +29739,8 @@ func (client AppsClient) SyncRepositorySlotResponder(resp *http.Response) (resul return } -// Update creates a new web, mobile, or API app in an existing resource group, or updates an existing app. +// Update description for Creates a new web, mobile, or API app in an existing resource group, or updates an existing +// app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - unique name of the app to create or update. To create or update a deployment slot, use the {slot} @@ -31450,7 +29794,7 @@ func (client AppsClient) UpdatePreparer(ctx context.Context, resourceGroupName s "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -31485,7 +29829,7 @@ func (client AppsClient) UpdateResponder(resp *http.Response) (result Site, err return } -// UpdateApplicationSettings replaces the application settings of an app. +// UpdateApplicationSettings description for Replaces the application settings of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -31538,7 +29882,7 @@ func (client AppsClient) UpdateApplicationSettingsPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -31573,7 +29917,7 @@ func (client AppsClient) UpdateApplicationSettingsResponder(resp *http.Response) return } -// UpdateApplicationSettingsSlot replaces the application settings of an app. +// UpdateApplicationSettingsSlot description for Replaces the application settings of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -31629,7 +29973,7 @@ func (client AppsClient) UpdateApplicationSettingsSlotPreparer(ctx context.Conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -31664,7 +30008,7 @@ func (client AppsClient) UpdateApplicationSettingsSlotResponder(resp *http.Respo return } -// UpdateAuthSettings updates the Authentication / Authorization settings associated with web app. +// UpdateAuthSettings description for Updates the Authentication / Authorization settings associated with web app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -31717,7 +30061,7 @@ func (client AppsClient) UpdateAuthSettingsPreparer(ctx context.Context, resourc "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -31752,7 +30096,7 @@ func (client AppsClient) UpdateAuthSettingsResponder(resp *http.Response) (resul return } -// UpdateAuthSettingsSlot updates the Authentication / Authorization settings associated with web app. +// UpdateAuthSettingsSlot description for Updates the Authentication / Authorization settings associated with web app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -31807,7 +30151,7 @@ func (client AppsClient) UpdateAuthSettingsSlotPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -31842,7 +30186,7 @@ func (client AppsClient) UpdateAuthSettingsSlotResponder(resp *http.Response) (r return } -// UpdateAzureStorageAccounts updates the Azure storage account configurations of an app. +// UpdateAzureStorageAccounts description for Updates the Azure storage account configurations of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -31895,7 +30239,7 @@ func (client AppsClient) UpdateAzureStorageAccountsPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -31930,7 +30274,7 @@ func (client AppsClient) UpdateAzureStorageAccountsResponder(resp *http.Response return } -// UpdateAzureStorageAccountsSlot updates the Azure storage account configurations of an app. +// UpdateAzureStorageAccountsSlot description for Updates the Azure storage account configurations of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -31986,7 +30330,7 @@ func (client AppsClient) UpdateAzureStorageAccountsSlotPreparer(ctx context.Cont "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -32021,7 +30365,7 @@ func (client AppsClient) UpdateAzureStorageAccountsSlotResponder(resp *http.Resp return } -// UpdateBackupConfiguration updates the backup configuration of an app. +// UpdateBackupConfiguration description for Updates the backup configuration of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -32083,7 +30427,7 @@ func (client AppsClient) UpdateBackupConfigurationPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -32118,7 +30462,7 @@ func (client AppsClient) UpdateBackupConfigurationResponder(resp *http.Response) return } -// UpdateBackupConfigurationSlot updates the backup configuration of an app. +// UpdateBackupConfigurationSlot description for Updates the backup configuration of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -32183,7 +30527,7 @@ func (client AppsClient) UpdateBackupConfigurationSlotPreparer(ctx context.Conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -32218,7 +30562,7 @@ func (client AppsClient) UpdateBackupConfigurationSlotResponder(resp *http.Respo return } -// UpdateConfiguration updates the configuration of an app. +// UpdateConfiguration description for Updates the configuration of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -32271,7 +30615,7 @@ func (client AppsClient) UpdateConfigurationPreparer(ctx context.Context, resour "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -32306,7 +30650,7 @@ func (client AppsClient) UpdateConfigurationResponder(resp *http.Response) (resu return } -// UpdateConfigurationSlot updates the configuration of an app. +// UpdateConfigurationSlot description for Updates the configuration of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -32362,7 +30706,7 @@ func (client AppsClient) UpdateConfigurationSlotPreparer(ctx context.Context, re "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -32397,7 +30741,7 @@ func (client AppsClient) UpdateConfigurationSlotResponder(resp *http.Response) ( return } -// UpdateConnectionStrings replaces the connection strings of an app. +// UpdateConnectionStrings description for Replaces the connection strings of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -32450,7 +30794,7 @@ func (client AppsClient) UpdateConnectionStringsPreparer(ctx context.Context, re "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -32485,7 +30829,7 @@ func (client AppsClient) UpdateConnectionStringsResponder(resp *http.Response) ( return } -// UpdateConnectionStringsSlot replaces the connection strings of an app. +// UpdateConnectionStringsSlot description for Replaces the connection strings of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -32541,7 +30885,7 @@ func (client AppsClient) UpdateConnectionStringsSlotPreparer(ctx context.Context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -32576,7 +30920,7 @@ func (client AppsClient) UpdateConnectionStringsSlotResponder(resp *http.Respons return } -// UpdateDiagnosticLogsConfig updates the logging configuration of an app. +// UpdateDiagnosticLogsConfig description for Updates the logging configuration of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -32645,7 +30989,7 @@ func (client AppsClient) UpdateDiagnosticLogsConfigPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -32680,7 +31024,7 @@ func (client AppsClient) UpdateDiagnosticLogsConfigResponder(resp *http.Response return } -// UpdateDiagnosticLogsConfigSlot updates the logging configuration of an app. +// UpdateDiagnosticLogsConfigSlot description for Updates the logging configuration of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -32752,7 +31096,7 @@ func (client AppsClient) UpdateDiagnosticLogsConfigSlotPreparer(ctx context.Cont "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -32787,8 +31131,8 @@ func (client AppsClient) UpdateDiagnosticLogsConfigSlotResponder(resp *http.Resp return } -// UpdateDomainOwnershipIdentifier creates a domain ownership identifier for web app, or updates an existing ownership -// identifier. +// UpdateDomainOwnershipIdentifier description for Creates a domain ownership identifier for web app, or updates an +// existing ownership identifier. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -32843,7 +31187,7 @@ func (client AppsClient) UpdateDomainOwnershipIdentifierPreparer(ctx context.Con "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -32878,8 +31222,8 @@ func (client AppsClient) UpdateDomainOwnershipIdentifierResponder(resp *http.Res return } -// UpdateDomainOwnershipIdentifierSlot creates a domain ownership identifier for web app, or updates an existing -// ownership identifier. +// UpdateDomainOwnershipIdentifierSlot description for Creates a domain ownership identifier for web app, or updates an +// existing ownership identifier. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -32937,7 +31281,7 @@ func (client AppsClient) UpdateDomainOwnershipIdentifierSlotPreparer(ctx context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -32972,7 +31316,7 @@ func (client AppsClient) UpdateDomainOwnershipIdentifierSlotResponder(resp *http return } -// UpdateHybridConnection creates a new Hybrid Connection using a Service Bus relay. +// UpdateHybridConnection description for Creates a new Hybrid Connection using a Service Bus relay. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -33029,7 +31373,7 @@ func (client AppsClient) UpdateHybridConnectionPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -33064,7 +31408,7 @@ func (client AppsClient) UpdateHybridConnectionResponder(resp *http.Response) (r return } -// UpdateHybridConnectionSlot creates a new Hybrid Connection using a Service Bus relay. +// UpdateHybridConnectionSlot description for Creates a new Hybrid Connection using a Service Bus relay. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - the name of the web app. @@ -33123,7 +31467,7 @@ func (client AppsClient) UpdateHybridConnectionSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -33158,7 +31502,7 @@ func (client AppsClient) UpdateHybridConnectionSlotResponder(resp *http.Response return } -// UpdateMetadata replaces the metadata of an app. +// UpdateMetadata description for Replaces the metadata of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -33211,7 +31555,7 @@ func (client AppsClient) UpdateMetadataPreparer(ctx context.Context, resourceGro "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -33246,7 +31590,7 @@ func (client AppsClient) UpdateMetadataResponder(resp *http.Response) (result St return } -// UpdateMetadataSlot replaces the metadata of an app. +// UpdateMetadataSlot description for Replaces the metadata of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -33302,7 +31646,7 @@ func (client AppsClient) UpdateMetadataSlotPreparer(ctx context.Context, resourc "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -33337,7 +31681,7 @@ func (client AppsClient) UpdateMetadataSlotResponder(resp *http.Response) (resul return } -// UpdatePremierAddOn updates a named add-on of an app. +// UpdatePremierAddOn description for Updates a named add-on of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -33392,7 +31736,7 @@ func (client AppsClient) UpdatePremierAddOnPreparer(ctx context.Context, resourc "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -33427,7 +31771,7 @@ func (client AppsClient) UpdatePremierAddOnResponder(resp *http.Response) (resul return } -// UpdatePremierAddOnSlot updates a named add-on of an app. +// UpdatePremierAddOnSlot description for Updates a named add-on of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -33485,7 +31829,7 @@ func (client AppsClient) UpdatePremierAddOnSlotPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -33520,8 +31864,8 @@ func (client AppsClient) UpdatePremierAddOnSlotResponder(resp *http.Response) (r return } -// UpdateRelayServiceConnection creates a new hybrid connection configuration (PUT), or updates an existing one -// (PATCH). +// UpdateRelayServiceConnection description for Creates a new hybrid connection configuration (PUT), or updates an +// existing one (PATCH). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -33576,7 +31920,7 @@ func (client AppsClient) UpdateRelayServiceConnectionPreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -33611,8 +31955,8 @@ func (client AppsClient) UpdateRelayServiceConnectionResponder(resp *http.Respon return } -// UpdateRelayServiceConnectionSlot creates a new hybrid connection configuration (PUT), or updates an existing one -// (PATCH). +// UpdateRelayServiceConnectionSlot description for Creates a new hybrid connection configuration (PUT), or updates an +// existing one (PATCH). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -33670,7 +32014,7 @@ func (client AppsClient) UpdateRelayServiceConnectionSlotPreparer(ctx context.Co "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -33705,7 +32049,7 @@ func (client AppsClient) UpdateRelayServiceConnectionSlotResponder(resp *http.Re return } -// UpdateSitePushSettings updates the Push settings associated with web app. +// UpdateSitePushSettings description for Updates the Push settings associated with web app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -33761,7 +32105,7 @@ func (client AppsClient) UpdateSitePushSettingsPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -33796,7 +32140,7 @@ func (client AppsClient) UpdateSitePushSettingsResponder(resp *http.Response) (r return } -// UpdateSitePushSettingsSlot updates the Push settings associated with web app. +// UpdateSitePushSettingsSlot description for Updates the Push settings associated with web app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -33854,7 +32198,7 @@ func (client AppsClient) UpdateSitePushSettingsSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -33889,7 +32233,8 @@ func (client AppsClient) UpdateSitePushSettingsSlotResponder(resp *http.Response return } -// UpdateSlot creates a new web, mobile, or API app in an existing resource group, or updates an existing app. +// UpdateSlot description for Creates a new web, mobile, or API app in an existing resource group, or updates an +// existing app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - unique name of the app to create or update. To create or update a deployment slot, use the {slot} @@ -33946,7 +32291,7 @@ func (client AppsClient) UpdateSlotPreparer(ctx context.Context, resourceGroupNa "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -33981,8 +32326,8 @@ func (client AppsClient) UpdateSlotResponder(resp *http.Response) (result Site, return } -// UpdateSlotConfigurationNames updates the names of application settings and connection string that remain with the -// slot during swap operation. +// UpdateSlotConfigurationNames description for Updates the names of application settings and connection string that +// remain with the slot during swap operation. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -34035,7 +32380,7 @@ func (client AppsClient) UpdateSlotConfigurationNamesPreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -34070,7 +32415,7 @@ func (client AppsClient) UpdateSlotConfigurationNamesResponder(resp *http.Respon return } -// UpdateSourceControl updates the source control configuration of an app. +// UpdateSourceControl description for Updates the source control configuration of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -34123,7 +32468,7 @@ func (client AppsClient) UpdateSourceControlPreparer(ctx context.Context, resour "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -34158,7 +32503,7 @@ func (client AppsClient) UpdateSourceControlResponder(resp *http.Response) (resu return } -// UpdateSourceControlSlot updates the source control configuration of an app. +// UpdateSourceControlSlot description for Updates the source control configuration of an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -34214,7 +32559,7 @@ func (client AppsClient) UpdateSourceControlSlotPreparer(ctx context.Context, re "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -34249,9 +32594,9 @@ func (client AppsClient) UpdateSourceControlSlotResponder(resp *http.Response) ( return } -// UpdateSwiftVirtualNetworkConnection integrates this Web App with a Virtual Network. This requires that 1) -// "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been -// delegated, and is not +// UpdateSwiftVirtualNetworkConnection description for Integrates this Web App with a Virtual Network. This requires +// that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already +// been delegated, and is not // in use by another App Service Plan other than the one this App is in. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. @@ -34305,7 +32650,7 @@ func (client AppsClient) UpdateSwiftVirtualNetworkConnectionPreparer(ctx context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -34340,9 +32685,9 @@ func (client AppsClient) UpdateSwiftVirtualNetworkConnectionResponder(resp *http return } -// UpdateSwiftVirtualNetworkConnectionSlot integrates this Web App with a Virtual Network. This requires that 1) -// "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been -// delegated, and is not +// UpdateSwiftVirtualNetworkConnectionSlot description for Integrates this Web App with a Virtual Network. This +// requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has +// already been delegated, and is not // in use by another App Service Plan other than the one this App is in. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. @@ -34399,7 +32744,7 @@ func (client AppsClient) UpdateSwiftVirtualNetworkConnectionSlotPreparer(ctx con "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -34434,8 +32779,8 @@ func (client AppsClient) UpdateSwiftVirtualNetworkConnectionSlotResponder(resp * return } -// UpdateVnetConnection adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties -// (PATCH). +// UpdateVnetConnection description for Adds a Virtual Network connection to an app or slot (PUT) or updates the +// connection properties (PATCH). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -34490,7 +32835,7 @@ func (client AppsClient) UpdateVnetConnectionPreparer(ctx context.Context, resou "vnetName": autorest.Encode("path", vnetName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -34525,7 +32870,8 @@ func (client AppsClient) UpdateVnetConnectionResponder(resp *http.Response) (res return } -// UpdateVnetConnectionGateway adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). +// UpdateVnetConnectionGateway description for Adds a gateway to a connected Virtual Network (PUT) or updates it +// (PATCH). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -34582,7 +32928,7 @@ func (client AppsClient) UpdateVnetConnectionGatewayPreparer(ctx context.Context "vnetName": autorest.Encode("path", vnetName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -34617,7 +32963,8 @@ func (client AppsClient) UpdateVnetConnectionGatewayResponder(resp *http.Respons return } -// UpdateVnetConnectionGatewaySlot adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). +// UpdateVnetConnectionGatewaySlot description for Adds a gateway to a connected Virtual Network (PUT) or updates it +// (PATCH). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -34677,7 +33024,7 @@ func (client AppsClient) UpdateVnetConnectionGatewaySlotPreparer(ctx context.Con "vnetName": autorest.Encode("path", vnetName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -34712,8 +33059,8 @@ func (client AppsClient) UpdateVnetConnectionGatewaySlotResponder(resp *http.Res return } -// UpdateVnetConnectionSlot adds a Virtual Network connection to an app or slot (PUT) or updates the connection -// properties (PATCH). +// UpdateVnetConnectionSlot description for Adds a Virtual Network connection to an app or slot (PUT) or updates the +// connection properties (PATCH). // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the app. @@ -34771,7 +33118,7 @@ func (client AppsClient) UpdateVnetConnectionSlotPreparer(ctx context.Context, r "vnetName": autorest.Encode("path", vnetName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/appservicecertificateorders.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/appservicecertificateorders.go similarity index 97% rename from vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/appservicecertificateorders.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/appservicecertificateorders.go index 8af6a8d62e885..0d457aba40ffc 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/appservicecertificateorders.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/appservicecertificateorders.go @@ -41,7 +41,7 @@ func NewAppServiceCertificateOrdersClientWithBaseURI(baseURI string, subscriptio return AppServiceCertificateOrdersClient{NewWithBaseURI(baseURI, subscriptionID)} } -// CreateOrUpdate create or update a certificate purchase order. +// CreateOrUpdate description for Create or update a certificate purchase order. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // certificateOrderName - name of the certificate order. @@ -95,7 +95,7 @@ func (client AppServiceCertificateOrdersClient) CreateOrUpdatePreparer(ctx conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -136,7 +136,7 @@ func (client AppServiceCertificateOrdersClient) CreateOrUpdateResponder(resp *ht return } -// CreateOrUpdateCertificate creates or updates a certificate and associates with key vault secret. +// CreateOrUpdateCertificate description for Creates or updates a certificate and associates with key vault secret. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // certificateOrderName - name of the certificate order. @@ -185,7 +185,7 @@ func (client AppServiceCertificateOrdersClient) CreateOrUpdateCertificatePrepare "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -226,7 +226,7 @@ func (client AppServiceCertificateOrdersClient) CreateOrUpdateCertificateRespond return } -// Delete delete an existing certificate order. +// Delete description for Delete an existing certificate order. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // certificateOrderName - name of the certificate order. @@ -278,7 +278,7 @@ func (client AppServiceCertificateOrdersClient) DeletePreparer(ctx context.Conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -310,7 +310,7 @@ func (client AppServiceCertificateOrdersClient) DeleteResponder(resp *http.Respo return } -// DeleteCertificate delete the certificate associated with a certificate order. +// DeleteCertificate description for Delete the certificate associated with a certificate order. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // certificateOrderName - name of the certificate order. @@ -364,7 +364,7 @@ func (client AppServiceCertificateOrdersClient) DeleteCertificatePreparer(ctx co "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -396,7 +396,7 @@ func (client AppServiceCertificateOrdersClient) DeleteCertificateResponder(resp return } -// Get get a certificate order. +// Get description for Get a certificate order. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // certificateOrderName - name of the certificate order.. @@ -448,7 +448,7 @@ func (client AppServiceCertificateOrdersClient) GetPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -481,7 +481,7 @@ func (client AppServiceCertificateOrdersClient) GetResponder(resp *http.Response return } -// GetCertificate get the certificate associated with a certificate order. +// GetCertificate description for Get the certificate associated with a certificate order. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // certificateOrderName - name of the certificate order. @@ -535,7 +535,7 @@ func (client AppServiceCertificateOrdersClient) GetCertificatePreparer(ctx conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -568,7 +568,7 @@ func (client AppServiceCertificateOrdersClient) GetCertificateResponder(resp *ht return } -// List list all certificate orders in a subscription. +// List description for List all certificate orders in a subscription. func (client AppServiceCertificateOrdersClient) List(ctx context.Context) (result AppServiceCertificateOrderCollectionPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceCertificateOrdersClient.List") @@ -608,7 +608,7 @@ func (client AppServiceCertificateOrdersClient) ListPreparer(ctx context.Context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -678,7 +678,7 @@ func (client AppServiceCertificateOrdersClient) ListComplete(ctx context.Context return } -// ListByResourceGroup get certificate orders in a resource group. +// ListByResourceGroup description for Get certificate orders in a resource group. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. func (client AppServiceCertificateOrdersClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result AppServiceCertificateOrderCollectionPage, err error) { @@ -729,7 +729,7 @@ func (client AppServiceCertificateOrdersClient) ListByResourceGroupPreparer(ctx "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -799,7 +799,7 @@ func (client AppServiceCertificateOrdersClient) ListByResourceGroupComplete(ctx return } -// ListCertificates list all certificates associated with a certificate order. +// ListCertificates description for List all certificates associated with a certificate order. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // certificateOrderName - name of the certificate order. @@ -852,7 +852,7 @@ func (client AppServiceCertificateOrdersClient) ListCertificatesPreparer(ctx con "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -922,7 +922,7 @@ func (client AppServiceCertificateOrdersClient) ListCertificatesComplete(ctx con return } -// Reissue reissue an existing certificate order. +// Reissue description for Reissue an existing certificate order. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // certificateOrderName - name of the certificate order. @@ -975,7 +975,7 @@ func (client AppServiceCertificateOrdersClient) ReissuePreparer(ctx context.Cont "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1009,7 +1009,7 @@ func (client AppServiceCertificateOrdersClient) ReissueResponder(resp *http.Resp return } -// Renew renew an existing certificate order. +// Renew description for Renew an existing certificate order. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // certificateOrderName - name of the certificate order. @@ -1062,7 +1062,7 @@ func (client AppServiceCertificateOrdersClient) RenewPreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1096,7 +1096,7 @@ func (client AppServiceCertificateOrdersClient) RenewResponder(resp *http.Respon return } -// ResendEmail resend certificate email. +// ResendEmail description for Resend certificate email. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // certificateOrderName - name of the certificate order. @@ -1148,7 +1148,7 @@ func (client AppServiceCertificateOrdersClient) ResendEmailPreparer(ctx context. "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1180,7 +1180,7 @@ func (client AppServiceCertificateOrdersClient) ResendEmailResponder(resp *http. return } -// ResendRequestEmails verify domain ownership for this certificate order. +// ResendRequestEmails description for Verify domain ownership for this certificate order. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // certificateOrderName - name of the certificate order. @@ -1233,7 +1233,7 @@ func (client AppServiceCertificateOrdersClient) ResendRequestEmailsPreparer(ctx "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1267,7 +1267,7 @@ func (client AppServiceCertificateOrdersClient) ResendRequestEmailsResponder(res return } -// RetrieveCertificateActions retrieve the list of certificate actions. +// RetrieveCertificateActions description for Retrieve the list of certificate actions. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the certificate order. @@ -1319,7 +1319,7 @@ func (client AppServiceCertificateOrdersClient) RetrieveCertificateActionsPrepar "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1352,7 +1352,7 @@ func (client AppServiceCertificateOrdersClient) RetrieveCertificateActionsRespon return } -// RetrieveCertificateEmailHistory retrieve email history. +// RetrieveCertificateEmailHistory description for Retrieve email history. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the certificate order. @@ -1404,7 +1404,7 @@ func (client AppServiceCertificateOrdersClient) RetrieveCertificateEmailHistoryP "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1437,7 +1437,7 @@ func (client AppServiceCertificateOrdersClient) RetrieveCertificateEmailHistoryR return } -// RetrieveSiteSeal verify domain ownership for this certificate order. +// RetrieveSiteSeal description for Verify domain ownership for this certificate order. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // certificateOrderName - name of the certificate order. @@ -1490,7 +1490,7 @@ func (client AppServiceCertificateOrdersClient) RetrieveSiteSealPreparer(ctx con "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1525,7 +1525,7 @@ func (client AppServiceCertificateOrdersClient) RetrieveSiteSealResponder(resp * return } -// Update create or update a certificate purchase order. +// Update description for Create or update a certificate purchase order. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // certificateOrderName - name of the certificate order. @@ -1578,7 +1578,7 @@ func (client AppServiceCertificateOrdersClient) UpdatePreparer(ctx context.Conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1613,7 +1613,7 @@ func (client AppServiceCertificateOrdersClient) UpdateResponder(resp *http.Respo return } -// UpdateCertificate creates or updates a certificate and associates with key vault secret. +// UpdateCertificate description for Creates or updates a certificate and associates with key vault secret. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // certificateOrderName - name of the certificate order. @@ -1668,7 +1668,7 @@ func (client AppServiceCertificateOrdersClient) UpdateCertificatePreparer(ctx co "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1703,7 +1703,7 @@ func (client AppServiceCertificateOrdersClient) UpdateCertificateResponder(resp return } -// ValidatePurchaseInformation validate information for a certificate order. +// ValidatePurchaseInformation description for Validate information for a certificate order. // Parameters: // appServiceCertificateOrder - information for a certificate order. func (client AppServiceCertificateOrdersClient) ValidatePurchaseInformation(ctx context.Context, appServiceCertificateOrder AppServiceCertificateOrder) (result autorest.Response, err error) { @@ -1755,7 +1755,7 @@ func (client AppServiceCertificateOrdersClient) ValidatePurchaseInformationPrepa "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1789,7 +1789,7 @@ func (client AppServiceCertificateOrdersClient) ValidatePurchaseInformationRespo return } -// VerifyDomainOwnership verify domain ownership for this certificate order. +// VerifyDomainOwnership description for Verify domain ownership for this certificate order. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // certificateOrderName - name of the certificate order. @@ -1841,7 +1841,7 @@ func (client AppServiceCertificateOrdersClient) VerifyDomainOwnershipPreparer(ct "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/appserviceenvironments.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/appserviceenvironments.go similarity index 80% rename from vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/appserviceenvironments.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/appserviceenvironments.go index e8f8bafdb05cf..39ee38393b908 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/appserviceenvironments.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/appserviceenvironments.go @@ -41,7 +41,7 @@ func NewAppServiceEnvironmentsClientWithBaseURI(baseURI string, subscriptionID s return AppServiceEnvironmentsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// ChangeVnet move an App Service Environment to a different VNET. +// ChangeVnet description for Move an App Service Environment to a different VNET. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -88,7 +88,7 @@ func (client AppServiceEnvironmentsClient) ChangeVnetPreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -173,7 +173,7 @@ func (client AppServiceEnvironmentsClient) ChangeVnetComplete(ctx context.Contex return } -// CreateOrUpdate create or update an App Service Environment. +// CreateOrUpdate description for Create or update an App Service Environment. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -227,7 +227,7 @@ func (client AppServiceEnvironmentsClient) CreateOrUpdatePreparer(ctx context.Co "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -261,14 +261,14 @@ func (client AppServiceEnvironmentsClient) CreateOrUpdateResponder(resp *http.Re err = autorest.Respond( resp, client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusBadRequest, http.StatusNotFound, http.StatusConflict), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) result.Response = autorest.Response{Response: resp} return } -// CreateOrUpdateMultiRolePool create or update a multi-role pool. +// CreateOrUpdateMultiRolePool description for Create or update a multi-role pool. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -315,7 +315,7 @@ func (client AppServiceEnvironmentsClient) CreateOrUpdateMultiRolePoolPreparer(c "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -349,14 +349,14 @@ func (client AppServiceEnvironmentsClient) CreateOrUpdateMultiRolePoolResponder( err = autorest.Respond( resp, client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusBadRequest, http.StatusNotFound, http.StatusConflict), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) result.Response = autorest.Response{Response: resp} return } -// CreateOrUpdateWorkerPool create or update a worker pool. +// CreateOrUpdateWorkerPool description for Create or update a worker pool. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -405,7 +405,7 @@ func (client AppServiceEnvironmentsClient) CreateOrUpdateWorkerPoolPreparer(ctx "workerPoolName": autorest.Encode("path", workerPoolName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -439,14 +439,14 @@ func (client AppServiceEnvironmentsClient) CreateOrUpdateWorkerPoolResponder(res err = autorest.Respond( resp, client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusBadRequest, http.StatusNotFound, http.StatusConflict), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) result.Response = autorest.Response{Response: resp} return } -// Delete delete an App Service Environment. +// Delete description for Delete an App Service Environment. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -494,7 +494,7 @@ func (client AppServiceEnvironmentsClient) DeletePreparer(ctx context.Context, r "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -529,13 +529,13 @@ func (client AppServiceEnvironmentsClient) DeleteResponder(resp *http.Response) err = autorest.Respond( resp, client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent, http.StatusBadRequest, http.StatusNotFound, http.StatusConflict), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent), autorest.ByClosing()) result.Response = resp return } -// Get get the properties of an App Service Environment. +// Get description for Get the properties of an App Service Environment. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -587,7 +587,7 @@ func (client AppServiceEnvironmentsClient) GetPreparer(ctx context.Context, reso "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -620,7 +620,7 @@ func (client AppServiceEnvironmentsClient) GetResponder(resp *http.Response) (re return } -// GetDiagnosticsItem get a diagnostics item for an App Service Environment. +// GetDiagnosticsItem description for Get a diagnostics item for an App Service Environment. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -674,7 +674,7 @@ func (client AppServiceEnvironmentsClient) GetDiagnosticsItemPreparer(ctx contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -707,8 +707,8 @@ func (client AppServiceEnvironmentsClient) GetDiagnosticsItemResponder(resp *htt return } -// GetInboundNetworkDependenciesEndpoints get the network endpoints of all inbound dependencies of an App Service -// Environment. +// GetInboundNetworkDependenciesEndpoints description for Get the network endpoints of all inbound dependencies of an +// App Service Environment. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -761,7 +761,7 @@ func (client AppServiceEnvironmentsClient) GetInboundNetworkDependenciesEndpoint "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -831,7 +831,7 @@ func (client AppServiceEnvironmentsClient) GetInboundNetworkDependenciesEndpoint return } -// GetMultiRolePool get properties of a multi-role pool. +// GetMultiRolePool description for Get properties of a multi-role pool. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -883,7 +883,7 @@ func (client AppServiceEnvironmentsClient) GetMultiRolePoolPreparer(ctx context. "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -916,8 +916,8 @@ func (client AppServiceEnvironmentsClient) GetMultiRolePoolResponder(resp *http. return } -// GetOutboundNetworkDependenciesEndpoints get the network endpoints of all outbound dependencies of an App Service -// Environment. +// GetOutboundNetworkDependenciesEndpoints description for Get the network endpoints of all outbound dependencies of an +// App Service Environment. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -970,7 +970,7 @@ func (client AppServiceEnvironmentsClient) GetOutboundNetworkDependenciesEndpoin "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1040,7 +1040,92 @@ func (client AppServiceEnvironmentsClient) GetOutboundNetworkDependenciesEndpoin return } -// GetWorkerPool get properties of a worker pool. +// GetVipInfo description for Get IP addresses assigned to an App Service Environment. +// Parameters: +// resourceGroupName - name of the resource group to which the resource belongs. +// name - name of the App Service Environment. +func (client AppServiceEnvironmentsClient) GetVipInfo(ctx context.Context, resourceGroupName string, name string) (result AddressResponse, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.GetVipInfo") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("web.AppServiceEnvironmentsClient", "GetVipInfo", err.Error()) + } + + req, err := client.GetVipInfoPreparer(ctx, resourceGroupName, name) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "GetVipInfo", nil, "Failure preparing request") + return + } + + resp, err := client.GetVipInfoSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "GetVipInfo", resp, "Failure sending request") + return + } + + result, err = client.GetVipInfoResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "GetVipInfo", resp, "Failure responding to request") + } + + return +} + +// GetVipInfoPreparer prepares the GetVipInfo request. +func (client AppServiceEnvironmentsClient) GetVipInfoPreparer(ctx context.Context, resourceGroupName string, name string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "name": autorest.Encode("path", name), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-08-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/capacities/virtualip", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetVipInfoSender sends the GetVipInfo request. The method will close the +// http.Response Body if it receives an error. +func (client AppServiceEnvironmentsClient) GetVipInfoSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// GetVipInfoResponder handles the response to the GetVipInfo request. The method always +// closes the http.Response Body. +func (client AppServiceEnvironmentsClient) GetVipInfoResponder(resp *http.Response) (result AddressResponse, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// GetWorkerPool description for Get properties of a worker pool. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -1094,7 +1179,7 @@ func (client AppServiceEnvironmentsClient) GetWorkerPoolPreparer(ctx context.Con "workerPoolName": autorest.Encode("path", workerPoolName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1127,7 +1212,7 @@ func (client AppServiceEnvironmentsClient) GetWorkerPoolResponder(resp *http.Res return } -// List get all App Service Environments for a subscription. +// List description for Get all App Service Environments for a subscription. func (client AppServiceEnvironmentsClient) List(ctx context.Context) (result AppServiceEnvironmentCollectionPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.List") @@ -1167,7 +1252,7 @@ func (client AppServiceEnvironmentsClient) ListPreparer(ctx context.Context) (*h "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1237,7 +1322,7 @@ func (client AppServiceEnvironmentsClient) ListComplete(ctx context.Context) (re return } -// ListAppServicePlans get all App Service plans in an App Service Environment. +// ListAppServicePlans description for Get all App Service plans in an App Service Environment. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -1290,7 +1375,7 @@ func (client AppServiceEnvironmentsClient) ListAppServicePlansPreparer(ctx conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1360,7 +1445,7 @@ func (client AppServiceEnvironmentsClient) ListAppServicePlansComplete(ctx conte return } -// ListByResourceGroup get all App Service Environments in a resource group. +// ListByResourceGroup description for Get all App Service Environments in a resource group. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. func (client AppServiceEnvironmentsClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result AppServiceEnvironmentCollectionPage, err error) { @@ -1411,7 +1496,7 @@ func (client AppServiceEnvironmentsClient) ListByResourceGroupPreparer(ctx conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1481,7 +1566,7 @@ func (client AppServiceEnvironmentsClient) ListByResourceGroupComplete(ctx conte return } -// ListCapacities get the used, available, and total worker capacity an App Service Environment. +// ListCapacities description for Get the used, available, and total worker capacity an App Service Environment. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -1534,7 +1619,7 @@ func (client AppServiceEnvironmentsClient) ListCapacitiesPreparer(ctx context.Co "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1604,7 +1689,7 @@ func (client AppServiceEnvironmentsClient) ListCapacitiesComplete(ctx context.Co return } -// ListDiagnostics get diagnostic information for an App Service Environment. +// ListDiagnostics description for Get diagnostic information for an App Service Environment. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -1656,7 +1741,7 @@ func (client AppServiceEnvironmentsClient) ListDiagnosticsPreparer(ctx context.C "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1689,17 +1774,18 @@ func (client AppServiceEnvironmentsClient) ListDiagnosticsResponder(resp *http.R return } -// ListMetricDefinitions get global metric definitions of an App Service Environment. +// ListMultiRoleMetricDefinitions description for Get metric definitions for a multi-role pool of an App Service +// Environment. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. -func (client AppServiceEnvironmentsClient) ListMetricDefinitions(ctx context.Context, resourceGroupName string, name string) (result MetricDefinition, err error) { +func (client AppServiceEnvironmentsClient) ListMultiRoleMetricDefinitions(ctx context.Context, resourceGroupName string, name string) (result ResourceMetricDefinitionCollectionPage, err error) { if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListMetricDefinitions") + ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListMultiRoleMetricDefinitions") defer func() { sc := -1 - if result.Response.Response != nil { - sc = result.Response.Response.StatusCode + if result.rmdc.Response.Response != nil { + sc = result.rmdc.Response.Response.StatusCode } tracing.EndSpan(ctx, sc, err) }() @@ -1709,39 +1795,40 @@ func (client AppServiceEnvironmentsClient) ListMetricDefinitions(ctx context.Con Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppServiceEnvironmentsClient", "ListMetricDefinitions", err.Error()) + return result, validation.NewError("web.AppServiceEnvironmentsClient", "ListMultiRoleMetricDefinitions", err.Error()) } - req, err := client.ListMetricDefinitionsPreparer(ctx, resourceGroupName, name) + result.fn = client.listMultiRoleMetricDefinitionsNextResults + req, err := client.ListMultiRoleMetricDefinitionsPreparer(ctx, resourceGroupName, name) if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMetricDefinitions", nil, "Failure preparing request") + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRoleMetricDefinitions", nil, "Failure preparing request") return } - resp, err := client.ListMetricDefinitionsSender(req) + resp, err := client.ListMultiRoleMetricDefinitionsSender(req) if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMetricDefinitions", resp, "Failure sending request") + result.rmdc.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRoleMetricDefinitions", resp, "Failure sending request") return } - result, err = client.ListMetricDefinitionsResponder(resp) + result.rmdc, err = client.ListMultiRoleMetricDefinitionsResponder(resp) if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMetricDefinitions", resp, "Failure responding to request") + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRoleMetricDefinitions", resp, "Failure responding to request") } return } -// ListMetricDefinitionsPreparer prepares the ListMetricDefinitions request. -func (client AppServiceEnvironmentsClient) ListMetricDefinitionsPreparer(ctx context.Context, resourceGroupName string, name string) (*http.Request, error) { +// ListMultiRoleMetricDefinitionsPreparer prepares the ListMultiRoleMetricDefinitions request. +func (client AppServiceEnvironmentsClient) ListMultiRoleMetricDefinitionsPreparer(ctx context.Context, resourceGroupName string, name string) (*http.Request, error) { pathParameters := map[string]interface{}{ "name": autorest.Encode("path", name), "resourceGroupName": autorest.Encode("path", resourceGroupName), "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1749,21 +1836,21 @@ func (client AppServiceEnvironmentsClient) ListMetricDefinitionsPreparer(ctx con preparer := autorest.CreatePreparer( autorest.AsGet(), autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/metricdefinitions", pathParameters), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/metricdefinitions", pathParameters), autorest.WithQueryParameters(queryParameters)) return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// ListMetricDefinitionsSender sends the ListMetricDefinitions request. The method will close the +// ListMultiRoleMetricDefinitionsSender sends the ListMultiRoleMetricDefinitions request. The method will close the // http.Response Body if it receives an error. -func (client AppServiceEnvironmentsClient) ListMetricDefinitionsSender(req *http.Request) (*http.Response, error) { +func (client AppServiceEnvironmentsClient) ListMultiRoleMetricDefinitionsSender(req *http.Request) (*http.Response, error) { sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) return autorest.SendWithSender(client, req, sd...) } -// ListMetricDefinitionsResponder handles the response to the ListMetricDefinitions request. The method always +// ListMultiRoleMetricDefinitionsResponder handles the response to the ListMultiRoleMetricDefinitions request. The method always // closes the http.Response Body. -func (client AppServiceEnvironmentsClient) ListMetricDefinitionsResponder(resp *http.Response) (result MetricDefinition, err error) { +func (client AppServiceEnvironmentsClient) ListMultiRoleMetricDefinitionsResponder(resp *http.Response) (result ResourceMetricDefinitionCollection, err error) { err = autorest.Respond( resp, client.ByInspecting(), @@ -1774,21 +1861,56 @@ func (client AppServiceEnvironmentsClient) ListMetricDefinitionsResponder(resp * return } -// ListMetrics get global metrics of an App Service Environment. +// listMultiRoleMetricDefinitionsNextResults retrieves the next set of results, if any. +func (client AppServiceEnvironmentsClient) listMultiRoleMetricDefinitionsNextResults(ctx context.Context, lastResults ResourceMetricDefinitionCollection) (result ResourceMetricDefinitionCollection, err error) { + req, err := lastResults.resourceMetricDefinitionCollectionPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRoleMetricDefinitionsNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListMultiRoleMetricDefinitionsSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRoleMetricDefinitionsNextResults", resp, "Failure sending next results request") + } + result, err = client.ListMultiRoleMetricDefinitionsResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRoleMetricDefinitionsNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListMultiRoleMetricDefinitionsComplete enumerates all values, automatically crossing page boundaries as required. +func (client AppServiceEnvironmentsClient) ListMultiRoleMetricDefinitionsComplete(ctx context.Context, resourceGroupName string, name string) (result ResourceMetricDefinitionCollectionIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListMultiRoleMetricDefinitions") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.ListMultiRoleMetricDefinitions(ctx, resourceGroupName, name) + return +} + +// ListMultiRolePoolInstanceMetricDefinitions description for Get metric definitions for a specific instance of a +// multi-role pool of an App Service Environment. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. -// details - specify true to include instance details. The default is false. -// filter - return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: -// $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and -// endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'. -func (client AppServiceEnvironmentsClient) ListMetrics(ctx context.Context, resourceGroupName string, name string, details *bool, filter string) (result ResourceMetricCollectionPage, err error) { +// instance - name of the instance in the multi-role pool. +func (client AppServiceEnvironmentsClient) ListMultiRolePoolInstanceMetricDefinitions(ctx context.Context, resourceGroupName string, name string, instance string) (result ResourceMetricDefinitionCollectionPage, err error) { if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListMetrics") + ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListMultiRolePoolInstanceMetricDefinitions") defer func() { sc := -1 - if result.rmc.Response.Response != nil { - sc = result.rmc.Response.Response.StatusCode + if result.rmdc.Response.Response != nil { + sc = result.rmdc.Response.Response.StatusCode } tracing.EndSpan(ctx, sc, err) }() @@ -1798,68 +1920,63 @@ func (client AppServiceEnvironmentsClient) ListMetrics(ctx context.Context, reso Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppServiceEnvironmentsClient", "ListMetrics", err.Error()) + return result, validation.NewError("web.AppServiceEnvironmentsClient", "ListMultiRolePoolInstanceMetricDefinitions", err.Error()) } - result.fn = client.listMetricsNextResults - req, err := client.ListMetricsPreparer(ctx, resourceGroupName, name, details, filter) + result.fn = client.listMultiRolePoolInstanceMetricDefinitionsNextResults + req, err := client.ListMultiRolePoolInstanceMetricDefinitionsPreparer(ctx, resourceGroupName, name, instance) if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMetrics", nil, "Failure preparing request") + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRolePoolInstanceMetricDefinitions", nil, "Failure preparing request") return } - resp, err := client.ListMetricsSender(req) + resp, err := client.ListMultiRolePoolInstanceMetricDefinitionsSender(req) if err != nil { - result.rmc.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMetrics", resp, "Failure sending request") + result.rmdc.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRolePoolInstanceMetricDefinitions", resp, "Failure sending request") return } - result.rmc, err = client.ListMetricsResponder(resp) + result.rmdc, err = client.ListMultiRolePoolInstanceMetricDefinitionsResponder(resp) if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMetrics", resp, "Failure responding to request") + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRolePoolInstanceMetricDefinitions", resp, "Failure responding to request") } return } -// ListMetricsPreparer prepares the ListMetrics request. -func (client AppServiceEnvironmentsClient) ListMetricsPreparer(ctx context.Context, resourceGroupName string, name string, details *bool, filter string) (*http.Request, error) { +// ListMultiRolePoolInstanceMetricDefinitionsPreparer prepares the ListMultiRolePoolInstanceMetricDefinitions request. +func (client AppServiceEnvironmentsClient) ListMultiRolePoolInstanceMetricDefinitionsPreparer(ctx context.Context, resourceGroupName string, name string, instance string) (*http.Request, error) { pathParameters := map[string]interface{}{ + "instance": autorest.Encode("path", instance), "name": autorest.Encode("path", name), "resourceGroupName": autorest.Encode("path", resourceGroupName), "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } - if details != nil { - queryParameters["details"] = autorest.Encode("query", *details) - } - if len(filter) > 0 { - queryParameters["$filter"] = filter - } preparer := autorest.CreatePreparer( autorest.AsGet(), autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/metrics", pathParameters), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/instances/{instance}/metricdefinitions", pathParameters), autorest.WithQueryParameters(queryParameters)) return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// ListMetricsSender sends the ListMetrics request. The method will close the +// ListMultiRolePoolInstanceMetricDefinitionsSender sends the ListMultiRolePoolInstanceMetricDefinitions request. The method will close the // http.Response Body if it receives an error. -func (client AppServiceEnvironmentsClient) ListMetricsSender(req *http.Request) (*http.Response, error) { +func (client AppServiceEnvironmentsClient) ListMultiRolePoolInstanceMetricDefinitionsSender(req *http.Request) (*http.Response, error) { sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) return autorest.SendWithSender(client, req, sd...) } -// ListMetricsResponder handles the response to the ListMetrics request. The method always +// ListMultiRolePoolInstanceMetricDefinitionsResponder handles the response to the ListMultiRolePoolInstanceMetricDefinitions request. The method always // closes the http.Response Body. -func (client AppServiceEnvironmentsClient) ListMetricsResponder(resp *http.Response) (result ResourceMetricCollection, err error) { +func (client AppServiceEnvironmentsClient) ListMultiRolePoolInstanceMetricDefinitionsResponder(resp *http.Response) (result ResourceMetricDefinitionCollection, err error) { err = autorest.Respond( resp, client.ByInspecting(), @@ -1870,31 +1987,31 @@ func (client AppServiceEnvironmentsClient) ListMetricsResponder(resp *http.Respo return } -// listMetricsNextResults retrieves the next set of results, if any. -func (client AppServiceEnvironmentsClient) listMetricsNextResults(ctx context.Context, lastResults ResourceMetricCollection) (result ResourceMetricCollection, err error) { - req, err := lastResults.resourceMetricCollectionPreparer(ctx) +// listMultiRolePoolInstanceMetricDefinitionsNextResults retrieves the next set of results, if any. +func (client AppServiceEnvironmentsClient) listMultiRolePoolInstanceMetricDefinitionsNextResults(ctx context.Context, lastResults ResourceMetricDefinitionCollection) (result ResourceMetricDefinitionCollection, err error) { + req, err := lastResults.resourceMetricDefinitionCollectionPreparer(ctx) if err != nil { - return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMetricsNextResults", nil, "Failure preparing next results request") + return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRolePoolInstanceMetricDefinitionsNextResults", nil, "Failure preparing next results request") } if req == nil { return } - resp, err := client.ListMetricsSender(req) + resp, err := client.ListMultiRolePoolInstanceMetricDefinitionsSender(req) if err != nil { result.Response = autorest.Response{Response: resp} - return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMetricsNextResults", resp, "Failure sending next results request") + return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRolePoolInstanceMetricDefinitionsNextResults", resp, "Failure sending next results request") } - result, err = client.ListMetricsResponder(resp) + result, err = client.ListMultiRolePoolInstanceMetricDefinitionsResponder(resp) if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMetricsNextResults", resp, "Failure responding to next results request") + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRolePoolInstanceMetricDefinitionsNextResults", resp, "Failure responding to next results request") } return } -// ListMetricsComplete enumerates all values, automatically crossing page boundaries as required. -func (client AppServiceEnvironmentsClient) ListMetricsComplete(ctx context.Context, resourceGroupName string, name string, details *bool, filter string) (result ResourceMetricCollectionIterator, err error) { +// ListMultiRolePoolInstanceMetricDefinitionsComplete enumerates all values, automatically crossing page boundaries as required. +func (client AppServiceEnvironmentsClient) ListMultiRolePoolInstanceMetricDefinitionsComplete(ctx context.Context, resourceGroupName string, name string, instance string) (result ResourceMetricDefinitionCollectionIterator, err error) { if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListMetrics") + ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListMultiRolePoolInstanceMetricDefinitions") defer func() { sc := -1 if result.Response().Response.Response != nil { @@ -1903,21 +2020,21 @@ func (client AppServiceEnvironmentsClient) ListMetricsComplete(ctx context.Conte tracing.EndSpan(ctx, sc, err) }() } - result.page, err = client.ListMetrics(ctx, resourceGroupName, name, details, filter) + result.page, err = client.ListMultiRolePoolInstanceMetricDefinitions(ctx, resourceGroupName, name, instance) return } -// ListMultiRoleMetricDefinitions get metric definitions for a multi-role pool of an App Service Environment. +// ListMultiRolePools description for Get all multi-role pools. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. -func (client AppServiceEnvironmentsClient) ListMultiRoleMetricDefinitions(ctx context.Context, resourceGroupName string, name string) (result ResourceMetricDefinitionCollectionPage, err error) { +func (client AppServiceEnvironmentsClient) ListMultiRolePools(ctx context.Context, resourceGroupName string, name string) (result WorkerPoolCollectionPage, err error) { if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListMultiRoleMetricDefinitions") + ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListMultiRolePools") defer func() { sc := -1 - if result.rmdc.Response.Response != nil { - sc = result.rmdc.Response.Response.StatusCode + if result.wpc.Response.Response != nil { + sc = result.wpc.Response.Response.StatusCode } tracing.EndSpan(ctx, sc, err) }() @@ -1927,40 +2044,40 @@ func (client AppServiceEnvironmentsClient) ListMultiRoleMetricDefinitions(ctx co Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppServiceEnvironmentsClient", "ListMultiRoleMetricDefinitions", err.Error()) + return result, validation.NewError("web.AppServiceEnvironmentsClient", "ListMultiRolePools", err.Error()) } - result.fn = client.listMultiRoleMetricDefinitionsNextResults - req, err := client.ListMultiRoleMetricDefinitionsPreparer(ctx, resourceGroupName, name) + result.fn = client.listMultiRolePoolsNextResults + req, err := client.ListMultiRolePoolsPreparer(ctx, resourceGroupName, name) if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRoleMetricDefinitions", nil, "Failure preparing request") + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRolePools", nil, "Failure preparing request") return } - resp, err := client.ListMultiRoleMetricDefinitionsSender(req) + resp, err := client.ListMultiRolePoolsSender(req) if err != nil { - result.rmdc.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRoleMetricDefinitions", resp, "Failure sending request") + result.wpc.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRolePools", resp, "Failure sending request") return } - result.rmdc, err = client.ListMultiRoleMetricDefinitionsResponder(resp) + result.wpc, err = client.ListMultiRolePoolsResponder(resp) if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRoleMetricDefinitions", resp, "Failure responding to request") + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRolePools", resp, "Failure responding to request") } return } -// ListMultiRoleMetricDefinitionsPreparer prepares the ListMultiRoleMetricDefinitions request. -func (client AppServiceEnvironmentsClient) ListMultiRoleMetricDefinitionsPreparer(ctx context.Context, resourceGroupName string, name string) (*http.Request, error) { +// ListMultiRolePoolsPreparer prepares the ListMultiRolePools request. +func (client AppServiceEnvironmentsClient) ListMultiRolePoolsPreparer(ctx context.Context, resourceGroupName string, name string) (*http.Request, error) { pathParameters := map[string]interface{}{ "name": autorest.Encode("path", name), "resourceGroupName": autorest.Encode("path", resourceGroupName), "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1968,21 +2085,21 @@ func (client AppServiceEnvironmentsClient) ListMultiRoleMetricDefinitionsPrepare preparer := autorest.CreatePreparer( autorest.AsGet(), autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/metricdefinitions", pathParameters), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools", pathParameters), autorest.WithQueryParameters(queryParameters)) return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// ListMultiRoleMetricDefinitionsSender sends the ListMultiRoleMetricDefinitions request. The method will close the +// ListMultiRolePoolsSender sends the ListMultiRolePools request. The method will close the // http.Response Body if it receives an error. -func (client AppServiceEnvironmentsClient) ListMultiRoleMetricDefinitionsSender(req *http.Request) (*http.Response, error) { +func (client AppServiceEnvironmentsClient) ListMultiRolePoolsSender(req *http.Request) (*http.Response, error) { sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) return autorest.SendWithSender(client, req, sd...) } -// ListMultiRoleMetricDefinitionsResponder handles the response to the ListMultiRoleMetricDefinitions request. The method always +// ListMultiRolePoolsResponder handles the response to the ListMultiRolePools request. The method always // closes the http.Response Body. -func (client AppServiceEnvironmentsClient) ListMultiRoleMetricDefinitionsResponder(resp *http.Response) (result ResourceMetricDefinitionCollection, err error) { +func (client AppServiceEnvironmentsClient) ListMultiRolePoolsResponder(resp *http.Response) (result WorkerPoolCollection, err error) { err = autorest.Respond( resp, client.ByInspecting(), @@ -1993,31 +2110,31 @@ func (client AppServiceEnvironmentsClient) ListMultiRoleMetricDefinitionsRespond return } -// listMultiRoleMetricDefinitionsNextResults retrieves the next set of results, if any. -func (client AppServiceEnvironmentsClient) listMultiRoleMetricDefinitionsNextResults(ctx context.Context, lastResults ResourceMetricDefinitionCollection) (result ResourceMetricDefinitionCollection, err error) { - req, err := lastResults.resourceMetricDefinitionCollectionPreparer(ctx) +// listMultiRolePoolsNextResults retrieves the next set of results, if any. +func (client AppServiceEnvironmentsClient) listMultiRolePoolsNextResults(ctx context.Context, lastResults WorkerPoolCollection) (result WorkerPoolCollection, err error) { + req, err := lastResults.workerPoolCollectionPreparer(ctx) if err != nil { - return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRoleMetricDefinitionsNextResults", nil, "Failure preparing next results request") + return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRolePoolsNextResults", nil, "Failure preparing next results request") } if req == nil { return } - resp, err := client.ListMultiRoleMetricDefinitionsSender(req) + resp, err := client.ListMultiRolePoolsSender(req) if err != nil { result.Response = autorest.Response{Response: resp} - return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRoleMetricDefinitionsNextResults", resp, "Failure sending next results request") + return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRolePoolsNextResults", resp, "Failure sending next results request") } - result, err = client.ListMultiRoleMetricDefinitionsResponder(resp) + result, err = client.ListMultiRolePoolsResponder(resp) if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRoleMetricDefinitionsNextResults", resp, "Failure responding to next results request") + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRolePoolsNextResults", resp, "Failure responding to next results request") } return } -// ListMultiRoleMetricDefinitionsComplete enumerates all values, automatically crossing page boundaries as required. -func (client AppServiceEnvironmentsClient) ListMultiRoleMetricDefinitionsComplete(ctx context.Context, resourceGroupName string, name string) (result ResourceMetricDefinitionCollectionIterator, err error) { +// ListMultiRolePoolsComplete enumerates all values, automatically crossing page boundaries as required. +func (client AppServiceEnvironmentsClient) ListMultiRolePoolsComplete(ctx context.Context, resourceGroupName string, name string) (result WorkerPoolCollectionIterator, err error) { if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListMultiRoleMetricDefinitions") + ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListMultiRolePools") defer func() { sc := -1 if result.Response().Response.Response != nil { @@ -2026,28 +2143,21 @@ func (client AppServiceEnvironmentsClient) ListMultiRoleMetricDefinitionsComplet tracing.EndSpan(ctx, sc, err) }() } - result.page, err = client.ListMultiRoleMetricDefinitions(ctx, resourceGroupName, name) + result.page, err = client.ListMultiRolePools(ctx, resourceGroupName, name) return } -// ListMultiRoleMetrics get metrics for a multi-role pool of an App Service Environment. +// ListMultiRolePoolSkus description for Get available SKUs for scaling a multi-role pool. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. -// startTime - beginning time of the metrics query. -// endTime - end time of the metrics query. -// timeGrain - time granularity of the metrics query. -// details - specify true to include instance details. The default is false. -// filter - return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: -// $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and -// endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'. -func (client AppServiceEnvironmentsClient) ListMultiRoleMetrics(ctx context.Context, resourceGroupName string, name string, startTime string, endTime string, timeGrain string, details *bool, filter string) (result ResourceMetricCollectionPage, err error) { +func (client AppServiceEnvironmentsClient) ListMultiRolePoolSkus(ctx context.Context, resourceGroupName string, name string) (result SkuInfoCollectionPage, err error) { if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListMultiRoleMetrics") + ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListMultiRolePoolSkus") defer func() { sc := -1 - if result.rmc.Response.Response != nil { - sc = result.rmc.Response.Response.StatusCode + if result.sic.Response.Response != nil { + sc = result.sic.Response.Response.StatusCode } tracing.EndSpan(ctx, sc, err) }() @@ -2057,543 +2167,26 @@ func (client AppServiceEnvironmentsClient) ListMultiRoleMetrics(ctx context.Cont Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppServiceEnvironmentsClient", "ListMultiRoleMetrics", err.Error()) + return result, validation.NewError("web.AppServiceEnvironmentsClient", "ListMultiRolePoolSkus", err.Error()) } - result.fn = client.listMultiRoleMetricsNextResults - req, err := client.ListMultiRoleMetricsPreparer(ctx, resourceGroupName, name, startTime, endTime, timeGrain, details, filter) + result.fn = client.listMultiRolePoolSkusNextResults + req, err := client.ListMultiRolePoolSkusPreparer(ctx, resourceGroupName, name) if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRoleMetrics", nil, "Failure preparing request") + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRolePoolSkus", nil, "Failure preparing request") return } - resp, err := client.ListMultiRoleMetricsSender(req) + resp, err := client.ListMultiRolePoolSkusSender(req) if err != nil { - result.rmc.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRoleMetrics", resp, "Failure sending request") + result.sic.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRolePoolSkus", resp, "Failure sending request") return } - result.rmc, err = client.ListMultiRoleMetricsResponder(resp) + result.sic, err = client.ListMultiRolePoolSkusResponder(resp) if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRoleMetrics", resp, "Failure responding to request") - } - - return -} - -// ListMultiRoleMetricsPreparer prepares the ListMultiRoleMetrics request. -func (client AppServiceEnvironmentsClient) ListMultiRoleMetricsPreparer(ctx context.Context, resourceGroupName string, name string, startTime string, endTime string, timeGrain string, details *bool, filter string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - if len(startTime) > 0 { - queryParameters["startTime"] = autorest.Encode("query", startTime) - } - if len(endTime) > 0 { - queryParameters["endTime"] = autorest.Encode("query", endTime) - } - if len(timeGrain) > 0 { - queryParameters["timeGrain"] = autorest.Encode("query", timeGrain) - } - if details != nil { - queryParameters["details"] = autorest.Encode("query", *details) - } - if len(filter) > 0 { - queryParameters["$filter"] = filter - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/metrics", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListMultiRoleMetricsSender sends the ListMultiRoleMetrics request. The method will close the -// http.Response Body if it receives an error. -func (client AppServiceEnvironmentsClient) ListMultiRoleMetricsSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// ListMultiRoleMetricsResponder handles the response to the ListMultiRoleMetrics request. The method always -// closes the http.Response Body. -func (client AppServiceEnvironmentsClient) ListMultiRoleMetricsResponder(resp *http.Response) (result ResourceMetricCollection, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// listMultiRoleMetricsNextResults retrieves the next set of results, if any. -func (client AppServiceEnvironmentsClient) listMultiRoleMetricsNextResults(ctx context.Context, lastResults ResourceMetricCollection) (result ResourceMetricCollection, err error) { - req, err := lastResults.resourceMetricCollectionPreparer(ctx) - if err != nil { - return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRoleMetricsNextResults", nil, "Failure preparing next results request") - } - if req == nil { - return - } - resp, err := client.ListMultiRoleMetricsSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRoleMetricsNextResults", resp, "Failure sending next results request") - } - result, err = client.ListMultiRoleMetricsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRoleMetricsNextResults", resp, "Failure responding to next results request") - } - return -} - -// ListMultiRoleMetricsComplete enumerates all values, automatically crossing page boundaries as required. -func (client AppServiceEnvironmentsClient) ListMultiRoleMetricsComplete(ctx context.Context, resourceGroupName string, name string, startTime string, endTime string, timeGrain string, details *bool, filter string) (result ResourceMetricCollectionIterator, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListMultiRoleMetrics") - defer func() { - sc := -1 - if result.Response().Response.Response != nil { - sc = result.page.Response().Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - result.page, err = client.ListMultiRoleMetrics(ctx, resourceGroupName, name, startTime, endTime, timeGrain, details, filter) - return -} - -// ListMultiRolePoolInstanceMetricDefinitions get metric definitions for a specific instance of a multi-role pool of an -// App Service Environment. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - name of the App Service Environment. -// instance - name of the instance in the multi-role pool. -func (client AppServiceEnvironmentsClient) ListMultiRolePoolInstanceMetricDefinitions(ctx context.Context, resourceGroupName string, name string, instance string) (result ResourceMetricDefinitionCollectionPage, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListMultiRolePoolInstanceMetricDefinitions") - defer func() { - sc := -1 - if result.rmdc.Response.Response != nil { - sc = result.rmdc.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppServiceEnvironmentsClient", "ListMultiRolePoolInstanceMetricDefinitions", err.Error()) - } - - result.fn = client.listMultiRolePoolInstanceMetricDefinitionsNextResults - req, err := client.ListMultiRolePoolInstanceMetricDefinitionsPreparer(ctx, resourceGroupName, name, instance) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRolePoolInstanceMetricDefinitions", nil, "Failure preparing request") - return - } - - resp, err := client.ListMultiRolePoolInstanceMetricDefinitionsSender(req) - if err != nil { - result.rmdc.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRolePoolInstanceMetricDefinitions", resp, "Failure sending request") - return - } - - result.rmdc, err = client.ListMultiRolePoolInstanceMetricDefinitionsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRolePoolInstanceMetricDefinitions", resp, "Failure responding to request") - } - - return -} - -// ListMultiRolePoolInstanceMetricDefinitionsPreparer prepares the ListMultiRolePoolInstanceMetricDefinitions request. -func (client AppServiceEnvironmentsClient) ListMultiRolePoolInstanceMetricDefinitionsPreparer(ctx context.Context, resourceGroupName string, name string, instance string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "instance": autorest.Encode("path", instance), - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/instances/{instance}/metricdefinitions", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListMultiRolePoolInstanceMetricDefinitionsSender sends the ListMultiRolePoolInstanceMetricDefinitions request. The method will close the -// http.Response Body if it receives an error. -func (client AppServiceEnvironmentsClient) ListMultiRolePoolInstanceMetricDefinitionsSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// ListMultiRolePoolInstanceMetricDefinitionsResponder handles the response to the ListMultiRolePoolInstanceMetricDefinitions request. The method always -// closes the http.Response Body. -func (client AppServiceEnvironmentsClient) ListMultiRolePoolInstanceMetricDefinitionsResponder(resp *http.Response) (result ResourceMetricDefinitionCollection, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// listMultiRolePoolInstanceMetricDefinitionsNextResults retrieves the next set of results, if any. -func (client AppServiceEnvironmentsClient) listMultiRolePoolInstanceMetricDefinitionsNextResults(ctx context.Context, lastResults ResourceMetricDefinitionCollection) (result ResourceMetricDefinitionCollection, err error) { - req, err := lastResults.resourceMetricDefinitionCollectionPreparer(ctx) - if err != nil { - return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRolePoolInstanceMetricDefinitionsNextResults", nil, "Failure preparing next results request") - } - if req == nil { - return - } - resp, err := client.ListMultiRolePoolInstanceMetricDefinitionsSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRolePoolInstanceMetricDefinitionsNextResults", resp, "Failure sending next results request") - } - result, err = client.ListMultiRolePoolInstanceMetricDefinitionsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRolePoolInstanceMetricDefinitionsNextResults", resp, "Failure responding to next results request") - } - return -} - -// ListMultiRolePoolInstanceMetricDefinitionsComplete enumerates all values, automatically crossing page boundaries as required. -func (client AppServiceEnvironmentsClient) ListMultiRolePoolInstanceMetricDefinitionsComplete(ctx context.Context, resourceGroupName string, name string, instance string) (result ResourceMetricDefinitionCollectionIterator, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListMultiRolePoolInstanceMetricDefinitions") - defer func() { - sc := -1 - if result.Response().Response.Response != nil { - sc = result.page.Response().Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - result.page, err = client.ListMultiRolePoolInstanceMetricDefinitions(ctx, resourceGroupName, name, instance) - return -} - -// ListMultiRolePoolInstanceMetrics get metrics for a specific instance of a multi-role pool of an App Service -// Environment. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - name of the App Service Environment. -// instance - name of the instance in the multi-role pool. -// details - specify true to include instance details. The default is false. -func (client AppServiceEnvironmentsClient) ListMultiRolePoolInstanceMetrics(ctx context.Context, resourceGroupName string, name string, instance string, details *bool) (result ResourceMetricCollectionPage, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListMultiRolePoolInstanceMetrics") - defer func() { - sc := -1 - if result.rmc.Response.Response != nil { - sc = result.rmc.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppServiceEnvironmentsClient", "ListMultiRolePoolInstanceMetrics", err.Error()) - } - - result.fn = client.listMultiRolePoolInstanceMetricsNextResults - req, err := client.ListMultiRolePoolInstanceMetricsPreparer(ctx, resourceGroupName, name, instance, details) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRolePoolInstanceMetrics", nil, "Failure preparing request") - return - } - - resp, err := client.ListMultiRolePoolInstanceMetricsSender(req) - if err != nil { - result.rmc.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRolePoolInstanceMetrics", resp, "Failure sending request") - return - } - - result.rmc, err = client.ListMultiRolePoolInstanceMetricsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRolePoolInstanceMetrics", resp, "Failure responding to request") - } - - return -} - -// ListMultiRolePoolInstanceMetricsPreparer prepares the ListMultiRolePoolInstanceMetrics request. -func (client AppServiceEnvironmentsClient) ListMultiRolePoolInstanceMetricsPreparer(ctx context.Context, resourceGroupName string, name string, instance string, details *bool) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "instance": autorest.Encode("path", instance), - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - if details != nil { - queryParameters["details"] = autorest.Encode("query", *details) - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/instances/{instance}/metrics", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListMultiRolePoolInstanceMetricsSender sends the ListMultiRolePoolInstanceMetrics request. The method will close the -// http.Response Body if it receives an error. -func (client AppServiceEnvironmentsClient) ListMultiRolePoolInstanceMetricsSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// ListMultiRolePoolInstanceMetricsResponder handles the response to the ListMultiRolePoolInstanceMetrics request. The method always -// closes the http.Response Body. -func (client AppServiceEnvironmentsClient) ListMultiRolePoolInstanceMetricsResponder(resp *http.Response) (result ResourceMetricCollection, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// listMultiRolePoolInstanceMetricsNextResults retrieves the next set of results, if any. -func (client AppServiceEnvironmentsClient) listMultiRolePoolInstanceMetricsNextResults(ctx context.Context, lastResults ResourceMetricCollection) (result ResourceMetricCollection, err error) { - req, err := lastResults.resourceMetricCollectionPreparer(ctx) - if err != nil { - return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRolePoolInstanceMetricsNextResults", nil, "Failure preparing next results request") - } - if req == nil { - return - } - resp, err := client.ListMultiRolePoolInstanceMetricsSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRolePoolInstanceMetricsNextResults", resp, "Failure sending next results request") - } - result, err = client.ListMultiRolePoolInstanceMetricsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRolePoolInstanceMetricsNextResults", resp, "Failure responding to next results request") - } - return -} - -// ListMultiRolePoolInstanceMetricsComplete enumerates all values, automatically crossing page boundaries as required. -func (client AppServiceEnvironmentsClient) ListMultiRolePoolInstanceMetricsComplete(ctx context.Context, resourceGroupName string, name string, instance string, details *bool) (result ResourceMetricCollectionIterator, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListMultiRolePoolInstanceMetrics") - defer func() { - sc := -1 - if result.Response().Response.Response != nil { - sc = result.page.Response().Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - result.page, err = client.ListMultiRolePoolInstanceMetrics(ctx, resourceGroupName, name, instance, details) - return -} - -// ListMultiRolePools get all multi-role pools. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - name of the App Service Environment. -func (client AppServiceEnvironmentsClient) ListMultiRolePools(ctx context.Context, resourceGroupName string, name string) (result WorkerPoolCollectionPage, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListMultiRolePools") - defer func() { - sc := -1 - if result.wpc.Response.Response != nil { - sc = result.wpc.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppServiceEnvironmentsClient", "ListMultiRolePools", err.Error()) - } - - result.fn = client.listMultiRolePoolsNextResults - req, err := client.ListMultiRolePoolsPreparer(ctx, resourceGroupName, name) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRolePools", nil, "Failure preparing request") - return - } - - resp, err := client.ListMultiRolePoolsSender(req) - if err != nil { - result.wpc.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRolePools", resp, "Failure sending request") - return - } - - result.wpc, err = client.ListMultiRolePoolsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRolePools", resp, "Failure responding to request") - } - - return -} - -// ListMultiRolePoolsPreparer prepares the ListMultiRolePools request. -func (client AppServiceEnvironmentsClient) ListMultiRolePoolsPreparer(ctx context.Context, resourceGroupName string, name string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListMultiRolePoolsSender sends the ListMultiRolePools request. The method will close the -// http.Response Body if it receives an error. -func (client AppServiceEnvironmentsClient) ListMultiRolePoolsSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// ListMultiRolePoolsResponder handles the response to the ListMultiRolePools request. The method always -// closes the http.Response Body. -func (client AppServiceEnvironmentsClient) ListMultiRolePoolsResponder(resp *http.Response) (result WorkerPoolCollection, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// listMultiRolePoolsNextResults retrieves the next set of results, if any. -func (client AppServiceEnvironmentsClient) listMultiRolePoolsNextResults(ctx context.Context, lastResults WorkerPoolCollection) (result WorkerPoolCollection, err error) { - req, err := lastResults.workerPoolCollectionPreparer(ctx) - if err != nil { - return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRolePoolsNextResults", nil, "Failure preparing next results request") - } - if req == nil { - return - } - resp, err := client.ListMultiRolePoolsSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRolePoolsNextResults", resp, "Failure sending next results request") - } - result, err = client.ListMultiRolePoolsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listMultiRolePoolsNextResults", resp, "Failure responding to next results request") - } - return -} - -// ListMultiRolePoolsComplete enumerates all values, automatically crossing page boundaries as required. -func (client AppServiceEnvironmentsClient) ListMultiRolePoolsComplete(ctx context.Context, resourceGroupName string, name string) (result WorkerPoolCollectionIterator, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListMultiRolePools") - defer func() { - sc := -1 - if result.Response().Response.Response != nil { - sc = result.page.Response().Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - result.page, err = client.ListMultiRolePools(ctx, resourceGroupName, name) - return -} - -// ListMultiRolePoolSkus get available SKUs for scaling a multi-role pool. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - name of the App Service Environment. -func (client AppServiceEnvironmentsClient) ListMultiRolePoolSkus(ctx context.Context, resourceGroupName string, name string) (result SkuInfoCollectionPage, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListMultiRolePoolSkus") - defer func() { - sc := -1 - if result.sic.Response.Response != nil { - sc = result.sic.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppServiceEnvironmentsClient", "ListMultiRolePoolSkus", err.Error()) - } - - result.fn = client.listMultiRolePoolSkusNextResults - req, err := client.ListMultiRolePoolSkusPreparer(ctx, resourceGroupName, name) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRolePoolSkus", nil, "Failure preparing request") - return - } - - resp, err := client.ListMultiRolePoolSkusSender(req) - if err != nil { - result.sic.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRolePoolSkus", resp, "Failure sending request") - return - } - - result.sic, err = client.ListMultiRolePoolSkusResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRolePoolSkus", resp, "Failure responding to request") + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListMultiRolePoolSkus", resp, "Failure responding to request") } return @@ -2607,7 +2200,7 @@ func (client AppServiceEnvironmentsClient) ListMultiRolePoolSkusPreparer(ctx con "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -2677,7 +2270,7 @@ func (client AppServiceEnvironmentsClient) ListMultiRolePoolSkusComplete(ctx con return } -// ListMultiRoleUsages get usage metrics for a multi-role pool of an App Service Environment. +// ListMultiRoleUsages description for Get usage metrics for a multi-role pool of an App Service Environment. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -2730,7 +2323,7 @@ func (client AppServiceEnvironmentsClient) ListMultiRoleUsagesPreparer(ctx conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -2800,7 +2393,7 @@ func (client AppServiceEnvironmentsClient) ListMultiRoleUsagesComplete(ctx conte return } -// ListOperations list all currently running operations on the App Service Environment. +// ListOperations description for List all currently running operations on the App Service Environment. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -2852,7 +2445,7 @@ func (client AppServiceEnvironmentsClient) ListOperationsPreparer(ctx context.Co "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -2885,7 +2478,7 @@ func (client AppServiceEnvironmentsClient) ListOperationsResponder(resp *http.Re return } -// ListUsages get global usage metrics of an App Service Environment. +// ListUsages description for Get global usage metrics of an App Service Environment. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -2914,181 +2507,59 @@ func (client AppServiceEnvironmentsClient) ListUsages(ctx context.Context, resou result.fn = client.listUsagesNextResults req, err := client.ListUsagesPreparer(ctx, resourceGroupName, name, filter) if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListUsages", nil, "Failure preparing request") - return - } - - resp, err := client.ListUsagesSender(req) - if err != nil { - result.cuqc.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListUsages", resp, "Failure sending request") - return - } - - result.cuqc, err = client.ListUsagesResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListUsages", resp, "Failure responding to request") - } - - return -} - -// ListUsagesPreparer prepares the ListUsages request. -func (client AppServiceEnvironmentsClient) ListUsagesPreparer(ctx context.Context, resourceGroupName string, name string, filter string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - if len(filter) > 0 { - queryParameters["$filter"] = filter - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/usages", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListUsagesSender sends the ListUsages request. The method will close the -// http.Response Body if it receives an error. -func (client AppServiceEnvironmentsClient) ListUsagesSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// ListUsagesResponder handles the response to the ListUsages request. The method always -// closes the http.Response Body. -func (client AppServiceEnvironmentsClient) ListUsagesResponder(resp *http.Response) (result CsmUsageQuotaCollection, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// listUsagesNextResults retrieves the next set of results, if any. -func (client AppServiceEnvironmentsClient) listUsagesNextResults(ctx context.Context, lastResults CsmUsageQuotaCollection) (result CsmUsageQuotaCollection, err error) { - req, err := lastResults.csmUsageQuotaCollectionPreparer(ctx) - if err != nil { - return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listUsagesNextResults", nil, "Failure preparing next results request") - } - if req == nil { - return - } - resp, err := client.ListUsagesSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listUsagesNextResults", resp, "Failure sending next results request") - } - result, err = client.ListUsagesResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listUsagesNextResults", resp, "Failure responding to next results request") - } - return -} - -// ListUsagesComplete enumerates all values, automatically crossing page boundaries as required. -func (client AppServiceEnvironmentsClient) ListUsagesComplete(ctx context.Context, resourceGroupName string, name string, filter string) (result CsmUsageQuotaCollectionIterator, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListUsages") - defer func() { - sc := -1 - if result.Response().Response.Response != nil { - sc = result.page.Response().Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - result.page, err = client.ListUsages(ctx, resourceGroupName, name, filter) - return -} - -// ListVips get IP addresses assigned to an App Service Environment. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - name of the App Service Environment. -func (client AppServiceEnvironmentsClient) ListVips(ctx context.Context, resourceGroupName string, name string) (result AddressResponse, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListVips") - defer func() { - sc := -1 - if result.Response.Response != nil { - sc = result.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppServiceEnvironmentsClient", "ListVips", err.Error()) - } - - req, err := client.ListVipsPreparer(ctx, resourceGroupName, name) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListVips", nil, "Failure preparing request") + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListUsages", nil, "Failure preparing request") return } - resp, err := client.ListVipsSender(req) + resp, err := client.ListUsagesSender(req) if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListVips", resp, "Failure sending request") + result.cuqc.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListUsages", resp, "Failure sending request") return } - result, err = client.ListVipsResponder(resp) + result.cuqc, err = client.ListUsagesResponder(resp) if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListVips", resp, "Failure responding to request") + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListUsages", resp, "Failure responding to request") } return } -// ListVipsPreparer prepares the ListVips request. -func (client AppServiceEnvironmentsClient) ListVipsPreparer(ctx context.Context, resourceGroupName string, name string) (*http.Request, error) { +// ListUsagesPreparer prepares the ListUsages request. +func (client AppServiceEnvironmentsClient) ListUsagesPreparer(ctx context.Context, resourceGroupName string, name string, filter string) (*http.Request, error) { pathParameters := map[string]interface{}{ "name": autorest.Encode("path", name), "resourceGroupName": autorest.Encode("path", resourceGroupName), "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } + if len(filter) > 0 { + queryParameters["$filter"] = filter + } preparer := autorest.CreatePreparer( autorest.AsGet(), autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/capacities/virtualip", pathParameters), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/usages", pathParameters), autorest.WithQueryParameters(queryParameters)) return preparer.Prepare((&http.Request{}).WithContext(ctx)) } -// ListVipsSender sends the ListVips request. The method will close the +// ListUsagesSender sends the ListUsages request. The method will close the // http.Response Body if it receives an error. -func (client AppServiceEnvironmentsClient) ListVipsSender(req *http.Request) (*http.Response, error) { +func (client AppServiceEnvironmentsClient) ListUsagesSender(req *http.Request) (*http.Response, error) { sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) return autorest.SendWithSender(client, req, sd...) } -// ListVipsResponder handles the response to the ListVips request. The method always +// ListUsagesResponder handles the response to the ListUsages request. The method always // closes the http.Response Body. -func (client AppServiceEnvironmentsClient) ListVipsResponder(resp *http.Response) (result AddressResponse, err error) { +func (client AppServiceEnvironmentsClient) ListUsagesResponder(resp *http.Response) (result CsmUsageQuotaCollection, err error) { err = autorest.Respond( resp, client.ByInspecting(), @@ -3099,7 +2570,44 @@ func (client AppServiceEnvironmentsClient) ListVipsResponder(resp *http.Response return } -// ListWebApps get all apps in an App Service Environment. +// listUsagesNextResults retrieves the next set of results, if any. +func (client AppServiceEnvironmentsClient) listUsagesNextResults(ctx context.Context, lastResults CsmUsageQuotaCollection) (result CsmUsageQuotaCollection, err error) { + req, err := lastResults.csmUsageQuotaCollectionPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listUsagesNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListUsagesSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listUsagesNextResults", resp, "Failure sending next results request") + } + result, err = client.ListUsagesResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listUsagesNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListUsagesComplete enumerates all values, automatically crossing page boundaries as required. +func (client AppServiceEnvironmentsClient) ListUsagesComplete(ctx context.Context, resourceGroupName string, name string, filter string) (result CsmUsageQuotaCollectionIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListUsages") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.ListUsages(ctx, resourceGroupName, name, filter) + return +} + +// ListWebApps description for Get all apps in an App Service Environment. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -3153,7 +2661,7 @@ func (client AppServiceEnvironmentsClient) ListWebAppsPreparer(ctx context.Conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -3226,7 +2734,8 @@ func (client AppServiceEnvironmentsClient) ListWebAppsComplete(ctx context.Conte return } -// ListWebWorkerMetricDefinitions get metric definitions for a worker pool of an App Service Environment. +// ListWebWorkerMetricDefinitions description for Get metric definitions for a worker pool of an App Service +// Environment. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -3281,7 +2790,7 @@ func (client AppServiceEnvironmentsClient) ListWebWorkerMetricDefinitionsPrepare "workerPoolName": autorest.Encode("path", workerPoolName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -3351,142 +2860,7 @@ func (client AppServiceEnvironmentsClient) ListWebWorkerMetricDefinitionsComplet return } -// ListWebWorkerMetrics get metrics for a worker pool of a AppServiceEnvironment (App Service Environment). -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - name of the App Service Environment. -// workerPoolName - name of worker pool -// details - specify true to include instance details. The default is false. -// filter - return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: -// $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and -// endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'. -func (client AppServiceEnvironmentsClient) ListWebWorkerMetrics(ctx context.Context, resourceGroupName string, name string, workerPoolName string, details *bool, filter string) (result ResourceMetricCollectionPage, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListWebWorkerMetrics") - defer func() { - sc := -1 - if result.rmc.Response.Response != nil { - sc = result.rmc.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppServiceEnvironmentsClient", "ListWebWorkerMetrics", err.Error()) - } - - result.fn = client.listWebWorkerMetricsNextResults - req, err := client.ListWebWorkerMetricsPreparer(ctx, resourceGroupName, name, workerPoolName, details, filter) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListWebWorkerMetrics", nil, "Failure preparing request") - return - } - - resp, err := client.ListWebWorkerMetricsSender(req) - if err != nil { - result.rmc.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListWebWorkerMetrics", resp, "Failure sending request") - return - } - - result.rmc, err = client.ListWebWorkerMetricsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListWebWorkerMetrics", resp, "Failure responding to request") - } - - return -} - -// ListWebWorkerMetricsPreparer prepares the ListWebWorkerMetrics request. -func (client AppServiceEnvironmentsClient) ListWebWorkerMetricsPreparer(ctx context.Context, resourceGroupName string, name string, workerPoolName string, details *bool, filter string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - "workerPoolName": autorest.Encode("path", workerPoolName), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - if details != nil { - queryParameters["details"] = autorest.Encode("query", *details) - } - if len(filter) > 0 { - queryParameters["$filter"] = filter - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/metrics", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListWebWorkerMetricsSender sends the ListWebWorkerMetrics request. The method will close the -// http.Response Body if it receives an error. -func (client AppServiceEnvironmentsClient) ListWebWorkerMetricsSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// ListWebWorkerMetricsResponder handles the response to the ListWebWorkerMetrics request. The method always -// closes the http.Response Body. -func (client AppServiceEnvironmentsClient) ListWebWorkerMetricsResponder(resp *http.Response) (result ResourceMetricCollection, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// listWebWorkerMetricsNextResults retrieves the next set of results, if any. -func (client AppServiceEnvironmentsClient) listWebWorkerMetricsNextResults(ctx context.Context, lastResults ResourceMetricCollection) (result ResourceMetricCollection, err error) { - req, err := lastResults.resourceMetricCollectionPreparer(ctx) - if err != nil { - return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listWebWorkerMetricsNextResults", nil, "Failure preparing next results request") - } - if req == nil { - return - } - resp, err := client.ListWebWorkerMetricsSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listWebWorkerMetricsNextResults", resp, "Failure sending next results request") - } - result, err = client.ListWebWorkerMetricsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listWebWorkerMetricsNextResults", resp, "Failure responding to next results request") - } - return -} - -// ListWebWorkerMetricsComplete enumerates all values, automatically crossing page boundaries as required. -func (client AppServiceEnvironmentsClient) ListWebWorkerMetricsComplete(ctx context.Context, resourceGroupName string, name string, workerPoolName string, details *bool, filter string) (result ResourceMetricCollectionIterator, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListWebWorkerMetrics") - defer func() { - sc := -1 - if result.Response().Response.Response != nil { - sc = result.page.Response().Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - result.page, err = client.ListWebWorkerMetrics(ctx, resourceGroupName, name, workerPoolName, details, filter) - return -} - -// ListWebWorkerUsages get usage metrics for a worker pool of an App Service Environment. +// ListWebWorkerUsages description for Get usage metrics for a worker pool of an App Service Environment. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -3541,7 +2915,7 @@ func (client AppServiceEnvironmentsClient) ListWebWorkerUsagesPreparer(ctx conte "workerPoolName": autorest.Encode("path", workerPoolName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -3611,8 +2985,8 @@ func (client AppServiceEnvironmentsClient) ListWebWorkerUsagesComplete(ctx conte return } -// ListWorkerPoolInstanceMetricDefinitions get metric definitions for a specific instance of a worker pool of an App -// Service Environment. +// ListWorkerPoolInstanceMetricDefinitions description for Get metric definitions for a specific instance of a worker +// pool of an App Service Environment. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -3669,7 +3043,7 @@ func (client AppServiceEnvironmentsClient) ListWorkerPoolInstanceMetricDefinitio "workerPoolName": autorest.Encode("path", workerPoolName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -3739,144 +3113,7 @@ func (client AppServiceEnvironmentsClient) ListWorkerPoolInstanceMetricDefinitio return } -// ListWorkerPoolInstanceMetrics get metrics for a specific instance of a worker pool of an App Service Environment. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - name of the App Service Environment. -// workerPoolName - name of the worker pool. -// instance - name of the instance in the worker pool. -// details - specify true to include instance details. The default is false. -// filter - return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: -// $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and -// endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'. -func (client AppServiceEnvironmentsClient) ListWorkerPoolInstanceMetrics(ctx context.Context, resourceGroupName string, name string, workerPoolName string, instance string, details *bool, filter string) (result ResourceMetricCollectionPage, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListWorkerPoolInstanceMetrics") - defer func() { - sc := -1 - if result.rmc.Response.Response != nil { - sc = result.rmc.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppServiceEnvironmentsClient", "ListWorkerPoolInstanceMetrics", err.Error()) - } - - result.fn = client.listWorkerPoolInstanceMetricsNextResults - req, err := client.ListWorkerPoolInstanceMetricsPreparer(ctx, resourceGroupName, name, workerPoolName, instance, details, filter) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListWorkerPoolInstanceMetrics", nil, "Failure preparing request") - return - } - - resp, err := client.ListWorkerPoolInstanceMetricsSender(req) - if err != nil { - result.rmc.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListWorkerPoolInstanceMetrics", resp, "Failure sending request") - return - } - - result.rmc, err = client.ListWorkerPoolInstanceMetricsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "ListWorkerPoolInstanceMetrics", resp, "Failure responding to request") - } - - return -} - -// ListWorkerPoolInstanceMetricsPreparer prepares the ListWorkerPoolInstanceMetrics request. -func (client AppServiceEnvironmentsClient) ListWorkerPoolInstanceMetricsPreparer(ctx context.Context, resourceGroupName string, name string, workerPoolName string, instance string, details *bool, filter string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "instance": autorest.Encode("path", instance), - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - "workerPoolName": autorest.Encode("path", workerPoolName), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - if details != nil { - queryParameters["details"] = autorest.Encode("query", *details) - } - if len(filter) > 0 { - queryParameters["$filter"] = filter - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/instances/{instance}/metrics", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListWorkerPoolInstanceMetricsSender sends the ListWorkerPoolInstanceMetrics request. The method will close the -// http.Response Body if it receives an error. -func (client AppServiceEnvironmentsClient) ListWorkerPoolInstanceMetricsSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// ListWorkerPoolInstanceMetricsResponder handles the response to the ListWorkerPoolInstanceMetrics request. The method always -// closes the http.Response Body. -func (client AppServiceEnvironmentsClient) ListWorkerPoolInstanceMetricsResponder(resp *http.Response) (result ResourceMetricCollection, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// listWorkerPoolInstanceMetricsNextResults retrieves the next set of results, if any. -func (client AppServiceEnvironmentsClient) listWorkerPoolInstanceMetricsNextResults(ctx context.Context, lastResults ResourceMetricCollection) (result ResourceMetricCollection, err error) { - req, err := lastResults.resourceMetricCollectionPreparer(ctx) - if err != nil { - return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listWorkerPoolInstanceMetricsNextResults", nil, "Failure preparing next results request") - } - if req == nil { - return - } - resp, err := client.ListWorkerPoolInstanceMetricsSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - return result, autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listWorkerPoolInstanceMetricsNextResults", resp, "Failure sending next results request") - } - result, err = client.ListWorkerPoolInstanceMetricsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServiceEnvironmentsClient", "listWorkerPoolInstanceMetricsNextResults", resp, "Failure responding to next results request") - } - return -} - -// ListWorkerPoolInstanceMetricsComplete enumerates all values, automatically crossing page boundaries as required. -func (client AppServiceEnvironmentsClient) ListWorkerPoolInstanceMetricsComplete(ctx context.Context, resourceGroupName string, name string, workerPoolName string, instance string, details *bool, filter string) (result ResourceMetricCollectionIterator, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServiceEnvironmentsClient.ListWorkerPoolInstanceMetrics") - defer func() { - sc := -1 - if result.Response().Response.Response != nil { - sc = result.page.Response().Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - result.page, err = client.ListWorkerPoolInstanceMetrics(ctx, resourceGroupName, name, workerPoolName, instance, details, filter) - return -} - -// ListWorkerPools get all worker pools of an App Service Environment. +// ListWorkerPools description for Get all worker pools of an App Service Environment. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -3929,7 +3166,7 @@ func (client AppServiceEnvironmentsClient) ListWorkerPoolsPreparer(ctx context.C "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -3999,7 +3236,7 @@ func (client AppServiceEnvironmentsClient) ListWorkerPoolsComplete(ctx context.C return } -// ListWorkerPoolSkus get available SKUs for scaling a worker pool. +// ListWorkerPoolSkus description for Get available SKUs for scaling a worker pool. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -4054,7 +3291,7 @@ func (client AppServiceEnvironmentsClient) ListWorkerPoolSkusPreparer(ctx contex "workerPoolName": autorest.Encode("path", workerPoolName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -4124,7 +3361,7 @@ func (client AppServiceEnvironmentsClient) ListWorkerPoolSkusComplete(ctx contex return } -// Reboot reboot all machines in an App Service Environment. +// Reboot description for Reboot all machines in an App Service Environment. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -4176,7 +3413,7 @@ func (client AppServiceEnvironmentsClient) RebootPreparer(ctx context.Context, r "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -4202,13 +3439,13 @@ func (client AppServiceEnvironmentsClient) RebootResponder(resp *http.Response) err = autorest.Respond( resp, client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusBadRequest, http.StatusNotFound, http.StatusConflict), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), autorest.ByClosing()) result.Response = resp return } -// Resume resume an App Service Environment. +// Resume description for Resume an App Service Environment. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -4254,7 +3491,7 @@ func (client AppServiceEnvironmentsClient) ResumePreparer(ctx context.Context, r "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -4335,7 +3572,7 @@ func (client AppServiceEnvironmentsClient) ResumeComplete(ctx context.Context, r return } -// Suspend suspend an App Service Environment. +// Suspend description for Suspend an App Service Environment. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -4381,7 +3618,7 @@ func (client AppServiceEnvironmentsClient) SuspendPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -4462,7 +3699,7 @@ func (client AppServiceEnvironmentsClient) SuspendComplete(ctx context.Context, return } -// Update create or update an App Service Environment. +// Update description for Create or update an App Service Environment. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -4515,7 +3752,7 @@ func (client AppServiceEnvironmentsClient) UpdatePreparer(ctx context.Context, r "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -4543,14 +3780,14 @@ func (client AppServiceEnvironmentsClient) UpdateResponder(resp *http.Response) err = autorest.Respond( resp, client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusBadRequest, http.StatusNotFound, http.StatusConflict), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) result.Response = autorest.Response{Response: resp} return } -// UpdateMultiRolePool create or update a multi-role pool. +// UpdateMultiRolePool description for Create or update a multi-role pool. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -4603,7 +3840,7 @@ func (client AppServiceEnvironmentsClient) UpdateMultiRolePoolPreparer(ctx conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -4631,14 +3868,14 @@ func (client AppServiceEnvironmentsClient) UpdateMultiRolePoolResponder(resp *ht err = autorest.Respond( resp, client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusBadRequest, http.StatusNotFound, http.StatusConflict), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) result.Response = autorest.Response{Response: resp} return } -// UpdateWorkerPool create or update a worker pool. +// UpdateWorkerPool description for Create or update a worker pool. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service Environment. @@ -4693,7 +3930,7 @@ func (client AppServiceEnvironmentsClient) UpdateWorkerPoolPreparer(ctx context. "workerPoolName": autorest.Encode("path", workerPoolName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -4721,7 +3958,7 @@ func (client AppServiceEnvironmentsClient) UpdateWorkerPoolResponder(resp *http. err = autorest.Respond( resp, client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusBadRequest, http.StatusNotFound, http.StatusConflict), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) result.Response = autorest.Response{Response: resp} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/appserviceplans.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/appserviceplans.go similarity index 88% rename from vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/appserviceplans.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/appserviceplans.go index 3324503f3dabc..24b03add793b6 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/appserviceplans.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/appserviceplans.go @@ -41,7 +41,7 @@ func NewAppServicePlansClientWithBaseURI(baseURI string, subscriptionID string) return AppServicePlansClient{NewWithBaseURI(baseURI, subscriptionID)} } -// CreateOrUpdate creates or updates an App Service Plan. +// CreateOrUpdate description for Creates or updates an App Service Plan. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service plan. @@ -88,7 +88,7 @@ func (client AppServicePlansClient) CreateOrUpdatePreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -122,14 +122,14 @@ func (client AppServicePlansClient) CreateOrUpdateResponder(resp *http.Response) err = autorest.Respond( resp, client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) result.Response = autorest.Response{Response: resp} return } -// CreateOrUpdateVnetRoute create or update a Virtual Network route in an App Service plan. +// CreateOrUpdateVnetRoute description for Create or update a Virtual Network route in an App Service plan. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service plan. @@ -186,7 +186,7 @@ func (client AppServicePlansClient) CreateOrUpdateVnetRoutePreparer(ctx context. "vnetName": autorest.Encode("path", vnetName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -221,7 +221,7 @@ func (client AppServicePlansClient) CreateOrUpdateVnetRouteResponder(resp *http. return } -// Delete delete an App Service plan. +// Delete description for Delete an App Service plan. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service plan. @@ -273,7 +273,7 @@ func (client AppServicePlansClient) DeletePreparer(ctx context.Context, resource "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -305,7 +305,7 @@ func (client AppServicePlansClient) DeleteResponder(resp *http.Response) (result return } -// DeleteHybridConnection delete a Hybrid Connection in use in an App Service plan. +// DeleteHybridConnection description for Delete a Hybrid Connection in use in an App Service plan. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service plan. @@ -361,7 +361,7 @@ func (client AppServicePlansClient) DeleteHybridConnectionPreparer(ctx context.C "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -393,7 +393,7 @@ func (client AppServicePlansClient) DeleteHybridConnectionResponder(resp *http.R return } -// DeleteVnetRoute delete a Virtual Network route in an App Service plan. +// DeleteVnetRoute description for Delete a Virtual Network route in an App Service plan. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service plan. @@ -449,7 +449,7 @@ func (client AppServicePlansClient) DeleteVnetRoutePreparer(ctx context.Context, "vnetName": autorest.Encode("path", vnetName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -481,7 +481,7 @@ func (client AppServicePlansClient) DeleteVnetRouteResponder(resp *http.Response return } -// Get get an App Service plan. +// Get description for Get an App Service plan. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service plan. @@ -533,7 +533,7 @@ func (client AppServicePlansClient) GetPreparer(ctx context.Context, resourceGro "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -566,7 +566,7 @@ func (client AppServicePlansClient) GetResponder(resp *http.Response) (result Ap return } -// GetHybridConnection retrieve a Hybrid Connection in use in an App Service plan. +// GetHybridConnection description for Retrieve a Hybrid Connection in use in an App Service plan. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service plan. @@ -622,7 +622,7 @@ func (client AppServicePlansClient) GetHybridConnectionPreparer(ctx context.Cont "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -655,7 +655,8 @@ func (client AppServicePlansClient) GetHybridConnectionResponder(resp *http.Resp return } -// GetHybridConnectionPlanLimit get the maximum number of Hybrid Connections allowed in an App Service plan. +// GetHybridConnectionPlanLimit description for Get the maximum number of Hybrid Connections allowed in an App Service +// plan. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service plan. @@ -707,7 +708,7 @@ func (client AppServicePlansClient) GetHybridConnectionPlanLimitPreparer(ctx con "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -740,7 +741,7 @@ func (client AppServicePlansClient) GetHybridConnectionPlanLimitResponder(resp * return } -// GetRouteForVnet get a Virtual Network route in an App Service plan. +// GetRouteForVnet description for Get a Virtual Network route in an App Service plan. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service plan. @@ -796,7 +797,7 @@ func (client AppServicePlansClient) GetRouteForVnetPreparer(ctx context.Context, "vnetName": autorest.Encode("path", vnetName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -829,7 +830,7 @@ func (client AppServicePlansClient) GetRouteForVnetResponder(resp *http.Response return } -// GetServerFarmSkus gets all selectable SKUs for a given App Service Plan +// GetServerFarmSkus description for Gets all selectable SKUs for a given App Service Plan // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of App Service Plan @@ -881,7 +882,7 @@ func (client AppServicePlansClient) GetServerFarmSkusPreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -914,7 +915,7 @@ func (client AppServicePlansClient) GetServerFarmSkusResponder(resp *http.Respon return } -// GetVnetFromServerFarm get a Virtual Network associated with an App Service plan. +// GetVnetFromServerFarm description for Get a Virtual Network associated with an App Service plan. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service plan. @@ -968,7 +969,7 @@ func (client AppServicePlansClient) GetVnetFromServerFarmPreparer(ctx context.Co "vnetName": autorest.Encode("path", vnetName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1001,7 +1002,7 @@ func (client AppServicePlansClient) GetVnetFromServerFarmResponder(resp *http.Re return } -// GetVnetGateway get a Virtual Network gateway. +// GetVnetGateway description for Get a Virtual Network gateway. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service plan. @@ -1057,7 +1058,7 @@ func (client AppServicePlansClient) GetVnetGatewayPreparer(ctx context.Context, "vnetName": autorest.Encode("path", vnetName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1090,7 +1091,7 @@ func (client AppServicePlansClient) GetVnetGatewayResponder(resp *http.Response) return } -// List get all App Service plans for a subscription. +// List description for Get all App Service plans for a subscription. // Parameters: // detailed - specify true to return all App Service plan properties. The default is // false, which returns a subset of the properties. @@ -1134,7 +1135,7 @@ func (client AppServicePlansClient) ListPreparer(ctx context.Context, detailed * "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1207,7 +1208,7 @@ func (client AppServicePlansClient) ListComplete(ctx context.Context, detailed * return } -// ListByResourceGroup get all App Service plans in a resource group. +// ListByResourceGroup description for Get all App Service plans in a resource group. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. func (client AppServicePlansClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result AppServicePlanCollectionPage, err error) { @@ -1258,7 +1259,7 @@ func (client AppServicePlansClient) ListByResourceGroupPreparer(ctx context.Cont "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1328,7 +1329,7 @@ func (client AppServicePlansClient) ListByResourceGroupComplete(ctx context.Cont return } -// ListCapabilities list all capabilities of an App Service plan. +// ListCapabilities description for List all capabilities of an App Service plan. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service plan. @@ -1380,7 +1381,7 @@ func (client AppServicePlansClient) ListCapabilitiesPreparer(ctx context.Context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1413,7 +1414,7 @@ func (client AppServicePlansClient) ListCapabilitiesResponder(resp *http.Respons return } -// ListHybridConnectionKeys get the send key name and value of a Hybrid Connection. +// ListHybridConnectionKeys description for Get the send key name and value of a Hybrid Connection. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service plan. @@ -1469,7 +1470,7 @@ func (client AppServicePlansClient) ListHybridConnectionKeysPreparer(ctx context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1502,7 +1503,7 @@ func (client AppServicePlansClient) ListHybridConnectionKeysResponder(resp *http return } -// ListHybridConnections retrieve all Hybrid Connections in use in an App Service plan. +// ListHybridConnections description for Retrieve all Hybrid Connections in use in an App Service plan. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service plan. @@ -1555,7 +1556,7 @@ func (client AppServicePlansClient) ListHybridConnectionsPreparer(ctx context.Co "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1625,263 +1626,7 @@ func (client AppServicePlansClient) ListHybridConnectionsComplete(ctx context.Co return } -// ListMetricDefintions get metrics that can be queried for an App Service plan, and their definitions. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - name of the App Service plan. -func (client AppServicePlansClient) ListMetricDefintions(ctx context.Context, resourceGroupName string, name string) (result ResourceMetricDefinitionCollectionPage, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServicePlansClient.ListMetricDefintions") - defer func() { - sc := -1 - if result.rmdc.Response.Response != nil { - sc = result.rmdc.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppServicePlansClient", "ListMetricDefintions", err.Error()) - } - - result.fn = client.listMetricDefintionsNextResults - req, err := client.ListMetricDefintionsPreparer(ctx, resourceGroupName, name) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServicePlansClient", "ListMetricDefintions", nil, "Failure preparing request") - return - } - - resp, err := client.ListMetricDefintionsSender(req) - if err != nil { - result.rmdc.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppServicePlansClient", "ListMetricDefintions", resp, "Failure sending request") - return - } - - result.rmdc, err = client.ListMetricDefintionsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServicePlansClient", "ListMetricDefintions", resp, "Failure responding to request") - } - - return -} - -// ListMetricDefintionsPreparer prepares the ListMetricDefintions request. -func (client AppServicePlansClient) ListMetricDefintionsPreparer(ctx context.Context, resourceGroupName string, name string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/metricdefinitions", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListMetricDefintionsSender sends the ListMetricDefintions request. The method will close the -// http.Response Body if it receives an error. -func (client AppServicePlansClient) ListMetricDefintionsSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// ListMetricDefintionsResponder handles the response to the ListMetricDefintions request. The method always -// closes the http.Response Body. -func (client AppServicePlansClient) ListMetricDefintionsResponder(resp *http.Response) (result ResourceMetricDefinitionCollection, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// listMetricDefintionsNextResults retrieves the next set of results, if any. -func (client AppServicePlansClient) listMetricDefintionsNextResults(ctx context.Context, lastResults ResourceMetricDefinitionCollection) (result ResourceMetricDefinitionCollection, err error) { - req, err := lastResults.resourceMetricDefinitionCollectionPreparer(ctx) - if err != nil { - return result, autorest.NewErrorWithError(err, "web.AppServicePlansClient", "listMetricDefintionsNextResults", nil, "Failure preparing next results request") - } - if req == nil { - return - } - resp, err := client.ListMetricDefintionsSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - return result, autorest.NewErrorWithError(err, "web.AppServicePlansClient", "listMetricDefintionsNextResults", resp, "Failure sending next results request") - } - result, err = client.ListMetricDefintionsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServicePlansClient", "listMetricDefintionsNextResults", resp, "Failure responding to next results request") - } - return -} - -// ListMetricDefintionsComplete enumerates all values, automatically crossing page boundaries as required. -func (client AppServicePlansClient) ListMetricDefintionsComplete(ctx context.Context, resourceGroupName string, name string) (result ResourceMetricDefinitionCollectionIterator, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServicePlansClient.ListMetricDefintions") - defer func() { - sc := -1 - if result.Response().Response.Response != nil { - sc = result.page.Response().Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - result.page, err = client.ListMetricDefintions(ctx, resourceGroupName, name) - return -} - -// ListMetrics get metrics for an App Service plan. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -// name - name of the App Service plan. -// details - specify true to include instance details. The default is false. -// filter - return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: -// $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and -// endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'. -func (client AppServicePlansClient) ListMetrics(ctx context.Context, resourceGroupName string, name string, details *bool, filter string) (result ResourceMetricCollectionPage, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServicePlansClient.ListMetrics") - defer func() { - sc := -1 - if result.rmc.Response.Response != nil { - sc = result.rmc.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.AppServicePlansClient", "ListMetrics", err.Error()) - } - - result.fn = client.listMetricsNextResults - req, err := client.ListMetricsPreparer(ctx, resourceGroupName, name, details, filter) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServicePlansClient", "ListMetrics", nil, "Failure preparing request") - return - } - - resp, err := client.ListMetricsSender(req) - if err != nil { - result.rmc.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.AppServicePlansClient", "ListMetrics", resp, "Failure sending request") - return - } - - result.rmc, err = client.ListMetricsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServicePlansClient", "ListMetrics", resp, "Failure responding to request") - } - - return -} - -// ListMetricsPreparer prepares the ListMetrics request. -func (client AppServicePlansClient) ListMetricsPreparer(ctx context.Context, resourceGroupName string, name string, details *bool, filter string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "name": autorest.Encode("path", name), - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - if details != nil { - queryParameters["details"] = autorest.Encode("query", *details) - } - if len(filter) > 0 { - queryParameters["$filter"] = filter - } - - preparer := autorest.CreatePreparer( - autorest.AsGet(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/metrics", pathParameters), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ListMetricsSender sends the ListMetrics request. The method will close the -// http.Response Body if it receives an error. -func (client AppServicePlansClient) ListMetricsSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// ListMetricsResponder handles the response to the ListMetrics request. The method always -// closes the http.Response Body. -func (client AppServicePlansClient) ListMetricsResponder(resp *http.Response) (result ResourceMetricCollection, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// listMetricsNextResults retrieves the next set of results, if any. -func (client AppServicePlansClient) listMetricsNextResults(ctx context.Context, lastResults ResourceMetricCollection) (result ResourceMetricCollection, err error) { - req, err := lastResults.resourceMetricCollectionPreparer(ctx) - if err != nil { - return result, autorest.NewErrorWithError(err, "web.AppServicePlansClient", "listMetricsNextResults", nil, "Failure preparing next results request") - } - if req == nil { - return - } - resp, err := client.ListMetricsSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - return result, autorest.NewErrorWithError(err, "web.AppServicePlansClient", "listMetricsNextResults", resp, "Failure sending next results request") - } - result, err = client.ListMetricsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.AppServicePlansClient", "listMetricsNextResults", resp, "Failure responding to next results request") - } - return -} - -// ListMetricsComplete enumerates all values, automatically crossing page boundaries as required. -func (client AppServicePlansClient) ListMetricsComplete(ctx context.Context, resourceGroupName string, name string, details *bool, filter string) (result ResourceMetricCollectionIterator, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/AppServicePlansClient.ListMetrics") - defer func() { - sc := -1 - if result.Response().Response.Response != nil { - sc = result.page.Response().Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - result.page, err = client.ListMetrics(ctx, resourceGroupName, name, details, filter) - return -} - -// ListRoutesForVnet get all routes that are associated with a Virtual Network in an App Service plan. +// ListRoutesForVnet description for Get all routes that are associated with a Virtual Network in an App Service plan. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service plan. @@ -1935,7 +1680,7 @@ func (client AppServicePlansClient) ListRoutesForVnetPreparer(ctx context.Contex "vnetName": autorest.Encode("path", vnetName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1968,7 +1713,7 @@ func (client AppServicePlansClient) ListRoutesForVnetResponder(resp *http.Respon return } -// ListUsages gets server farm usage information +// ListUsages description for Gets server farm usage information // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of App Service Plan @@ -2023,7 +1768,7 @@ func (client AppServicePlansClient) ListUsagesPreparer(ctx context.Context, reso "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -2096,7 +1841,7 @@ func (client AppServicePlansClient) ListUsagesComplete(ctx context.Context, reso return } -// ListVnets get all Virtual Networks associated with an App Service plan. +// ListVnets description for Get all Virtual Networks associated with an App Service plan. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service plan. @@ -2148,7 +1893,7 @@ func (client AppServicePlansClient) ListVnetsPreparer(ctx context.Context, resou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -2181,7 +1926,7 @@ func (client AppServicePlansClient) ListVnetsResponder(resp *http.Response) (res return } -// ListWebApps get all apps associated with an App Service plan. +// ListWebApps description for Get all apps associated with an App Service plan. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service plan. @@ -2239,7 +1984,7 @@ func (client AppServicePlansClient) ListWebAppsPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -2318,7 +2063,7 @@ func (client AppServicePlansClient) ListWebAppsComplete(ctx context.Context, res return } -// ListWebAppsByHybridConnection get all apps that use a Hybrid Connection in an App Service Plan. +// ListWebAppsByHybridConnection description for Get all apps that use a Hybrid Connection in an App Service Plan. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service plan. @@ -2375,7 +2120,7 @@ func (client AppServicePlansClient) ListWebAppsByHybridConnectionPreparer(ctx co "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -2445,7 +2190,7 @@ func (client AppServicePlansClient) ListWebAppsByHybridConnectionComplete(ctx co return } -// RebootWorker reboot a worker machine in an App Service plan. +// RebootWorker description for Reboot a worker machine in an App Service plan. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service plan. @@ -2499,7 +2244,7 @@ func (client AppServicePlansClient) RebootWorkerPreparer(ctx context.Context, re "workerName": autorest.Encode("path", workerName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -2531,7 +2276,7 @@ func (client AppServicePlansClient) RebootWorkerResponder(resp *http.Response) ( return } -// RestartWebApps restart all apps in an App Service plan. +// RestartWebApps description for Restart all apps in an App Service plan. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service plan. @@ -2586,7 +2331,7 @@ func (client AppServicePlansClient) RestartWebAppsPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -2621,7 +2366,7 @@ func (client AppServicePlansClient) RestartWebAppsResponder(resp *http.Response) return } -// Update creates or updates an App Service Plan. +// Update description for Creates or updates an App Service Plan. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service plan. @@ -2674,7 +2419,7 @@ func (client AppServicePlansClient) UpdatePreparer(ctx context.Context, resource "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -2709,7 +2454,7 @@ func (client AppServicePlansClient) UpdateResponder(resp *http.Response) (result return } -// UpdateVnetGateway update a Virtual Network gateway. +// UpdateVnetGateway description for Update a Virtual Network gateway. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service plan. @@ -2769,7 +2514,7 @@ func (client AppServicePlansClient) UpdateVnetGatewayPreparer(ctx context.Contex "vnetName": autorest.Encode("path", vnetName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -2804,7 +2549,7 @@ func (client AppServicePlansClient) UpdateVnetGatewayResponder(resp *http.Respon return } -// UpdateVnetRoute create or update a Virtual Network route in an App Service plan. +// UpdateVnetRoute description for Create or update a Virtual Network route in an App Service plan. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the App Service plan. @@ -2861,7 +2606,7 @@ func (client AppServicePlansClient) UpdateVnetRoutePreparer(ctx context.Context, "vnetName": autorest.Encode("path", vnetName), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/certificateregistrationprovider.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/certificateregistrationprovider.go similarity index 97% rename from vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/certificateregistrationprovider.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/certificateregistrationprovider.go index 20728a9f22866..907ccd3ed5da2 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/certificateregistrationprovider.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/certificateregistrationprovider.go @@ -41,7 +41,8 @@ func NewCertificateRegistrationProviderClientWithBaseURI(baseURI string, subscri return CertificateRegistrationProviderClient{NewWithBaseURI(baseURI, subscriptionID)} } -// ListOperations implements Csm operations Api to exposes the list of available Csm Apis under the resource provider +// ListOperations description for Implements Csm operations Api to exposes the list of available Csm Apis under the +// resource provider func (client CertificateRegistrationProviderClient) ListOperations(ctx context.Context) (result CsmOperationCollectionPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/CertificateRegistrationProviderClient.ListOperations") @@ -77,7 +78,7 @@ func (client CertificateRegistrationProviderClient) ListOperations(ctx context.C // ListOperationsPreparer prepares the ListOperations request. func (client CertificateRegistrationProviderClient) ListOperationsPreparer(ctx context.Context) (*http.Request, error) { - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/certificates.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/certificates.go similarity index 97% rename from vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/certificates.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/certificates.go index b1640960c58cb..9ebfaaa94d97a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/certificates.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/certificates.go @@ -41,7 +41,7 @@ func NewCertificatesClientWithBaseURI(baseURI string, subscriptionID string) Cer return CertificatesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// CreateOrUpdate create or update a certificate. +// CreateOrUpdate description for Create or update a certificate. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the certificate. @@ -97,7 +97,7 @@ func (client CertificatesClient) CreateOrUpdatePreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -132,7 +132,7 @@ func (client CertificatesClient) CreateOrUpdateResponder(resp *http.Response) (r return } -// Delete delete a certificate. +// Delete description for Delete a certificate. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the certificate. @@ -184,7 +184,7 @@ func (client CertificatesClient) DeletePreparer(ctx context.Context, resourceGro "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -216,7 +216,7 @@ func (client CertificatesClient) DeleteResponder(resp *http.Response) (result au return } -// Get get a certificate. +// Get description for Get a certificate. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the certificate. @@ -268,7 +268,7 @@ func (client CertificatesClient) GetPreparer(ctx context.Context, resourceGroupN "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -301,7 +301,7 @@ func (client CertificatesClient) GetResponder(resp *http.Response) (result Certi return } -// List get all certificates for a subscription. +// List description for Get all certificates for a subscription. func (client CertificatesClient) List(ctx context.Context) (result CertificateCollectionPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/CertificatesClient.List") @@ -341,7 +341,7 @@ func (client CertificatesClient) ListPreparer(ctx context.Context) (*http.Reques "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -411,7 +411,7 @@ func (client CertificatesClient) ListComplete(ctx context.Context) (result Certi return } -// ListByResourceGroup get all certificates in a resource group. +// ListByResourceGroup description for Get all certificates in a resource group. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. func (client CertificatesClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result CertificateCollectionPage, err error) { @@ -462,7 +462,7 @@ func (client CertificatesClient) ListByResourceGroupPreparer(ctx context.Context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -532,7 +532,7 @@ func (client CertificatesClient) ListByResourceGroupComplete(ctx context.Context return } -// Update create or update a certificate. +// Update description for Create or update a certificate. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of the certificate. @@ -585,7 +585,7 @@ func (client CertificatesClient) UpdatePreparer(ctx context.Context, resourceGro "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/client.go similarity index 91% rename from vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/client.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/client.go index 01215bd8bb60c..7109055e5dff8 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/client.go @@ -1,4 +1,4 @@ -// Package web implements the Azure ARM Web service API version 2018-02-01. +// Package web implements the Azure ARM Web service API version 2019-08-01. // // WebSite Management Client package web @@ -55,7 +55,7 @@ func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { } } -// CheckNameAvailability check if a resource name is available. +// CheckNameAvailability description for Check if a resource name is available. // Parameters: // request - name availability request. func (client BaseClient) CheckNameAvailability(ctx context.Context, request ResourceNameAvailabilityRequest) (result ResourceNameAvailability, err error) { @@ -102,7 +102,7 @@ func (client BaseClient) CheckNameAvailabilityPreparer(ctx context.Context, requ "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -137,7 +137,7 @@ func (client BaseClient) CheckNameAvailabilityResponder(resp *http.Response) (re return } -// GetPublishingUser gets publishing user +// GetPublishingUser description for Gets publishing user func (client BaseClient) GetPublishingUser(ctx context.Context) (result User, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/BaseClient.GetPublishingUser") @@ -172,7 +172,7 @@ func (client BaseClient) GetPublishingUser(ctx context.Context) (result User, er // GetPublishingUserPreparer prepares the GetPublishingUser request. func (client BaseClient) GetPublishingUserPreparer(ctx context.Context) (*http.Request, error) { - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -205,7 +205,7 @@ func (client BaseClient) GetPublishingUserResponder(resp *http.Response) (result return } -// GetSourceControl gets source control token +// GetSourceControl description for Gets source control token // Parameters: // sourceControlType - type of source control func (client BaseClient) GetSourceControl(ctx context.Context, sourceControlType string) (result SourceControl, err error) { @@ -246,7 +246,7 @@ func (client BaseClient) GetSourceControlPreparer(ctx context.Context, sourceCon "sourceControlType": autorest.Encode("path", sourceControlType), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -279,7 +279,7 @@ func (client BaseClient) GetSourceControlResponder(resp *http.Response) (result return } -// GetSubscriptionDeploymentLocations gets list of available geo regions plus ministamps +// GetSubscriptionDeploymentLocations description for Gets list of available geo regions plus ministamps func (client BaseClient) GetSubscriptionDeploymentLocations(ctx context.Context) (result DeploymentLocations, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/BaseClient.GetSubscriptionDeploymentLocations") @@ -318,7 +318,7 @@ func (client BaseClient) GetSubscriptionDeploymentLocationsPreparer(ctx context. "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -351,7 +351,7 @@ func (client BaseClient) GetSubscriptionDeploymentLocationsResponder(resp *http. return } -// ListBillingMeters gets a list of meters for a given location. +// ListBillingMeters description for Gets a list of meters for a given location. // Parameters: // billingLocation - azure Location of billable resource // osType - app Service OS type meters used for @@ -394,7 +394,7 @@ func (client BaseClient) ListBillingMetersPreparer(ctx context.Context, billingL "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -470,7 +470,7 @@ func (client BaseClient) ListBillingMetersComplete(ctx context.Context, billingL return } -// ListGeoRegions get a list of available geographical regions. +// ListGeoRegions description for Get a list of available geographical regions. // Parameters: // sku - name of SKU used to filter the regions. // linuxWorkersEnabled - specify true if you want to filter to only regions that support Linux @@ -518,7 +518,7 @@ func (client BaseClient) ListGeoRegionsPreparer(ctx context.Context, sku SkuName "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -600,7 +600,7 @@ func (client BaseClient) ListGeoRegionsComplete(ctx context.Context, sku SkuName return } -// ListPremierAddOnOffers list all premier add-on offers. +// ListPremierAddOnOffers description for List all premier add-on offers. func (client BaseClient) ListPremierAddOnOffers(ctx context.Context) (result PremierAddOnOfferCollectionPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/BaseClient.ListPremierAddOnOffers") @@ -640,7 +640,7 @@ func (client BaseClient) ListPremierAddOnOffersPreparer(ctx context.Context) (*h "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -710,7 +710,7 @@ func (client BaseClient) ListPremierAddOnOffersComplete(ctx context.Context) (re return } -// ListSiteIdentifiersAssignedToHostName list all apps that are assigned to a hostname. +// ListSiteIdentifiersAssignedToHostName description for List all apps that are assigned to a hostname. // Parameters: // nameIdentifier - hostname information. func (client BaseClient) ListSiteIdentifiersAssignedToHostName(ctx context.Context, nameIdentifier NameIdentifier) (result IdentifierCollectionPage, err error) { @@ -752,7 +752,7 @@ func (client BaseClient) ListSiteIdentifiersAssignedToHostNamePreparer(ctx conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -824,7 +824,7 @@ func (client BaseClient) ListSiteIdentifiersAssignedToHostNameComplete(ctx conte return } -// ListSkus list all SKUs. +// ListSkus description for List all SKUs. func (client BaseClient) ListSkus(ctx context.Context) (result SkuInfos, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/BaseClient.ListSkus") @@ -863,7 +863,7 @@ func (client BaseClient) ListSkusPreparer(ctx context.Context) (*http.Request, e "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -896,7 +896,7 @@ func (client BaseClient) ListSkusResponder(resp *http.Response) (result SkuInfos return } -// ListSourceControls gets the source controls available for Azure websites. +// ListSourceControls description for Gets the source controls available for Azure websites. func (client BaseClient) ListSourceControls(ctx context.Context) (result SourceControlCollectionPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/BaseClient.ListSourceControls") @@ -932,7 +932,7 @@ func (client BaseClient) ListSourceControls(ctx context.Context) (result SourceC // ListSourceControlsPreparer prepares the ListSourceControls request. func (client BaseClient) ListSourceControlsPreparer(ctx context.Context) (*http.Request, error) { - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1002,7 +1002,7 @@ func (client BaseClient) ListSourceControlsComplete(ctx context.Context) (result return } -// Move move resources between resource groups. +// Move description for Move resources between resource groups. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // moveResourceEnvelope - object that represents the resource to move. @@ -1059,7 +1059,7 @@ func (client BaseClient) MovePreparer(ctx context.Context, resourceGroupName str "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1093,7 +1093,7 @@ func (client BaseClient) MoveResponder(resp *http.Response) (result autorest.Res return } -// UpdatePublishingUser updates publishing user +// UpdatePublishingUser description for Updates publishing user // Parameters: // userDetails - details of publishing user func (client BaseClient) UpdatePublishingUser(ctx context.Context, userDetails User) (result User, err error) { @@ -1137,7 +1137,7 @@ func (client BaseClient) UpdatePublishingUser(ctx context.Context, userDetails U // UpdatePublishingUserPreparer prepares the UpdatePublishingUser request. func (client BaseClient) UpdatePublishingUserPreparer(ctx context.Context, userDetails User) (*http.Request, error) { - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1172,7 +1172,7 @@ func (client BaseClient) UpdatePublishingUserResponder(resp *http.Response) (res return } -// UpdateSourceControl updates source control token +// UpdateSourceControl description for Updates source control token // Parameters: // sourceControlType - type of source control // requestMessage - source control token information @@ -1214,7 +1214,7 @@ func (client BaseClient) UpdateSourceControlPreparer(ctx context.Context, source "sourceControlType": autorest.Encode("path", sourceControlType), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1249,7 +1249,7 @@ func (client BaseClient) UpdateSourceControlResponder(resp *http.Response) (resu return } -// Validate validate if a resource can be created. +// Validate description for Validate if a resource can be created. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // validateRequest - request with the resources to validate. @@ -1307,7 +1307,7 @@ func (client BaseClient) ValidatePreparer(ctx context.Context, resourceGroupName "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1342,92 +1342,7 @@ func (client BaseClient) ValidateResponder(resp *http.Response) (result Validate return } -// ValidateContainerSettings validate if the container settings are correct. -// Parameters: -// resourceGroupName - name of the resource group to which the resource belongs. -func (client BaseClient) ValidateContainerSettings(ctx context.Context, validateContainerSettingsRequest ValidateContainerSettingsRequest, resourceGroupName string) (result SetObject, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/BaseClient.ValidateContainerSettings") - defer func() { - sc := -1 - if result.Response.Response != nil { - sc = result.Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - if err := validation.Validate([]validation.Validation{ - {TargetValue: resourceGroupName, - Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, - {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, - {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+[^\.]$`, Chain: nil}}}}); err != nil { - return result, validation.NewError("web.BaseClient", "ValidateContainerSettings", err.Error()) - } - - req, err := client.ValidateContainerSettingsPreparer(ctx, validateContainerSettingsRequest, resourceGroupName) - if err != nil { - err = autorest.NewErrorWithError(err, "web.BaseClient", "ValidateContainerSettings", nil, "Failure preparing request") - return - } - - resp, err := client.ValidateContainerSettingsSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "web.BaseClient", "ValidateContainerSettings", resp, "Failure sending request") - return - } - - result, err = client.ValidateContainerSettingsResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.BaseClient", "ValidateContainerSettings", resp, "Failure responding to request") - } - - return -} - -// ValidateContainerSettingsPreparer prepares the ValidateContainerSettings request. -func (client BaseClient) ValidateContainerSettingsPreparer(ctx context.Context, validateContainerSettingsRequest ValidateContainerSettingsRequest, resourceGroupName string) (*http.Request, error) { - pathParameters := map[string]interface{}{ - "resourceGroupName": autorest.Encode("path", resourceGroupName), - "subscriptionId": autorest.Encode("path", client.SubscriptionID), - } - - const APIVersion = "2018-02-01" - queryParameters := map[string]interface{}{ - "api-version": APIVersion, - } - - preparer := autorest.CreatePreparer( - autorest.AsContentType("application/json; charset=utf-8"), - autorest.AsPost(), - autorest.WithBaseURL(client.BaseURI), - autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/validateContainerSettings", pathParameters), - autorest.WithJSON(validateContainerSettingsRequest), - autorest.WithQueryParameters(queryParameters)) - return preparer.Prepare((&http.Request{}).WithContext(ctx)) -} - -// ValidateContainerSettingsSender sends the ValidateContainerSettings request. The method will close the -// http.Response Body if it receives an error. -func (client BaseClient) ValidateContainerSettingsSender(req *http.Request) (*http.Response, error) { - sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) - return autorest.SendWithSender(client, req, sd...) -} - -// ValidateContainerSettingsResponder handles the response to the ValidateContainerSettings request. The method always -// closes the http.Response Body. -func (client BaseClient) ValidateContainerSettingsResponder(resp *http.Response) (result SetObject, err error) { - err = autorest.Respond( - resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result.Value), - autorest.ByClosing()) - result.Response = autorest.Response{Response: resp} - return -} - -// ValidateMove validate whether a resource can be moved. +// ValidateMove description for Validate whether a resource can be moved. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // moveResourceEnvelope - object that represents the resource to move. @@ -1484,7 +1399,7 @@ func (client BaseClient) ValidateMovePreparer(ctx context.Context, resourceGroup "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1518,8 +1433,8 @@ func (client BaseClient) ValidateMoveResponder(resp *http.Response) (result auto return } -// VerifyHostingEnvironmentVnet verifies if this VNET is compatible with an App Service Environment by analyzing the -// Network Security Group rules. +// VerifyHostingEnvironmentVnet description for Verifies if this VNET is compatible with an App Service Environment by +// analyzing the Network Security Group rules. // Parameters: // parameters - VNET information func (client BaseClient) VerifyHostingEnvironmentVnet(ctx context.Context, parameters VnetParameters) (result VnetValidationFailureDetails, err error) { @@ -1560,7 +1475,7 @@ func (client BaseClient) VerifyHostingEnvironmentVnetPreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/deletedwebapps.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/deletedwebapps.go similarity index 97% rename from vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/deletedwebapps.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/deletedwebapps.go index 46a014df4b9e3..2d9a5c49caed8 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/deletedwebapps.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/deletedwebapps.go @@ -40,7 +40,7 @@ func NewDeletedWebAppsClientWithBaseURI(baseURI string, subscriptionID string) D return DeletedWebAppsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// GetDeletedWebAppByLocation get deleted app for a subscription at location. +// GetDeletedWebAppByLocation description for Get deleted app for a subscription at location. // Parameters: // deletedSiteID - the numeric ID of the deleted app, e.g. 12345 func (client DeletedWebAppsClient) GetDeletedWebAppByLocation(ctx context.Context, location string, deletedSiteID string) (result DeletedSite, err error) { @@ -83,7 +83,7 @@ func (client DeletedWebAppsClient) GetDeletedWebAppByLocationPreparer(ctx contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -116,7 +116,7 @@ func (client DeletedWebAppsClient) GetDeletedWebAppByLocationResponder(resp *htt return } -// List get all deleted apps for a subscription. +// List description for Get all deleted apps for a subscription. func (client DeletedWebAppsClient) List(ctx context.Context) (result DeletedWebAppCollectionPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/DeletedWebAppsClient.List") @@ -156,7 +156,7 @@ func (client DeletedWebAppsClient) ListPreparer(ctx context.Context) (*http.Requ "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -226,7 +226,7 @@ func (client DeletedWebAppsClient) ListComplete(ctx context.Context) (result Del return } -// ListByLocation get all deleted apps for a subscription at location +// ListByLocation description for Get all deleted apps for a subscription at location func (client DeletedWebAppsClient) ListByLocation(ctx context.Context, location string) (result DeletedWebAppCollectionPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/DeletedWebAppsClient.ListByLocation") @@ -267,7 +267,7 @@ func (client DeletedWebAppsClient) ListByLocationPreparer(ctx context.Context, l "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/diagnostics.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/diagnostics.go similarity index 94% rename from vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/diagnostics.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/diagnostics.go index b6c4d90884b1d..6ae727b35a285 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/diagnostics.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/diagnostics.go @@ -42,7 +42,7 @@ func NewDiagnosticsClientWithBaseURI(baseURI string, subscriptionID string) Diag return DiagnosticsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// ExecuteSiteAnalysis execute Analysis +// ExecuteSiteAnalysis description for Execute Analysis // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - site Name @@ -104,7 +104,7 @@ func (client DiagnosticsClient) ExecuteSiteAnalysisPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -146,7 +146,7 @@ func (client DiagnosticsClient) ExecuteSiteAnalysisResponder(resp *http.Response return } -// ExecuteSiteAnalysisSlot execute Analysis +// ExecuteSiteAnalysisSlot description for Execute Analysis // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - site Name @@ -210,7 +210,7 @@ func (client DiagnosticsClient) ExecuteSiteAnalysisSlotPreparer(ctx context.Cont "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -252,7 +252,7 @@ func (client DiagnosticsClient) ExecuteSiteAnalysisSlotResponder(resp *http.Resp return } -// ExecuteSiteDetector execute Detector +// ExecuteSiteDetector description for Execute Detector // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - site Name @@ -314,7 +314,7 @@ func (client DiagnosticsClient) ExecuteSiteDetectorPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -356,7 +356,7 @@ func (client DiagnosticsClient) ExecuteSiteDetectorResponder(resp *http.Response return } -// ExecuteSiteDetectorSlot execute Detector +// ExecuteSiteDetectorSlot description for Execute Detector // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - site Name @@ -420,7 +420,7 @@ func (client DiagnosticsClient) ExecuteSiteDetectorSlotPreparer(ctx context.Cont "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -462,7 +462,7 @@ func (client DiagnosticsClient) ExecuteSiteDetectorSlotResponder(resp *http.Resp return } -// GetHostingEnvironmentDetectorResponse get Hosting Environment Detector Response +// GetHostingEnvironmentDetectorResponse description for Get Hosting Environment Detector Response // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - app Service Environment Name @@ -522,7 +522,7 @@ func (client DiagnosticsClient) GetHostingEnvironmentDetectorResponsePreparer(ct "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -564,13 +564,13 @@ func (client DiagnosticsClient) GetHostingEnvironmentDetectorResponseResponder(r return } -// GetSiteAnalysis get Site Analysis +// GetSiteAnalysis description for Get Site Analysis // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - site Name // diagnosticCategory - diagnostic Category // analysisName - analysis Name -func (client DiagnosticsClient) GetSiteAnalysis(ctx context.Context, resourceGroupName string, siteName string, diagnosticCategory string, analysisName string) (result DiagnosticAnalysis, err error) { +func (client DiagnosticsClient) GetSiteAnalysis(ctx context.Context, resourceGroupName string, siteName string, diagnosticCategory string, analysisName string) (result AnalysisDefinition, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/DiagnosticsClient.GetSiteAnalysis") defer func() { @@ -620,7 +620,7 @@ func (client DiagnosticsClient) GetSiteAnalysisPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -642,7 +642,7 @@ func (client DiagnosticsClient) GetSiteAnalysisSender(req *http.Request) (*http. // GetSiteAnalysisResponder handles the response to the GetSiteAnalysis request. The method always // closes the http.Response Body. -func (client DiagnosticsClient) GetSiteAnalysisResponder(resp *http.Response) (result DiagnosticAnalysis, err error) { +func (client DiagnosticsClient) GetSiteAnalysisResponder(resp *http.Response) (result AnalysisDefinition, err error) { err = autorest.Respond( resp, client.ByInspecting(), @@ -653,14 +653,14 @@ func (client DiagnosticsClient) GetSiteAnalysisResponder(resp *http.Response) (r return } -// GetSiteAnalysisSlot get Site Analysis +// GetSiteAnalysisSlot description for Get Site Analysis // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - site Name // diagnosticCategory - diagnostic Category // analysisName - analysis Name // slot - slot - optional -func (client DiagnosticsClient) GetSiteAnalysisSlot(ctx context.Context, resourceGroupName string, siteName string, diagnosticCategory string, analysisName string, slot string) (result DiagnosticAnalysis, err error) { +func (client DiagnosticsClient) GetSiteAnalysisSlot(ctx context.Context, resourceGroupName string, siteName string, diagnosticCategory string, analysisName string, slot string) (result AnalysisDefinition, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/DiagnosticsClient.GetSiteAnalysisSlot") defer func() { @@ -711,7 +711,7 @@ func (client DiagnosticsClient) GetSiteAnalysisSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -733,7 +733,7 @@ func (client DiagnosticsClient) GetSiteAnalysisSlotSender(req *http.Request) (*h // GetSiteAnalysisSlotResponder handles the response to the GetSiteAnalysisSlot request. The method always // closes the http.Response Body. -func (client DiagnosticsClient) GetSiteAnalysisSlotResponder(resp *http.Response) (result DiagnosticAnalysis, err error) { +func (client DiagnosticsClient) GetSiteAnalysisSlotResponder(resp *http.Response) (result AnalysisDefinition, err error) { err = autorest.Respond( resp, client.ByInspecting(), @@ -744,19 +744,19 @@ func (client DiagnosticsClient) GetSiteAnalysisSlotResponder(resp *http.Response return } -// GetSiteDetector get Detector +// GetSiteDetector description for Get Detector // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - site Name // diagnosticCategory - diagnostic Category // detectorName - detector Name -func (client DiagnosticsClient) GetSiteDetector(ctx context.Context, resourceGroupName string, siteName string, diagnosticCategory string, detectorName string) (result DiagnosticDetectorCollectionPage, err error) { +func (client DiagnosticsClient) GetSiteDetector(ctx context.Context, resourceGroupName string, siteName string, diagnosticCategory string, detectorName string) (result DetectorDefinition, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/DiagnosticsClient.GetSiteDetector") defer func() { sc := -1 - if result.ddc.Response.Response != nil { - sc = result.ddc.Response.Response.StatusCode + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode } tracing.EndSpan(ctx, sc, err) }() @@ -769,7 +769,6 @@ func (client DiagnosticsClient) GetSiteDetector(ctx context.Context, resourceGro return result, validation.NewError("web.DiagnosticsClient", "GetSiteDetector", err.Error()) } - result.fn = client.getSiteDetectorNextResults req, err := client.GetSiteDetectorPreparer(ctx, resourceGroupName, siteName, diagnosticCategory, detectorName) if err != nil { err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "GetSiteDetector", nil, "Failure preparing request") @@ -778,12 +777,12 @@ func (client DiagnosticsClient) GetSiteDetector(ctx context.Context, resourceGro resp, err := client.GetSiteDetectorSender(req) if err != nil { - result.ddc.Response = autorest.Response{Response: resp} + result.Response = autorest.Response{Response: resp} err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "GetSiteDetector", resp, "Failure sending request") return } - result.ddc, err = client.GetSiteDetectorResponder(resp) + result, err = client.GetSiteDetectorResponder(resp) if err != nil { err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "GetSiteDetector", resp, "Failure responding to request") } @@ -801,7 +800,7 @@ func (client DiagnosticsClient) GetSiteDetectorPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -823,7 +822,7 @@ func (client DiagnosticsClient) GetSiteDetectorSender(req *http.Request) (*http. // GetSiteDetectorResponder handles the response to the GetSiteDetector request. The method always // closes the http.Response Body. -func (client DiagnosticsClient) GetSiteDetectorResponder(resp *http.Response) (result DiagnosticDetectorCollection, err error) { +func (client DiagnosticsClient) GetSiteDetectorResponder(resp *http.Response) (result DetectorDefinition, err error) { err = autorest.Respond( resp, client.ByInspecting(), @@ -834,44 +833,7 @@ func (client DiagnosticsClient) GetSiteDetectorResponder(resp *http.Response) (r return } -// getSiteDetectorNextResults retrieves the next set of results, if any. -func (client DiagnosticsClient) getSiteDetectorNextResults(ctx context.Context, lastResults DiagnosticDetectorCollection) (result DiagnosticDetectorCollection, err error) { - req, err := lastResults.diagnosticDetectorCollectionPreparer(ctx) - if err != nil { - return result, autorest.NewErrorWithError(err, "web.DiagnosticsClient", "getSiteDetectorNextResults", nil, "Failure preparing next results request") - } - if req == nil { - return - } - resp, err := client.GetSiteDetectorSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - return result, autorest.NewErrorWithError(err, "web.DiagnosticsClient", "getSiteDetectorNextResults", resp, "Failure sending next results request") - } - result, err = client.GetSiteDetectorResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "getSiteDetectorNextResults", resp, "Failure responding to next results request") - } - return -} - -// GetSiteDetectorComplete enumerates all values, automatically crossing page boundaries as required. -func (client DiagnosticsClient) GetSiteDetectorComplete(ctx context.Context, resourceGroupName string, siteName string, diagnosticCategory string, detectorName string) (result DiagnosticDetectorCollectionIterator, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/DiagnosticsClient.GetSiteDetector") - defer func() { - sc := -1 - if result.Response().Response.Response != nil { - sc = result.page.Response().Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - result.page, err = client.GetSiteDetector(ctx, resourceGroupName, siteName, diagnosticCategory, detectorName) - return -} - -// GetSiteDetectorResponse get site detector response +// GetSiteDetectorResponse description for Get site detector response // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - site Name @@ -931,7 +893,7 @@ func (client DiagnosticsClient) GetSiteDetectorResponsePreparer(ctx context.Cont "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -973,7 +935,7 @@ func (client DiagnosticsClient) GetSiteDetectorResponseResponder(resp *http.Resp return } -// GetSiteDetectorResponseSlot get site detector response +// GetSiteDetectorResponseSlot description for Get site detector response // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - site Name @@ -1035,7 +997,7 @@ func (client DiagnosticsClient) GetSiteDetectorResponseSlotPreparer(ctx context. "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1077,20 +1039,20 @@ func (client DiagnosticsClient) GetSiteDetectorResponseSlotResponder(resp *http. return } -// GetSiteDetectorSlot get Detector +// GetSiteDetectorSlot description for Get Detector // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - site Name // diagnosticCategory - diagnostic Category // detectorName - detector Name // slot - slot Name -func (client DiagnosticsClient) GetSiteDetectorSlot(ctx context.Context, resourceGroupName string, siteName string, diagnosticCategory string, detectorName string, slot string) (result DiagnosticDetectorCollectionPage, err error) { +func (client DiagnosticsClient) GetSiteDetectorSlot(ctx context.Context, resourceGroupName string, siteName string, diagnosticCategory string, detectorName string, slot string) (result DetectorDefinition, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/DiagnosticsClient.GetSiteDetectorSlot") defer func() { sc := -1 - if result.ddc.Response.Response != nil { - sc = result.ddc.Response.Response.StatusCode + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode } tracing.EndSpan(ctx, sc, err) }() @@ -1103,7 +1065,6 @@ func (client DiagnosticsClient) GetSiteDetectorSlot(ctx context.Context, resourc return result, validation.NewError("web.DiagnosticsClient", "GetSiteDetectorSlot", err.Error()) } - result.fn = client.getSiteDetectorSlotNextResults req, err := client.GetSiteDetectorSlotPreparer(ctx, resourceGroupName, siteName, diagnosticCategory, detectorName, slot) if err != nil { err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "GetSiteDetectorSlot", nil, "Failure preparing request") @@ -1112,12 +1073,12 @@ func (client DiagnosticsClient) GetSiteDetectorSlot(ctx context.Context, resourc resp, err := client.GetSiteDetectorSlotSender(req) if err != nil { - result.ddc.Response = autorest.Response{Response: resp} + result.Response = autorest.Response{Response: resp} err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "GetSiteDetectorSlot", resp, "Failure sending request") return } - result.ddc, err = client.GetSiteDetectorSlotResponder(resp) + result, err = client.GetSiteDetectorSlotResponder(resp) if err != nil { err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "GetSiteDetectorSlot", resp, "Failure responding to request") } @@ -1136,7 +1097,7 @@ func (client DiagnosticsClient) GetSiteDetectorSlotPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1158,7 +1119,7 @@ func (client DiagnosticsClient) GetSiteDetectorSlotSender(req *http.Request) (*h // GetSiteDetectorSlotResponder handles the response to the GetSiteDetectorSlot request. The method always // closes the http.Response Body. -func (client DiagnosticsClient) GetSiteDetectorSlotResponder(resp *http.Response) (result DiagnosticDetectorCollection, err error) { +func (client DiagnosticsClient) GetSiteDetectorSlotResponder(resp *http.Response) (result DetectorDefinition, err error) { err = autorest.Respond( resp, client.ByInspecting(), @@ -1169,44 +1130,7 @@ func (client DiagnosticsClient) GetSiteDetectorSlotResponder(resp *http.Response return } -// getSiteDetectorSlotNextResults retrieves the next set of results, if any. -func (client DiagnosticsClient) getSiteDetectorSlotNextResults(ctx context.Context, lastResults DiagnosticDetectorCollection) (result DiagnosticDetectorCollection, err error) { - req, err := lastResults.diagnosticDetectorCollectionPreparer(ctx) - if err != nil { - return result, autorest.NewErrorWithError(err, "web.DiagnosticsClient", "getSiteDetectorSlotNextResults", nil, "Failure preparing next results request") - } - if req == nil { - return - } - resp, err := client.GetSiteDetectorSlotSender(req) - if err != nil { - result.Response = autorest.Response{Response: resp} - return result, autorest.NewErrorWithError(err, "web.DiagnosticsClient", "getSiteDetectorSlotNextResults", resp, "Failure sending next results request") - } - result, err = client.GetSiteDetectorSlotResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "web.DiagnosticsClient", "getSiteDetectorSlotNextResults", resp, "Failure responding to next results request") - } - return -} - -// GetSiteDetectorSlotComplete enumerates all values, automatically crossing page boundaries as required. -func (client DiagnosticsClient) GetSiteDetectorSlotComplete(ctx context.Context, resourceGroupName string, siteName string, diagnosticCategory string, detectorName string, slot string) (result DiagnosticDetectorCollectionIterator, err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/DiagnosticsClient.GetSiteDetectorSlot") - defer func() { - sc := -1 - if result.Response().Response.Response != nil { - sc = result.page.Response().Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - result.page, err = client.GetSiteDetectorSlot(ctx, resourceGroupName, siteName, diagnosticCategory, detectorName, slot) - return -} - -// GetSiteDiagnosticCategory get Diagnostics Category +// GetSiteDiagnosticCategory description for Get Diagnostics Category // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - site Name @@ -1260,7 +1184,7 @@ func (client DiagnosticsClient) GetSiteDiagnosticCategoryPreparer(ctx context.Co "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1293,7 +1217,7 @@ func (client DiagnosticsClient) GetSiteDiagnosticCategoryResponder(resp *http.Re return } -// GetSiteDiagnosticCategorySlot get Diagnostics Category +// GetSiteDiagnosticCategorySlot description for Get Diagnostics Category // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - site Name @@ -1349,7 +1273,7 @@ func (client DiagnosticsClient) GetSiteDiagnosticCategorySlotPreparer(ctx contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1382,7 +1306,7 @@ func (client DiagnosticsClient) GetSiteDiagnosticCategorySlotResponder(resp *htt return } -// ListHostingEnvironmentDetectorResponses list Hosting Environment Detector Responses +// ListHostingEnvironmentDetectorResponses description for List Hosting Environment Detector Responses // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - site Name @@ -1435,7 +1359,7 @@ func (client DiagnosticsClient) ListHostingEnvironmentDetectorResponsesPreparer( "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1505,7 +1429,7 @@ func (client DiagnosticsClient) ListHostingEnvironmentDetectorResponsesComplete( return } -// ListSiteAnalyses get Site Analyses +// ListSiteAnalyses description for Get Site Analyses // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - site Name @@ -1560,7 +1484,7 @@ func (client DiagnosticsClient) ListSiteAnalysesPreparer(ctx context.Context, re "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1630,7 +1554,7 @@ func (client DiagnosticsClient) ListSiteAnalysesComplete(ctx context.Context, re return } -// ListSiteAnalysesSlot get Site Analyses +// ListSiteAnalysesSlot description for Get Site Analyses // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - site Name @@ -1687,7 +1611,7 @@ func (client DiagnosticsClient) ListSiteAnalysesSlotPreparer(ctx context.Context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1757,7 +1681,7 @@ func (client DiagnosticsClient) ListSiteAnalysesSlotComplete(ctx context.Context return } -// ListSiteDetectorResponses list Site Detector Responses +// ListSiteDetectorResponses description for List Site Detector Responses // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - site Name @@ -1810,7 +1734,7 @@ func (client DiagnosticsClient) ListSiteDetectorResponsesPreparer(ctx context.Co "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1880,7 +1804,7 @@ func (client DiagnosticsClient) ListSiteDetectorResponsesComplete(ctx context.Co return } -// ListSiteDetectorResponsesSlot list Site Detector Responses +// ListSiteDetectorResponsesSlot description for List Site Detector Responses // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - site Name @@ -1935,7 +1859,7 @@ func (client DiagnosticsClient) ListSiteDetectorResponsesSlotPreparer(ctx contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -2005,7 +1929,7 @@ func (client DiagnosticsClient) ListSiteDetectorResponsesSlotComplete(ctx contex return } -// ListSiteDetectors get Detectors +// ListSiteDetectors description for Get Detectors // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - site Name @@ -2060,7 +1984,7 @@ func (client DiagnosticsClient) ListSiteDetectorsPreparer(ctx context.Context, r "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -2130,7 +2054,7 @@ func (client DiagnosticsClient) ListSiteDetectorsComplete(ctx context.Context, r return } -// ListSiteDetectorsSlot get Detectors +// ListSiteDetectorsSlot description for Get Detectors // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - site Name @@ -2187,7 +2111,7 @@ func (client DiagnosticsClient) ListSiteDetectorsSlotPreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -2257,7 +2181,7 @@ func (client DiagnosticsClient) ListSiteDetectorsSlotComplete(ctx context.Contex return } -// ListSiteDiagnosticCategories get Diagnostics Categories +// ListSiteDiagnosticCategories description for Get Diagnostics Categories // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - site Name @@ -2310,7 +2234,7 @@ func (client DiagnosticsClient) ListSiteDiagnosticCategoriesPreparer(ctx context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -2380,7 +2304,7 @@ func (client DiagnosticsClient) ListSiteDiagnosticCategoriesComplete(ctx context return } -// ListSiteDiagnosticCategoriesSlot get Diagnostics Categories +// ListSiteDiagnosticCategoriesSlot description for Get Diagnostics Categories // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - site Name @@ -2435,7 +2359,7 @@ func (client DiagnosticsClient) ListSiteDiagnosticCategoriesSlotPreparer(ctx con "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/domainregistrationprovider.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/domainregistrationprovider.go similarity index 97% rename from vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/domainregistrationprovider.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/domainregistrationprovider.go index b289d15851715..b886fa4fde2db 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/domainregistrationprovider.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/domainregistrationprovider.go @@ -40,7 +40,8 @@ func NewDomainRegistrationProviderClientWithBaseURI(baseURI string, subscription return DomainRegistrationProviderClient{NewWithBaseURI(baseURI, subscriptionID)} } -// ListOperations implements Csm operations Api to exposes the list of available Csm Apis under the resource provider +// ListOperations description for Implements Csm operations Api to exposes the list of available Csm Apis under the +// resource provider func (client DomainRegistrationProviderClient) ListOperations(ctx context.Context) (result CsmOperationCollectionPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/DomainRegistrationProviderClient.ListOperations") @@ -76,7 +77,7 @@ func (client DomainRegistrationProviderClient) ListOperations(ctx context.Contex // ListOperationsPreparer prepares the ListOperations request. func (client DomainRegistrationProviderClient) ListOperationsPreparer(ctx context.Context) (*http.Request, error) { - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/domains.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/domains.go similarity index 97% rename from vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/domains.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/domains.go index 1f6c3b749419d..29a4fbec23779 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/domains.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/domains.go @@ -41,10 +41,10 @@ func NewDomainsClientWithBaseURI(baseURI string, subscriptionID string) DomainsC return DomainsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// CheckAvailability check if a domain is available for registration. +// CheckAvailability description for Check if a domain is available for registration. // Parameters: // identifier - name of the domain. -func (client DomainsClient) CheckAvailability(ctx context.Context, identifier NameIdentifier) (result DomainAvailablilityCheckResult, err error) { +func (client DomainsClient) CheckAvailability(ctx context.Context, identifier NameIdentifier) (result DomainAvailabilityCheckResult, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/DomainsClient.CheckAvailability") defer func() { @@ -82,7 +82,7 @@ func (client DomainsClient) CheckAvailabilityPreparer(ctx context.Context, ident "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -106,7 +106,7 @@ func (client DomainsClient) CheckAvailabilitySender(req *http.Request) (*http.Re // CheckAvailabilityResponder handles the response to the CheckAvailability request. The method always // closes the http.Response Body. -func (client DomainsClient) CheckAvailabilityResponder(resp *http.Response) (result DomainAvailablilityCheckResult, err error) { +func (client DomainsClient) CheckAvailabilityResponder(resp *http.Response) (result DomainAvailabilityCheckResult, err error) { err = autorest.Respond( resp, client.ByInspecting(), @@ -117,7 +117,7 @@ func (client DomainsClient) CheckAvailabilityResponder(resp *http.Response) (res return } -// CreateOrUpdate creates or updates a domain. +// CreateOrUpdate description for Creates or updates a domain. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // domainName - name of the domain. @@ -222,7 +222,7 @@ func (client DomainsClient) CreateOrUpdatePreparer(ctx context.Context, resource "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -263,8 +263,8 @@ func (client DomainsClient) CreateOrUpdateResponder(resp *http.Response) (result return } -// CreateOrUpdateOwnershipIdentifier creates an ownership identifier for a domain or updates identifier details for an -// existing identifer +// CreateOrUpdateOwnershipIdentifier description for Creates an ownership identifier for a domain or updates identifier +// details for an existing identifer // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // domainName - name of domain. @@ -319,7 +319,7 @@ func (client DomainsClient) CreateOrUpdateOwnershipIdentifierPreparer(ctx contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -354,7 +354,7 @@ func (client DomainsClient) CreateOrUpdateOwnershipIdentifierResponder(resp *htt return } -// Delete delete a domain. +// Delete description for Delete a domain. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // domainName - name of the domain. @@ -408,7 +408,7 @@ func (client DomainsClient) DeletePreparer(ctx context.Context, resourceGroupNam "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -443,7 +443,7 @@ func (client DomainsClient) DeleteResponder(resp *http.Response) (result autores return } -// DeleteOwnershipIdentifier delete ownership identifier for domain +// DeleteOwnershipIdentifier description for Delete ownership identifier for domain // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // domainName - name of domain. @@ -497,7 +497,7 @@ func (client DomainsClient) DeleteOwnershipIdentifierPreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -529,7 +529,7 @@ func (client DomainsClient) DeleteOwnershipIdentifierResponder(resp *http.Respon return } -// Get get a domain. +// Get description for Get a domain. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // domainName - name of the domain. @@ -581,7 +581,7 @@ func (client DomainsClient) GetPreparer(ctx context.Context, resourceGroupName s "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -614,7 +614,7 @@ func (client DomainsClient) GetResponder(resp *http.Response) (result Domain, er return } -// GetControlCenterSsoRequest generate a single sign-on request for the domain management portal. +// GetControlCenterSsoRequest description for Generate a single sign-on request for the domain management portal. func (client DomainsClient) GetControlCenterSsoRequest(ctx context.Context) (result DomainControlCenterSsoRequest, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/DomainsClient.GetControlCenterSsoRequest") @@ -653,7 +653,7 @@ func (client DomainsClient) GetControlCenterSsoRequestPreparer(ctx context.Conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -686,7 +686,7 @@ func (client DomainsClient) GetControlCenterSsoRequestResponder(resp *http.Respo return } -// GetOwnershipIdentifier get ownership identifier for domain +// GetOwnershipIdentifier description for Get ownership identifier for domain // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // domainName - name of domain. @@ -740,7 +740,7 @@ func (client DomainsClient) GetOwnershipIdentifierPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -773,7 +773,7 @@ func (client DomainsClient) GetOwnershipIdentifierResponder(resp *http.Response) return } -// List get all domains in a subscription. +// List description for Get all domains in a subscription. func (client DomainsClient) List(ctx context.Context) (result DomainCollectionPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/DomainsClient.List") @@ -813,7 +813,7 @@ func (client DomainsClient) ListPreparer(ctx context.Context) (*http.Request, er "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -883,7 +883,7 @@ func (client DomainsClient) ListComplete(ctx context.Context) (result DomainColl return } -// ListByResourceGroup get all domains in a resource group. +// ListByResourceGroup description for Get all domains in a resource group. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. func (client DomainsClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result DomainCollectionPage, err error) { @@ -934,7 +934,7 @@ func (client DomainsClient) ListByResourceGroupPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1004,7 +1004,7 @@ func (client DomainsClient) ListByResourceGroupComplete(ctx context.Context, res return } -// ListOwnershipIdentifiers lists domain ownership identifiers. +// ListOwnershipIdentifiers description for Lists domain ownership identifiers. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // domainName - name of domain. @@ -1057,7 +1057,7 @@ func (client DomainsClient) ListOwnershipIdentifiersPreparer(ctx context.Context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1127,7 +1127,7 @@ func (client DomainsClient) ListOwnershipIdentifiersComplete(ctx context.Context return } -// ListRecommendations get domain name recommendations based on keywords. +// ListRecommendations description for Get domain name recommendations based on keywords. // Parameters: // parameters - search parameters for domain name recommendations. func (client DomainsClient) ListRecommendations(ctx context.Context, parameters DomainRecommendationSearchParameters) (result NameIdentifierCollectionPage, err error) { @@ -1169,7 +1169,7 @@ func (client DomainsClient) ListRecommendationsPreparer(ctx context.Context, par "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1241,7 +1241,7 @@ func (client DomainsClient) ListRecommendationsComplete(ctx context.Context, par return } -// Renew renew a domain. +// Renew description for Renew a domain. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // domainName - name of the domain. @@ -1293,7 +1293,7 @@ func (client DomainsClient) RenewPreparer(ctx context.Context, resourceGroupName "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1319,13 +1319,13 @@ func (client DomainsClient) RenewResponder(resp *http.Response) (result autorest err = autorest.Respond( resp, client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent, http.StatusBadRequest, http.StatusInternalServerError), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent), autorest.ByClosing()) result.Response = resp return } -// Update creates or updates a domain. +// Update description for Creates or updates a domain. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // domainName - name of the domain. @@ -1380,7 +1380,7 @@ func (client DomainsClient) UpdatePreparer(ctx context.Context, resourceGroupNam "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1415,8 +1415,8 @@ func (client DomainsClient) UpdateResponder(resp *http.Response) (result Domain, return } -// UpdateOwnershipIdentifier creates an ownership identifier for a domain or updates identifier details for an existing -// identifer +// UpdateOwnershipIdentifier description for Creates an ownership identifier for a domain or updates identifier details +// for an existing identifer // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // domainName - name of domain. @@ -1471,7 +1471,7 @@ func (client DomainsClient) UpdateOwnershipIdentifierPreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/models.go similarity index 97% rename from vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/models.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/models.go index 24b150a122276..d06b77a42eebe 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/models.go @@ -31,7 +31,7 @@ import ( ) // The package's fully qualified name. -const fqdn = "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web" +const fqdn = "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" // AccessControlEntryAction enumerates the values for access control entry action. type AccessControlEntryAction string @@ -375,6 +375,32 @@ func PossibleComputeModeOptionsValues() []ComputeModeOptions { return []ComputeModeOptions{ComputeModeOptionsDedicated, ComputeModeOptionsDynamic, ComputeModeOptionsShared} } +// ConfigReferenceLocation enumerates the values for config reference location. +type ConfigReferenceLocation string + +const ( + // ApplicationSetting ... + ApplicationSetting ConfigReferenceLocation = "ApplicationSetting" +) + +// PossibleConfigReferenceLocationValues returns an array of possible values for the ConfigReferenceLocation const type. +func PossibleConfigReferenceLocationValues() []ConfigReferenceLocation { + return []ConfigReferenceLocation{ApplicationSetting} +} + +// ConfigReferenceSource enumerates the values for config reference source. +type ConfigReferenceSource string + +const ( + // KeyVault ... + KeyVault ConfigReferenceSource = "KeyVault" +) + +// PossibleConfigReferenceSourceValues returns an array of possible values for the ConfigReferenceSource const type. +func PossibleConfigReferenceSourceValues() []ConfigReferenceSource { + return []ConfigReferenceSource{KeyVault} +} + // ConnectionStringType enumerates the values for connection string type. type ConnectionStringType string @@ -810,15 +836,13 @@ const ( ManagedServiceIdentityTypeNone ManagedServiceIdentityType = "None" // ManagedServiceIdentityTypeSystemAssigned ... ManagedServiceIdentityTypeSystemAssigned ManagedServiceIdentityType = "SystemAssigned" - // ManagedServiceIdentityTypeSystemAssignedUserAssigned ... - ManagedServiceIdentityTypeSystemAssignedUserAssigned ManagedServiceIdentityType = "SystemAssigned, UserAssigned" // ManagedServiceIdentityTypeUserAssigned ... ManagedServiceIdentityTypeUserAssigned ManagedServiceIdentityType = "UserAssigned" ) // PossibleManagedServiceIdentityTypeValues returns an array of possible values for the ManagedServiceIdentityType const type. func PossibleManagedServiceIdentityTypeValues() []ManagedServiceIdentityType { - return []ManagedServiceIdentityType{ManagedServiceIdentityTypeNone, ManagedServiceIdentityTypeSystemAssigned, ManagedServiceIdentityTypeSystemAssignedUserAssigned, ManagedServiceIdentityTypeUserAssigned} + return []ManagedServiceIdentityType{ManagedServiceIdentityTypeNone, ManagedServiceIdentityTypeSystemAssigned, ManagedServiceIdentityTypeUserAssigned} } // MSDeployLogEntryType enumerates the values for ms deploy log entry type. @@ -1009,6 +1033,35 @@ func PossibleRenderingTypeValues() []RenderingType { return []RenderingType{NoGraph, Table, TimeSeries, TimeSeriesPerInstance} } +// ResolveStatus enumerates the values for resolve status. +type ResolveStatus string + +const ( + // AccessToKeyVaultDenied ... + AccessToKeyVaultDenied ResolveStatus = "AccessToKeyVaultDenied" + // Initialized ... + Initialized ResolveStatus = "Initialized" + // InvalidSyntax ... + InvalidSyntax ResolveStatus = "InvalidSyntax" + // MSINotEnabled ... + MSINotEnabled ResolveStatus = "MSINotEnabled" + // OtherReasons ... + OtherReasons ResolveStatus = "OtherReasons" + // Resolved ... + Resolved ResolveStatus = "Resolved" + // SecretNotFound ... + SecretNotFound ResolveStatus = "SecretNotFound" + // SecretVersionNotFound ... + SecretVersionNotFound ResolveStatus = "SecretVersionNotFound" + // VaultNotFound ... + VaultNotFound ResolveStatus = "VaultNotFound" +) + +// PossibleResolveStatusValues returns an array of possible values for the ResolveStatus const type. +func PossibleResolveStatusValues() []ResolveStatus { + return []ResolveStatus{AccessToKeyVaultDenied, Initialized, InvalidSyntax, MSINotEnabled, OtherReasons, Resolved, SecretNotFound, SecretVersionNotFound, VaultNotFound} +} + // ResourceScopeType enumerates the values for resource scope type. type ResourceScopeType string @@ -1073,11 +1126,13 @@ const ( ScmTypeTfs ScmType = "Tfs" // ScmTypeVSO ... ScmTypeVSO ScmType = "VSO" + // ScmTypeVSTSRM ... + ScmTypeVSTSRM ScmType = "VSTSRM" ) // PossibleScmTypeValues returns an array of possible values for the ScmType const type. func PossibleScmTypeValues() []ScmType { - return []ScmType{ScmTypeBitbucketGit, ScmTypeBitbucketHg, ScmTypeCodePlexGit, ScmTypeCodePlexHg, ScmTypeDropbox, ScmTypeExternalGit, ScmTypeExternalHg, ScmTypeGitHub, ScmTypeLocalGit, ScmTypeNone, ScmTypeOneDrive, ScmTypeTfs, ScmTypeVSO} + return []ScmType{ScmTypeBitbucketGit, ScmTypeBitbucketHg, ScmTypeCodePlexGit, ScmTypeCodePlexHg, ScmTypeDropbox, ScmTypeExternalGit, ScmTypeExternalHg, ScmTypeGitHub, ScmTypeLocalGit, ScmTypeNone, ScmTypeOneDrive, ScmTypeTfs, ScmTypeVSO, ScmTypeVSTSRM} } // SiteAvailabilityState enumerates the values for site availability state. @@ -1133,6 +1188,23 @@ func PossibleSiteLoadBalancingValues() []SiteLoadBalancing { return []SiteLoadBalancing{LeastRequests, LeastResponseTime, RequestHash, WeightedRoundRobin, WeightedTotalTraffic} } +// SiteRuntimeState enumerates the values for site runtime state. +type SiteRuntimeState string + +const ( + // READY ... + READY SiteRuntimeState = "READY" + // STOPPED ... + STOPPED SiteRuntimeState = "STOPPED" + // UNKNOWN ... + UNKNOWN SiteRuntimeState = "UNKNOWN" +) + +// PossibleSiteRuntimeStateValues returns an array of possible values for the SiteRuntimeState const type. +func PossibleSiteRuntimeStateValues() []SiteRuntimeState { + return []SiteRuntimeState{READY, STOPPED, UNKNOWN} +} + // SkuName enumerates the values for sku name. type SkuName string @@ -1310,13 +1382,15 @@ const ( WorkerSizeOptionsLarge WorkerSizeOptions = "Large" // WorkerSizeOptionsMedium ... WorkerSizeOptionsMedium WorkerSizeOptions = "Medium" + // WorkerSizeOptionsNestedSmall ... + WorkerSizeOptionsNestedSmall WorkerSizeOptions = "NestedSmall" // WorkerSizeOptionsSmall ... WorkerSizeOptionsSmall WorkerSizeOptions = "Small" ) // PossibleWorkerSizeOptionsValues returns an array of possible values for the WorkerSizeOptions const type. func PossibleWorkerSizeOptionsValues() []WorkerSizeOptions { - return []WorkerSizeOptions{WorkerSizeOptionsD1, WorkerSizeOptionsD2, WorkerSizeOptionsD3, WorkerSizeOptionsDefault, WorkerSizeOptionsLarge, WorkerSizeOptionsMedium, WorkerSizeOptionsSmall} + return []WorkerSizeOptions{WorkerSizeOptionsD1, WorkerSizeOptionsD2, WorkerSizeOptionsD3, WorkerSizeOptionsDefault, WorkerSizeOptionsLarge, WorkerSizeOptionsMedium, WorkerSizeOptionsNestedSmall, WorkerSizeOptionsSmall} } // AbnormalTimePeriod class representing Abnormal Time Period identified in diagnosis @@ -1350,6 +1424,92 @@ type Address struct { // AddressResponse describes main public IP address and any extra virtual IPs. type AddressResponse struct { autorest.Response `json:"-"` + // AddressResponseProperties - AddressResponse resource specific properties + *AddressResponseProperties `json:"properties,omitempty"` + // ID - READ-ONLY; Resource Id. + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; Resource Name. + Name *string `json:"name,omitempty"` + // Kind - Kind of resource. + Kind *string `json:"kind,omitempty"` + // Type - READ-ONLY; Resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for AddressResponse. +func (ar AddressResponse) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if ar.AddressResponseProperties != nil { + objectMap["properties"] = ar.AddressResponseProperties + } + if ar.Kind != nil { + objectMap["kind"] = ar.Kind + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for AddressResponse struct. +func (ar *AddressResponse) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var addressResponseProperties AddressResponseProperties + err = json.Unmarshal(*v, &addressResponseProperties) + if err != nil { + return err + } + ar.AddressResponseProperties = &addressResponseProperties + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + ar.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + ar.Name = &name + } + case "kind": + if v != nil { + var kind string + err = json.Unmarshal(*v, &kind) + if err != nil { + return err + } + ar.Kind = &kind + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + ar.Type = &typeVar + } + } + } + + return nil +} + +// AddressResponseProperties addressResponse resource specific properties +type AddressResponseProperties struct { // ServiceIPAddress - Main public virtual IP. ServiceIPAddress *string `json:"serviceIpAddress,omitempty"` // InternalIPAddress - Virtual Network internal IP address of the App Service Environment if it is in internal load-balancing mode. @@ -1376,6 +1536,7 @@ type AnalysisData struct { // AnalysisDefinition definition of Analysis type AnalysisDefinition struct { + autorest.Response `json:"-"` // AnalysisDefinitionProperties - AnalysisDefinition resource specific properties *AnalysisDefinitionProperties `json:"properties,omitempty"` // ID - READ-ONLY; Resource Id. @@ -1472,6 +1633,29 @@ type APIDefinitionInfo struct { URL *string `json:"url,omitempty"` } +// APIKVReference description of site key vault references. +type APIKVReference struct { + Reference *string `json:"reference,omitempty"` + // Status - Possible values include: 'Initialized', 'Resolved', 'InvalidSyntax', 'MSINotEnabled', 'VaultNotFound', 'SecretNotFound', 'SecretVersionNotFound', 'AccessToKeyVaultDenied', 'OtherReasons' + Status ResolveStatus `json:"status,omitempty"` + VaultName *string `json:"vaultName,omitempty"` + SecretName *string `json:"secretName,omitempty"` + SecretVersion *string `json:"secretVersion,omitempty"` + // IdentityType - Possible values include: 'ManagedServiceIdentityTypeNone', 'ManagedServiceIdentityTypeSystemAssigned', 'ManagedServiceIdentityTypeUserAssigned' + IdentityType ManagedServiceIdentityType `json:"identityType,omitempty"` + Details *string `json:"details,omitempty"` + // Source - Possible values include: 'KeyVault' + Source ConfigReferenceSource `json:"source,omitempty"` + // Location - Possible values include: 'ApplicationSetting' + Location ConfigReferenceLocation `json:"location,omitempty"` +} + +// APIManagementConfig azure API management (APIM) configuration linked to the app. +type APIManagementConfig struct { + // ID - APIM-Api Identifier. + ID *string `json:"id,omitempty"` +} + // AppCollection collection of App Service apps. type AppCollection struct { autorest.Response `json:"-"` @@ -1792,12 +1976,13 @@ type ApplicationStack struct { type ApplicationStackCollection struct { autorest.Response `json:"-"` // Value - Collection of resources. - Value *[]ApplicationStack `json:"value,omitempty"` + Value *[]ApplicationStackResource `json:"value,omitempty"` // NextLink - READ-ONLY; Link to next page of resources. NextLink *string `json:"nextLink,omitempty"` } -// ApplicationStackCollectionIterator provides access to a complete listing of ApplicationStack values. +// ApplicationStackCollectionIterator provides access to a complete listing of ApplicationStackResource +// values. type ApplicationStackCollectionIterator struct { i int page ApplicationStackCollectionPage @@ -1848,9 +2033,9 @@ func (iter ApplicationStackCollectionIterator) Response() ApplicationStackCollec // Value returns the current value or a zero-initialized value if the // iterator has advanced beyond the end of the collection. -func (iter ApplicationStackCollectionIterator) Value() ApplicationStack { +func (iter ApplicationStackCollectionIterator) Value() ApplicationStackResource { if !iter.page.NotDone() { - return ApplicationStack{} + return ApplicationStackResource{} } return iter.page.Values()[iter.i] } @@ -1877,7 +2062,7 @@ func (asc ApplicationStackCollection) applicationStackCollectionPreparer(ctx con autorest.WithBaseURL(to.String(asc.NextLink))) } -// ApplicationStackCollectionPage contains a page of ApplicationStack values. +// ApplicationStackCollectionPage contains a page of ApplicationStackResource values. type ApplicationStackCollectionPage struct { fn func(context.Context, ApplicationStackCollection) (ApplicationStackCollection, error) asc ApplicationStackCollection @@ -1922,7 +2107,7 @@ func (page ApplicationStackCollectionPage) Response() ApplicationStackCollection } // Values returns the slice of values for the current page or nil if there are no values. -func (page ApplicationStackCollectionPage) Values() []ApplicationStack { +func (page ApplicationStackCollectionPage) Values() []ApplicationStackResource { if page.asc.IsEmpty() { return nil } @@ -1934,6 +2119,138 @@ func NewApplicationStackCollectionPage(getNextPage func(context.Context, Applica return ApplicationStackCollectionPage{fn: getNextPage} } +// ApplicationStackResource ARM resource for a ApplicationStack. +type ApplicationStackResource struct { + // ApplicationStack - Core resource properties + *ApplicationStack `json:"properties,omitempty"` + // ID - READ-ONLY; Resource Id. + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; Resource Name. + Name *string `json:"name,omitempty"` + // Kind - Kind of resource. + Kind *string `json:"kind,omitempty"` + // Type - READ-ONLY; Resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for ApplicationStackResource. +func (asr ApplicationStackResource) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if asr.ApplicationStack != nil { + objectMap["properties"] = asr.ApplicationStack + } + if asr.Kind != nil { + objectMap["kind"] = asr.Kind + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for ApplicationStackResource struct. +func (asr *ApplicationStackResource) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var applicationStack ApplicationStack + err = json.Unmarshal(*v, &applicationStack) + if err != nil { + return err + } + asr.ApplicationStack = &applicationStack + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + asr.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + asr.Name = &name + } + case "kind": + if v != nil { + var kind string + err = json.Unmarshal(*v, &kind) + if err != nil { + return err + } + asr.Kind = &kind + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + asr.Type = &typeVar + } + } + } + + return nil +} + +// AppsCopyProductionSlotFuture an abstraction for monitoring and retrieving the results of a long-running +// operation. +type AppsCopyProductionSlotFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *AppsCopyProductionSlotFuture) Result(client AppsClient) (ar autorest.Response, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppsCopyProductionSlotFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("web.AppsCopyProductionSlotFuture") + return + } + ar.Response = future.Response() + return +} + +// AppsCopySlotSlotFuture an abstraction for monitoring and retrieving the results of a long-running +// operation. +type AppsCopySlotSlotFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *AppsCopySlotSlotFuture) Result(client AppsClient) (ar autorest.Response, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "web.AppsCopySlotSlotFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("web.AppsCopySlotSlotFuture") + return + } + ar.Response = future.Response() + return +} + // AppsCreateFunctionFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type AppsCreateFunctionFuture struct { @@ -6194,6 +6511,8 @@ type CertificatePatchResourceProperties struct { KeyVaultSecretStatus KeyVaultSecretStatus `json:"keyVaultSecretStatus,omitempty"` // ServerFarmID - Resource ID of the associated App Service plan, formatted as: "/subscriptions/{subscriptionID}/resourceGroups/{groupName}/providers/Microsoft.Web/serverfarms/{appServicePlanName}". ServerFarmID *string `json:"serverFarmId,omitempty"` + // CanonicalName - CNAME of the certificate to be issued via free certificate + CanonicalName *string `json:"canonicalName,omitempty"` } // CertificateProperties certificate resource specific properties @@ -6236,6 +6555,8 @@ type CertificateProperties struct { KeyVaultSecretStatus KeyVaultSecretStatus `json:"keyVaultSecretStatus,omitempty"` // ServerFarmID - Resource ID of the associated App Service plan, formatted as: "/subscriptions/{subscriptionID}/resourceGroups/{groupName}/providers/Microsoft.Web/serverfarms/{appServicePlanName}". ServerFarmID *string `json:"serverFarmId,omitempty"` + // CanonicalName - CNAME of the certificate to be issued via free certificate + CanonicalName *string `json:"canonicalName,omitempty"` } // CloningInfo information needed for cloning operation. @@ -6377,6 +6698,60 @@ type Contact struct { Phone *string `json:"phone,omitempty"` } +// ContainerCPUStatistics ... +type ContainerCPUStatistics struct { + CPUUsage *ContainerCPUUsage `json:"cpuUsage,omitempty"` + SystemCPUUsage *int64 `json:"systemCpuUsage,omitempty"` + OnlineCPUCount *int32 `json:"onlineCpuCount,omitempty"` + ThrottlingData *ContainerThrottlingData `json:"throttlingData,omitempty"` +} + +// ContainerCPUUsage ... +type ContainerCPUUsage struct { + TotalUsage *int64 `json:"totalUsage,omitempty"` + PerCPUUsage *[]int64 `json:"perCpuUsage,omitempty"` + KernelModeUsage *int64 `json:"kernelModeUsage,omitempty"` + UserModeUsage *int64 `json:"userModeUsage,omitempty"` +} + +// ContainerInfo ... +type ContainerInfo struct { + CurrentTimeStamp *date.Time `json:"currentTimeStamp,omitempty"` + PreviousTimeStamp *date.Time `json:"previousTimeStamp,omitempty"` + CurrentCPUStats *ContainerCPUStatistics `json:"currentCpuStats,omitempty"` + PreviousCPUStats *ContainerCPUStatistics `json:"previousCpuStats,omitempty"` + MemoryStats *ContainerMemoryStatistics `json:"memoryStats,omitempty"` + Name *string `json:"name,omitempty"` + ID *string `json:"id,omitempty"` + Eth0 *ContainerNetworkInterfaceStatistics `json:"eth0,omitempty"` +} + +// ContainerMemoryStatistics ... +type ContainerMemoryStatistics struct { + Usage *int64 `json:"usage,omitempty"` + MaxUsage *int64 `json:"maxUsage,omitempty"` + Limit *int64 `json:"limit,omitempty"` +} + +// ContainerNetworkInterfaceStatistics ... +type ContainerNetworkInterfaceStatistics struct { + RxBytes *int64 `json:"rxBytes,omitempty"` + RxPackets *int64 `json:"rxPackets,omitempty"` + RxErrors *int64 `json:"rxErrors,omitempty"` + RxDropped *int64 `json:"rxDropped,omitempty"` + TxBytes *int64 `json:"txBytes,omitempty"` + TxPackets *int64 `json:"txPackets,omitempty"` + TxErrors *int64 `json:"txErrors,omitempty"` + TxDropped *int64 `json:"txDropped,omitempty"` +} + +// ContainerThrottlingData ... +type ContainerThrottlingData struct { + Periods *int32 `json:"periods,omitempty"` + ThrottledPeriods *int32 `json:"throttledPeriods,omitempty"` + ThrottledTime *int32 `json:"throttledTime,omitempty"` +} + // ContinuousWebJob continuous Web Job Information. type ContinuousWebJob struct { autorest.Response `json:"-"` @@ -6681,6 +7056,17 @@ type CorsSettings struct { SupportCredentials *bool `json:"supportCredentials,omitempty"` } +// CsmCopySlotEntity copy deployment slot parameters. +type CsmCopySlotEntity struct { + // TargetSlot - Destination deployment slot during copy operation. + TargetSlot *string `json:"targetSlot,omitempty"` + // SiteConfig - The site object which will be merged with the source slot site + // to produce new destination slot site object. + // null to just copy source slot content. Otherwise a Site + // object with properties to override source slot site. + SiteConfig *SiteConfig `json:"siteConfig,omitempty"` +} + // CsmMoveResourceEnvelope object with a list of the resources that need to be moved and the resource group // they should be moved to. type CsmMoveResourceEnvelope struct { @@ -7858,6 +8244,7 @@ type DetectorAbnormalTimePeriod struct { // DetectorDefinition class representing detector definition type DetectorDefinition struct { + autorest.Response `json:"-"` // DetectorDefinitionProperties - DetectorDefinition resource specific properties *DetectorDefinitionProperties `json:"properties,omitempty"` // ID - READ-ONLY; Resource Id. @@ -9113,8 +9500,8 @@ func (d *Domain) UnmarshalJSON(body []byte) error { return nil } -// DomainAvailablilityCheckResult domain availability check result. -type DomainAvailablilityCheckResult struct { +// DomainAvailabilityCheckResult domain availability check result. +type DomainAvailabilityCheckResult struct { autorest.Response `json:"-"` // Name - Name of the domain. Name *string `json:"name,omitempty"` @@ -9767,8 +10154,8 @@ type EndpointDetail struct { Port *int32 `json:"port,omitempty"` // Latency - The time in milliseconds it takes for a TCP connection to be created from the App Service Environment to this IpAddress at this Port. Latency *float64 `json:"latency,omitempty"` - // IsAccessable - Whether it is possible to create a TCP connection from the App Service Environment to this IpAddress at this Port. - IsAccessable *bool `json:"isAccessable,omitempty"` + // IsAccessible - Whether it is possible to create a TCP connection from the App Service Environment to this IpAddress at this Port. + IsAccessible *bool `json:"isAccessible,omitempty"` } // ErrorEntity body of the error response returned from the API. @@ -10072,7 +10459,7 @@ type FunctionEnvelopeProperties struct { InvokeURLTemplate *string `json:"invoke_url_template,omitempty"` // Language - The function language Language *string `json:"language,omitempty"` - // IsDisabled - Value indicating whether the function is disabled + // IsDisabled - Gets or sets a value indicating whether the function is disabled IsDisabled *bool `json:"isDisabled,omitempty"` } @@ -10216,14 +10603,6 @@ type FunctionSecretsProperties struct { TriggerURL *string `json:"trigger_url,omitempty"` } -// GeoDistribution a global distribution definition. -type GeoDistribution struct { - // Location - Location. - Location *string `json:"location,omitempty"` - // NumberOfWorkers - NumberOfWorkers. - NumberOfWorkers *int32 `json:"numberOfWorkers,omitempty"` -} - // GeoRegion geographical region. type GeoRegion struct { // GeoRegionProperties - GeoRegion resource specific properties @@ -10462,6 +10841,8 @@ type GeoRegionProperties struct { Description *string `json:"description,omitempty"` // DisplayName - READ-ONLY; Display name for region. DisplayName *string `json:"displayName,omitempty"` + // OrgDomain - READ-ONLY; Display name for region. + OrgDomain *string `json:"orgDomain,omitempty"` } // GlobalCsmSkuDescription a Global SKU Description. @@ -10508,8 +10889,8 @@ type HostingEnvironmentDiagnostics struct { autorest.Response `json:"-"` // Name - Name/identifier of the diagnostics. Name *string `json:"name,omitempty"` - // DiagnosicsOutput - Diagnostics output. - DiagnosicsOutput *string `json:"diagnosicsOutput,omitempty"` + // DiagnosticsOutput - Diagnostics output. + DiagnosticsOutput *string `json:"diagnosticsOutput,omitempty"` } // HostingEnvironmentProfile specification for an App Service Environment to use for this resource. @@ -10522,32 +10903,6 @@ type HostingEnvironmentProfile struct { Type *string `json:"type,omitempty"` } -// HostKeys functions host level keys. -type HostKeys struct { - autorest.Response `json:"-"` - // MasterKey - Secret key. - MasterKey *string `json:"masterKey,omitempty"` - // FunctionKeys - Host level function keys. - FunctionKeys map[string]*string `json:"functionKeys"` - // SystemKeys - System keys. - SystemKeys map[string]*string `json:"systemKeys"` -} - -// MarshalJSON is the custom marshaler for HostKeys. -func (hk HostKeys) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]interface{}) - if hk.MasterKey != nil { - objectMap["masterKey"] = hk.MasterKey - } - if hk.FunctionKeys != nil { - objectMap["functionKeys"] = hk.FunctionKeys - } - if hk.SystemKeys != nil { - objectMap["systemKeys"] = hk.SystemKeys - } - return json.Marshal(objectMap) -} - // HostName details of a hostname derived from a domain. type HostName struct { // Name - Name of the hostname. @@ -11524,8 +11879,8 @@ func NewIdentifierCollectionPage(getNextPage func(context.Context, IdentifierCol // IdentifierProperties identifier resource specific properties type IdentifierProperties struct { - // ID - String representation of the identity. - ID *string `json:"id,omitempty"` + // Value - String representation of the identity. + Value *string `json:"id,omitempty"` } // InboundEnvironmentEndpoint the IP Addresses and Ports that require inbound network access to and within @@ -11991,30 +12346,209 @@ func (j JobProperties) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// KeyInfo function key info. -type KeyInfo struct { +// KeyVaultReferenceCollection web app key vault reference and status ARM resource. +type KeyVaultReferenceCollection struct { autorest.Response `json:"-"` - // Name - Key name + // KeyVaultReferenceCollectionProperties - KeyVaultReferenceCollection resource specific properties + *KeyVaultReferenceCollectionProperties `json:"properties,omitempty"` + // ID - READ-ONLY; Resource Id. + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; Resource Name. Name *string `json:"name,omitempty"` - // Value - Key value - Value *string `json:"value,omitempty"` -} - -// ListCapability ... -type ListCapability struct { - autorest.Response `json:"-"` - Value *[]Capability `json:"value,omitempty"` + // Kind - Kind of resource. + Kind *string `json:"kind,omitempty"` + // Type - READ-ONLY; Resource type. + Type *string `json:"type,omitempty"` } -// ListCertificateEmail ... -type ListCertificateEmail struct { - autorest.Response `json:"-"` - Value *[]CertificateEmail `json:"value,omitempty"` +// MarshalJSON is the custom marshaler for KeyVaultReferenceCollection. +func (kvrc KeyVaultReferenceCollection) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if kvrc.KeyVaultReferenceCollectionProperties != nil { + objectMap["properties"] = kvrc.KeyVaultReferenceCollectionProperties + } + if kvrc.Kind != nil { + objectMap["kind"] = kvrc.Kind + } + return json.Marshal(objectMap) } -// ListCertificateOrderAction ... -type ListCertificateOrderAction struct { - autorest.Response `json:"-"` +// UnmarshalJSON is the custom unmarshaler for KeyVaultReferenceCollection struct. +func (kvrc *KeyVaultReferenceCollection) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var keyVaultReferenceCollectionProperties KeyVaultReferenceCollectionProperties + err = json.Unmarshal(*v, &keyVaultReferenceCollectionProperties) + if err != nil { + return err + } + kvrc.KeyVaultReferenceCollectionProperties = &keyVaultReferenceCollectionProperties + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + kvrc.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + kvrc.Name = &name + } + case "kind": + if v != nil { + var kind string + err = json.Unmarshal(*v, &kind) + if err != nil { + return err + } + kvrc.Kind = &kind + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + kvrc.Type = &typeVar + } + } + } + + return nil +} + +// KeyVaultReferenceCollectionProperties keyVaultReferenceCollection resource specific properties +type KeyVaultReferenceCollectionProperties struct { + KeyToReferenceStatuses map[string]*APIKVReference `json:"keyToReferenceStatuses"` +} + +// MarshalJSON is the custom marshaler for KeyVaultReferenceCollectionProperties. +func (kvrc KeyVaultReferenceCollectionProperties) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if kvrc.KeyToReferenceStatuses != nil { + objectMap["keyToReferenceStatuses"] = kvrc.KeyToReferenceStatuses + } + return json.Marshal(objectMap) +} + +// KeyVaultReferenceResource web app key vault reference and status ARM resource. +type KeyVaultReferenceResource struct { + autorest.Response `json:"-"` + // APIKVReference - Core resource properties + *APIKVReference `json:"properties,omitempty"` + // ID - READ-ONLY; Resource Id. + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; Resource Name. + Name *string `json:"name,omitempty"` + // Kind - Kind of resource. + Kind *string `json:"kind,omitempty"` + // Type - READ-ONLY; Resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for KeyVaultReferenceResource. +func (kvrr KeyVaultReferenceResource) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if kvrr.APIKVReference != nil { + objectMap["properties"] = kvrr.APIKVReference + } + if kvrr.Kind != nil { + objectMap["kind"] = kvrr.Kind + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for KeyVaultReferenceResource struct. +func (kvrr *KeyVaultReferenceResource) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var aPIKVReference APIKVReference + err = json.Unmarshal(*v, &aPIKVReference) + if err != nil { + return err + } + kvrr.APIKVReference = &aPIKVReference + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + kvrr.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + kvrr.Name = &name + } + case "kind": + if v != nil { + var kind string + err = json.Unmarshal(*v, &kind) + if err != nil { + return err + } + kvrr.Kind = &kind + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + kvrr.Type = &typeVar + } + } + } + + return nil +} + +// ListCapability ... +type ListCapability struct { + autorest.Response `json:"-"` + Value *[]Capability `json:"value,omitempty"` +} + +// ListCertificateEmail ... +type ListCertificateEmail struct { + autorest.Response `json:"-"` + Value *[]CertificateEmail `json:"value,omitempty"` +} + +// ListCertificateOrderAction ... +type ListCertificateOrderAction struct { + autorest.Response `json:"-"` Value *[]CertificateOrderAction `json:"value,omitempty"` } @@ -12065,7 +12599,7 @@ type LogSpecification struct { // ManagedServiceIdentity managed service identity. type ManagedServiceIdentity struct { - // Type - Type of managed service identity. Possible values include: 'ManagedServiceIdentityTypeSystemAssigned', 'ManagedServiceIdentityTypeUserAssigned', 'ManagedServiceIdentityTypeSystemAssignedUserAssigned', 'ManagedServiceIdentityTypeNone' + // Type - Type of managed service identity. Possible values include: 'ManagedServiceIdentityTypeNone', 'ManagedServiceIdentityTypeSystemAssigned', 'ManagedServiceIdentityTypeUserAssigned' Type ManagedServiceIdentityType `json:"type,omitempty"` // TenantID - READ-ONLY; Tenant of managed service identity. TenantID *string `json:"tenantId,omitempty"` @@ -12095,119 +12629,12 @@ type ManagedServiceIdentityUserAssignedIdentitiesValue struct { ClientID *string `json:"clientId,omitempty"` } -// MetricAvailabilily metric availability and retention. -type MetricAvailabilily struct { - // TimeGrain - Time grain. - TimeGrain *string `json:"timeGrain,omitempty"` - // Retention - Retention period for the current time grain. - Retention *string `json:"retention,omitempty"` -} - // MetricAvailability retention policy of a resource metric. type MetricAvailability struct { TimeGrain *string `json:"timeGrain,omitempty"` BlobDuration *string `json:"blobDuration,omitempty"` } -// MetricDefinition metadata for a metric. -type MetricDefinition struct { - autorest.Response `json:"-"` - // MetricDefinitionProperties - MetricDefinition resource specific properties - *MetricDefinitionProperties `json:"properties,omitempty"` - // ID - READ-ONLY; Resource Id. - ID *string `json:"id,omitempty"` - // Name - READ-ONLY; Resource Name. - Name *string `json:"name,omitempty"` - // Kind - Kind of resource. - Kind *string `json:"kind,omitempty"` - // Type - READ-ONLY; Resource type. - Type *string `json:"type,omitempty"` -} - -// MarshalJSON is the custom marshaler for MetricDefinition. -func (md MetricDefinition) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]interface{}) - if md.MetricDefinitionProperties != nil { - objectMap["properties"] = md.MetricDefinitionProperties - } - if md.Kind != nil { - objectMap["kind"] = md.Kind - } - return json.Marshal(objectMap) -} - -// UnmarshalJSON is the custom unmarshaler for MetricDefinition struct. -func (md *MetricDefinition) UnmarshalJSON(body []byte) error { - var m map[string]*json.RawMessage - err := json.Unmarshal(body, &m) - if err != nil { - return err - } - for k, v := range m { - switch k { - case "properties": - if v != nil { - var metricDefinitionProperties MetricDefinitionProperties - err = json.Unmarshal(*v, &metricDefinitionProperties) - if err != nil { - return err - } - md.MetricDefinitionProperties = &metricDefinitionProperties - } - case "id": - if v != nil { - var ID string - err = json.Unmarshal(*v, &ID) - if err != nil { - return err - } - md.ID = &ID - } - case "name": - if v != nil { - var name string - err = json.Unmarshal(*v, &name) - if err != nil { - return err - } - md.Name = &name - } - case "kind": - if v != nil { - var kind string - err = json.Unmarshal(*v, &kind) - if err != nil { - return err - } - md.Kind = &kind - } - case "type": - if v != nil { - var typeVar string - err = json.Unmarshal(*v, &typeVar) - if err != nil { - return err - } - md.Type = &typeVar - } - } - } - - return nil -} - -// MetricDefinitionProperties metricDefinition resource specific properties -type MetricDefinitionProperties struct { - // Unit - READ-ONLY; Unit of the metric. - Unit *string `json:"unit,omitempty"` - // PrimaryAggregationType - READ-ONLY; Primary aggregation type. - PrimaryAggregationType *string `json:"primaryAggregationType,omitempty"` - // MetricAvailabilities - READ-ONLY; List of time grains supported for the metric together with retention period. - MetricAvailabilities *[]MetricAvailabilily `json:"metricAvailabilities,omitempty"` - // DisplayName - READ-ONLY; Friendly name shown in the UI. - DisplayName *string `json:"displayName,omitempty"` -} - // MetricSpecification definition of a single resource metric. type MetricSpecification struct { Name *string `json:"name,omitempty"` @@ -12225,6 +12652,7 @@ type MetricSpecification struct { Dimensions *[]Dimension `json:"dimensions,omitempty"` Category *string `json:"category,omitempty"` Availabilities *[]MetricAvailability `json:"availabilities,omitempty"` + SupportedTimeGrainTypes *[]string `json:"supportedTimeGrainTypes,omitempty"` } // MigrateMySQLRequest mySQL migration request. @@ -14677,7 +15105,6 @@ type ProcessModuleInfoProperties struct { // ProcessThreadInfo process Thread Information. type ProcessThreadInfo struct { - autorest.Response `json:"-"` // ProcessThreadInfoProperties - ProcessThreadInfo resource specific properties *ProcessThreadInfoProperties `json:"properties,omitempty"` // ID - READ-ONLY; Resource Id. @@ -14930,8 +15357,6 @@ type ProcessThreadInfoProperties struct { TotalProcessorTime *string `json:"total_processor_time,omitempty"` // UserProcessorTime - User processor time. UserProcessorTime *string `json:"user_processor_time,omitempty"` - // PriviledgedProcessorTime - Privileged processor time. - PriviledgedProcessorTime *string `json:"priviledged_processor_time,omitempty"` // State - Thread state. State *string `json:"state,omitempty"` // WaitReason - Wait reason. @@ -15302,9 +15727,9 @@ type RampUpRule struct { ActionHostName *string `json:"actionHostName,omitempty"` // ReroutePercentage - Percentage of the traffic which will be redirected to ActionHostName. ReroutePercentage *float64 `json:"reroutePercentage,omitempty"` - // ChangeStep - In auto ramp up scenario this is the step to add/remove from ReroutePercentage until it reaches - // MinReroutePercentage or MaxReroutePercentage. Site metrics are checked every N minutes specified in ChangeIntervalInMinutes. - // Custom decision algorithm can be provided in TiPCallback site extension which URL can be specified in ChangeDecisionCallbackUrl. + // ChangeStep - In auto ramp up scenario this is the step to add/remove from ReroutePercentage until it reaches \nMinReroutePercentage or + // MaxReroutePercentage. Site metrics are checked every N minutes specified in ChangeIntervalInMinutes.\nCustom decision algorithm + // can be provided in TiPCallback site extension which URL can be specified in ChangeDecisionCallbackUrl. ChangeStep *float64 `json:"changeStep,omitempty"` // ChangeIntervalInMinutes - Specifies interval in minutes to reevaluate ReroutePercentage. ChangeIntervalInMinutes *int32 `json:"changeIntervalInMinutes,omitempty"` @@ -16454,28 +16879,6 @@ type ResourceHealthMetadataProperties struct { SignalAvailability *bool `json:"signalAvailability,omitempty"` } -// ResourceMetric object representing a metric for any resource . -type ResourceMetric struct { - // Name - READ-ONLY; Name of metric. - Name *ResourceMetricName `json:"name,omitempty"` - // Unit - READ-ONLY; Metric unit. - Unit *string `json:"unit,omitempty"` - // TimeGrain - READ-ONLY; Metric granularity. E.g PT1H, PT5M, P1D - TimeGrain *string `json:"timeGrain,omitempty"` - // StartTime - READ-ONLY; Metric start time. - StartTime *date.Time `json:"startTime,omitempty"` - // EndTime - READ-ONLY; Metric end time. - EndTime *date.Time `json:"endTime,omitempty"` - // ResourceID - READ-ONLY; Metric resource Id. - ResourceID *string `json:"resourceId,omitempty"` - // ID - READ-ONLY; Resource Id. - ID *string `json:"id,omitempty"` - // MetricValues - READ-ONLY; Metric values. - MetricValues *[]ResourceMetricValue `json:"metricValues,omitempty"` - // Properties - READ-ONLY; Resource metric properties collection. - Properties *[]ResourceMetricProperty `json:"properties,omitempty"` -} - // ResourceMetricAvailability metrics availability and retention. type ResourceMetricAvailability struct { // TimeGrain - READ-ONLY; Time grain . @@ -16484,152 +16887,6 @@ type ResourceMetricAvailability struct { Retention *string `json:"retention,omitempty"` } -// ResourceMetricCollection collection of metric responses. -type ResourceMetricCollection struct { - autorest.Response `json:"-"` - // Value - Collection of resources. - Value *[]ResourceMetric `json:"value,omitempty"` - // NextLink - READ-ONLY; Link to next page of resources. - NextLink *string `json:"nextLink,omitempty"` -} - -// ResourceMetricCollectionIterator provides access to a complete listing of ResourceMetric values. -type ResourceMetricCollectionIterator struct { - i int - page ResourceMetricCollectionPage -} - -// NextWithContext advances to the next value. If there was an error making -// the request the iterator does not advance and the error is returned. -func (iter *ResourceMetricCollectionIterator) NextWithContext(ctx context.Context) (err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/ResourceMetricCollectionIterator.NextWithContext") - defer func() { - sc := -1 - if iter.Response().Response.Response != nil { - sc = iter.Response().Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - iter.i++ - if iter.i < len(iter.page.Values()) { - return nil - } - err = iter.page.NextWithContext(ctx) - if err != nil { - iter.i-- - return err - } - iter.i = 0 - return nil -} - -// Next advances to the next value. If there was an error making -// the request the iterator does not advance and the error is returned. -// Deprecated: Use NextWithContext() instead. -func (iter *ResourceMetricCollectionIterator) Next() error { - return iter.NextWithContext(context.Background()) -} - -// NotDone returns true if the enumeration should be started or is not yet complete. -func (iter ResourceMetricCollectionIterator) NotDone() bool { - return iter.page.NotDone() && iter.i < len(iter.page.Values()) -} - -// Response returns the raw server response from the last page request. -func (iter ResourceMetricCollectionIterator) Response() ResourceMetricCollection { - return iter.page.Response() -} - -// Value returns the current value or a zero-initialized value if the -// iterator has advanced beyond the end of the collection. -func (iter ResourceMetricCollectionIterator) Value() ResourceMetric { - if !iter.page.NotDone() { - return ResourceMetric{} - } - return iter.page.Values()[iter.i] -} - -// Creates a new instance of the ResourceMetricCollectionIterator type. -func NewResourceMetricCollectionIterator(page ResourceMetricCollectionPage) ResourceMetricCollectionIterator { - return ResourceMetricCollectionIterator{page: page} -} - -// IsEmpty returns true if the ListResult contains no values. -func (rmc ResourceMetricCollection) IsEmpty() bool { - return rmc.Value == nil || len(*rmc.Value) == 0 -} - -// resourceMetricCollectionPreparer prepares a request to retrieve the next set of results. -// It returns nil if no more results exist. -func (rmc ResourceMetricCollection) resourceMetricCollectionPreparer(ctx context.Context) (*http.Request, error) { - if rmc.NextLink == nil || len(to.String(rmc.NextLink)) < 1 { - return nil, nil - } - return autorest.Prepare((&http.Request{}).WithContext(ctx), - autorest.AsJSON(), - autorest.AsGet(), - autorest.WithBaseURL(to.String(rmc.NextLink))) -} - -// ResourceMetricCollectionPage contains a page of ResourceMetric values. -type ResourceMetricCollectionPage struct { - fn func(context.Context, ResourceMetricCollection) (ResourceMetricCollection, error) - rmc ResourceMetricCollection -} - -// NextWithContext advances to the next page of values. If there was an error making -// the request the page does not advance and the error is returned. -func (page *ResourceMetricCollectionPage) NextWithContext(ctx context.Context) (err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/ResourceMetricCollectionPage.NextWithContext") - defer func() { - sc := -1 - if page.Response().Response.Response != nil { - sc = page.Response().Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - next, err := page.fn(ctx, page.rmc) - if err != nil { - return err - } - page.rmc = next - return nil -} - -// Next advances to the next page of values. If there was an error making -// the request the page does not advance and the error is returned. -// Deprecated: Use NextWithContext() instead. -func (page *ResourceMetricCollectionPage) Next() error { - return page.NextWithContext(context.Background()) -} - -// NotDone returns true if the page enumeration should be started or is not yet complete. -func (page ResourceMetricCollectionPage) NotDone() bool { - return !page.rmc.IsEmpty() -} - -// Response returns the raw server response from the last page request. -func (page ResourceMetricCollectionPage) Response() ResourceMetricCollection { - return page.rmc -} - -// Values returns the slice of values for the current page or nil if there are no values. -func (page ResourceMetricCollectionPage) Values() []ResourceMetric { - if page.rmc.IsEmpty() { - return nil - } - return *page.rmc.Value -} - -// Creates a new instance of the ResourceMetricCollectionPage type. -func NewResourceMetricCollectionPage(getNextPage func(context.Context, ResourceMetricCollection) (ResourceMetricCollection, error)) ResourceMetricCollectionPage { - return ResourceMetricCollectionPage{fn: getNextPage} -} - // ResourceMetricDefinition metadata for the metrics. type ResourceMetricDefinition struct { // ResourceMetricDefinitionProperties - ResourceMetricDefinition resource specific properties @@ -16883,40 +17140,6 @@ func (rmd ResourceMetricDefinitionProperties) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// ResourceMetricName name of a metric for any resource . -type ResourceMetricName struct { - // Value - READ-ONLY; metric name value. - Value *string `json:"value,omitempty"` - // LocalizedValue - READ-ONLY; Localized metric name value. - LocalizedValue *string `json:"localizedValue,omitempty"` -} - -// ResourceMetricProperty resource metric property. -type ResourceMetricProperty struct { - // Key - Key for resource metric property. - Key *string `json:"key,omitempty"` - // Value - Value of pair. - Value *string `json:"value,omitempty"` -} - -// ResourceMetricValue value of resource metric. -type ResourceMetricValue struct { - // Timestamp - READ-ONLY; Value timestamp. - Timestamp *string `json:"timestamp,omitempty"` - // Average - READ-ONLY; Value average. - Average *float64 `json:"average,omitempty"` - // Minimum - READ-ONLY; Value minimum. - Minimum *float64 `json:"minimum,omitempty"` - // Maximum - READ-ONLY; Value maximum. - Maximum *float64 `json:"maximum,omitempty"` - // Total - READ-ONLY; Value total. - Total *float64 `json:"total,omitempty"` - // Count - READ-ONLY; Value count. - Count *float64 `json:"count,omitempty"` - // Properties - READ-ONLY; Resource metric properties collection. - Properties *[]ResourceMetricProperty `json:"properties,omitempty"` -} - // ResourceNameAvailability information regarding availability of a resource name. type ResourceNameAvailability struct { autorest.Response `json:"-"` @@ -17440,8 +17663,6 @@ type SiteConfig struct { PublishingUsername *string `json:"publishingUsername,omitempty"` // AppSettings - Application settings. AppSettings *[]NameValuePair `json:"appSettings,omitempty"` - // AzureStorageAccounts - User-provided Azure storage accounts. - AzureStorageAccounts map[string]*AzureStorageInfoValue `json:"azureStorageAccounts"` // ConnectionStrings - Connection strings. ConnectionStrings *[]ConnStringInfo `json:"connectionStrings,omitempty"` // MachineKey - READ-ONLY; Site MachineKey. @@ -17450,7 +17671,7 @@ type SiteConfig struct { HandlerMappings *[]HandlerMapping `json:"handlerMappings,omitempty"` // DocumentRoot - Document root. DocumentRoot *string `json:"documentRoot,omitempty"` - // ScmType - SCM type. Possible values include: 'ScmTypeNone', 'ScmTypeDropbox', 'ScmTypeTfs', 'ScmTypeLocalGit', 'ScmTypeGitHub', 'ScmTypeCodePlexGit', 'ScmTypeCodePlexHg', 'ScmTypeBitbucketGit', 'ScmTypeBitbucketHg', 'ScmTypeExternalGit', 'ScmTypeExternalHg', 'ScmTypeOneDrive', 'ScmTypeVSO' + // ScmType - SCM type. Possible values include: 'ScmTypeNone', 'ScmTypeDropbox', 'ScmTypeTfs', 'ScmTypeLocalGit', 'ScmTypeGitHub', 'ScmTypeCodePlexGit', 'ScmTypeCodePlexHg', 'ScmTypeBitbucketGit', 'ScmTypeBitbucketHg', 'ScmTypeExternalGit', 'ScmTypeExternalHg', 'ScmTypeOneDrive', 'ScmTypeVSO', 'ScmTypeVSTSRM' ScmType ScmType `json:"scmType,omitempty"` // Use32BitWorkerProcess - true to use 32-bit worker process; otherwise, false. Use32BitWorkerProcess *bool `json:"use32BitWorkerProcess,omitempty"` @@ -17490,6 +17711,8 @@ type SiteConfig struct { Push *PushSettings `json:"push,omitempty"` // APIDefinition - Information about the formal API definition for the app. APIDefinition *APIDefinitionInfo `json:"apiDefinition,omitempty"` + // APIManagementConfig - Azure API management settings linked to the app. + APIManagementConfig *APIManagementConfig `json:"apiManagementConfig,omitempty"` // AutoSwapSlotName - Auto-swap slot name. AutoSwapSlotName *string `json:"autoSwapSlotName,omitempty"` // LocalMySQLEnabled - true to enable local MySQL; otherwise, false. @@ -17510,171 +17733,11 @@ type SiteConfig struct { MinTLSVersion SupportedTLSVersions `json:"minTlsVersion,omitempty"` // FtpsState - State of FTP / FTPS service. Possible values include: 'AllAllowed', 'FtpsOnly', 'Disabled' FtpsState FtpsState `json:"ftpsState,omitempty"` - // ReservedInstanceCount - Number of reserved instances. - // This setting only applies to the Consumption Plan - ReservedInstanceCount *int32 `json:"reservedInstanceCount,omitempty"` -} - -// MarshalJSON is the custom marshaler for SiteConfig. -func (sc SiteConfig) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]interface{}) - if sc.NumberOfWorkers != nil { - objectMap["numberOfWorkers"] = sc.NumberOfWorkers - } - if sc.DefaultDocuments != nil { - objectMap["defaultDocuments"] = sc.DefaultDocuments - } - if sc.NetFrameworkVersion != nil { - objectMap["netFrameworkVersion"] = sc.NetFrameworkVersion - } - if sc.PhpVersion != nil { - objectMap["phpVersion"] = sc.PhpVersion - } - if sc.PythonVersion != nil { - objectMap["pythonVersion"] = sc.PythonVersion - } - if sc.NodeVersion != nil { - objectMap["nodeVersion"] = sc.NodeVersion - } - if sc.LinuxFxVersion != nil { - objectMap["linuxFxVersion"] = sc.LinuxFxVersion - } - if sc.WindowsFxVersion != nil { - objectMap["windowsFxVersion"] = sc.WindowsFxVersion - } - if sc.RequestTracingEnabled != nil { - objectMap["requestTracingEnabled"] = sc.RequestTracingEnabled - } - if sc.RequestTracingExpirationTime != nil { - objectMap["requestTracingExpirationTime"] = sc.RequestTracingExpirationTime - } - if sc.RemoteDebuggingEnabled != nil { - objectMap["remoteDebuggingEnabled"] = sc.RemoteDebuggingEnabled - } - if sc.RemoteDebuggingVersion != nil { - objectMap["remoteDebuggingVersion"] = sc.RemoteDebuggingVersion - } - if sc.HTTPLoggingEnabled != nil { - objectMap["httpLoggingEnabled"] = sc.HTTPLoggingEnabled - } - if sc.LogsDirectorySizeLimit != nil { - objectMap["logsDirectorySizeLimit"] = sc.LogsDirectorySizeLimit - } - if sc.DetailedErrorLoggingEnabled != nil { - objectMap["detailedErrorLoggingEnabled"] = sc.DetailedErrorLoggingEnabled - } - if sc.PublishingUsername != nil { - objectMap["publishingUsername"] = sc.PublishingUsername - } - if sc.AppSettings != nil { - objectMap["appSettings"] = sc.AppSettings - } - if sc.AzureStorageAccounts != nil { - objectMap["azureStorageAccounts"] = sc.AzureStorageAccounts - } - if sc.ConnectionStrings != nil { - objectMap["connectionStrings"] = sc.ConnectionStrings - } - if sc.HandlerMappings != nil { - objectMap["handlerMappings"] = sc.HandlerMappings - } - if sc.DocumentRoot != nil { - objectMap["documentRoot"] = sc.DocumentRoot - } - if sc.ScmType != "" { - objectMap["scmType"] = sc.ScmType - } - if sc.Use32BitWorkerProcess != nil { - objectMap["use32BitWorkerProcess"] = sc.Use32BitWorkerProcess - } - if sc.WebSocketsEnabled != nil { - objectMap["webSocketsEnabled"] = sc.WebSocketsEnabled - } - if sc.AlwaysOn != nil { - objectMap["alwaysOn"] = sc.AlwaysOn - } - if sc.JavaVersion != nil { - objectMap["javaVersion"] = sc.JavaVersion - } - if sc.JavaContainer != nil { - objectMap["javaContainer"] = sc.JavaContainer - } - if sc.JavaContainerVersion != nil { - objectMap["javaContainerVersion"] = sc.JavaContainerVersion - } - if sc.AppCommandLine != nil { - objectMap["appCommandLine"] = sc.AppCommandLine - } - if sc.ManagedPipelineMode != "" { - objectMap["managedPipelineMode"] = sc.ManagedPipelineMode - } - if sc.VirtualApplications != nil { - objectMap["virtualApplications"] = sc.VirtualApplications - } - if sc.LoadBalancing != "" { - objectMap["loadBalancing"] = sc.LoadBalancing - } - if sc.Experiments != nil { - objectMap["experiments"] = sc.Experiments - } - if sc.Limits != nil { - objectMap["limits"] = sc.Limits - } - if sc.AutoHealEnabled != nil { - objectMap["autoHealEnabled"] = sc.AutoHealEnabled - } - if sc.AutoHealRules != nil { - objectMap["autoHealRules"] = sc.AutoHealRules - } - if sc.TracingOptions != nil { - objectMap["tracingOptions"] = sc.TracingOptions - } - if sc.VnetName != nil { - objectMap["vnetName"] = sc.VnetName - } - if sc.Cors != nil { - objectMap["cors"] = sc.Cors - } - if sc.Push != nil { - objectMap["push"] = sc.Push - } - if sc.APIDefinition != nil { - objectMap["apiDefinition"] = sc.APIDefinition - } - if sc.AutoSwapSlotName != nil { - objectMap["autoSwapSlotName"] = sc.AutoSwapSlotName - } - if sc.LocalMySQLEnabled != nil { - objectMap["localMySqlEnabled"] = sc.LocalMySQLEnabled - } - if sc.ManagedServiceIdentityID != nil { - objectMap["managedServiceIdentityId"] = sc.ManagedServiceIdentityID - } - if sc.XManagedServiceIdentityID != nil { - objectMap["xManagedServiceIdentityId"] = sc.XManagedServiceIdentityID - } - if sc.IPSecurityRestrictions != nil { - objectMap["ipSecurityRestrictions"] = sc.IPSecurityRestrictions - } - if sc.ScmIPSecurityRestrictions != nil { - objectMap["scmIpSecurityRestrictions"] = sc.ScmIPSecurityRestrictions - } - if sc.ScmIPSecurityRestrictionsUseMain != nil { - objectMap["scmIpSecurityRestrictionsUseMain"] = sc.ScmIPSecurityRestrictionsUseMain - } - if sc.HTTP20Enabled != nil { - objectMap["http20Enabled"] = sc.HTTP20Enabled - } - if sc.MinTLSVersion != "" { - objectMap["minTlsVersion"] = sc.MinTLSVersion - } - if sc.FtpsState != "" { - objectMap["ftpsState"] = sc.FtpsState - } - if sc.ReservedInstanceCount != nil { - objectMap["reservedInstanceCount"] = sc.ReservedInstanceCount - } - return json.Marshal(objectMap) + // PreWarmedInstanceCount - Number of preWarmed instances. + // This setting only applies to the Consumption and Elastic Plans + PreWarmedInstanceCount *int32 `json:"preWarmedInstanceCount,omitempty"` + // HealthCheckPath - Health check path + HealthCheckPath *string `json:"healthCheckPath,omitempty"` } // SiteConfigResource web app configuration ARM resource. @@ -18520,6 +18583,127 @@ type SiteInstanceProperties struct { SiteInstanceName *string `json:"siteInstanceName,omitempty"` } +// SiteInstanceStatus ... +type SiteInstanceStatus struct { + autorest.Response `json:"-"` + // SiteInstanceStatusProperties - WebSiteInstanceStatus resource specific properties + *SiteInstanceStatusProperties `json:"properties,omitempty"` + // ID - READ-ONLY; Resource Id. + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; Resource Name. + Name *string `json:"name,omitempty"` + // Kind - Kind of resource. + Kind *string `json:"kind,omitempty"` + // Type - READ-ONLY; Resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for SiteInstanceStatus. +func (sis SiteInstanceStatus) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if sis.SiteInstanceStatusProperties != nil { + objectMap["properties"] = sis.SiteInstanceStatusProperties + } + if sis.Kind != nil { + objectMap["kind"] = sis.Kind + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for SiteInstanceStatus struct. +func (sis *SiteInstanceStatus) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var siteInstanceStatusProperties SiteInstanceStatusProperties + err = json.Unmarshal(*v, &siteInstanceStatusProperties) + if err != nil { + return err + } + sis.SiteInstanceStatusProperties = &siteInstanceStatusProperties + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + sis.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + sis.Name = &name + } + case "kind": + if v != nil { + var kind string + err = json.Unmarshal(*v, &kind) + if err != nil { + return err + } + sis.Kind = &kind + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + sis.Type = &typeVar + } + } + } + + return nil +} + +// SiteInstanceStatusProperties webSiteInstanceStatus resource specific properties +type SiteInstanceStatusProperties struct { + // State - Possible values include: 'READY', 'STOPPED', 'UNKNOWN' + State SiteRuntimeState `json:"state,omitempty"` + // StatusURL - Link to the GetStatusApi in Kudu + StatusURL *string `json:"statusUrl,omitempty"` + // DetectorURL - Link to the Diagnose and Solve Portal + DetectorURL *string `json:"detectorUrl,omitempty"` + // ConsoleURL - Link to the Diagnose and Solve Portal + ConsoleURL *string `json:"consoleUrl,omitempty"` + Containers map[string]*ContainerInfo `json:"containers"` +} + +// MarshalJSON is the custom marshaler for SiteInstanceStatusProperties. +func (sis SiteInstanceStatusProperties) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if sis.State != "" { + objectMap["state"] = sis.State + } + if sis.StatusURL != nil { + objectMap["statusUrl"] = sis.StatusURL + } + if sis.DetectorURL != nil { + objectMap["detectorUrl"] = sis.DetectorURL + } + if sis.ConsoleURL != nil { + objectMap["consoleUrl"] = sis.ConsoleURL + } + if sis.Containers != nil { + objectMap["containers"] = sis.Containers + } + return json.Marshal(objectMap) +} + // SiteLimits metric limits set on an app. type SiteLimits struct { // MaxPercentageCPU - Maximum allowed CPU usage percentage. @@ -18790,7 +18974,7 @@ type SitePatchResourceProperties struct { HostNamesDisabled *bool `json:"hostNamesDisabled,omitempty"` // OutboundIPAddresses - READ-ONLY; List of IP addresses that the app uses for outbound connections (e.g. database access). Includes VIPs from tenants that site can be hosted with current settings. Read-only. OutboundIPAddresses *string `json:"outboundIpAddresses,omitempty"` - // PossibleOutboundIPAddresses - READ-ONLY; List of IP addresses that the app uses for outbound connections (e.g. database access). Includes VIPs from all tenants. Read-only. + // PossibleOutboundIPAddresses - READ-ONLY; List of IP addresses that the app uses for outbound connections (e.g. database access). Includes VIPs from all tenants except dataComponent. Read-only. PossibleOutboundIPAddresses *string `json:"possibleOutboundIpAddresses,omitempty"` // ContainerSize - Size of the function container. ContainerSize *int32 `json:"containerSize,omitempty"` @@ -18818,8 +19002,6 @@ type SitePatchResourceProperties struct { RedundancyMode RedundancyMode `json:"redundancyMode,omitempty"` // InProgressOperationID - READ-ONLY; Specifies an operation id if this site has a pending operation. InProgressOperationID *uuid.UUID `json:"inProgressOperationId,omitempty"` - // GeoDistributions - GeoDistributions for this site - GeoDistributions *[]GeoDistribution `json:"geoDistributions,omitempty"` } // SitePhpErrorLogFlag used for getting PHP error logging flag. @@ -18971,7 +19153,7 @@ type SiteProperties struct { HostNamesDisabled *bool `json:"hostNamesDisabled,omitempty"` // OutboundIPAddresses - READ-ONLY; List of IP addresses that the app uses for outbound connections (e.g. database access). Includes VIPs from tenants that site can be hosted with current settings. Read-only. OutboundIPAddresses *string `json:"outboundIpAddresses,omitempty"` - // PossibleOutboundIPAddresses - READ-ONLY; List of IP addresses that the app uses for outbound connections (e.g. database access). Includes VIPs from all tenants. Read-only. + // PossibleOutboundIPAddresses - READ-ONLY; List of IP addresses that the app uses for outbound connections (e.g. database access). Includes VIPs from all tenants except dataComponent. Read-only. PossibleOutboundIPAddresses *string `json:"possibleOutboundIpAddresses,omitempty"` // ContainerSize - Size of the function container. ContainerSize *int32 `json:"containerSize,omitempty"` @@ -18999,8 +19181,6 @@ type SiteProperties struct { RedundancyMode RedundancyMode `json:"redundancyMode,omitempty"` // InProgressOperationID - READ-ONLY; Specifies an operation id if this site has a pending operation. InProgressOperationID *uuid.UUID `json:"inProgressOperationId,omitempty"` - // GeoDistributions - GeoDistributions for this site - GeoDistributions *[]GeoDistribution `json:"geoDistributions,omitempty"` } // SiteSeal site seal @@ -20313,6 +20493,12 @@ type StackMajorVersion struct { MinorVersions *[]StackMinorVersion `json:"minorVersions,omitempty"` // ApplicationInsights - true if this supports Application Insights; otherwise, false. ApplicationInsights *bool `json:"applicationInsights,omitempty"` + // IsPreview - true if this stack is in Preview, otherwise false. + IsPreview *bool `json:"isPreview,omitempty"` + // IsDeprecated - true if this stack has been deprecated, otherwise false. + IsDeprecated *bool `json:"isDeprecated,omitempty"` + // IsHidden - true if this stack should be hidden for new customers on portal, otherwise false. + IsHidden *bool `json:"isHidden,omitempty"` } // StackMinorVersion application stack minor version. @@ -20339,7 +20525,7 @@ type StampCapacity struct { Unit *string `json:"unit,omitempty"` // ComputeMode - Shared/dedicated workers. Possible values include: 'ComputeModeOptionsShared', 'ComputeModeOptionsDedicated', 'ComputeModeOptionsDynamic' ComputeMode ComputeModeOptions `json:"computeMode,omitempty"` - // WorkerSize - Size of the machines. Possible values include: 'WorkerSizeOptionsSmall', 'WorkerSizeOptionsMedium', 'WorkerSizeOptionsLarge', 'WorkerSizeOptionsD1', 'WorkerSizeOptionsD2', 'WorkerSizeOptionsD3', 'WorkerSizeOptionsDefault' + // WorkerSize - Size of the machines. Possible values include: 'WorkerSizeOptionsSmall', 'WorkerSizeOptionsMedium', 'WorkerSizeOptionsLarge', 'WorkerSizeOptionsD1', 'WorkerSizeOptionsD2', 'WorkerSizeOptionsD3', 'WorkerSizeOptionsNestedSmall', 'WorkerSizeOptionsDefault' WorkerSize WorkerSizeOptions `json:"workerSize,omitempty"` // WorkerSizeID - Size ID of machines: // 0 - Small @@ -22240,22 +22426,6 @@ type UserProperties struct { ScmURI *string `json:"scmUri,omitempty"` } -// ValidateContainerSettingsRequest container settings validation request context -type ValidateContainerSettingsRequest struct { - // BaseURL - Base URL of the container registry - BaseURL *string `json:"baseUrl,omitempty"` - // Username - Username for to access the container registry - Username *string `json:"username,omitempty"` - // Password - Password for to access the container registry - Password *string `json:"password,omitempty"` - // Repository - Repository name (image name) - Repository *string `json:"repository,omitempty"` - // Tag - Image tag - Tag *string `json:"tag,omitempty"` - // Platform - Platform (windows or linux) - Platform *string `json:"platform,omitempty"` -} - // ValidateProperties app properties used for validation. type ValidateProperties struct { // ServerFarmID - ARM resource ID of an App Service plan that would host the app. @@ -22272,6 +22442,18 @@ type ValidateProperties struct { HostingEnvironment *string `json:"hostingEnvironment,omitempty"` // IsXenon - true if App Service plan is running as a windows container IsXenon *bool `json:"isXenon,omitempty"` + // ContainerRegistryBaseURL - Base URL of the container registry + ContainerRegistryBaseURL *string `json:"containerRegistryBaseUrl,omitempty"` + // ContainerRegistryUsername - Username for to access the container registry + ContainerRegistryUsername *string `json:"containerRegistryUsername,omitempty"` + // ContainerRegistryPassword - Password for to access the container registry + ContainerRegistryPassword *string `json:"containerRegistryPassword,omitempty"` + // ContainerImageRepository - Repository name (image name) + ContainerImageRepository *string `json:"containerImageRepository,omitempty"` + // ContainerImageTag - Image tag + ContainerImageTag *string `json:"containerImageTag,omitempty"` + // ContainerImagePlatform - Platform (windows or linux) + ContainerImagePlatform *string `json:"containerImagePlatform,omitempty"` } // ValidateRequest resource validation request content. @@ -22402,6 +22584,8 @@ type VirtualIPMapping struct { InternalHTTPSPort *int32 `json:"internalHttpsPort,omitempty"` // InUse - Is virtual IP mapping in use. InUse *bool `json:"inUse,omitempty"` + // ServiceName - name of the service that virtual IP is assigned to + ServiceName *string `json:"serviceName,omitempty"` } // VirtualNetworkProfile specification for using a Virtual Network. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/provider.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/provider.go similarity index 97% rename from vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/provider.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/provider.go index c24ca0866e5c6..bcbf208112cd8 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/provider.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/provider.go @@ -40,7 +40,7 @@ func NewProviderClientWithBaseURI(baseURI string, subscriptionID string) Provide return ProviderClient{NewWithBaseURI(baseURI, subscriptionID)} } -// GetAvailableStacks get available application frameworks and their versions +// GetAvailableStacks description for Get available application frameworks and their versions func (client ProviderClient) GetAvailableStacks(ctx context.Context, osTypeSelected string) (result ApplicationStackCollectionPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/ProviderClient.GetAvailableStacks") @@ -76,7 +76,7 @@ func (client ProviderClient) GetAvailableStacks(ctx context.Context, osTypeSelec // GetAvailableStacksPreparer prepares the GetAvailableStacks request. func (client ProviderClient) GetAvailableStacksPreparer(ctx context.Context, osTypeSelected string) (*http.Request, error) { - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -149,7 +149,7 @@ func (client ProviderClient) GetAvailableStacksComplete(ctx context.Context, osT return } -// GetAvailableStacksOnPrem get available application frameworks and their versions +// GetAvailableStacksOnPrem description for Get available application frameworks and their versions func (client ProviderClient) GetAvailableStacksOnPrem(ctx context.Context, osTypeSelected string) (result ApplicationStackCollectionPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/ProviderClient.GetAvailableStacksOnPrem") @@ -189,7 +189,7 @@ func (client ProviderClient) GetAvailableStacksOnPremPreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -262,8 +262,8 @@ func (client ProviderClient) GetAvailableStacksOnPremComplete(ctx context.Contex return } -// ListOperations gets all available operations for the Microsoft.Web resource provider. Also exposes resource metric -// definitions +// ListOperations description for Gets all available operations for the Microsoft.Web resource provider. Also exposes +// resource metric definitions func (client ProviderClient) ListOperations(ctx context.Context) (result CsmOperationCollectionPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/ProviderClient.ListOperations") @@ -299,7 +299,7 @@ func (client ProviderClient) ListOperations(ctx context.Context) (result CsmOper // ListOperationsPreparer prepares the ListOperations request. func (client ProviderClient) ListOperationsPreparer(ctx context.Context) (*http.Request, error) { - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/recommendations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/recommendations.go similarity index 97% rename from vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/recommendations.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/recommendations.go index 89c4e34215300..e97d6099b2471 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/recommendations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/recommendations.go @@ -41,7 +41,7 @@ func NewRecommendationsClientWithBaseURI(baseURI string, subscriptionID string) return RecommendationsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// DisableAllForHostingEnvironment disable all recommendations for an app. +// DisableAllForHostingEnvironment description for Disable all recommendations for an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // environmentName - name of the app. @@ -93,7 +93,7 @@ func (client RecommendationsClient) DisableAllForHostingEnvironmentPreparer(ctx "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, "environmentName": autorest.Encode("query", environmentName), @@ -126,7 +126,7 @@ func (client RecommendationsClient) DisableAllForHostingEnvironmentResponder(res return } -// DisableAllForWebApp disable all recommendations for an app. +// DisableAllForWebApp description for Disable all recommendations for an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - name of the app. @@ -178,7 +178,7 @@ func (client RecommendationsClient) DisableAllForWebAppPreparer(ctx context.Cont "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -210,7 +210,7 @@ func (client RecommendationsClient) DisableAllForWebAppResponder(resp *http.Resp return } -// DisableRecommendationForHostingEnvironment disables the specific rule for a web site permanently. +// DisableRecommendationForHostingEnvironment description for Disables the specific rule for a web site permanently. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // environmentName - site name @@ -264,7 +264,7 @@ func (client RecommendationsClient) DisableRecommendationForHostingEnvironmentPr "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, "environmentName": autorest.Encode("query", environmentName), @@ -297,7 +297,7 @@ func (client RecommendationsClient) DisableRecommendationForHostingEnvironmentRe return } -// DisableRecommendationForSite disables the specific rule for a web site permanently. +// DisableRecommendationForSite description for Disables the specific rule for a web site permanently. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - site name @@ -351,7 +351,7 @@ func (client RecommendationsClient) DisableRecommendationForSitePreparer(ctx con "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -383,8 +383,8 @@ func (client RecommendationsClient) DisableRecommendationForSiteResponder(resp * return } -// DisableRecommendationForSubscription disables the specified rule so it will not apply to a subscription in the -// future. +// DisableRecommendationForSubscription description for Disables the specified rule so it will not apply to a +// subscription in the future. // Parameters: // name - rule name func (client RecommendationsClient) DisableRecommendationForSubscription(ctx context.Context, name string) (result autorest.Response, err error) { @@ -426,7 +426,7 @@ func (client RecommendationsClient) DisableRecommendationForSubscriptionPreparer "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -458,7 +458,7 @@ func (client RecommendationsClient) DisableRecommendationForSubscriptionResponde return } -// GetRuleDetailsByHostingEnvironment get a recommendation rule for an app. +// GetRuleDetailsByHostingEnvironment description for Get a recommendation rule for an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // hostingEnvironmentName - name of the hosting environment. @@ -515,7 +515,7 @@ func (client RecommendationsClient) GetRuleDetailsByHostingEnvironmentPreparer(c "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -554,7 +554,7 @@ func (client RecommendationsClient) GetRuleDetailsByHostingEnvironmentResponder( return } -// GetRuleDetailsByWebApp get a recommendation rule for an app. +// GetRuleDetailsByWebApp description for Get a recommendation rule for an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - name of the app. @@ -611,7 +611,7 @@ func (client RecommendationsClient) GetRuleDetailsByWebAppPreparer(ctx context.C "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -650,7 +650,7 @@ func (client RecommendationsClient) GetRuleDetailsByWebAppResponder(resp *http.R return } -// List list all recommendations for a subscription. +// List description for List all recommendations for a subscription. // Parameters: // featured - specify true to return only the most critical recommendations. The default is // false, which returns all recommendations. @@ -696,7 +696,7 @@ func (client RecommendationsClient) ListPreparer(ctx context.Context, featured * "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -772,7 +772,8 @@ func (client RecommendationsClient) ListComplete(ctx context.Context, featured * return } -// ListHistoryForHostingEnvironment get past recommendations for an app, optionally specified by the time range. +// ListHistoryForHostingEnvironment description for Get past recommendations for an app, optionally specified by the +// time range. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // hostingEnvironmentName - name of the hosting environment. @@ -830,7 +831,7 @@ func (client RecommendationsClient) ListHistoryForHostingEnvironmentPreparer(ctx "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -906,7 +907,7 @@ func (client RecommendationsClient) ListHistoryForHostingEnvironmentComplete(ctx return } -// ListHistoryForWebApp get past recommendations for an app, optionally specified by the time range. +// ListHistoryForWebApp description for Get past recommendations for an app, optionally specified by the time range. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - name of the app. @@ -964,7 +965,7 @@ func (client RecommendationsClient) ListHistoryForWebAppPreparer(ctx context.Con "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1040,7 +1041,7 @@ func (client RecommendationsClient) ListHistoryForWebAppComplete(ctx context.Con return } -// ListRecommendedRulesForHostingEnvironment get all recommendations for an app. +// ListRecommendedRulesForHostingEnvironment description for Get all recommendations for an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // hostingEnvironmentName - name of the app. @@ -1097,7 +1098,7 @@ func (client RecommendationsClient) ListRecommendedRulesForHostingEnvironmentPre "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1173,7 +1174,7 @@ func (client RecommendationsClient) ListRecommendedRulesForHostingEnvironmentCom return } -// ListRecommendedRulesForWebApp get all recommendations for an app. +// ListRecommendedRulesForWebApp description for Get all recommendations for an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - name of the app. @@ -1230,7 +1231,7 @@ func (client RecommendationsClient) ListRecommendedRulesForWebAppPreparer(ctx co "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1306,7 +1307,7 @@ func (client RecommendationsClient) ListRecommendedRulesForWebAppComplete(ctx co return } -// ResetAllFilters reset all recommendation opt-out settings for a subscription. +// ResetAllFilters description for Reset all recommendation opt-out settings for a subscription. func (client RecommendationsClient) ResetAllFilters(ctx context.Context) (result autorest.Response, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/RecommendationsClient.ResetAllFilters") @@ -1345,7 +1346,7 @@ func (client RecommendationsClient) ResetAllFiltersPreparer(ctx context.Context) "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1377,7 +1378,7 @@ func (client RecommendationsClient) ResetAllFiltersResponder(resp *http.Response return } -// ResetAllFiltersForHostingEnvironment reset all recommendation opt-out settings for an app. +// ResetAllFiltersForHostingEnvironment description for Reset all recommendation opt-out settings for an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // environmentName - name of the app. @@ -1429,7 +1430,7 @@ func (client RecommendationsClient) ResetAllFiltersForHostingEnvironmentPreparer "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, "environmentName": autorest.Encode("query", environmentName), @@ -1462,7 +1463,7 @@ func (client RecommendationsClient) ResetAllFiltersForHostingEnvironmentResponde return } -// ResetAllFiltersForWebApp reset all recommendation opt-out settings for an app. +// ResetAllFiltersForWebApp description for Reset all recommendation opt-out settings for an app. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // siteName - name of the app. @@ -1514,7 +1515,7 @@ func (client RecommendationsClient) ResetAllFiltersForWebAppPreparer(ctx context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/resourcehealthmetadata.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/resourcehealthmetadata.go similarity index 97% rename from vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/resourcehealthmetadata.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/resourcehealthmetadata.go index b43c6e5f64c0f..ff89c6a5f2e97 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/resourcehealthmetadata.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/resourcehealthmetadata.go @@ -41,7 +41,7 @@ func NewResourceHealthMetadataClientWithBaseURI(baseURI string, subscriptionID s return ResourceHealthMetadataClient{NewWithBaseURI(baseURI, subscriptionID)} } -// GetBySite gets the category of ResourceHealthMetadata to use for the given site +// GetBySite description for Gets the category of ResourceHealthMetadata to use for the given site // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app @@ -93,7 +93,7 @@ func (client ResourceHealthMetadataClient) GetBySitePreparer(ctx context.Context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -126,7 +126,7 @@ func (client ResourceHealthMetadataClient) GetBySiteResponder(resp *http.Respons return } -// GetBySiteSlot gets the category of ResourceHealthMetadata to use for the given site +// GetBySiteSlot description for Gets the category of ResourceHealthMetadata to use for the given site // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app @@ -180,7 +180,7 @@ func (client ResourceHealthMetadataClient) GetBySiteSlotPreparer(ctx context.Con "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -213,7 +213,7 @@ func (client ResourceHealthMetadataClient) GetBySiteSlotResponder(resp *http.Res return } -// List list all ResourceHealthMetadata for all sites in the subscription. +// List description for List all ResourceHealthMetadata for all sites in the subscription. func (client ResourceHealthMetadataClient) List(ctx context.Context) (result ResourceHealthMetadataCollectionPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/ResourceHealthMetadataClient.List") @@ -253,7 +253,7 @@ func (client ResourceHealthMetadataClient) ListPreparer(ctx context.Context) (*h "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -323,7 +323,8 @@ func (client ResourceHealthMetadataClient) ListComplete(ctx context.Context) (re return } -// ListByResourceGroup list all ResourceHealthMetadata for all sites in the resource group in the subscription. +// ListByResourceGroup description for List all ResourceHealthMetadata for all sites in the resource group in the +// subscription. // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. func (client ResourceHealthMetadataClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result ResourceHealthMetadataCollectionPage, err error) { @@ -374,7 +375,7 @@ func (client ResourceHealthMetadataClient) ListByResourceGroupPreparer(ctx conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -444,7 +445,7 @@ func (client ResourceHealthMetadataClient) ListByResourceGroupComplete(ctx conte return } -// ListBySite gets the category of ResourceHealthMetadata to use for the given site as a collection +// ListBySite description for Gets the category of ResourceHealthMetadata to use for the given site as a collection // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -497,7 +498,7 @@ func (client ResourceHealthMetadataClient) ListBySitePreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -567,7 +568,7 @@ func (client ResourceHealthMetadataClient) ListBySiteComplete(ctx context.Contex return } -// ListBySiteSlot gets the category of ResourceHealthMetadata to use for the given site as a collection +// ListBySiteSlot description for Gets the category of ResourceHealthMetadata to use for the given site as a collection // Parameters: // resourceGroupName - name of the resource group to which the resource belongs. // name - name of web app. @@ -622,7 +623,7 @@ func (client ResourceHealthMetadataClient) ListBySiteSlotPreparer(ctx context.Co "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/topleveldomains.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/topleveldomains.go similarity index 97% rename from vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/topleveldomains.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/topleveldomains.go index 969de2a398a67..c06f49a25cb4d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/topleveldomains.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/topleveldomains.go @@ -40,7 +40,7 @@ func NewTopLevelDomainsClientWithBaseURI(baseURI string, subscriptionID string) return TopLevelDomainsClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Get get details of a top-level domain. +// Get description for Get details of a top-level domain. // Parameters: // name - name of the top-level domain. func (client TopLevelDomainsClient) Get(ctx context.Context, name string) (result TopLevelDomain, err error) { @@ -82,7 +82,7 @@ func (client TopLevelDomainsClient) GetPreparer(ctx context.Context, name string "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -115,7 +115,7 @@ func (client TopLevelDomainsClient) GetResponder(resp *http.Response) (result To return } -// List get all top-level domains supported for registration. +// List description for Get all top-level domains supported for registration. func (client TopLevelDomainsClient) List(ctx context.Context) (result TopLevelDomainCollectionPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/TopLevelDomainsClient.List") @@ -155,7 +155,7 @@ func (client TopLevelDomainsClient) ListPreparer(ctx context.Context) (*http.Req "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -225,7 +225,7 @@ func (client TopLevelDomainsClient) ListComplete(ctx context.Context) (result To return } -// ListAgreements gets all legal agreements that user needs to accept before purchasing a domain. +// ListAgreements description for Gets all legal agreements that user needs to accept before purchasing a domain. // Parameters: // name - name of the top-level domain. // agreementOption - domain agreement options. @@ -269,7 +269,7 @@ func (client TopLevelDomainsClient) ListAgreementsPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-02-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/version.go similarity index 94% rename from vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/version.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/version.go index 596623e11a99e..21f486dc53410 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web/version.go @@ -21,7 +21,7 @@ import "github.com/Azure/azure-sdk-for-go/version" // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/" + version.Number + " web/2018-02-01" + return "Azure-SDK-For-Go/" + version.Number + " web/2019-08-01" } // Version returns the semantic version (see http://semver.org) of the client. diff --git a/vendor/modules.txt b/vendor/modules.txt index dd8f3ed3b3f1c..ef8827c62e164 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -80,7 +80,7 @@ github.com/Azure/azure-sdk-for-go/services/signalr/mgmt/2018-10-01/signalr github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-04-01/storage github.com/Azure/azure-sdk-for-go/services/streamanalytics/mgmt/2016-03-01/streamanalytics github.com/Azure/azure-sdk-for-go/services/trafficmanager/mgmt/2018-04-01/trafficmanager -github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web +github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web github.com/Azure/azure-sdk-for-go/version # github.com/Azure/go-autorest/autorest v0.9.3 github.com/Azure/go-autorest/autorest From b33d803cf70570ff5a0b576908e8570c8d9e32b0 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Thu, 20 Feb 2020 11:10:11 +0000 Subject: [PATCH 262/498] set tags in keyvault_certificate to ForceNewSchema as resource has no Update method --- .../services/keyvault/resource_arm_key_vault_certificate.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault_certificate.go b/azurerm/internal/services/keyvault/resource_arm_key_vault_certificate.go index 6219533d02b24..7de47dd8431ee 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault_certificate.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault_certificate.go @@ -330,7 +330,7 @@ func resourceArmKeyVaultCertificate() *schema.Resource { Computed: true, }, - "tags": tags.Schema(), + "tags": tags.ForceNewSchema(), }, } } From 9b8d0bfc9e9dce6a0835f2f6dfc0b552b00bd4a6 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Thu, 20 Feb 2020 11:15:16 +0000 Subject: [PATCH 263/498] lint and goimports --- azurerm/helpers/azure/app_service.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/azurerm/helpers/azure/app_service.go b/azurerm/helpers/azure/app_service.go index 925220fdc5b60..bc287e46cccd6 100644 --- a/azurerm/helpers/azure/app_service.go +++ b/azurerm/helpers/azure/app_service.go @@ -2,15 +2,16 @@ package azure import ( "fmt" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "log" "regexp" "strings" + "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -301,8 +302,8 @@ func SchemaAppServiceSiteConfig() *schema.Schema { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "ip_address": { - Type: schema.TypeString, - Optional: true, + Type: schema.TypeString, + Optional: true, ValidateFunc: validate.CIDR, }, "virtual_network_subnet_id": { @@ -1544,7 +1545,7 @@ func FlattenAppServiceSiteConfig(input *web.SiteConfig) []interface{} { for _, v := range *vs { block := make(map[string]interface{}) if ip := v.IPAddress; ip != nil { - block["ip_address"] = *ip + block["ip_address"] = *ip } if vNetSubnetID := v.VnetSubnetResourceID; vNetSubnetID != nil { block["virtual_network_subnet_id"] = *vNetSubnetID From 164559a4b1531b78b26e9f1e791db2a391f7c89d Mon Sep 17 00:00:00 2001 From: njucz <740360112@qq.com> Date: Thu, 20 Feb 2020 19:55:53 +0800 Subject: [PATCH 264/498] add `tags` for resource `azurerm_automation_dsc_configuration` --- .../resource_arm_automation_dsc_configuration.go | 7 ++++++- .../resource_arm_automation_dsc_configuration_test.go | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/azurerm/internal/services/automation/resource_arm_automation_dsc_configuration.go b/azurerm/internal/services/automation/resource_arm_automation_dsc_configuration.go index a741b96e7ccba..79e4b1f7fe484 100644 --- a/azurerm/internal/services/automation/resource_arm_automation_dsc_configuration.go +++ b/azurerm/internal/services/automation/resource_arm_automation_dsc_configuration.go @@ -14,6 +14,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -79,6 +80,8 @@ func resourceArmAutomationDscConfiguration() *schema.Resource { Type: schema.TypeString, Computed: true, }, + + "tags": tags.Schema(), }, } } @@ -111,6 +114,7 @@ func resourceArmAutomationDscConfigurationCreateUpdate(d *schema.ResourceData, m location := azure.NormalizeLocation(d.Get("location").(string)) logVerbose := d.Get("log_verbose").(bool) description := d.Get("description").(string) + t := d.Get("tags").(map[string]interface{}) parameters := automation.DscConfigurationCreateOrUpdateParameters{ DscConfigurationCreateOrUpdateProperties: &automation.DscConfigurationCreateOrUpdateProperties{ @@ -122,6 +126,7 @@ func resourceArmAutomationDscConfigurationCreateUpdate(d *schema.ResourceData, m }, }, Location: utils.String(location), + Tags: tags.Expand(t), } if _, err := client.CreateOrUpdate(ctx, resGroup, accName, name, parameters); err != nil { @@ -192,7 +197,7 @@ func resourceArmAutomationDscConfigurationRead(d *schema.ResourceData, meta inte d.Set("content_embedded", content) - return nil + return tags.FlattenAndSet(d, resp.Tags) } func resourceArmAutomationDscConfigurationDelete(d *schema.ResourceData, meta interface{}) error { diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_configuration_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_configuration_test.go index b90ae33efdd75..3248254ca1ce0 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_configuration_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_configuration_test.go @@ -28,6 +28,8 @@ func TestAccAzureRMAutomationDscConfiguration_basic(t *testing.T) { resource.TestCheckResourceAttrSet(data.ResourceName, "log_verbose"), resource.TestCheckResourceAttrSet(data.ResourceName, "state"), resource.TestCheckResourceAttr(data.ResourceName, "content_embedded", "configuration acctest {}"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.ENV", "prod"), ), }, data.ImportStep(), @@ -145,6 +147,10 @@ resource "azurerm_automation_dsc_configuration" "test" { location = "${azurerm_resource_group.test.location}" content_embedded = "configuration acctest {}" description = "test" + + tags = { + ENV = "prod" + } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } From 6c5e9042a75af9d4ba900db12fc5662f4ae76049 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 20 Feb 2020 12:59:05 +0100 Subject: [PATCH 265/498] validate: removing the bool validators --- azurerm/helpers/validate/bool.go | 23 ------------------ azurerm/helpers/validate/bool_test.go | 35 --------------------------- 2 files changed, 58 deletions(-) delete mode 100644 azurerm/helpers/validate/bool.go delete mode 100644 azurerm/helpers/validate/bool_test.go diff --git a/azurerm/helpers/validate/bool.go b/azurerm/helpers/validate/bool.go deleted file mode 100644 index 3c7901b3636c7..0000000000000 --- a/azurerm/helpers/validate/bool.go +++ /dev/null @@ -1,23 +0,0 @@ -package validate - -import ( - "fmt" - - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" -) - -func BoolIsTrue() schema.SchemaValidateFunc { - return func(i interface{}, k string) (_ []string, errors []error) { - v, ok := i.(bool) - if !ok { - errors = append(errors, fmt.Errorf("expected type of %q to be bool", k)) - return - } - - if !v { - errors = append(errors, fmt.Errorf("%q can only be set to true, if not required remove key", k)) - return - } - return - } -} diff --git a/azurerm/helpers/validate/bool_test.go b/azurerm/helpers/validate/bool_test.go deleted file mode 100644 index d378dafc41b0d..0000000000000 --- a/azurerm/helpers/validate/bool_test.go +++ /dev/null @@ -1,35 +0,0 @@ -package validate - -import "testing" - -func TestBoolIsTrue(t *testing.T) { - testCases := []struct { - Value bool - ShouldHaveError bool - }{ - { - Value: true, - ShouldHaveError: false, - }, { - Value: false, - ShouldHaveError: true, - }, - } - - t.Run("TestBoolIsTrue", func(t *testing.T) { - for _, value := range testCases { - _, errors := BoolIsTrue()(value.Value, "dummy") - hasErrors := len(errors) > 0 - - if value.ShouldHaveError && !hasErrors { - t.Fatalf("Expected an error but didn't get one for %t", value.Value) - return - } - - if !value.ShouldHaveError && hasErrors { - t.Fatalf("Expected %t to return no errors, but got some %+v", value.Value, errors) - return - } - } - }) -} From 76babfac5fb496c6a11b773fd31863d5e062b33e Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 20 Feb 2020 12:59:39 +0100 Subject: [PATCH 266/498] (d|r)/key_vault: moving the name validation into that package --- .../keyvault/data_source_key_vault.go | 3 +- .../keyvault/resource_arm_key_vault.go | 13 +--- .../tests/resource_arm_key_vault_test.go | 58 ----------------- .../services/keyvault/validate/name.go | 15 +++++ .../services/keyvault/validate/name_test.go | 62 +++++++++++++++++++ 5 files changed, 81 insertions(+), 70 deletions(-) create mode 100644 azurerm/internal/services/keyvault/validate/name.go create mode 100644 azurerm/internal/services/keyvault/validate/name_test.go diff --git a/azurerm/internal/services/keyvault/data_source_key_vault.go b/azurerm/internal/services/keyvault/data_source_key_vault.go index 94ae0e9d97f6f..86a484a17b715 100644 --- a/azurerm/internal/services/keyvault/data_source_key_vault.go +++ b/azurerm/internal/services/keyvault/data_source_key_vault.go @@ -9,6 +9,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/set" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/keyvault/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" @@ -26,7 +27,7 @@ func dataSourceArmKeyVault() *schema.Resource { "name": { Type: schema.TypeString, Required: true, - ValidateFunc: ValidateKeyVaultName, + ValidateFunc: validate.KeyVaultName, }, "resource_group_name": azure.SchemaResourceGroupNameForDataSource(), diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault.go b/azurerm/internal/services/keyvault/resource_arm_key_vault.go index 50fdd7d4d9443..12f99756cbb34 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault.go @@ -4,9 +4,9 @@ import ( "fmt" "log" "net/http" - "regexp" "time" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/keyvault/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network" "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2018-02-14/keyvault" @@ -59,7 +59,7 @@ func resourceArmKeyVault() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: ValidateKeyVaultName, + ValidateFunc: validate.KeyVaultName, }, "location": azure.SchemaLocation(), @@ -531,15 +531,6 @@ func flattenKeyVaultNetworkAcls(input *keyvault.NetworkRuleSet) []interface{} { return []interface{}{output} } -func ValidateKeyVaultName(v interface{}, k string) (warnings []string, errors []error) { - value := v.(string) - if matched := regexp.MustCompile(`^[a-zA-Z0-9-]{3,24}$`).Match([]byte(value)); !matched { - errors = append(errors, fmt.Errorf("%q may only contain alphanumeric characters and dashes and must be between 3-24 chars", k)) - } - - return warnings, errors -} - func keyVaultRefreshFunc(vaultUri string) resource.StateRefreshFunc { return func() (interface{}, string, error) { log.Printf("[DEBUG] Checking to see if KeyVault %q is available..", vaultUri) diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go index 0699025aef01b..48a3d1998e900 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go @@ -10,67 +10,9 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/keyvault" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func TestAccAzureRMKeyVault_name(t *testing.T) { - cases := []struct { - Input string - ExpectError bool - }{ - { - Input: "", - ExpectError: true, - }, - { - Input: "hi", - ExpectError: true, - }, - { - Input: "hello", - ExpectError: false, - }, - { - Input: "hello-world", - ExpectError: false, - }, - { - Input: "hello-world-21", - ExpectError: false, - }, - { - Input: "hello_world_21", - ExpectError: true, - }, - { - Input: "Hello-World", - ExpectError: false, - }, - { - Input: "20202020", - ExpectError: false, - }, - { - Input: "ABC123!@£", - ExpectError: true, - }, - { - Input: "abcdefghijklmnopqrstuvwxyz", - ExpectError: true, - }, - } - - for _, tc := range cases { - _, errors := keyvault.ValidateKeyVaultName(tc.Input, "") - - hasError := len(errors) > 0 - if tc.ExpectError && !hasError { - t.Fatalf("Expected the Key Vault Name to trigger a validation error for '%s'", tc.Input) - } - } -} - func TestAccAzureRMKeyVault_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_key_vault", "test") diff --git a/azurerm/internal/services/keyvault/validate/name.go b/azurerm/internal/services/keyvault/validate/name.go new file mode 100644 index 0000000000000..764ceba95e23c --- /dev/null +++ b/azurerm/internal/services/keyvault/validate/name.go @@ -0,0 +1,15 @@ +package validate + +import ( + "fmt" + "regexp" +) + +func KeyVaultName(v interface{}, k string) (warnings []string, errors []error) { + value := v.(string) + if matched := regexp.MustCompile(`^[a-zA-Z0-9-]{3,24}$`).Match([]byte(value)); !matched { + errors = append(errors, fmt.Errorf("%q may only contain alphanumeric characters and dashes and must be between 3-24 chars", k)) + } + + return warnings, errors +} diff --git a/azurerm/internal/services/keyvault/validate/name_test.go b/azurerm/internal/services/keyvault/validate/name_test.go new file mode 100644 index 0000000000000..c574c749f5416 --- /dev/null +++ b/azurerm/internal/services/keyvault/validate/name_test.go @@ -0,0 +1,62 @@ +package validate + +import ( + "testing" +) + +func TestValidateKeyVaultName(t *testing.T) { + cases := []struct { + Input string + ExpectError bool + }{ + { + Input: "", + ExpectError: true, + }, + { + Input: "hi", + ExpectError: true, + }, + { + Input: "hello", + ExpectError: false, + }, + { + Input: "hello-world", + ExpectError: false, + }, + { + Input: "hello-world-21", + ExpectError: false, + }, + { + Input: "hello_world_21", + ExpectError: true, + }, + { + Input: "Hello-World", + ExpectError: false, + }, + { + Input: "20202020", + ExpectError: false, + }, + { + Input: "ABC123!@£", + ExpectError: true, + }, + { + Input: "abcdefghijklmnopqrstuvwxyz", + ExpectError: true, + }, + } + + for _, tc := range cases { + _, errors := KeyVaultName(tc.Input, "") + + hasError := len(errors) > 0 + if tc.ExpectError && !hasError { + t.Fatalf("Expected the Key Vault Name to trigger a validation error for '%s'", tc.Input) + } + } +} From 488b8ab6bbe8e77323fd20e93640c1e6acaa3818 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Thu, 20 Feb 2020 12:09:37 +0000 Subject: [PATCH 267/498] test fixes. Unused virtual_network_name field removed --- azurerm/helpers/azure/app_service.go | 1 - .../services/web/resource_arm_function_app.go | 4 - .../resource_arm_app_service_slot_test.go | 8 +- .../tests/resource_arm_app_service_test.go | 130 +----------------- .../tests/resource_arm_function_app_test.go | 63 --------- 5 files changed, 7 insertions(+), 199 deletions(-) diff --git a/azurerm/helpers/azure/app_service.go b/azurerm/helpers/azure/app_service.go index bc287e46cccd6..ee58baa9782a0 100644 --- a/azurerm/helpers/azure/app_service.go +++ b/azurerm/helpers/azure/app_service.go @@ -6,7 +6,6 @@ import ( "regexp" "strings" - "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" diff --git a/azurerm/internal/services/web/resource_arm_function_app.go b/azurerm/internal/services/web/resource_arm_function_app.go index 6d195e3340712..f4f60beb73781 100644 --- a/azurerm/internal/services/web/resource_arm_function_app.go +++ b/azurerm/internal/services/web/resource_arm_function_app.go @@ -192,10 +192,6 @@ func resourceArmFunctionApp() *schema.Resource { Optional: true, Computed: true, }, - "virtual_network_name": { - Type: schema.TypeString, - Optional: true, - }, "http2_enabled": { Type: schema.TypeBool, Optional: true, 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 a291366212b45..b0f84bf88ce8f 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 @@ -2682,7 +2682,7 @@ resource "azurerm_app_service_slot" "test" { site_config { ip_restriction { - ip_address = "10.10.10.10" + ip_address = "10.10.10.10/32" } } } @@ -2821,15 +2821,15 @@ resource "azurerm_app_service_slot" "test" { } ip_restriction { - ip_address = "20.20.20.0/24" + ip_address = "20.20.20.0/24" } ip_restriction { - ip_address = "30.30.0.0/16" + ip_address = "30.30.0.0/16" } ip_restriction { - ip_address = "192.168.1.2/24" + ip_address = "192.168.1.2/24" } } } 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 e237d706a6b1c..51bdff0a42dcf 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 @@ -344,32 +344,6 @@ func TestAccAzureRMAppService_clientAffinityDisabled(t *testing.T) { }) } -func TestAccAzureRMAppService_virtualNetwork(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_app_service", "test") - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMAppServiceDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMAppService_virtualNetwork(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMAppServiceExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.virtual_network_name", fmt.Sprintf("acctestvn-%d", data.RandomInteger)), - ), - }, - { - Config: testAccAzureRMAppService_virtualNetworkUpdated(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMAppServiceExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.virtual_network_name", fmt.Sprintf("acctestvn2-%d", data.RandomInteger)), - ), - }, - data.ImportStep(), - }, - }) -} - func TestAccAzureRMAppService_enableManageServiceIdentity(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_app_service", "test") resource.ParallelTest(t, resource.TestCase{ @@ -2259,104 +2233,6 @@ resource "azurerm_app_service" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, clientAffinity) } -func testAccAzureRMAppService_virtualNetwork(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - subnet { - name = "internal" - address_prefix = "10.0.1.0/24" - } -} - -resource "azurerm_app_service_plan" "test" { - name = "acctestASP-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - tier = "Standard" - size = "S1" - } -} - -resource "azurerm_app_service" "test" { - name = "acctestAS-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - app_service_plan_id = "${azurerm_app_service_plan.test.id}" - - site_config { - virtual_network_name = "${azurerm_virtual_network.test.name}" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - -func testAccAzureRMAppService_virtualNetworkUpdated(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - subnet { - name = "internal" - address_prefix = "10.0.1.0/24" - } -} - -resource "azurerm_virtual_network" "second" { - name = "acctestvn2-%d" - address_space = ["172.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - subnet { - name = "internal" - address_prefix = "172.0.1.0/24" - } -} - -resource "azurerm_app_service_plan" "test" { - name = "acctestASP-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - tier = "Standard" - size = "S1" - } -} - -resource "azurerm_app_service" "test" { - name = "acctestAS-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - app_service_plan_id = "${azurerm_app_service_plan.test.id}" - - site_config { - virtual_network_name = "${azurerm_virtual_network.second.name}" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - func testAccAzureRMAppService_mangedServiceIdentity(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { @@ -2767,15 +2643,15 @@ resource "azurerm_app_service" "test" { } ip_restriction { - ip_address = "20.20.20.0/24" + ip_address = "20.20.20.0/24" } ip_restriction { - ip_address = "30.30.0.0/16" + ip_address = "30.30.0.0/16" } ip_restriction { - ip_address = "192.168.1.2/24" + ip_address = "192.168.1.2/24" } } } 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 ccc9d3c3468aa..53ab8da11196e 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 @@ -11,7 +11,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" @@ -580,28 +579,6 @@ func TestAccAzureRMFunctionApp_corsSettings(t *testing.T) { }) } -func TestAccAzureRMFunctionApp_vnetName(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_function_app", "test") - - vnetName := strings.ToLower(acctest.RandString(11)) - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMFunctionAppDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMFunctionApp_vnetName(data, vnetName), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMFunctionAppExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.virtual_network_name", vnetName), - ), - }, - data.ImportStep(), - }, - }) -} - func TestAccAzureRMFunctionApp_enableHttp2(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_function_app", "test") @@ -1802,46 +1779,6 @@ resource "azurerm_function_app" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomString) } -func testAccAzureRMFunctionApp_vnetName(data acceptance.TestData, vnetName string) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%[1]d" - location = "%[2]s" -} - -resource "azurerm_storage_account" "test" { - name = "acctestsa%[3]s" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - account_tier = "Standard" - account_replication_type = "LRS" -} - -resource "azurerm_app_service_plan" "test" { - name = "acctestASP-%[1]d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - tier = "Standard" - size = "S1" - } -} - -resource "azurerm_function_app" "test" { - name = "acctest-%[1]d-func" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - app_service_plan_id = "${azurerm_app_service_plan.test.id}" - storage_connection_string = "${azurerm_storage_account.test.primary_connection_string}" - - site_config { - virtual_network_name = "%[4]s" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomString, vnetName) -} - func testAccAzureRMFunctionApp_enableHttp2(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { From 0e444bfb3cd3c955d88058e5616289f598c1a13f Mon Sep 17 00:00:00 2001 From: jackofallops Date: Thu, 20 Feb 2020 14:00:33 +0000 Subject: [PATCH 268/498] excluded implicit Any rule from state for ipRestrictions --- azurerm/helpers/azure/app_service.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/azurerm/helpers/azure/app_service.go b/azurerm/helpers/azure/app_service.go index ee58baa9782a0..0bab4cf91ce3c 100644 --- a/azurerm/helpers/azure/app_service.go +++ b/azurerm/helpers/azure/app_service.go @@ -1422,6 +1422,10 @@ func ExpandAppServiceSiteConfig(input interface{}) (*web.SiteConfig, error) { } ipSecurityRestriction := web.IPSecurityRestriction{} + if ipAddress == "Any" { + continue + } + if ipAddress != "" { ipSecurityRestriction.IPAddress = &ipAddress } @@ -1543,6 +1547,10 @@ func FlattenAppServiceSiteConfig(input *web.SiteConfig) []interface{} { if vs := input.IPSecurityRestrictions; vs != nil { for _, v := range *vs { block := make(map[string]interface{}) + + if ip := v.IPAddress; *ip == "Any" { + continue + } if ip := v.IPAddress; ip != nil { block["ip_address"] = *ip } From 8ad9c450e6a9e96c3565c27123722c889bb59acc Mon Sep 17 00:00:00 2001 From: jackofallops Date: Thu, 20 Feb 2020 14:43:47 +0000 Subject: [PATCH 269/498] Removed multipleAssignedIdentities test as ManagedServiceIdentityTypeSystemAssignedUserAssigned type removed --- .../tests/resource_arm_app_service_test.go | 59 ------------------- 1 file changed, 59 deletions(-) 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 51bdff0a42dcf..987973c6731bf 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 @@ -412,27 +412,6 @@ func TestAccAzureRMAppService_userAssignedIdentity(t *testing.T) { }) } -func TestAccAzureRMAppService_multipleAssignedIdentities(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_app_service", "test") - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMAppServiceDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMAppService_multipleAssignedIdentities(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMAppServiceExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "identity.0.type", "SystemAssigned, UserAssigned"), - resource.TestCheckResourceAttr(data.ResourceName, "identity.0.identity_ids.#", "1"), - resource.TestMatchResourceAttr(data.ResourceName, "identity.0.principal_id", validate.UUIDRegExp), - resource.TestMatchResourceAttr(data.ResourceName, "identity.0.tenant_id", validate.UUIDRegExp), - ), - }, - }, - }) -} - func TestAccAzureRMAppService_clientAffinityUpdate(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_app_service", "test") resource.ParallelTest(t, resource.TestCase{ @@ -2302,44 +2281,6 @@ resource "azurerm_app_service" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) } -func testAccAzureRMAppService_multipleAssignedIdentities(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_user_assigned_identity" "test" { - name = "acct-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" -} - -resource "azurerm_app_service_plan" "test" { - name = "acctestASP-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - tier = "Standard" - size = "S1" - } -} - -resource "azurerm_app_service" "test" { - name = "acctestAS-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - app_service_plan_id = "${azurerm_app_service_plan.test.id}" - - identity { - type = "SystemAssigned, UserAssigned" - identity_ids = ["${azurerm_user_assigned_identity.test.id}"] - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - func testAccAzureRMAppService_connectionStrings(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { From d38b7437dd080b7985f31b303c53f6c15d4570aa Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 20 Feb 2020 15:57:40 +0100 Subject: [PATCH 270/498] r/key_vault: moving the migration code closer to the package --- .../services/keyvault/resource_arm_key_vault_migration.go | 2 +- .../{tests => }/resource_arm_key_vault_migration_test.go | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) rename azurerm/internal/services/keyvault/{tests => }/resource_arm_key_vault_migration_test.go (98%) diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault_migration.go b/azurerm/internal/services/keyvault/resource_arm_key_vault_migration.go index 5e5930a0d2a4c..f3dff4890ebea 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault_migration.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault_migration.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" ) -func ResourceAzureRMKeyVaultMigrateState(v int, is *terraform.InstanceState, _ interface{}) (*terraform.InstanceState, error) { +func resourceAzureRMKeyVaultMigrateState(v int, is *terraform.InstanceState, _ interface{}) (*terraform.InstanceState, error) { switch v { case 0: log.Println("[INFO] Found AzureRM Key Vault State v0; migrating to v1") diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_migration_test.go b/azurerm/internal/services/keyvault/resource_arm_key_vault_migration_test.go similarity index 98% rename from azurerm/internal/services/keyvault/tests/resource_arm_key_vault_migration_test.go rename to azurerm/internal/services/keyvault/resource_arm_key_vault_migration_test.go index 97a6998d2bf2c..34b92ff2b0b83 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_migration_test.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault_migration_test.go @@ -1,14 +1,13 @@ -package tests +package keyvault import ( "reflect" "testing" "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/keyvault" ) -func TestAzureRMKeyVaultMigrateState(t *testing.T) { +func TestKeyVaultMigrateState(t *testing.T) { cases := map[string]struct { StateVersion int ID string @@ -366,7 +365,7 @@ func TestAzureRMKeyVaultMigrateState(t *testing.T) { ID: tc.ID, Attributes: tc.Attributes, } - is, err := keyvault.ResourceAzureRMKeyVaultMigrateState(tc.StateVersion, is, tc.Meta) + is, err := resourceAzureRMKeyVaultMigrateState(tc.StateVersion, is, tc.Meta) if err != nil { t.Fatalf("bad: %q, err: %+v", tn, err) From 0f38724525d7e7e892e17e03ba0447ffc7828ac7 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Thu, 20 Feb 2020 15:22:48 +0000 Subject: [PATCH 271/498] Missed removing virtual_network_name from function_app --- azurerm/internal/services/web/resource_arm_function_app.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/azurerm/internal/services/web/resource_arm_function_app.go b/azurerm/internal/services/web/resource_arm_function_app.go index f4f60beb73781..4e0b4ba4ae474 100644 --- a/azurerm/internal/services/web/resource_arm_function_app.go +++ b/azurerm/internal/services/web/resource_arm_function_app.go @@ -740,10 +740,6 @@ func expandFunctionAppSiteConfig(d *schema.ResourceData) (web.SiteConfig, error) siteConfig.Cors = &expand } - if v, ok := config["virtual_network_name"]; ok { - siteConfig.VnetName = utils.String(v.(string)) - } - if v, ok := config["http2_enabled"]; ok { siteConfig.HTTP20Enabled = utils.Bool(v.(bool)) } From 0cf61d55faeaa31f2fbda3bacab13353745e4a1e Mon Sep 17 00:00:00 2001 From: jackofallops Date: Thu, 20 Feb 2020 15:29:26 +0000 Subject: [PATCH 272/498] Missed removing virtual_network_name from function_app again --- azurerm/internal/services/web/resource_arm_function_app.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/azurerm/internal/services/web/resource_arm_function_app.go b/azurerm/internal/services/web/resource_arm_function_app.go index 4e0b4ba4ae474..8c18cf67b4cb2 100644 --- a/azurerm/internal/services/web/resource_arm_function_app.go +++ b/azurerm/internal/services/web/resource_arm_function_app.go @@ -789,10 +789,6 @@ func flattenFunctionAppSiteConfig(input *web.SiteConfig) []interface{} { result["linux_fx_version"] = *input.LinuxFxVersion } - if input.VnetName != nil { - result["virtual_network_name"] = *input.VnetName - } - if input.HTTP20Enabled != nil { result["http2_enabled"] = *input.HTTP20Enabled } From d88909c57f39bd3db412804d7be7a4fbaf53edc4 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Thu, 20 Feb 2020 15:40:22 +0000 Subject: [PATCH 273/498] missed ip to cidr change --- .../services/web/tests/resource_arm_app_service_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 987973c6731bf..52eddf14ec153 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 @@ -2500,7 +2500,7 @@ resource "azurerm_app_service" "test" { site_config { ip_restriction { - ip_address = "10.10.10.10" + ip_address = "10.10.10.10/32" } } } From 1b97f34a8ca33ed9690d79691a92452edbb5812e Mon Sep 17 00:00:00 2001 From: jackofallops Date: Thu, 20 Feb 2020 16:10:00 +0000 Subject: [PATCH 274/498] nil pointer fix and others --- azurerm/helpers/azure/app_service.go | 9 +++++---- .../internal/services/web/resource_arm_function_app.go | 8 ++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/azurerm/helpers/azure/app_service.go b/azurerm/helpers/azure/app_service.go index 0bab4cf91ce3c..0cd460d6a840c 100644 --- a/azurerm/helpers/azure/app_service.go +++ b/azurerm/helpers/azure/app_service.go @@ -1548,11 +1548,12 @@ func FlattenAppServiceSiteConfig(input *web.SiteConfig) []interface{} { for _, v := range *vs { block := make(map[string]interface{}) - if ip := v.IPAddress; *ip == "Any" { - continue - } if ip := v.IPAddress; ip != nil { - block["ip_address"] = *ip + if *ip == "Any" { + continue + } else { + block["ip_address"] = *ip + } } if vNetSubnetID := v.VnetSubnetResourceID; vNetSubnetID != nil { block["virtual_network_subnet_id"] = *vNetSubnetID diff --git a/azurerm/internal/services/web/resource_arm_function_app.go b/azurerm/internal/services/web/resource_arm_function_app.go index 8c18cf67b4cb2..517f1bc39d072 100644 --- a/azurerm/internal/services/web/resource_arm_function_app.go +++ b/azurerm/internal/services/web/resource_arm_function_app.go @@ -843,6 +843,10 @@ func expandFunctionAppIpRestriction(input interface{}) ([]web.IPSecurityRestrict } ipSecurityRestriction := web.IPSecurityRestriction{} + if ipAddress == "Any" { + continue + } + if ipAddress != "" { ipSecurityRestriction.IPAddress = &ipAddress } @@ -900,6 +904,10 @@ func flattenFunctionAppIpRestriction(input *[]web.IPSecurityRestriction) []inter for _, v := range *input { ipAddress := "" + if *v.IPAddress == "Any" { + continue + } + if v.IPAddress != nil { ipAddress = *v.IPAddress } From 73f5751975e90b1d1f09ea5884e45398378c7fa1 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Thu, 20 Feb 2020 16:24:37 +0000 Subject: [PATCH 275/498] nil pointer fix --- azurerm/internal/services/web/resource_arm_function_app.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/azurerm/internal/services/web/resource_arm_function_app.go b/azurerm/internal/services/web/resource_arm_function_app.go index 517f1bc39d072..9bc97724772d5 100644 --- a/azurerm/internal/services/web/resource_arm_function_app.go +++ b/azurerm/internal/services/web/resource_arm_function_app.go @@ -904,12 +904,11 @@ func flattenFunctionAppIpRestriction(input *[]web.IPSecurityRestriction) []inter for _, v := range *input { ipAddress := "" - if *v.IPAddress == "Any" { - continue - } - if v.IPAddress != nil { ipAddress = *v.IPAddress + if ipAddress == "Any" { + continue + } } subnetId := "" From 5c5ae7eebfa4c9e3caf8b895d193644b9f40e2dd Mon Sep 17 00:00:00 2001 From: jackofallops Date: Thu, 20 Feb 2020 16:35:21 +0000 Subject: [PATCH 276/498] Removed redundant test and config --- .../resource_arm_app_service_slot_test.go | 140 ------------------ 1 file changed, 140 deletions(-) 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 b0f84bf88ce8f..175ea8f42757b 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 @@ -870,32 +870,6 @@ func TestAccAzureRMAppServiceSlot_remoteDebugging(t *testing.T) { }) } -func TestAccAzureRMAppServiceSlot_virtualNetwork(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_app_service_slot", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMAppServiceSlotDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMAppServiceSlot_virtualNetwork(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMAppServiceSlotExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.virtual_network_name", fmt.Sprintf("acctestvn-%d", data.RandomInteger)), - ), - }, - { - Config: testAccAzureRMAppServiceSlot_virtualNetworkUpdated(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMAppServiceSlotExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "site_config.0.virtual_network_name", fmt.Sprintf("acctestvn2-%d", data.RandomInteger)), - ), - }, - }, - }) -} - func TestAccAzureRMAppServiceSlot_windowsDotNet2(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_app_service_slot", "test") @@ -3037,120 +3011,6 @@ resource "azurerm_app_service_slot" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) } -func testAccAzureRMAppServiceSlot_virtualNetwork(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - subnet { - name = "internal" - address_prefix = "10.0.1.0/24" - } -} - -resource "azurerm_app_service_plan" "test" { - name = "acctestASP-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - tier = "Standard" - size = "S1" - } -} - -resource "azurerm_app_service" "test" { - name = "acctestAS-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - app_service_plan_id = "${azurerm_app_service_plan.test.id}" -} - -resource "azurerm_app_service_slot" "test" { - name = "acctestASSlot-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - app_service_plan_id = "${azurerm_app_service_plan.test.id}" - app_service_name = "${azurerm_app_service.test.name}" - - site_config { - virtual_network_name = "${azurerm_virtual_network.test.name}" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - -func testAccAzureRMAppServiceSlot_virtualNetworkUpdated(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - subnet { - name = "internal" - address_prefix = "10.0.1.0/24" - } -} - -resource "azurerm_virtual_network" "second" { - name = "acctestvn2-%d" - address_space = ["172.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - subnet { - name = "internal" - address_prefix = "172.0.1.0/24" - } -} - -resource "azurerm_app_service_plan" "test" { - name = "acctestASP-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - tier = "Standard" - size = "S1" - } -} - -resource "azurerm_app_service" "test" { - name = "acctestAS-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - app_service_plan_id = "${azurerm_app_service_plan.test.id}" -} - -resource "azurerm_app_service_slot" "test" { - name = "acctestASSlot-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - app_service_plan_id = "${azurerm_app_service_plan.test.id}" - app_service_name = "${azurerm_app_service.test.name}" - - site_config { - virtual_network_name = "${azurerm_virtual_network.second.name}" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - func testAccAzureRMAppServiceSlot_windowsDotNet(data acceptance.TestData, version string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { From dac47937cd7b5f4d43207fb1c97b141df5938bd4 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Thu, 20 Feb 2020 16:36:38 +0000 Subject: [PATCH 277/498] Removed another redundant test and config --- .../resource_arm_app_service_slot_test.go | 68 ------------------- 1 file changed, 68 deletions(-) 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 175ea8f42757b..7b080a2d8af27 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 @@ -957,28 +957,6 @@ func TestAccAzureRMAppServiceSlot_userAssignedIdentity(t *testing.T) { }) } -func TestAccAzureRMAppServiceSlot_multipleAssignedIdentities(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_app_service_slot", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMAppServiceSlotDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMAppServiceSlot_multipleAssignedIdentities(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMAppServiceSlotExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "identity.0.type", "SystemAssigned, UserAssigned"), - resource.TestCheckResourceAttr(data.ResourceName, "identity.0.identity_ids.#", "1"), - resource.TestMatchResourceAttr(data.ResourceName, "identity.0.principal_id", validate.UUIDRegExp), - resource.TestMatchResourceAttr(data.ResourceName, "identity.0.tenant_id", validate.UUIDRegExp), - ), - }, - }, - }) -} - func TestAccAzureRMAppServiceSlot_windowsDotNetUpdate(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_app_service_slot", "test") @@ -3293,52 +3271,6 @@ resource "azurerm_app_service_slot" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) } -func testAccAzureRMAppServiceSlot_multipleAssignedIdentities(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_user_assigned_identity" "test" { - name = "acct-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" -} - -resource "azurerm_app_service_plan" "test" { - name = "acctestASP-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - tier = "Standard" - size = "S1" - } -} - -resource "azurerm_app_service" "test" { - name = "acctestAS-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - app_service_plan_id = "${azurerm_app_service_plan.test.id}" -} - -resource "azurerm_app_service_slot" "test" { - name = "acctestASSlot-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - app_service_plan_id = "${azurerm_app_service_plan.test.id}" - app_service_name = "${azurerm_app_service.test.name}" - - identity { - type = "SystemAssigned, UserAssigned" - identity_ids = ["${azurerm_user_assigned_identity.test.id}"] - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - func testAccAzureRMAppServiceSlot_minTls(data acceptance.TestData, tlsVersion string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { From 125a9515b69c11c6a27f43189b1bb1b480817b2e Mon Sep 17 00:00:00 2001 From: jackofallops Date: Thu, 20 Feb 2020 16:57:45 +0000 Subject: [PATCH 278/498] More test fixes --- .../web/tests/resource_arm_app_service_certificate_test.go | 2 +- .../services/web/tests/resource_arm_app_service_test.go | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/azurerm/internal/services/web/tests/resource_arm_app_service_certificate_test.go b/azurerm/internal/services/web/tests/resource_arm_app_service_certificate_test.go index 813d1cbb809f3..e57c0907c6aef 100644 --- a/azurerm/internal/services/web/tests/resource_arm_app_service_certificate_test.go +++ b/azurerm/internal/services/web/tests/resource_arm_app_service_certificate_test.go @@ -126,7 +126,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = data.azurerm_client_config.test.tenant_id - object_id = data.azurerm_client_config.test.service_principal_object_id + object_id = data.azurerm_client_config.test.object_id secret_permissions = ["delete", "get", "set"] certificate_permissions = ["create", "delete", "get", "import"] } 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 52eddf14ec153..bd93bcaab795d 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 @@ -2064,7 +2064,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "example" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } @@ -2376,7 +2375,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "acctestcontainer" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" } @@ -2437,7 +2435,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "acctestcontainer" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" } From 586901dc78b39e0b23d31e8da8136a79e4dbeae0 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 20 Feb 2020 20:09:51 +0100 Subject: [PATCH 279/498] r/key_vault: handling conditionally updating the key vault resource --- azurerm/helpers/azure/key_vault.go | 45 -- azurerm/internal/features/user_flags.go | 2 +- azurerm/internal/provider/features.go | 26 +- azurerm/internal/provider/features_test.go | 38 +- .../keyvault/resource_arm_key_vault.go | 445 ++++++++++++------ .../tests/data_source_key_vault_test.go | 8 +- .../tests/resource_arm_key_vault_test.go | 306 +++++++++++- 7 files changed, 619 insertions(+), 251 deletions(-) diff --git a/azurerm/helpers/azure/key_vault.go b/azurerm/helpers/azure/key_vault.go index f75368e5d2374..7957380bb5946 100644 --- a/azurerm/helpers/azure/key_vault.go +++ b/azurerm/helpers/azure/key_vault.go @@ -3,10 +3,8 @@ package azure import ( "context" "fmt" - "time" "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2018-02-14/keyvault" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -120,46 +118,3 @@ func KeyVaultExists(ctx context.Context, client *keyvault.VaultsClient, keyVault return true, nil } - -func KeyVaultCustomizeDiff(d *schema.ResourceDiff, _ interface{}) error { - if d.HasChange("soft_delete_enabled") { - if old, new := d.GetChange("soft_delete_enabled"); old.(bool) && !new.(bool) { - return fmt.Errorf("the property 'soft_delete_enabled' cannot be set to false, enabling the soft delete for a vault is an irreversible action") - } - } - - if d.HasChange("purge_protection_enabled") { - if old, new := d.GetChange("purge_protection_enabled"); old.(bool) && !new.(bool) { - return fmt.Errorf("the property 'purge_protection_enabled' cannot be set to false, enabling the purge protection for a vault is an irreversible action") - } - } - - return nil -} - -func KeyVaultGetSoftDeletedState(ctx context.Context, client *keyvault.VaultsClient, name string, location string) (deleteDate interface{}, purgeDate interface{}, err error) { - softDel, err := client.GetDeleted(ctx, name, location) - if err != nil { - return nil, nil, fmt.Errorf("unable to get soft delete state information: %+v", err) - } - - // the logic is this way because the GetDeleted call will return an existing key vault - // that is not soft deleted, but the Deleted Vault properties will be nil - if props := softDel.Properties; props != nil { - var delDate interface{} - var purgeDate interface{} - - if dd := props.DeletionDate; dd != nil { - delDate = (*dd).Format(time.RFC3339) - } - if pg := props.ScheduledPurgeDate; pg != nil { - purgeDate = (*pg).Format(time.RFC3339) - } - if delDate != nil && purgeDate != nil { - return delDate, purgeDate, nil - } - } - - // this means we found an existing key vault that is not soft deleted - return nil, nil, nil -} diff --git a/azurerm/internal/features/user_flags.go b/azurerm/internal/features/user_flags.go index 834b6bc903c37..93407b225c2ed 100644 --- a/azurerm/internal/features/user_flags.go +++ b/azurerm/internal/features/user_flags.go @@ -15,5 +15,5 @@ type VirtualMachineScaleSetFeatures struct { } type KeyVaultFeatures struct { - PurgeSoftDeleteOnDestroy bool + RecoverSoftDeletedKeyVaults bool } diff --git a/azurerm/internal/provider/features.go b/azurerm/internal/provider/features.go index 8e26707224973..c0ea99f52950b 100644 --- a/azurerm/internal/provider/features.go +++ b/azurerm/internal/provider/features.go @@ -8,6 +8,8 @@ import ( ) func schemaFeatures() *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": { Type: schema.TypeList, @@ -43,7 +45,7 @@ func schemaFeatures() *schema.Schema { MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ - "purge_soft_delete_on_destroy": { + "recover_soft_deleted_key_vaults": { Type: schema.TypeBool, Required: true, }, @@ -85,7 +87,7 @@ func expandFeatures(input []interface{}) features.UserFeatures { RollInstancesWhenRequired: true, }, KeyVault: features.KeyVaultFeatures{ - PurgeSoftDeleteOnDestroy: true, + RecoverSoftDeletedKeyVaults: true, }, } @@ -95,6 +97,16 @@ func expandFeatures(input []interface{}) features.UserFeatures { val := input[0].(map[string]interface{}) + if raw, ok := val["key_vault"]; ok { + items := raw.([]interface{}) + if len(items) > 0 { + keyVaultRaw := items[0].(map[string]interface{}) + if v, ok := keyVaultRaw["recover_soft_deleted_key_vaults"]; ok { + features.KeyVault.RecoverSoftDeletedKeyVaults = v.(bool) + } + } + } + if raw, ok := val["virtual_machine"]; ok { items := raw.([]interface{}) if len(items) > 0 { @@ -115,15 +127,5 @@ func expandFeatures(input []interface{}) features.UserFeatures { } } - if raw, ok := val["key_vault"]; ok { - items := raw.([]interface{}) - if len(items) > 0 { - keyVaultRaw := items[0].(map[string]interface{}) - if v, ok := keyVaultRaw["purge_soft_delete_on_destroy"]; ok { - features.KeyVault.PurgeSoftDeleteOnDestroy = v.(bool) - } - } - } - return features } diff --git a/azurerm/internal/provider/features_test.go b/azurerm/internal/provider/features_test.go index 41041e6d1e342..7d24f1bf07d3a 100644 --- a/azurerm/internal/provider/features_test.go +++ b/azurerm/internal/provider/features_test.go @@ -18,15 +18,15 @@ func TestExpandFeatures(t *testing.T) { Name: "Empty Block", Input: []interface{}{}, Expected: features.UserFeatures{ + KeyVault: features.KeyVaultFeatures{ + RecoverSoftDeletedKeyVaults: true, + }, VirtualMachine: features.VirtualMachineFeatures{ DeleteOSDiskOnDeletion: true, }, VirtualMachineScaleSet: features.VirtualMachineScaleSetFeatures{ RollInstancesWhenRequired: true, }, - KeyVault: features.KeyVaultFeatures{ - PurgeSoftDeleteOnDestroy: true, - }, }, }, { @@ -45,21 +45,22 @@ func TestExpandFeatures(t *testing.T) { }, "key_vault": []interface{}{ map[string]interface{}{ - "purge_soft_delete_on_destroy": true, + "purge_soft_delete_on_destroy": true, + "recover_soft_deleted_key_vaults": true, }, }, }, }, Expected: features.UserFeatures{ + KeyVault: features.KeyVaultFeatures{ + RecoverSoftDeletedKeyVaults: true, + }, VirtualMachine: features.VirtualMachineFeatures{ DeleteOSDiskOnDeletion: true, }, VirtualMachineScaleSet: features.VirtualMachineScaleSetFeatures{ RollInstancesWhenRequired: true, }, - KeyVault: features.KeyVaultFeatures{ - PurgeSoftDeleteOnDestroy: true, - }, }, }, { @@ -78,21 +79,22 @@ func TestExpandFeatures(t *testing.T) { }, "key_vault": []interface{}{ map[string]interface{}{ - "purge_soft_delete_on_destroy": false, + "purge_soft_delete_on_destroy": false, + "recover_soft_deleted_key_vaults": false, }, }, }, }, Expected: features.UserFeatures{ + KeyVault: features.KeyVaultFeatures{ + RecoverSoftDeletedKeyVaults: false, + }, VirtualMachine: features.VirtualMachineFeatures{ DeleteOSDiskOnDeletion: false, }, VirtualMachineScaleSet: features.VirtualMachineScaleSetFeatures{ RollInstancesWhenRequired: false, }, - KeyVault: features.KeyVaultFeatures{ - PurgeSoftDeleteOnDestroy: false, - }, }, }, } @@ -122,41 +124,41 @@ func TestExpandFeaturesKeyVault(t *testing.T) { }, Expected: features.UserFeatures{ KeyVault: features.KeyVaultFeatures{ - PurgeSoftDeleteOnDestroy: true, + RecoverSoftDeletedKeyVaults: true, }, }, }, { - Name: "Purge Soft Delete On Destroy Enabled", + Name: "Recover Soft Deleted Key Vaults Enabled", Input: []interface{}{ map[string]interface{}{ "key_vault": []interface{}{ map[string]interface{}{ - "purge_soft_delete_on_destroy": true, + "recover_soft_deleted_key_vaults": true, }, }, }, }, Expected: features.UserFeatures{ KeyVault: features.KeyVaultFeatures{ - PurgeSoftDeleteOnDestroy: true, + RecoverSoftDeletedKeyVaults: true, }, }, }, { - Name: "Purge Soft Delete On Destroy Disabled", + Name: "Recover Soft Deleted Key Vaults Disabled", Input: []interface{}{ map[string]interface{}{ "key_vault": []interface{}{ map[string]interface{}{ - "purge_soft_delete_on_destroy": false, + "recover_soft_deleted_key_vaults": false, }, }, }, }, Expected: features.UserFeatures{ KeyVault: features.KeyVaultFeatures{ - PurgeSoftDeleteOnDestroy: false, + RecoverSoftDeletedKeyVaults: false, }, }, }, diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault.go b/azurerm/internal/services/keyvault/resource_arm_key_vault.go index 12f99756cbb34..2a878c12f6e86 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault.go @@ -19,7 +19,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/set" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/locks" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" @@ -35,16 +34,16 @@ var keyVaultResourceName = "azurerm_key_vault" func resourceArmKeyVault() *schema.Resource { return &schema.Resource{ - Create: resourceArmKeyVaultCreateUpdate, + Create: resourceArmKeyVaultCreate, Read: resourceArmKeyVaultRead, - Update: resourceArmKeyVaultCreateUpdate, + Update: resourceArmKeyVaultUpdate, Delete: resourceArmKeyVaultDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, }, - MigrateState: ResourceAzureRMKeyVaultMigrateState, + MigrateState: resourceAzureRMKeyVaultMigrateState, SchemaVersion: 1, Timeouts: &schema.ResourceTimeout{ @@ -75,11 +74,6 @@ func resourceArmKeyVault() *schema.Resource { }, false), }, - "vault_uri": { - Type: schema.TypeString, - Computed: true, - }, - "tenant_id": { Type: schema.TypeString, Required: true, @@ -182,68 +176,76 @@ func resourceArmKeyVault() *schema.Resource { }, "tags": tags.Schema(), - }, - CustomizeDiff: azure.KeyVaultCustomizeDiff, + // Computed + "vault_uri": { + Type: schema.TypeString, + Computed: true, + }, + }, } } -func resourceArmKeyVaultCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceArmKeyVaultCreate(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).KeyVault.VaultsClient - ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) + ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) defer cancel() - log.Printf("[INFO] preparing arguments for Azure ARM KeyVault creation.") - name := d.Get("name").(string) resourceGroup := d.Get("resource_group_name").(string) - purgeProtectionEnabled := d.Get("purge_protection_enabled").(bool) + location := azure.NormalizeLocation(d.Get("location").(string)) - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, resourceGroup, name) - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing Key Vault %q (Resource Group %q): %s", name, resourceGroup, err) - } - } + // Locking this resource so we don't make modifications to it at the same time if there is a + // key vault access policy trying to update it as well + locks.ByName(name, keyVaultResourceName) + defer locks.UnlockByName(name, keyVaultResourceName) - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_key_vault", *existing.ID) + // check for the presence of an existing, live one which should be imported into the state + existing, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if !utils.ResponseWasNotFound(existing.Response) { + return fmt.Errorf("Error checking for presence of existing Key Vault %q (Resource Group %q): %s", name, resourceGroup, err) } } + if existing.ID != nil && *existing.ID != "" { + return tf.ImportAsExistsError("azurerm_key_vault", *existing.ID) + } + // before creating check to see if the key vault exists in the soft delete state - location := azure.NormalizeLocation(d.Get("location").(string)) - delDate, purgeDate, err := azure.KeyVaultGetSoftDeletedState(ctx, client, name, location) - if err == nil { - if delDate != nil && purgeDate != nil { - return fmt.Errorf("unable to create Key Vault %q (Resource Group %q) becauese it already exists in the soft delete state. The key vault was soft deleted on %s and is scheduled to be purged on %s, please use the Azure CLI tool to recover this Key Vault", name, resourceGroup, delDate.(string), purgeDate.(string)) + softDeletedKeyVault, err := client.GetDeleted(ctx, name, location) + if err != nil { + if !utils.ResponseWasNotFound(softDeletedKeyVault.Response) { + return fmt.Errorf("Error checking for the presence of an existing Soft-Deleted Key Vault %q (Location %q): %+v", name, location, err) } - return fmt.Errorf("unable to create Key Vault %q (Resource Group %q) becauese it already exists", name, resourceGroup) } - // check to see if they enabled purge protection and purge on destroy - if purgeProtectionEnabled && meta.(*clients.Client).Features.KeyVault.PurgeSoftDeleteOnDestroy { - return fmt.Errorf("conflicting properties 'purge_protection_enabled' and 'purge_soft_delete_on_destroy' are both enabled for Key Vault %q (Resource Group %q). Please disable one of these paroperties and re-apply", name, resourceGroup) + // if so, does the user want us to recover it? + recoverSoftDeletedKeyVault := false + if !utils.ResponseWasNotFound(softDeletedKeyVault.Response) { + if !meta.(*clients.Client).Features.KeyVault.RecoverSoftDeletedKeyVaults { + // this exists but the users opted out so they must import this it out-of-band + return fmt.Errorf(optedOutOfRecoveringSoftDeletedKeyVaultErrorFmt(name, location)) + } + + recoverSoftDeletedKeyVault = true } tenantUUID := uuid.FromStringOrNil(d.Get("tenant_id").(string)) enabledForDeployment := d.Get("enabled_for_deployment").(bool) enabledForDiskEncryption := d.Get("enabled_for_disk_encryption").(bool) enabledForTemplateDeployment := d.Get("enabled_for_template_deployment").(bool) - softDeleteEnabled := d.Get("soft_delete_enabled").(bool) - t := d.Get("tags").(map[string]interface{}) - networkAclsRaw := d.Get("network_acls").([]interface{}) - networkAcls, subnetIds := expandKeyVaultNetworkAcls(networkAclsRaw) - policies := d.Get("access_policy").([]interface{}) accessPolicies, err := azure.ExpandKeyVaultAccessPolicies(policies) if err != nil { - return fmt.Errorf("Error expanding `access_policy`: %+v", policies) + return fmt.Errorf("Error expanding `access_policy`: %+v", err) } + networkAclsRaw := d.Get("network_acls").([]interface{}) + networkAcls, subnetIds := expandKeyVaultNetworkAcls(networkAclsRaw) + sku := keyvault.Sku{ Family: &armKeyVaultSkuFamily, Name: keyvault.SkuName(d.Get("sku_name").(string)), @@ -264,17 +266,16 @@ func resourceArmKeyVaultCreateUpdate(d *schema.ResourceData, meta interface{}) e } // This settings can only be set if it is true, if set when value is false API returns errors - if softDeleteEnabled { - parameters.Properties.EnableSoftDelete = &softDeleteEnabled + if softDeleteEnabled := d.Get("soft_delete_enabled").(bool); softDeleteEnabled { + parameters.Properties.EnableSoftDelete = utils.Bool(softDeleteEnabled) } - if purgeProtectionEnabled { - parameters.Properties.EnablePurgeProtection = &purgeProtectionEnabled + if purgeProtectionEnabled := d.Get("purge_protection_enabled").(bool); purgeProtectionEnabled { + parameters.Properties.EnablePurgeProtection = utils.Bool(purgeProtectionEnabled) } - // Locking this resource so we don't make modifications to it at the same time if there is a - // key vault access policy trying to update it as well - locks.ByName(name, keyVaultResourceName) - defer locks.UnlockByName(name, keyVaultResourceName) + if recoverSoftDeletedKeyVault { + parameters.Properties.CreateMode = keyvault.CreateModeRecover + } // also lock on the Virtual Network ID's since modifications in the networking stack are exclusive virtualNetworkNames := make([]string, 0) @@ -293,8 +294,8 @@ func resourceArmKeyVaultCreateUpdate(d *schema.ResourceData, meta interface{}) e locks.MultipleByName(&virtualNetworkNames, network.VirtualNetworkResourceName) defer locks.UnlockMultipleByName(&virtualNetworkNames, network.VirtualNetworkResourceName) - if _, err = client.CreateOrUpdate(ctx, resourceGroup, name, parameters); err != nil { - return fmt.Errorf("Error updating Key Vault %q (Resource Group %q): %+v", name, resourceGroup, err) + if _, err := client.CreateOrUpdate(ctx, resourceGroup, name, parameters); err != nil { + return fmt.Errorf("Error creating Key Vault %q (Resource Group %q): %+v", name, resourceGroup, err) } read, err := client.Get(ctx, resourceGroup, name) @@ -307,23 +308,21 @@ func resourceArmKeyVaultCreateUpdate(d *schema.ResourceData, meta interface{}) e d.SetId(*read.ID) - if d.IsNewResource() { - if props := read.Properties; props != nil { - if vault := props.VaultURI; vault != nil { - log.Printf("[DEBUG] Waiting for Key Vault %q (Resource Group %q) to become available", name, resourceGroup) - stateConf := &resource.StateChangeConf{ - Pending: []string{"pending"}, - Target: []string{"available"}, - Refresh: keyVaultRefreshFunc(*vault), - Delay: 30 * time.Second, - PollInterval: 10 * time.Second, - ContinuousTargetOccurence: 10, - Timeout: d.Timeout(schema.TimeoutCreate), - } + if props := read.Properties; props != nil { + if vault := props.VaultURI; vault != nil { + log.Printf("[DEBUG] Waiting for Key Vault %q (Resource Group %q) to become available", name, resourceGroup) + stateConf := &resource.StateChangeConf{ + Pending: []string{"pending"}, + Target: []string{"available"}, + Refresh: keyVaultRefreshFunc(*vault), + Delay: 30 * time.Second, + PollInterval: 10 * time.Second, + ContinuousTargetOccurence: 10, + Timeout: d.Timeout(schema.TimeoutCreate), + } - if _, err := stateConf.WaitForState(); err != nil { - return fmt.Errorf("Error waiting for Key Vault %q (Resource Group %q) to become available: %s", name, resourceGroup, err) - } + if _, err := stateConf.WaitForState(); err != nil { + return fmt.Errorf("Error waiting for Key Vault %q (Resource Group %q) to become available: %s", name, resourceGroup, err) } } } @@ -331,6 +330,179 @@ func resourceArmKeyVaultCreateUpdate(d *schema.ResourceData, meta interface{}) e return resourceArmKeyVaultRead(d, meta) } +func resourceArmKeyVaultUpdate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).KeyVault.VaultsClient + ctx, cancel := timeouts.ForUpdate(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := azure.ParseAzureResourceID(d.Id()) + if err != nil { + return err + } + resourceGroup := id.ResourceGroup + name := id.Path["vaults"] + + // Locking this resource so we don't make modifications to it at the same time if there is a + // key vault access policy trying to update it as well + locks.ByName(name, keyVaultResourceName) + defer locks.UnlockByName(name, keyVaultResourceName) + + d.Partial(true) + + // first pull the existing key vault since we need to lock on several bits of it's information + existing, err := client.Get(ctx, resourceGroup, name) + if err != nil { + return fmt.Errorf("Error retrieving Key Vault %q (Resource Group %q): %+v", name, resourceGroup, err) + } + if existing.Properties == nil { + return fmt.Errorf("Error retrieving Key Vault %q (Resource Group %q): `properties` was nil", name, resourceGroup) + } + + update := keyvault.VaultPatchParameters{} + + if d.HasChange("access_policy") { + if update.Properties == nil { + update.Properties = &keyvault.VaultPatchProperties{} + } + + policiesRaw := d.Get("access_policy").([]interface{}) + accessPolicies, err := azure.ExpandKeyVaultAccessPolicies(policiesRaw) + if err != nil { + return fmt.Errorf("Error expanding `access_policy`: %+v", err) + } + update.Properties.AccessPolicies = accessPolicies + } + + if d.HasChange("enabled_for_deployment") { + if update.Properties == nil { + update.Properties = &keyvault.VaultPatchProperties{} + } + + update.Properties.EnabledForDeployment = utils.Bool(d.Get("enabled_for_deployment").(bool)) + } + + if d.HasChange("enabled_for_disk_encryption") { + if update.Properties == nil { + update.Properties = &keyvault.VaultPatchProperties{} + } + + update.Properties.EnabledForDiskEncryption = utils.Bool(d.Get("enabled_for_disk_encryption").(bool)) + } + + if d.HasChange("enabled_for_template_deployment") { + if update.Properties == nil { + update.Properties = &keyvault.VaultPatchProperties{} + } + + update.Properties.EnabledForTemplateDeployment = utils.Bool(d.Get("enabled_for_template_deployment").(bool)) + } + + if d.HasChange("network_acls") { + if update.Properties == nil { + update.Properties = &keyvault.VaultPatchProperties{} + } + + networkAclsRaw := d.Get("network_acls").([]interface{}) + networkAcls, subnetIds := expandKeyVaultNetworkAcls(networkAclsRaw) + + // also lock on the Virtual Network ID's since modifications in the networking stack are exclusive + virtualNetworkNames := make([]string, 0) + for _, v := range subnetIds { + id, err2 := azure.ParseAzureResourceID(v) + if err2 != nil { + return err2 + } + + virtualNetworkName := id.Path["virtualNetworks"] + if !azure.SliceContainsValue(virtualNetworkNames, virtualNetworkName) { + virtualNetworkNames = append(virtualNetworkNames, virtualNetworkName) + } + } + + locks.MultipleByName(&virtualNetworkNames, network.VirtualNetworkResourceName) + defer locks.UnlockMultipleByName(&virtualNetworkNames, network.VirtualNetworkResourceName) + + update.Properties.NetworkAcls = networkAcls + } + + if d.HasChange("purge_protection_enabled") { + if update.Properties == nil { + update.Properties = &keyvault.VaultPatchProperties{} + } + + newValue := d.Get("purge_protection_enabled").(bool) + + // existing.Properties guaranteed non-nil above + oldValue := false + if existing.Properties.EnablePurgeProtection != nil { + oldValue = *existing.Properties.EnablePurgeProtection + } + + // whilst this should have got caught in the customizeDiff this won't work if that fields interpolated + // hence the double-checking here + if oldValue && !newValue { + return fmt.Errorf("Error updating Key Vault %q (Resource Group %q): once Purge Protection has been Enabled it's not possible to disable it", name, resourceGroup) + } + + update.Properties.EnablePurgeProtection = utils.Bool(newValue) + } + + if d.HasChange("sku_name") { + if update.Properties == nil { + update.Properties = &keyvault.VaultPatchProperties{} + } + + update.Properties.Sku = &keyvault.Sku{ + Family: &armKeyVaultSkuFamily, + Name: keyvault.SkuName(d.Get("sku_name").(string)), + } + } + + if d.HasChange("soft_delete_enabled") { + if update.Properties == nil { + update.Properties = &keyvault.VaultPatchProperties{} + } + + newValue := d.Get("soft_delete_enabled").(bool) + + // existing.Properties guaranteed non-nil above + oldValue := false + if existing.Properties.EnableSoftDelete != nil { + oldValue = *existing.Properties.EnableSoftDelete + } + + // whilst this should have got caught in the customizeDiff this won't work if that fields interpolated + // hence the double-checking here + if oldValue && !newValue { + return fmt.Errorf("Error updating Key Vault %q (Resource Group %q): once Soft Delete has been Enabled it's not possible to disable it", name, resourceGroup) + } + + update.Properties.EnableSoftDelete = utils.Bool(newValue) + } + + if d.HasChange("tenant_id") { + if update.Properties == nil { + update.Properties = &keyvault.VaultPatchProperties{} + } + + tenantUUID := uuid.FromStringOrNil(d.Get("tenant_id").(string)) + update.Properties.TenantID = &tenantUUID + } + + if d.HasChange("tags") { + t := d.Get("tags").(map[string]interface{}) + update.Tags = tags.Expand(t) + } + + if _, err := client.Update(ctx, resourceGroup, name, update); err != nil { + return fmt.Errorf("Error updating Key Vault %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + d.Partial(false) + + return resourceArmKeyVaultRead(d, meta) +} + func resourceArmKeyVaultRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).KeyVault.VaultsClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) @@ -413,14 +585,8 @@ func resourceArmKeyVaultDelete(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("Error retrieving Key Vault %q (Resource Group %q): %+v", name, resourceGroup, err) } - // Check to see if purge protection is enabled or not... - purgeProtectionEnabled := false - softDeleteEnabled := false - if ppe := read.Properties.EnablePurgeProtection; ppe != nil { - purgeProtectionEnabled = *ppe - } - if sde := read.Properties.EnableSoftDelete; sde != nil { - softDeleteEnabled = *sde + if read.Properties == nil { + return fmt.Errorf("Error retrieving Key Vault %q (Resource Group %q): `properties` was nil", name, resourceGroup) } // ensure we lock on the latest network names, to ensure we handle Azure's networking layer being limited to one change at a time @@ -457,80 +623,9 @@ func resourceArmKeyVaultDelete(d *schema.ResourceData, meta interface{}) error { } } - if meta.(*clients.Client).Features.KeyVault.PurgeSoftDeleteOnDestroy && softDeleteEnabled { - location := d.Get("location").(string) - - // raise an error if the key vault is in the soft delete state and purge protection is enabled - if purgeProtectionEnabled { - delDate, purgeDate, err := azure.KeyVaultGetSoftDeletedState(ctx, client, name, location) - if err == nil { - if delDate != nil && purgeDate != nil { - return fmt.Errorf("unable to purge Key Vault %q (Resource Group %q) because it has purge protection enabled. The key vault was soft deleted on %s and is scheduled to be purged on %s", name, resourceGroup, delDate.(string), purgeDate.(string)) - } - return fmt.Errorf("unable to purge Key Vault %q (Resource Group %q) because it has purge protection enabled", name, resourceGroup) - } - } - - log.Printf("[DEBUG] KeyVault %s marked for purge, executing purge", name) - future, err := client.PurgeDeleted(ctx, name, location) - if err != nil { - return err - } - - log.Printf("[DEBUG] Waiting for purge of KeyVault %s", name) - err = future.WaitForCompletionRef(ctx, client.Client) - if err != nil { - return fmt.Errorf("Error purging Key Vault %q (Resource Group %q): %+v", name, resourceGroup, err) - } - } - return nil } -func flattenKeyVaultNetworkAcls(input *keyvault.NetworkRuleSet) []interface{} { - if input == nil { - return []interface{}{ - map[string]interface{}{ - "bypass": string(keyvault.AzureServices), - "default_action": string(keyvault.Allow), - "ip_rules": schema.NewSet(schema.HashString, []interface{}{}), - "virtual_network_subnet_ids": schema.NewSet(schema.HashString, []interface{}{}), - }, - } - } - - output := make(map[string]interface{}) - - output["bypass"] = string(input.Bypass) - output["default_action"] = string(input.DefaultAction) - - ipRules := make([]interface{}, 0) - if input.IPRules != nil { - for _, v := range *input.IPRules { - if v.Value == nil { - continue - } - - ipRules = append(ipRules, *v.Value) - } - } - output["ip_rules"] = schema.NewSet(schema.HashString, ipRules) - - virtualNetworkRules := make([]interface{}, 0) - if input.VirtualNetworkRules != nil { - for _, v := range *input.VirtualNetworkRules { - if v.ID == nil { - continue - } - - virtualNetworkRules = append(virtualNetworkRules, *v.ID) - } - } - output["virtual_network_subnet_ids"] = schema.NewSet(schema.HashString, virtualNetworkRules) - - return []interface{}{output} -} - func keyVaultRefreshFunc(vaultUri string) resource.StateRefreshFunc { return func() (interface{}, string, error) { log.Printf("[DEBUG] Checking to see if KeyVault %q is available..", vaultUri) @@ -594,3 +689,63 @@ func expandKeyVaultNetworkAcls(input []interface{}) (*keyvault.NetworkRuleSet, [ } return &ruleSet, subnetIds } + +func flattenKeyVaultNetworkAcls(input *keyvault.NetworkRuleSet) []interface{} { + if input == nil { + return []interface{}{ + map[string]interface{}{ + "bypass": string(keyvault.AzureServices), + "default_action": string(keyvault.Allow), + "ip_rules": schema.NewSet(schema.HashString, []interface{}{}), + "virtual_network_subnet_ids": schema.NewSet(schema.HashString, []interface{}{}), + }, + } + } + + output := make(map[string]interface{}) + + output["bypass"] = string(input.Bypass) + output["default_action"] = string(input.DefaultAction) + + ipRules := make([]interface{}, 0) + if input.IPRules != nil { + for _, v := range *input.IPRules { + if v.Value == nil { + continue + } + + ipRules = append(ipRules, *v.Value) + } + } + output["ip_rules"] = schema.NewSet(schema.HashString, ipRules) + + virtualNetworkRules := make([]interface{}, 0) + if input.VirtualNetworkRules != nil { + for _, v := range *input.VirtualNetworkRules { + if v.ID == nil { + continue + } + + virtualNetworkRules = append(virtualNetworkRules, *v.ID) + } + } + output["virtual_network_subnet_ids"] = schema.NewSet(schema.HashString, virtualNetworkRules) + + return []interface{}{output} +} + +func optedOutOfRecoveringSoftDeletedKeyVaultErrorFmt(name, location string) string { + return fmt.Sprintf(` +An existing soft-deleted Key Vault exists with the Name %q in the location %q, however +automatically recovering this KeyVault has been disabled via the "features" block. + +Terraform can automatically recover the soft-deleted Key Vault when this behaviour is +enabled within the "features" block (located within the "provider" block) - more +information can be found here: + +https://www.terraform.io/docs/providers/azurerm/index.html#features + +Alternatively you can manually recover this (e.g. using the Azure CLI) and then import +this into Terraform via "terraform import", or pick a different name/location. +`, name, location) +} diff --git a/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go b/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go index c4efe633cb460..e96326fbc1ad5 100644 --- a/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go @@ -95,7 +95,7 @@ func TestAccDataSourceAzureRMKeyVault_softDelete(t *testing.T) { CheckDestroy: testCheckAzureRMKeyVaultDestroy, Steps: []resource.TestStep{ { - Config: testAccDataSourceAzureRMKeyVault_enable_soft_delete(data), + Config: testAccDataSourceAzureRMKeyVault_enableSoftDelete(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMKeyVaultExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "soft_delete_enabled", "true"), @@ -105,7 +105,7 @@ func TestAccDataSourceAzureRMKeyVault_softDelete(t *testing.T) { ), }, { - Config: testAccAzureRMKeyVault_softDeletePurge(data), + Config: testAccAzureRMKeyVault_softDeleteAbsent(data), }, }, }) @@ -147,8 +147,8 @@ data "azurerm_key_vault" "test" { `, r) } -func testAccDataSourceAzureRMKeyVault_enable_soft_delete(data acceptance.TestData) string { - r := testAccAzureRMKeyVault_softDelete(data) +func testAccDataSourceAzureRMKeyVault_enableSoftDelete(data acceptance.TestData) string { + r := testAccAzureRMKeyVault_softDelete(data, true) return fmt.Sprintf(` %s diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go index 48a3d1998e900..d357df9493c32 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go @@ -2,6 +2,7 @@ package tests import ( "fmt" + "regexp" "testing" "github.com/hashicorp/go-azure-helpers/response" @@ -234,7 +235,7 @@ func TestAccAzureRMKeyVault_justCert(t *testing.T) { }) } -func TestAccAzureRMKeyVault_softDelete(t *testing.T) { +func TestAccAzureRMKeyVault_softDeleteEnabled(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_key_vault", "test") resource.ParallelTest(t, resource.TestCase{ @@ -243,26 +244,233 @@ func TestAccAzureRMKeyVault_softDelete(t *testing.T) { CheckDestroy: testCheckAzureRMKeyVaultDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMKeyVault_softDelete(data), + Config: testAccAzureRMKeyVault_softDelete(data, true), Check: resource.ComposeTestCheckFunc( testCheckAzureRMKeyVaultExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "soft_delete_enabled", "true"), resource.TestCheckResourceAttr(data.ResourceName, "purge_protection_enabled", "false"), ), }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMKeyVault_softDeleteViaUpdate(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_key_vault", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMKeyVaultDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMKeyVault_softDelete(data, false), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKeyVaultExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "soft_delete_enabled", "false"), + resource.TestCheckResourceAttr(data.ResourceName, "purge_protection_enabled", "false"), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMKeyVault_softDelete(data, true), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKeyVaultExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "soft_delete_enabled", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "purge_protection_enabled", "false"), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMKeyVault_softDeleteAttemptToDisable(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_key_vault", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMKeyVaultDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMKeyVault_softDelete(data, true), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKeyVaultExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "soft_delete_enabled", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "purge_protection_enabled", "false"), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMKeyVault_softDelete(data, false), + ExpectError: regexp.MustCompile("once Soft Delete has been Enabled it's not possible to disable it"), + }, + }, + }) +} + +func TestAccAzureRMKeyVault_softDeleteRecovery(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_key_vault", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMKeyVaultDestroy, + Steps: []resource.TestStep{ { - Config: testAccAzureRMKeyVault_softDeletePurge(data), + // create it regularly + Config: testAccAzureRMKeyVault_softDelete(data, true), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKeyVaultExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "soft_delete_enabled", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "purge_protection_enabled", "false"), + ), + }, + data.ImportStep(), + { + // delete the key vault + Config: testAccAzureRMKeyVault_softDeleteAbsent(data), + }, + { + // attempting to re-create it requires recovery, which is enabled by default + Config: testAccAzureRMKeyVault_softDelete(data, true), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKeyVaultExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "soft_delete_enabled", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "purge_protection_enabled", "false"), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMKeyVault_softDeleteRecoveryDisabled(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_key_vault", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMKeyVaultDestroy, + Steps: []resource.TestStep{ + { + // create it regularly + Config: testAccAzureRMKeyVault_softDelete(data, true), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKeyVaultExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "soft_delete_enabled", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "purge_protection_enabled", "false"), + ), + }, + data.ImportStep(), + { + // delete the key vault + Config: testAccAzureRMKeyVault_softDeleteAbsent(data), + }, + { + // attempting to re-create it requires recovery, which is enabled by default + Config: testAccAzureRMKeyVault_softDeleteRecoveryDisabled(data), + ExpectError: regexp.MustCompile("An existing soft-deleted Key Vault exists with the Name"), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMKeyVault_purgeProtectionEnabled(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_key_vault", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMKeyVaultDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMKeyVault_purgeProtection(data, true), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKeyVaultExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "purge_protection_enabled", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "soft_delete_enabled", "false"), + ), }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMKeyVault_purgeProtectionAndSoftDeleteEnabled(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_key_vault", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMKeyVaultDestroy, + Steps: []resource.TestStep{ { - Config: testAccAzureRMKeyVault_softDelete(data), + Config: testAccAzureRMKeyVault_purgeProtectionAndSoftDelete(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMKeyVaultExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "purge_protection_enabled", "true"), resource.TestCheckResourceAttr(data.ResourceName, "soft_delete_enabled", "true"), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMKeyVault_purgeProtectionViaUpdate(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_key_vault", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMKeyVaultDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMKeyVault_purgeProtection(data, false), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKeyVaultExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "purge_protection_enabled", "false"), + resource.TestCheckResourceAttr(data.ResourceName, "soft_delete_enabled", "false"), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMKeyVault_purgeProtection(data, true), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKeyVaultExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "purge_protection_enabled", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "soft_delete_enabled", "false"), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMKeyVault_purgeProtectionAttemptToDisable(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_key_vault", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMKeyVaultDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMKeyVault_purgeProtection(data, true), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKeyVaultExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "purge_protection_enabled", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "soft_delete_enabled", "false"), ), }, + data.ImportStep(), { - Config: testAccAzureRMKeyVault_softDeletePurge(data), + Config: testAccAzureRMKeyVault_purgeProtection(data, false), + ExpectError: regexp.MustCompile("TODO"), // TODO: correct error message }, }, }) @@ -798,20 +1006,30 @@ access_policy { `, oid) } -func testAccAzureRMKeyVault_softDelete(data acceptance.TestData) string { +func testAccAzureRMKeyVault_purgeProtection(data acceptance.TestData, enabled bool) string { return fmt.Sprintf(` data "azurerm_client_config" "current" {} -provider "azurerm" { - alias = "keyVault" +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} - features { - key_vault { - purge_soft_delete_on_destroy = true - } - } +resource "azurerm_key_vault" "test" { + name = "vault%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + tenant_id = data.azurerm_client_config.current.tenant_id + sku_name = "premium" + purge_protection_enabled = %t +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, enabled) } +func testAccAzureRMKeyVault_softDelete(data acceptance.TestData, enabled bool) string { + return fmt.Sprintf(` +data "azurerm_client_config" "current" {} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -819,35 +1037,71 @@ resource "azurerm_resource_group" "test" { resource "azurerm_key_vault" "test" { name = "vault%d" - provider = azurerm.keyVault location = azurerm_resource_group.test.location resource_group_name = azurerm_resource_group.test.name tenant_id = data.azurerm_client_config.current.tenant_id - soft_delete_enabled = true - purge_protection_enabled = false - - sku_name = "premium" + sku_name = "premium" + soft_delete_enabled = %t } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, enabled) } -func testAccAzureRMKeyVault_softDeletePurge(data acceptance.TestData) string { +func testAccAzureRMKeyVault_softDeleteAbsent(data acceptance.TestData) string { return fmt.Sprintf(` data "azurerm_client_config" "current" {} -provider "azurerm" { - alias = "keyVault" +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} +`, data.RandomInteger, data.Locations.Primary) +} +func testAccAzureRMKeyVault_softDeleteRecoveryDisabled(data acceptance.TestData) string { + return fmt.Sprintf(` +provider "azurerm" { features { - key_vault { - purge_soft_delete_on_destroy = true - } + key_vault { + recover_soft_deleted_key_vaults = false + } } } +data "azurerm_client_config" "current" {} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" } -`, data.RandomInteger, data.Locations.Primary) + +resource "azurerm_key_vault" "test" { + name = "vault%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + tenant_id = data.azurerm_client_config.current.tenant_id + sku_name = "premium" + soft_delete_enabled = true +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) +} + +func testAccAzureRMKeyVault_purgeProtectionAndSoftDelete(data acceptance.TestData) string { + return fmt.Sprintf(` +data "azurerm_client_config" "current" {} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_key_vault" "test" { + name = "vault%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + tenant_id = data.azurerm_client_config.current.tenant_id + sku_name = "premium" + soft_delete_enabled = true + purge_protection_enabled = true +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } From 872de6b0f28797248c59ab70597f56beddac2970 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 20 Feb 2020 20:24:50 +0100 Subject: [PATCH 280/498] r/key_vault: updating the docs --- website/docs/r/key_vault.html.markdown | 33 +++++++++++--------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/website/docs/r/key_vault.html.markdown b/website/docs/r/key_vault.html.markdown index e929aea49f185..918591ba6da2d 100644 --- a/website/docs/r/key_vault.html.markdown +++ b/website/docs/r/key_vault.html.markdown @@ -10,21 +10,15 @@ description: |- Manages a Key Vault. -~> **NOTE:** It's possible to define Key Vault Access Policies both within [the `azurerm_key_vault` resource](key_vault.html) via the `access_policy` block and by using [the `azurerm_key_vault_access_policy` resource](key_vault_access_policy.html). However it's not possible to use both methods to manage Access Policies within a KeyVault, since there'll be conflicts. +## Disclaimers -## Example Usage +~> **Note:** It's possible to define Key Vault Access Policies both within [the `azurerm_key_vault` resource](key_vault.html) via the `access_policy` block and by using [the `azurerm_key_vault_access_policy` resource](key_vault_access_policy.html). However it's not possible to use both methods to manage Access Policies within a KeyVault, since there'll be conflicts. -```hcl -provider "azurerm" { - alias = "keyVault" +~> **Note:** Terraform will automatically recover a soft-deleted Key Vault during Creation if one is found - you can opt out of this using the `features` block within the Provider block. - features { - key_vault { - purge_soft_delete_on_destroy = true - } - } -} +## Example Usage +```hcl resource "azurerm_resource_group" "example" { name = "resourceGroup1" location = "West US" @@ -32,7 +26,6 @@ resource "azurerm_resource_group" "example" { resource "azurerm_key_vault" "example" { name = "testvault" - provider = azurerm.keyVault location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name enabled_for_disk_encryption = true @@ -84,6 +77,8 @@ The following arguments are supported: * `tenant_id` - (Required) The Azure Active Directory tenant ID that should be used for authenticating requests to the key vault. +--- + * `access_policy` - (Optional) [A list](/docs/configuration/attr-as-blocks.html) of up to 16 objects describing access policies, as described below. ~> **NOTE:** It's possible to define Key Vault Access Policies both within [the `azurerm_key_vault` resource](key_vault.html) via the `access_policy` block and by using [the `azurerm_key_vault_access_policy` resource](key_vault_access_policy.html). However it's not possible to use both methods to manage Access Policies within a KeyVault, since there'll be conflicts. @@ -94,15 +89,17 @@ The following arguments are supported: * `enabled_for_template_deployment` - (Optional) Boolean flag to specify whether Azure Resource Manager is permitted to retrieve secrets from the key vault. Defaults to `false`. -* `soft_delete_enabled` - (Optional) Should Soft Delete be enabled for this Key Vault? +* `network_acls` - (Optional) A `network_acls` block as defined below. + +* `purge_protection_enabled` - (Optional) Is Purge Protection enabled for this Key Vault? Defaults to `false`. --> **NOTE:** Once `soft_delete_enabled` has been enabled it is an **irreversible** action. If you want to destroy this key vault before the 90 day purge policy expires you must set the `purge_soft_delete_on_destroy` to **true** in the `key_vault` section of the azure provider `features` block. +!> **Note:** Once Purge Protection has been Enabled it's not possible to Disable it. Support for [disabling purge protection is being tracked in this Azure API issue](https://github.com/Azure/azure-rest-api-specs/issues/8075). -* `purge_protection_enabled` - (Optional) Is Purge Protection enabled for this Key Vault? +* `soft_delete_enabled` - (Optional) Should Soft Delete be enabled for this Key Vault? Defaults to `false`. --> **NOTE:** Once `purge_protection_enabled` has been enabled it is an **irreversible** action. - [support for this is being tracked in this Azure API issue](https://github.com/Azure/azure-rest-api-specs/issues/8075) +!> **Note:** Once Soft Delete has been Enabled it's not possible to Disable it. -* `network_acls` - (Optional) A `network_acls` block as defined below. +~> **Note:** Terraform will check when creating a Key Vault for a previous soft-deleted Key Vault and recover it if one exists. You can configure this behaviour using the `features` block within the `provider` block. * `tags` - (Optional) A mapping of tags to assign to the resource. @@ -110,8 +107,6 @@ The following arguments are supported: A `access_policy` block supports the following: -Elements of `access_policy` support: - * `tenant_id` - (Required) The Azure Active Directory tenant ID that should be used for authenticating requests to the key vault. Must match the `tenant_id` used above. * `object_id` - (Required) The object ID of a user, service principal or security group in the Azure Active Directory tenant for the vault. The object ID must be unique for the list of access policies. From d2cd2486124bb8a730460c25e0c8b6a6857d0315 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 20 Feb 2020 20:31:22 +0100 Subject: [PATCH 281/498] minor: committing some lingering test files --- azurerm/internal/provider/features_test.go | 2 -- website/docs/index.html.markdown | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/azurerm/internal/provider/features_test.go b/azurerm/internal/provider/features_test.go index 7d24f1bf07d3a..6cab40a7f8ece 100644 --- a/azurerm/internal/provider/features_test.go +++ b/azurerm/internal/provider/features_test.go @@ -45,7 +45,6 @@ func TestExpandFeatures(t *testing.T) { }, "key_vault": []interface{}{ map[string]interface{}{ - "purge_soft_delete_on_destroy": true, "recover_soft_deleted_key_vaults": true, }, }, @@ -79,7 +78,6 @@ func TestExpandFeatures(t *testing.T) { }, "key_vault": []interface{}{ map[string]interface{}{ - "purge_soft_delete_on_destroy": false, "recover_soft_deleted_key_vaults": false, }, }, diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown index cfe1ad0bbe97a..6e4282b964d21 100644 --- a/website/docs/index.html.markdown +++ b/website/docs/index.html.markdown @@ -163,9 +163,7 @@ The `features` block supports the following: The `key_vault` block supports the following: -* `purge_soft_delete_on_destroy` - (Optional) Should the `azurerm_key_vault` resource be permanently deleted (e.g. purged) when destroyed? Defaults to `true`. - -~> **Note:** When purge protection is enabled, a vault or an object in the deleted state cannot be purged until the retention period has passed. +* `recover_soft_deleted_key_vaults` - (Optional) Should the `azurerm_key_vault` resource recover a Key Vault which has previously been Soft Deleted? Defaults to `true`. --- From 31f5a73f2b0ec74f81dfd850c4eedc8c9b6a8673 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Thu, 20 Feb 2020 14:21:12 -0800 Subject: [PATCH 282/498] Start adding purge on destroy back in --- azurerm/internal/provider/features.go | 11 ++++++++++- website/docs/index.html.markdown | 6 +++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/provider/features.go b/azurerm/internal/provider/features.go index c0ea99f52950b..15d4f72c2276b 100644 --- a/azurerm/internal/provider/features.go +++ b/azurerm/internal/provider/features.go @@ -47,7 +47,12 @@ func schemaFeatures() *schema.Schema { Schema: map[string]*schema.Schema{ "recover_soft_deleted_key_vaults": { Type: schema.TypeBool, - Required: true, + Optional: true, + }, + + "purge_soft_delete_on_destroy": { + Type: schema.TypeBool, + Optional: true, }, }, }, @@ -88,6 +93,7 @@ func expandFeatures(input []interface{}) features.UserFeatures { }, KeyVault: features.KeyVaultFeatures{ RecoverSoftDeletedKeyVaults: true, + PurgeSoftDeleteOnDestroy: true, }, } @@ -104,6 +110,9 @@ func expandFeatures(input []interface{}) features.UserFeatures { if v, ok := keyVaultRaw["recover_soft_deleted_key_vaults"]; ok { features.KeyVault.RecoverSoftDeletedKeyVaults = v.(bool) } + if v, ok := keyVaultRaw["purge_soft_delete_on_destroy"]; ok { + features.KeyVault.RecoverSoftDeletedKeyVaults = v.(bool) + } } } diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown index 6e4282b964d21..7e01a4fd22a56 100644 --- a/website/docs/index.html.markdown +++ b/website/docs/index.html.markdown @@ -163,7 +163,11 @@ The `features` block supports the following: The `key_vault` block supports the following: -* `recover_soft_deleted_key_vaults` - (Optional) Should the `azurerm_key_vault` resource recover a Key Vault which has previously been Soft Deleted? Defaults to `true`. +* `recover_soft_deleted_key_vaults` - (Optional) Should the `azurerm_key_vault` resource recover a Key Vault which has previously been Soft Deleted? Defaults to `true`. + +* `purge_soft_delete_on_destroy` - (Optional) Should the `azurerm_key_vault` resource be permanently deleted (e.g. purged) when destroyed? Defaults to `true`. + +~> **Note:** When purge protection is enabled, a vault or an object in the deleted state cannot be purged until the retention period(90 days) has passed. --- From 50b2371c30102ce70eb0c06cfdac8fc706a7f51d Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Thu, 20 Feb 2020 14:27:38 -0800 Subject: [PATCH 283/498] Fix for #4868 --- .../services/eventhub/resource_arm_eventhub_namespace.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/azurerm/internal/services/eventhub/resource_arm_eventhub_namespace.go b/azurerm/internal/services/eventhub/resource_arm_eventhub_namespace.go index b3d11deabdd0c..5ae3bbfa2af61 100644 --- a/azurerm/internal/services/eventhub/resource_arm_eventhub_namespace.go +++ b/azurerm/internal/services/eventhub/resource_arm_eventhub_namespace.go @@ -103,9 +103,11 @@ func resourceArmEventHubNamespace() *schema.Resource { }, false), }, + // 128 limit per https://docs.microsoft.com/azure/event-hubs/event-hubs-quotas "virtual_network_rule": { Type: schema.TypeList, Optional: true, + MaxItems: 128, ConfigMode: schema.SchemaConfigModeAttr, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -127,10 +129,11 @@ func resourceArmEventHubNamespace() *schema.Resource { }, }, + // 128 limit per https://docs.microsoft.com/azure/event-hubs/event-hubs-quotas "ip_rule": { Type: schema.TypeList, Optional: true, - MaxItems: 1, + MaxItems: 128, ConfigMode: schema.SchemaConfigModeAttr, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ From 188fc6adc7da3c0b73fa30725665cde811fd8929 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Thu, 20 Feb 2020 14:35:16 -0800 Subject: [PATCH 284/498] allow_virtual_network_access defaults to true --- .../services/network/resource_arm_virtual_network_peering.go | 2 +- website/docs/guides/2.0-upgrade-guide.html.markdown | 4 ++++ website/docs/r/virtual_network_peering.html.markdown | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/network/resource_arm_virtual_network_peering.go b/azurerm/internal/services/network/resource_arm_virtual_network_peering.go index 43f796abd0890..d9d9dbc4fa5ea 100644 --- a/azurerm/internal/services/network/resource_arm_virtual_network_peering.go +++ b/azurerm/internal/services/network/resource_arm_virtual_network_peering.go @@ -63,7 +63,7 @@ func resourceArmVirtualNetworkPeering() *schema.Resource { "allow_virtual_network_access": { Type: schema.TypeBool, Optional: true, - Computed: true, + Default: true, }, "allow_forwarded_traffic": { diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index 026dc51329dc2..bb970827401d8 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -578,6 +578,10 @@ Splitting the Virtual Machine Scale Set resource in two allows us to both provid The existing `azurerm_virtual_machine_scale_set` Resource will continue to be available in it's current form, however it will eventually be deprecated and we recommend using the new resources going forward. +### Resource: `azurerm_virtual_network_peering` + +The `allow_virtual_network_access` field now defaults to true. + ### Resource: `azurerm_virtual_wan` The deprecated `security_provider_name` field will be removed, since this option is no longer supported by Azure. diff --git a/website/docs/r/virtual_network_peering.html.markdown b/website/docs/r/virtual_network_peering.html.markdown index 29c162ba9b6f3..072289202c76d 100644 --- a/website/docs/r/virtual_network_peering.html.markdown +++ b/website/docs/r/virtual_network_peering.html.markdown @@ -129,7 +129,7 @@ The following arguments are supported: * `allow_virtual_network_access` - (Optional) Controls if the VMs in the remote virtual network can access VMs in the local virtual network. Defaults to - false. + true. * `allow_forwarded_traffic` - (Optional) Controls if forwarded traffic from VMs in the remote virtual network is allowed. Defaults to false. From 49a51a7d90e6a586e8477452a182175b40d27d6e Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Thu, 20 Feb 2020 15:23:25 -0800 Subject: [PATCH 285/498] Test for blank path --- .../resource_arm_api_management_api_test.go | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_test.go index 858a33be0ca18..e80dbbb7a1a55 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_test.go @@ -77,6 +77,29 @@ func TestAccAzureRMApiManagementApi_wordRevision(t *testing.T) { }) } +func TestAccAzureRMApiManagementApi_blankPath(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_api_management_api", "test") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMApiManagementApiDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMApiManagementApi_blankPath(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMApiManagementApiExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "soap_pass_through", "false"), + resource.TestCheckResourceAttr(data.ResourceName, "is_current", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "is_online", "false"), + resource.TestCheckResourceAttr(data.ResourceName, "path", ""), + ), + }, + data.ImportStep(), + }, + }) +} + func TestAccAzureRMApiManagementApi_version(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api", "test") @@ -349,6 +372,23 @@ resource "azurerm_api_management_api" "test" { `, template, data.RandomInteger) } +func testAccAzureRMApiManagementApi_blankPath(data acceptance.TestData) string { + template := testAccAzureRMApiManagementApi_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_api_management_api" "test" { + name = "acctestapi-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = "${azurerm_api_management.test.name}" + display_name = "api1" + path = "" + protocols = ["https"] + revision = "1" +} +`, template, data.RandomInteger) +} + func testAccAzureRMApiManagementApi_wordRevision(data acceptance.TestData) string { template := testAccAzureRMApiManagementApi_template(data) return fmt.Sprintf(` From c48a5bef5b6b9f9eafa96b6ea62e65b06709c384 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Thu, 20 Feb 2020 17:11:27 -0800 Subject: [PATCH 286/498] Add test case and txt to 2.0 guide --- .../resource_arm_eventhub_namespace_test.go | 146 ++++++++++++++---- .../guides/2.0-upgrade-guide.html.markdown | 2 + 2 files changed, 119 insertions(+), 29 deletions(-) diff --git a/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_namespace_test.go b/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_namespace_test.go index 6a7a18f915390..3f830588499ad 100644 --- a/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_namespace_test.go +++ b/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_namespace_test.go @@ -116,6 +116,27 @@ func TestAccAzureRMEventHubNamespace_networkrule_vnet(t *testing.T) { }) } +func TestAccAzureRMEventHubNamespace_networkruleVnetIpRule(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_eventhub_namespace", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMEventHubNamespaceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMEventHubNamespace_networkruleVnetIpRule(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMEventHubNamespaceExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "network_rulesets.0.virtual_network_rule.#", "2"), + resource.TestCheckResourceAttr(data.ResourceName, "network_rulesets.0.ip_rule.#", "2"), + ), + }, + data.ImportStep(), + }, + }) +} + func TestAccAzureRMEventHubNamespace_readDefaultKeys(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_eventhub_namespace", "test") @@ -388,8 +409,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_eventhub_namespace" "test" { name = "acctesteventhubnamespace-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku = "Basic" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) @@ -401,10 +422,10 @@ func testAccAzureRMEventHubNamespace_requiresImport(data acceptance.TestData) st %s resource "azurerm_eventhub_namespace" "import" { - name = "${azurerm_eventhub_namespace.test.name}" - location = "${azurerm_eventhub_namespace.test.location}" - resource_group_name = "${azurerm_eventhub_namespace.test.resource_group_name}" - sku = "${azurerm_eventhub_namespace.test.sku}" + name = azurerm_eventhub_namespace.test.name + location = azurerm_eventhub_namespace.test.location + resource_group_name = azurerm_eventhub_namespace.test.resource_group_name + sku = azurerm_eventhub_namespace.test.sku } `, template) } @@ -418,8 +439,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_eventhub_namespace" "test" { name = "acctesteventhubnamespace-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku = "Standard" capacity = "2" } @@ -435,8 +456,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_eventhub_namespace" "test" { name = "acctesteventhubnamespace-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku = "Standard" capacity = "2" @@ -460,28 +481,28 @@ resource "azurerm_resource_group" "test" { resource "azurerm_virtual_network" "test" { name = "acctvn-%[1]d" address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name } resource "azurerm_subnet" "test" { name = "acctsub-%[1]d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name address_prefix = "10.0.2.0/24" } resource "azurerm_eventhub_namespace" "test" { name = "acctesteventhubnamespace-%[1]d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku = "Standard" capacity = "2" network_rulesets { default_action = "Deny" virtual_network_rule { - subnet_id = "${azurerm_subnet.test.id}" + subnet_id = azurerm_subnet.test.id ignore_missing_virtual_network_service_endpoint = true } @@ -490,6 +511,73 @@ resource "azurerm_eventhub_namespace" "test" { `, data.RandomInteger, data.Locations.Primary) } +func testAccAzureRMEventHubNamespace_networkruleVnetIpRule(data acceptance.TestData) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%[1]d" + location = "%[2]s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctvn1-%[1]d" + address_space = ["10.0.0.0/16"] + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name +} + +resource "azurerm_subnet" "test" { + name = "acctsub1-%[1]d" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name + address_prefix = "10.0.1.0/24" + service_endpoints = ["Microsoft.EventHub"] +} + +resource "azurerm_virtual_network" "test2" { + name = "acctvn2-%[1]d" + address_space = ["10.1.0.0/16"] + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name +} + +resource "azurerm_subnet" "test2" { + name = "acctsub2-%[1]d" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test2.name + address_prefix = "10.1.1.0/24" + service_endpoints = ["Microsoft.EventHub"] +} + +resource "azurerm_eventhub_namespace" "test" { + name = "acctesteventhubnamespace-%[1]d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + sku = "Standard" + capacity = "2" + + network_rulesets { + default_action = "Deny" + + virtual_network_rule { + subnet_id = azurerm_subnet.test.id + } + + virtual_network_rule { + subnet_id = azurerm_subnet.test2.id + } + + ip_rule { + ip_mask = "10.0.1.0/24" + } + + ip_rule { + ip_mask = "10.1.1.0/24" + } + } +} +`, data.RandomInteger, data.Locations.Primary) +} + func testAccAzureRMEventHubNamespaceNonStandardCasing(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { @@ -499,8 +587,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_eventhub_namespace" "test" { name = "acctesteventhubnamespace-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku = "basic" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) @@ -515,8 +603,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_eventhub_namespace" "test" { name = "acctesteventhubnamespace-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku = "Standard" capacity = "2" auto_inflate_enabled = true @@ -534,8 +622,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_eventhub_namespace" "test" { name = "acctesteventhubnamespace-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku = "Basic" tags = { @@ -554,8 +642,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_eventhub_namespace" "test" { name = "acctesteventhubnamespace-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku = "Basic" capacity = %d } @@ -571,8 +659,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_eventhub_namespace" "test" { name = "acctesteventhubnamespace-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku = "Standard" capacity = 1 auto_inflate_enabled = true @@ -590,8 +678,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_eventhub_namespace" "test" { name = "acctesteventhubnamespace-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku = "Standard" capacity = 1 auto_inflate_enabled = false diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index 026dc51329dc2..56d19acdf74e4 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -327,6 +327,8 @@ The deprecated `kafka_enabled` field will be removed, since this is no longer us The deprecated `location` field will be removed, since this is no longer used. +The `virtual_network_rule` and `ip_rule` fields in the `network_rulesets` block will have a hard limit of 128 items. + ### Resource: `azurerm_firewall` The deprecated `internal_public_ip_address_id` field in the `ip_configuration` block will be removed. This field has been replaced by the `public_ip_address_id` field in the `ip_configuration` block. From 70606d23b2ebd03b95abc8e726778f16228f2e1c Mon Sep 17 00:00:00 2001 From: Tracy P Holmes <12778804+tracypholmes@users.noreply.github.com> Date: Thu, 20 Feb 2020 20:30:01 -0600 Subject: [PATCH 287/498] dns - add parse ID and func (#5779) --- .../services/dns/parse/dns_a_record.go | 38 ++++++++ .../services/dns/parse/dns_a_record_test.go | 86 +++++++++++++++++++ .../services/dns/parse/dns_aaaa_record.go | 38 ++++++++ .../dns/parse/dns_aaaa_record_test.go | 86 +++++++++++++++++++ .../services/dns/parse/dns_caa_record.go | 38 ++++++++ .../services/dns/parse/dns_caa_record_test.go | 86 +++++++++++++++++++ .../services/dns/parse/dns_cname_record.go | 38 ++++++++ .../dns/parse/dns_cname_record_test.go | 86 +++++++++++++++++++ .../services/dns/parse/dns_mx_record.go | 38 ++++++++ .../services/dns/parse/dns_mx_record_test.go | 86 +++++++++++++++++++ .../services/dns/parse/dns_ns_record.go | 38 ++++++++ .../services/dns/parse/dns_ns_record_test.go | 86 +++++++++++++++++++ .../services/dns/parse/dns_ptr_record.go | 38 ++++++++ .../services/dns/parse/dns_ptr_record_test.go | 86 +++++++++++++++++++ .../services/dns/parse/dns_srv_record.go | 38 ++++++++ .../services/dns/parse/dns_srv_record_test.go | 86 +++++++++++++++++++ .../services/dns/parse/dns_txt_record.go | 38 ++++++++ .../services/dns/parse/dns_txt_record_test.go | 86 +++++++++++++++++++ .../internal/services/dns/parse/dns_zone.go | 33 +++++++ .../services/dns/parse/dns_zone_test.go | 73 ++++++++++++++++ .../services/dns/resource_arm_dns_a_record.go | 36 ++++---- .../dns/resource_arm_dns_aaaa_record.go | 37 ++++---- .../dns/resource_arm_dns_caa_record.go | 37 ++++---- .../dns/resource_arm_dns_cname_record.go | 37 ++++---- .../dns/resource_arm_dns_mx_record.go | 37 ++++---- .../dns/resource_arm_dns_ns_record.go | 36 ++++---- .../dns/resource_arm_dns_ptr_record.go | 35 ++++---- .../dns/resource_arm_dns_srv_record.go | 36 ++++---- .../dns/resource_arm_dns_txt_record.go | 36 ++++---- .../services/dns/resource_arm_dns_zone.go | 34 ++++---- .../tests/resource_arm_dns_a_record_test.go | 23 +++-- .../resource_arm_dns_aaaa_record_test.go | 23 +++-- .../tests/resource_arm_dns_caa_record_test.go | 23 +++-- .../resource_arm_dns_cname_record_test.go | 22 ++--- .../tests/resource_arm_dns_mx_record_test.go | 22 ++--- .../tests/resource_arm_dns_ns_record_test.go | 22 ++--- .../tests/resource_arm_dns_ptr_record_test.go | 22 ++--- .../tests/resource_arm_dns_srv_record_test.go | 22 ++--- .../tests/resource_arm_dns_txt_record_test.go | 22 ++--- .../dns/tests/resource_arm_dns_zone_test.go | 20 +++-- 40 files changed, 1493 insertions(+), 311 deletions(-) create mode 100644 azurerm/internal/services/dns/parse/dns_a_record.go create mode 100644 azurerm/internal/services/dns/parse/dns_a_record_test.go create mode 100644 azurerm/internal/services/dns/parse/dns_aaaa_record.go create mode 100644 azurerm/internal/services/dns/parse/dns_aaaa_record_test.go create mode 100644 azurerm/internal/services/dns/parse/dns_caa_record.go create mode 100644 azurerm/internal/services/dns/parse/dns_caa_record_test.go create mode 100644 azurerm/internal/services/dns/parse/dns_cname_record.go create mode 100644 azurerm/internal/services/dns/parse/dns_cname_record_test.go create mode 100644 azurerm/internal/services/dns/parse/dns_mx_record.go create mode 100644 azurerm/internal/services/dns/parse/dns_mx_record_test.go create mode 100644 azurerm/internal/services/dns/parse/dns_ns_record.go create mode 100644 azurerm/internal/services/dns/parse/dns_ns_record_test.go create mode 100644 azurerm/internal/services/dns/parse/dns_ptr_record.go create mode 100644 azurerm/internal/services/dns/parse/dns_ptr_record_test.go create mode 100644 azurerm/internal/services/dns/parse/dns_srv_record.go create mode 100644 azurerm/internal/services/dns/parse/dns_srv_record_test.go create mode 100644 azurerm/internal/services/dns/parse/dns_txt_record.go create mode 100644 azurerm/internal/services/dns/parse/dns_txt_record_test.go create mode 100644 azurerm/internal/services/dns/parse/dns_zone.go create mode 100644 azurerm/internal/services/dns/parse/dns_zone_test.go diff --git a/azurerm/internal/services/dns/parse/dns_a_record.go b/azurerm/internal/services/dns/parse/dns_a_record.go new file mode 100644 index 0000000000000..dd85593c276ff --- /dev/null +++ b/azurerm/internal/services/dns/parse/dns_a_record.go @@ -0,0 +1,38 @@ +package parse + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type DnsARecordId struct { + ResourceGroup string + ZoneName string + Name string +} + +func DnsARecordID(input string) (*DnsARecordId, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("[ERROR] Unable to parse DNS A Record ID %q: %+v", input, err) + } + + record := DnsARecordId{ + ResourceGroup: id.ResourceGroup, + } + + if record.ZoneName, err = id.PopSegment("dnszones"); err != nil { + return nil, err + } + + if record.Name, err = id.PopSegment("A"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &record, nil +} diff --git a/azurerm/internal/services/dns/parse/dns_a_record_test.go b/azurerm/internal/services/dns/parse/dns_a_record_test.go new file mode 100644 index 0000000000000..cd48c1c806451 --- /dev/null +++ b/azurerm/internal/services/dns/parse/dns_a_record_test.go @@ -0,0 +1,86 @@ +package parse + +import ( + "testing" +) + +func TestDnsARecordId(t *testing.T) { + testData := []struct { + Name string + Input string + Expected *DnsARecordId + }{ + { + Name: "Empty", + Input: "", + Expected: nil, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Expected: nil, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Expected: nil, + }, + { + Name: "Resource Group ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", + Expected: nil, + }, + { + Name: "Missing DNS Zones Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/", + Expected: nil, + }, + { + Name: "DNS Zone ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1", + Expected: nil, + }, + { + Name: "Missing A Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/A/", + Expected: nil, + }, + { + Name: "DNS A Record ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/A/myrecord1", + Expected: &DnsARecordId{ + ResourceGroup: "resGroup1", + ZoneName: "zone1", + Name: "myrecord1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/a/myrecord1", + Expected: nil, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Name) + + actual, err := DnsARecordID(v.Input) + if err != nil { + if v.Expected == nil { + continue + } + + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.Name != v.Expected.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expected.Name, actual.Name) + } + if actual.ZoneName != v.Expected.ZoneName { + t.Fatalf("Expected %q but got %q for ZoneName", v.Expected.ZoneName, actual.ZoneName) + } + if actual.ResourceGroup != v.Expected.ResourceGroup { + t.Fatalf("Expected %q but got %q for Resource Group", v.Expected.ResourceGroup, actual.ResourceGroup) + } + } +} diff --git a/azurerm/internal/services/dns/parse/dns_aaaa_record.go b/azurerm/internal/services/dns/parse/dns_aaaa_record.go new file mode 100644 index 0000000000000..e9b7b1bb10a3d --- /dev/null +++ b/azurerm/internal/services/dns/parse/dns_aaaa_record.go @@ -0,0 +1,38 @@ +package parse + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type DnsAaaaRecordId struct { + ResourceGroup string + ZoneName string + Name string +} + +func DnsAaaaRecordID(input string) (*DnsAaaaRecordId, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("[ERROR] Unable to parse DNS AAAA Record ID %q: %+v", input, err) + } + + record := DnsAaaaRecordId{ + ResourceGroup: id.ResourceGroup, + } + + if record.ZoneName, err = id.PopSegment("dnszones"); err != nil { + return nil, err + } + + if record.Name, err = id.PopSegment("AAAA"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &record, nil +} diff --git a/azurerm/internal/services/dns/parse/dns_aaaa_record_test.go b/azurerm/internal/services/dns/parse/dns_aaaa_record_test.go new file mode 100644 index 0000000000000..36dc9458b744f --- /dev/null +++ b/azurerm/internal/services/dns/parse/dns_aaaa_record_test.go @@ -0,0 +1,86 @@ +package parse + +import ( + "testing" +) + +func TestDnsAAAARecordId(t *testing.T) { + testData := []struct { + Name string + Input string + Expected *DnsAaaaRecordId + }{ + { + Name: "Empty", + Input: "", + Expected: nil, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Expected: nil, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Expected: nil, + }, + { + Name: "Resource Group ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", + Expected: nil, + }, + { + Name: "Missing DNS Zones Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/", + Expected: nil, + }, + { + Name: "DNS Zone ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1", + Expected: nil, + }, + { + Name: "Missing AAAA Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/AAAA/", + Expected: nil, + }, + { + Name: "DNS AAAA Record ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/AAAA/myrecord1", + Expected: &DnsAaaaRecordId{ + ResourceGroup: "resGroup1", + ZoneName: "zone1", + Name: "myrecord1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/aaaa/myrecord1", + Expected: nil, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Name) + + actual, err := DnsAaaaRecordID(v.Input) + if err != nil { + if v.Expected == nil { + continue + } + + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.Name != v.Expected.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expected.Name, actual.Name) + } + if actual.ZoneName != v.Expected.ZoneName { + t.Fatalf("Expected %q but got %q for ZoneName", v.Expected.ZoneName, actual.ZoneName) + } + if actual.ResourceGroup != v.Expected.ResourceGroup { + t.Fatalf("Expected %q but got %q for Resource Group", v.Expected.ResourceGroup, actual.ResourceGroup) + } + } +} diff --git a/azurerm/internal/services/dns/parse/dns_caa_record.go b/azurerm/internal/services/dns/parse/dns_caa_record.go new file mode 100644 index 0000000000000..1ae6b4afc175f --- /dev/null +++ b/azurerm/internal/services/dns/parse/dns_caa_record.go @@ -0,0 +1,38 @@ +package parse + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type DnsCaaRecordId struct { + ResourceGroup string + ZoneName string + Name string +} + +func DnsCaaRecordID(input string) (*DnsCaaRecordId, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("[ERROR] Unable to parse DNS CAA Record ID %q: %+v", input, err) + } + + record := DnsCaaRecordId{ + ResourceGroup: id.ResourceGroup, + } + + if record.ZoneName, err = id.PopSegment("dnszones"); err != nil { + return nil, err + } + + if record.Name, err = id.PopSegment("CAA"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &record, nil +} diff --git a/azurerm/internal/services/dns/parse/dns_caa_record_test.go b/azurerm/internal/services/dns/parse/dns_caa_record_test.go new file mode 100644 index 0000000000000..0ee8c66689c73 --- /dev/null +++ b/azurerm/internal/services/dns/parse/dns_caa_record_test.go @@ -0,0 +1,86 @@ +package parse + +import ( + "testing" +) + +func TestDnsCaaRecordId(t *testing.T) { + testData := []struct { + Name string + Input string + Expected *DnsCaaRecordId + }{ + { + Name: "Empty", + Input: "", + Expected: nil, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Expected: nil, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Expected: nil, + }, + { + Name: "Resource Group ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", + Expected: nil, + }, + { + Name: "Missing DNS Zones Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/", + Expected: nil, + }, + { + Name: "DNS Zone ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1", + Expected: nil, + }, + { + Name: "Missing CAA Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/CAA/", + Expected: nil, + }, + { + Name: "DNS CAA Record ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/CAA/myrecord1", + Expected: &DnsCaaRecordId{ + ResourceGroup: "resGroup1", + ZoneName: "zone1", + Name: "myrecord1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/caa/myrecord1", + Expected: nil, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Name) + + actual, err := DnsCaaRecordID(v.Input) + if err != nil { + if v.Expected == nil { + continue + } + + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.Name != v.Expected.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expected.Name, actual.Name) + } + if actual.ZoneName != v.Expected.ZoneName { + t.Fatalf("Expected %q but got %q for ZoneName", v.Expected.ZoneName, actual.ZoneName) + } + if actual.ResourceGroup != v.Expected.ResourceGroup { + t.Fatalf("Expected %q but got %q for Resource Group", v.Expected.ResourceGroup, actual.ResourceGroup) + } + } +} diff --git a/azurerm/internal/services/dns/parse/dns_cname_record.go b/azurerm/internal/services/dns/parse/dns_cname_record.go new file mode 100644 index 0000000000000..f43d8c4ff0dc2 --- /dev/null +++ b/azurerm/internal/services/dns/parse/dns_cname_record.go @@ -0,0 +1,38 @@ +package parse + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type DnsCNameRecordId struct { + ResourceGroup string + ZoneName string + Name string +} + +func DnsCNameRecordID(input string) (*DnsCNameRecordId, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("[ERROR] Unable to parse DNS CNAME Record ID %q: %+v", input, err) + } + + record := DnsCNameRecordId{ + ResourceGroup: id.ResourceGroup, + } + + if record.ZoneName, err = id.PopSegment("dnszones"); err != nil { + return nil, err + } + + if record.Name, err = id.PopSegment("CNAME"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &record, nil +} diff --git a/azurerm/internal/services/dns/parse/dns_cname_record_test.go b/azurerm/internal/services/dns/parse/dns_cname_record_test.go new file mode 100644 index 0000000000000..b0f4d55157b8f --- /dev/null +++ b/azurerm/internal/services/dns/parse/dns_cname_record_test.go @@ -0,0 +1,86 @@ +package parse + +import ( + "testing" +) + +func TestDnsCNameRecordId(t *testing.T) { + testData := []struct { + Name string + Input string + Expected *DnsCNameRecordId + }{ + { + Name: "Empty", + Input: "", + Expected: nil, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Expected: nil, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Expected: nil, + }, + { + Name: "Resource Group ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", + Expected: nil, + }, + { + Name: "Missing DNS Zones Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/", + Expected: nil, + }, + { + Name: "DNS Zone ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1", + Expected: nil, + }, + { + Name: "Missing CNAME Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/CNAME/", + Expected: nil, + }, + { + Name: "DNS CNAME Record ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/CNAME/myrecord1", + Expected: &DnsCNameRecordId{ + ResourceGroup: "resGroup1", + ZoneName: "zone1", + Name: "myrecord1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/cname/myrecord1", + Expected: nil, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Name) + + actual, err := DnsCNameRecordID(v.Input) + if err != nil { + if v.Expected == nil { + continue + } + + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.Name != v.Expected.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expected.Name, actual.Name) + } + if actual.ZoneName != v.Expected.ZoneName { + t.Fatalf("Expected %q but got %q for ZoneName", v.Expected.ZoneName, actual.ZoneName) + } + if actual.ResourceGroup != v.Expected.ResourceGroup { + t.Fatalf("Expected %q but got %q for Resource Group", v.Expected.ResourceGroup, actual.ResourceGroup) + } + } +} diff --git a/azurerm/internal/services/dns/parse/dns_mx_record.go b/azurerm/internal/services/dns/parse/dns_mx_record.go new file mode 100644 index 0000000000000..17bb2798b541e --- /dev/null +++ b/azurerm/internal/services/dns/parse/dns_mx_record.go @@ -0,0 +1,38 @@ +package parse + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type DnsMxRecordId struct { + ResourceGroup string + ZoneName string + Name string +} + +func DnsMxRecordID(input string) (*DnsMxRecordId, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("[ERROR] Unable to parse DNS MX Record ID %q: %+v", input, err) + } + + record := DnsMxRecordId{ + ResourceGroup: id.ResourceGroup, + } + + if record.ZoneName, err = id.PopSegment("dnszones"); err != nil { + return nil, err + } + + if record.Name, err = id.PopSegment("MX"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &record, nil +} diff --git a/azurerm/internal/services/dns/parse/dns_mx_record_test.go b/azurerm/internal/services/dns/parse/dns_mx_record_test.go new file mode 100644 index 0000000000000..2b565b675c5dc --- /dev/null +++ b/azurerm/internal/services/dns/parse/dns_mx_record_test.go @@ -0,0 +1,86 @@ +package parse + +import ( + "testing" +) + +func TestDnsMxRecordId(t *testing.T) { + testData := []struct { + Name string + Input string + Expected *DnsMxRecordId + }{ + { + Name: "Empty", + Input: "", + Expected: nil, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Expected: nil, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Expected: nil, + }, + { + Name: "Resource Group ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", + Expected: nil, + }, + { + Name: "Missing DNS Zones Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/", + Expected: nil, + }, + { + Name: "DNS Zone ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1", + Expected: nil, + }, + { + Name: "Missing MX Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/MX/", + Expected: nil, + }, + { + Name: "DNS MX Record ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/MX/myrecord1", + Expected: &DnsMxRecordId{ + ResourceGroup: "resGroup1", + ZoneName: "zone1", + Name: "myrecord1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/mx/myrecord1", + Expected: nil, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Name) + + actual, err := DnsMxRecordID(v.Input) + if err != nil { + if v.Expected == nil { + continue + } + + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.Name != v.Expected.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expected.Name, actual.Name) + } + if actual.ZoneName != v.Expected.ZoneName { + t.Fatalf("Expected %q but got %q for ZoneName", v.Expected.ZoneName, actual.ZoneName) + } + if actual.ResourceGroup != v.Expected.ResourceGroup { + t.Fatalf("Expected %q but got %q for Resource Group", v.Expected.ResourceGroup, actual.ResourceGroup) + } + } +} diff --git a/azurerm/internal/services/dns/parse/dns_ns_record.go b/azurerm/internal/services/dns/parse/dns_ns_record.go new file mode 100644 index 0000000000000..4bef6f9ea0b7b --- /dev/null +++ b/azurerm/internal/services/dns/parse/dns_ns_record.go @@ -0,0 +1,38 @@ +package parse + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type DnsNsRecordId struct { + ResourceGroup string + ZoneName string + Name string +} + +func DnsNsRecordID(input string) (*DnsNsRecordId, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("[ERROR] Unable to parse DNS NS Record ID %q: %+v", input, err) + } + + record := DnsNsRecordId{ + ResourceGroup: id.ResourceGroup, + } + + if record.ZoneName, err = id.PopSegment("dnszones"); err != nil { + return nil, err + } + + if record.Name, err = id.PopSegment("NS"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &record, nil +} diff --git a/azurerm/internal/services/dns/parse/dns_ns_record_test.go b/azurerm/internal/services/dns/parse/dns_ns_record_test.go new file mode 100644 index 0000000000000..35b2ce5c37f1b --- /dev/null +++ b/azurerm/internal/services/dns/parse/dns_ns_record_test.go @@ -0,0 +1,86 @@ +package parse + +import ( + "testing" +) + +func TestDnsNsRecordId(t *testing.T) { + testData := []struct { + Name string + Input string + Expected *DnsNsRecordId + }{ + { + Name: "Empty", + Input: "", + Expected: nil, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Expected: nil, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Expected: nil, + }, + { + Name: "Resource Group ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", + Expected: nil, + }, + { + Name: "Missing DNS Zones Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/", + Expected: nil, + }, + { + Name: "DNS Zone ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1", + Expected: nil, + }, + { + Name: "Missing NS Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/NS/", + Expected: nil, + }, + { + Name: "DNS NS Record ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/NS/myrecord1", + Expected: &DnsNsRecordId{ + ResourceGroup: "resGroup1", + ZoneName: "zone1", + Name: "myrecord1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/ns/myrecord1", + Expected: nil, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Name) + + actual, err := DnsNsRecordID(v.Input) + if err != nil { + if v.Expected == nil { + continue + } + + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.Name != v.Expected.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expected.Name, actual.Name) + } + if actual.ZoneName != v.Expected.ZoneName { + t.Fatalf("Expected %q but got %q for ZoneName", v.Expected.ZoneName, actual.ZoneName) + } + if actual.ResourceGroup != v.Expected.ResourceGroup { + t.Fatalf("Expected %q but got %q for Resource Group", v.Expected.ResourceGroup, actual.ResourceGroup) + } + } +} diff --git a/azurerm/internal/services/dns/parse/dns_ptr_record.go b/azurerm/internal/services/dns/parse/dns_ptr_record.go new file mode 100644 index 0000000000000..0926b71e3890c --- /dev/null +++ b/azurerm/internal/services/dns/parse/dns_ptr_record.go @@ -0,0 +1,38 @@ +package parse + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type DnsPtrRecordId struct { + ResourceGroup string + ZoneName string + Name string +} + +func DnsPtrRecordID(input string) (*DnsPtrRecordId, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("[ERROR] Unable to parse DNS PTR Record ID %q: %+v", input, err) + } + + record := DnsPtrRecordId{ + ResourceGroup: id.ResourceGroup, + } + + if record.ZoneName, err = id.PopSegment("dnszones"); err != nil { + return nil, err + } + + if record.Name, err = id.PopSegment("PTR"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &record, nil +} diff --git a/azurerm/internal/services/dns/parse/dns_ptr_record_test.go b/azurerm/internal/services/dns/parse/dns_ptr_record_test.go new file mode 100644 index 0000000000000..7dfd262137177 --- /dev/null +++ b/azurerm/internal/services/dns/parse/dns_ptr_record_test.go @@ -0,0 +1,86 @@ +package parse + +import ( + "testing" +) + +func TestDnsPtrRecordId(t *testing.T) { + testData := []struct { + Name string + Input string + Expected *DnsPtrRecordId + }{ + { + Name: "Empty", + Input: "", + Expected: nil, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Expected: nil, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Expected: nil, + }, + { + Name: "Resource Group ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", + Expected: nil, + }, + { + Name: "Missing DNS Zones Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/", + Expected: nil, + }, + { + Name: "DNS Zone ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1", + Expected: nil, + }, + { + Name: "Missing PTR Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/PTR/", + Expected: nil, + }, + { + Name: "DNS PTR Record ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/PTR/myrecord1", + Expected: &DnsPtrRecordId{ + ResourceGroup: "resGroup1", + ZoneName: "zone1", + Name: "myrecord1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/ptr/myrecord1", + Expected: nil, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Name) + + actual, err := DnsPtrRecordID(v.Input) + if err != nil { + if v.Expected == nil { + continue + } + + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.Name != v.Expected.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expected.Name, actual.Name) + } + if actual.ZoneName != v.Expected.ZoneName { + t.Fatalf("Expected %q but got %q for ZoneName", v.Expected.ZoneName, actual.ZoneName) + } + if actual.ResourceGroup != v.Expected.ResourceGroup { + t.Fatalf("Expected %q but got %q for Resource Group", v.Expected.ResourceGroup, actual.ResourceGroup) + } + } +} diff --git a/azurerm/internal/services/dns/parse/dns_srv_record.go b/azurerm/internal/services/dns/parse/dns_srv_record.go new file mode 100644 index 0000000000000..ec4d9802705c7 --- /dev/null +++ b/azurerm/internal/services/dns/parse/dns_srv_record.go @@ -0,0 +1,38 @@ +package parse + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type DnsSrvRecordId struct { + ResourceGroup string + ZoneName string + Name string +} + +func DnsSrvRecordID(input string) (*DnsSrvRecordId, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("[ERROR] Unable to parse DNS SRV Record ID %q: %+v", input, err) + } + + record := DnsSrvRecordId{ + ResourceGroup: id.ResourceGroup, + } + + if record.ZoneName, err = id.PopSegment("dnszones"); err != nil { + return nil, err + } + + if record.Name, err = id.PopSegment("SRV"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &record, nil +} diff --git a/azurerm/internal/services/dns/parse/dns_srv_record_test.go b/azurerm/internal/services/dns/parse/dns_srv_record_test.go new file mode 100644 index 0000000000000..00f6131a7c3a0 --- /dev/null +++ b/azurerm/internal/services/dns/parse/dns_srv_record_test.go @@ -0,0 +1,86 @@ +package parse + +import ( + "testing" +) + +func TestDnsSrvRecordId(t *testing.T) { + testData := []struct { + Name string + Input string + Expected *DnsSrvRecordId + }{ + { + Name: "Empty", + Input: "", + Expected: nil, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Expected: nil, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Expected: nil, + }, + { + Name: "Resource Group ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", + Expected: nil, + }, + { + Name: "Missing DNS Zones Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/", + Expected: nil, + }, + { + Name: "DNS Zone ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1", + Expected: nil, + }, + { + Name: "Missing SRV Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/SRV/", + Expected: nil, + }, + { + Name: "DNS SRV Record ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/SRV/myrecord1", + Expected: &DnsSrvRecordId{ + ResourceGroup: "resGroup1", + ZoneName: "zone1", + Name: "myrecord1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/srv/myrecord1", + Expected: nil, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Name) + + actual, err := DnsSrvRecordID(v.Input) + if err != nil { + if v.Expected == nil { + continue + } + + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.Name != v.Expected.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expected.Name, actual.Name) + } + if actual.ZoneName != v.Expected.ZoneName { + t.Fatalf("Expected %q but got %q for ZoneName", v.Expected.ZoneName, actual.ZoneName) + } + if actual.ResourceGroup != v.Expected.ResourceGroup { + t.Fatalf("Expected %q but got %q for Resource Group", v.Expected.ResourceGroup, actual.ResourceGroup) + } + } +} diff --git a/azurerm/internal/services/dns/parse/dns_txt_record.go b/azurerm/internal/services/dns/parse/dns_txt_record.go new file mode 100644 index 0000000000000..dc4344ac78b9e --- /dev/null +++ b/azurerm/internal/services/dns/parse/dns_txt_record.go @@ -0,0 +1,38 @@ +package parse + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type DnsTxtRecordId struct { + ResourceGroup string + ZoneName string + Name string +} + +func DnsTxtRecordID(input string) (*DnsTxtRecordId, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("[ERROR] Unable to parse DNS TXT Record ID %q: %+v", input, err) + } + + record := DnsTxtRecordId{ + ResourceGroup: id.ResourceGroup, + } + + if record.ZoneName, err = id.PopSegment("dnszones"); err != nil { + return nil, err + } + + if record.Name, err = id.PopSegment("TXT"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &record, nil +} diff --git a/azurerm/internal/services/dns/parse/dns_txt_record_test.go b/azurerm/internal/services/dns/parse/dns_txt_record_test.go new file mode 100644 index 0000000000000..6c32e244024de --- /dev/null +++ b/azurerm/internal/services/dns/parse/dns_txt_record_test.go @@ -0,0 +1,86 @@ +package parse + +import ( + "testing" +) + +func TestDnsTxtRecordId(t *testing.T) { + testData := []struct { + Name string + Input string + Expected *DnsTxtRecordId + }{ + { + Name: "Empty", + Input: "", + Expected: nil, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Expected: nil, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Expected: nil, + }, + { + Name: "Resource Group ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", + Expected: nil, + }, + { + Name: "Missing DNS Zones Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/", + Expected: nil, + }, + { + Name: "DNS Zone ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1", + Expected: nil, + }, + { + Name: "Missing TXT Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/TXT/", + Expected: nil, + }, + { + Name: "DNS TXT Record ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/TXT/myrecord1", + Expected: &DnsTxtRecordId{ + ResourceGroup: "resGroup1", + ZoneName: "zone1", + Name: "myrecord1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1/txt/myrecord1", + Expected: nil, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Name) + + actual, err := DnsTxtRecordID(v.Input) + if err != nil { + if v.Expected == nil { + continue + } + + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.Name != v.Expected.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expected.Name, actual.Name) + } + if actual.ZoneName != v.Expected.ZoneName { + t.Fatalf("Expected %q but got %q for ZoneName", v.Expected.ZoneName, actual.ZoneName) + } + if actual.ResourceGroup != v.Expected.ResourceGroup { + t.Fatalf("Expected %q but got %q for Resource Group", v.Expected.ResourceGroup, actual.ResourceGroup) + } + } +} diff --git a/azurerm/internal/services/dns/parse/dns_zone.go b/azurerm/internal/services/dns/parse/dns_zone.go new file mode 100644 index 0000000000000..9d2fb359d068e --- /dev/null +++ b/azurerm/internal/services/dns/parse/dns_zone.go @@ -0,0 +1,33 @@ +package parse + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type DnsZoneId struct { + ResourceGroup string + Name string +} + +func DnsZoneID(input string) (*DnsZoneId, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("[ERROR] Unable to parse DNS Zone ID %q: %+v", input, err) + } + + zone := DnsZoneId{ + ResourceGroup: id.ResourceGroup, + } + + if zone.Name, err = id.PopSegment("dnszones"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &zone, nil +} diff --git a/azurerm/internal/services/dns/parse/dns_zone_test.go b/azurerm/internal/services/dns/parse/dns_zone_test.go new file mode 100644 index 0000000000000..3d970377aa14e --- /dev/null +++ b/azurerm/internal/services/dns/parse/dns_zone_test.go @@ -0,0 +1,73 @@ +package parse + +import ( + "testing" +) + +func TestDnsZoneId(t *testing.T) { + testData := []struct { + Name string + Input string + Expected *DnsZoneId + }{ + { + Name: "Empty", + Input: "", + Expected: nil, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Expected: nil, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Expected: nil, + }, + { + Name: "Resource Group ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", + Expected: nil, + }, + { + Name: "Missing DNS Zones Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/", + Expected: nil, + }, + { + Name: "DNS Zone ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/dnszones/zone1", + Expected: &DnsZoneId{ + Name: "zone1", + ResourceGroup: "resGroup1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/Dnszones/zone1", + Expected: nil, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Name) + + actual, err := DnsZoneID(v.Input) + if err != nil { + if v.Expected == nil { + continue + } + + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.Name != v.Expected.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expected.Name, actual.Name) + } + + if actual.ResourceGroup != v.Expected.ResourceGroup { + t.Fatalf("Expected %q but got %q for Resource Group", v.Expected.ResourceGroup, actual.ResourceGroup) + } + } +} diff --git a/azurerm/internal/services/dns/resource_arm_dns_a_record.go b/azurerm/internal/services/dns/resource_arm_dns_a_record.go index a7a919eb49d27..a7798f49283a4 100644 --- a/azurerm/internal/services/dns/resource_arm_dns_a_record.go +++ b/azurerm/internal/services/dns/resource_arm_dns_a_record.go @@ -11,7 +11,9 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/dns/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -22,9 +24,6 @@ func resourceArmDnsARecord() *schema.Resource { Read: resourceArmDnsARecordRead, Update: resourceArmDnsARecordCreateUpdate, Delete: resourceArmDnsARecordDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(30 * time.Minute), @@ -32,6 +31,10 @@ func resourceArmDnsARecord() *schema.Resource { Update: schema.DefaultTimeout(30 * time.Minute), Delete: schema.DefaultTimeout(30 * time.Minute), }, + Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { + _, err := parse.DnsARecordID(id) + return err + }), Schema: map[string]*schema.Schema{ "name": { @@ -150,27 +153,24 @@ func resourceArmDnsARecordRead(d *schema.ResourceData, meta interface{}) error { ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.DnsARecordID(d.Id()) if err != nil { return err } - resGroup := id.ResourceGroup - name := id.Path["A"] - zoneName := id.Path["dnszones"] - - resp, err := dnsClient.Get(ctx, resGroup, zoneName, name, dns.A) + resp, err := dnsClient.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.A) if err != nil { if utils.ResponseWasNotFound(resp.Response) { d.SetId("") return nil } - return fmt.Errorf("Error reading DNS A record %s: %+v", name, err) + return fmt.Errorf("Error reading DNS A record %s: %+v", id.Name, err) } - d.Set("name", name) - d.Set("resource_group_name", resGroup) - d.Set("zone_name", zoneName) + d.Set("name", id.Name) + d.Set("resource_group_name", id.ResourceGroup) + d.Set("zone_name", id.ZoneName) + d.Set("fqdn", resp.Fqdn) d.Set("ttl", resp.TTL) @@ -192,18 +192,14 @@ func resourceArmDnsARecordDelete(d *schema.ResourceData, meta interface{}) error ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.DnsARecordID(d.Id()) if err != nil { return err } - resGroup := id.ResourceGroup - name := id.Path["A"] - zoneName := id.Path["dnszones"] - - resp, err := dnsClient.Delete(ctx, resGroup, zoneName, name, dns.A, "") + resp, err := dnsClient.Delete(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.A, "") if resp.StatusCode != http.StatusOK { - return fmt.Errorf("Error deleting DNS A Record %s: %+v", name, err) + return fmt.Errorf("Error deleting DNS A Record %s: %+v", id.Name, err) } return nil diff --git a/azurerm/internal/services/dns/resource_arm_dns_aaaa_record.go b/azurerm/internal/services/dns/resource_arm_dns_aaaa_record.go index 657bcfc287bb2..ba4788b3a33aa 100644 --- a/azurerm/internal/services/dns/resource_arm_dns_aaaa_record.go +++ b/azurerm/internal/services/dns/resource_arm_dns_aaaa_record.go @@ -12,7 +12,9 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/dns/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -23,9 +25,6 @@ func resourceArmDnsAAAARecord() *schema.Resource { Read: resourceArmDnsAaaaRecordRead, Update: resourceArmDnsAaaaRecordCreateUpdate, Delete: resourceArmDnsAaaaRecordDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(30 * time.Minute), @@ -34,6 +33,11 @@ func resourceArmDnsAAAARecord() *schema.Resource { Delete: schema.DefaultTimeout(30 * time.Minute), }, + Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { + _, err := parse.DnsAaaaRecordID(id) + return err + }), + Schema: map[string]*schema.Schema{ "name": { Type: schema.TypeString, @@ -152,27 +156,24 @@ func resourceArmDnsAaaaRecordRead(d *schema.ResourceData, meta interface{}) erro ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.DnsAaaaRecordID(d.Id()) if err != nil { return err } - resGroup := id.ResourceGroup - name := id.Path["AAAA"] - zoneName := id.Path["dnszones"] - - resp, err := dnsClient.Get(ctx, resGroup, zoneName, name, dns.AAAA) + resp, err := dnsClient.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.AAAA) if err != nil { if utils.ResponseWasNotFound(resp.Response) { d.SetId("") return nil } - return fmt.Errorf("Error reading DNS AAAA record %s: %v", name, err) + return fmt.Errorf("Error reading DNS AAAA record %s: %v", id.Name, err) } - d.Set("name", name) - d.Set("resource_group_name", resGroup) - d.Set("zone_name", zoneName) + d.Set("name", id.Name) + d.Set("resource_group_name", id.ResourceGroup) + d.Set("zone_name", id.ZoneName) + d.Set("fqdn", resp.Fqdn) d.Set("ttl", resp.TTL) @@ -194,18 +195,14 @@ func resourceArmDnsAaaaRecordDelete(d *schema.ResourceData, meta interface{}) er ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.DnsAaaaRecordID(d.Id()) if err != nil { return err } - resGroup := id.ResourceGroup - name := id.Path["AAAA"] - zoneName := id.Path["dnszones"] - - resp, err := dnsClient.Delete(ctx, resGroup, zoneName, name, dns.AAAA, "") + resp, err := dnsClient.Delete(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.AAAA, "") if resp.StatusCode != http.StatusOK { - return fmt.Errorf("Error deleting DNS AAAA Record %s: %+v", name, err) + return fmt.Errorf("Error deleting DNS AAAA Record %s: %+v", id.Name, err) } return nil diff --git a/azurerm/internal/services/dns/resource_arm_dns_caa_record.go b/azurerm/internal/services/dns/resource_arm_dns_caa_record.go index 65db838855bbc..7cf9ba5944bfd 100644 --- a/azurerm/internal/services/dns/resource_arm_dns_caa_record.go +++ b/azurerm/internal/services/dns/resource_arm_dns_caa_record.go @@ -15,7 +15,9 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/dns/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -26,9 +28,6 @@ func resourceArmDnsCaaRecord() *schema.Resource { Read: resourceArmDnsCaaRecordRead, Update: resourceArmDnsCaaRecordCreateUpdate, Delete: resourceArmDnsCaaRecordDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(30 * time.Minute), @@ -37,6 +36,11 @@ func resourceArmDnsCaaRecord() *schema.Resource { Delete: schema.DefaultTimeout(30 * time.Minute), }, + Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { + _, err := parse.DnsCaaRecordID(id) + return err + }), + Schema: map[string]*schema.Schema{ "name": { Type: schema.TypeString, @@ -155,27 +159,24 @@ func resourceArmDnsCaaRecordRead(d *schema.ResourceData, meta interface{}) error ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.DnsCaaRecordID(d.Id()) if err != nil { return err } - resGroup := id.ResourceGroup - name := id.Path["CAA"] - zoneName := id.Path["dnszones"] - - resp, err := client.Get(ctx, resGroup, zoneName, name, dns.CAA) + resp, err := client.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.CAA) if err != nil { if utils.ResponseWasNotFound(resp.Response) { d.SetId("") return nil } - return fmt.Errorf("Error reading DNS CAA record %s: %v", name, err) + return fmt.Errorf("Error reading DNS CAA record %s: %v", id.Name, err) } - d.Set("name", name) - d.Set("resource_group_name", resGroup) - d.Set("zone_name", zoneName) + d.Set("name", id.Name) + d.Set("resource_group_name", id.ResourceGroup) + d.Set("zone_name", id.ZoneName) + d.Set("ttl", resp.TTL) d.Set("fqdn", resp.Fqdn) @@ -190,18 +191,14 @@ func resourceArmDnsCaaRecordDelete(d *schema.ResourceData, meta interface{}) err ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.DnsCaaRecordID(d.Id()) if err != nil { return err } - resGroup := id.ResourceGroup - name := id.Path["CAA"] - zoneName := id.Path["dnszones"] - - resp, err := client.Delete(ctx, resGroup, zoneName, name, dns.CAA, "") + resp, err := client.Delete(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.CAA, "") if resp.StatusCode != http.StatusOK { - return fmt.Errorf("Error deleting DNS CAA Record %s: %+v", name, err) + return fmt.Errorf("Error deleting DNS CAA Record %s: %+v", id.Name, err) } return nil diff --git a/azurerm/internal/services/dns/resource_arm_dns_cname_record.go b/azurerm/internal/services/dns/resource_arm_dns_cname_record.go index 9d62608bc817a..8ab073a76968a 100644 --- a/azurerm/internal/services/dns/resource_arm_dns_cname_record.go +++ b/azurerm/internal/services/dns/resource_arm_dns_cname_record.go @@ -11,7 +11,9 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/dns/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -22,9 +24,6 @@ func resourceArmDnsCNameRecord() *schema.Resource { Read: resourceArmDnsCNameRecordRead, Update: resourceArmDnsCNameRecordCreateUpdate, Delete: resourceArmDnsCNameRecordDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(30 * time.Minute), @@ -33,6 +32,11 @@ func resourceArmDnsCNameRecord() *schema.Resource { Delete: schema.DefaultTimeout(30 * time.Minute), }, + Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { + _, err := parse.DnsCNameRecordID(id) + return err + }), + Schema: map[string]*schema.Schema{ "name": { Type: schema.TypeString, @@ -150,27 +154,24 @@ func resourceArmDnsCNameRecordRead(d *schema.ResourceData, meta interface{}) err ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.DnsCNameRecordID(d.Id()) if err != nil { return err } - resGroup := id.ResourceGroup - name := id.Path["CNAME"] - zoneName := id.Path["dnszones"] - - resp, err := dnsClient.Get(ctx, resGroup, zoneName, name, dns.CNAME) + resp, err := dnsClient.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.CNAME) if err != nil { if utils.ResponseWasNotFound(resp.Response) { d.SetId("") return nil } - return fmt.Errorf("Error retrieving CNAME Record %s (DNS Zone %q / Resource Group %q): %+v", name, zoneName, resGroup, err) + return fmt.Errorf("Error retrieving CNAME Record %s (DNS Zone %q / Resource Group %q): %+v", id.Name, id.ZoneName, id.ResourceGroup, err) } - d.Set("name", name) - d.Set("resource_group_name", resGroup) - d.Set("zone_name", zoneName) + d.Set("name", id.Name) + d.Set("resource_group_name", id.ResourceGroup) + d.Set("zone_name", id.ZoneName) + d.Set("fqdn", resp.Fqdn) d.Set("ttl", resp.TTL) @@ -196,18 +197,14 @@ func resourceArmDnsCNameRecordDelete(d *schema.ResourceData, meta interface{}) e ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.DnsCNameRecordID(d.Id()) if err != nil { return err } - resGroup := id.ResourceGroup - name := id.Path["CNAME"] - zoneName := id.Path["dnszones"] - - resp, err := dnsClient.Delete(ctx, resGroup, zoneName, name, dns.CNAME, "") + resp, err := dnsClient.Delete(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.CNAME, "") if resp.StatusCode != http.StatusOK { - return fmt.Errorf("Error deleting CNAME Record %q (DNS Zone %q / Resource Group %q): %+v", name, zoneName, resGroup, err) + return fmt.Errorf("Error deleting CNAME Record %q (DNS Zone %q / Resource Group %q): %+v", id.Name, id.ZoneName, id.ResourceGroup, err) } return nil diff --git a/azurerm/internal/services/dns/resource_arm_dns_mx_record.go b/azurerm/internal/services/dns/resource_arm_dns_mx_record.go index 42f29f95d9878..a244b4c65eb9f 100644 --- a/azurerm/internal/services/dns/resource_arm_dns_mx_record.go +++ b/azurerm/internal/services/dns/resource_arm_dns_mx_record.go @@ -14,7 +14,9 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/dns/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -25,9 +27,6 @@ func resourceArmDnsMxRecord() *schema.Resource { Read: resourceArmDnsMxRecordRead, Update: resourceArmDnsMxRecordCreateUpdate, Delete: resourceArmDnsMxRecordDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(30 * time.Minute), @@ -36,6 +35,11 @@ func resourceArmDnsMxRecord() *schema.Resource { Delete: schema.DefaultTimeout(30 * time.Minute), }, + Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { + _, err := parse.DnsMxRecordID(id) + return err + }), + Schema: map[string]*schema.Schema{ "name": { Type: schema.TypeString, @@ -143,27 +147,24 @@ func resourceArmDnsMxRecordRead(d *schema.ResourceData, meta interface{}) error ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.DnsMxRecordID(d.Id()) if err != nil { return err } - resGroup := id.ResourceGroup - name := id.Path["MX"] - zoneName := id.Path["dnszones"] - - resp, err := client.Get(ctx, resGroup, zoneName, name, dns.MX) + resp, err := client.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.MX) if err != nil { if utils.ResponseWasNotFound(resp.Response) { d.SetId("") return nil } - return fmt.Errorf("Error reading DNS MX record %s: %v", name, err) + return fmt.Errorf("Error reading DNS MX record %s: %v", id.Name, err) } - d.Set("name", name) - d.Set("resource_group_name", resGroup) - d.Set("zone_name", zoneName) + d.Set("name", id.Name) + d.Set("resource_group_name", id.ResourceGroup) + d.Set("zone_name", id.ZoneName) + d.Set("ttl", resp.TTL) d.Set("fqdn", resp.Fqdn) @@ -178,18 +179,14 @@ func resourceArmDnsMxRecordDelete(d *schema.ResourceData, meta interface{}) erro ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.DnsMxRecordID(d.Id()) if err != nil { return err } - resGroup := id.ResourceGroup - name := id.Path["MX"] - zoneName := id.Path["dnszones"] - - resp, err := client.Delete(ctx, resGroup, zoneName, name, dns.MX, "") + resp, err := client.Delete(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.MX, "") if resp.StatusCode != http.StatusOK { - return fmt.Errorf("Error deleting DNS MX Record %s: %+v", name, err) + return fmt.Errorf("Error deleting DNS MX Record %s: %+v", id.Name, err) } return nil diff --git a/azurerm/internal/services/dns/resource_arm_dns_ns_record.go b/azurerm/internal/services/dns/resource_arm_dns_ns_record.go index f1d6791083711..db47b9a0aa8e7 100644 --- a/azurerm/internal/services/dns/resource_arm_dns_ns_record.go +++ b/azurerm/internal/services/dns/resource_arm_dns_ns_record.go @@ -11,7 +11,9 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/dns/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -22,9 +24,6 @@ func resourceArmDnsNsRecord() *schema.Resource { Read: resourceArmDnsNsRecordRead, Update: resourceArmDnsNsRecordUpdate, Delete: resourceArmDnsNsRecordDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(30 * time.Minute), @@ -32,6 +31,10 @@ func resourceArmDnsNsRecord() *schema.Resource { Update: schema.DefaultTimeout(30 * time.Minute), Delete: schema.DefaultTimeout(30 * time.Minute), }, + Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { + _, err := parse.DnsNsRecordID(id) + return err + }), Schema: map[string]*schema.Schema{ "name": { @@ -180,27 +183,24 @@ func resourceArmDnsNsRecordRead(d *schema.ResourceData, meta interface{}) error ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.DnsNsRecordID(d.Id()) if err != nil { return err } - resGroup := id.ResourceGroup - name := id.Path["NS"] - zoneName := id.Path["dnszones"] - - resp, err := dnsClient.Get(ctx, resGroup, zoneName, name, dns.NS) + resp, err := dnsClient.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.NS) if err != nil { if utils.ResponseWasNotFound(resp.Response) { d.SetId("") return nil } - return fmt.Errorf("Error reading DNS NS record %s: %+v", name, err) + return fmt.Errorf("Error reading DNS NS record %s: %+v", id.Name, err) } - d.Set("name", name) - d.Set("resource_group_name", resGroup) - d.Set("zone_name", zoneName) + d.Set("name", id.Name) + d.Set("resource_group_name", id.ResourceGroup) + d.Set("zone_name", id.ZoneName) + d.Set("ttl", resp.TTL) d.Set("fqdn", resp.Fqdn) @@ -218,18 +218,14 @@ func resourceArmDnsNsRecordDelete(d *schema.ResourceData, meta interface{}) erro ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.DnsNsRecordID(d.Id()) if err != nil { return err } - resGroup := id.ResourceGroup - name := id.Path["NS"] - zoneName := id.Path["dnszones"] - - resp, err := dnsClient.Delete(ctx, resGroup, zoneName, name, dns.NS, "") + resp, err := dnsClient.Delete(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.NS, "") if resp.StatusCode != http.StatusOK { - return fmt.Errorf("Error deleting DNS NS Record %s: %+v", name, err) + return fmt.Errorf("Error deleting DNS NS Record %s: %+v", id.Name, err) } return nil diff --git a/azurerm/internal/services/dns/resource_arm_dns_ptr_record.go b/azurerm/internal/services/dns/resource_arm_dns_ptr_record.go index 25272c1c2dd5e..8f85a76141542 100644 --- a/azurerm/internal/services/dns/resource_arm_dns_ptr_record.go +++ b/azurerm/internal/services/dns/resource_arm_dns_ptr_record.go @@ -11,7 +11,9 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/dns/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -22,9 +24,6 @@ func resourceArmDnsPtrRecord() *schema.Resource { Read: resourceArmDnsPtrRecordRead, Update: resourceArmDnsPtrRecordCreateUpdate, Delete: resourceArmDnsPtrRecordDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(30 * time.Minute), @@ -33,6 +32,10 @@ func resourceArmDnsPtrRecord() *schema.Resource { Delete: schema.DefaultTimeout(30 * time.Minute), }, + Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { + _, err := parse.DnsPtrRecordID(id) + return err + }), Schema: map[string]*schema.Schema{ "name": { Type: schema.TypeString, @@ -128,28 +131,24 @@ func resourceArmDnsPtrRecordRead(d *schema.ResourceData, meta interface{}) error ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.DnsPtrRecordID(d.Id()) if err != nil { return err } - resGroup := id.ResourceGroup - name := id.Path["PTR"] - zoneName := id.Path["dnszones"] - - resp, err := dnsClient.Get(ctx, resGroup, zoneName, name, dns.PTR) + resp, err := dnsClient.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.PTR) if err != nil { if utils.ResponseWasNotFound(resp.Response) { d.SetId("") return nil } - return fmt.Errorf("Error reading DNS PTR record %s: %+v", name, err) + return fmt.Errorf("Error reading DNS PTR record %s: %+v", id.Name, err) } - d.Set("name", name) - d.Set("resource_group_name", resGroup) - d.Set("zone_name", zoneName) + d.Set("name", id.Name) + d.Set("resource_group_name", id.ResourceGroup) + d.Set("zone_name", id.ZoneName) d.Set("ttl", resp.TTL) d.Set("fqdn", resp.Fqdn) @@ -165,22 +164,18 @@ func resourceArmDnsPtrRecordDelete(d *schema.ResourceData, meta interface{}) err ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.DnsPtrRecordID(d.Id()) if err != nil { return err } - resGroup := id.ResourceGroup - name := id.Path["PTR"] - zoneName := id.Path["dnszones"] - - resp, err := dnsClient.Delete(ctx, resGroup, zoneName, name, dns.PTR, "") + resp, err := dnsClient.Delete(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.PTR, "") if err != nil { if resp.StatusCode == http.StatusNotFound { return nil } - return fmt.Errorf("Error deleting DNS PTR Record %s: %+v", name, err) + return fmt.Errorf("Error deleting DNS PTR Record %s: %+v", id.Name, err) } return nil diff --git a/azurerm/internal/services/dns/resource_arm_dns_srv_record.go b/azurerm/internal/services/dns/resource_arm_dns_srv_record.go index d6f7749e37582..456afc758020e 100644 --- a/azurerm/internal/services/dns/resource_arm_dns_srv_record.go +++ b/azurerm/internal/services/dns/resource_arm_dns_srv_record.go @@ -13,7 +13,9 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/dns/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -24,9 +26,6 @@ func resourceArmDnsSrvRecord() *schema.Resource { Read: resourceArmDnsSrvRecordRead, Update: resourceArmDnsSrvRecordCreateUpdate, Delete: resourceArmDnsSrvRecordDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(30 * time.Minute), @@ -34,7 +33,10 @@ func resourceArmDnsSrvRecord() *schema.Resource { Update: schema.DefaultTimeout(30 * time.Minute), Delete: schema.DefaultTimeout(30 * time.Minute), }, - + Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { + _, err := parse.DnsSrvRecordID(id) + return err + }), Schema: map[string]*schema.Schema{ "name": { Type: schema.TypeString, @@ -152,27 +154,23 @@ func resourceArmDnsSrvRecordRead(d *schema.ResourceData, meta interface{}) error ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.DnsSrvRecordID(d.Id()) if err != nil { return err } - resGroup := id.ResourceGroup - name := id.Path["SRV"] - zoneName := id.Path["dnszones"] - - resp, err := client.Get(ctx, resGroup, zoneName, name, dns.SRV) + resp, err := client.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.SRV) if err != nil { if utils.ResponseWasNotFound(resp.Response) { d.SetId("") return nil } - return fmt.Errorf("Error reading DNS SRV record %s: %v", name, err) + return fmt.Errorf("Error reading DNS SRV record %s: %v", id.Name, err) } - d.Set("name", name) - d.Set("resource_group_name", resGroup) - d.Set("zone_name", zoneName) + d.Set("name", id.Name) + d.Set("resource_group_name", id.ResourceGroup) + d.Set("zone_name", id.ZoneName) d.Set("ttl", resp.TTL) d.Set("fqdn", resp.Fqdn) @@ -187,18 +185,14 @@ func resourceArmDnsSrvRecordDelete(d *schema.ResourceData, meta interface{}) err ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.DnsSrvRecordID(d.Id()) if err != nil { return err } - resGroup := id.ResourceGroup - name := id.Path["SRV"] - zoneName := id.Path["dnszones"] - - resp, err := client.Delete(ctx, resGroup, zoneName, name, dns.SRV, "") + resp, err := client.Delete(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.SRV, "") if resp.StatusCode != http.StatusOK { - return fmt.Errorf("Error deleting DNS SRV Record %s: %+v", name, err) + return fmt.Errorf("Error deleting DNS SRV Record %s: %+v", id.Name, err) } return nil diff --git a/azurerm/internal/services/dns/resource_arm_dns_txt_record.go b/azurerm/internal/services/dns/resource_arm_dns_txt_record.go index abf1e2eaae9c5..ad7bd70533ffc 100644 --- a/azurerm/internal/services/dns/resource_arm_dns_txt_record.go +++ b/azurerm/internal/services/dns/resource_arm_dns_txt_record.go @@ -11,7 +11,9 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/dns/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -22,9 +24,6 @@ func resourceArmDnsTxtRecord() *schema.Resource { Read: resourceArmDnsTxtRecordRead, Update: resourceArmDnsTxtRecordCreateUpdate, Delete: resourceArmDnsTxtRecordDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(30 * time.Minute), @@ -32,7 +31,10 @@ func resourceArmDnsTxtRecord() *schema.Resource { Update: schema.DefaultTimeout(30 * time.Minute), Delete: schema.DefaultTimeout(30 * time.Minute), }, - + Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { + _, err := parse.DnsTxtRecordID(id) + return err + }), Schema: map[string]*schema.Schema{ "name": { Type: schema.TypeString, @@ -134,27 +136,23 @@ func resourceArmDnsTxtRecordRead(d *schema.ResourceData, meta interface{}) error ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.DnsTxtRecordID(d.Id()) if err != nil { return err } - resGroup := id.ResourceGroup - name := id.Path["TXT"] - zoneName := id.Path["dnszones"] - - resp, err := client.Get(ctx, resGroup, zoneName, name, dns.TXT) + resp, err := client.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.TXT) if err != nil { if utils.ResponseWasNotFound(resp.Response) { d.SetId("") return nil } - return fmt.Errorf("Error reading DNS TXT record %s: %+v", name, err) + return fmt.Errorf("Error reading DNS TXT record %s: %+v", id.Name, err) } - d.Set("name", name) - d.Set("resource_group_name", resGroup) - d.Set("zone_name", zoneName) + d.Set("name", id.Name) + d.Set("resource_group_name", id.ResourceGroup) + d.Set("zone_name", id.ZoneName) d.Set("ttl", resp.TTL) d.Set("fqdn", resp.Fqdn) @@ -169,18 +167,14 @@ func resourceArmDnsTxtRecordDelete(d *schema.ResourceData, meta interface{}) err ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.DnsTxtRecordID(d.Id()) if err != nil { return err } - resGroup := id.ResourceGroup - name := id.Path["TXT"] - zoneName := id.Path["dnszones"] - - resp, err := client.Delete(ctx, resGroup, zoneName, name, dns.TXT, "") + resp, err := client.Delete(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.TXT, "") if resp.StatusCode != http.StatusOK { - return fmt.Errorf("Error deleting DNS TXT Record %s: %+v", name, err) + return fmt.Errorf("Error deleting DNS TXT Record %s: %+v", id.Name, err) } return nil diff --git a/azurerm/internal/services/dns/resource_arm_dns_zone.go b/azurerm/internal/services/dns/resource_arm_dns_zone.go index 53d04a030d38e..58258a85f94f5 100644 --- a/azurerm/internal/services/dns/resource_arm_dns_zone.go +++ b/azurerm/internal/services/dns/resource_arm_dns_zone.go @@ -11,7 +11,9 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/dns/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -22,9 +24,6 @@ func resourceArmDnsZone() *schema.Resource { Read: resourceArmDnsZoneRead, Update: resourceArmDnsZoneCreateUpdate, Delete: resourceArmDnsZoneDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(30 * time.Minute), @@ -33,6 +32,10 @@ func resourceArmDnsZone() *schema.Resource { Delete: schema.DefaultTimeout(30 * time.Minute), }, + Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { + _, err := parse.DnsZoneID(id) + return err + }), Schema: map[string]*schema.Schema{ "name": { Type: schema.TypeString, @@ -118,25 +121,23 @@ func resourceArmDnsZoneRead(d *schema.ResourceData, meta interface{}) error { ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.DnsZoneID(d.Id()) if err != nil { return err } - resGroup := id.ResourceGroup - name := id.Path["dnszones"] - - resp, err := zonesClient.Get(ctx, resGroup, name) + resp, err := zonesClient.Get(ctx, id.ResourceGroup, id.Name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { d.SetId("") return nil } - return fmt.Errorf("Error reading DNS Zone %q (Resource Group %q): %+v", name, resGroup, err) + return fmt.Errorf("Error reading DNS Zone %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } - d.Set("name", name) - d.Set("resource_group_name", resGroup) + d.Set("name", id.Name) + d.Set("resource_group_name", id.ResourceGroup) + d.Set("number_of_record_sets", resp.NumberOfRecordSets) d.Set("max_number_of_record_sets", resp.MaxNumberOfRecordSets) @@ -156,28 +157,25 @@ func resourceArmDnsZoneDelete(d *schema.ResourceData, meta interface{}) error { ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.DnsZoneID(d.Id()) if err != nil { return err } - resGroup := id.ResourceGroup - name := id.Path["dnszones"] - etag := "" - future, err := client.Delete(ctx, resGroup, name, etag) + future, err := client.Delete(ctx, id.ResourceGroup, id.Name, etag) if err != nil { if response.WasNotFound(future.Response()) { return nil } - return fmt.Errorf("Error deleting DNS zone %s (resource group %s): %+v", name, resGroup, err) + return fmt.Errorf("Error deleting DNS zone %s (resource group %s): %+v", id.Name, id.ResourceGroup, err) } if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { if response.WasNotFound(future.Response()) { return nil } - return fmt.Errorf("Error deleting DNS zone %s (resource group %s): %+v", name, resGroup, err) + return fmt.Errorf("Error deleting DNS zone %s (resource group %s): %+v", id.Name, id.ResourceGroup, err) } return nil diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_a_record_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_a_record_test.go index e3ed5c60671ab..6e5247c37f49a 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_a_record_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_a_record_test.go @@ -11,6 +11,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/dns/parse" ) func TestAccAzureRMDnsARecord_basic(t *testing.T) { @@ -211,20 +212,18 @@ func testCheckAzureRMDnsARecordExists(resourceName string) resource.TestCheckFun return fmt.Errorf("Not found: %s", resourceName) } - aName := rs.Primary.Attributes["name"] - zoneName := rs.Primary.Attributes["zone_name"] - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for DNS A record: %s", aName) + id, err := parse.DnsARecordID(rs.Primary.ID) + if err != nil { + return err } - resp, err := conn.Get(ctx, resourceGroup, zoneName, aName, dns.A) + resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.A) if err != nil { return fmt.Errorf("Bad: Get A RecordSet: %+v", err) } if resp.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: DNS A record %s (resource group: %s) does not exist", aName, resourceGroup) + return fmt.Errorf("Bad: DNS A record %s (resource group: %s) does not exist", id.Name, id.ResourceGroup) } return nil @@ -240,11 +239,11 @@ func testCheckAzureRMDnsARecordDestroy(s *terraform.State) error { continue } - aName := rs.Primary.Attributes["name"] - zoneName := rs.Primary.Attributes["zone_name"] - resourceGroup := rs.Primary.Attributes["resource_group_name"] - - resp, err := conn.Get(ctx, resourceGroup, zoneName, aName, dns.A) + id, err := parse.DnsARecordID(rs.Primary.ID) + if err != nil { + return err + } + resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.A) if err != nil { if resp.StatusCode == http.StatusNotFound { diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_aaaa_record_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_aaaa_record_test.go index a06dcc54a05e9..2fd943c437269 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_aaaa_record_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_aaaa_record_test.go @@ -11,6 +11,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/dns/parse" ) func TestAccAzureRMDnsAAAARecord_basic(t *testing.T) { @@ -238,20 +239,18 @@ func testCheckAzureRMDnsAaaaRecordExists(resourceName string) resource.TestCheck return fmt.Errorf("Not found: %s", resourceName) } - aaaaName := rs.Primary.Attributes["name"] - zoneName := rs.Primary.Attributes["zone_name"] - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for DNS AAAA record: %s", aaaaName) + id, err := parse.DnsAaaaRecordID(rs.Primary.ID) + if err != nil { + return err } - resp, err := conn.Get(ctx, resourceGroup, zoneName, aaaaName, dns.AAAA) + resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.AAAA) if err != nil { return fmt.Errorf("Bad: Get AAAA RecordSet: %+v", err) } if resp.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: DNS AAAA record %s (resource group: %s) does not exist", aaaaName, resourceGroup) + return fmt.Errorf("Bad: DNS AAAA record %s (resource group: %s) does not exist", id.Name, id.ResourceGroup) } return nil @@ -267,11 +266,11 @@ func testCheckAzureRMDnsAaaaRecordDestroy(s *terraform.State) error { continue } - aaaaName := rs.Primary.Attributes["name"] - zoneName := rs.Primary.Attributes["zone_name"] - resourceGroup := rs.Primary.Attributes["resource_group_name"] - - resp, err := conn.Get(ctx, resourceGroup, zoneName, aaaaName, dns.AAAA) + id, err := parse.DnsAaaaRecordID(rs.Primary.ID) + if err != nil { + return err + } + resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.AAAA) if err != nil { if resp.StatusCode == http.StatusNotFound { diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_caa_record_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_caa_record_test.go index 72adf5d97c830..7428c114ee7e2 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_caa_record_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_caa_record_test.go @@ -11,6 +11,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/dns/parse" ) func TestAccAzureRMDnsCaaRecord_basic(t *testing.T) { @@ -124,20 +125,18 @@ func testCheckAzureRMDnsCaaRecordExists(resourceName string) resource.TestCheckF return fmt.Errorf("Not found: %s", resourceName) } - caaName := rs.Primary.Attributes["name"] - zoneName := rs.Primary.Attributes["zone_name"] - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for DNS CAA record: %s", caaName) + id, err := parse.DnsCaaRecordID(rs.Primary.ID) + if err != nil { + return err } - resp, err := conn.Get(ctx, resourceGroup, zoneName, caaName, dns.CAA) + resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.CAA) if err != nil { return fmt.Errorf("Bad: Get CAA RecordSet: %+v", err) } if resp.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: DNS CAA record %s (resource group: %s) does not exist", caaName, resourceGroup) + return fmt.Errorf("Bad: DNS CAA record %s (resource group: %s) does not exist", id.Name, id.ResourceGroup) } return nil @@ -153,11 +152,11 @@ func testCheckAzureRMDnsCaaRecordDestroy(s *terraform.State) error { continue } - caaName := rs.Primary.Attributes["name"] - zoneName := rs.Primary.Attributes["zone_name"] - resourceGroup := rs.Primary.Attributes["resource_group_name"] - - resp, err := conn.Get(ctx, resourceGroup, zoneName, caaName, dns.CAA) + id, err := parse.DnsCaaRecordID(rs.Primary.ID) + if err != nil { + return err + } + resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.CAA) if err != nil { if resp.StatusCode == http.StatusNotFound { diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_cname_record_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_cname_record_test.go index 0e630f6e2fba9..2f988dd3205c3 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_cname_record_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_cname_record_test.go @@ -11,6 +11,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/dns/parse" ) func TestAccAzureRMDnsCNameRecord_basic(t *testing.T) { @@ -227,20 +228,18 @@ func testCheckAzureRMDnsCNameRecordExists(resourceName string) resource.TestChec return fmt.Errorf("Not found: %s", resourceName) } - cnameName := rs.Primary.Attributes["name"] - zoneName := rs.Primary.Attributes["zone_name"] - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for DNS CNAME record: %s", cnameName) + id, err := parse.DnsCNameRecordID(rs.Primary.ID) + if err != nil { + return err } - resp, err := conn.Get(ctx, resourceGroup, zoneName, cnameName, dns.CNAME) + resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.CNAME) if err != nil { return fmt.Errorf("Bad: Get CNAME RecordSet: %v", err) } if resp.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: DNS CNAME record %s (resource group: %s) does not exist", cnameName, resourceGroup) + return fmt.Errorf("Bad: DNS CNAME record %s (resource group: %s) does not exist", id.Name, id.ResourceGroup) } return nil @@ -256,11 +255,12 @@ func testCheckAzureRMDnsCNameRecordDestroy(s *terraform.State) error { continue } - cnameName := rs.Primary.Attributes["name"] - zoneName := rs.Primary.Attributes["zone_name"] - resourceGroup := rs.Primary.Attributes["resource_group_name"] + id, err := parse.DnsCNameRecordID(rs.Primary.ID) + if err != nil { + return err + } - resp, err := conn.Get(ctx, resourceGroup, zoneName, cnameName, dns.CNAME) + resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.CNAME) if err != nil { if resp.StatusCode == http.StatusNotFound { diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_mx_record_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_mx_record_test.go index 0587fe54c99b8..6b25c2792f854 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_mx_record_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_mx_record_test.go @@ -11,6 +11,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/dns/parse" ) func TestAccAzureRMDnsMxRecord_basic(t *testing.T) { @@ -144,20 +145,18 @@ func testCheckAzureRMDnsMxRecordExists(resourceName string) resource.TestCheckFu return fmt.Errorf("Not found: %s", resourceName) } - mxName := rs.Primary.Attributes["name"] - zoneName := rs.Primary.Attributes["zone_name"] - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for DNS MX record: %s", mxName) + id, err := parse.DnsMxRecordID(rs.Primary.ID) + if err != nil { + return err } - resp, err := conn.Get(ctx, resourceGroup, zoneName, mxName, dns.MX) + resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.MX) if err != nil { return fmt.Errorf("Bad: Get MX RecordSet: %+v", err) } if resp.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: DNS MX record %s (resource group: %s) does not exist", mxName, resourceGroup) + return fmt.Errorf("Bad: DNS MX record %s (resource group: %s) does not exist", id.Name, id.ResourceGroup) } return nil @@ -173,11 +172,12 @@ func testCheckAzureRMDnsMxRecordDestroy(s *terraform.State) error { continue } - mxName := rs.Primary.Attributes["name"] - zoneName := rs.Primary.Attributes["zone_name"] - resourceGroup := rs.Primary.Attributes["resource_group_name"] + id, err := parse.DnsMxRecordID(rs.Primary.ID) + if err != nil { + return err + } - resp, err := conn.Get(ctx, resourceGroup, zoneName, mxName, dns.MX) + resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.MX) if err != nil { if resp.StatusCode == http.StatusNotFound { diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_ns_record_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_ns_record_test.go index f4d159818a33d..edddb30658273 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_ns_record_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_ns_record_test.go @@ -11,6 +11,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/dns/parse" ) func TestAccAzureRMDnsNsRecord_basic(t *testing.T) { @@ -124,20 +125,18 @@ func testCheckAzureRMDnsNsRecordExists(resourceName string) resource.TestCheckFu return fmt.Errorf("Not found: %s", resourceName) } - nsName := rs.Primary.Attributes["name"] - zoneName := rs.Primary.Attributes["zone_name"] - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for DNS NS record: %s", nsName) + id, err := parse.DnsNsRecordID(rs.Primary.ID) + if err != nil { + return err } - resp, err := conn.Get(ctx, resourceGroup, zoneName, nsName, dns.NS) + resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.NS) if err != nil { return fmt.Errorf("Bad: Get DNS NS Record: %+v", err) } if resp.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: DNS NS record %s (resource group: %s) does not exist", nsName, resourceGroup) + return fmt.Errorf("Bad: DNS NS record %s (resource group: %s) does not exist", id.Name, id.ResourceGroup) } return nil @@ -153,11 +152,12 @@ func testCheckAzureRMDnsNsRecordDestroy(s *terraform.State) error { continue } - nsName := rs.Primary.Attributes["name"] - zoneName := rs.Primary.Attributes["zone_name"] - resourceGroup := rs.Primary.Attributes["resource_group_name"] + id, err := parse.DnsNsRecordID(rs.Primary.ID) + if err != nil { + return err + } - resp, err := conn.Get(ctx, resourceGroup, zoneName, nsName, dns.NS) + 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/resource_arm_dns_ptr_record_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_ptr_record_test.go index db31482bf55b0..bd5036605e823 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_ptr_record_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_ptr_record_test.go @@ -11,6 +11,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/dns/parse" ) func TestAccAzureRMDnsPtrRecord_basic(t *testing.T) { @@ -126,20 +127,18 @@ func testCheckAzureRMDnsPtrRecordExists(resourceName string) resource.TestCheckF return fmt.Errorf("Not found: %s", resourceName) } - ptrName := rs.Primary.Attributes["name"] - zoneName := rs.Primary.Attributes["zone_name"] - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for DNS PTR record: %s", ptrName) + id, err := parse.DnsPtrRecordID(rs.Primary.ID) + if err != nil { + return err } - resp, err := conn.Get(ctx, resourceGroup, zoneName, ptrName, dns.PTR) + resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.PTR) if err != nil { return fmt.Errorf("Bad: Get PTR RecordSet: %+v", err) } if resp.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: DNS PTR record %s (resource group: %s) does not exist", ptrName, resourceGroup) + return fmt.Errorf("Bad: DNS PTR record %s (resource group: %s) does not exist", id.Name, id.ResourceGroup) } return nil @@ -155,11 +154,12 @@ func testCheckAzureRMDnsPtrRecordDestroy(s *terraform.State) error { continue } - ptrName := rs.Primary.Attributes["name"] - zoneName := rs.Primary.Attributes["zone_name"] - resourceGroup := rs.Primary.Attributes["resource_group_name"] + id, err := parse.DnsPtrRecordID(rs.Primary.ID) + if err != nil { + return err + } - resp, err := conn.Get(ctx, resourceGroup, zoneName, ptrName, dns.PTR) + resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.PTR) if err != nil { if resp.StatusCode == http.StatusNotFound { diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_srv_record_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_srv_record_test.go index 0e10c85b932d2..3077e7e6afd59 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_srv_record_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_srv_record_test.go @@ -11,6 +11,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/dns/parse" ) func TestAccAzureRMDnsSrvRecord_basic(t *testing.T) { @@ -124,20 +125,18 @@ func testCheckAzureRMDnsSrvRecordExists(resourceName string) resource.TestCheckF return fmt.Errorf("Not found: %s", resourceName) } - srvName := rs.Primary.Attributes["name"] - zoneName := rs.Primary.Attributes["zone_name"] - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for DNS SRV record: %s", srvName) + id, err := parse.DnsSrvRecordID(rs.Primary.ID) + if err != nil { + return err } - resp, err := conn.Get(ctx, resourceGroup, zoneName, srvName, dns.SRV) + resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.SRV) if err != nil { return fmt.Errorf("Bad: Get SRV RecordSet: %+v", err) } if resp.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: DNS SRV record %s (resource group: %s) does not exist", srvName, resourceGroup) + return fmt.Errorf("Bad: DNS SRV record %s (resource group: %s) does not exist", id.Name, id.ResourceGroup) } return nil @@ -153,11 +152,12 @@ func testCheckAzureRMDnsSrvRecordDestroy(s *terraform.State) error { continue } - srvName := rs.Primary.Attributes["name"] - zoneName := rs.Primary.Attributes["zone_name"] - resourceGroup := rs.Primary.Attributes["resource_group_name"] + id, err := parse.DnsSrvRecordID(rs.Primary.ID) + if err != nil { + return err + } - resp, err := conn.Get(ctx, resourceGroup, zoneName, srvName, dns.SRV) + resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.SRV) if err != nil { if resp.StatusCode == http.StatusNotFound { diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_txt_record_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_txt_record_test.go index 8bf2d3301d002..69d534b084c86 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_txt_record_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_txt_record_test.go @@ -11,6 +11,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/dns/parse" ) func TestAccAzureRMDnsTxtRecord_basic(t *testing.T) { @@ -124,20 +125,18 @@ func testCheckAzureRMDnsTxtRecordExists(resourceName string) resource.TestCheckF return fmt.Errorf("Not found: %s", resourceName) } - txtName := rs.Primary.Attributes["name"] - zoneName := rs.Primary.Attributes["zone_name"] - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for DNS TXT record: %s", txtName) + id, err := parse.DnsTxtRecordID(rs.Primary.ID) + if err != nil { + return err } - resp, err := conn.Get(ctx, resourceGroup, zoneName, txtName, dns.TXT) + resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.TXT) if err != nil { return fmt.Errorf("Bad: Get TXT RecordSet: %+v", err) } if resp.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: DNS TXT record %s (resource group: %s) does not exist", txtName, resourceGroup) + return fmt.Errorf("Bad: DNS TXT record %s (resource group: %s) does not exist", id.Name, id.ResourceGroup) } return nil @@ -153,11 +152,12 @@ func testCheckAzureRMDnsTxtRecordDestroy(s *terraform.State) error { continue } - txtName := rs.Primary.Attributes["name"] - zoneName := rs.Primary.Attributes["zone_name"] - resourceGroup := rs.Primary.Attributes["resource_group_name"] + id, err := parse.DnsTxtRecordID(rs.Primary.ID) + if err != nil { + return err + } - resp, err := conn.Get(ctx, resourceGroup, zoneName, txtName, dns.TXT) + resp, err := conn.Get(ctx, id.ResourceGroup, id.ZoneName, id.Name, dns.TXT) if err != nil { if resp.StatusCode == http.StatusNotFound { diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_zone_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_zone_test.go index b886117ae7de1..2c84dd76a6606 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_zone_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_zone_test.go @@ -10,6 +10,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/dns/parse" ) func TestAccAzureRMDnsZone_basic(t *testing.T) { @@ -96,19 +97,18 @@ func testCheckAzureRMDnsZoneExists(resourceName string) resource.TestCheckFunc { return fmt.Errorf("Not found: %s", resourceName) } - zoneName := rs.Primary.Attributes["name"] - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for DNS zone: %s", zoneName) + id, err := parse.DnsZoneID(rs.Primary.ID) + if err != nil { + return err } - resp, err := client.Get(ctx, resourceGroup, zoneName) + resp, err := client.Get(ctx, id.ResourceGroup, id.Name) if err != nil { return fmt.Errorf("Bad: Get DNS zone: %+v", err) } if resp.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: DNS zone %s (resource group: %s) does not exist", zoneName, resourceGroup) + return fmt.Errorf("Bad: DNS zone %s (resource group: %s) does not exist", id.Name, id.ResourceGroup) } return nil @@ -124,10 +124,12 @@ func testCheckAzureRMDnsZoneDestroy(s *terraform.State) error { continue } - zoneName := rs.Primary.Attributes["name"] - resourceGroup := rs.Primary.Attributes["resource_group_name"] + id, err := parse.DnsZoneID(rs.Primary.ID) + if err != nil { + return err + } - resp, err := conn.Get(ctx, resourceGroup, zoneName) + resp, err := conn.Get(ctx, id.ResourceGroup, id.Name) if err != nil { if resp.StatusCode == http.StatusNotFound { return nil From 6a7b3e5875ae1c1d1fbc5097756edf345aa49e07 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Thu, 20 Feb 2020 18:52:54 -0800 Subject: [PATCH 288/498] Added Purge on Destroy back in --- azurerm/helpers/azure/key_vault.go | 29 +++++++++++++ azurerm/internal/features/user_flags.go | 1 + azurerm/internal/provider/features.go | 8 ++-- azurerm/internal/provider/features_test.go | 14 +++++- .../keyvault/resource_arm_key_vault.go | 43 +++++++++++++++++++ .../tests/resource_arm_key_vault_test.go | 11 +++++ website/docs/index.html.markdown | 2 +- 7 files changed, 101 insertions(+), 7 deletions(-) diff --git a/azurerm/helpers/azure/key_vault.go b/azurerm/helpers/azure/key_vault.go index 7957380bb5946..e9459bdec46bf 100644 --- a/azurerm/helpers/azure/key_vault.go +++ b/azurerm/helpers/azure/key_vault.go @@ -3,6 +3,7 @@ package azure import ( "context" "fmt" + "time" "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2018-02-14/keyvault" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" @@ -118,3 +119,31 @@ func KeyVaultExists(ctx context.Context, client *keyvault.VaultsClient, keyVault return true, nil } + +func KeyVaultGetSoftDeletedState(ctx context.Context, client *keyvault.VaultsClient, name string, location string) (deleteDate interface{}, purgeDate interface{}, err error) { + softDel, err := client.GetDeleted(ctx, name, location) + if err != nil { + return nil, nil, fmt.Errorf("unable to get soft delete state information: %+v", err) + } + + // the logic is this way because the GetDeleted call will return an existing key vault + // that is not soft deleted, but the Deleted Vault properties will be nil + if props := softDel.Properties; props != nil { + var delDate interface{} + var purgeDate interface{} + + if dd := props.DeletionDate; dd != nil { + delDate = (*dd).Format(time.RFC3339) + } + if pg := props.ScheduledPurgeDate; pg != nil { + purgeDate = (*pg).Format(time.RFC3339) + } + + if delDate != nil && purgeDate != nil { + return delDate, purgeDate, nil + } + } + + // this means we found an existing key vault that is not soft deleted + return nil, nil, nil +} diff --git a/azurerm/internal/features/user_flags.go b/azurerm/internal/features/user_flags.go index 93407b225c2ed..cc874f68dd205 100644 --- a/azurerm/internal/features/user_flags.go +++ b/azurerm/internal/features/user_flags.go @@ -15,5 +15,6 @@ type VirtualMachineScaleSetFeatures struct { } type KeyVaultFeatures struct { + PurgeSoftDeleteOnDestroy bool RecoverSoftDeletedKeyVaults bool } diff --git a/azurerm/internal/provider/features.go b/azurerm/internal/provider/features.go index 15d4f72c2276b..3df1e7014a496 100644 --- a/azurerm/internal/provider/features.go +++ b/azurerm/internal/provider/features.go @@ -92,8 +92,8 @@ func expandFeatures(input []interface{}) features.UserFeatures { RollInstancesWhenRequired: true, }, KeyVault: features.KeyVaultFeatures{ - RecoverSoftDeletedKeyVaults: true, PurgeSoftDeleteOnDestroy: true, + RecoverSoftDeletedKeyVaults: true, }, } @@ -107,10 +107,10 @@ func expandFeatures(input []interface{}) features.UserFeatures { items := raw.([]interface{}) if len(items) > 0 { keyVaultRaw := items[0].(map[string]interface{}) - if v, ok := keyVaultRaw["recover_soft_deleted_key_vaults"]; ok { - features.KeyVault.RecoverSoftDeletedKeyVaults = v.(bool) - } if v, ok := keyVaultRaw["purge_soft_delete_on_destroy"]; ok { + features.KeyVault.PurgeSoftDeleteOnDestroy = v.(bool) + } + if v, ok := keyVaultRaw["recover_soft_deleted_key_vaults"]; ok { features.KeyVault.RecoverSoftDeletedKeyVaults = v.(bool) } } diff --git a/azurerm/internal/provider/features_test.go b/azurerm/internal/provider/features_test.go index 6cab40a7f8ece..79b54bd585761 100644 --- a/azurerm/internal/provider/features_test.go +++ b/azurerm/internal/provider/features_test.go @@ -19,6 +19,7 @@ func TestExpandFeatures(t *testing.T) { Input: []interface{}{}, Expected: features.UserFeatures{ KeyVault: features.KeyVaultFeatures{ + PurgeSoftDeleteOnDestroy: true, RecoverSoftDeletedKeyVaults: true, }, VirtualMachine: features.VirtualMachineFeatures{ @@ -45,6 +46,7 @@ func TestExpandFeatures(t *testing.T) { }, "key_vault": []interface{}{ map[string]interface{}{ + "purge_soft_delete_on_destroy": true, "recover_soft_deleted_key_vaults": true, }, }, @@ -52,6 +54,7 @@ func TestExpandFeatures(t *testing.T) { }, Expected: features.UserFeatures{ KeyVault: features.KeyVaultFeatures{ + PurgeSoftDeleteOnDestroy: true, RecoverSoftDeletedKeyVaults: true, }, VirtualMachine: features.VirtualMachineFeatures{ @@ -78,6 +81,7 @@ func TestExpandFeatures(t *testing.T) { }, "key_vault": []interface{}{ map[string]interface{}{ + "purge_soft_delete_on_destroy": false, "recover_soft_deleted_key_vaults": false, }, }, @@ -85,6 +89,7 @@ func TestExpandFeatures(t *testing.T) { }, Expected: features.UserFeatures{ KeyVault: features.KeyVaultFeatures{ + PurgeSoftDeleteOnDestroy: false, RecoverSoftDeletedKeyVaults: false, }, VirtualMachine: features.VirtualMachineFeatures{ @@ -122,16 +127,18 @@ func TestExpandFeaturesKeyVault(t *testing.T) { }, Expected: features.UserFeatures{ KeyVault: features.KeyVaultFeatures{ + PurgeSoftDeleteOnDestroy: true, RecoverSoftDeletedKeyVaults: true, }, }, }, { - Name: "Recover Soft Deleted Key Vaults Enabled", + Name: "Purge Soft Delete On Destroy and Recover Soft Deleted Key Vaults Enabled", Input: []interface{}{ map[string]interface{}{ "key_vault": []interface{}{ map[string]interface{}{ + "purge_soft_delete_on_destroy": true, "recover_soft_deleted_key_vaults": true, }, }, @@ -139,16 +146,18 @@ func TestExpandFeaturesKeyVault(t *testing.T) { }, Expected: features.UserFeatures{ KeyVault: features.KeyVaultFeatures{ + PurgeSoftDeleteOnDestroy: true, RecoverSoftDeletedKeyVaults: true, }, }, }, { - Name: "Recover Soft Deleted Key Vaults Disabled", + Name: "Purge Soft Delete On Destroy and Recover Soft Deleted Key Vaults Disabled", Input: []interface{}{ map[string]interface{}{ "key_vault": []interface{}{ map[string]interface{}{ + "purge_soft_delete_on_destroy": false, "recover_soft_deleted_key_vaults": false, }, }, @@ -156,6 +165,7 @@ func TestExpandFeaturesKeyVault(t *testing.T) { }, Expected: features.UserFeatures{ KeyVault: features.KeyVaultFeatures{ + PurgeSoftDeleteOnDestroy: false, RecoverSoftDeletedKeyVaults: false, }, }, diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault.go b/azurerm/internal/services/keyvault/resource_arm_key_vault.go index 2a878c12f6e86..2e38c72edd236 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault.go @@ -570,8 +570,12 @@ func resourceArmKeyVaultDelete(d *schema.ResourceData, meta interface{}) error { if err != nil { return err } + resourceGroup := id.ResourceGroup name := id.Path["vaults"] + location := d.Get("location").(string) + purgeProtectionEnabled := false + softDeleteEnabled := false locks.ByName(name, keyVaultResourceName) defer locks.UnlockByName(name, keyVaultResourceName) @@ -589,6 +593,16 @@ func resourceArmKeyVaultDelete(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("Error retrieving Key Vault %q (Resource Group %q): `properties` was nil", name, resourceGroup) } + // Check to see if purge protection is enabled or not... + if read.Properties == nil { + if ppe := read.Properties.EnablePurgeProtection; ppe != nil { + purgeProtectionEnabled = *ppe + } + if sde := read.Properties.EnableSoftDelete; sde != nil { + softDeleteEnabled = *sde + } + } + // ensure we lock on the latest network names, to ensure we handle Azure's networking layer being limited to one change at a time virtualNetworkNames := make([]string, 0) if props := read.Properties; props != nil { @@ -623,6 +637,35 @@ func resourceArmKeyVaultDelete(d *schema.ResourceData, meta interface{}) error { } } + // Purge the soft deleted key vault permanently if the feature flag is enabled + if meta.(*clients.Client).Features.KeyVault.PurgeSoftDeleteOnDestroy && softDeleteEnabled { + // Raise an error if the key vault is in the soft delete state and purge protection is enabled + if purgeProtectionEnabled { + delDate, purgeDate, err := azure.KeyVaultGetSoftDeletedState(ctx, client, name, location) + if err == nil { + if delDate != nil && purgeDate != nil { + return fmt.Errorf("unable to purge Key Vault %q (Resource Group %q) because it has purge protection enabled. The key vault was soft deleted on %s and is scheduled to be purged on %s", name, resourceGroup, delDate.(string), purgeDate.(string)) + } + + // I was unable to get the soft deleted and purge date information, error with a generic error as the key valit cannot be purged + return fmt.Errorf("unable to purge Key Vault %q (Resource Group %q) because it has purge protection enabled", name, resourceGroup) + } + } + + log.Printf("[DEBUG] KeyVault %s marked for purge, executing purge", name) + + future, err := client.PurgeDeleted(ctx, name, location) + if err != nil { + return err + } + + log.Printf("[DEBUG] Waiting for purge of KeyVault %s", name) + err = future.WaitForCompletionRef(ctx, client.Client) + if err != nil { + return fmt.Errorf("Error purging Key Vault %q (Resource Group %q): %+v", name, resourceGroup, err) + } + } + return nil } diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go index d357df9493c32..77b6d19b00891 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go @@ -1085,6 +1085,17 @@ resource "azurerm_key_vault" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } +func testAccAzureRMKeyVault_softDeletePurge(data acceptance.TestData) string { + return fmt.Sprintf(` +data "azurerm_client_config" "current" {} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} +`, data.RandomInteger, data.Locations.Primary) +} + func testAccAzureRMKeyVault_purgeProtectionAndSoftDelete(data acceptance.TestData) string { return fmt.Sprintf(` data "azurerm_client_config" "current" {} diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown index 7e01a4fd22a56..c8c7a54f6b640 100644 --- a/website/docs/index.html.markdown +++ b/website/docs/index.html.markdown @@ -167,7 +167,7 @@ The `key_vault` block supports the following: * `purge_soft_delete_on_destroy` - (Optional) Should the `azurerm_key_vault` resource be permanently deleted (e.g. purged) when destroyed? Defaults to `true`. -~> **Note:** When purge protection is enabled, a vault or an object in the deleted state cannot be purged until the retention period(90 days) has passed. +~> **Note:** When purge protection is enabled, a key vault or an object in the deleted state cannot be purged until the retention period(90 days) has passed. --- From a4b081871eeb3bb80ee7f730d58f408b622fb171 Mon Sep 17 00:00:00 2001 From: Tracy Holmes Date: Thu, 20 Feb 2020 21:09:00 -0600 Subject: [PATCH 289/498] docs: updates cdn_endpoint `origin` attr to required Fixes #5750 --- website/docs/r/cdn_endpoint.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/cdn_endpoint.html.markdown b/website/docs/r/cdn_endpoint.html.markdown index 872e68a900258..6cb8cac80b78c 100644 --- a/website/docs/r/cdn_endpoint.html.markdown +++ b/website/docs/r/cdn_endpoint.html.markdown @@ -73,7 +73,7 @@ The following arguments are supported: * `optimization_type` - (Optional) What types of optimization should this CDN Endpoint optimize for? Possible values include `DynamicSiteAcceleration`, `GeneralMediaStreaming`, `GeneralWebDelivery`, `LargeFileDownload` and `VideoOnDemandMediaStreaming`. -* `origin` - (Optional) The set of origins of the CDN endpoint. When multiple origins exist, the first origin will be used as primary and rest will be used as failover options. Each `origin` block supports fields documented below. +* `origin` - (Required) The set of origins of the CDN endpoint. When multiple origins exist, the first origin will be used as primary and rest will be used as failover options. Each `origin` block supports fields documented below. * `origin_host_header` - (Optional) The host header CDN provider will send along with content requests to origins. Defaults to the host name of the origin. From 0ffb566fe89f754368162bcf701eda8c489eafcd Mon Sep 17 00:00:00 2001 From: njucz <740360112@qq.com> Date: Fri, 21 Feb 2020 11:17:41 +0800 Subject: [PATCH 290/498] add `tags` in doc --- website/docs/r/automation_dsc_configuration.html.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/docs/r/automation_dsc_configuration.html.markdown b/website/docs/r/automation_dsc_configuration.html.markdown index 9bfb4bf43990c..d3b915d2f390b 100644 --- a/website/docs/r/automation_dsc_configuration.html.markdown +++ b/website/docs/r/automation_dsc_configuration.html.markdown @@ -55,6 +55,8 @@ The following arguments are supported: * `description` - (Optional) Description to go with DSC Configuration. +* `tags` - (Optional) A mapping of tags to assign to the resource. + ## Attributes Reference The following attributes are exported: From 51fa1b4d5bf33fdd799929af2329ddf1c61765fa Mon Sep 17 00:00:00 2001 From: Tracy Holmes Date: Thu, 20 Feb 2020 21:27:41 -0600 Subject: [PATCH 291/498] docs: Adds `id` to r/resource_group Fixes #5686 --- website/docs/d/resource_group.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/d/resource_group.html.markdown b/website/docs/d/resource_group.html.markdown index 83653ea0f3462..74d587e70aa4e 100644 --- a/website/docs/d/resource_group.html.markdown +++ b/website/docs/d/resource_group.html.markdown @@ -35,6 +35,7 @@ resource "azurerm_managed_disk" "example" { ## Attributes Reference +* `id` - The ID of the Resource Group. * `location` - The location of the resource group. * `tags` - A mapping of tags assigned to the resource group. From 94d284f41f8653b8cb48008150b058dfec780672 Mon Sep 17 00:00:00 2001 From: njucz <740360112@qq.com> Date: Fri, 21 Feb 2020 15:30:22 +0800 Subject: [PATCH 292/498] add support for long text record --- .../dns/resource_arm_dns_txt_record.go | 19 +++++++++++++++---- .../tests/resource_arm_dns_txt_record_test.go | 6 +++--- website/docs/r/dns_txt_record.html.markdown | 2 +- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/azurerm/internal/services/dns/resource_arm_dns_txt_record.go b/azurerm/internal/services/dns/resource_arm_dns_txt_record.go index abf1e2eaae9c5..d80c8218517e9 100644 --- a/azurerm/internal/services/dns/resource_arm_dns_txt_record.go +++ b/azurerm/internal/services/dns/resource_arm_dns_txt_record.go @@ -3,10 +3,12 @@ package dns import ( "fmt" "net/http" + "strings" "time" "github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2018-05-01/dns" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" @@ -53,8 +55,9 @@ func resourceArmDnsTxtRecord() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "value": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringLenBetween(1, 1024), }, }, }, @@ -194,7 +197,7 @@ func flattenAzureRmDnsTxtRecords(records *[]dns.TxtRecord) []map[string]interfac txtRecord := make(map[string]interface{}) if v := record.Value; v != nil { - value := (*v)[0] + value := strings.Join(*v, "") txtRecord["value"] = value } @@ -209,9 +212,17 @@ func expandAzureRmDnsTxtRecords(d *schema.ResourceData) *[]dns.TxtRecord { recordStrings := d.Get("record").(*schema.Set).List() records := make([]dns.TxtRecord, len(recordStrings)) + segmentLen := 254 for i, v := range recordStrings { record := v.(map[string]interface{}) - value := []string{record["value"].(string)} + v := record["value"].(string) + + var value []string + for len(v) > segmentLen { + value = append(value, v[:segmentLen]) + v = v[segmentLen:] + } + value = append(value, v) txtRecord := dns.TxtRecord{ Value: &value, diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_txt_record_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_txt_record_test.go index 8bf2d3301d002..793e393c8d6a5 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_txt_record_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_txt_record_test.go @@ -196,7 +196,7 @@ resource "azurerm_dns_txt_record" "test" { } record { - value = "Another test txt string" + value = "A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......" } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) @@ -218,7 +218,7 @@ resource "azurerm_dns_txt_record" "import" { } record { - value = "Another test txt string" + value = "A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......" } } `, template) @@ -247,7 +247,7 @@ resource "azurerm_dns_txt_record" "test" { } record { - value = "Another test txt string" + value = "A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......A long text......" } record { diff --git a/website/docs/r/dns_txt_record.html.markdown b/website/docs/r/dns_txt_record.html.markdown index 6e895349a587c..6a17ff6c147e0 100644 --- a/website/docs/r/dns_txt_record.html.markdown +++ b/website/docs/r/dns_txt_record.html.markdown @@ -60,7 +60,7 @@ The following arguments are supported: The `record` block supports: -* `value` - (Required) The value of the record. +* `value` - (Required) The value of the record. Max length: 1024 characters ## Attributes Reference From a349df8d84313db914d37ccf3b5add61d631c78c Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 21 Feb 2020 09:29:07 +0100 Subject: [PATCH 293/498] r/key_vault: fixing up the tests --- .../services/keyvault/tests/resource_arm_key_vault_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go index d357df9493c32..83e065aa250eb 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go @@ -374,7 +374,6 @@ func TestAccAzureRMKeyVault_softDeleteRecoveryDisabled(t *testing.T) { Config: testAccAzureRMKeyVault_softDeleteRecoveryDisabled(data), ExpectError: regexp.MustCompile("An existing soft-deleted Key Vault exists with the Name"), }, - data.ImportStep(), }, }) } @@ -470,7 +469,7 @@ func TestAccAzureRMKeyVault_purgeProtectionAttemptToDisable(t *testing.T) { data.ImportStep(), { Config: testAccAzureRMKeyVault_purgeProtection(data, false), - ExpectError: regexp.MustCompile("TODO"), // TODO: correct error message + ExpectError: regexp.MustCompile("once Purge Protection has been Enabled it's not possible to disable it"), }, }, }) From aad84c4a40f7b2fed9335a1e79f24f69397b39ac Mon Sep 17 00:00:00 2001 From: jackofallops Date: Fri, 21 Feb 2020 09:22:23 +0000 Subject: [PATCH 294/498] Updated validate to correct method for cidrs --- azurerm/internal/services/web/resource_arm_function_app.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/web/resource_arm_function_app.go b/azurerm/internal/services/web/resource_arm_function_app.go index 9bc97724772d5..134a2dba6a938 100644 --- a/azurerm/internal/services/web/resource_arm_function_app.go +++ b/azurerm/internal/services/web/resource_arm_function_app.go @@ -207,7 +207,7 @@ func resourceArmFunctionApp() *schema.Resource { "ip_address": { Type: schema.TypeString, Optional: true, - ValidateFunc: validate.NoEmptyStrings, + ValidateFunc: validate.CIDR, }, "subnet_id": { Type: schema.TypeString, From 497f844925d50321ee1eea10bb1d7c13662828ea Mon Sep 17 00:00:00 2001 From: jackofallops Date: Fri, 21 Feb 2020 09:36:29 +0000 Subject: [PATCH 295/498] Doc updates, test fixes --- ...urce_arm_virtual_machine_extension_test.go | 5 ---- .../resource_arm_container_group_test.go | 8 +++--- website/docs/d/app_service.html.markdown | 2 -- .../guides/2.0-upgrade-guide.html.markdown | 27 +++++++++++++++++-- website/docs/r/app_service.html.markdown | 8 ++---- website/docs/r/function_app.html.markdown | 3 +-- 6 files changed, 32 insertions(+), 21 deletions(-) diff --git a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_extension_test.go b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_extension_test.go index 85dd28571d0f3..370fcd2a7ab3f 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_extension_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_extension_test.go @@ -483,11 +483,6 @@ resource "azurerm_virtual_machine" "test" { resource "azurerm_virtual_machine_extension" "test" { name = "acctvme-%d" -<<<<<<< HEAD - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -======= ->>>>>>> master virtual_machine_id = "${azurerm_virtual_machine.test.id}" publisher = "Microsoft.Azure.Extensions" type = "CustomScript" diff --git a/azurerm/internal/services/containers/tests/resource_arm_container_group_test.go b/azurerm/internal/services/containers/tests/resource_arm_container_group_test.go index 8a5eec235d382..483a4628d6d0c 100644 --- a/azurerm/internal/services/containers/tests/resource_arm_container_group_test.go +++ b/azurerm/internal/services/containers/tests/resource_arm_container_group_test.go @@ -617,10 +617,10 @@ resource "azurerm_container_group" "test" { os_type = "Linux" container { - name = "hw" - image = "microsoft/aci-helloworld:latest" - cpu = "0.5" - memory = "0.5" + name = "hw" + image = "microsoft/aci-helloworld:latest" + cpu = "0.5" + memory = "0.5" ports { port = 5443 protocol = "UDP" diff --git a/website/docs/d/app_service.html.markdown b/website/docs/d/app_service.html.markdown index 4af3f9c513b3a..07d6832efc6b0 100644 --- a/website/docs/d/app_service.html.markdown +++ b/website/docs/d/app_service.html.markdown @@ -135,8 +135,6 @@ A `ip_restriction` block exports the following: * `websockets_enabled` - Are WebSockets enabled for this App Service? -* `virtual_network_name` - The name of the Virtual Network which this App Service is attached to. - ## Timeouts The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index 504b499973fc1..d6b72b7bd8ad9 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -173,6 +173,8 @@ The deprecated `vault_uri` field has been replaced by the `key_vault_id` field a The deprecated block `agent_pool_profile` will be removed. This has been replaced by the `default_node_pool` block. +The deprecated `default_node_pool.dns_prefix` field has been removed + ### Data Source: `azurerm_network_interface` The deprecated field `internal_fqdn` will be removed. @@ -191,7 +193,7 @@ Azure Scheduler is being retired in favour of Logic Apps ([more information can ### Data Source: `azurerm_virtual_network` -The deprecated field `address_space` will be removed. +The deprecated field `address_spaces` will be removed. ### Resource: `azurerm_api_management` @@ -213,6 +215,16 @@ The deprecated field `disable_triple_des_chipers` will be removed in favour of The deprecated field `disable_triple_des_ciphers` will be removed in favour of the `enable_triple_des_ciphers` property. +### Resource: `azurerm_app_service` + +The `identity.type` field no longer supports the combined value `"SystemAssigned, UserAssigned"` as this has been removed from the API + +The `site_config.ip_restriction.ip_address` must now be specified in CIDR notation to match the API + +The `site_config.ip_restriction.subnet_mask` field has been removed as it is not longer used. + +The `site_config.virtual_network_name` field has been removed as it it no longer used + ### Resource: `azurerm_app_service_plan` The fields in the `properties` block (`app_service_environment_id`, `reserved` and `per_site_scaling`) have been moved to the top level - as such the `properties` block will be removed. @@ -337,6 +349,14 @@ The deprecated `internal_public_ip_address_id` field in the `ip_configuration` b The `forwarding_protocol` property now defaults to `HttpsOnly` +### Resource: `azurerm_function_app` + +The `site_config.ip_restriction.ip_address` must now be specified in CIDR notation to match the API + +The `site_config.ip_restriction.subnet_mask` field has been removed as it is not longer used. + +The `site_config.virtual_network_name` field has been removed as it it no longer used + ### Resource: `azurerm_iothub` The deprecated `sku.tier` property will be remove. @@ -409,11 +429,14 @@ The deprecated `vault_uri` field has been replaced by the `key_vault_id` field a The deprecated `vault_uri` field has been replaced by the `key_vault_id` field and will be removed. - ### Resource: `azurerm_key_vault_secret` The deprecated `vault_uri` field has been replaced by the `key_vault_id` field and will be removed. +### Resource: `azurerm_kubernetes_cluster` + +The deprecated `default_node_pool.dns_prefix` field has been removed + ### Resource: `azurerm_log_analytics_linked_service` The `resource_id` field has been moved from the `linked_service_properties` block to the top-level. diff --git a/website/docs/r/app_service.html.markdown b/website/docs/r/app_service.html.markdown index 2477588640e40..71470c6a98923 100644 --- a/website/docs/r/app_service.html.markdown +++ b/website/docs/r/app_service.html.markdown @@ -225,8 +225,6 @@ Additional examples of how to run Containers via the `azurerm_app_service` resou ~> **NOTE:** when using an App Service Plan in the `Free` or `Shared` Tiers `use_32_bit_worker_process` must be set to `true`. -* `virtual_network_name` - (Optional) The name of the Virtual Network which this App Service should be attached to. - * `websockets_enabled` - (Optional) Should WebSockets be enabled? --- @@ -305,11 +303,9 @@ A `google` block supports the following: A `ip_restriction` block supports the following: -* `ip_address` - (Optional) The IP Address used for this IP Restriction. - -* `subnet_mask` - (Optional) The Subnet mask used for this IP Restriction. Defaults to `255.255.255.255`. +* `ip_address` - (Optional) The IP Address used for this IP Restriction in CIDR notation. -* `virtual_network_subnet_id` - (Optional.The Virtual Network Subnet ID used for this IP Restriction. +* `virtual_network_subnet_id` - (Optional) The Virtual Network Subnet ID used for this IP Restriction. -> **NOTE:** One of either `ip_address` or `virtual_network_subnet_id` must be specified diff --git a/website/docs/r/function_app.html.markdown b/website/docs/r/function_app.html.markdown index 5ab0845ff8674..201478edd4b07 100644 --- a/website/docs/r/function_app.html.markdown +++ b/website/docs/r/function_app.html.markdown @@ -136,14 +136,13 @@ The following arguments are supported: `site_config` supports the following: * `always_on` - (Optional) Should the Function App be loaded at all times? Defaults to `false`. + * `use_32_bit_worker_process` - (Optional) Should the Function App run in 32 bit mode, rather than 64 bit mode? Defaults to `true`. ~> **Note:** when using an App Service Plan in the `Free` or `Shared` Tiers `use_32_bit_worker_process` must be set to `true`. * `websockets_enabled` - (Optional) Should WebSockets be enabled? -* `virtual_network_name` - (Optional) The name of the Virtual Network which this App Service should be attached to. - * `linux_fx_version` - (Optional) Linux App Framework and version for the AppService, e.g. `DOCKER|(golang:latest)`. * `http2_enabled` - (Optional) Specifies whether or not the http2 protocol should be enabled. Defaults to `false`. From 3a222df4cce944aafd2e545f97207dd0ffcbffbd Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 21 Feb 2020 14:36:00 +0100 Subject: [PATCH 296/498] r/key_vault: outputting a warning rather than an error during the delete --- azurerm/helpers/azure/key_vault.go | 29 --------- .../keyvault/resource_arm_key_vault.go | 61 +++++++++++++++---- 2 files changed, 50 insertions(+), 40 deletions(-) diff --git a/azurerm/helpers/azure/key_vault.go b/azurerm/helpers/azure/key_vault.go index e9459bdec46bf..7957380bb5946 100644 --- a/azurerm/helpers/azure/key_vault.go +++ b/azurerm/helpers/azure/key_vault.go @@ -3,7 +3,6 @@ package azure import ( "context" "fmt" - "time" "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2018-02-14/keyvault" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" @@ -119,31 +118,3 @@ func KeyVaultExists(ctx context.Context, client *keyvault.VaultsClient, keyVault return true, nil } - -func KeyVaultGetSoftDeletedState(ctx context.Context, client *keyvault.VaultsClient, name string, location string) (deleteDate interface{}, purgeDate interface{}, err error) { - softDel, err := client.GetDeleted(ctx, name, location) - if err != nil { - return nil, nil, fmt.Errorf("unable to get soft delete state information: %+v", err) - } - - // the logic is this way because the GetDeleted call will return an existing key vault - // that is not soft deleted, but the Deleted Vault properties will be nil - if props := softDel.Properties; props != nil { - var delDate interface{} - var purgeDate interface{} - - if dd := props.DeletionDate; dd != nil { - delDate = (*dd).Format(time.RFC3339) - } - if pg := props.ScheduledPurgeDate; pg != nil { - purgeDate = (*pg).Format(time.RFC3339) - } - - if delDate != nil && purgeDate != nil { - return delDate, purgeDate, nil - } - } - - // this means we found an existing key vault that is not soft deleted - return nil, nil, nil -} diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault.go b/azurerm/internal/services/keyvault/resource_arm_key_vault.go index 2e38c72edd236..e479667616e1f 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault.go @@ -1,6 +1,7 @@ package keyvault import ( + "context" "fmt" "log" "net/http" @@ -639,31 +640,34 @@ func resourceArmKeyVaultDelete(d *schema.ResourceData, meta interface{}) error { // Purge the soft deleted key vault permanently if the feature flag is enabled if meta.(*clients.Client).Features.KeyVault.PurgeSoftDeleteOnDestroy && softDeleteEnabled { - // Raise an error if the key vault is in the soft delete state and purge protection is enabled + // KeyVaults with Purge Protection Enabled cannot be deleted unless done by Azure if purgeProtectionEnabled { - delDate, purgeDate, err := azure.KeyVaultGetSoftDeletedState(ctx, client, name, location) - if err == nil { - if delDate != nil && purgeDate != nil { - return fmt.Errorf("unable to purge Key Vault %q (Resource Group %q) because it has purge protection enabled. The key vault was soft deleted on %s and is scheduled to be purged on %s", name, resourceGroup, delDate.(string), purgeDate.(string)) - } + deletedInfo, err := getSoftDeletedStateForKeyVault(ctx, client, name, location) + if err != nil { + return fmt.Errorf("Error retrieving the Deletion Details for KeyVault %q: %+v", name, err) + } - // I was unable to get the soft deleted and purge date information, error with a generic error as the key valit cannot be purged - return fmt.Errorf("unable to purge Key Vault %q (Resource Group %q) because it has purge protection enabled", name, resourceGroup) + // in the future it'd be nice to raise a warning, but this is the best we can do for now + if deletedInfo != nil { + log.Printf("[DEBUG] The Key Vault %q has Purge Protection Enabled and was deleted on %q. Azure will purge this on %q", name, deletedInfo.deleteDate, deletedInfo.purgeDate) + } else { + log.Printf("[DEBUG] The Key Vault %q has Purge Protection Enabled and will be purged automatically by Azure", name) } + return nil } - log.Printf("[DEBUG] KeyVault %s marked for purge, executing purge", name) - + log.Printf("[DEBUG] KeyVault %q marked for purge - executing purge", name) future, err := client.PurgeDeleted(ctx, name, location) if err != nil { return err } - log.Printf("[DEBUG] Waiting for purge of KeyVault %s", name) + log.Printf("[DEBUG] Waiting for purge of KeyVault %q..", name) err = future.WaitForCompletionRef(ctx, client.Client) if err != nil { return fmt.Errorf("Error purging Key Vault %q (Resource Group %q): %+v", name, resourceGroup, err) } + log.Printf("[DEBUG] Purged KeyVault %q.", name) } return nil @@ -792,3 +796,38 @@ Alternatively you can manually recover this (e.g. using the Azure CLI) and then this into Terraform via "terraform import", or pick a different name/location. `, name, location) } + +type keyVaultDeletionStatus struct { + deleteDate string + purgeDate string +} + +func getSoftDeletedStateForKeyVault(ctx context.Context, client *keyvault.VaultsClient, name string, location string) (*keyVaultDeletionStatus, error) { + softDel, err := client.GetDeleted(ctx, name, location) + if err != nil { + return nil, err + } + + // we found an existing key vault that is not soft deleted + if softDel.Properties == nil { + return nil, nil + } + + // the logic is this way because the GetDeleted call will return an existing key vault + // that is not soft deleted, but the Deleted Vault properties will be nil + props := *softDel.Properties + + result := keyVaultDeletionStatus{} + if props.DeletionDate != nil { + result.deleteDate = (*props.DeletionDate).Format(time.RFC3339) + } + if props.ScheduledPurgeDate != nil { + result.purgeDate = (*props.ScheduledPurgeDate).Format(time.RFC3339) + } + + if result.deleteDate == "" && result.purgeDate == "" { + return nil, nil + } + + return &result, nil +} From e85e4d1df46efbfca083e5364a21289b0319c301 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 21 Feb 2020 14:37:36 +0100 Subject: [PATCH 297/498] r/key_vault: updating the docs --- website/docs/r/key_vault.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/key_vault.html.markdown b/website/docs/r/key_vault.html.markdown index 918591ba6da2d..e5ab3ed5c6e0a 100644 --- a/website/docs/r/key_vault.html.markdown +++ b/website/docs/r/key_vault.html.markdown @@ -93,7 +93,7 @@ The following arguments are supported: * `purge_protection_enabled` - (Optional) Is Purge Protection enabled for this Key Vault? Defaults to `false`. -!> **Note:** Once Purge Protection has been Enabled it's not possible to Disable it. Support for [disabling purge protection is being tracked in this Azure API issue](https://github.com/Azure/azure-rest-api-specs/issues/8075). +!> **Note:** Once Purge Protection has been Enabled it's not possible to Disable it. Support for [disabling purge protection is being tracked in this Azure API issue](https://github.com/Azure/azure-rest-api-specs/issues/8075). Deleting the Key Vault with Purge Protection Enabled will schedule the Key Vault to be deleted (which will happen by Azure in the configured number of days, currently 90 days - which will be configurable in Terraform in the future). * `soft_delete_enabled` - (Optional) Should Soft Delete be enabled for this Key Vault? Defaults to `false`. From f08b9806d9363c6417df8c015c9cb4e5e018d33b Mon Sep 17 00:00:00 2001 From: jackofallops Date: Fri, 21 Feb 2020 13:38:30 +0000 Subject: [PATCH 298/498] fix for linux function apps --- .../services/web/resource_arm_function_app.go | 26 +++++++++++++++++++ .../tests/resource_arm_function_app_test.go | 1 + 2 files changed, 27 insertions(+) diff --git a/azurerm/internal/services/web/resource_arm_function_app.go b/azurerm/internal/services/web/resource_arm_function_app.go index 223d9d127804c..4765f28fd0120 100644 --- a/azurerm/internal/services/web/resource_arm_function_app.go +++ b/azurerm/internal/services/web/resource_arm_function_app.go @@ -143,6 +143,15 @@ func resourceArmFunctionApp() *schema.Resource { Computed: true, }, + "os_type": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + "linux", + }, false), + }, + "outbound_ip_addresses": { Type: schema.TypeString, Computed: true, @@ -307,6 +316,13 @@ func resourceArmFunctionAppCreate(d *schema.ResourceData, meta interface{}) erro location := azure.NormalizeLocation(d.Get("location").(string)) kind := "functionapp" + if osTypeRaw, ok := d.GetOk("os_type"); ok { + osType := osTypeRaw.(string) + if osType == "linux" { + kind = "functionapp,linux" + } + } + appServicePlanID := d.Get("app_service_plan_id").(string) enabled := d.Get("enabled").(bool) clientAffinityEnabled := d.Get("client_affinity_enabled").(bool) @@ -394,6 +410,12 @@ func resourceArmFunctionAppUpdate(d *schema.ResourceData, meta interface{}) erro location := azure.NormalizeLocation(d.Get("location").(string)) kind := "functionapp" + if osTypeRaw, ok := d.GetOk("os_type"); ok { + osType := osTypeRaw.(string) + if osType == "Linux" { + kind = "functionapp,linux" + } + } appServicePlanID := d.Get("app_service_plan_id").(string) enabled := d.Get("enabled").(bool) clientAffinityEnabled := d.Get("client_affinity_enabled").(bool) @@ -552,6 +574,10 @@ func resourceArmFunctionAppRead(d *schema.ResourceData, meta interface{}) error d.Set("resource_group_name", resGroup) d.Set("kind", resp.Kind) + if notWindows := strings.HasPrefix(*resp.Kind, "functionapp,linux"); notWindows { + d.Set("os_type", utils.String("linux")) + } + if location := resp.Location; location != nil { d.Set("location", azure.NormalizeLocation(*location)) } 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 ccc9d3c3468aa..cd38d86192ddc 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 @@ -1165,6 +1165,7 @@ resource "azurerm_function_app" "test" { resource_group_name = "${azurerm_resource_group.test.name}" app_service_plan_id = "${azurerm_app_service_plan.test.id}" storage_connection_string = "${azurerm_storage_account.test.primary_connection_string}" + os_type = "linux" site_config { linux_fx_version = "DOCKER|(golang:latest)" From 5cc9062615fc39ea7de502d86a5f9c7642cf6bfd Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 21 Feb 2020 14:47:41 +0100 Subject: [PATCH 299/498] r/key_vault: removing a superflurious if statement --- .../services/keyvault/resource_arm_key_vault.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault.go b/azurerm/internal/services/keyvault/resource_arm_key_vault.go index e479667616e1f..bd91a63452ad9 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault.go @@ -575,8 +575,6 @@ func resourceArmKeyVaultDelete(d *schema.ResourceData, meta interface{}) error { resourceGroup := id.ResourceGroup name := id.Path["vaults"] location := d.Get("location").(string) - purgeProtectionEnabled := false - softDeleteEnabled := false locks.ByName(name, keyVaultResourceName) defer locks.UnlockByName(name, keyVaultResourceName) @@ -595,13 +593,13 @@ func resourceArmKeyVaultDelete(d *schema.ResourceData, meta interface{}) error { } // Check to see if purge protection is enabled or not... - if read.Properties == nil { - if ppe := read.Properties.EnablePurgeProtection; ppe != nil { - purgeProtectionEnabled = *ppe - } - if sde := read.Properties.EnableSoftDelete; sde != nil { - softDeleteEnabled = *sde - } + purgeProtectionEnabled := false + if ppe := read.Properties.EnablePurgeProtection; ppe != nil { + purgeProtectionEnabled = *ppe + } + softDeleteEnabled := false + if sde := read.Properties.EnableSoftDelete; sde != nil { + softDeleteEnabled = *sde } // ensure we lock on the latest network names, to ensure we handle Azure's networking layer being limited to one change at a time From bba05e316ad7166d868c72c883fa5a879c3aeff7 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Fri, 21 Feb 2020 13:48:07 +0000 Subject: [PATCH 300/498] updated so os_type is always set --- azurerm/internal/services/web/resource_arm_function_app.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/azurerm/internal/services/web/resource_arm_function_app.go b/azurerm/internal/services/web/resource_arm_function_app.go index 4765f28fd0120..fd64184300153 100644 --- a/azurerm/internal/services/web/resource_arm_function_app.go +++ b/azurerm/internal/services/web/resource_arm_function_app.go @@ -573,10 +573,11 @@ func resourceArmFunctionAppRead(d *schema.ResourceData, meta interface{}) error d.Set("name", name) d.Set("resource_group_name", resGroup) d.Set("kind", resp.Kind) - - if notWindows := strings.HasPrefix(*resp.Kind, "functionapp,linux"); notWindows { - d.Set("os_type", utils.String("linux")) + osType := "" + if v := resp.Kind; v != nil && strings.Contains(*v, "linux") { + osType = "linux" } + d.Set("os_type", osType) if location := resp.Location; location != nil { d.Set("location", azure.NormalizeLocation(*location)) From de09d09529b9823a5b1157075ae82177f2867d14 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Fri, 21 Feb 2020 14:54:07 +0100 Subject: [PATCH 301/498] updating to include #5825 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a758a626c9e0..44910ded4b5bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -122,6 +122,7 @@ BUG FIXES: * `azurerm_linux_virtual_machine` - using the delete custom timeout during deletion [GH-5764] * `azurerm_network_interface` - the `dns_servers` field now respects ordering [GH-5784] * `azurerm_public_ip_prefix` - fixing the validation for the `prefix_length` to match the Azure API [GH-5693] +* `azurerm_recovery_services_vault` - using the requested cloud rather than the default [GH-5825] * `azurerm_role_assignment` - validating that the `name` is a UUID [GH-5624] * `azurerm_signalr_service` - ensuring the SignalR segment is parsed in the correct case [GH-5737] * `azurerm_subnet` - supporting updating of the `enforce_private_link_endpoint_network_policies` field [GH-5801] From 8fd1ad16842ce8e0d2f3f6ed5d79707eb2cb13f5 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Fri, 21 Feb 2020 14:11:15 +0000 Subject: [PATCH 302/498] Updated data source and docs --- .../services/web/data_source_function_app.go | 12 ++++++++++++ website/docs/d/function_app.html.markdown | 4 ++++ website/docs/r/function_app.html.markdown | 4 ++++ 3 files changed, 20 insertions(+) diff --git a/azurerm/internal/services/web/data_source_function_app.go b/azurerm/internal/services/web/data_source_function_app.go index c0ae357f58b49..bf4eb6e7a738e 100644 --- a/azurerm/internal/services/web/data_source_function_app.go +++ b/azurerm/internal/services/web/data_source_function_app.go @@ -2,6 +2,7 @@ package web import ( "fmt" + "strings" "time" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -94,6 +95,11 @@ func dataSourceArmFunctionApp() *schema.Resource { }, }, + "os_type": { + Type: schema.TypeString, + Computed: true, + }, + "outbound_ip_addresses": { Type: schema.TypeString, Computed: true, @@ -168,6 +174,12 @@ func dataSourceArmFunctionAppRead(d *schema.ResourceData, meta interface{}) erro d.Set("possible_outbound_ip_addresses", props.PossibleOutboundIPAddresses) } + osType := "" + if v := resp.Kind; v != nil && strings.Contains(*v, "linux") { + osType = "linux" + } + d.Set("os_type", osType) + appSettings := flattenAppServiceAppSettings(appSettingsResp.Properties) if err = d.Set("app_settings", appSettings); err != nil { diff --git a/website/docs/d/function_app.html.markdown b/website/docs/d/function_app.html.markdown index f14fea19cf7c2..6a712ed2aa379 100644 --- a/website/docs/d/function_app.html.markdown +++ b/website/docs/d/function_app.html.markdown @@ -46,6 +46,10 @@ The following attributes are exported: * `site_credential` - A `site_credential` block as defined below, which contains the site-level credentials used to publish to this App Service. +* `os_type` - A string indicating the Operating System type for this function app. + +~> **NOTE:** This value will be `linux` for Linux Derivatives or an empty string for Windows. + * `outbound_ip_addresses` - A comma separated list of outbound IP addresses. * `possible_outbound_ip_addresses` - A comma separated list of outbound IP addresses, not all of which are necessarily in use. Superset of `outbound_ip_addresses`. diff --git a/website/docs/r/function_app.html.markdown b/website/docs/r/function_app.html.markdown index 5ab0845ff8674..c2ac13f73ac39 100644 --- a/website/docs/r/function_app.html.markdown +++ b/website/docs/r/function_app.html.markdown @@ -109,6 +109,10 @@ The following arguments are supported: * `connection_string` - (Optional) An `connection_string` block as defined below. +* `os_type` - (Optional) A string indicating the Operating System type for this function app. + +~> **NOTE:** This value will be `linux` for Linux Derivatives or an empty string for Windows (default). + * `client_affinity_enabled` - (Optional) Should the Function App send session affinity cookies, which route client requests in the same session to the same instance? * `enabled` - (Optional) Is the Function App enabled? From 70789a0f25c26fe9d775f6c4cc20568a2f8cc38d Mon Sep 17 00:00:00 2001 From: Steve <11830746+jackofallops@users.noreply.github.com> Date: Fri, 21 Feb 2020 14:27:56 +0000 Subject: [PATCH 303/498] Adding 5832 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44910ded4b5bd..ef1bdcb0a93d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -105,6 +105,7 @@ BREAKING CHANGES: * `azurerm_subnet` - removing the deprecated `network_security_group_id` field [GH-5801] * `azurerm_subnet` - removing the deprecated `route_table_id` field [GH-5801] * `azurerm_subnet` - making the `actions` list within the `service_delegation` block within the `service_endpoints` block non-computed [GH-5801] +* `azurerm_virtual_network_peering` - `allow_virtual_network_access` now defaults to true, matching the API and Portal behaviours. IMPROVEMENTS: From cd303d409dfff514e452c4a97c15f389e7688110 Mon Sep 17 00:00:00 2001 From: Steve <11830746+jackofallops@users.noreply.github.com> Date: Fri, 21 Feb 2020 14:29:04 +0000 Subject: [PATCH 304/498] adding gh marker for 5832 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef1bdcb0a93d7..9a68d077a34fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -105,7 +105,7 @@ BREAKING CHANGES: * `azurerm_subnet` - removing the deprecated `network_security_group_id` field [GH-5801] * `azurerm_subnet` - removing the deprecated `route_table_id` field [GH-5801] * `azurerm_subnet` - making the `actions` list within the `service_delegation` block within the `service_endpoints` block non-computed [GH-5801] -* `azurerm_virtual_network_peering` - `allow_virtual_network_access` now defaults to true, matching the API and Portal behaviours. +* `azurerm_virtual_network_peering` - `allow_virtual_network_access` now defaults to true, matching the API and Portal behaviours. [GH-5832] IMPROVEMENTS: From 8800991d4b032ab714d9bb8527997539b615b280 Mon Sep 17 00:00:00 2001 From: Steve <11830746+jackofallops@users.noreply.github.com> Date: Fri, 21 Feb 2020 14:34:48 +0000 Subject: [PATCH 305/498] Added 5833 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a68d077a34fe..8756fe34ffb10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -120,6 +120,7 @@ IMPROVEMENTS: BUG FIXES: * `azurerm_application_insights` - the `application_type` field is now case sensitive as documented [GH-5817] +* `azurerm_api_management_api` - allows blank `path` field [GH-5833] * `azurerm_linux_virtual_machine` - using the delete custom timeout during deletion [GH-5764] * `azurerm_network_interface` - the `dns_servers` field now respects ordering [GH-5784] * `azurerm_public_ip_prefix` - fixing the validation for the `prefix_length` to match the Azure API [GH-5693] From dc7b871daf0d257a9bc1298a98d96a6db2831fc8 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 21 Feb 2020 15:39:13 +0100 Subject: [PATCH 306/498] r/keyvault: removing dead code --- .../keyvault/tests/resource_arm_key_vault_test.go | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go index 8bdab40ae03d2..83e065aa250eb 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go @@ -1084,17 +1084,6 @@ resource "azurerm_key_vault" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } -func testAccAzureRMKeyVault_softDeletePurge(data acceptance.TestData) string { - return fmt.Sprintf(` -data "azurerm_client_config" "current" {} - -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} -`, data.RandomInteger, data.Locations.Primary) -} - func testAccAzureRMKeyVault_purgeProtectionAndSoftDelete(data acceptance.TestData) string { return fmt.Sprintf(` data "azurerm_client_config" "current" {} From 415d4fd2d8e0915b99c99508bfd0238d40fe9092 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 21 Feb 2020 16:38:40 +0100 Subject: [PATCH 307/498] r/keyvault: fixing the soft delete disabled test --- .../keyvault/tests/data_source_key_vault_test.go | 3 --- .../keyvault/tests/resource_arm_key_vault_test.go | 10 +++++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go b/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go index e96326fbc1ad5..9ee79eed75f87 100644 --- a/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go @@ -104,9 +104,6 @@ func TestAccDataSourceAzureRMKeyVault_softDelete(t *testing.T) { resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "0"), ), }, - { - Config: testAccAzureRMKeyVault_softDeleteAbsent(data), - }, }, }) } diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go index 83e065aa250eb..c4472598ea9f9 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go @@ -357,7 +357,7 @@ func TestAccAzureRMKeyVault_softDeleteRecoveryDisabled(t *testing.T) { Steps: []resource.TestStep{ { // create it regularly - Config: testAccAzureRMKeyVault_softDelete(data, true), + Config: testAccAzureRMKeyVault_softDeleteRecoveryDisabled(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMKeyVaultExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "soft_delete_enabled", "true"), @@ -1047,6 +1047,14 @@ resource "azurerm_key_vault" "test" { func testAccAzureRMKeyVault_softDeleteAbsent(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features { + key_vault { + recover_soft_deleted_key_vaults = false + } + } +} + data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { From 7bf15efacd60b54762899eb1ceae3a851aafc90b Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 21 Feb 2020 17:00:52 +0100 Subject: [PATCH 308/498] linting --- .../tests/resource_arm_key_vault_test.go | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go index c4472598ea9f9..f308e2ae1d5f7 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go @@ -1035,12 +1035,12 @@ resource "azurerm_resource_group" "test" { } resource "azurerm_key_vault" "test" { - name = "vault%d" - location = azurerm_resource_group.test.location - resource_group_name = azurerm_resource_group.test.name - tenant_id = data.azurerm_client_config.current.tenant_id - sku_name = "premium" - soft_delete_enabled = %t + name = "vault%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + tenant_id = data.azurerm_client_config.current.tenant_id + sku_name = "premium" + soft_delete_enabled = %t } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, enabled) } @@ -1049,9 +1049,9 @@ func testAccAzureRMKeyVault_softDeleteAbsent(data acceptance.TestData) string { return fmt.Sprintf(` provider "azurerm" { features { - key_vault { - recover_soft_deleted_key_vaults = false - } + key_vault { + recover_soft_deleted_key_vaults = false + } } } @@ -1068,9 +1068,9 @@ func testAccAzureRMKeyVault_softDeleteRecoveryDisabled(data acceptance.TestData) return fmt.Sprintf(` provider "azurerm" { features { - key_vault { - recover_soft_deleted_key_vaults = false - } + key_vault { + recover_soft_deleted_key_vaults = false + } } } @@ -1082,12 +1082,12 @@ resource "azurerm_resource_group" "test" { } resource "azurerm_key_vault" "test" { - name = "vault%d" - location = azurerm_resource_group.test.location - resource_group_name = azurerm_resource_group.test.name - tenant_id = data.azurerm_client_config.current.tenant_id - sku_name = "premium" - soft_delete_enabled = true + name = "vault%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + tenant_id = data.azurerm_client_config.current.tenant_id + sku_name = "premium" + soft_delete_enabled = true } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } From aa72687d069df8223766861ced8ce38a4be9a418 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Fri, 21 Feb 2020 18:47:33 +0100 Subject: [PATCH 309/498] updating to include #5344 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8756fe34ffb10..0ea2dc970cad9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -111,6 +111,8 @@ IMPROVEMENTS: * Data Source: `azurerm_kubernetes_service_version` - support for filtering of preview releases [GH-5662] * `azurerm_dedicated_host` - support for setting `sku_name` to `DSv3-Type2` and `ESv3-Type2` [GH-5768] +* `azurerm_key_vault` - support for configuring `purge_protection_enabled` [GH-5344] +* `azurerm_key_vault` - support for configuring `soft_delete_enabled` [GH-5344] * `azurerm_sql_database` - support for configuring `zone_redundant` [GH-5772] * `azurerm_storage_account` - support for configuring the `static_website` block [GH-5649] * `azurerm_storage_account` - support for configuring `cors_rules` within the `blob_properties` block [GH-5425] From 68260564bd2098c47f02b7b063df91473a8ea7c2 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Fri, 21 Feb 2020 19:05:47 +0100 Subject: [PATCH 310/498] updating to include #5831 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ea2dc970cad9..50f7f14adf3a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -123,6 +123,8 @@ BUG FIXES: * `azurerm_application_insights` - the `application_type` field is now case sensitive as documented [GH-5817] * `azurerm_api_management_api` - allows blank `path` field [GH-5833] +* `azurerm_eventhub_namespace` - the field `ip_rule` within the `network_rulesets` block now supports a maximum of 128 items [GH-5831] +* `azurerm_eventhub_namespace` - the field `virtual_network_rule` within the `network_rulesets` block now supports a maximum of 128 items [GH-5831] * `azurerm_linux_virtual_machine` - using the delete custom timeout during deletion [GH-5764] * `azurerm_network_interface` - the `dns_servers` field now respects ordering [GH-5784] * `azurerm_public_ip_prefix` - fixing the validation for the `prefix_length` to match the Azure API [GH-5693] From 2105c25e2107387628d17f96048fb6742bcf6d13 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 21 Feb 2020 20:45:56 +0100 Subject: [PATCH 311/498] fixing comments from code review --- azurerm/helpers/azure/app_service.go | 8 +++++++- website/docs/r/virtual_machine_extension.html.markdown | 3 +-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/azurerm/helpers/azure/app_service.go b/azurerm/helpers/azure/app_service.go index 0cd460d6a840c..fd9ae4b636f2e 100644 --- a/azurerm/helpers/azure/app_service.go +++ b/azurerm/helpers/azure/app_service.go @@ -14,6 +14,11 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) +const ( + // TODO: switch back once https://github.com/Azure/azure-rest-api-specs/pull/8435 has been fixed + SystemAssignedUserAssigned web.ManagedServiceIdentityType = "SystemAssigned, UserAssigned" +) + func SchemaAppServiceAadAuthSettings() *schema.Schema { return &schema.Schema{ Type: schema.TypeList, @@ -225,6 +230,7 @@ func SchemaAppServiceIdentity() *schema.Schema { ValidateFunc: validation.StringInSlice([]string{ string(web.ManagedServiceIdentityTypeNone), string(web.ManagedServiceIdentityTypeSystemAssigned), + string(SystemAssignedUserAssigned), string(web.ManagedServiceIdentityTypeUserAssigned), }, true), DiffSuppressFunc: suppress.CaseDifference, @@ -1309,7 +1315,7 @@ func ExpandAppServiceIdentity(input []interface{}) *web.ManagedServiceIdentity { Type: identityType, } - if managedServiceIdentity.Type == web.ManagedServiceIdentityTypeUserAssigned { + if managedServiceIdentity.Type == web.ManagedServiceIdentityTypeUserAssigned || managedServiceIdentity.Type == SystemAssignedUserAssigned { managedServiceIdentity.UserAssignedIdentities = identityIds } diff --git a/website/docs/r/virtual_machine_extension.html.markdown b/website/docs/r/virtual_machine_extension.html.markdown index 531f8dd904756..ff7c5ada4052e 100644 --- a/website/docs/r/virtual_machine_extension.html.markdown +++ b/website/docs/r/virtual_machine_extension.html.markdown @@ -132,8 +132,7 @@ The following arguments are supported: * `name` - (Required) The name of the virtual machine extension peering. Changing this forces a new resource to be created. - -* `virtual_machine_id` - (Required) The resource ID of the virtual machine. Changing this forces a new resource to be created +* `virtual_machine_id` - (Required) The ID of the Virtual Machine. Changing this forces a new resource to be created * `publisher` - (Required) The publisher of the extension, available publishers can be found by using the Azure CLI. From 68737615e1aedc763977ab4e25cdfb6e665b8614 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Fri, 21 Feb 2020 21:43:06 +0100 Subject: [PATCH 312/498] updating to include #5823 --- CHANGELOG.md | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50f7f14adf3a0..1832848d4279d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,10 @@ FEATURES: BREAKING CHANGES: +* The Environment Variable `DISABLE_CORRELATION_REQUEST_ID` has been renamed to `ARM_DISABLE_CORRELATION_REQUEST_ID` to match the other Environment Variables +* The field `tags` is no longer `computed` * Data Source: `azurerm_api_management` - removing the deprecated `sku` block [GH-5725] +* Data Source: `azurerm_app_service` - removing the deprecated field `subnet_mask` from the `site_config` block [GH-5823] * Data Source: `azurerm_app_service_plan` - the deprecated `properties` block has been removed since these properties have been moved to the top level [GH-5717] * Data Source: `azurerm_azuread_application` - This data source has been removed since it was deprecated [GH-5748] * Data Source: `azurerm_azuread_service_principal` - This data source has been removed since it was deprecated [GH-5748] @@ -31,12 +34,28 @@ BREAKING CHANGES: * Data Source: `azurerm_key_vault` - removing the `sku` block since this has been deprecated in favour of the `sku_name` field [GH-5774] * Data Source: `azurerm_key_vault_key` - removing the deprecated `vault_uri` field [GH-5774] * Data Source: `azurerm_key_vault_secret` - removing the deprecated `vault_uri` field [GH-5774] +* Data Source: `azurerm_kubernetes_cluster` - removing the field `dns_prefix` from the `agent_pool_profile` block [GH-5823] +* Data Source: `azurerm_network_interface` - removing the deprecated field `internal_fqdn` [GH-5823] +* Data Source: `azurerm_private_link_service` - removing the deprecated field `network_interface_ids` [GH-5823] * Data Source: `azurerm_role_definition` - removing the alias `VirtualMachineContributor` which has been deprecated in favour of the full name `Virtual Machine Contributor` [GH-5733] * Data Source: `azurerm_scheduler_job_collection` - This data source has been removed since it was deprecated [GH-5712] * Data Source: `azurerm_subnet` - removing the deprecated `ip_configuration` field [GH-5801] +* Data Source: `azurerm_virtual_network` - removing the deprecated `address_spaces` field [GH-5823] * `azurerm_api_management` - removing the deprecated `sku` block [GH-5725] * `azurerm_api_management` - removing the deprecated fields in the `security` block [GH-5725] +* `azurerm_application_gateway` - the field `fqdns` within the `backend_address_pool` block is no longer computed [GH-5823] +* `azurerm_application_gateway` - the field `ip_addresses` within the `backend_address_pool` block is no longer computed [GH-5823] +* `azurerm_application_gateway` - the deprecated field `fqdn_list` within the `backend_address_pool` block has been removed [GH-5823] +* `azurerm_application_gateway` - the deprecated field `ip_address_list` within the `backend_address_pool` block has been removed [GH-5823] +* `azurerm_application_gateway` - the deprecated field `disabled_ssl_protocols` has been removed [GH-5823] +* `azurerm_application_gateway` - the field `disabled_protocols` within the `ssl_policy` block is no longer computed [GH-5823] +* `azurerm_app_service` - removing the field `subnet_mask` from the `site_config` block [GH-5823] +* `azurerm_app_service` - the field `ip_address` within the `site_config` block now refers to a CIDR block, rather than an IP Address to match the Azure API [GH-5823] +* `azurerm_app_service` - removing the field `virtual_network_name` from the `site_config` block [GH-5823] * `azurerm_app_service_plan` - the deprecated `properties` block has been removed since these properties have been moved to the top level [GH-5717] +* `azurerm_app_service_slot` - removing the field `subnet_mask` from the `site_config` block [GH-5823] +* `azurerm_app_service_slot` - the field `ip_address` within the `site_config` block now refers to a CIDR block, rather than an IP Address to match the Azure API [GH-5823] +* `azurerm_app_service_slot` - removing the field `virtual_network_name` from the `site_config` block [GH-5823] * `azurerm_application_gateway` - updating the default value for the `body` field within the `match` block from `*` to an empty string [GH-5752] * `azurerm_automation_account` - removing the `sku` block which has been deprecated in favour of the `sku_name` field [GH-5781] * `azurerm_automation_credential` - removing the deprecated `account_name` field [GH-5781] @@ -46,7 +65,15 @@ BREAKING CHANGES: * `azurerm_azuread_application` - This resource has been removed since it was deprecated [GH-5748] * `azurerm_azuread_service_principal_password` - This resource has been removed since it was deprecated [GH-5748] * `azurerm_azuread_service_principal` - This resource has been removed since it was deprecated [GH-5748] +* `azurerm_client_config` - removing the deprecated field `service_principal_application_id` [GH-5823] +* `azurerm_client_config` - removing the deprecated field `service_principal_object_id` [GH-5823] * `azurerm_cognitive_account` - removing the deprecated `sku_name` block [GH-5797] +* `azurerm_container_group` - removing the `port` field from the `container` block [GH-5823] +* `azurerm_container_group` - removing the `protocol` field from the `container` block [GH-5823] +* `azurerm_container_group` - the `ports` field is no longer Computed [GH-5823] +* `azurerm_container_group` - the `protocol` field within the `ports` block is no longer Computed and now defaults to `TCP` [GH-5823] +* `azurerm_container_group` - removing the deprecated field `command` [GH-5823] +* `azurerm_container_registry` - removing the deprecated `storage_account` block [GH-5823] * `azurerm_container_service` - This resource has been removed since it was deprecated [GH-5709] * `azurerm_devspace_controller` - removing the deprecated `sku` block [GH-5795] * `azurerm_dns_cname_record` - removing the deprecated `records` field [GH-5794] @@ -59,7 +86,11 @@ BREAKING CHANGES: * `azurerm_eventhub_consumer_group` - removing the deprecated `location` field [GH-5793] * `azurerm_eventhub_namespace` - removing the deprecated `kafka_enabled` field since this is now managed by Azure [GH-5793] * `azurerm_eventhub_namespace_authorization_rule` - removing the deprecated `location` field [GH-5793] +* `azurerm_firewall` - removing the deprecated field `internal_public_ip_address_id` from the `ip_configuration` block [GH-5823] +* `azurerm_firewall` - the field `public_ip_address_id` within the `ip_configuration` block is now required [GH-5823] * `azurerm_frontdoor` - The `forwarding_protocol` property now defaults to `HttpsOnly` [GH-5792] +* `azurerm_function_app` - removing the field `virtual_network_name` from the `site_config` block [GH-5823] +* `azurerm_function_app` - updating the field `ip_address` within the `ip_restriction` block to accept a CIDR rather than an IP Address to match the updated API behaviour [GH-5823] * `azurerm_iot_dps` - This resource has been removed since it was deprecated [GH-5753] * `azurerm_iot_dps_certificate` - This resource has been removed since it was deprecated [GH-5753] * `azurerm_iothub`- The deprecated `sku.tier` property will be removed. [GH-5790] @@ -71,6 +102,14 @@ BREAKING CHANGES: * `azurerm_key_vault_key` - removing the deprecated `vault_uri` field [GH-5774] * `azurerm_key_vault_secret` - removing the deprecated `vault_uri` field [GH-5774] * `azurerm_kubernetes_cluster` - updating the default value for `load_balancer_sku` to `Standard` from `Basic` [GH-5747] +* `azurerm_kubernetes_cluster` - the block `default_node_pool` is now required [GH-5823] +* `azurerm_kubernetes_cluster` - removing the deprecated `agent_pool_profile` block [GH-5823] +* `azurerm_kubernetes_cluster` - the field `enable_pod_security_policy` is no longer computed [GH-5823] +* `azurerm_lb_backend_address_pool` - removing the deprecated `location` field [GH-5823] +* `azurerm_lb_nat_pool` - removing the deprecated `location` field [GH-5823] +* `azurerm_lb_nat_rule` - removing the deprecated `location` field [GH-5823] +* `azurerm_lb_probe` - removing the deprecated `location` field [GH-5823] +* `azurerm_lb_rule` - removing the deprecated `location` field [GH-5823] * `azurerm_log_analytics_workspace_linked_service` - This resource has been removed since it was deprecated [GH-5754] * `azurerm_log_analytics_linked_service` - The `resource_id` field has been moved from the `linked_service_properties` block to the top-level and the deprecated field `linked_service_properties` will be removed. This has been replaced by the `resource_id` resource [GH-5775] * `azurerm_maps_account` - the `sku_name` field is now case-sensitive [GH-5776] @@ -87,6 +126,9 @@ BREAKING CHANGES: * `azurerm_network_interface` - the `virtual_machine_id` field is now computed-only since it's not setable [GH-5784] * `azurerm_notification_hub_namesapce` - removing the `sku` block in favour of the `sku_name` argument [GH-5722] * `azurerm_postgresql_server` - removing the `sku` block which has been deprecated in favour of the `sku_name` field [GH-5721] +* `azurerm_private_link_service` - removing the deprecated field `network_interface_ids` [GH-5823] +* `azurerm_public_ip` - making the `allocation_method` field required [GH-5823] +* `azurerm_public_ip` - removing the deprecated field `public_ip_address_allocation` [GH-5823] * `azurerm_relay_namespace` - removing the `sku` block in favour of the `sku_name` field [GH-5719] * `azurerm_scheduler_job` - This resource has been removed since it was deprecated [GH-5712] * `azurerm_scheduler_job_collection` - This resource has been removed since it was deprecated [GH-5712] @@ -106,9 +148,11 @@ BREAKING CHANGES: * `azurerm_subnet` - removing the deprecated `route_table_id` field [GH-5801] * `azurerm_subnet` - making the `actions` list within the `service_delegation` block within the `service_endpoints` block non-computed [GH-5801] * `azurerm_virtual_network_peering` - `allow_virtual_network_access` now defaults to true, matching the API and Portal behaviours. [GH-5832] +* `azurerm_virtual_wan` - removing the deprecated field `security_provider_name` [GH-5823] IMPROVEMENTS: +* web: updating to API version `2019-08-01` [GH-5823] * Data Source: `azurerm_kubernetes_service_version` - support for filtering of preview releases [GH-5662] * `azurerm_dedicated_host` - support for setting `sku_name` to `DSv3-Type2` and `ESv3-Type2` [GH-5768] * `azurerm_key_vault` - support for configuring `purge_protection_enabled` [GH-5344] From 13e50e11c395bba6b4e51bc1b0719a258ed0811d Mon Sep 17 00:00:00 2001 From: jackofallops Date: Fri, 24 Jan 2020 08:59:24 +0000 Subject: [PATCH 313/498] Adds new resource and datasource for App Serice Environment (v2 support only) Replaces https://github.com/terraform-providers/terraform-provider-azurerm/pull/4956/ Co-authored-by: @justinbarias --- azurerm/internal/services/network/subnet.go | 54 ++++ .../services/network/virtual_network.go | 49 +++ .../services/web/app_service_environment.go | 74 +++++ .../web/app_service_environment_test.go | 103 ++++++ .../internal/services/web/client/client.go | 26 +- .../data_source_app_service_environment.go | 72 +++++ azurerm/internal/services/web/registration.go | 6 +- .../resource_arm_app_service_environment.go | 282 ++++++++++++++++ ...ata_source_app_service_environment_test.go | 39 +++ ...source_arm_app_service_environment_test.go | 302 ++++++++++++++++++ vendor/modules.txt | 1 + .../d/app_service_environment.html.markdown | 43 +++ .../r/app_service_environment.html.markdown | 84 +++++ 13 files changed, 1123 insertions(+), 12 deletions(-) create mode 100644 azurerm/internal/services/network/subnet.go create mode 100644 azurerm/internal/services/network/virtual_network.go create mode 100644 azurerm/internal/services/web/app_service_environment.go create mode 100644 azurerm/internal/services/web/app_service_environment_test.go create mode 100644 azurerm/internal/services/web/data_source_app_service_environment.go create mode 100644 azurerm/internal/services/web/resource_arm_app_service_environment.go create mode 100644 azurerm/internal/services/web/tests/data_source_app_service_environment_test.go create mode 100644 azurerm/internal/services/web/tests/resource_arm_app_service_environment_test.go create mode 100644 website/docs/d/app_service_environment.html.markdown create mode 100644 website/docs/r/app_service_environment.html.markdown diff --git a/azurerm/internal/services/network/subnet.go b/azurerm/internal/services/network/subnet.go new file mode 100644 index 0000000000000..b6a4994df3f09 --- /dev/null +++ b/azurerm/internal/services/network/subnet.go @@ -0,0 +1,54 @@ +package network + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type SubnetID struct { + ResourceGroup string + VirtualNetworkName string + Name string +} + +func ParseSubnetID(input string) (*SubnetID, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("[ERROR] Unable to parse Subnet ID %q: %+v", input, err) + } + + subnet := SubnetID{ + ResourceGroup: id.ResourceGroup, + } + + if subnet.VirtualNetworkName, err = id.PopSegment("virtualNetworks"); err != nil { + return nil, err + } + + if subnet.Name, err = id.PopSegment("subnets"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &subnet, nil +} + +// ValidateSubnetID validates that the specified ID is a valid App Service ID +func ValidateSubnetID(i interface{}, k string) (warnings []string, errors []error) { + v, ok := i.(string) + if !ok { + errors = append(errors, fmt.Errorf("expected type of %q to be string", k)) + return + } + + if _, err := ParseSubnetID(v); err != nil { + errors = append(errors, fmt.Errorf("Can not parse %q as a resource id: %v", k, err)) + return + } + + return warnings, errors +} diff --git a/azurerm/internal/services/network/virtual_network.go b/azurerm/internal/services/network/virtual_network.go new file mode 100644 index 0000000000000..ffd47239f6ff4 --- /dev/null +++ b/azurerm/internal/services/network/virtual_network.go @@ -0,0 +1,49 @@ +package network + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type VirtualNetworkID struct { + ResourceGroup string + Name string +} + +func ParseVirtualNetworkID(input string) (*VirtualNetworkID, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("[ERROR] Unable to parse Subnet ID %q: %+v", input, err) + } + + vnet := VirtualNetworkID{ + ResourceGroup: id.ResourceGroup, + } + + if vnet.Name, err = id.PopSegment("virtualNetworks"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &vnet, nil +} + +// ValidateVirtualNetworkID validates that the specified ID is a valid App Service ID +func ValidateVirtualNetworkID(i interface{}, k string) (warnings []string, errors []error) { + v, ok := i.(string) + if !ok { + errors = append(errors, fmt.Errorf("expected type of %q to be string", k)) + return + } + + if _, err := ParseVirtualNetworkID(v); err != nil { + errors = append(errors, fmt.Errorf("Can not parse %q as a resource id: %v", k, err)) + return + } + + return warnings, errors +} diff --git a/azurerm/internal/services/web/app_service_environment.go b/azurerm/internal/services/web/app_service_environment.go new file mode 100644 index 0000000000000..6f4eba92fc6aa --- /dev/null +++ b/azurerm/internal/services/web/app_service_environment.go @@ -0,0 +1,74 @@ +package web + +import ( + "fmt" + "regexp" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type AppServiceEnvironmentResourceID struct { + ResourceGroup string + Name string +} + +func ParseAppServiceEnvironmentID(input string) (*AppServiceEnvironmentResourceID, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("[ERROR] Unable to parse App Service Environment ID %q: %+v", input, err) + } + + appServiceEnvironment := AppServiceEnvironmentResourceID{ + ResourceGroup: id.ResourceGroup, + } + + if appServiceEnvironment.Name, err = id.PopSegment("hostingEnvironments"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &appServiceEnvironment, nil +} + +// ValidateAppServiceID validates that the specified ID is a valid App Service ID +func ValidateAppServiceEnvironmentID(i interface{}, k string) (warnings []string, errors []error) { + v, ok := i.(string) + if !ok { + errors = append(errors, fmt.Errorf("expected type of %q to be string", k)) + return + } + + if _, err := ParseAppServiceEnvironmentID(v); err != nil { + errors = append(errors, fmt.Errorf("Can not parse %q as a resource id: %v", k, err)) + return + } + + return warnings, errors +} + +func validateAppServiceEnvironmentName(v interface{}, k string) (warnings []string, errors []error) { + value := v.(string) + + if matched := regexp.MustCompile(`^[0-9a-zA-Z][-0-9a-zA-Z]{0,61}[0-9a-zA-Z]$`).Match([]byte(value)); !matched { + errors = append(errors, fmt.Errorf("%q may only contain alphanumeric characters and dashes up to 60 characters in length, and must start and end in an alphanumeric", k)) + } + + return warnings, errors +} + +func validateAppServiceEnvironmentPricingTier(v interface{}, k string) (warnings []string, errors []error) { + tier := v.(string) + + valid := []string{"I1", "I2", "I3"} + + for _, val := range valid { + if val == tier { + return + } + } + errors = append(errors, fmt.Errorf("pricing_tier must be one of %q", valid)) + return warnings, errors +} diff --git a/azurerm/internal/services/web/app_service_environment_test.go b/azurerm/internal/services/web/app_service_environment_test.go new file mode 100644 index 0000000000000..942cac22492f6 --- /dev/null +++ b/azurerm/internal/services/web/app_service_environment_test.go @@ -0,0 +1,103 @@ +package web + +import "testing" + +func TestParseAppServiceEnvironmentID(t *testing.T) { + testData := []struct { + Name string + Input string + Expected *AppServiceEnvironmentResourceID + }{ + { + Name: "Empty", + Input: "", + Expected: nil, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Expected: nil, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Expected: nil, + }, + { + Name: "Resource Group ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", + Expected: nil, + }, + { + Name: "Missing environment name value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/providers/Microsoft.Web/hostingEnvironments/", + Expected: nil, + }, + { + Name: "Valid", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup1/providers/Microsoft.Web/hostingEnvironments/TestASEv2", + Expected: &AppServiceEnvironmentResourceID{ + ResourceGroup: "testGroup1", + Name: "TestASEv2", + }, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Name) + + actual, err := ParseAppServiceEnvironmentID(v.Input) + if err != nil { + if v.Expected == nil { + continue + } + + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.Name != v.Expected.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expected.Name, actual.Name) + } + + if actual.ResourceGroup != v.Expected.ResourceGroup { + t.Fatalf("Expected %q but got %q for Resource Group", v.Expected.ResourceGroup, actual.ResourceGroup) + } + } +} + +func TestValidateAppServiceEnvironmentID(t *testing.T) { + cases := []struct { + ID string + Valid bool + }{ + { + ID: "", + Valid: false, + }, + { + ID: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Valid: false, + }, + { + ID: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/", + Valid: false, + }, + { + ID: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/providers/Microsoft.Web/hostingEnvironments/", + Valid: false, + }, + { + ID: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup1/providers/Microsoft.Web/hostingEnvironments/TestASEv2", + Valid: true, + }, + } + for _, tc := range cases { + t.Logf("[DEBUG] Testing Value %s", tc.ID) + _, errors := ValidateAppServiceEnvironmentID(tc.ID, "test") + valid := len(errors) == 0 + + if tc.Valid != valid { + t.Fatalf("Expected %t but got %t", tc.Valid, valid) + } + } +} diff --git a/azurerm/internal/services/web/client/client.go b/azurerm/internal/services/web/client/client.go index 696f8b593547b..0ff3d10a458cf 100644 --- a/azurerm/internal/services/web/client/client.go +++ b/azurerm/internal/services/web/client/client.go @@ -2,18 +2,23 @@ package client import ( "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" + asev2 "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common" ) type Client struct { - AppServicePlansClient *web.AppServicePlansClient - AppServicesClient *web.AppsClient - BaseClient *web.BaseClient - CertificatesClient *web.CertificatesClient - CertificatesOrderClient *web.AppServiceCertificateOrdersClient + AppServiceEnvironmentsClient *asev2.AppServiceEnvironmentsClient + AppServicePlansClient *web.AppServicePlansClient + AppServicesClient *web.AppsClient + BaseClient *web.BaseClient + CertificatesClient *web.CertificatesClient + CertificatesOrderClient *web.AppServiceCertificateOrdersClient } func NewClient(o *common.ClientOptions) *Client { + appServiceEnvironmentsClient := asev2.NewAppServiceEnvironmentsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) + o.ConfigureClient(&appServiceEnvironmentsClient.Client, o.ResourceManagerAuthorizer) + appServicePlansClient := web.NewAppServicePlansClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&appServicePlansClient.Client, o.ResourceManagerAuthorizer) @@ -30,10 +35,11 @@ func NewClient(o *common.ClientOptions) *Client { o.ConfigureClient(&certificatesOrderClient.Client, o.ResourceManagerAuthorizer) return &Client{ - AppServicePlansClient: &appServicePlansClient, - AppServicesClient: &appServicesClient, - BaseClient: &baseClient, - CertificatesClient: &certificatesClient, - CertificatesOrderClient: &certificatesOrderClient, + AppServiceEnvironmentsClient: &appServiceEnvironmentsClient, + AppServicePlansClient: &appServicePlansClient, + AppServicesClient: &appServicesClient, + BaseClient: &baseClient, + CertificatesClient: &certificatesClient, + CertificatesOrderClient: &certificatesOrderClient, } } diff --git a/azurerm/internal/services/web/data_source_app_service_environment.go b/azurerm/internal/services/web/data_source_app_service_environment.go new file mode 100644 index 0000000000000..c95e62f39355c --- /dev/null +++ b/azurerm/internal/services/web/data_source_app_service_environment.go @@ -0,0 +1,72 @@ +package web + +import ( + "fmt" + "time" + + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func dataSourceArmAppServiceEnvironment() *schema.Resource { + return &schema.Resource{ + Read: dataSourceArmAppServiceEnvironmentRead, + + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(5 * time.Minute), + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "resource_group_name": azure.SchemaResourceGroupNameForDataSource(), + + "front_end_scale_factor": { + Type: schema.TypeInt, + Computed: true, + }, + + "pricing_tier": { + Type: schema.TypeString, + Computed: true, + }, + + "tags": tags.SchemaDataSource(), + }, + } +} + +func dataSourceArmAppServiceEnvironmentRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Web.AppServiceEnvironmentsClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + resourceGroup := d.Get("resource_group_name").(string) + name := d.Get("name").(string) + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Error: App Service Environment %q (Resource Group %q) was not found", name, resourceGroup) + } + return fmt.Errorf("Error making read request on Azure App Service Environment %q: %+v", name, err) + } + + d.SetId(*resp.ID) + + d.Set("name", name) + d.Set("resource_group_name", resourceGroup) + d.Set("front_end_scale_factor", int(*resp.FrontEndScaleFactor)) + d.Set("pricing_tier", convertToIsolatedSKU(*resp.MultiSize)) + d.Set("location", azure.NormalizeLocation(*resp.Location)) + + return tags.FlattenAndSet(d, resp.Tags) +} diff --git a/azurerm/internal/services/web/registration.go b/azurerm/internal/services/web/registration.go index 53fc4553211b6..37589d215f5b3 100644 --- a/azurerm/internal/services/web/registration.go +++ b/azurerm/internal/services/web/registration.go @@ -21,10 +21,11 @@ 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_app_service_plan": dataSourceAppServicePlan(), - "azurerm_app_service_certificate": dataSourceAppServiceCertificate(), "azurerm_app_service": dataSourceArmAppService(), "azurerm_app_service_certificate_order": dataSourceArmAppServiceCertificateOrder(), + "azurerm_app_service_environment": dataSourceArmAppServiceEnvironment(), + "azurerm_app_service_certificate": dataSourceAppServiceCertificate(), //TODO: rename this for consistency? + "azurerm_app_service_plan": dataSourceAppServicePlan(), //TODO: rename this for consistency? "azurerm_function_app": dataSourceArmFunctionApp(), } } @@ -36,6 +37,7 @@ func (r Registration) SupportedResources() map[string]*schema.Resource { "azurerm_app_service_certificate": resourceArmAppServiceCertificate(), "azurerm_app_service_certificate_order": resourceArmAppServiceCertificateOrder(), "azurerm_app_service_custom_hostname_binding": resourceArmAppServiceCustomHostnameBinding(), + "azurerm_app_service_environment": resourceArmAppServiceEnvironment(), "azurerm_app_service_plan": resourceArmAppServicePlan(), "azurerm_app_service_slot": resourceArmAppServiceSlot(), "azurerm_app_service_source_control_token": resourceArmAppServiceSourceControlToken(), diff --git a/azurerm/internal/services/web/resource_arm_app_service_environment.go b/azurerm/internal/services/web/resource_arm_app_service_environment.go new file mode 100644 index 0000000000000..cfd3e9e8d0211 --- /dev/null +++ b/azurerm/internal/services/web/resource_arm_app_service_environment.go @@ -0,0 +1,282 @@ +package web + +import ( + "fmt" + "log" + "time" + + "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" + "github.com/hashicorp/go-azure-helpers/response" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmAppServiceEnvironment() *schema.Resource { + return &schema.Resource{ + Create: resourceArmAppServiceEnvironmentCreateOrUpdate, + Read: resourceArmAppServiceEnvironmentRead, + Update: resourceArmAppServiceEnvironmentCreateOrUpdate, + Delete: resourceArmAppServiceEnvironmentDelete, + Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { + _, err := ParseAppServiceEnvironmentID(id) + return err + }), + + // Need to find sane values for below, some operations on this resource can take an exceptionally long time + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(4 * time.Hour), + Read: schema.DefaultTimeout(5 * time.Minute), + Update: schema.DefaultTimeout(4 * time.Hour), + Delete: schema.DefaultTimeout(4 * time.Hour), + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validateAppServiceEnvironmentName, + }, + + "internal_load_balancing_mode": { + Type: schema.TypeString, + Optional: true, + Default: string(web.InternalLoadBalancingModeNone), + ValidateFunc: validation.StringInSlice([]string{ + string(web.InternalLoadBalancingModeNone), + string(web.InternalLoadBalancingModePublishing), + string(web.InternalLoadBalancingModeWeb), + }, false), + }, + + "subnet_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: network.ValidateSubnetID, + }, + + // Note: This is currently 'multiSize' in the API for historic v1 reasons, may change in future? + "pricing_tier": { + Type: schema.TypeString, + Optional: true, + Default: "I1", + ValidateFunc: validateAppServiceEnvironmentPricingTier, + }, + + "front_end_scale_factor": { + Type: schema.TypeInt, + Optional: true, + Default: 15, + ValidateFunc: validation.IntBetween(5, 15), + }, + + "location": { + Type: schema.TypeString, + Computed: true, + StateFunc: azure.NormalizeLocation, + }, + + "resource_group_name": { + Type: schema.TypeString, + Computed: true, + }, + + "tags": tags.Schema(), + }, + } +} +func resourceArmAppServiceEnvironmentCreateOrUpdate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Web.AppServiceEnvironmentsClient + vnetClient := meta.(*clients.Client).Network.VnetClient + ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) + defer cancel() + + name := d.Get("name").(string) + internalLoadBalancingMode := d.Get("internal_load_balancing_mode").(string) + t := d.Get("tags").(map[string]interface{}) + + subnetId := d.Get("subnet_id").(string) + subnet, err := network.ParseSubnetID(subnetId) + if err != nil { + return fmt.Errorf("Error parsing subnet id %q: %+v", subnetId, err) + } + + resourceGroup := subnet.ResourceGroup + + vnet, err := vnetClient.Get(ctx, resourceGroup, subnet.VirtualNetworkName, "") + if err != nil { + return fmt.Errorf("Error reading Virtual Network %q for App Service Environment %q: %+v", subnet.VirtualNetworkName, name, err) + } + + var location string + if vnetLoc := vnet.Location; vnetLoc != nil { + location = azure.NormalizeLocation(*vnetLoc) + } else { + return fmt.Errorf("Error determining Location from Virtual Network %s", *vnet.Name) + } + + frontEndScaleFactor := d.Get("front_end_scale_factor").(int) + + pricingTier := d.Get("pricing_tier").(string) + + // the SDK is coded primarily for v1, which needs a non-null entry for workerpool, so we construct an empty slice for it + wp := []web.WorkerPool{{}} + + envelope := web.AppServiceEnvironmentResource{ + Location: utils.String(location), + Kind: utils.String("ASEV2"), + AppServiceEnvironment: &web.AppServiceEnvironment{ + FrontEndScaleFactor: utils.Int32(int32(frontEndScaleFactor)), + MultiSize: utils.String(convertFromIsolatedSKU(pricingTier)), + Name: utils.String(name), + Location: utils.String(location), + InternalLoadBalancingMode: web.InternalLoadBalancingMode(internalLoadBalancingMode), + VirtualNetwork: &web.VirtualNetworkProfile{ + ID: utils.String(subnetId), + Subnet: utils.String(subnet.Name), + }, + WorkerPools: &wp, + }, + Tags: tags.Expand(t), + } + + future, err := client.CreateOrUpdate(ctx, resourceGroup, name, envelope) + if err != nil { + return fmt.Errorf("Error creating App Service Environment %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + err = future.WaitForCompletionRef(ctx, client.Client) + if err != nil { + return fmt.Errorf("Error waiting for the creation of App Service Environment %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + read, err := client.Get(ctx, resourceGroup, name) + if err != nil { + return fmt.Errorf("Error retrieving App Service Environment %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + d.SetId(*read.ID) + + return resourceArmAppServiceEnvironmentRead(d, meta) +} + +func resourceArmAppServiceEnvironmentRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Web.AppServiceEnvironmentsClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := ParseAppServiceEnvironmentID(d.Id()) + if err != nil { + return err + } + + resourceGroup := id.ResourceGroup + name := id.Name + + appServiceEnvironment, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(appServiceEnvironment.Response) { + log.Printf("[DEBUG] App Service Environmment %q (Resource Group %q) was not found!", name, resourceGroup) + d.SetId("") + return nil + } + return fmt.Errorf("Error retrieving App Service Environmment %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + d.Set("name", name) + d.Set("resource_group_name", resourceGroup) + if location := appServiceEnvironment.Location; location != nil { + d.Set("location", azure.NormalizeLocation(*location)) + } + + if err := tags.FlattenAndSet(d, appServiceEnvironment.Tags); err != nil { + return fmt.Errorf("Error flattening and setting tags in App Service Environment %q (resource group %q): %+v", name, resourceGroup, err) + } + + ase := appServiceEnvironment.AppServiceEnvironment + if ase.InternalLoadBalancingMode != "" { + d.Set("internal_load_balancing_mode", ase.InternalLoadBalancingMode) + } + if ase.VirtualNetwork.ID != nil { + d.Set("subnet_id", ase.VirtualNetwork.ID) + } + if ase.FrontEndScaleFactor != nil { + d.Set("front_end_scale_factor", int(*ase.FrontEndScaleFactor)) + } + if ase.MultiSize != nil { + d.Set("pricing_tier", convertToIsolatedSKU(*ase.MultiSize)) + } + + return nil +} + +func resourceArmAppServiceEnvironmentDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Web.AppServiceEnvironmentsClient + ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := ParseAppServiceEnvironmentID(d.Id()) + if err != nil { + return err + } + + resGroup := id.ResourceGroup + name := id.Name + + log.Printf("[DEBUG] Deleting App Service Environment %q (Resource Group %q)", name, resGroup) + + // `true` below deletes any child resources (e.g. App Services / Plans / Certificates etc) + // This potentially destroys resources outside of Terraform's state without the user knowing + // It is set to true as this is consistent with other instances of this type of functionality in the provider. + future, err := client.Delete(ctx, resGroup, name, utils.Bool(true)) + if err != nil { + if response.WasNotFound(future.Response()) { + return nil + } + + return err + } + + err = future.WaitForCompletionRef(ctx, client.Client) + if err != nil { + if response.WasNotFound(future.Response()) { + return nil + } + + return err + } + + return nil +} + +func convertFromIsolatedSKU(isolated string) (vmSKU string) { + switch isolated { + case "I1": + vmSKU = "Standard_D1_V2" + case "I2": + vmSKU = "Standard_D2_V2" + case "I3": + vmSKU = "Standard_D3_V2" + } + return vmSKU +} + +func convertToIsolatedSKU(vmSKU string) (isolated string) { + switch vmSKU { + case "Standard_D1_V2": + isolated = "I1" + case "Standard_D2_V2": + isolated = "I2" + case "Standard_D3_V2": + isolated = "I3" + } + return isolated +} diff --git a/azurerm/internal/services/web/tests/data_source_app_service_environment_test.go b/azurerm/internal/services/web/tests/data_source_app_service_environment_test.go new file mode 100644 index 0000000000000..a26d0453d801c --- /dev/null +++ b/azurerm/internal/services/web/tests/data_source_app_service_environment_test.go @@ -0,0 +1,39 @@ +package tests + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" +) + +func TestDataSourceAzureRMAppServiceEnvironment_basic(t *testing.T) { + data := acceptance.BuildTestData(t, "data.azurerm_app_service_environment", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + Steps: []resource.TestStep{ + { + Config: testAccDatasourceAppServiceEnvironment_basic(data), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrSet(data.ResourceName, "front_end_scale_factor"), + resource.TestCheckResourceAttrSet(data.ResourceName, "pricing_tier"), + ), + }, + }, + }) +} + +func testAccDatasourceAppServiceEnvironment_basic(data acceptance.TestData) string { + config := testAccAzureRMAppServiceEnvironment_basic(data) + return fmt.Sprintf(` +%s + +data "azurerm_app_service_environment" "test" { + name = "${azurerm_app_service_environment.test.name}" + resource_group_name = "${azurerm_app_service_environment.test.resource_group_name}" +} +`, config) +} diff --git a/azurerm/internal/services/web/tests/resource_arm_app_service_environment_test.go b/azurerm/internal/services/web/tests/resource_arm_app_service_environment_test.go new file mode 100644 index 0000000000000..1623cc2d2a6bc --- /dev/null +++ b/azurerm/internal/services/web/tests/resource_arm_app_service_environment_test.go @@ -0,0 +1,302 @@ +package tests + +import ( + "fmt" + "testing" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func TestAccAzureRMAppServiceEnvironment_basicWindows(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_app_service_environment", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMAppServiceEnvironmentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMAppServiceEnvironment_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMAppServiceEnvironmentExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "pricing_tier", "I1"), + resource.TestCheckResourceAttr(data.ResourceName, "front_end_scale_factor", "15"), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMAppServiceEnvironment_update(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_app_service_environment", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMAppServiceEnvironmentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMAppServiceEnvironment_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMAppServiceEnvironmentExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "pricing_tier", "I1"), + resource.TestCheckResourceAttr(data.ResourceName, "front_end_scale_factor", "15"), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMAppServiceEnvironment_update(data), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(data.ResourceName, "pricing_tier", "I2"), + resource.TestCheckResourceAttr(data.ResourceName, "front_end_scale_factor", "10"), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMAppServiceEnvironment_tierAndScaleFactor(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_app_service_environment", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMAppServiceEnvironmentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMAppServiceEnvironment_tierAndScaleFactor(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMAppServiceEnvironmentExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "pricing_tier", "I2"), + resource.TestCheckResourceAttr(data.ResourceName, "front_end_scale_factor", "10"), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMAppServiceEnvironment_withAppServicePlan(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_app_service_environment", "test") + aspData := acceptance.BuildTestData(t, "azurerm_app_service_plan", "test") + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMAppServiceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMAppServiceEnvironment_withAppServicePlan(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMAppServiceEnvironmentExists(data.ResourceName), + testCheckAppServicePlanMemberOfAppServiceEnvironment(data.ResourceName, aspData.ResourceName), + ), + }, + }, + }) +} + +func testAccAzureRMAppServiceEnvironment_basic(data acceptance.TestData) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%[1]d" + location = "%[2]s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctest-vnet-%[1]d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + address_space = ["10.0.0.0/16"] + + subnet { + name = "asesubnet" + address_prefix = "10.0.1.0/24" + } + + subnet { + name = "gatewaysubnet" + address_prefix = "10.0.2.0/24" + } +} + +data "azurerm_subnet" "test" { + name = "asesubnet" + virtual_network_name = "${azurerm_virtual_network.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" +} + +resource "azurerm_app_service_environment" "test" { + name = "acctest-ase-%[1]d" + subnet_id = "${data.azurerm_subnet.test.id}" +} +`, data.RandomInteger, data.Locations.Primary) +} + +func testAccAzureRMAppServiceEnvironment_tierAndScaleFactor(data acceptance.TestData) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%[1]d" + location = "%[2]s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctest-vnet-%[1]d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + address_space = ["10.0.0.0/16"] + + subnet { + name = "asesubnet" + address_prefix = "10.0.1.0/24" + } + + subnet { + name = "gatewaysubnet" + address_prefix = "10.0.2.0/24" + } +} + +data "azurerm_subnet" "test" { + name = "asesubnet" + virtual_network_name = "${azurerm_virtual_network.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" +} + +resource "azurerm_app_service_environment" "test" { + name = "acctest-ase-%[1]d" + subnet_id = "${data.azurerm_subnet.test.id}" + pricing_tier = "I2" + front_end_scale_factor = 10 +} +`, data.RandomInteger, data.Locations.Primary) +} + +func testAccAzureRMAppServiceEnvironment_update(data acceptance.TestData) string { + return testAccAzureRMAppServiceEnvironment_tierAndScaleFactor(data) +} + +func testAccAzureRMAppServiceEnvironment_withAppServicePlan(data acceptance.TestData) string { + template := testAccAzureRMAppServiceEnvironment_basic(data) + return fmt.Sprintf(` +%s + +resource "azurerm_app_service_plan" "test"{ + name = "acctest-ASP-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + app_service_environment_id = "${azurerm_app_service_environment.test.id}" + + sku { + tier = "Basic" + size = "B1" + } + +} +`, template, data.RandomInteger) +} + +func testCheckAzureRMAppServiceEnvironmentExists(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + client := acceptance.AzureProvider.Meta().(*clients.Client).Web.AppServiceEnvironmentsClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("Not found: %s", resourceName) + } + + appServiceEnvironmentName := rs.Primary.Attributes["name"] + resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] + if !hasResourceGroup { + return fmt.Errorf("Bad: no resource group found in state for App Service Environment: %s", appServiceEnvironmentName) + } + + resp, err := client.Get(ctx, resourceGroup, appServiceEnvironmentName) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Bad: App Service Environment %q (resource group %q) does not exist", appServiceEnvironmentName, resourceGroup) + } + + return fmt.Errorf("Bad: Get on appServiceEnvironmentClient: %+v", err) + } + + return nil + } +} + +func testCheckAzureRMAppServiceEnvironmentDestroy(s *terraform.State) error { + client := acceptance.AzureProvider.Meta().(*clients.Client).Web.AppServiceEnvironmentsClient + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_app_service_environment" { + continue + } + + name := rs.Primary.Attributes["name"] + 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 + } + + return err + } + + return nil + } + + return nil +} + +func testCheckAppServicePlanMemberOfAppServiceEnvironment(ase string, asp string) resource.TestCheckFunc { + return func(s *terraform.State) error { + aseClient := acceptance.AzureProvider.Meta().(*clients.Client).Web.AppServiceEnvironmentsClient + aspClient := acceptance.AzureProvider.Meta().(*clients.Client).Web.AppServicePlansClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + aseResource, ok := s.RootModule().Resources[ase] + if !ok { + return fmt.Errorf("Not found: %s", ase) + } + + appServiceEnvironmentName := aseResource.Primary.Attributes["name"] + appServiceEnvironmentResourceGroup := aseResource.Primary.Attributes["resource_group_name"] + + aseResp, err := aseClient.Get(ctx, appServiceEnvironmentResourceGroup, appServiceEnvironmentName) + if err != nil { + if utils.ResponseWasNotFound(aseResp.Response) { + return fmt.Errorf("Bad: App Service Environment %q (resource group %q) does not exist: %+v", appServiceEnvironmentName, appServiceEnvironmentResourceGroup, err) + } + } + + aspResource, ok := s.RootModule().Resources[asp] + if !ok { + return fmt.Errorf("Not found: %s", ase) + } + + appServicePlanName := aspResource.Primary.Attributes["name"] + appServicePlanResourceGroup := aspResource.Primary.Attributes["resource_group_name"] + + aspResp, err := aspClient.Get(ctx, appServicePlanResourceGroup, appServicePlanName) + if err != nil { + if utils.ResponseWasNotFound(aseResp.Response) { + return fmt.Errorf("Bad: App Service Plan %q (resource group %q) does not exist: %+v", appServicePlanName, appServicePlanResourceGroup, err) + } + } + if aspResp.HostingEnvironmentProfile.ID != aseResp.ID { + return fmt.Errorf("Bad: App Service Plan %s not a member of App Service Environment %s", appServicePlanName, appServiceEnvironmentName) + } + + return nil + } +} diff --git a/vendor/modules.txt b/vendor/modules.txt index ef8827c62e164..21fb930017fc9 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -80,6 +80,7 @@ github.com/Azure/azure-sdk-for-go/services/signalr/mgmt/2018-10-01/signalr github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-04-01/storage github.com/Azure/azure-sdk-for-go/services/streamanalytics/mgmt/2016-03-01/streamanalytics github.com/Azure/azure-sdk-for-go/services/trafficmanager/mgmt/2018-04-01/trafficmanager +github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web github.com/Azure/azure-sdk-for-go/version # github.com/Azure/go-autorest/autorest v0.9.3 diff --git a/website/docs/d/app_service_environment.html.markdown b/website/docs/d/app_service_environment.html.markdown new file mode 100644 index 0000000000000..7b6b1b89a1ead --- /dev/null +++ b/website/docs/d/app_service_environment.html.markdown @@ -0,0 +1,43 @@ +--- +subcategory: "App Service (Web Apps)" +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_app_service_environment" +description: |- + Gets information about an existing App Service Environment. +--- + +# Data Source: azurerm_app_service_environment + +Use this data source to access information about an existing App Service Environment + +## Example Usage + +```hcl +data "azure_app_service_plan" "example" { + name = "example-ase" + resource_group_name = "example-rg" +} + +output "app_service_environment_id" { + value = "${data.azurerm_app_service_environment.id}" +} + +``` + +## Argument Reference + +* `name` - (Required) The name of the App Service Environment. + +* `resource_group_name` - (Required) The Name of the Resource Group where the App Service Environment exists. + +## Attribute Reference + +* `id` - The ID of the App Service Environment. + +* `location` - The Azure location where the App Service Environment exists + +* `front_end_scale_factor` - The number of app instances per App Service Environment Front End + +* `pricing_tier` - The Pricing Tier (Isolated SKU) of the App Service Environment. + +* `tags` - A mapping of tags assigned to the resource. \ No newline at end of file diff --git a/website/docs/r/app_service_environment.html.markdown b/website/docs/r/app_service_environment.html.markdown new file mode 100644 index 0000000000000..e863e6df06eb7 --- /dev/null +++ b/website/docs/r/app_service_environment.html.markdown @@ -0,0 +1,84 @@ +--- +subcategory: "App Service (Web Apps)" +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_app_service_environment" +description: |- + Manages an App Service Environment v2. + +--- + +# azurerm_app_service_environment + +Manages a App Service Environment v2 + +*WARNING* Deleting an App Service Environment resource will also delete App Service Plans and App Services associated with it. + +## Example Usage + +```hcl +resource "azurerm_resource_group" "example" { + name = "exampleRG1" + location = "westeurope" +} + +resource "azurerm_virtual_network" "example" { + name = "example-vnet1" + location = "${azurerm_resource_group.example.location}" + resource_group_name = "${azurerm_resource_group.example.name}" + address_space = ["10.0.0.0/16"] + + subnet { + name = "asesubnet" + address_prefix = "10.0.1.0/24" + } + + subnet { + name = "gatewaysubnet" + address_prefix = "10.0.2.0/24" + } +} + +data "azurerm_subnet" "example" { + name = "asesubnet" + virtual_network_name = "${azurerm_virtual_network.example.name}" + resource_group_name = "${azurerm_resource_group.example.name}" +} + +resource "azurerm_app_service_environment" "example" { + name = "example-ase" + subnet_id = "${data.azurerm_subnet.example.id}" + pricing_tier = "I2" + front_end_scale_factor = 10 +} + +``` + +## Argument Reference + +* `name` - (Required) name of the App Service Environment. + +~> *NOTE* Must meet DNS name specification. + +* `subnet_id` - (Required) Resource ID for the ASE subnet. + +~> *NOTE* a /24 or larger CIDR is required. + +* `pricing_tier` - (Optional) Pricing tier for the front end instances. Possible values are `I1` (default), `I2` and `I3`. + +* `front_end_scale_factor` - (Optional) Scale factor for front end instances. Possible values are between `15` (default) and `5`. + +~> *NOTE* Lowering/changing this value has cost implications, see https://docs.microsoft.com/en-us/azure/app-service/environment/using-an-ase#front-end-scaling for details. + +## Attribute Reference + +* `id` - The ID of the App Services Environment. + +* `resource_group_name` - The name of the resource group. + +* `location` - The location the App Service Environment is deployed into. + +## Import + +```shell +terraform import azurerm_app_service_environment.myAppServiceEnv /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Web/hostingEnvironments/myAppServiceEnv +``` \ No newline at end of file From 5beb2d2727de0ccecf4fea38716aa09897e9480b Mon Sep 17 00:00:00 2001 From: jackofallops Date: Fri, 24 Jan 2020 10:06:00 +0000 Subject: [PATCH 314/498] Linter fixes --- .../data_source_app_service_environment_test.go | 2 +- .../resource_arm_app_service_environment_test.go | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/azurerm/internal/services/web/tests/data_source_app_service_environment_test.go b/azurerm/internal/services/web/tests/data_source_app_service_environment_test.go index a26d0453d801c..3d48cbf9ade54 100644 --- a/azurerm/internal/services/web/tests/data_source_app_service_environment_test.go +++ b/azurerm/internal/services/web/tests/data_source_app_service_environment_test.go @@ -8,7 +8,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" ) -func TestDataSourceAzureRMAppServiceEnvironment_basic(t *testing.T) { +func TestAccDataSourceAzureRMAppServiceEnvironment_basic(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_app_service_environment", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/web/tests/resource_arm_app_service_environment_test.go b/azurerm/internal/services/web/tests/resource_arm_app_service_environment_test.go index 1623cc2d2a6bc..b8883c54591aa 100644 --- a/azurerm/internal/services/web/tests/resource_arm_app_service_environment_test.go +++ b/azurerm/internal/services/web/tests/resource_arm_app_service_environment_test.go @@ -108,7 +108,7 @@ resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" } - + resource "azurerm_virtual_network" "test" { name = "acctest-vnet-%[1]d" location = "${azurerm_resource_group.test.location}" @@ -118,8 +118,8 @@ resource "azurerm_virtual_network" "test" { subnet { name = "asesubnet" address_prefix = "10.0.1.0/24" - } - + } + subnet { name = "gatewaysubnet" address_prefix = "10.0.2.0/24" @@ -145,7 +145,7 @@ resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" } - + resource "azurerm_virtual_network" "test" { name = "acctest-vnet-%[1]d" location = "${azurerm_resource_group.test.location}" @@ -155,8 +155,8 @@ resource "azurerm_virtual_network" "test" { subnet { name = "asesubnet" address_prefix = "10.0.1.0/24" - } - + } + subnet { name = "gatewaysubnet" address_prefix = "10.0.2.0/24" @@ -187,7 +187,7 @@ func testAccAzureRMAppServiceEnvironment_withAppServicePlan(data acceptance.Test return fmt.Sprintf(` %s -resource "azurerm_app_service_plan" "test"{ +resource "azurerm_app_service_plan" "test" { name = "acctest-ASP-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" @@ -197,7 +197,6 @@ resource "azurerm_app_service_plan" "test"{ tier = "Basic" size = "B1" } - } `, template, data.RandomInteger) } From e94e186b246f1f48399618f2e3fbe412e1eb4b46 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Fri, 24 Jan 2020 12:55:41 +0000 Subject: [PATCH 315/498] Added forgotten requiresImport test --- ...source_arm_app_service_environment_test.go | 44 ++++++++++++++++--- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/azurerm/internal/services/web/tests/resource_arm_app_service_environment_test.go b/azurerm/internal/services/web/tests/resource_arm_app_service_environment_test.go index b8883c54591aa..2f9f816e17827 100644 --- a/azurerm/internal/services/web/tests/resource_arm_app_service_environment_test.go +++ b/azurerm/internal/services/web/tests/resource_arm_app_service_environment_test.go @@ -4,11 +4,11 @@ import ( "fmt" "testing" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -33,6 +33,29 @@ func TestAccAzureRMAppServiceEnvironment_basicWindows(t *testing.T) { }) } +func TestAccAzureRMAppServiceEnvironment_requiresImport(t *testing.T) { + if !features.ShouldResourcesBeImported() { + t.Skip("Skipping since resources aren't required to be imported") + return + } + + data := acceptance.BuildTestData(t, "azurerm_app_service_environment", "test") + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMAppServiceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMAppService_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMAppServiceEnvironmentExists(data.ResourceName), + ), + }, + data.RequiresImportErrorStep(testAccAzureRMAppServiceEnvironment_requiresImport), + }, + }) +} + func TestAccAzureRMAppServiceEnvironment_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_app_service_environment", "test") @@ -49,7 +72,6 @@ func TestAccAzureRMAppServiceEnvironment_update(t *testing.T) { resource.TestCheckResourceAttr(data.ResourceName, "front_end_scale_factor", "15"), ), }, - data.ImportStep(), { Config: testAccAzureRMAppServiceEnvironment_update(data), Check: resource.ComposeTestCheckFunc( @@ -57,7 +79,6 @@ func TestAccAzureRMAppServiceEnvironment_update(t *testing.T) { resource.TestCheckResourceAttr(data.ResourceName, "front_end_scale_factor", "10"), ), }, - data.ImportStep(), }, }) } @@ -139,6 +160,19 @@ resource "azurerm_app_service_environment" "test" { `, data.RandomInteger, data.Locations.Primary) } +func testAccAzureRMAppServiceEnvironment_requiresImport(data acceptance.TestData) string { + template := testAccAzureRMAppServiceEnvironment_basic(data) + return fmt.Sprintf(` +%s + +resource "azurerm_app_service_environment" "import" { + name = "${azurerm_app_service_environment.test.name}" + subnet_id = "${azurerm_app_service_environment.test.subnet_id}" + +} +`, template) +} + func testAccAzureRMAppServiceEnvironment_tierAndScaleFactor(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { From 1a5f5f2216f6228ff7d05a5099cd4365b264eb51 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Wed, 12 Feb 2020 15:10:16 +0000 Subject: [PATCH 316/498] Refactor for 2.0 --- .../services/web/app_service_environment.go | 74 ------------------- ...=> app_service_environment_data_source.go} | 0 ...go => app_service_environment_resource.go} | 13 ++-- .../web/parse/app_service_environment.go | 33 +++++++++ .../app_service_environment_test.go | 41 +--------- .../web/validate/app_service_environment.go | 47 ++++++++++++ .../validate/app_service_environment_test.go | 40 ++++++++++ 7 files changed, 130 insertions(+), 118 deletions(-) delete mode 100644 azurerm/internal/services/web/app_service_environment.go rename azurerm/internal/services/web/{data_source_app_service_environment.go => app_service_environment_data_source.go} (100%) rename azurerm/internal/services/web/{resource_arm_app_service_environment.go => app_service_environment_resource.go} (94%) create mode 100644 azurerm/internal/services/web/parse/app_service_environment.go rename azurerm/internal/services/web/{ => parse}/app_service_environment_test.go (62%) create mode 100644 azurerm/internal/services/web/validate/app_service_environment.go create mode 100644 azurerm/internal/services/web/validate/app_service_environment_test.go diff --git a/azurerm/internal/services/web/app_service_environment.go b/azurerm/internal/services/web/app_service_environment.go deleted file mode 100644 index 6f4eba92fc6aa..0000000000000 --- a/azurerm/internal/services/web/app_service_environment.go +++ /dev/null @@ -1,74 +0,0 @@ -package web - -import ( - "fmt" - "regexp" - - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" -) - -type AppServiceEnvironmentResourceID struct { - ResourceGroup string - Name string -} - -func ParseAppServiceEnvironmentID(input string) (*AppServiceEnvironmentResourceID, error) { - id, err := azure.ParseAzureResourceID(input) - if err != nil { - return nil, fmt.Errorf("[ERROR] Unable to parse App Service Environment ID %q: %+v", input, err) - } - - appServiceEnvironment := AppServiceEnvironmentResourceID{ - ResourceGroup: id.ResourceGroup, - } - - if appServiceEnvironment.Name, err = id.PopSegment("hostingEnvironments"); err != nil { - return nil, err - } - - if err := id.ValidateNoEmptySegments(input); err != nil { - return nil, err - } - - return &appServiceEnvironment, nil -} - -// ValidateAppServiceID validates that the specified ID is a valid App Service ID -func ValidateAppServiceEnvironmentID(i interface{}, k string) (warnings []string, errors []error) { - v, ok := i.(string) - if !ok { - errors = append(errors, fmt.Errorf("expected type of %q to be string", k)) - return - } - - if _, err := ParseAppServiceEnvironmentID(v); err != nil { - errors = append(errors, fmt.Errorf("Can not parse %q as a resource id: %v", k, err)) - return - } - - return warnings, errors -} - -func validateAppServiceEnvironmentName(v interface{}, k string) (warnings []string, errors []error) { - value := v.(string) - - if matched := regexp.MustCompile(`^[0-9a-zA-Z][-0-9a-zA-Z]{0,61}[0-9a-zA-Z]$`).Match([]byte(value)); !matched { - errors = append(errors, fmt.Errorf("%q may only contain alphanumeric characters and dashes up to 60 characters in length, and must start and end in an alphanumeric", k)) - } - - return warnings, errors -} - -func validateAppServiceEnvironmentPricingTier(v interface{}, k string) (warnings []string, errors []error) { - tier := v.(string) - - valid := []string{"I1", "I2", "I3"} - - for _, val := range valid { - if val == tier { - return - } - } - errors = append(errors, fmt.Errorf("pricing_tier must be one of %q", valid)) - return warnings, errors -} diff --git a/azurerm/internal/services/web/data_source_app_service_environment.go b/azurerm/internal/services/web/app_service_environment_data_source.go similarity index 100% rename from azurerm/internal/services/web/data_source_app_service_environment.go rename to azurerm/internal/services/web/app_service_environment_data_source.go diff --git a/azurerm/internal/services/web/resource_arm_app_service_environment.go b/azurerm/internal/services/web/app_service_environment_resource.go similarity index 94% rename from azurerm/internal/services/web/resource_arm_app_service_environment.go rename to azurerm/internal/services/web/app_service_environment_resource.go index cfd3e9e8d0211..2057371dda1c2 100644 --- a/azurerm/internal/services/web/resource_arm_app_service_environment.go +++ b/azurerm/internal/services/web/app_service_environment_resource.go @@ -12,6 +12,8 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/web/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/web/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" @@ -25,7 +27,7 @@ func resourceArmAppServiceEnvironment() *schema.Resource { Update: resourceArmAppServiceEnvironmentCreateOrUpdate, Delete: resourceArmAppServiceEnvironmentDelete, Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { - _, err := ParseAppServiceEnvironmentID(id) + _, err := parse.AppServiceEnvironmentID(id) return err }), @@ -42,7 +44,7 @@ func resourceArmAppServiceEnvironment() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: validateAppServiceEnvironmentName, + ValidateFunc: validate.AppServiceEnvironmentName, }, "internal_load_balancing_mode": { @@ -68,7 +70,7 @@ func resourceArmAppServiceEnvironment() *schema.Resource { Type: schema.TypeString, Optional: true, Default: "I1", - ValidateFunc: validateAppServiceEnvironmentPricingTier, + ValidateFunc: validate.AppServiceEnvironmentPricingTier, }, "front_end_scale_factor": { @@ -128,6 +130,7 @@ func resourceArmAppServiceEnvironmentCreateOrUpdate(d *schema.ResourceData, meta pricingTier := d.Get("pricing_tier").(string) // the SDK is coded primarily for v1, which needs a non-null entry for workerpool, so we construct an empty slice for it + // TODO Submit change for SDK? wp := []web.WorkerPool{{}} envelope := web.AppServiceEnvironmentResource{ @@ -173,7 +176,7 @@ func resourceArmAppServiceEnvironmentRead(d *schema.ResourceData, meta interface ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := ParseAppServiceEnvironmentID(d.Id()) + id, err := parse.AppServiceEnvironmentID(d.Id()) if err != nil { return err } @@ -223,7 +226,7 @@ func resourceArmAppServiceEnvironmentDelete(d *schema.ResourceData, meta interfa ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := ParseAppServiceEnvironmentID(d.Id()) + id, err := parse.AppServiceEnvironmentID(d.Id()) if err != nil { return err } diff --git a/azurerm/internal/services/web/parse/app_service_environment.go b/azurerm/internal/services/web/parse/app_service_environment.go new file mode 100644 index 0000000000000..7189915717ae0 --- /dev/null +++ b/azurerm/internal/services/web/parse/app_service_environment.go @@ -0,0 +1,33 @@ +package parse + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type AppServiceEnvironmentResourceID struct { + ResourceGroup string + Name string +} + +func AppServiceEnvironmentID(input string) (*AppServiceEnvironmentResourceID, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("[ERROR] Unable to parse App Service Environment ID %q: %+v", input, err) + } + + appServiceEnvironment := AppServiceEnvironmentResourceID{ + ResourceGroup: id.ResourceGroup, + } + + if appServiceEnvironment.Name, err = id.PopSegment("hostingEnvironments"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &appServiceEnvironment, nil +} diff --git a/azurerm/internal/services/web/app_service_environment_test.go b/azurerm/internal/services/web/parse/app_service_environment_test.go similarity index 62% rename from azurerm/internal/services/web/app_service_environment_test.go rename to azurerm/internal/services/web/parse/app_service_environment_test.go index 942cac22492f6..50c93b5442574 100644 --- a/azurerm/internal/services/web/app_service_environment_test.go +++ b/azurerm/internal/services/web/parse/app_service_environment_test.go @@ -1,4 +1,4 @@ -package web +package parse import "testing" @@ -46,7 +46,7 @@ func TestParseAppServiceEnvironmentID(t *testing.T) { for _, v := range testData { t.Logf("[DEBUG] Testing %q", v.Name) - actual, err := ParseAppServiceEnvironmentID(v.Input) + actual, err := AppServiceEnvironmentID(v.Input) if err != nil { if v.Expected == nil { continue @@ -64,40 +64,3 @@ func TestParseAppServiceEnvironmentID(t *testing.T) { } } } - -func TestValidateAppServiceEnvironmentID(t *testing.T) { - cases := []struct { - ID string - Valid bool - }{ - { - ID: "", - Valid: false, - }, - { - ID: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", - Valid: false, - }, - { - ID: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/", - Valid: false, - }, - { - ID: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/providers/Microsoft.Web/hostingEnvironments/", - Valid: false, - }, - { - ID: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup1/providers/Microsoft.Web/hostingEnvironments/TestASEv2", - Valid: true, - }, - } - for _, tc := range cases { - t.Logf("[DEBUG] Testing Value %s", tc.ID) - _, errors := ValidateAppServiceEnvironmentID(tc.ID, "test") - valid := len(errors) == 0 - - if tc.Valid != valid { - t.Fatalf("Expected %t but got %t", tc.Valid, valid) - } - } -} diff --git a/azurerm/internal/services/web/validate/app_service_environment.go b/azurerm/internal/services/web/validate/app_service_environment.go new file mode 100644 index 0000000000000..63d458654577b --- /dev/null +++ b/azurerm/internal/services/web/validate/app_service_environment.go @@ -0,0 +1,47 @@ +package validate + +import ( + "fmt" + "regexp" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/web/parse" +) + +func AppServiceEnvironmentID(i interface{}, k string) (warnings []string, errors []error) { + v, ok := i.(string) + if !ok { + errors = append(errors, fmt.Errorf("expected type of %q to be string", k)) + return + } + + if _, err := parse.AppServiceEnvironmentID(v); err != nil { + errors = append(errors, fmt.Errorf("Can not parse %q as a resource id: %v", k, err)) + return + } + + return warnings, errors +} + +func AppServiceEnvironmentName(v interface{}, k string) (warnings []string, errors []error) { + value := v.(string) + + if matched := regexp.MustCompile(`^[0-9a-zA-Z][-0-9a-zA-Z]{0,61}[0-9a-zA-Z]$`).Match([]byte(value)); !matched { + errors = append(errors, fmt.Errorf("%q may only contain alphanumeric characters and dashes up to 60 characters in length, and must start and end in an alphanumeric", k)) + } + + return warnings, errors +} + +func AppServiceEnvironmentPricingTier(v interface{}, k string) (warnings []string, errors []error) { + tier := v.(string) + + valid := []string{"I1", "I2", "I3"} + + for _, val := range valid { + if val == tier { + return + } + } + errors = append(errors, fmt.Errorf("pricing_tier must be one of %q", valid)) + return warnings, errors +} diff --git a/azurerm/internal/services/web/validate/app_service_environment_test.go b/azurerm/internal/services/web/validate/app_service_environment_test.go new file mode 100644 index 0000000000000..9f6b1d44b4c86 --- /dev/null +++ b/azurerm/internal/services/web/validate/app_service_environment_test.go @@ -0,0 +1,40 @@ +package validate + +import "testing" + +func TestValidateAppServiceEnvironmentID(t *testing.T) { + cases := []struct { + ID string + Valid bool + }{ + { + ID: "", + Valid: false, + }, + { + ID: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Valid: false, + }, + { + ID: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/", + Valid: false, + }, + { + ID: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/providers/Microsoft.Web/hostingEnvironments/", + Valid: false, + }, + { + ID: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup1/providers/Microsoft.Web/hostingEnvironments/TestASEv2", + Valid: true, + }, + } + for _, tc := range cases { + t.Logf("[DEBUG] Testing Value %s", tc.ID) + _, errors := AppServiceEnvironmentID(tc.ID, "test") + valid := len(errors) == 0 + + if tc.Valid != valid { + t.Fatalf("Expected %t but got %t", tc.Valid, valid) + } + } +} From 522a17b76f759f8fd567efd3249e812b0e667112 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Wed, 12 Feb 2020 15:30:02 +0000 Subject: [PATCH 317/498] refactor tests, fix tflint issues --- .../services/web/app_service_environment_data_source.go | 1 - .../services/web/app_service_environment_resource.go | 5 ++--- ...ment_test.go => app_service_environment_resource_test.go} | 3 +++ 3 files changed, 5 insertions(+), 4 deletions(-) rename azurerm/internal/services/web/tests/{resource_arm_app_service_environment_test.go => app_service_environment_resource_test.go} (99%) diff --git a/azurerm/internal/services/web/app_service_environment_data_source.go b/azurerm/internal/services/web/app_service_environment_data_source.go index c95e62f39355c..de54d73a36849 100644 --- a/azurerm/internal/services/web/app_service_environment_data_source.go +++ b/azurerm/internal/services/web/app_service_environment_data_source.go @@ -24,7 +24,6 @@ func dataSourceArmAppServiceEnvironment() *schema.Resource { "name": { Type: schema.TypeString, Required: true, - ForceNew: true, }, "resource_group_name": azure.SchemaResourceGroupNameForDataSource(), diff --git a/azurerm/internal/services/web/app_service_environment_resource.go b/azurerm/internal/services/web/app_service_environment_resource.go index 2057371dda1c2..a229098d75b22 100644 --- a/azurerm/internal/services/web/app_service_environment_resource.go +++ b/azurerm/internal/services/web/app_service_environment_resource.go @@ -83,7 +83,6 @@ func resourceArmAppServiceEnvironment() *schema.Resource { "location": { Type: schema.TypeString, Computed: true, - StateFunc: azure.NormalizeLocation, }, "resource_group_name": { @@ -237,8 +236,7 @@ func resourceArmAppServiceEnvironmentDelete(d *schema.ResourceData, meta interfa log.Printf("[DEBUG] Deleting App Service Environment %q (Resource Group %q)", name, resGroup) // `true` below deletes any child resources (e.g. App Services / Plans / Certificates etc) - // This potentially destroys resources outside of Terraform's state without the user knowing - // It is set to true as this is consistent with other instances of this type of functionality in the provider. + // TODO: Add this to the provider 'Features' schema? future, err := client.Delete(ctx, resGroup, name, utils.Bool(true)) if err != nil { if response.WasNotFound(future.Response()) { @@ -260,6 +258,7 @@ func resourceArmAppServiceEnvironmentDelete(d *schema.ResourceData, meta interfa return nil } +// Note: These are abstractions and possibly subject to change if Azure changes the underlying SKU for Isolated instances. func convertFromIsolatedSKU(isolated string) (vmSKU string) { switch isolated { case "I1": diff --git a/azurerm/internal/services/web/tests/resource_arm_app_service_environment_test.go b/azurerm/internal/services/web/tests/app_service_environment_resource_test.go similarity index 99% rename from azurerm/internal/services/web/tests/resource_arm_app_service_environment_test.go rename to azurerm/internal/services/web/tests/app_service_environment_resource_test.go index 2f9f816e17827..b90e65844a498 100644 --- a/azurerm/internal/services/web/tests/resource_arm_app_service_environment_test.go +++ b/azurerm/internal/services/web/tests/app_service_environment_resource_test.go @@ -72,6 +72,7 @@ func TestAccAzureRMAppServiceEnvironment_update(t *testing.T) { resource.TestCheckResourceAttr(data.ResourceName, "front_end_scale_factor", "15"), ), }, + data.ImportStep(), { Config: testAccAzureRMAppServiceEnvironment_update(data), Check: resource.ComposeTestCheckFunc( @@ -79,6 +80,7 @@ func TestAccAzureRMAppServiceEnvironment_update(t *testing.T) { resource.TestCheckResourceAttr(data.ResourceName, "front_end_scale_factor", "10"), ), }, + data.ImportStep(), }, }) } @@ -119,6 +121,7 @@ func TestAccAzureRMAppServiceEnvironment_withAppServicePlan(t *testing.T) { testCheckAppServicePlanMemberOfAppServiceEnvironment(data.ResourceName, aspData.ResourceName), ), }, + data.ImportStep(), }, }) } From 260bd86b9d7fbbded5cae753d2b992a88680f76b Mon Sep 17 00:00:00 2001 From: jackofallops Date: Wed, 12 Feb 2020 15:58:11 +0000 Subject: [PATCH 318/498] docs update --- website/azurerm.erb | 12 ++++++++++-- .../docs/r/app_service_environment.html.markdown | 14 ++++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/website/azurerm.erb b/website/azurerm.erb index 13e50d7b10782..1045f5dd3d2d9 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -83,11 +83,15 @@
    • - azurerm_app_service_plan + azurerm_app_service_certificate
    • - azurerm_app_service_certificate + azurerm_app_service_environment +
      • + +
    • + azurerm_app_service_plan
    • @@ -695,6 +699,10 @@ azurerm_app_service_custom_hostname_binding
      • +
    • + azurerm_app_service_environment +
      • +
    • azurerm_app_service_plan
      • diff --git a/website/docs/r/app_service_environment.html.markdown b/website/docs/r/app_service_environment.html.markdown index e863e6df06eb7..d82ffca09a4fb 100644 --- a/website/docs/r/app_service_environment.html.markdown +++ b/website/docs/r/app_service_environment.html.markdown @@ -3,15 +3,15 @@ subcategory: "App Service (Web Apps)" layout: "azurerm" page_title: "Azure Resource Manager: azurerm_app_service_environment" description: |- - Manages an App Service Environment v2. + Manages an App Service Environment. --- # azurerm_app_service_environment -Manages a App Service Environment v2 +Manages a App Service Environment -*WARNING* Deleting an App Service Environment resource will also delete App Service Plans and App Services associated with it. +**WARNING** Deleting an App Service Environment resource will also delete App Service Plans and App Services associated with it. ## Example Usage @@ -57,17 +57,19 @@ resource "azurerm_app_service_environment" "example" { * `name` - (Required) name of the App Service Environment. -~> *NOTE* Must meet DNS name specification. +~> **NOTE** Must meet DNS name specification. * `subnet_id` - (Required) Resource ID for the ASE subnet. -~> *NOTE* a /24 or larger CIDR is required. +~> **NOTE** a /24 or larger CIDR is required. Once associated with an ASE this size cannot be changed. * `pricing_tier` - (Optional) Pricing tier for the front end instances. Possible values are `I1` (default), `I2` and `I3`. +~> **NOTE** Azure currently utilises Dv2 instances for Isolated SKUs, being `Standard_D1_V2`, `Standard_D2_V2`, and `Standard_D3_V2`. + * `front_end_scale_factor` - (Optional) Scale factor for front end instances. Possible values are between `15` (default) and `5`. -~> *NOTE* Lowering/changing this value has cost implications, see https://docs.microsoft.com/en-us/azure/app-service/environment/using-an-ase#front-end-scaling for details. +~> **NOTE** Lowering/changing this value has cost implications, see https://docs.microsoft.com/en-us/azure/app-service/environment/using-an-ase#front-end-scaling for details. ## Attribute Reference From f2d90670d7bef22c14c6a58b2a0d522015ee88d8 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Thu, 13 Feb 2020 06:56:03 +0000 Subject: [PATCH 319/498] fmt fix --- .../internal/services/web/app_service_environment_resource.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/web/app_service_environment_resource.go b/azurerm/internal/services/web/app_service_environment_resource.go index a229098d75b22..4c0f47b2c0c14 100644 --- a/azurerm/internal/services/web/app_service_environment_resource.go +++ b/azurerm/internal/services/web/app_service_environment_resource.go @@ -81,8 +81,8 @@ func resourceArmAppServiceEnvironment() *schema.Resource { }, "location": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, }, "resource_group_name": { From f659142c09521a3ca74b67625fa54db5c131d0f9 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Mon, 17 Feb 2020 07:39:46 +0000 Subject: [PATCH 320/498] refactor validate to correct helper location --- .../web => helpers}/validate/app_service_environment.go | 0 .../web => helpers}/validate/app_service_environment_test.go | 0 .../internal/services/web/app_service_environment_resource.go | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename azurerm/{internal/services/web => helpers}/validate/app_service_environment.go (100%) rename azurerm/{internal/services/web => helpers}/validate/app_service_environment_test.go (100%) diff --git a/azurerm/internal/services/web/validate/app_service_environment.go b/azurerm/helpers/validate/app_service_environment.go similarity index 100% rename from azurerm/internal/services/web/validate/app_service_environment.go rename to azurerm/helpers/validate/app_service_environment.go diff --git a/azurerm/internal/services/web/validate/app_service_environment_test.go b/azurerm/helpers/validate/app_service_environment_test.go similarity index 100% rename from azurerm/internal/services/web/validate/app_service_environment_test.go rename to azurerm/helpers/validate/app_service_environment_test.go diff --git a/azurerm/internal/services/web/app_service_environment_resource.go b/azurerm/internal/services/web/app_service_environment_resource.go index 4c0f47b2c0c14..fe43cfff1c25e 100644 --- a/azurerm/internal/services/web/app_service_environment_resource.go +++ b/azurerm/internal/services/web/app_service_environment_resource.go @@ -10,10 +10,10 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/web/parse" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/web/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" From 3e21fb74a627794b6b64e03c9572652d47ba07d9 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Wed, 19 Feb 2020 12:37:18 +0100 Subject: [PATCH 321/498] r/app_service_environment: fixing up the build errors --- .../internal/services/web/app_service_environment_resource.go | 2 +- .../services/web}/validate/app_service_environment.go | 0 .../services/web}/validate/app_service_environment_test.go | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename azurerm/{helpers => internal/services/web}/validate/app_service_environment.go (100%) rename azurerm/{helpers => internal/services/web}/validate/app_service_environment_test.go (100%) diff --git a/azurerm/internal/services/web/app_service_environment_resource.go b/azurerm/internal/services/web/app_service_environment_resource.go index fe43cfff1c25e..4c0f47b2c0c14 100644 --- a/azurerm/internal/services/web/app_service_environment_resource.go +++ b/azurerm/internal/services/web/app_service_environment_resource.go @@ -10,10 +10,10 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/web/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/web/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" diff --git a/azurerm/helpers/validate/app_service_environment.go b/azurerm/internal/services/web/validate/app_service_environment.go similarity index 100% rename from azurerm/helpers/validate/app_service_environment.go rename to azurerm/internal/services/web/validate/app_service_environment.go diff --git a/azurerm/helpers/validate/app_service_environment_test.go b/azurerm/internal/services/web/validate/app_service_environment_test.go similarity index 100% rename from azurerm/helpers/validate/app_service_environment_test.go rename to azurerm/internal/services/web/validate/app_service_environment_test.go From 6ab4e1e7f829af2e9924a87822e1ba0bd83c4059 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Wed, 19 Feb 2020 12:44:10 +0100 Subject: [PATCH 322/498] r/subnet: moving the subnet parser into the parse package --- .../services/network/{ => parse}/subnet.go | 24 +---- .../services/network/parse/subnet_test.go | 90 +++++++++++++++++++ .../services/network/validate/subnet.go | 23 +++++ .../web/app_service_environment_resource.go | 7 +- 4 files changed, 121 insertions(+), 23 deletions(-) rename azurerm/internal/services/network/{ => parse}/subnet.go (53%) create mode 100644 azurerm/internal/services/network/parse/subnet_test.go create mode 100644 azurerm/internal/services/network/validate/subnet.go diff --git a/azurerm/internal/services/network/subnet.go b/azurerm/internal/services/network/parse/subnet.go similarity index 53% rename from azurerm/internal/services/network/subnet.go rename to azurerm/internal/services/network/parse/subnet.go index b6a4994df3f09..a60ca6a007318 100644 --- a/azurerm/internal/services/network/subnet.go +++ b/azurerm/internal/services/network/parse/subnet.go @@ -1,4 +1,4 @@ -package network +package parse import ( "fmt" @@ -6,19 +6,19 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" ) -type SubnetID struct { +type SubnetId struct { ResourceGroup string VirtualNetworkName string Name string } -func ParseSubnetID(input string) (*SubnetID, error) { +func SubnetID(input string) (*SubnetId, error) { id, err := azure.ParseAzureResourceID(input) if err != nil { return nil, fmt.Errorf("[ERROR] Unable to parse Subnet ID %q: %+v", input, err) } - subnet := SubnetID{ + subnet := SubnetId{ ResourceGroup: id.ResourceGroup, } @@ -36,19 +36,3 @@ func ParseSubnetID(input string) (*SubnetID, error) { return &subnet, nil } - -// ValidateSubnetID validates that the specified ID is a valid App Service ID -func ValidateSubnetID(i interface{}, k string) (warnings []string, errors []error) { - v, ok := i.(string) - if !ok { - errors = append(errors, fmt.Errorf("expected type of %q to be string", k)) - return - } - - if _, err := ParseSubnetID(v); err != nil { - errors = append(errors, fmt.Errorf("Can not parse %q as a resource id: %v", k, err)) - return - } - - return warnings, errors -} diff --git a/azurerm/internal/services/network/parse/subnet_test.go b/azurerm/internal/services/network/parse/subnet_test.go new file mode 100644 index 0000000000000..ef696cba59b85 --- /dev/null +++ b/azurerm/internal/services/network/parse/subnet_test.go @@ -0,0 +1,90 @@ +package parse + +import ( + "testing" +) + +func TestSubnetID(t *testing.T) { + testData := []struct { + Name string + Input string + Error bool + Expect *SubnetId + }{ + { + Name: "Empty", + Input: "", + Error: true, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Error: true, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Error: true, + }, + { + Name: "Resource Group ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", + Error: true, + }, + { + Name: "Missing Virtual Networks Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/virtualNetworks/", + Error: true, + }, + { + Name: "Missing Subnets Key", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/virtualNetworks/network1", + Error: true, + }, + { + Name: "Missing Subnets Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/virtualNetworks/network1/subnets/", + Error: true, + }, + { + Name: "Subnet ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/virtualNetworks/network1/subnets/subnet1", + Error: false, + Expect: &SubnetId{ + ResourceGroup: "resGroup1", + VirtualNetworkName: "network1", + Name: "subnet1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/virtualNetworks/network1/Subnets/subnet1", + Error: true, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Name) + + actual, err := SubnetID(v.Input) + if err != nil { + if v.Error { + continue + } + + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.Name != v.Expect.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expect.Name, actual.Name) + } + + if actual.VirtualNetworkName != v.Expect.VirtualNetworkName { + t.Fatalf("Expected %q but got %q for Virtual Network Name", v.Expect.VirtualNetworkName, actual.VirtualNetworkName) + } + + if actual.ResourceGroup != v.Expect.ResourceGroup { + t.Fatalf("Expected %q but got %q for Resource Group", v.Expect.ResourceGroup, actual.ResourceGroup) + } + } +} diff --git a/azurerm/internal/services/network/validate/subnet.go b/azurerm/internal/services/network/validate/subnet.go new file mode 100644 index 0000000000000..625f730148247 --- /dev/null +++ b/azurerm/internal/services/network/validate/subnet.go @@ -0,0 +1,23 @@ +package validate + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network/parse" +) + +// SubnetID validates that the specified ID is a valid Subnet ID +func SubnetID(i interface{}, k string) (warnings []string, errors []error) { + v, ok := i.(string) + if !ok { + errors = append(errors, fmt.Errorf("expected type of %q to be string", k)) + return + } + + if _, err := parse.SubnetID(v); err != nil { + errors = append(errors, fmt.Errorf("Can not parse %q as a resource id: %v", k, err)) + return + } + + return warnings, errors +} diff --git a/azurerm/internal/services/web/app_service_environment_resource.go b/azurerm/internal/services/web/app_service_environment_resource.go index 4c0f47b2c0c14..3efda382e9dfb 100644 --- a/azurerm/internal/services/web/app_service_environment_resource.go +++ b/azurerm/internal/services/web/app_service_environment_resource.go @@ -11,7 +11,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network" + networkParse "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network/parse" + networkValidate "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/web/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/web/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" @@ -62,7 +63,7 @@ func resourceArmAppServiceEnvironment() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: network.ValidateSubnetID, + ValidateFunc: networkValidate.SubnetID, }, // Note: This is currently 'multiSize' in the API for historic v1 reasons, may change in future? @@ -105,7 +106,7 @@ func resourceArmAppServiceEnvironmentCreateOrUpdate(d *schema.ResourceData, meta t := d.Get("tags").(map[string]interface{}) subnetId := d.Get("subnet_id").(string) - subnet, err := network.ParseSubnetID(subnetId) + subnet, err := networkParse.SubnetID(subnetId) if err != nil { return fmt.Errorf("Error parsing subnet id %q: %+v", subnetId, err) } From a6a48978a0009e4a2604bcdde81c365e4384948d Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Wed, 19 Feb 2020 14:01:28 +0100 Subject: [PATCH 323/498] network: moving the virtual network parse/validaters into those packages --- .../services/network/parse/virtual_network.go | 33 +++++++++ .../network/parse/virtual_network_test.go | 70 +++++++++++++++++++ .../network/validate/virtual_network.go | 23 ++++++ .../services/network/virtual_network.go | 49 ------------- 4 files changed, 126 insertions(+), 49 deletions(-) create mode 100644 azurerm/internal/services/network/parse/virtual_network.go create mode 100644 azurerm/internal/services/network/parse/virtual_network_test.go create mode 100644 azurerm/internal/services/network/validate/virtual_network.go delete mode 100644 azurerm/internal/services/network/virtual_network.go diff --git a/azurerm/internal/services/network/parse/virtual_network.go b/azurerm/internal/services/network/parse/virtual_network.go new file mode 100644 index 0000000000000..b789e8aefb40a --- /dev/null +++ b/azurerm/internal/services/network/parse/virtual_network.go @@ -0,0 +1,33 @@ +package parse + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type VirtualNetworkId struct { + ResourceGroup string + Name string +} + +func VirtualNetworkID(input string) (*VirtualNetworkId, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("[ERROR] Unable to parse Virtual Network ID %q: %+v", input, err) + } + + vnet := VirtualNetworkId{ + ResourceGroup: id.ResourceGroup, + } + + if vnet.Name, err = id.PopSegment("virtualNetworks"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &vnet, nil +} diff --git a/azurerm/internal/services/network/parse/virtual_network_test.go b/azurerm/internal/services/network/parse/virtual_network_test.go new file mode 100644 index 0000000000000..b9eb6b35d3575 --- /dev/null +++ b/azurerm/internal/services/network/parse/virtual_network_test.go @@ -0,0 +1,70 @@ +package parse + +import ( + "testing" +) + +func TestVirtualNetworkID(t *testing.T) { + testData := []struct { + Name string + Input string + Error bool + Expect *VirtualNetworkId + }{ + { + Name: "Empty", + Input: "", + Error: true, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Error: true, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Error: true, + }, + { + Name: "Resource Group ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", + Error: true, + }, + { + Name: "Virtual Network ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/virtualNetworks/network1", + Error: false, + Expect: &VirtualNetworkId{ + ResourceGroup: "resGroup1", + Name: "network1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Network/VirtualNetworks/network1", + Error: true, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Name) + + actual, err := VirtualNetworkID(v.Input) + if err != nil { + if v.Error { + continue + } + + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.Name != v.Expect.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expect.Name, actual.Name) + } + + if actual.ResourceGroup != v.Expect.ResourceGroup { + t.Fatalf("Expected %q but got %q for Resource Group", v.Expect.ResourceGroup, actual.ResourceGroup) + } + } +} diff --git a/azurerm/internal/services/network/validate/virtual_network.go b/azurerm/internal/services/network/validate/virtual_network.go new file mode 100644 index 0000000000000..03b10e31f2efe --- /dev/null +++ b/azurerm/internal/services/network/validate/virtual_network.go @@ -0,0 +1,23 @@ +package validate + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network/parse" +) + +// VirtualNetworkID validates that the specified ID is a valid Virtual Network ID +func VirtualNetworkID(i interface{}, k string) (warnings []string, errors []error) { + v, ok := i.(string) + if !ok { + errors = append(errors, fmt.Errorf("expected type of %q to be string", k)) + return + } + + if _, err := parse.VirtualNetworkID(v); err != nil { + errors = append(errors, fmt.Errorf("Can not parse %q as a resource id: %v", k, err)) + return + } + + return warnings, errors +} diff --git a/azurerm/internal/services/network/virtual_network.go b/azurerm/internal/services/network/virtual_network.go deleted file mode 100644 index ffd47239f6ff4..0000000000000 --- a/azurerm/internal/services/network/virtual_network.go +++ /dev/null @@ -1,49 +0,0 @@ -package network - -import ( - "fmt" - - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" -) - -type VirtualNetworkID struct { - ResourceGroup string - Name string -} - -func ParseVirtualNetworkID(input string) (*VirtualNetworkID, error) { - id, err := azure.ParseAzureResourceID(input) - if err != nil { - return nil, fmt.Errorf("[ERROR] Unable to parse Subnet ID %q: %+v", input, err) - } - - vnet := VirtualNetworkID{ - ResourceGroup: id.ResourceGroup, - } - - if vnet.Name, err = id.PopSegment("virtualNetworks"); err != nil { - return nil, err - } - - if err := id.ValidateNoEmptySegments(input); err != nil { - return nil, err - } - - return &vnet, nil -} - -// ValidateVirtualNetworkID validates that the specified ID is a valid App Service ID -func ValidateVirtualNetworkID(i interface{}, k string) (warnings []string, errors []error) { - v, ok := i.(string) - if !ok { - errors = append(errors, fmt.Errorf("expected type of %q to be string", k)) - return - } - - if _, err := ParseVirtualNetworkID(v); err != nil { - errors = append(errors, fmt.Errorf("Can not parse %q as a resource id: %v", k, err)) - return - } - - return warnings, errors -} From ef7dcaaab5b05cbb15739cab0da4c3997bd8ce11 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Wed, 19 Feb 2020 14:02:58 +0100 Subject: [PATCH 324/498] d/app_service_environment: fixing comments from code review --- .../app_service_environment_data_source.go | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/azurerm/internal/services/web/app_service_environment_data_source.go b/azurerm/internal/services/web/app_service_environment_data_source.go index de54d73a36849..4e99c9de26c3f 100644 --- a/azurerm/internal/services/web/app_service_environment_data_source.go +++ b/azurerm/internal/services/web/app_service_environment_data_source.go @@ -56,16 +56,31 @@ func dataSourceArmAppServiceEnvironmentRead(d *schema.ResourceData, meta interfa if utils.ResponseWasNotFound(resp.Response) { return fmt.Errorf("Error: App Service Environment %q (Resource Group %q) was not found", name, resourceGroup) } - return fmt.Errorf("Error making read request on Azure App Service Environment %q: %+v", name, err) + return fmt.Errorf("Error retrieving App Service Environment %q (Resource Group %q): %+v", name, resourceGroup, err) } d.SetId(*resp.ID) d.Set("name", name) d.Set("resource_group_name", resourceGroup) - d.Set("front_end_scale_factor", int(*resp.FrontEndScaleFactor)) - d.Set("pricing_tier", convertToIsolatedSKU(*resp.MultiSize)) - d.Set("location", azure.NormalizeLocation(*resp.Location)) + + if loc := resp.Location; loc != nil { + d.Set("location", azure.NormalizeLocation(*loc)) + } + + if props := resp.AppServiceEnvironment; props != nil { + frontendScaleFactor := 0 + if props.FrontEndScaleFactor != nil { + frontendScaleFactor = int(*props.FrontEndScaleFactor) + } + d.Set("front_end_scale_factor", frontendScaleFactor) + + pricingTier := "" + if props.MultiSize != nil { + pricingTier = convertFromIsolatedSKU(*props.MultiSize) + } + d.Set("pricing_tier", pricingTier) + } return tags.FlattenAndSet(d, resp.Tags) } From bbdfbcb93894d8b24c3254cda22d3e18d92b868d Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Wed, 19 Feb 2020 15:40:30 +0100 Subject: [PATCH 325/498] web: removing todos --- azurerm/internal/services/web/registration.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/web/registration.go b/azurerm/internal/services/web/registration.go index 37589d215f5b3..282159c5e36e0 100644 --- a/azurerm/internal/services/web/registration.go +++ b/azurerm/internal/services/web/registration.go @@ -24,8 +24,8 @@ func (r Registration) SupportedDataSources() map[string]*schema.Resource { "azurerm_app_service": dataSourceArmAppService(), "azurerm_app_service_certificate_order": dataSourceArmAppServiceCertificateOrder(), "azurerm_app_service_environment": dataSourceArmAppServiceEnvironment(), - "azurerm_app_service_certificate": dataSourceAppServiceCertificate(), //TODO: rename this for consistency? - "azurerm_app_service_plan": dataSourceAppServicePlan(), //TODO: rename this for consistency? + "azurerm_app_service_certificate": dataSourceAppServiceCertificate(), + "azurerm_app_service_plan": dataSourceAppServicePlan(), "azurerm_function_app": dataSourceArmFunctionApp(), } } From a661838752f2bfbb9fba9d08d1e8aa5fdf7bf152 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Wed, 19 Feb 2020 15:56:09 +0100 Subject: [PATCH 326/498] d/app_service_environment: renaming the file to match the convention --- ...est.go => app_service_environment_data_source_test.go} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename azurerm/internal/services/web/tests/{data_source_app_service_environment_test.go => app_service_environment_data_source_test.go} (76%) diff --git a/azurerm/internal/services/web/tests/data_source_app_service_environment_test.go b/azurerm/internal/services/web/tests/app_service_environment_data_source_test.go similarity index 76% rename from azurerm/internal/services/web/tests/data_source_app_service_environment_test.go rename to azurerm/internal/services/web/tests/app_service_environment_data_source_test.go index 3d48cbf9ade54..5b98c25ff79ca 100644 --- a/azurerm/internal/services/web/tests/data_source_app_service_environment_test.go +++ b/azurerm/internal/services/web/tests/app_service_environment_data_source_test.go @@ -16,7 +16,7 @@ func TestAccDataSourceAzureRMAppServiceEnvironment_basic(t *testing.T) { Providers: acceptance.SupportedProviders, Steps: []resource.TestStep{ { - Config: testAccDatasourceAppServiceEnvironment_basic(data), + Config: testAccDataSourceAppServiceEnvironment_basic(data), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(data.ResourceName, "front_end_scale_factor"), resource.TestCheckResourceAttrSet(data.ResourceName, "pricing_tier"), @@ -26,14 +26,14 @@ func TestAccDataSourceAzureRMAppServiceEnvironment_basic(t *testing.T) { }) } -func testAccDatasourceAppServiceEnvironment_basic(data acceptance.TestData) string { +func testAccDataSourceAppServiceEnvironment_basic(data acceptance.TestData) string { config := testAccAzureRMAppServiceEnvironment_basic(data) return fmt.Sprintf(` %s data "azurerm_app_service_environment" "test" { - name = "${azurerm_app_service_environment.test.name}" - resource_group_name = "${azurerm_app_service_environment.test.resource_group_name}" + name = azurerm_app_service_environment.test.name + resource_group_name = azurerm_app_service_environment.test.resource_group_name } `, config) } From b840fd481b4159caebee88be1bed147583dfb5a8 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Wed, 19 Feb 2020 15:56:45 +0100 Subject: [PATCH 327/498] r/app_service_environment: fixing comments from code review --- .../web/parse/app_service_environment_test.go | 5 ++ .../web/validate/app_service_environment.go | 14 ------ .../r/app_service_environment.html.markdown | 50 ++++++++----------- 3 files changed, 25 insertions(+), 44 deletions(-) diff --git a/azurerm/internal/services/web/parse/app_service_environment_test.go b/azurerm/internal/services/web/parse/app_service_environment_test.go index 50c93b5442574..5600c8b6efdb3 100644 --- a/azurerm/internal/services/web/parse/app_service_environment_test.go +++ b/azurerm/internal/services/web/parse/app_service_environment_test.go @@ -41,6 +41,11 @@ func TestParseAppServiceEnvironmentID(t *testing.T) { Name: "TestASEv2", }, }, + { + Name: "Wrong Case", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup1/providers/Microsoft.Web/HostingEnvironments/TestASEv2", + Expected: nil, + }, } for _, v := range testData { diff --git a/azurerm/internal/services/web/validate/app_service_environment.go b/azurerm/internal/services/web/validate/app_service_environment.go index 63d458654577b..9e7b63222213b 100644 --- a/azurerm/internal/services/web/validate/app_service_environment.go +++ b/azurerm/internal/services/web/validate/app_service_environment.go @@ -31,17 +31,3 @@ func AppServiceEnvironmentName(v interface{}, k string) (warnings []string, erro return warnings, errors } - -func AppServiceEnvironmentPricingTier(v interface{}, k string) (warnings []string, errors []error) { - tier := v.(string) - - valid := []string{"I1", "I2", "I3"} - - for _, val := range valid { - if val == tier { - return - } - } - errors = append(errors, fmt.Errorf("pricing_tier must be one of %q", valid)) - return warnings, errors -} diff --git a/website/docs/r/app_service_environment.html.markdown b/website/docs/r/app_service_environment.html.markdown index d82ffca09a4fb..4f9a554b62cc1 100644 --- a/website/docs/r/app_service_environment.html.markdown +++ b/website/docs/r/app_service_environment.html.markdown @@ -9,9 +9,7 @@ description: |- # azurerm_app_service_environment -Manages a App Service Environment - -**WARNING** Deleting an App Service Environment resource will also delete App Service Plans and App Services associated with it. +Manages an App Service Environment. ## Example Usage @@ -26,27 +24,25 @@ resource "azurerm_virtual_network" "example" { location = "${azurerm_resource_group.example.location}" resource_group_name = "${azurerm_resource_group.example.name}" address_space = ["10.0.0.0/16"] - - subnet { - name = "asesubnet" - address_prefix = "10.0.1.0/24" - } - - subnet { - name = "gatewaysubnet" - address_prefix = "10.0.2.0/24" - } } -data "azurerm_subnet" "example" { +resource "azurerm_subnet" "ase" { name = "asesubnet" - virtual_network_name = "${azurerm_virtual_network.example.name}" - resource_group_name = "${azurerm_resource_group.example.name}" + resource_group_name = azurerm_resource_group.example.name + virtual_network_name = azurerm_virtual_network.example.name + address_prefix = "10.0.1.0/24" +} + +resource "azurerm_subnet" "gateway" { + name = "gatewaysubnet" + resource_group_name = azurerm_resource_group.example.name + virtual_network_name = azurerm_virtual_network.example.name + address_prefix = "10.0.2.0/24" } resource "azurerm_app_service_environment" "example" { name = "example-ase" - subnet_id = "${data.azurerm_subnet.example.id}" + subnet_id = azurerm_subnet.ase.id pricing_tier = "I2" front_end_scale_factor = 10 } @@ -55,29 +51,23 @@ resource "azurerm_app_service_environment" "example" { ## Argument Reference -* `name` - (Required) name of the App Service Environment. - -~> **NOTE** Must meet DNS name specification. +* `name` - (Required) The name of the App Service Environment. Changing this forces a new resource to be created. -* `subnet_id` - (Required) Resource ID for the ASE subnet. +* `subnet_id` - (Required) The ID of the Subnet which the App Service Environment should be connected to. Changing this forces a new resource to be created. ~> **NOTE** a /24 or larger CIDR is required. Once associated with an ASE this size cannot be changed. -* `pricing_tier` - (Optional) Pricing tier for the front end instances. Possible values are `I1` (default), `I2` and `I3`. - -~> **NOTE** Azure currently utilises Dv2 instances for Isolated SKUs, being `Standard_D1_V2`, `Standard_D2_V2`, and `Standard_D3_V2`. - -* `front_end_scale_factor` - (Optional) Scale factor for front end instances. Possible values are between `15` (default) and `5`. +* `pricing_tier` - (Optional) Pricing tier for the front end instances. Possible values are `I1`, `I2` and `I3`. Defaults to `I1`. -~> **NOTE** Lowering/changing this value has cost implications, see https://docs.microsoft.com/en-us/azure/app-service/environment/using-an-ase#front-end-scaling for details. +* `front_end_scale_factor` - (Optional) Scale factor for front end instances. Possible values are between `5` and `15`. Defaults to `15`. ## Attribute Reference -* `id` - The ID of the App Services Environment. +* `id` - The ID of the App Service Environment. -* `resource_group_name` - The name of the resource group. +* `resource_group_name` - The name of the Resource Group where the App Service Environment exists. -* `location` - The location the App Service Environment is deployed into. +* `location` - The location where the App Service Environment exists. ## Import From 5b5241ee7c7b5c5a9c43319e006939c60ee062f1 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Wed, 19 Feb 2020 16:56:07 +0100 Subject: [PATCH 328/498] r/app_service_environment: switching to use a custom update method/poller --- .../web/app_service_environment_resource.go | 222 +++++++++++++----- .../app_service_environment_resource_test.go | 203 +++++++--------- 2 files changed, 246 insertions(+), 179 deletions(-) diff --git a/azurerm/internal/services/web/app_service_environment_resource.go b/azurerm/internal/services/web/app_service_environment_resource.go index 3efda382e9dfb..cdb134e90a4ed 100644 --- a/azurerm/internal/services/web/app_service_environment_resource.go +++ b/azurerm/internal/services/web/app_service_environment_resource.go @@ -1,6 +1,7 @@ package web import ( + "context" "fmt" "log" "time" @@ -10,6 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" networkParse "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network/parse" networkValidate "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network/validate" @@ -23,9 +25,9 @@ import ( func resourceArmAppServiceEnvironment() *schema.Resource { return &schema.Resource{ - Create: resourceArmAppServiceEnvironmentCreateOrUpdate, + Create: resourceArmAppServiceEnvironmentCreate, Read: resourceArmAppServiceEnvironmentRead, - Update: resourceArmAppServiceEnvironmentCreateOrUpdate, + Update: resourceArmAppServiceEnvironmentUpdate, Delete: resourceArmAppServiceEnvironmentDelete, Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { _, err := parse.AppServiceEnvironmentID(id) @@ -48,6 +50,13 @@ func resourceArmAppServiceEnvironment() *schema.Resource { ValidateFunc: validate.AppServiceEnvironmentName, }, + "subnet_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: networkValidate.SubnetID, + }, + "internal_load_balancing_mode": { Type: schema.TypeString, Optional: true, @@ -59,21 +68,6 @@ func resourceArmAppServiceEnvironment() *schema.Resource { }, false), }, - "subnet_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: networkValidate.SubnetID, - }, - - // Note: This is currently 'multiSize' in the API for historic v1 reasons, may change in future? - "pricing_tier": { - Type: schema.TypeString, - Optional: true, - Default: "I1", - ValidateFunc: validate.AppServiceEnvironmentPricingTier, - }, - "front_end_scale_factor": { Type: schema.TypeInt, Optional: true, @@ -81,6 +75,20 @@ func resourceArmAppServiceEnvironment() *schema.Resource { ValidateFunc: validation.IntBetween(5, 15), }, + "pricing_tier": { + Type: schema.TypeString, + Optional: true, + Default: "I1", + ValidateFunc: validation.StringInSlice([]string{ + "I1", + "I2", + "I3", + }, false), + }, + + "tags": tags.ForceNewSchema(), + + // Computed "location": { Type: schema.TypeString, Computed: true, @@ -90,14 +98,13 @@ func resourceArmAppServiceEnvironment() *schema.Resource { Type: schema.TypeString, Computed: true, }, - - "tags": tags.Schema(), }, } } -func resourceArmAppServiceEnvironmentCreateOrUpdate(d *schema.ResourceData, meta interface{}) error { + +func resourceArmAppServiceEnvironmentCreate(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Web.AppServiceEnvironmentsClient - vnetClient := meta.(*clients.Client).Network.VnetClient + networksClient := meta.(*clients.Client).Network.VnetClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -108,56 +115,65 @@ func resourceArmAppServiceEnvironmentCreateOrUpdate(d *schema.ResourceData, meta subnetId := d.Get("subnet_id").(string) subnet, err := networkParse.SubnetID(subnetId) if err != nil { - return fmt.Errorf("Error parsing subnet id %q: %+v", subnetId, err) + return err } resourceGroup := subnet.ResourceGroup - - vnet, err := vnetClient.Get(ctx, resourceGroup, subnet.VirtualNetworkName, "") + vnet, err := networksClient.Get(ctx, resourceGroup, subnet.VirtualNetworkName, "") if err != nil { - return fmt.Errorf("Error reading Virtual Network %q for App Service Environment %q: %+v", subnet.VirtualNetworkName, name, err) + return fmt.Errorf("Error retrieving Virtual Network %q (Resource Group %q): %+v", subnet.VirtualNetworkName, resourceGroup, err) } + // the App Service Environment has to be in the same location as the Virtual netowrk - var location string - if vnetLoc := vnet.Location; vnetLoc != nil { - location = azure.NormalizeLocation(*vnetLoc) + if loc := vnet.Location; loc != nil { + location = azure.NormalizeLocation(*loc) } else { - return fmt.Errorf("Error determining Location from Virtual Network %s", *vnet.Name) + return fmt.Errorf("Error determining Location from Virtual Network %q (Resource Group %q): `location` was nil", subnet.VirtualNetworkName, resourceGroup) } - frontEndScaleFactor := d.Get("front_end_scale_factor").(int) + existing, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if !utils.ResponseWasNotFound(existing.Response) { + return fmt.Errorf("Error checking for presence of existing App Service Environment %q (Resource Group %q): %s", name, resourceGroup, err) + } + } - pricingTier := d.Get("pricing_tier").(string) + if existing.ID != nil && *existing.ID != "" { + return tf.ImportAsExistsError("azurerm_app_service_environment", *existing.ID) + } - // the SDK is coded primarily for v1, which needs a non-null entry for workerpool, so we construct an empty slice for it - // TODO Submit change for SDK? - wp := []web.WorkerPool{{}} + frontEndScaleFactor := d.Get("front_end_scale_factor").(int) + pricingTier := d.Get("pricing_tier").(string) envelope := web.AppServiceEnvironmentResource{ Location: utils.String(location), Kind: utils.String("ASEV2"), AppServiceEnvironment: &web.AppServiceEnvironment{ - FrontEndScaleFactor: utils.Int32(int32(frontEndScaleFactor)), - MultiSize: utils.String(convertFromIsolatedSKU(pricingTier)), Name: utils.String(name), Location: utils.String(location), InternalLoadBalancingMode: web.InternalLoadBalancingMode(internalLoadBalancingMode), + FrontEndScaleFactor: utils.Int32(int32(frontEndScaleFactor)), + MultiSize: utils.String(convertFromIsolatedSKU(pricingTier)), VirtualNetwork: &web.VirtualNetworkProfile{ ID: utils.String(subnetId), Subnet: utils.String(subnet.Name), }, - WorkerPools: &wp, + + // the SDK is coded primarily for v1, which needs a non-null entry for workerpool, so we construct an empty slice for it + // TODO: remove this hack once https://github.com/Azure/azure-rest-api-specs/pull/8433 has been merged + WorkerPools: &[]web.WorkerPool{{}}, }, Tags: tags.Expand(t), } - future, err := client.CreateOrUpdate(ctx, resourceGroup, name, envelope) - if err != nil { + // whilst this returns a future go-autorest has a max number of retries + if _, err := client.CreateOrUpdate(ctx, resourceGroup, name, envelope); err != nil { return fmt.Errorf("Error creating App Service Environment %q (Resource Group %q): %+v", name, resourceGroup, err) } - err = future.WaitForCompletionRef(ctx, client.Client) - if err != nil { + // as such we'll ignore it and use a custom poller instead + if err := waitForAppServiceEnvironmentToStabilize(ctx, client, resourceGroup, name); err != nil { return fmt.Errorf("Error waiting for the creation of App Service Environment %q (Resource Group %q): %+v", name, resourceGroup, err) } @@ -171,6 +187,49 @@ func resourceArmAppServiceEnvironmentCreateOrUpdate(d *schema.ResourceData, meta return resourceArmAppServiceEnvironmentRead(d, meta) } +func resourceArmAppServiceEnvironmentUpdate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Web.AppServiceEnvironmentsClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := parse.AppServiceEnvironmentID(d.Id()) + if err != nil { + return err + } + + resourceGroup := id.ResourceGroup + name := id.Name + + environment := web.AppServiceEnvironmentPatchResource{ + AppServiceEnvironment: &web.AppServiceEnvironment{}, + } + + if d.HasChange("internal_load_balancing_mode") { + v := d.Get("internal_load_balancing_mode").(string) + environment.AppServiceEnvironment.InternalLoadBalancingMode = web.InternalLoadBalancingMode(v) + } + + if d.HasChange("front_end_scale_factor") { + v := d.Get("front_end_scale_factor").(int) + environment.AppServiceEnvironment.FrontEndScaleFactor = utils.Int32(int32(v)) + } + + if d.HasChange("pricing_tier") { + v := d.Get("pricing_tier").(string) + environment.AppServiceEnvironment.MultiSize = utils.String(v) + } + + if _, err := client.Update(ctx, resourceGroup, name, environment); err != nil { + return fmt.Errorf("Error updating App Service Environment %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + if err := waitForAppServiceEnvironmentToStabilize(ctx, client, resourceGroup, name); err != nil { + return fmt.Errorf("Error waiting for Update of App Service Environment %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + return resourceArmAppServiceEnvironmentRead(d, meta) +} + func resourceArmAppServiceEnvironmentRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Web.AppServiceEnvironmentsClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) @@ -184,10 +243,10 @@ func resourceArmAppServiceEnvironmentRead(d *schema.ResourceData, meta interface resourceGroup := id.ResourceGroup name := id.Name - appServiceEnvironment, err := client.Get(ctx, resourceGroup, name) + existing, err := client.Get(ctx, resourceGroup, name) if err != nil { - if utils.ResponseWasNotFound(appServiceEnvironment.Response) { - log.Printf("[DEBUG] App Service Environmment %q (Resource Group %q) was not found!", name, resourceGroup) + if utils.ResponseWasNotFound(existing.Response) { + log.Printf("[DEBUG] App Service Environmment %q (Resource Group %q) was not found - removing from state!", name, resourceGroup) d.SetId("") return nil } @@ -196,29 +255,34 @@ func resourceArmAppServiceEnvironmentRead(d *schema.ResourceData, meta interface d.Set("name", name) d.Set("resource_group_name", resourceGroup) - if location := appServiceEnvironment.Location; location != nil { + + if location := existing.Location; location != nil { d.Set("location", azure.NormalizeLocation(*location)) } - if err := tags.FlattenAndSet(d, appServiceEnvironment.Tags); err != nil { - return fmt.Errorf("Error flattening and setting tags in App Service Environment %q (resource group %q): %+v", name, resourceGroup, err) - } + if props := existing.AppServiceEnvironment; props != nil { + d.Set("internal_load_balancing_mode", string(props.InternalLoadBalancingMode)) - ase := appServiceEnvironment.AppServiceEnvironment - if ase.InternalLoadBalancingMode != "" { - d.Set("internal_load_balancing_mode", ase.InternalLoadBalancingMode) - } - if ase.VirtualNetwork.ID != nil { - d.Set("subnet_id", ase.VirtualNetwork.ID) - } - if ase.FrontEndScaleFactor != nil { - d.Set("front_end_scale_factor", int(*ase.FrontEndScaleFactor)) - } - if ase.MultiSize != nil { - d.Set("pricing_tier", convertToIsolatedSKU(*ase.MultiSize)) + subnetId := "" + if props.VirtualNetwork != nil && props.VirtualNetwork.ID != nil { + subnetId = *props.VirtualNetwork.ID + } + d.Set("subnet_id", subnetId) + + frontendScaleFactor := 0 + if props.FrontEndScaleFactor != nil { + frontendScaleFactor = int(*props.FrontEndScaleFactor) + } + d.Set("front_end_scale_factor", frontendScaleFactor) + + pricingTier := "" + if props.MultiSize != nil { + pricingTier = convertToIsolatedSKU(*props.MultiSize) + } + d.Set("pricing_tier", pricingTier) } - return nil + return tags.FlattenAndSet(d, existing.Tags) } func resourceArmAppServiceEnvironmentDelete(d *schema.ResourceData, meta interface{}) error { @@ -236,15 +300,15 @@ func resourceArmAppServiceEnvironmentDelete(d *schema.ResourceData, meta interfa log.Printf("[DEBUG] Deleting App Service Environment %q (Resource Group %q)", name, resGroup) - // `true` below deletes any child resources (e.g. App Services / Plans / Certificates etc) - // TODO: Add this to the provider 'Features' schema? - future, err := client.Delete(ctx, resGroup, name, utils.Bool(true)) + // TODO: should this behaviour be added to the `features` block? + forceDeleteAllChildren := utils.Bool(false) + future, err := client.Delete(ctx, resGroup, name, forceDeleteAllChildren) if err != nil { if response.WasNotFound(future.Response()) { return nil } - return err + return fmt.Errorf("Error deleting App Service Environment %q (Resource Group %q): %+v", name, resGroup, err) } err = future.WaitForCompletionRef(ctx, client.Client) @@ -253,7 +317,35 @@ func resourceArmAppServiceEnvironmentDelete(d *schema.ResourceData, meta interfa return nil } - return err + return fmt.Errorf("Error waiting for deletion of App Service Environment %q (Resource Group %q): %+v", name, resGroup, err) + } + + return nil +} + +func waitForAppServiceEnvironmentToStabilize(ctx context.Context, client *web.AppServiceEnvironmentsClient, resourceGroup string, name string) error { + for true { + time.Sleep(1 * time.Minute) + + read, err := client.Get(ctx, resourceGroup, name) + if err != nil { + return err + } + + if read.AppServiceEnvironment == nil { + return fmt.Errorf("`properties` was nil") + } + + state := read.AppServiceEnvironment.ProvisioningState + if state == web.ProvisioningStateSucceeded { + return nil + } + + if state == web.ProvisioningStateInProgress { + continue + } + + return fmt.Errorf("Unexpected ProvisioningState: %q", state) } return nil 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 b90e65844a498..b64ed190ae024 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 @@ -12,7 +12,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func TestAccAzureRMAppServiceEnvironment_basicWindows(t *testing.T) { +func TestAccAzureRMAppServiceEnvironment_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_app_service_environment", "test") resource.ParallelTest(t, resource.TestCase{ @@ -74,7 +74,7 @@ func TestAccAzureRMAppServiceEnvironment_update(t *testing.T) { }, data.ImportStep(), { - Config: testAccAzureRMAppServiceEnvironment_update(data), + Config: testAccAzureRMAppServiceEnvironment_tierAndScaleFactor(data), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(data.ResourceName, "pricing_tier", "I2"), resource.TestCheckResourceAttr(data.ResourceName, "front_end_scale_factor", "10"), @@ -126,118 +126,6 @@ func TestAccAzureRMAppServiceEnvironment_withAppServicePlan(t *testing.T) { }) } -func testAccAzureRMAppServiceEnvironment_basic(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%[1]d" - location = "%[2]s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctest-vnet-%[1]d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - address_space = ["10.0.0.0/16"] - - subnet { - name = "asesubnet" - address_prefix = "10.0.1.0/24" - } - - subnet { - name = "gatewaysubnet" - address_prefix = "10.0.2.0/24" - } -} - -data "azurerm_subnet" "test" { - name = "asesubnet" - virtual_network_name = "${azurerm_virtual_network.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_app_service_environment" "test" { - name = "acctest-ase-%[1]d" - subnet_id = "${data.azurerm_subnet.test.id}" -} -`, data.RandomInteger, data.Locations.Primary) -} - -func testAccAzureRMAppServiceEnvironment_requiresImport(data acceptance.TestData) string { - template := testAccAzureRMAppServiceEnvironment_basic(data) - return fmt.Sprintf(` -%s - -resource "azurerm_app_service_environment" "import" { - name = "${azurerm_app_service_environment.test.name}" - subnet_id = "${azurerm_app_service_environment.test.subnet_id}" - -} -`, template) -} - -func testAccAzureRMAppServiceEnvironment_tierAndScaleFactor(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%[1]d" - location = "%[2]s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctest-vnet-%[1]d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - address_space = ["10.0.0.0/16"] - - subnet { - name = "asesubnet" - address_prefix = "10.0.1.0/24" - } - - subnet { - name = "gatewaysubnet" - address_prefix = "10.0.2.0/24" - } -} - -data "azurerm_subnet" "test" { - name = "asesubnet" - virtual_network_name = "${azurerm_virtual_network.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_app_service_environment" "test" { - name = "acctest-ase-%[1]d" - subnet_id = "${data.azurerm_subnet.test.id}" - pricing_tier = "I2" - front_end_scale_factor = 10 -} -`, data.RandomInteger, data.Locations.Primary) -} - -func testAccAzureRMAppServiceEnvironment_update(data acceptance.TestData) string { - return testAccAzureRMAppServiceEnvironment_tierAndScaleFactor(data) -} - -func testAccAzureRMAppServiceEnvironment_withAppServicePlan(data acceptance.TestData) string { - template := testAccAzureRMAppServiceEnvironment_basic(data) - return fmt.Sprintf(` -%s - -resource "azurerm_app_service_plan" "test" { - name = "acctest-ASP-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - app_service_environment_id = "${azurerm_app_service_environment.test.id}" - - sku { - tier = "Basic" - size = "B1" - } -} -`, template, data.RandomInteger) -} - func testCheckAzureRMAppServiceEnvironmentExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).Web.AppServiceEnvironmentsClient @@ -336,3 +224,90 @@ func testCheckAppServicePlanMemberOfAppServiceEnvironment(ase string, asp string return nil } } + +func testAccAzureRMAppServiceEnvironment_basic(data acceptance.TestData) string { + template := testAccAzureRMAppServiceEnvironment_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_app_service_environment" "test" { + name = "acctest-ase-%d" + subnet_id = azurerm_subnet.ase.id +} +`, template, data.RandomInteger) +} + +func testAccAzureRMAppServiceEnvironment_requiresImport(data acceptance.TestData) string { + template := testAccAzureRMAppServiceEnvironment_basic(data) + return fmt.Sprintf(` +%s + +resource "azurerm_app_service_environment" "import" { + name = azurerm_app_service_environment.test.name + subnet_id = azurerm_app_service_environment.test.subnet_id +} +`, template) +} + +func testAccAzureRMAppServiceEnvironment_tierAndScaleFactor(data acceptance.TestData) string { + template := testAccAzureRMAppServiceEnvironment_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_app_service_environment" "test" { + name = "acctest-ase-%d" + subnet_id = azurerm_subnet.ase.id + pricing_tier = "I2" + front_end_scale_factor = 10 +} +`, template, data.RandomInteger) +} + +func testAccAzureRMAppServiceEnvironment_withAppServicePlan(data acceptance.TestData) string { + template := testAccAzureRMAppServiceEnvironment_basic(data) + return fmt.Sprintf(` +%s + +resource "azurerm_app_service_plan" "test" { + name = "acctest-ASP-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + app_service_environment_id = azurerm_app_service_environment.test.id + + sku { + tier = "Basic" + size = "B1" + } +} +`, template, data.RandomInteger) +} + +func testAccAzureRMAppServiceEnvironment_template(data acceptance.TestData) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctest-vnet-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + address_space = ["10.0.0.0/16"] +} + +resource "azurerm_subnet" "ase" { + name = "asesubnet" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name + address_prefix = "10.0.1.0/24" +} + +resource "azurerm_subnet" "gateway" { + name = "gatewaysubnet" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name + address_prefix = "10.0.2.0/24" +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) +} From f5d0c7ce52aa7cbb060b347c48b2307aa483927c Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 21 Feb 2020 15:03:12 +0100 Subject: [PATCH 329/498] tests: adding in missing checkdestroys for the data source tests --- ...pp_service_environment_data_source_test.go | 5 +- .../data_source_app_service_plan_test.go | 20 +++++--- .../web/tests/data_source_app_service_test.go | 50 +++++++++++-------- 3 files changed, 45 insertions(+), 30 deletions(-) diff --git a/azurerm/internal/services/web/tests/app_service_environment_data_source_test.go b/azurerm/internal/services/web/tests/app_service_environment_data_source_test.go index 5b98c25ff79ca..a38c32a878edf 100644 --- a/azurerm/internal/services/web/tests/app_service_environment_data_source_test.go +++ b/azurerm/internal/services/web/tests/app_service_environment_data_source_test.go @@ -12,8 +12,9 @@ func TestAccDataSourceAzureRMAppServiceEnvironment_basic(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_app_service_environment", "test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMAppServiceEnvironmentDestroy, Steps: []resource.TestStep{ { Config: testAccDataSourceAppServiceEnvironment_basic(data), 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 0b6d291c9d01c..83076a2e43991 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 @@ -14,8 +14,9 @@ func TestAccDataSourceAzureRMAppServicePlan_basic(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_app_service_plan", "test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMAppServicePlanDestroy, Steps: []resource.TestStep{ { Config: testAccDataSourceAppServicePlan_basic(data), @@ -35,8 +36,9 @@ func TestAccDataSourceAzureRMAppServicePlan_complete(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_app_service_plan", "test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMAppServicePlanDestroy, Steps: []resource.TestStep{ { Config: testAccDataSourceAppServicePlan_complete(data), @@ -57,8 +59,9 @@ func TestAccDataSourceAzureRMAppServicePlan_premiumSKU(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_app_service_plan", "test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMAppServicePlanDestroy, Steps: []resource.TestStep{ { Config: testAccDataSourceAppServicePlan_premiumSKU(data), @@ -78,8 +81,9 @@ func TestAccDataSourceAzureRMAppServicePlan_basicWindowsContainer(t *testing.T) data := acceptance.BuildTestData(t, "data.azurerm_app_service_plan", "test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMAppServicePlanDestroy, Steps: []resource.TestStep{ { Config: testAccDataSourceAppServicePlan_basicWindowsContainer(data), diff --git a/azurerm/internal/services/web/tests/data_source_app_service_test.go b/azurerm/internal/services/web/tests/data_source_app_service_test.go index b94041087df63..bc4f75c25abab 100644 --- a/azurerm/internal/services/web/tests/data_source_app_service_test.go +++ b/azurerm/internal/services/web/tests/data_source_app_service_test.go @@ -12,8 +12,9 @@ func TestAccDataSourceAzureRMAppService_basic(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_app_service", "test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMAppServiceDestroy, Steps: []resource.TestStep{ { Config: testAccDataSourceAppService_basic(data), @@ -32,8 +33,9 @@ func TestAccDataSourceAzureRMAppService_tags(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_app_service", "test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMAppServiceDestroy, Steps: []resource.TestStep{ { Config: testAccDataSourceAppService_tags(data), @@ -50,8 +52,9 @@ func TestAccDataSourceAzureRMAppService_clientAppAffinityDisabled(t *testing.T) data := acceptance.BuildTestData(t, "data.azurerm_app_service", "test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMAppServiceDestroy, Steps: []resource.TestStep{ { Config: testAccDataSourceAppService_clientAffinityDisabled(data), @@ -67,8 +70,9 @@ func TestAccDataSourceAzureRMAppService_32Bit(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_app_service", "test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMAppServiceDestroy, Steps: []resource.TestStep{ { Config: testAccDataSourceAppService_32Bit(data), @@ -84,8 +88,9 @@ func TestAccDataSourceAzureRMAppService_appSettings(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_app_service", "test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMAppServiceDestroy, Steps: []resource.TestStep{ { Config: testAccDataSourceAppService_appSettings(data), @@ -101,8 +106,9 @@ func TestAccDataSourceAzureRMAppService_connectionString(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_app_service", "test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMAppServiceDestroy, Steps: []resource.TestStep{ { Config: testAccDataSourceAppService_connectionStrings(data), @@ -123,8 +129,9 @@ func TestAccDataSourceAzureRMAppService_ipRestriction(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_app_service", "test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMAppServiceDestroy, Steps: []resource.TestStep{ { Config: testAccDataSourceAppService_ipRestriction(data), @@ -140,8 +147,9 @@ func TestAccDataSourceAzureRMAppService_http2Enabled(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_app_service", "test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMAppServiceDestroy, Steps: []resource.TestStep{ { Config: testAccDataSourceAppService_http2Enabled(data), @@ -157,8 +165,9 @@ func TestAccDataSourceAzureRMAppService_minTls(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_app_service", "test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMAppServiceDestroy, Steps: []resource.TestStep{ { Config: testAccDataSourceAppService_minTls(data), @@ -174,8 +183,9 @@ func TestAccDataSourceAzureRMAppService_basicWindowsContainer(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_app_service", "test") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMAppServiceDestroy, Steps: []resource.TestStep{ { Config: testAccDataSourceAppService_basicWindowsContainer(data), From b190eff5f5b79964ea12d6ae4003502ba6a71bdc Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 21 Feb 2020 15:05:58 +0100 Subject: [PATCH 330/498] r/app_service_environment: fixing up linting --- .../internal/services/web/app_service_environment_resource.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/web/app_service_environment_resource.go b/azurerm/internal/services/web/app_service_environment_resource.go index cdb134e90a4ed..ac1acef6ca6fc 100644 --- a/azurerm/internal/services/web/app_service_environment_resource.go +++ b/azurerm/internal/services/web/app_service_environment_resource.go @@ -124,7 +124,7 @@ func resourceArmAppServiceEnvironmentCreate(d *schema.ResourceData, meta interfa return fmt.Errorf("Error retrieving Virtual Network %q (Resource Group %q): %+v", subnet.VirtualNetworkName, resourceGroup, err) } - // the App Service Environment has to be in the same location as the Virtual netowrk - + // the App Service Environment has to be in the same location as the Virtual Network var location string if loc := vnet.Location; loc != nil { location = azure.NormalizeLocation(*loc) @@ -324,7 +324,7 @@ func resourceArmAppServiceEnvironmentDelete(d *schema.ResourceData, meta interfa } func waitForAppServiceEnvironmentToStabilize(ctx context.Context, client *web.AppServiceEnvironmentsClient, resourceGroup string, name string) error { - for true { + for { time.Sleep(1 * time.Minute) read, err := client.Get(ctx, resourceGroup, name) From 8000bba4476615e2473e591b900deee0be642f65 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 21 Feb 2020 15:23:16 +0100 Subject: [PATCH 331/498] r/app_service_env: fixing the import test --- .../services/web/tests/app_service_environment_resource_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b64ed190ae024..6db18f88cab4c 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 @@ -39,7 +39,7 @@ func TestAccAzureRMAppServiceEnvironment_requiresImport(t *testing.T) { return } - data := acceptance.BuildTestData(t, "azurerm_app_service_environment", "test") + data := acceptance.BuildTestData(t, "azurerm_app_service_environment", "import") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, From afb1e60f3e4e9ec22a4e94f0612c5985b3b75bb6 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 21 Feb 2020 18:56:18 +0100 Subject: [PATCH 332/498] r/app_service_environment: fixing the requires import test --- .../web/tests/app_service_environment_resource_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 6db18f88cab4c..05a1ec9792fc1 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 @@ -39,14 +39,14 @@ func TestAccAzureRMAppServiceEnvironment_requiresImport(t *testing.T) { return } - data := acceptance.BuildTestData(t, "azurerm_app_service_environment", "import") + data := acceptance.BuildTestData(t, "azurerm_app_service_environment", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMAppServiceDestroy, + CheckDestroy: testCheckAzureRMAppServiceEnvironmentDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMAppService_basic(data), + Config: testAccAzureRMAppServiceEnvironment_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMAppServiceEnvironmentExists(data.ResourceName), ), From 08855d9b8ab32e0f07c504e96dba320a754802e0 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 21 Feb 2020 20:58:57 +0100 Subject: [PATCH 333/498] r/app_service_environment: converting from the display to actual sku --- .../internal/services/web/app_service_environment_resource.go | 1 + 1 file changed, 1 insertion(+) diff --git a/azurerm/internal/services/web/app_service_environment_resource.go b/azurerm/internal/services/web/app_service_environment_resource.go index ac1acef6ca6fc..78edc473120fb 100644 --- a/azurerm/internal/services/web/app_service_environment_resource.go +++ b/azurerm/internal/services/web/app_service_environment_resource.go @@ -216,6 +216,7 @@ func resourceArmAppServiceEnvironmentUpdate(d *schema.ResourceData, meta interfa if d.HasChange("pricing_tier") { v := d.Get("pricing_tier").(string) + v = convertFromIsolatedSKU(v) environment.AppServiceEnvironment.MultiSize = utils.String(v) } From 1c2eb081ae5a1361f87be1c27f6c9080da7a276f Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 21 Feb 2020 21:32:33 +0100 Subject: [PATCH 334/498] r/app_service_environment: fixing the plan test --- .../services/web/app_service_environment_resource.go | 2 -- .../web/tests/app_service_environment_resource_test.go | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/azurerm/internal/services/web/app_service_environment_resource.go b/azurerm/internal/services/web/app_service_environment_resource.go index 78edc473120fb..bda7acb22fb68 100644 --- a/azurerm/internal/services/web/app_service_environment_resource.go +++ b/azurerm/internal/services/web/app_service_environment_resource.go @@ -348,8 +348,6 @@ func waitForAppServiceEnvironmentToStabilize(ctx context.Context, client *web.Ap return fmt.Errorf("Unexpected ProvisioningState: %q", state) } - - return nil } // Note: These are abstractions and possibly subject to change if Azure changes the underlying SKU for Isolated instances. 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 05a1ec9792fc1..0e0ef9687f649 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 @@ -275,8 +275,9 @@ resource "azurerm_app_service_plan" "test" { app_service_environment_id = azurerm_app_service_environment.test.id sku { - tier = "Basic" - size = "B1" + tier = "Isolated" + size = "I1" + capacity = 1 } } `, template, data.RandomInteger) From 9187513738fc4e2dad9faf3949340647148b3606 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 21 Feb 2020 21:46:13 +0100 Subject: [PATCH 335/498] refactor: switching to the same client --- azurerm/internal/services/web/client/client.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/azurerm/internal/services/web/client/client.go b/azurerm/internal/services/web/client/client.go index 0ff3d10a458cf..6c89651665ade 100644 --- a/azurerm/internal/services/web/client/client.go +++ b/azurerm/internal/services/web/client/client.go @@ -2,12 +2,11 @@ package client import ( "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" - asev2 "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common" ) type Client struct { - AppServiceEnvironmentsClient *asev2.AppServiceEnvironmentsClient + AppServiceEnvironmentsClient *web.AppServiceEnvironmentsClient AppServicePlansClient *web.AppServicePlansClient AppServicesClient *web.AppsClient BaseClient *web.BaseClient @@ -16,7 +15,7 @@ type Client struct { } func NewClient(o *common.ClientOptions) *Client { - appServiceEnvironmentsClient := asev2.NewAppServiceEnvironmentsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) + appServiceEnvironmentsClient := web.NewAppServiceEnvironmentsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&appServiceEnvironmentsClient.Client, o.ResourceManagerAuthorizer) appServicePlansClient := web.NewAppServicePlansClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) From 26000c1c11ab7631b0c0097ea7d84c74a46b8f6d Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 21 Feb 2020 21:46:57 +0100 Subject: [PATCH 336/498] deps: fixing the vendor file --- vendor/modules.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/vendor/modules.txt b/vendor/modules.txt index 21fb930017fc9..ef8827c62e164 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -80,7 +80,6 @@ github.com/Azure/azure-sdk-for-go/services/signalr/mgmt/2018-10-01/signalr github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-04-01/storage github.com/Azure/azure-sdk-for-go/services/streamanalytics/mgmt/2016-03-01/streamanalytics github.com/Azure/azure-sdk-for-go/services/trafficmanager/mgmt/2018-04-01/trafficmanager -github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web github.com/Azure/azure-sdk-for-go/version # github.com/Azure/go-autorest/autorest v0.9.3 From 59ca4b2971428feb3537a81ad71209736696aee6 Mon Sep 17 00:00:00 2001 From: jknash Date: Fri, 21 Feb 2020 15:42:14 -0600 Subject: [PATCH 337/498] Change dns to dns_servers The correct syntax is to use dns_servers, not dns in the active_directory configuration block. --- website/docs/r/netapp_account.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/netapp_account.html.markdown b/website/docs/r/netapp_account.html.markdown index 5d179cafe56ba..3540442f8a505 100644 --- a/website/docs/r/netapp_account.html.markdown +++ b/website/docs/r/netapp_account.html.markdown @@ -29,7 +29,7 @@ resource "azurerm_netapp_account" "example" { username = "aduser" password = "aduserpwd" smb_server_name = "SMBSERVER" - dns = ["1.2.3.4"] + dns_servers = ["1.2.3.4"] domain = "westcentralus.com" organizational_unit = "OU=FirstLevel" } From 677220e36688c13a069ee858bf9fb9524674c0cb Mon Sep 17 00:00:00 2001 From: jknash Date: Fri, 21 Feb 2020 16:00:30 -0600 Subject: [PATCH 338/498] Update domain regex to allow dash (-) Azure AD domain services allows a dash - in the domain name, but the regex that validates the domain name does not. I changed the regex from: ^[(\da-zA-Z)\.]{1,255}$ to: ^[(\da-zA-Z-)\.]{1,255}$ It's a subtle change, but we can't use the ANF provider until it is fixed, because our domain name contains a dash - --- azurerm/internal/services/netapp/resource_arm_netapp_account.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/netapp/resource_arm_netapp_account.go b/azurerm/internal/services/netapp/resource_arm_netapp_account.go index 4b606ed848ce1..168d9ff80cbe7 100644 --- a/azurerm/internal/services/netapp/resource_arm_netapp_account.go +++ b/azurerm/internal/services/netapp/resource_arm_netapp_account.go @@ -68,7 +68,7 @@ func resourceArmNetAppAccount() *schema.Resource { Type: schema.TypeString, Required: true, ValidateFunc: validation.StringMatch( - regexp.MustCompile(`^[(\da-zA-Z)\.]{1,255}$`), + regexp.MustCompile(`^[(\da-zA-Z-)\.]{1,255}$`), `The domain name must end with a letter or number before dot and start with a letter or number after dot and can not be longer than 255 characters in length.`, ), }, From bccc83d64b061f9e16e0d90b794819e90fc8ad22 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Fri, 21 Feb 2020 16:25:59 -0800 Subject: [PATCH 339/498] removing deprecated resources --- .../data_source_builtin_role_definition.go | 190 --- .../services/authorization/registration.go | 5 +- ...ata_source_builtin_role_definition_test.go | 112 -- .../resource_arm_role_assignment_test.go | 8 +- .../internal/services/monitor/registration.go | 5 +- .../monitor/resource_arm_autoscale_setting.go | 1087 ----------------- .../monitor/resource_arm_metric_alertrule.go | 476 -------- .../resource_arm_monitor_metric_alertrule.go | 462 ------- .../resource_arm_autoscale_setting_test.go | 918 -------------- .../resource_arm_metric_alertrule_test.go | 483 -------- ...ource_arm_monitor_metric_alertrule_test.go | 462 ------- ...source_private_link_endpoint_connection.go | 167 --- .../internal/services/network/registration.go | 4 - .../resource_arm_connection_monitor.go | 351 ------ .../resource_arm_ddos_protection_plan.go | 254 ---- ...source_arm_network_ddos_protection_plan.go | 20 + .../resource_arm_private_link_endpoint.go | 242 ---- ...e_private_link_endpoint_connection_test.go | 37 - .../resource_arm_connection_monitor_test.go | 648 ---------- .../resource_arm_ddos_protection_plan_test.go | 264 ---- ...resource_arm_private_link_endpoint_test.go | 102 -- .../resource_arm_virtual_network_test.go | 4 +- ..._vm.go => data_source_backup_policy_vm.go} | 12 +- .../services/recoveryservices/registration.go | 36 +- .../resource_arm_recovery_services_fabric.go | 164 --- ...e_arm_recovery_services_network_mapping.go | 216 ---- ...urce_arm_recovery_services_protected_vm.go | 283 ----- ..._recovery_services_protection_container.go | 162 --- ...y_services_protection_container_mapping.go | 203 --- ..._recovery_services_protection_policy_vm.go | 764 ------------ ...rce_arm_recovery_services_replicated_vm.go | 353 ------ ...rm_recovery_services_replication_policy.go | 215 ---- ..._arm_site_recovery_protection_container.go | 2 +- ...o => data_source_backup_policy_vm_test.go} | 18 +- ...ource_arm_recovery_services_fabric_test.go | 113 -- ..._recovery_services_network_mapping_test.go | 161 --- ...arm_recovery_services_protected_vm_test.go | 642 ---------- ...vices_protection_container_mapping_test.go | 158 --- ...very_services_protection_container_test.go | 121 -- ...very_services_protection_policy_vm_test.go | 555 --------- ...rm_recovery_services_replicated_vm_test.go | 269 ---- ...covery_services_replication_policy_test.go | 113 -- .../autoscale/main.tf | 2 +- website/azurerm.erb | 71 +- ..._vm.markdown => backup_policy_vm.markdown} | 14 +- .../docs/d/builtin_role_definition.markdown | 51 - ...ate_link_endpoint_connection.html.markdown | 61 - website/docs/d/role_definition.html.markdown | 2 +- .../guides/2.0-upgrade-guide.html.markdown | 10 + .../managed_service_identity.html.markdown | 4 +- .../docs/r/autoscale_setting.html.markdown | 421 ------- .../docs/r/connection_monitor.html.markdown | 181 --- .../docs/r/ddos_protection_plan.html.markdown | 68 -- website/docs/r/metric_alertrule.html.markdown | 167 --- .../r/monitor_metric_alertrule.html.markdown | 165 --- .../network_connection_monitor.html.markdown | 179 --- .../r/private_link_endpoint.html.markdown | 162 --- .../r/recovery_network_mapping.html.markdown | 114 -- .../r/recovery_services_fabric.html.markdown | 76 -- .../r/recovery_services_protected_vm.markdown | 87 -- ...ervices_protection_container.html.markdown | 83 -- ...protection_container_mapping.html.markdown | 121 -- ...ery_services_protection_policy_vm.markdown | 159 --- ...overy_services_replicated_vm.html.markdown | 232 ---- ..._services_replication_policy.html.markdown | 74 -- website/docs/r/virtual_network.html.markdown | 4 +- 66 files changed, 86 insertions(+), 13283 deletions(-) delete mode 100644 azurerm/internal/services/authorization/data_source_builtin_role_definition.go delete mode 100644 azurerm/internal/services/authorization/tests/data_source_builtin_role_definition_test.go delete mode 100644 azurerm/internal/services/monitor/resource_arm_autoscale_setting.go delete mode 100644 azurerm/internal/services/monitor/resource_arm_metric_alertrule.go delete mode 100644 azurerm/internal/services/monitor/resource_arm_monitor_metric_alertrule.go delete mode 100644 azurerm/internal/services/monitor/tests/resource_arm_autoscale_setting_test.go delete mode 100644 azurerm/internal/services/monitor/tests/resource_arm_metric_alertrule_test.go delete mode 100644 azurerm/internal/services/monitor/tests/resource_arm_monitor_metric_alertrule_test.go delete mode 100644 azurerm/internal/services/network/data_source_private_link_endpoint_connection.go delete mode 100644 azurerm/internal/services/network/resource_arm_connection_monitor.go delete mode 100644 azurerm/internal/services/network/resource_arm_ddos_protection_plan.go delete mode 100644 azurerm/internal/services/network/resource_arm_private_link_endpoint.go delete mode 100644 azurerm/internal/services/network/tests/data_source_private_link_endpoint_connection_test.go delete mode 100644 azurerm/internal/services/network/tests/resource_arm_connection_monitor_test.go delete mode 100644 azurerm/internal/services/network/tests/resource_arm_ddos_protection_plan_test.go delete mode 100644 azurerm/internal/services/network/tests/resource_arm_private_link_endpoint_test.go rename azurerm/internal/services/recoveryservices/{data_source_recovery_services_protection_policy_vm.go => data_source_backup_policy_vm.go} (72%) delete mode 100644 azurerm/internal/services/recoveryservices/resource_arm_recovery_services_fabric.go delete mode 100644 azurerm/internal/services/recoveryservices/resource_arm_recovery_services_network_mapping.go delete mode 100644 azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protected_vm.go delete mode 100644 azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_container.go delete mode 100644 azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_container_mapping.go delete mode 100644 azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_policy_vm.go delete mode 100644 azurerm/internal/services/recoveryservices/resource_arm_recovery_services_replicated_vm.go delete mode 100644 azurerm/internal/services/recoveryservices/resource_arm_recovery_services_replication_policy.go rename azurerm/internal/services/recoveryservices/tests/{data_source_recovery_services_protection_policy_vm_test.go => data_source_backup_policy_vm_test.go} (53%) delete mode 100644 azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_fabric_test.go delete mode 100644 azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_network_mapping_test.go delete mode 100644 azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protected_vm_test.go delete mode 100644 azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_container_mapping_test.go delete mode 100644 azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_container_test.go delete mode 100644 azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_policy_vm_test.go delete mode 100644 azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_replicated_vm_test.go delete mode 100644 azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_replication_policy_test.go rename website/docs/d/{recovery_services_protection_policy_vm.markdown => backup_policy_vm.markdown} (62%) delete mode 100644 website/docs/d/builtin_role_definition.markdown delete mode 100644 website/docs/d/private_link_endpoint_connection.html.markdown delete mode 100644 website/docs/r/autoscale_setting.html.markdown delete mode 100644 website/docs/r/connection_monitor.html.markdown delete mode 100644 website/docs/r/ddos_protection_plan.html.markdown delete mode 100644 website/docs/r/metric_alertrule.html.markdown delete mode 100644 website/docs/r/monitor_metric_alertrule.html.markdown delete mode 100644 website/docs/r/network_connection_monitor.html.markdown delete mode 100644 website/docs/r/private_link_endpoint.html.markdown delete mode 100644 website/docs/r/recovery_network_mapping.html.markdown delete mode 100644 website/docs/r/recovery_services_fabric.html.markdown delete mode 100644 website/docs/r/recovery_services_protected_vm.markdown delete mode 100644 website/docs/r/recovery_services_protection_container.html.markdown delete mode 100644 website/docs/r/recovery_services_protection_container_mapping.html.markdown delete mode 100644 website/docs/r/recovery_services_protection_policy_vm.markdown delete mode 100644 website/docs/r/recovery_services_replicated_vm.html.markdown delete mode 100644 website/docs/r/recovery_services_replication_policy.html.markdown diff --git a/azurerm/internal/services/authorization/data_source_builtin_role_definition.go b/azurerm/internal/services/authorization/data_source_builtin_role_definition.go deleted file mode 100644 index 3c47827503a19..0000000000000 --- a/azurerm/internal/services/authorization/data_source_builtin_role_definition.go +++ /dev/null @@ -1,190 +0,0 @@ -package authorization - -import ( - "fmt" - "time" - - "github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-09-01-preview/authorization" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" -) - -func dataSourceArmBuiltInRoleDefinition() *schema.Resource { - return &schema.Resource{ - Read: dataSourceArmBuiltInRoleDefinitionRead, - - Timeouts: &schema.ResourceTimeout{ - Read: schema.DefaultTimeout(5 * time.Minute), - }, - - DeprecationMessage: `This Data Source has been deprecated in favour of the 'azurerm_role_definition' resource that now can look up role definitions by names. - -As such this Data Source will be removed in v2.0 of the AzureRM Provider. -`, - - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - }, - - // Computed - "description": { - Type: schema.TypeString, - Computed: true, - }, - "type": { - Type: schema.TypeString, - Computed: true, - }, - "permissions": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "actions": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - "not_actions": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - "data_actions": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - Set: schema.HashString, - }, - "not_data_actions": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - Set: schema.HashString, - }, - }, - }, - }, - "assignable_scopes": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - }, - } -} - -func dataSourceArmBuiltInRoleDefinitionRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Authorization.RoleDefinitionsClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - name := d.Get("name").(string) - if name == "VirtualMachineContributor" { - name = "Virtual Machine Contributor" - } - filter := fmt.Sprintf("roleName eq '%s'", name) - roleDefinitions, err := client.List(ctx, "", filter) - if err != nil { - return fmt.Errorf("Error loading Role Definition List: %+v", err) - } - if len(roleDefinitions.Values()) != 1 { - return fmt.Errorf("Error loading Role Definition List: could not find role '%s'", name) - } - - roleDefinitionId := *roleDefinitions.Values()[0].ID - - d.SetId(roleDefinitionId) - - role, err := client.GetByID(ctx, roleDefinitionId) - if err != nil { - return fmt.Errorf("Error loading Role Definition: %+v", err) - } - - if props := role.RoleDefinitionProperties; props != nil { - d.Set("name", props.RoleName) - d.Set("description", props.Description) - d.Set("type", props.RoleType) - - permissions := flattenRoleDefinitionDataSourcePermissions(props.Permissions) - if err := d.Set("permissions", permissions); err != nil { - return err - } - - assignableScopes := flattenRoleDefinitionDataSourceAssignableScopes(props.AssignableScopes) - if err := d.Set("assignable_scopes", assignableScopes); err != nil { - return err - } - } - - return nil -} - -func flattenRoleDefinitionDataSourcePermissions(input *[]authorization.Permission) []interface{} { - permissions := make([]interface{}, 0) - if input == nil { - return permissions - } - - for _, permission := range *input { - output := make(map[string]interface{}) - - actions := make([]string, 0) - if s := permission.Actions; s != nil { - actions = *s - } - output["actions"] = actions - - dataActions := make([]interface{}, 0) - if s := permission.DataActions; s != nil { - for _, dataAction := range *s { - dataActions = append(dataActions, dataAction) - } - } - output["data_actions"] = schema.NewSet(schema.HashString, dataActions) - - notActions := make([]string, 0) - if s := permission.NotActions; s != nil { - notActions = *s - } - output["not_actions"] = notActions - - notDataActions := make([]interface{}, 0) - if s := permission.NotDataActions; s != nil { - for _, dataAction := range *s { - notDataActions = append(notDataActions, dataAction) - } - } - output["not_data_actions"] = schema.NewSet(schema.HashString, notDataActions) - - permissions = append(permissions, output) - } - - return permissions -} - -func flattenRoleDefinitionDataSourceAssignableScopes(input *[]string) []interface{} { - scopes := make([]interface{}, 0) - if input == nil { - return scopes - } - - for _, scope := range *input { - scopes = append(scopes, scope) - } - - return scopes -} diff --git a/azurerm/internal/services/authorization/registration.go b/azurerm/internal/services/authorization/registration.go index b403085646740..9fd6e42c3dd9f 100644 --- a/azurerm/internal/services/authorization/registration.go +++ b/azurerm/internal/services/authorization/registration.go @@ -21,9 +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_builtin_role_definition": dataSourceArmBuiltInRoleDefinition(), - "azurerm_client_config": dataSourceArmClientConfig(), - "azurerm_role_definition": dataSourceArmRoleDefinition(), + "azurerm_client_config": dataSourceArmClientConfig(), + "azurerm_role_definition": dataSourceArmRoleDefinition(), } } diff --git a/azurerm/internal/services/authorization/tests/data_source_builtin_role_definition_test.go b/azurerm/internal/services/authorization/tests/data_source_builtin_role_definition_test.go deleted file mode 100644 index 805b443e014c0..0000000000000 --- a/azurerm/internal/services/authorization/tests/data_source_builtin_role_definition_test.go +++ /dev/null @@ -1,112 +0,0 @@ -package tests - -import ( - "fmt" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" -) - -func TestAccDataSourceAzureRMBuiltInRoleDefinition_contributor(t *testing.T) { - data := acceptance.BuildTestData(t, "data.azurerm_builtin_role_definition", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - Steps: []resource.TestStep{ - { - Config: testAccDataSourceBuiltInRoleDefinition("Contributor"), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(data.ResourceName, "id", "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c"), - resource.TestCheckResourceAttrSet(data.ResourceName, "description"), - resource.TestCheckResourceAttrSet(data.ResourceName, "type"), - resource.TestCheckResourceAttr(data.ResourceName, "permissions.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "permissions.0.actions.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "permissions.0.actions.0", "*"), - resource.TestCheckResourceAttr(data.ResourceName, "permissions.0.not_actions.#", "5"), - resource.TestCheckResourceAttr(data.ResourceName, "permissions.0.not_actions.0", "Microsoft.Authorization/*/Delete"), - resource.TestCheckResourceAttr(data.ResourceName, "permissions.0.not_actions.1", "Microsoft.Authorization/*/Write"), - resource.TestCheckResourceAttr(data.ResourceName, "permissions.0.not_actions.2", "Microsoft.Authorization/elevateAccess/Action"), - resource.TestCheckResourceAttr(data.ResourceName, "permissions.0.not_actions.3", "Microsoft.Blueprint/blueprintAssignments/write"), - resource.TestCheckResourceAttr(data.ResourceName, "permissions.0.not_actions.4", "Microsoft.Blueprint/blueprintAssignments/delete"), - ), - }, - }, - }) -} - -func TestAccDataSourceAzureRMBuiltInRoleDefinition_owner(t *testing.T) { - data := acceptance.BuildTestData(t, "data.azurerm_builtin_role_definition", "test") - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - Steps: []resource.TestStep{ - { - Config: testAccDataSourceBuiltInRoleDefinition("Owner"), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(data.ResourceName, "id", "/providers/Microsoft.Authorization/roleDefinitions/8e3af657-a8ff-443c-a75c-2fe8c4bcb635"), - resource.TestCheckResourceAttrSet(data.ResourceName, "description"), - resource.TestCheckResourceAttrSet(data.ResourceName, "type"), - resource.TestCheckResourceAttr(data.ResourceName, "permissions.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "permissions.0.actions.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "permissions.0.actions.0", "*"), - resource.TestCheckResourceAttr(data.ResourceName, "permissions.0.not_actions.#", "0"), - ), - }, - }, - }) -} - -func TestAccDataSourceAzureRMBuiltInRoleDefinition_reader(t *testing.T) { - data := acceptance.BuildTestData(t, "data.azurerm_builtin_role_definition", "test") - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - Steps: []resource.TestStep{ - { - Config: testAccDataSourceBuiltInRoleDefinition("Reader"), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(data.ResourceName, "id", "/providers/Microsoft.Authorization/roleDefinitions/acdd72a7-3385-48ef-bd42-f606fba81ae7"), - resource.TestCheckResourceAttrSet(data.ResourceName, "description"), - resource.TestCheckResourceAttrSet(data.ResourceName, "type"), - resource.TestCheckResourceAttr(data.ResourceName, "permissions.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "permissions.0.actions.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "permissions.0.actions.0", "*/read"), - resource.TestCheckResourceAttr(data.ResourceName, "permissions.0.not_actions.#", "0"), - ), - }, - }, - }) -} - -func TestAccDataSourceAzureRMBuiltInRoleDefinition_virtualMachineContributor(t *testing.T) { - data := acceptance.BuildTestData(t, "data.azurerm_builtin_role_definition", "test") - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - Steps: []resource.TestStep{ - { - Config: testAccDataSourceBuiltInRoleDefinition("VirtualMachineContributor"), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(data.ResourceName, "id", "/providers/Microsoft.Authorization/roleDefinitions/9980e02c-c2be-4d73-94e8-173b1dc7cf3c"), - resource.TestCheckResourceAttrSet(data.ResourceName, "description"), - resource.TestCheckResourceAttrSet(data.ResourceName, "type"), - resource.TestCheckResourceAttr(data.ResourceName, "permissions.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "permissions.0.actions.#", "38"), - resource.TestCheckResourceAttr(data.ResourceName, "permissions.0.actions.0", "Microsoft.Authorization/*/read"), - resource.TestCheckResourceAttr(data.ResourceName, "permissions.0.actions.15", "Microsoft.Network/networkSecurityGroups/join/action"), - resource.TestCheckResourceAttr(data.ResourceName, "permissions.0.not_actions.#", "0"), - ), - }, - }, - }) -} - -func testAccDataSourceBuiltInRoleDefinition(name string) string { - return fmt.Sprintf(` -data "azurerm_builtin_role_definition" "test" { - name = "%s" -} -`, name) -} diff --git a/azurerm/internal/services/authorization/tests/resource_arm_role_assignment_test.go b/azurerm/internal/services/authorization/tests/resource_arm_role_assignment_test.go index 0b30cb6b1edd0..df2e193fe5e24 100644 --- a/azurerm/internal/services/authorization/tests/resource_arm_role_assignment_test.go +++ b/azurerm/internal/services/authorization/tests/resource_arm_role_assignment_test.go @@ -342,13 +342,13 @@ data "azurerm_subscription" "primary" {} data "azurerm_client_config" "test" {} -data "azurerm_builtin_role_definition" "test" { +data "azurerm_role_definition" "test" { name = "Monitoring Reader" } resource "azurerm_role_assignment" "test" { scope = "${data.azurerm_subscription.primary.id}" - role_definition_id = "${data.azurerm_subscription.primary.id}${data.azurerm_builtin_role_definition.test.id}" + role_definition_id = "${data.azurerm_subscription.primary.id}${data.azurerm_role_definition.test.id}" principal_id = "${data.azurerm_client_config.test.service_principal_object_id}" } ` @@ -403,14 +403,14 @@ data "azurerm_subscription" "primary" {} data "azurerm_client_config" "test" {} -data "azurerm_builtin_role_definition" "test" { +data "azurerm_role_definition" "test" { name = "Site Recovery Reader" } resource "azurerm_role_assignment" "test" { name = "%s" scope = "${data.azurerm_subscription.primary.id}" - role_definition_id = "${data.azurerm_subscription.primary.id}${data.azurerm_builtin_role_definition.test.id}" + role_definition_id = "${data.azurerm_subscription.primary.id}${data.azurerm_role_definition.test.id}" principal_id = "${data.azurerm_client_config.test.service_principal_object_id}" } `, id) diff --git a/azurerm/internal/services/monitor/registration.go b/azurerm/internal/services/monitor/registration.go index 691f4f753c255..b1ccab0aef1a6 100644 --- a/azurerm/internal/services/monitor/registration.go +++ b/azurerm/internal/services/monitor/registration.go @@ -29,13 +29,10 @@ 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_autoscale_setting": resourceArmAutoScaleSetting(), - "azurerm_metric_alertrule": resourceArmMetricAlertRule(), "azurerm_monitor_autoscale_setting": resourceArmMonitorAutoScaleSetting(), "azurerm_monitor_action_group": resourceArmMonitorActionGroup(), "azurerm_monitor_activity_log_alert": resourceArmMonitorActivityLogAlert(), "azurerm_monitor_diagnostic_setting": resourceArmMonitorDiagnosticSetting(), "azurerm_monitor_log_profile": resourceArmMonitorLogProfile(), - "azurerm_monitor_metric_alert": resourceArmMonitorMetricAlert(), - "azurerm_monitor_metric_alertrule": resourceArmMonitorMetricAlertRule()} + "azurerm_monitor_metric_alert": resourceArmMonitorMetricAlert()} } diff --git a/azurerm/internal/services/monitor/resource_arm_autoscale_setting.go b/azurerm/internal/services/monitor/resource_arm_autoscale_setting.go deleted file mode 100644 index 636fe22e6522c..0000000000000 --- a/azurerm/internal/services/monitor/resource_arm_autoscale_setting.go +++ /dev/null @@ -1,1087 +0,0 @@ -package monitor - -import ( - "fmt" - "log" - "strconv" - "time" - - "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" - "github.com/Azure/go-autorest/autorest/date" - "github.com/hashicorp/go-azure-helpers/response" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmAutoScaleSetting() *schema.Resource { - return &schema.Resource{ - DeprecationMessage: `The 'azurerm_autoscale_setting' resource is deprecated in favour of the renamed version 'azurerm_monitor_autoscale_setting'. - -Information on migrating to the renamed resource can be found here: https://terraform.io/docs/providers/azurerm/guides/migrating-between-renamed-resources.html - -As such the existing 'azurerm_autoscale_setting' resource is deprecated and will be removed in the next major version of the AzureRM Provider (2.0). -`, - - Create: resourceArmAutoScaleSettingCreateUpdate, - Read: resourceArmAutoScaleSettingRead, - Update: resourceArmAutoScaleSettingCreateUpdate, - Delete: resourceArmAutoScaleSettingDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - - "resource_group_name": azure.SchemaResourceGroupName(), - - "location": azure.SchemaLocation(), - - "target_resource_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - }, - - "enabled": { - Type: schema.TypeBool, - Optional: true, - Default: true, - }, - - "profile": { - Type: schema.TypeList, - Required: true, - MaxItems: 20, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "capacity": { - Type: schema.TypeList, - Required: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "minimum": { - Type: schema.TypeInt, - Required: true, - ValidateFunc: validation.IntBetween(0, 1000), - }, - "maximum": { - Type: schema.TypeInt, - Required: true, - ValidateFunc: validation.IntBetween(0, 1000), - }, - "default": { - Type: schema.TypeInt, - Required: true, - ValidateFunc: validation.IntBetween(0, 1000), - }, - }, - }, - }, - "rule": { - Type: schema.TypeList, - Optional: true, - MaxItems: 10, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "metric_trigger": { - Type: schema.TypeList, - Required: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "metric_name": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "metric_resource_id": { - Type: schema.TypeString, - Required: true, - ValidateFunc: azure.ValidateResourceID, - }, - "time_grain": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validate.ISO8601Duration, - }, - "statistic": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - string(insights.MetricStatisticTypeAverage), - string(insights.MetricStatisticTypeMax), - string(insights.MetricStatisticTypeMin), - string(insights.MetricStatisticTypeSum), - }, true), - DiffSuppressFunc: suppress.CaseDifference, - }, - "time_window": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validate.ISO8601Duration, - }, - "time_aggregation": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - string(insights.TimeAggregationTypeAverage), - string(insights.TimeAggregationTypeCount), - string(insights.TimeAggregationTypeMaximum), - string(insights.TimeAggregationTypeMinimum), - string(insights.TimeAggregationTypeTotal), - }, true), - DiffSuppressFunc: suppress.CaseDifference, - }, - "operator": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - string(insights.Equals), - string(insights.GreaterThan), - string(insights.GreaterThanOrEqual), - string(insights.LessThan), - string(insights.LessThanOrEqual), - string(insights.NotEquals), - }, true), - DiffSuppressFunc: suppress.CaseDifference, - }, - "threshold": { - Type: schema.TypeFloat, - Required: true, - }, - }, - }, - }, - "scale_action": { - Type: schema.TypeList, - Required: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "direction": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - string(insights.ScaleDirectionDecrease), - string(insights.ScaleDirectionIncrease), - }, true), - DiffSuppressFunc: suppress.CaseDifference, - }, - "type": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice([]string{ - string(insights.ChangeCount), - string(insights.ExactCount), - string(insights.PercentChangeCount), - }, true), - DiffSuppressFunc: suppress.CaseDifference, - }, - "value": { - Type: schema.TypeInt, - Required: true, - ValidateFunc: validation.IntAtLeast(0), - }, - "cooldown": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validate.ISO8601Duration, - }, - }, - }, - }, - }, - }, - }, - "fixed_date": { - Type: schema.TypeList, - Optional: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "timezone": { - Type: schema.TypeString, - Optional: true, - Default: "UTC", - ValidateFunc: validateAutoScaleSettingsTimeZone(), - }, - "start": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validate.RFC3339Time, - }, - "end": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validate.RFC3339Time, - }, - }, - }, - }, - "recurrence": { - Type: schema.TypeList, - Optional: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "timezone": { - Type: schema.TypeString, - Optional: true, - Default: "UTC", - ValidateFunc: validateAutoScaleSettingsTimeZone(), - }, - "days": { - Type: schema.TypeList, - Required: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - ValidateFunc: validation.StringInSlice([]string{ - "Monday", - "Tuesday", - "Wednesday", - "Thursday", - "Friday", - "Saturday", - "Sunday", - }, true), - DiffSuppressFunc: suppress.CaseDifference, - }, - }, - "hours": { - Type: schema.TypeList, - Required: true, - MaxItems: 1, - Elem: &schema.Schema{ - Type: schema.TypeInt, - ValidateFunc: validation.IntBetween(0, 23), - }, - }, - "minutes": { - Type: schema.TypeList, - Required: true, - MaxItems: 1, - Elem: &schema.Schema{ - Type: schema.TypeInt, - ValidateFunc: validation.IntBetween(0, 59), - }, - }, - }, - }, - }, - }, - }, - }, - - "notification": { - Type: schema.TypeList, - Optional: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "email": { - Type: schema.TypeList, - Optional: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "send_to_subscription_administrator": { - Type: schema.TypeBool, - Optional: true, - Default: false, - }, - "send_to_subscription_co_administrator": { - Type: schema.TypeBool, - Optional: true, - Default: false, - }, - "custom_emails": { - Type: schema.TypeList, - Optional: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - }, - }, - }, - "webhook": { - Type: schema.TypeList, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "service_uri": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "properties": { - Type: schema.TypeMap, - Optional: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - }, - }, - }, - }, - }, - }, - - "tags": tags.Schema(), - }, - } -} - -func resourceArmAutoScaleSettingCreateUpdate(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Monitor.AutoscaleSettingsClient - ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) - defer cancel() - - name := d.Get("name").(string) - resourceGroup := d.Get("resource_group_name").(string) - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, resourceGroup, name) - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing AutoScale Setting %q (Resource Group %q): %s", name, resourceGroup, err) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_autoscale_setting", *existing.ID) - } - } - - location := azure.NormalizeLocation(d.Get("location").(string)) - enabled := d.Get("enabled").(bool) - targetResourceId := d.Get("target_resource_id").(string) - - notificationsRaw := d.Get("notification").([]interface{}) - notifications := expandAzureRmAutoScaleSettingNotifications(notificationsRaw) - - profilesRaw := d.Get("profile").([]interface{}) - profiles, err := expandAzureRmAutoScaleSettingProfile(profilesRaw) - if err != nil { - return fmt.Errorf("Error expanding `profile`: %+v", err) - } - - t := d.Get("tags").(map[string]interface{}) - expandedTags := tags.Expand(t) - - parameters := insights.AutoscaleSettingResource{ - Location: utils.String(location), - AutoscaleSetting: &insights.AutoscaleSetting{ - Enabled: &enabled, - Profiles: profiles, - Notifications: notifications, - TargetResourceURI: &targetResourceId, - }, - Tags: expandedTags, - } - - if _, err = client.CreateOrUpdate(ctx, resourceGroup, name, parameters); err != nil { - return fmt.Errorf("Error creating AutoScale Setting %q (Resource Group %q): %+v", name, resourceGroup, err) - } - - read, err := client.Get(ctx, resourceGroup, name) - if err != nil { - return fmt.Errorf("Error retrieving AutoScale Setting %q (Resource Group %q): %+v", name, resourceGroup, err) - } - if read.ID == nil { - return fmt.Errorf("AutoScale Setting %q (Resource Group %q) has no ID", name, resourceGroup) - } - - d.SetId(*read.ID) - - return resourceArmAutoScaleSettingRead(d, meta) -} - -func resourceArmAutoScaleSettingRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Monitor.AutoscaleSettingsClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - resourceGroup := id.ResourceGroup - name := id.Path["autoscalesettings"] - - resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - log.Printf("[DEBUG] AutoScale Setting %q (Resource Group %q) was not found - removing from state!", name, resourceGroup) - d.SetId("") - return nil - } - - return fmt.Errorf("Error reading AutoScale Setting %q (Resource Group %q): %+v", name, resourceGroup, err) - } - - d.Set("name", name) - d.Set("resource_group_name", resourceGroup) - if location := resp.Location; location != nil { - d.Set("location", azure.NormalizeLocation(*location)) - } - - d.Set("enabled", resp.Enabled) - d.Set("target_resource_id", resp.TargetResourceURI) - - profile, err := flattenAzureRmAutoScaleSettingProfile(resp.Profiles) - if err != nil { - return fmt.Errorf("Error flattening `profile` of Autoscale Setting %q (Resource Group %q): %+v", name, resourceGroup, err) - } - if err = d.Set("profile", profile); err != nil { - return fmt.Errorf("Error setting `profile` of Autoscale Setting %q (Resource Group %q): %+v", name, resourceGroup, err) - } - - notifications := flattenAzureRmAutoScaleSettingNotification(resp.Notifications) - if err = d.Set("notification", notifications); err != nil { - return fmt.Errorf("Error setting `notification` of Autoscale Setting %q (resource group %q): %+v", name, resourceGroup, err) - } - - // Return a new tag map filtered by the specified tag names. - tagMap := tags.Filter(resp.Tags, "$type") - return tags.FlattenAndSet(d, tagMap) -} - -func resourceArmAutoScaleSettingDelete(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Monitor.AutoscaleSettingsClient - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - resourceGroup := id.ResourceGroup - name := id.Path["autoscalesettings"] - - resp, err := client.Delete(ctx, resourceGroup, name) - if err != nil { - if !response.WasNotFound(resp.Response) { - return fmt.Errorf("Error deleting AutoScale Setting %q (Resource Group %q): %+v", name, resourceGroup, err) - } - } - - return nil -} - -func expandAzureRmAutoScaleSettingProfile(input []interface{}) (*[]insights.AutoscaleProfile, error) { - results := make([]insights.AutoscaleProfile, 0) - - for _, v := range input { - raw := v.(map[string]interface{}) - - name := raw["name"].(string) - - // this is Required, so we don't need to check for optionals here - capacitiesRaw := raw["capacity"].([]interface{}) - capacityRaw := capacitiesRaw[0].(map[string]interface{}) - capacity := insights.ScaleCapacity{ - Minimum: utils.String(strconv.Itoa(capacityRaw["minimum"].(int))), - Maximum: utils.String(strconv.Itoa(capacityRaw["maximum"].(int))), - Default: utils.String(strconv.Itoa(capacityRaw["default"].(int))), - } - - recurrencesRaw := raw["recurrence"].([]interface{}) - recurrence := expandAzureRmAutoScaleSettingRecurrence(recurrencesRaw) - - rulesRaw := raw["rule"].([]interface{}) - rules := expandAzureRmAutoScaleSettingRule(rulesRaw) - - fixedDatesRaw := raw["fixed_date"].([]interface{}) - fixedDate, err := expandAzureRmAutoScaleSettingFixedDate(fixedDatesRaw) - if err != nil { - return nil, fmt.Errorf("Error expanding `fixed_date`: %+v", err) - } - - result := insights.AutoscaleProfile{ - Name: utils.String(name), - Capacity: &capacity, - FixedDate: fixedDate, - Recurrence: recurrence, - Rules: rules, - } - results = append(results, result) - } - - return &results, nil -} - -func expandAzureRmAutoScaleSettingRule(input []interface{}) *[]insights.ScaleRule { - rules := make([]insights.ScaleRule, 0) - - for _, v := range input { - ruleRaw := v.(map[string]interface{}) - - triggersRaw := ruleRaw["metric_trigger"].([]interface{}) - triggerRaw := triggersRaw[0].(map[string]interface{}) - metricTrigger := insights.MetricTrigger{ - MetricName: utils.String(triggerRaw["metric_name"].(string)), - MetricResourceURI: utils.String(triggerRaw["metric_resource_id"].(string)), - TimeGrain: utils.String(triggerRaw["time_grain"].(string)), - Statistic: insights.MetricStatisticType(triggerRaw["statistic"].(string)), - TimeWindow: utils.String(triggerRaw["time_window"].(string)), - TimeAggregation: insights.TimeAggregationType(triggerRaw["time_aggregation"].(string)), - Operator: insights.ComparisonOperationType(triggerRaw["operator"].(string)), - Threshold: utils.Float(triggerRaw["threshold"].(float64)), - } - - actionsRaw := ruleRaw["scale_action"].([]interface{}) - actionRaw := actionsRaw[0].(map[string]interface{}) - scaleAction := insights.ScaleAction{ - Direction: insights.ScaleDirection(actionRaw["direction"].(string)), - Type: insights.ScaleType(actionRaw["type"].(string)), - Value: utils.String(strconv.Itoa(actionRaw["value"].(int))), - Cooldown: utils.String(actionRaw["cooldown"].(string)), - } - - rule := insights.ScaleRule{ - MetricTrigger: &metricTrigger, - ScaleAction: &scaleAction, - } - - rules = append(rules, rule) - } - - return &rules -} - -func expandAzureRmAutoScaleSettingFixedDate(input []interface{}) (*insights.TimeWindow, error) { - if len(input) == 0 { - return nil, nil - } - - raw := input[0].(map[string]interface{}) - - startString := raw["start"].(string) - startTime, err := date.ParseTime(time.RFC3339, startString) - if err != nil { - return nil, fmt.Errorf("Failed to parse `start` time %q as an RFC3339 date: %+v", startString, err) - } - endString := raw["end"].(string) - endTime, err := date.ParseTime(time.RFC3339, endString) - if err != nil { - return nil, fmt.Errorf("Failed to parse `end` time %q as an RFC3339 date: %+v", endString, err) - } - - timeZone := raw["timezone"].(string) - timeWindow := insights.TimeWindow{ - TimeZone: utils.String(timeZone), - Start: &date.Time{ - Time: startTime, - }, - End: &date.Time{ - Time: endTime, - }, - } - return &timeWindow, nil -} - -func expandAzureRmAutoScaleSettingRecurrence(input []interface{}) *insights.Recurrence { - if len(input) == 0 { - return nil - } - - recurrenceRaw := input[0].(map[string]interface{}) - - timeZone := recurrenceRaw["timezone"].(string) - days := make([]string, 0) - for _, dayItem := range recurrenceRaw["days"].([]interface{}) { - days = append(days, dayItem.(string)) - } - - hours := make([]int32, 0) - for _, hourItem := range recurrenceRaw["hours"].([]interface{}) { - hours = append(hours, int32(hourItem.(int))) - } - - minutes := make([]int32, 0) - for _, minuteItem := range recurrenceRaw["minutes"].([]interface{}) { - minutes = append(minutes, int32(minuteItem.(int))) - } - - return &insights.Recurrence{ - // API docs say this has to be `Week`. - Frequency: insights.RecurrenceFrequencyWeek, - Schedule: &insights.RecurrentSchedule{ - TimeZone: utils.String(timeZone), - Days: &days, - Hours: &hours, - Minutes: &minutes, - }, - } -} - -func expandAzureRmAutoScaleSettingNotifications(input []interface{}) *[]insights.AutoscaleNotification { - notifications := make([]insights.AutoscaleNotification, 0) - - for _, v := range input { - notificationRaw := v.(map[string]interface{}) - - emailsRaw := notificationRaw["email"].([]interface{}) - emailRaw := emailsRaw[0].(map[string]interface{}) - email := expandAzureRmAutoScaleSettingNotificationEmail(emailRaw) - - configsRaw := notificationRaw["webhook"].([]interface{}) - webhooks := expandAzureRmAutoScaleSettingNotificationWebhook(configsRaw) - - notification := insights.AutoscaleNotification{ - Email: email, - Operation: utils.String("scale"), - Webhooks: webhooks, - } - notifications = append(notifications, notification) - } - - return ¬ifications -} - -func expandAzureRmAutoScaleSettingNotificationEmail(input map[string]interface{}) *insights.EmailNotification { - customEmails := make([]string, 0) - if v, ok := input["custom_emails"]; ok { - for _, item := range v.([]interface{}) { - customEmails = append(customEmails, item.(string)) - } - } - - email := insights.EmailNotification{ - CustomEmails: &customEmails, - SendToSubscriptionAdministrator: utils.Bool(input["send_to_subscription_administrator"].(bool)), - SendToSubscriptionCoAdministrators: utils.Bool(input["send_to_subscription_co_administrator"].(bool)), - } - - return &email -} - -func expandAzureRmAutoScaleSettingNotificationWebhook(input []interface{}) *[]insights.WebhookNotification { - webhooks := make([]insights.WebhookNotification, 0) - - for _, v := range input { - webhookRaw := v.(map[string]interface{}) - - webhook := insights.WebhookNotification{ - ServiceURI: utils.String(webhookRaw["service_uri"].(string)), - } - - if props, ok := webhookRaw["properties"]; ok { - properties := make(map[string]*string) - for key, value := range props.(map[string]interface{}) { - properties[key] = utils.String(value.(string)) - } - - webhook.Properties = properties - } - - webhooks = append(webhooks, webhook) - } - - return &webhooks -} - -func flattenAzureRmAutoScaleSettingProfile(profiles *[]insights.AutoscaleProfile) ([]interface{}, error) { - if profiles == nil { - return []interface{}{}, nil - } - - results := make([]interface{}, 0) - for _, profile := range *profiles { - result := make(map[string]interface{}) - - if name := profile.Name; name != nil { - result["name"] = *name - } - - capacity, err := flattenAzureRmAutoScaleSettingCapacity(profile.Capacity) - if err != nil { - return nil, fmt.Errorf("Error flattening `capacity`: %+v", err) - } - result["capacity"] = capacity - - result["fixed_date"] = flattenAzureRmAutoScaleSettingFixedDate(profile.FixedDate) - result["recurrence"] = flattenAzureRmAutoScaleSettingRecurrence(profile.Recurrence) - - rule, err := flattenAzureRmAutoScaleSettingRules(profile.Rules) - if err != nil { - return nil, fmt.Errorf("Error flattening Rule: %s", err) - } - result["rule"] = rule - - results = append(results, result) - } - return results, nil -} - -func flattenAzureRmAutoScaleSettingCapacity(input *insights.ScaleCapacity) ([]interface{}, error) { - if input == nil { - return []interface{}{}, nil - } - - result := make(map[string]interface{}) - - if minStr := input.Minimum; minStr != nil { - min, err := strconv.Atoi(*minStr) - if err != nil { - return nil, fmt.Errorf("Error converting Minimum Scale Capacity %q to an int: %+v", *minStr, err) - } - result["minimum"] = min - } - - if maxStr := input.Maximum; maxStr != nil { - max, err := strconv.Atoi(*maxStr) - if err != nil { - return nil, fmt.Errorf("Error converting Maximum Scale Capacity %q to an int: %+v", *maxStr, err) - } - result["maximum"] = max - } - - if defaultCapacityStr := input.Default; defaultCapacityStr != nil { - defaultCapacity, err := strconv.Atoi(*defaultCapacityStr) - if err != nil { - return nil, fmt.Errorf("Error converting Default Scale Capacity %q to an int: %+v", *defaultCapacityStr, err) - } - result["default"] = defaultCapacity - } - - return []interface{}{result}, nil -} - -func flattenAzureRmAutoScaleSettingRules(input *[]insights.ScaleRule) ([]interface{}, error) { - if input == nil { - return []interface{}{}, nil - } - - results := make([]interface{}, 0) - for _, rule := range *input { - result := make(map[string]interface{}) - - metricTriggers := make([]interface{}, 0) - if trigger := rule.MetricTrigger; trigger != nil { - output := make(map[string]interface{}) - - output["operator"] = string(trigger.Operator) - output["statistic"] = string(trigger.Statistic) - output["time_aggregation"] = string(trigger.TimeAggregation) - - if trigger.MetricName != nil { - output["metric_name"] = *trigger.MetricName - } - - if trigger.MetricResourceURI != nil { - output["metric_resource_id"] = *trigger.MetricResourceURI - } - - if trigger.TimeGrain != nil { - output["time_grain"] = *trigger.TimeGrain - } - - if trigger.TimeWindow != nil { - output["time_window"] = *trigger.TimeWindow - } - - if trigger.Threshold != nil { - output["threshold"] = *trigger.Threshold - } - - metricTriggers = append(metricTriggers, output) - } - - result["metric_trigger"] = metricTriggers - - scaleActions := make([]interface{}, 0) - if v := rule.ScaleAction; v != nil { - action := make(map[string]interface{}) - - action["direction"] = string(v.Direction) - action["type"] = string(v.Type) - - if v.Cooldown != nil { - action["cooldown"] = *v.Cooldown - } - - if val := v.Value; val != nil && *val != "" { - i, err := strconv.Atoi(*val) - if err != nil { - return nil, fmt.Errorf("`value` %q was not convertable to an int: %s", *val, err) - } - action["value"] = i - } - - scaleActions = append(scaleActions, action) - } - - result["scale_action"] = scaleActions - - results = append(results, result) - } - - return results, nil -} - -func flattenAzureRmAutoScaleSettingFixedDate(input *insights.TimeWindow) []interface{} { - if input == nil { - return []interface{}{} - } - - result := make(map[string]interface{}) - - if timezone := input.TimeZone; timezone != nil { - result["timezone"] = *timezone - } - - if start := input.Start; start != nil { - result["start"] = start.String() - } - - if end := input.End; end != nil { - result["end"] = end.String() - } - - return []interface{}{result} -} - -func flattenAzureRmAutoScaleSettingRecurrence(input *insights.Recurrence) []interface{} { - if input == nil { - return []interface{}{} - } - - result := make(map[string]interface{}) - - if schedule := input.Schedule; schedule != nil { - if timezone := schedule.TimeZone; timezone != nil { - result["timezone"] = *timezone - } - - days := make([]string, 0) - if s := schedule.Days; s != nil { - days = *s - } - result["days"] = days - - hours := make([]int, 0) - if schedule.Hours != nil { - for _, v := range *schedule.Hours { - hours = append(hours, int(v)) - } - } - result["hours"] = hours - - minutes := make([]int, 0) - if schedule.Minutes != nil { - for _, v := range *schedule.Minutes { - minutes = append(minutes, int(v)) - } - } - result["minutes"] = minutes - } - - return []interface{}{result} -} - -func flattenAzureRmAutoScaleSettingNotification(notifications *[]insights.AutoscaleNotification) []interface{} { - results := make([]interface{}, 0) - - if notifications == nil { - return results - } - - for _, notification := range *notifications { - result := make(map[string]interface{}) - - emails := make([]interface{}, 0) - if email := notification.Email; email != nil { - block := make(map[string]interface{}) - - if send := email.SendToSubscriptionAdministrator; send != nil { - block["send_to_subscription_administrator"] = *send - } - - if send := email.SendToSubscriptionCoAdministrators; send != nil { - block["send_to_subscription_co_administrator"] = *send - } - - customEmails := make([]interface{}, 0) - if custom := email.CustomEmails; custom != nil { - for _, v := range *custom { - customEmails = append(customEmails, v) - } - } - block["custom_emails"] = customEmails - - emails = append(emails, block) - } - result["email"] = emails - - webhooks := make([]interface{}, 0) - if hooks := notification.Webhooks; hooks != nil { - for _, v := range *hooks { - hook := make(map[string]interface{}) - - if v.ServiceURI != nil { - hook["service_uri"] = *v.ServiceURI - } - - props := make(map[string]string) - for key, value := range v.Properties { - if value != nil { - props[key] = *value - } - } - hook["properties"] = props - webhooks = append(webhooks, hook) - } - } - - result["webhook"] = webhooks - - results = append(results, result) - } - return results -} - -func validateAutoScaleSettingsTimeZone() schema.SchemaValidateFunc { - // from https://docs.microsoft.com/en-us/rest/api/monitor/autoscalesettings/createorupdate#timewindow - timeZones := []string{ - "Dateline Standard Time", - "UTC-11", - "Hawaiian Standard Time", - "Alaskan Standard Time", - "Pacific Standard Time (Mexico)", - "Pacific Standard Time", - "US Mountain Standard Time", - "Mountain Standard Time (Mexico)", - "Mountain Standard Time", - "Central America Standard Time", - "Central Standard Time", - "Central Standard Time (Mexico)", - "Canada Central Standard Time", - "SA Pacific Standard Time", - "Eastern Standard Time", - "US Eastern Standard Time", - "Venezuela Standard Time", - "Paraguay Standard Time", - "Atlantic Standard Time", - "Central Brazilian Standard Time", - "SA Western Standard Time", - "Pacific SA Standard Time", - "Newfoundland Standard Time", - "E. South America Standard Time", - "Argentina Standard Time", - "SA Eastern Standard Time", - "Greenland Standard Time", - "Montevideo Standard Time", - "Bahia Standard Time", - "UTC-02", - "Mid-Atlantic Standard Time", - "Azores Standard Time", - "Cape Verde Standard Time", - "Morocco Standard Time", - "UTC", - "GMT Standard Time", - "Greenwich Standard Time", - "W. Europe Standard Time", - "Central Europe Standard Time", - "Romance Standard Time", - "Central European Standard Time", - "W. Central Africa Standard Time", - "Namibia Standard Time", - "Jordan Standard Time", - "GTB Standard Time", - "Middle East Standard Time", - "Egypt Standard Time", - "Syria Standard Time", - "E. Europe Standard Time", - "South Africa Standard Time", - "FLE Standard Time", - "Turkey Standard Time", - "Israel Standard Time", - "Kaliningrad Standard Time", - "Libya Standard Time", - "Arabic Standard Time", - "Arab Standard Time", - "Belarus Standard Time", - "Russian Standard Time", - "E. Africa Standard Time", - "Iran Standard Time", - "Arabian Standard Time", - "Azerbaijan Standard Time", - "Russia Time Zone 3", - "Mauritius Standard Time", - "Georgian Standard Time", - "Caucasus Standard Time", - "Afghanistan Standard Time", - "West Asia Standard Time", - "Ekaterinburg Standard Time", - "Pakistan Standard Time", - "India Standard Time", - "Sri Lanka Standard Time", - "Nepal Standard Time", - "Central Asia Standard Time", - "Bangladesh Standard Time", - "N. Central Asia Standard Time", - "Myanmar Standard Time", - "SE Asia Standard Time", - "North Asia Standard Time", - "China Standard Time", - "North Asia East Standard Time", - "Singapore Standard Time", - "W. Australia Standard Time", - "Taipei Standard Time", - "Ulaanbaatar Standard Time", - "Tokyo Standard Time", - "Korea Standard Time", - "Yakutsk Standard Time", - "Cen. Australia Standard Time", - "AUS Central Standard Time", - "E. Australia Standard Time", - "AUS Eastern Standard Time", - "West Pacific Standard Time", - "Tasmania Standard Time", - "Magadan Standard Time", - "Vladivostok Standard Time", - "Russia Time Zone 10", - "Central Pacific Standard Time", - "Russia Time Zone 11", - "New Zealand Standard Time", - "UTC+12", - "Fiji Standard Time", - "Kamchatka Standard Time", - "Tonga Standard Time", - "Samoa Standard Time", - "Line Islands Standard Time", - } - return validation.StringInSlice(timeZones, false) -} diff --git a/azurerm/internal/services/monitor/resource_arm_metric_alertrule.go b/azurerm/internal/services/monitor/resource_arm_metric_alertrule.go deleted file mode 100644 index dba743c5cbdcf..0000000000000 --- a/azurerm/internal/services/monitor/resource_arm_metric_alertrule.go +++ /dev/null @@ -1,476 +0,0 @@ -package monitor - -import ( - "fmt" - "log" - "strings" - "time" - - "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmMetricAlertRule() *schema.Resource { - return &schema.Resource{ - Create: resourceArmMetricAlertRuleCreateUpdate, - Read: resourceArmMetricAlertRuleRead, - Update: resourceArmMetricAlertRuleCreateUpdate, - Delete: resourceArmMetricAlertRuleDelete, - - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), - }, - - DeprecationMessage: `The 'azurerm_metric_alertrule' resource is deprecated in favour of the renamed version 'azurerm_monitor_metric_alertrule'. - -Information on migrating to the renamed resource can be found here: https://terraform.io/docs/providers/azurerm/guides/migrating-between-renamed-resources.html - -As such the existing 'azurerm_metric_alertrule' resource is deprecated and will be removed in the next major version of the AzureRM Provider (2.0). -`, - - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - }, - - "resource_group_name": azure.SchemaResourceGroupName(), - - "location": azure.SchemaLocation(), - - "description": { - Type: schema.TypeString, - Optional: true, - Computed: true, - }, - - "enabled": { - Type: schema.TypeBool, - Optional: true, - Default: true, - }, - - "resource_id": { - Type: schema.TypeString, - Required: true, - }, - - "metric_name": { - Type: schema.TypeString, - Required: true, - }, - - "operator": { - Type: schema.TypeString, - Required: true, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validation.StringInSlice([]string{ - string(insights.ConditionOperatorGreaterThan), - string(insights.ConditionOperatorGreaterThanOrEqual), - string(insights.ConditionOperatorLessThan), - string(insights.ConditionOperatorLessThanOrEqual), - }, true), - }, - - "threshold": { - Type: schema.TypeFloat, - Required: true, - }, - - "period": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validate.ISO8601Duration, - }, - - "aggregation": { - Type: schema.TypeString, - Required: true, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validation.StringInSlice([]string{ - string(insights.TimeAggregationOperatorAverage), - string(insights.TimeAggregationOperatorLast), - string(insights.TimeAggregationOperatorMaximum), - string(insights.TimeAggregationOperatorMinimum), - string(insights.TimeAggregationOperatorTotal), - }, true), - }, - - "email_action": { - Type: schema.TypeList, - MaxItems: 1, - Optional: true, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "send_to_service_owners": { - Type: schema.TypeBool, - Optional: true, - Computed: true, - }, - - "custom_emails": { - Type: schema.TypeList, - Optional: true, - Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - }, - }, - }, - - "webhook_action": { - Type: schema.TypeList, - MaxItems: 1, - Optional: true, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "service_uri": { - Type: schema.TypeString, - Required: true, - }, - - "properties": { - Type: schema.TypeMap, - Optional: true, - Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - }, - }, - }, - - "tags": { - Type: schema.TypeMap, - Optional: true, - Computed: true, - ValidateFunc: ValidateMetricAlertRuleTags, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - }, - } -} - -func resourceArmMetricAlertRuleCreateUpdate(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Monitor.AlertRulesClient - ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) - defer cancel() - - log.Printf("[INFO] preparing arguments for AzureRM Alert Rule creation.") - - name := d.Get("name").(string) - resourceGroup := d.Get("resource_group_name").(string) - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, resourceGroup, name) - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing Alert Rule %q (Resource Group %q): %s", name, resourceGroup, err) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_metric_alertrule", *existing.ID) - } - } - - location := azure.NormalizeLocation(d.Get("location").(string)) - t := d.Get("tags").(map[string]interface{}) - - alertRule, err := expandAzureRmMetricThresholdAlertRule(d) - if err != nil { - return err - } - - alertRuleResource := insights.AlertRuleResource{ - Name: &name, - Location: &location, - Tags: tags.Expand(t), - AlertRule: alertRule, - } - - if _, err = client.CreateOrUpdate(ctx, resourceGroup, name, alertRuleResource); err != nil { - return err - } - - read, err := client.Get(ctx, resourceGroup, name) - if err != nil { - return err - } - if read.ID == nil { - return fmt.Errorf("Cannot read AzureRM Alert Rule %q (Resource Group %s) ID", name, resourceGroup) - } - - d.SetId(*read.ID) - - return resourceArmMetricAlertRuleRead(d, meta) -} - -func resourceArmMetricAlertRuleRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Monitor.AlertRulesClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - resourceGroup, name, err := resourceGroupAndAlertRuleNameFromId(d.Id()) - if err != nil { - return err - } - - resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - log.Printf("[DEBUG] Metric Alert Rule %q (resource group %q) was not found - removing from state", name, resourceGroup) - d.SetId("") - return nil - } - - return fmt.Errorf("Error making Read request on AzureRM Metric Alert Rule %q: %+v", name, err) - } - - d.Set("name", name) - d.Set("resource_group_name", resourceGroup) - if location := resp.Location; location != nil { - d.Set("location", azure.NormalizeLocation(*location)) - } - - if alertRule := resp.AlertRule; alertRule != nil { - d.Set("description", alertRule.Description) - d.Set("enabled", alertRule.IsEnabled) - - ruleCondition := alertRule.Condition - - if ruleCondition != nil { - if thresholdRuleCondition, ok := ruleCondition.AsThresholdRuleCondition(); ok && thresholdRuleCondition != nil { - d.Set("operator", string(thresholdRuleCondition.Operator)) - d.Set("threshold", thresholdRuleCondition.Threshold) - d.Set("period", thresholdRuleCondition.WindowSize) - d.Set("aggregation", string(thresholdRuleCondition.TimeAggregation)) - - dataSource := thresholdRuleCondition.DataSource - - if dataSource != nil { - if metricDataSource, ok := dataSource.AsRuleMetricDataSource(); ok && metricDataSource != nil { - d.Set("resource_id", metricDataSource.ResourceURI) - d.Set("metric_name", metricDataSource.MetricName) - } - } - } - } - - email_actions := make([]interface{}, 0) - webhook_actions := make([]interface{}, 0) - - for _, ruleAction := range *alertRule.Actions { - if emailAction, ok := ruleAction.AsRuleEmailAction(); ok && emailAction != nil { - email_action := make(map[string]interface{}, 1) - - if sendToOwners := emailAction.SendToServiceOwners; sendToOwners != nil { - email_action["send_to_service_owners"] = *sendToOwners - } - - custom_emails := make([]string, 0) - if s := emailAction.CustomEmails; s != nil { - custom_emails = *s - } - email_action["custom_emails"] = custom_emails - - email_actions = append(email_actions, email_action) - } else if webhookAction, ok := ruleAction.AsRuleWebhookAction(); ok && webhookAction != nil { - webhook_action := make(map[string]interface{}, 1) - - webhook_action["service_uri"] = *webhookAction.ServiceURI - - properties := make(map[string]string) - for k, v := range webhookAction.Properties { - if k != "$type" { - if v != nil { - properties[k] = *v - } - } - } - webhook_action["properties"] = properties - - webhook_actions = append(webhook_actions, webhook_action) - } - } - - d.Set("email_action", email_actions) - d.Set("webhook_action", webhook_actions) - } - - // Return a new tag map filtered by the specified tag names. - tagMap := tags.Filter(resp.Tags, "$type") - - return tags.FlattenAndSet(d, tagMap) -} - -func resourceArmMetricAlertRuleDelete(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Monitor.AlertRulesClient - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - resourceGroup, name, err := resourceGroupAndAlertRuleNameFromId(d.Id()) - if err != nil { - return err - } - - resp, err := client.Delete(ctx, resourceGroup, name) - if err != nil { - if utils.ResponseWasNotFound(resp) { - return nil - } - - return fmt.Errorf("Error deleting Metric Alert Rule %q (resource group %q): %+v", name, resourceGroup, err) - } - - return err -} - -func expandAzureRmMetricThresholdAlertRule(d *schema.ResourceData) (*insights.AlertRule, error) { - name := d.Get("name").(string) - - resource := d.Get("resource_id").(string) - metric_name := d.Get("metric_name").(string) - - metricDataSource := insights.RuleMetricDataSource{ - ResourceURI: &resource, - MetricName: &metric_name, - } - - operator := d.Get("operator").(string) - threshold := d.Get("threshold").(float64) - period := d.Get("period").(string) - aggregation := d.Get("aggregation").(string) - - thresholdRuleCondition := insights.ThresholdRuleCondition{ - DataSource: metricDataSource, - Operator: insights.ConditionOperator(operator), - Threshold: &threshold, - TimeAggregation: insights.TimeAggregationOperator(aggregation), - WindowSize: &period, - } - - actions := make([]insights.BasicRuleAction, 0, 2) - - // Email action - - email_actions := d.Get("email_action").([]interface{}) - - if len(email_actions) > 0 { - email_action := email_actions[0].(map[string]interface{}) - emailAction := insights.RuleEmailAction{} - - if v, ok := email_action["custom_emails"]; ok { - custom_emails := v.([]interface{}) - - customEmails := make([]string, 0) - for _, customEmail := range custom_emails { - custom_email := customEmail.(string) - customEmails = append(customEmails, custom_email) - } - - emailAction.CustomEmails = &customEmails - } - - if v, ok := email_action["send_to_service_owners"]; ok { - sendToServiceOwners := v.(bool) - emailAction.SendToServiceOwners = &sendToServiceOwners - } - - actions = append(actions, emailAction) - } - - // Webhook action - - webhook_actions := d.Get("webhook_action").([]interface{}) - - if len(webhook_actions) > 0 { - webhook_action := webhook_actions[0].(map[string]interface{}) - - service_uri := webhook_action["service_uri"].(string) - - webhook_properties := make(map[string]*string) - - if v, ok := webhook_action["properties"]; ok { - properties := v.(map[string]interface{}) - - for property_key, property_value := range properties { - property_string := property_value.(string) - webhook_properties[property_key] = &property_string - } - } - - webhookAction := insights.RuleWebhookAction{ - ServiceURI: &service_uri, - Properties: webhook_properties, - } - - actions = append(actions, webhookAction) - } - - enabled := d.Get("enabled").(bool) - - alertRule := insights.AlertRule{ - Name: &name, - Condition: &thresholdRuleCondition, - Actions: &actions, - IsEnabled: &enabled, - } - - if v, ok := d.GetOk("description"); ok { - description := v.(string) - alertRule.Description = &description - } - - return &alertRule, nil -} - -func ValidateMetricAlertRuleTags(v interface{}, f string) (warnings []string, errors []error) { - // Normal validation required by any AzureRM resource. - warnings, errors = tags.Validate(v, f) - - tagsMap := v.(map[string]interface{}) - - for k := range tagsMap { - if strings.EqualFold(k, "$type") { - errors = append(errors, fmt.Errorf("the %q is not allowed as tag name", k)) - } - } - - return warnings, errors -} - -func resourceGroupAndAlertRuleNameFromId(alertRuleId string) (string, string, error) { - id, err := azure.ParseAzureResourceID(alertRuleId) - if err != nil { - return "", "", err - } - name := id.Path["alertrules"] - resourceGroup := id.ResourceGroup - - return resourceGroup, name, nil -} diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_metric_alertrule.go b/azurerm/internal/services/monitor/resource_arm_monitor_metric_alertrule.go deleted file mode 100644 index efbaae8559d5d..0000000000000 --- a/azurerm/internal/services/monitor/resource_arm_monitor_metric_alertrule.go +++ /dev/null @@ -1,462 +0,0 @@ -package monitor - -import ( - "fmt" - "log" - "strings" - "time" - - "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmMonitorMetricAlertRule() *schema.Resource { - return &schema.Resource{ - Create: resourceArmMonitorMetricAlertRuleCreateUpdate, - Read: resourceArmMonitorMetricAlertRuleRead, - Update: resourceArmMonitorMetricAlertRuleCreateUpdate, - Delete: resourceArmMonitorMetricAlertRuleDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - }, - - "resource_group_name": azure.SchemaResourceGroupName(), - - "location": azure.SchemaLocation(), - - "description": { - Type: schema.TypeString, - Optional: true, - Computed: true, - }, - - "enabled": { - Type: schema.TypeBool, - Optional: true, - Default: true, - }, - - "resource_id": { - Type: schema.TypeString, - Required: true, - }, - - "metric_name": { - Type: schema.TypeString, - Required: true, - }, - - "operator": { - Type: schema.TypeString, - Required: true, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validation.StringInSlice([]string{ - string(insights.ConditionOperatorGreaterThan), - string(insights.ConditionOperatorGreaterThanOrEqual), - string(insights.ConditionOperatorLessThan), - string(insights.ConditionOperatorLessThanOrEqual), - }, true), - }, - - "threshold": { - Type: schema.TypeFloat, - Required: true, - }, - - "period": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validate.ISO8601Duration, - }, - - "aggregation": { - Type: schema.TypeString, - Required: true, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validation.StringInSlice([]string{ - string(insights.TimeAggregationOperatorAverage), - string(insights.TimeAggregationOperatorLast), - string(insights.TimeAggregationOperatorMaximum), - string(insights.TimeAggregationOperatorMinimum), - string(insights.TimeAggregationOperatorTotal), - }, true), - }, - - "email_action": { - Type: schema.TypeList, - MaxItems: 1, - Optional: true, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "send_to_service_owners": { - Type: schema.TypeBool, - Optional: true, - Computed: true, - }, - - "custom_emails": { - Type: schema.TypeList, - Optional: true, - Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - }, - }, - }, - - "webhook_action": { - Type: schema.TypeList, - MaxItems: 1, - Optional: true, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "service_uri": { - Type: schema.TypeString, - Required: true, - }, - - "properties": { - Type: schema.TypeMap, - Optional: true, - Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - }, - }, - }, - - "tags": { - Type: schema.TypeMap, - Optional: true, - Computed: true, - ValidateFunc: ValidateMetricAlertRuleTags, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - }, - } -} - -func resourceArmMonitorMetricAlertRuleCreateUpdate(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Monitor.AlertRulesClient - ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) - defer cancel() - - log.Printf("[INFO] preparing arguments for AzureRM Alert Rule creation.") - - name := d.Get("name").(string) - resourceGroup := d.Get("resource_group_name").(string) - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, resourceGroup, name) - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing Alert Rule %q (Resource Group %q): %s", name, resourceGroup, err) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_monitor_metric_alertrule", *existing.ID) - } - } - - location := azure.NormalizeLocation(d.Get("location").(string)) - t := d.Get("tags").(map[string]interface{}) - - alertRule, err := expandAzureRmMonitorMetricThresholdAlertRule(d) - if err != nil { - return err - } - - alertRuleResource := insights.AlertRuleResource{ - Name: &name, - Location: &location, - Tags: tags.Expand(t), - AlertRule: alertRule, - } - - if _, err = client.CreateOrUpdate(ctx, resourceGroup, name, alertRuleResource); err != nil { - return err - } - - read, err := client.Get(ctx, resourceGroup, name) - if err != nil { - return err - } - if read.ID == nil { - return fmt.Errorf("Cannot read AzureRM Alert Rule %q (Resource Group %s) ID", name, resourceGroup) - } - - d.SetId(*read.ID) - - return resourceArmMonitorMetricAlertRuleRead(d, meta) -} - -func resourceArmMonitorMetricAlertRuleRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Monitor.AlertRulesClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - name := id.Path["alertrules"] - resourceGroup := id.ResourceGroup - - resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - log.Printf("[DEBUG] Metric Alert Rule %q (resource group %q) was not found - removing from state", name, resourceGroup) - d.SetId("") - return nil - } - - return fmt.Errorf("Error making Read request on AzureRM Metric Alert Rule %q: %+v", name, err) - } - - d.Set("name", name) - d.Set("resource_group_name", resourceGroup) - if location := resp.Location; location != nil { - d.Set("location", azure.NormalizeLocation(*location)) - } - - if alertRule := resp.AlertRule; alertRule != nil { - d.Set("description", alertRule.Description) - d.Set("enabled", alertRule.IsEnabled) - - ruleCondition := alertRule.Condition - - if ruleCondition != nil { - if thresholdRuleCondition, ok := ruleCondition.AsThresholdRuleCondition(); ok && thresholdRuleCondition != nil { - d.Set("operator", string(thresholdRuleCondition.Operator)) - d.Set("threshold", thresholdRuleCondition.Threshold) - d.Set("period", thresholdRuleCondition.WindowSize) - d.Set("aggregation", string(thresholdRuleCondition.TimeAggregation)) - - dataSource := thresholdRuleCondition.DataSource - - if dataSource != nil { - if metricDataSource, ok := dataSource.AsRuleMetricDataSource(); ok && metricDataSource != nil { - d.Set("resource_id", metricDataSource.ResourceURI) - d.Set("metric_name", metricDataSource.MetricName) - } - } - } - } - - email_actions := make([]interface{}, 0) - webhook_actions := make([]interface{}, 0) - - for _, ruleAction := range *alertRule.Actions { - if emailAction, ok := ruleAction.AsRuleEmailAction(); ok && emailAction != nil { - email_action := make(map[string]interface{}, 1) - - if sendToOwners := emailAction.SendToServiceOwners; sendToOwners != nil { - email_action["send_to_service_owners"] = *sendToOwners - } - - custom_emails := make([]string, 0) - if s := emailAction.CustomEmails; s != nil { - custom_emails = *s - } - email_action["custom_emails"] = custom_emails - - email_actions = append(email_actions, email_action) - } else if webhookAction, ok := ruleAction.AsRuleWebhookAction(); ok && webhookAction != nil { - webhook_action := make(map[string]interface{}, 1) - - webhook_action["service_uri"] = *webhookAction.ServiceURI - - properties := make(map[string]string) - for k, v := range webhookAction.Properties { - if k != "$type" { - if v != nil { - properties[k] = *v - } - } - } - webhook_action["properties"] = properties - - webhook_actions = append(webhook_actions, webhook_action) - } - } - - d.Set("email_action", email_actions) - d.Set("webhook_action", webhook_actions) - } - - // Return a new tag map filtered by the specified tag names. - tagMap := tags.Filter(resp.Tags, "$type") - - return tags.FlattenAndSet(d, tagMap) -} - -func resourceArmMonitorMetricAlertRuleDelete(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Monitor.AlertRulesClient - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - name := id.Path["alertrules"] - resourceGroup := id.ResourceGroup - - resp, err := client.Delete(ctx, resourceGroup, name) - if err != nil { - if utils.ResponseWasNotFound(resp) { - return nil - } - - return fmt.Errorf("Error deleting Metric Alert Rule %q (resource group %q): %+v", name, resourceGroup, err) - } - - return err -} - -func expandAzureRmMonitorMetricThresholdAlertRule(d *schema.ResourceData) (*insights.AlertRule, error) { - name := d.Get("name").(string) - - resource := d.Get("resource_id").(string) - metric_name := d.Get("metric_name").(string) - - metricDataSource := insights.RuleMetricDataSource{ - ResourceURI: &resource, - MetricName: &metric_name, - } - - operator := d.Get("operator").(string) - threshold := d.Get("threshold").(float64) - period := d.Get("period").(string) - aggregation := d.Get("aggregation").(string) - - thresholdRuleCondition := insights.ThresholdRuleCondition{ - DataSource: metricDataSource, - Operator: insights.ConditionOperator(operator), - Threshold: &threshold, - TimeAggregation: insights.TimeAggregationOperator(aggregation), - WindowSize: &period, - } - - actions := make([]insights.BasicRuleAction, 0, 2) - - // Email action - - email_actions := d.Get("email_action").([]interface{}) - - if len(email_actions) > 0 { - email_action := email_actions[0].(map[string]interface{}) - emailAction := insights.RuleEmailAction{} - - if v, ok := email_action["custom_emails"]; ok { - custom_emails := v.([]interface{}) - - customEmails := make([]string, 0) - for _, customEmail := range custom_emails { - custom_email := customEmail.(string) - customEmails = append(customEmails, custom_email) - } - - emailAction.CustomEmails = &customEmails - } - - if v, ok := email_action["send_to_service_owners"]; ok { - sendToServiceOwners := v.(bool) - emailAction.SendToServiceOwners = &sendToServiceOwners - } - - actions = append(actions, emailAction) - } - - // Webhook action - - webhook_actions := d.Get("webhook_action").([]interface{}) - - if len(webhook_actions) > 0 { - webhook_action := webhook_actions[0].(map[string]interface{}) - - service_uri := webhook_action["service_uri"].(string) - - webhook_properties := make(map[string]*string) - - if v, ok := webhook_action["properties"]; ok { - properties := v.(map[string]interface{}) - - for property_key, property_value := range properties { - property_string := property_value.(string) - webhook_properties[property_key] = &property_string - } - } - - webhookAction := insights.RuleWebhookAction{ - ServiceURI: &service_uri, - Properties: webhook_properties, - } - - actions = append(actions, webhookAction) - } - - enabled := d.Get("enabled").(bool) - - alertRule := insights.AlertRule{ - Name: &name, - Condition: &thresholdRuleCondition, - Actions: &actions, - IsEnabled: &enabled, - } - - if v, ok := d.GetOk("description"); ok { - description := v.(string) - alertRule.Description = &description - } - - return &alertRule, nil -} - -func ValidateMonitorMetricAlertRuleTags(v interface{}, f string) (warnings []string, errors []error) { - // Normal validation required by any AzureRM resource. - warnings, errors = tags.Validate(v, f) - - tagsMap := v.(map[string]interface{}) - - for k := range tagsMap { - if strings.EqualFold(k, "$type") { - errors = append(errors, fmt.Errorf("the %q is not allowed as tag name", k)) - } - } - - return warnings, errors -} diff --git a/azurerm/internal/services/monitor/tests/resource_arm_autoscale_setting_test.go b/azurerm/internal/services/monitor/tests/resource_arm_autoscale_setting_test.go deleted file mode 100644 index ce680d4a64a48..0000000000000 --- a/azurerm/internal/services/monitor/tests/resource_arm_autoscale_setting_test.go +++ /dev/null @@ -1,918 +0,0 @@ -package tests - -import ( - "fmt" - "net/http" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" -) - -func TestAccAzureRMAutoScaleSetting_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_autoscale_setting", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMAutoScaleSettingDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMAutoScaleSetting_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMAutoScaleSettingExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "enabled", "true"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.name", "metricRules"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.rule.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "notification.#", "0"), - resource.TestCheckNoResourceAttr(data.ResourceName, "tags.$type"), - ), - }, - data.ImportStep(), - }, - }) -} - -func TestAccAzureRMAutoScaleSetting_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - - data := acceptance.BuildTestData(t, "azurerm_autoscale_setting", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMAutoScaleSettingDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMAutoScaleSetting_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMAutoScaleSettingExists(data.ResourceName), - ), - }, - { - Config: testAccAzureRMAutoScaleSetting_requiresImport(data), - ExpectError: acceptance.RequiresImportError("azurerm_autoscale_setting"), - }, - }, - }) -} - -func TestAccAzureRMAutoScaleSetting_multipleProfiles(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_autoscale_setting", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMAutoScaleSettingDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMAutoScaleSetting_multipleProfiles(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMAutoScaleSettingExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "enabled", "true"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.#", "2"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.name", "primary"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.1.name", "secondary"), - ), - }, - }, - }) -} - -func TestAccAzureRMAutoScaleSetting_update(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_autoscale_setting", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMAutoScaleSettingDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMAutoScaleSetting_capacity(data, 1, 3, 2), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMAutoScaleSettingExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "enabled", "false"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.capacity.0.minimum", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.capacity.0.maximum", "3"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.capacity.0.default", "2"), - ), - }, - { - Config: testAccAzureRMAutoScaleSetting_capacity(data, 0, 400, 0), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMAutoScaleSettingExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "enabled", "false"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.capacity.0.minimum", "0"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.capacity.0.maximum", "400"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.capacity.0.default", "0"), - ), - }, - { - Config: testAccAzureRMAutoScaleSetting_capacity(data, 2, 45, 3), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMAutoScaleSettingExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "enabled", "false"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.capacity.0.minimum", "2"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.capacity.0.maximum", "45"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.capacity.0.default", "3"), - ), - }, - }, - }) -} - -func TestAccAzureRMAutoScaleSetting_multipleRules(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_autoscale_setting", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMAutoScaleSettingDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMAutoScaleSetting_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMAutoScaleSettingExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "enabled", "true"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.name", "metricRules"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.rule.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.rule.0.scale_action.0.direction", "Increase"), - resource.TestCheckResourceAttr(data.ResourceName, "notification.#", "0"), - ), - }, - { - Config: testAccAzureRMAutoScaleSetting_multipleRules(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMAutoScaleSettingExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "enabled", "true"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.name", "metricRules"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.rule.#", "2"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.rule.0.scale_action.0.direction", "Increase"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.rule.1.scale_action.0.direction", "Decrease"), - resource.TestCheckResourceAttr(data.ResourceName, "notification.#", "0"), - ), - }, - }, - }) -} - -func TestAccAzureRMAutoScaleSetting_customEmails(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_autoscale_setting", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMAutoScaleSettingDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMAutoScaleSetting_email(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMAutoScaleSettingExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "notification.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "notification.0.email.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "notification.0.email.0.custom_emails.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "notification.0.email.0.custom_emails.0", fmt.Sprintf("acctest1-%d@example.com", data.RandomInteger)), - ), - }, - { - Config: testAccAzureRMAutoScaleSetting_emailUpdated(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMAutoScaleSettingExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "notification.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "notification.0.email.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "notification.0.email.0.custom_emails.#", "2"), - resource.TestCheckResourceAttr(data.ResourceName, "notification.0.email.0.custom_emails.0", fmt.Sprintf("acctest1-%d@example.com", data.RandomInteger)), - resource.TestCheckResourceAttr(data.ResourceName, "notification.0.email.0.custom_emails.1", fmt.Sprintf("acctest2-%d@example.com", data.RandomInteger)), - ), - }, - }, - }) -} - -func TestAccAzureRMAutoScaleSetting_recurrence(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_autoscale_setting", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMAutoScaleSettingDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMAutoScaleSetting_recurrence(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMAutoScaleSettingExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "enabled", "true"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.name", "recurrence"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.recurrence.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "notification.#", "1"), - ), - }, - data.ImportStep(), - }, - }) -} - -func TestAccAzureRMAutoScaleSetting_recurrenceUpdate(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_autoscale_setting", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMAutoScaleSettingDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMAutoScaleSetting_recurrence(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMAutoScaleSettingExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "notification.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.recurrence.0.days.#", "3"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.recurrence.0.days.0", "Monday"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.recurrence.0.days.1", "Wednesday"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.recurrence.0.days.2", "Friday"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.recurrence.0.hours.0", "18"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.recurrence.0.minutes.0", "0"), - ), - }, - { - Config: testAccAzureRMAutoScaleSetting_recurrenceUpdated(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMAutoScaleSettingExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.recurrence.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.recurrence.0.days.#", "3"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.recurrence.0.days.0", "Monday"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.recurrence.0.days.1", "Tuesday"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.recurrence.0.days.2", "Wednesday"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.recurrence.0.hours.0", "20"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.recurrence.0.minutes.0", "15"), - ), - }, - }, - }) -} - -func TestAccAzureRMAutoScaleSetting_fixedDate(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_autoscale_setting", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMAutoScaleSettingDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMAutoScaleSetting_fixedDate(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMAutoScaleSettingExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "enabled", "true"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.name", "fixedDate"), - resource.TestCheckResourceAttr(data.ResourceName, "profile.0.fixed_date.#", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "notification.#", "0"), - ), - }, - data.ImportStep(), - }, - }) -} - -func testCheckAzureRMAutoScaleSettingExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - conn := acceptance.AzureProvider.Meta().(*clients.Client).Monitor.AutoscaleSettingsClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - rs, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %s", resourceName) - } - - autoscaleSettingName := rs.Primary.Attributes["name"] - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for AutoScale Setting: %s", autoscaleSettingName) - } - - resp, err := conn.Get(ctx, resourceGroup, autoscaleSettingName) - if err != nil { - return fmt.Errorf("Bad: Get on AutoScale Setting: %+v", err) - } - - if resp.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: AutoScale Setting %q (Resource Group: %q) does not exist", autoscaleSettingName, resourceGroup) - } - - return nil - } -} - -func testCheckAzureRMAutoScaleSettingDestroy(s *terraform.State) error { - conn := acceptance.AzureProvider.Meta().(*clients.Client).Monitor.AutoscaleSettingsClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_autoscale_setting" { - continue - } - - name := rs.Primary.Attributes["name"] - resourceGroup := rs.Primary.Attributes["resource_group_name"] - - resp, err := conn.Get(ctx, resourceGroup, name) - - if err != nil { - return nil - } - - if resp.StatusCode != http.StatusNotFound { - return fmt.Errorf("AutoScale Setting still exists:\n%#v", resp) - } - } - - return nil -} - -func testAccAzureRMAutoScaleSetting_basic(data acceptance.TestData) string { - template := testAccAzureRMAutoScaleSetting_template(data) - return fmt.Sprintf(` -%s - -resource "azurerm_autoscale_setting" "test" { - name = "acctestautoscale-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - target_resource_id = "${azurerm_virtual_machine_scale_set.test.id}" - - profile { - name = "metricRules" - - capacity { - default = 1 - minimum = 1 - maximum = 30 - } - - rule { - metric_trigger { - metric_name = "Percentage CPU" - metric_resource_id = "${azurerm_virtual_machine_scale_set.test.id}" - time_grain = "PT1M" - statistic = "Average" - time_window = "PT5M" - time_aggregation = "Average" - operator = "GreaterThan" - threshold = 75 - } - - scale_action { - direction = "Increase" - type = "ChangeCount" - value = 1 - cooldown = "PT1M" - } - } - } -} -`, template, data.RandomInteger) -} - -func testAccAzureRMAutoScaleSetting_requiresImport(data acceptance.TestData) string { - template := testAccAzureRMAutoScaleSetting_basic(data) - return fmt.Sprintf(` -%s - -resource "azurerm_autoscale_setting" "import" { - name = "${azurerm_autoscale_setting.test.name}" - resource_group_name = "${azurerm_autoscale_setting.test.resource_group_name}" - location = "${azurerm_autoscale_setting.test.location}" - target_resource_id = "${azurerm_autoscale_setting.test.target_resource_id}" - - profile { - name = "metricRules" - - capacity { - default = 1 - minimum = 1 - maximum = 30 - } - - rule { - metric_trigger { - metric_name = "Percentage CPU" - metric_resource_id = "${azurerm_virtual_machine_scale_set.test.id}" - time_grain = "PT1M" - statistic = "Average" - time_window = "PT5M" - time_aggregation = "Average" - operator = "GreaterThan" - threshold = 75 - } - - scale_action { - direction = "Increase" - type = "ChangeCount" - value = 1 - cooldown = "PT1M" - } - } - } -} -`, template) -} - -func testAccAzureRMAutoScaleSetting_multipleProfiles(data acceptance.TestData) string { - template := testAccAzureRMAutoScaleSetting_template(data) - return fmt.Sprintf(` -%s - -resource "azurerm_autoscale_setting" "test" { - name = "acctestautoscale-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - target_resource_id = "${azurerm_virtual_machine_scale_set.test.id}" - - profile { - name = "primary" - - capacity { - default = 1 - minimum = 1 - maximum = 30 - } - - rule { - metric_trigger { - metric_name = "Percentage CPU" - metric_resource_id = "${azurerm_virtual_machine_scale_set.test.id}" - time_grain = "PT1M" - statistic = "Average" - time_window = "PT5M" - time_aggregation = "Average" - operator = "GreaterThan" - threshold = 75 - } - - scale_action { - direction = "Increase" - type = "ChangeCount" - value = 1 - cooldown = "PT1M" - } - } - - rule { - metric_trigger { - metric_name = "Percentage CPU" - metric_resource_id = "${azurerm_virtual_machine_scale_set.test.id}" - time_grain = "PT1M" - statistic = "Average" - time_window = "PT5M" - time_aggregation = "Average" - operator = "GreaterThan" - threshold = 75 - } - - scale_action { - direction = "Decrease" - type = "ChangeCount" - value = 1 - cooldown = "PT1M" - } - } - } - - profile { - name = "secondary" - - capacity { - default = 1 - minimum = 1 - maximum = 30 - } - - recurrence { - timezone = "Pacific Standard Time" - - days = [ - "Monday", - "Wednesday", - "Friday", - ] - - hours = [18] - minutes = [0] - } - } -} -`, template, data.RandomInteger) -} - -func testAccAzureRMAutoScaleSetting_multipleRules(data acceptance.TestData) string { - template := testAccAzureRMAutoScaleSetting_template(data) - return fmt.Sprintf(` -%s - -resource "azurerm_autoscale_setting" "test" { - name = "acctestautoscale-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - target_resource_id = "${azurerm_virtual_machine_scale_set.test.id}" - enabled = true - - profile { - name = "metricRules" - - capacity { - default = 1 - minimum = 1 - maximum = 30 - } - - rule { - metric_trigger { - metric_name = "Percentage CPU" - metric_resource_id = "${azurerm_virtual_machine_scale_set.test.id}" - time_grain = "PT1M" - statistic = "Average" - time_window = "PT5M" - time_aggregation = "Average" - operator = "GreaterThan" - threshold = 75 - } - - scale_action { - direction = "Increase" - type = "ChangeCount" - value = 1 - cooldown = "PT1M" - } - } - - rule { - metric_trigger { - metric_name = "Percentage CPU" - metric_resource_id = "${azurerm_virtual_machine_scale_set.test.id}" - time_grain = "PT1M" - statistic = "Average" - time_window = "PT5M" - time_aggregation = "Average" - operator = "LessThan" - threshold = 25 - } - - scale_action { - direction = "Decrease" - type = "ChangeCount" - value = 1 - cooldown = "PT1M" - } - } - } -} -`, template, data.RandomInteger) -} - -func testAccAzureRMAutoScaleSetting_capacity(data acceptance.TestData, min int, max int, defaultVal int) string { - template := testAccAzureRMAutoScaleSetting_template(data) - return fmt.Sprintf(` -%s - -resource "azurerm_autoscale_setting" "test" { - name = "acctestautoscale-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - target_resource_id = "${azurerm_virtual_machine_scale_set.test.id}" - enabled = false - - profile { - name = "metricRules" - - capacity { - default = %d - minimum = %d - maximum = %d - } - - rule { - metric_trigger { - metric_name = "Percentage CPU" - metric_resource_id = "${azurerm_virtual_machine_scale_set.test.id}" - time_grain = "PT1M" - statistic = "Average" - time_window = "PT5M" - time_aggregation = "Average" - operator = "GreaterThan" - threshold = 75 - } - - scale_action { - direction = "Increase" - type = "ChangeCount" - value = 1 - cooldown = "PT1M" - } - } - } -} -`, template, data.RandomInteger, defaultVal, min, max) -} - -func testAccAzureRMAutoScaleSetting_email(data acceptance.TestData) string { - template := testAccAzureRMAutoScaleSetting_template(data) - return fmt.Sprintf(` -%s - -resource "azurerm_autoscale_setting" "test" { - name = "acctestautoscale-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - target_resource_id = "${azurerm_virtual_machine_scale_set.test.id}" - - profile { - name = "metricRules" - - capacity { - default = 1 - minimum = 1 - maximum = 30 - } - - rule { - metric_trigger { - metric_name = "Percentage CPU" - metric_resource_id = "${azurerm_virtual_machine_scale_set.test.id}" - time_grain = "PT1M" - statistic = "Average" - time_window = "PT5M" - time_aggregation = "Average" - operator = "GreaterThan" - threshold = 75 - } - - scale_action { - direction = "Increase" - type = "ChangeCount" - value = 1 - cooldown = "PT1M" - } - } - } - - notification { - email { - send_to_subscription_administrator = false - send_to_subscription_co_administrator = false - custom_emails = ["acctest1-%d@example.com"] - } - } -} -`, template, data.RandomInteger, data.RandomInteger) -} - -func testAccAzureRMAutoScaleSetting_emailUpdated(data acceptance.TestData) string { - template := testAccAzureRMAutoScaleSetting_template(data) - return fmt.Sprintf(` -%s - -resource "azurerm_autoscale_setting" "test" { - name = "acctestautoscale-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - target_resource_id = "${azurerm_virtual_machine_scale_set.test.id}" - - profile { - name = "metricRules" - - capacity { - default = 1 - minimum = 1 - maximum = 30 - } - - rule { - metric_trigger { - metric_name = "Percentage CPU" - metric_resource_id = "${azurerm_virtual_machine_scale_set.test.id}" - time_grain = "PT1M" - statistic = "Average" - time_window = "PT5M" - time_aggregation = "Average" - operator = "GreaterThan" - threshold = 75 - } - - scale_action { - direction = "Increase" - type = "ChangeCount" - value = 1 - cooldown = "PT1M" - } - } - } - - notification { - email { - send_to_subscription_administrator = false - send_to_subscription_co_administrator = false - custom_emails = ["acctest1-%d@example.com", "acctest2-%d@example.com"] - } - } -} -`, template, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - -func testAccAzureRMAutoScaleSetting_recurrence(data acceptance.TestData) string { - template := testAccAzureRMAutoScaleSetting_template(data) - return fmt.Sprintf(` -%s - -resource "azurerm_autoscale_setting" "test" { - name = "acctestautoscale-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - target_resource_id = "${azurerm_virtual_machine_scale_set.test.id}" - - profile { - name = "recurrence" - - capacity { - default = 1 - minimum = 1 - maximum = 30 - } - - recurrence { - timezone = "Pacific Standard Time" - - days = [ - "Monday", - "Wednesday", - "Friday", - ] - - hours = [18] - minutes = [0] - } - } - - notification { - email { - send_to_subscription_administrator = false - send_to_subscription_co_administrator = false - } - } -} -`, template, data.RandomInteger) -} - -func testAccAzureRMAutoScaleSetting_recurrenceUpdated(data acceptance.TestData) string { - template := testAccAzureRMAutoScaleSetting_template(data) - return fmt.Sprintf(` -%s - -resource "azurerm_autoscale_setting" "test" { - name = "acctestautoscale-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - target_resource_id = "${azurerm_virtual_machine_scale_set.test.id}" - - profile { - name = "recurrence" - - capacity { - default = 1 - minimum = 1 - maximum = 30 - } - - recurrence { - timezone = "Pacific Standard Time" - - days = [ - "Monday", - "Tuesday", - "Wednesday", - ] - - hours = [20] - minutes = [15] - } - } - - notification { - email { - send_to_subscription_administrator = false - send_to_subscription_co_administrator = false - } - } -} -`, template, data.RandomInteger) -} - -func testAccAzureRMAutoScaleSetting_fixedDate(data acceptance.TestData) string { - template := testAccAzureRMAutoScaleSetting_template(data) - return fmt.Sprintf(` -%s - -resource "azurerm_autoscale_setting" "test" { - name = "acctestautoscale-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - target_resource_id = "${azurerm_virtual_machine_scale_set.test.id}" - - profile { - name = "fixedDate" - - capacity { - default = 1 - minimum = 1 - maximum = 30 - } - - fixed_date { - timezone = "Pacific Standard Time" - start = "2020-06-18T00:00:00Z" - end = "2020-06-18T23:59:59Z" - } - } -} -`, template, data.RandomInteger) -} - -func testAccAzureRMAutoScaleSetting_template(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "internal" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" -} - -resource "azurerm_virtual_machine_scale_set" "test" { - name = "acctvmss-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - upgrade_policy_mode = "Automatic" - single_placement_group = "false" - - sku { - name = "Standard_DS1_v2" - tier = "Standard" - capacity = 30 - } - - os_profile { - computer_name_prefix = "testvm-%d" - admin_username = "myadmin" - admin_password = "Passwword1234" - } - - network_profile { - name = "TestNetworkProfile-%d" - primary = true - - ip_configuration { - name = "TestIPConfiguration" - subnet_id = "${azurerm_subnet.test.id}" - primary = true - } - } - - storage_profile_os_disk { - name = "" - caching = "ReadWrite" - create_option = "FromImage" - managed_disk_type = "StandardSSD_LRS" - } - - storage_profile_image_reference { - publisher = "Canonical" - offer = "UbuntuServer" - sku = "16.04-LTS" - version = "latest" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} diff --git a/azurerm/internal/services/monitor/tests/resource_arm_metric_alertrule_test.go b/azurerm/internal/services/monitor/tests/resource_arm_metric_alertrule_test.go deleted file mode 100644 index 9fad64b86ac56..0000000000000 --- a/azurerm/internal/services/monitor/tests/resource_arm_metric_alertrule_test.go +++ /dev/null @@ -1,483 +0,0 @@ -package tests - -import ( - "fmt" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/monitor" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func TestValidateMetricAlertRuleTags(t *testing.T) { - cases := []struct { - Name string - Value map[string]interface{} - ErrCount int - }{ - { - Name: "Single Valid", - Value: map[string]interface{}{ - "hello": "world", - }, - ErrCount: 0, - }, - { - Name: "Single Invalid", - Value: map[string]interface{}{ - "$Type": "hello/world", - }, - ErrCount: 1, - }, - { - Name: "Single Invalid lowercase", - Value: map[string]interface{}{ - "$type": "hello/world", - }, - ErrCount: 1, - }, - { - Name: "Multiple Valid", - Value: map[string]interface{}{ - "hello": "world", - "foo": "bar", - }, - ErrCount: 0, - }, - { - Name: "Multiple Invalid", - Value: map[string]interface{}{ - "hello": "world", - "$type": "Microsoft.Foo/Bar", - }, - ErrCount: 1, - }, - } - - for _, tc := range cases { - _, errors := monitor.ValidateMetricAlertRuleTags(tc.Value, "azurerm_metric_alert_rule") - - if len(errors) != tc.ErrCount { - t.Fatalf("Expected %q to return %d errors but returned %d", tc.Name, tc.ErrCount, len(errors)) - } - } -} - -func TestAccAzureRMMetricAlertRule_virtualMachineCpu(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_metric_alertrule", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMetricAlertRuleDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMMetricAlertRule_virtualMachineCpu(data, true), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMetricAlertRuleExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "enabled", "true"), - resource.TestCheckNoResourceAttr(data.ResourceName, "tags.$type"), - ), - }, - { - Config: testAccAzureRMMetricAlertRule_virtualMachineCpu(data, false), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMetricAlertRuleExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "enabled", "false"), - resource.TestCheckNoResourceAttr(data.ResourceName, "tags.$type"), - ), - }, - { - ResourceName: data.ResourceName, - ImportState: true, - ImportStateVerify: true, - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMetricAlertRuleExists(data.ResourceName), - resource.TestCheckNoResourceAttr(data.ResourceName, "tags.$type"), - ), - }, - }, - }) -} - -func TestAccAzureRMMetricAlertRule_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - - data := acceptance.BuildTestData(t, "azurerm_metric_alertrule", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMetricAlertRuleDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMMetricAlertRule_virtualMachineCpu(data, true), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMetricAlertRuleExists(data.ResourceName), - ), - }, - { - Config: testAccAzureRMMetricAlertRule_requiresImport(data, true), - ExpectError: acceptance.RequiresImportError("azurerm_metric_alertrule"), - }, - }, - }) -} - -func TestAccAzureRMMetricAlertRule_sqlDatabaseStorage(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_metric_alertrule", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMetricAlertRuleDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMMetricAlertRule_sqlDatabaseStorage(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMetricAlertRuleExists(data.ResourceName), - resource.TestCheckNoResourceAttr(data.ResourceName, "tags.$type"), - ), - }, - }, - }) -} - -func testCheckAzureRMMetricAlertRuleExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - client := acceptance.AzureProvider.Meta().(*clients.Client).Monitor.AlertRulesClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - // Ensure we have enough information in state to look up in API - rs, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %s", resourceName) - } - - name := rs.Primary.Attributes["name"] - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for Alert Rule: %s", name) - } - - resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - return fmt.Errorf("Bad: Alert Rule %q (resource group: %q) does not exist", name, resourceGroup) - } - - return fmt.Errorf("Bad: Get on monitorAlertRulesClient: %+v", err) - } - - return nil - } -} - -func testCheckAzureRMMetricAlertRuleDestroy(s *terraform.State) error { - client := acceptance.AzureProvider.Meta().(*clients.Client).Monitor.AlertRulesClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_metric_alertrule" { - continue - } - - 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 - } - - return err - } - - return fmt.Errorf("Alert Rule still exists:\n%#v", resp) - } - - return nil -} - -func testAccAzureRMMetricAlertRule_virtualMachineCpu(data acceptance.TestData, enabled bool) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "acctsub-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" -} - -resource "azurerm_network_interface" "test" { - name = "acctni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - } -} - -resource "azurerm_virtual_machine" "test" { - name = "acctvm-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - network_interface_ids = ["${azurerm_network_interface.test.id}"] - vm_size = "Standard_D1_v2" - - storage_image_reference { - publisher = "Canonical" - offer = "UbuntuServer" - sku = "16.04-LTS" - version = "latest" - } - - storage_os_disk { - name = "osd-%d" - caching = "ReadWrite" - create_option = "FromImage" - disk_size_gb = "50" - managed_disk_type = "Standard_LRS" - } - - os_profile { - computer_name = "hn%d" - admin_username = "testadmin" - admin_password = "Password1234!" - } - - os_profile_linux_config { - disable_password_authentication = false - } - - tags = { - environment = "Production" - cost-center = "Ops" - } -} - -resource "azurerm_metric_alertrule" "test" { - name = "${azurerm_virtual_machine.test.name}-cpu" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - - description = "An alert rule to watch the metric Percentage CPU" - - enabled = %t - - resource_id = "${azurerm_virtual_machine.test.id}" - metric_name = "Percentage CPU" - operator = "GreaterThan" - threshold = 75 - aggregation = "Average" - period = "PT5M" - - email_action { - send_to_service_owners = false - - custom_emails = [ - "support@azure.microsoft.com", - ] - } - - webhook_action { - service_uri = "https://requestb.in/18jamc41" - - properties = { - severity = "incredible" - acceptance_test = "true" - } - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, enabled) -} - -func testAccAzureRMMetricAlertRule_requiresImport(data acceptance.TestData, enabled bool) string { - template := testAccAzureRMMetricAlertRule_virtualMachineCpu(data, enabled) - return fmt.Sprintf(` -%s - -resource "azurerm_metric_alertrule" "import" { - name = "${azurerm_metric_alertrule.test.name}" - resource_group_name = "${azurerm_metric_alertrule.test.resource_group_name}" - location = "${azurerm_metric_alertrule.test.location}" - description = "${azurerm_metric_alertrule.test.description}" - enabled = "${azurerm_metric_alertrule.test.enabled}" - - resource_id = "${azurerm_virtual_machine.test.id}" - metric_name = "Percentage CPU" - operator = "GreaterThan" - threshold = 75 - aggregation = "Average" - period = "PT5M" - - email_action { - send_to_service_owners = false - - custom_emails = [ - "support@azure.microsoft.com", - ] - } - - webhook_action { - service_uri = "https://requestb.in/18jamc41" - - properties = { - severity = "incredible" - acceptance_test = "true" - } - } -} -`, template) -} - -func testAccAzureRMMetricAlertRule_sqlDatabaseStorage(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%[1]d" - location = "%[2]s" -} - - -resource "azurerm_sql_server" "test" { - name = "acctestsqlserver%[1]d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - version = "12.0" - administrator_login = "mradministrator" - administrator_login_password = "thisIsDog11" -} - -resource "azurerm_sql_database" "test" { - name = "acctestdb%[1]d" - resource_group_name = "${azurerm_resource_group.test.name}" - server_name = "${azurerm_sql_server.test.name}" - location = "${azurerm_resource_group.test.location}" - edition = "Standard" - collation = "SQL_Latin1_General_CP1_CI_AS" - max_size_bytes = "1073741824" - requested_service_objective_name = "S0" -} - -resource "azurerm_virtual_network" "test" { - name = "acctvn-%[1]d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "acctsub-%[1]d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" -} - -resource "azurerm_network_interface" "test" { - name = "acctni-%[1]d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - } -} - -resource "azurerm_virtual_machine" "test" { - name = "acctvm-%[1]d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - network_interface_ids = ["${azurerm_network_interface.test.id}"] - vm_size = "Standard_D1_v2" - - storage_image_reference { - publisher = "Canonical" - offer = "UbuntuServer" - sku = "16.04-LTS" - version = "latest" - } - - storage_os_disk { - name = "osd-%[1]d" - caching = "ReadWrite" - create_option = "FromImage" - disk_size_gb = "50" - managed_disk_type = "Standard_LRS" - } - - os_profile { - computer_name = "hn%[1]d" - admin_username = "testadmin" - admin_password = "Password1234!" - } - - os_profile_linux_config { - disable_password_authentication = false - } - - tags = { - environment = "Production" - cost-center = "Ops" - } -} - -resource "azurerm_metric_alertrule" "test" { - name = "${azurerm_sql_database.test.name}-storage" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - - description = "An alert rule to watch the metric Storage" - - enabled = true - - resource_id = "${azurerm_sql_database.test.id}" - metric_name = "storage" - operator = "GreaterThan" - threshold = 1073741824 - aggregation = "Maximum" - period = "PT10M" - - email_action { - send_to_service_owners = false - - custom_emails = [ - "support@azure.microsoft.com", - ] - } - - webhook_action { - service_uri = "https://requestb.in/18jamc41" - - properties = { - severity = "incredible" - acceptance_test = "true" - } - } -} -`, data.RandomInteger, data.Locations.Primary) -} diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_metric_alertrule_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_metric_alertrule_test.go deleted file mode 100644 index cd71bce285733..0000000000000 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_metric_alertrule_test.go +++ /dev/null @@ -1,462 +0,0 @@ -package tests - -import ( - "fmt" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/monitor" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func TestValidateMonitorMetricAlertRuleTags(t *testing.T) { - cases := []struct { - Name string - Value map[string]interface{} - ErrCount int - }{ - { - Name: "Single Valid", - Value: map[string]interface{}{ - "hello": "world", - }, - ErrCount: 0, - }, - { - Name: "Single Invalid", - Value: map[string]interface{}{ - "$Type": "hello/world", - }, - ErrCount: 1, - }, - { - Name: "Single Invalid lowercase", - Value: map[string]interface{}{ - "$type": "hello/world", - }, - ErrCount: 1, - }, - { - Name: "Multiple Valid", - Value: map[string]interface{}{ - "hello": "world", - "foo": "bar", - }, - ErrCount: 0, - }, - { - Name: "Multiple Invalid", - Value: map[string]interface{}{ - "hello": "world", - "$type": "Microsoft.Foo/Bar", - }, - ErrCount: 1, - }, - } - - for _, tc := range cases { - _, errors := monitor.ValidateMonitorMetricAlertRuleTags(tc.Value, "azurerm_metric_alert_rule") - - if len(errors) != tc.ErrCount { - t.Fatalf("Expected %q to return %d errors but returned %d", tc.Name, tc.ErrCount, len(errors)) - } - } -} - -func TestAccAzureRMMonitorMetricAlertRule_virtualMachineCpu(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_monitor_metric_alertrule", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMonitorMetricAlertRuleDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMMonitorMetricAlertRule_virtualMachineCpu(data, true), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMonitorMetricAlertRuleExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "enabled", "true"), - resource.TestCheckNoResourceAttr(data.ResourceName, "tags.$type"), - ), - }, - { - Config: testAccAzureRMMonitorMetricAlertRule_virtualMachineCpu(data, false), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMonitorMetricAlertRuleExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "enabled", "false"), - resource.TestCheckNoResourceAttr(data.ResourceName, "tags.$type"), - ), - }, - { - ResourceName: data.ResourceName, - ImportState: true, - ImportStateVerify: true, - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMonitorMetricAlertRuleExists(data.ResourceName), - resource.TestCheckNoResourceAttr(data.ResourceName, "tags.$type"), - ), - }, - }, - }) -} - -func TestAccAzureRMMonitorMetricAlertRule_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - - data := acceptance.BuildTestData(t, "azurerm_monitor_metric_alertrule", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMonitorMetricAlertRuleDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMMonitorMetricAlertRule_virtualMachineCpu(data, true), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMonitorMetricAlertRuleExists(data.ResourceName), - ), - }, - { - Config: testAccAzureRMMonitorMetricAlertRule_requiresImport(data, true), - ExpectError: acceptance.RequiresImportError("azurerm_monitor_metric_alertrule"), - }, - }, - }) -} - -func TestAccAzureRMMonitorMetricAlertRule_sqlDatabaseStorage(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_monitor_metric_alertrule", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMonitorMetricAlertRuleDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMMonitorMetricAlertRule_sqlDatabaseStorage(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMonitorMetricAlertRuleExists(data.ResourceName), - resource.TestCheckNoResourceAttr(data.ResourceName, "tags.$type"), - ), - }, - }, - }) -} - -func testCheckAzureRMMonitorMetricAlertRuleExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - client := acceptance.AzureProvider.Meta().(*clients.Client).Monitor.AlertRulesClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - // Ensure we have enough information in state to look up in API - rs, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %s", resourceName) - } - - name := rs.Primary.Attributes["name"] - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for Alert Rule: %s", name) - } - - resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - return fmt.Errorf("Bad: Alert Rule %q (resource group: %q) does not exist", name, resourceGroup) - } - - return fmt.Errorf("Bad: Get on monitorAlertRulesClient: %+v", err) - } - - return nil - } -} - -func testCheckAzureRMMonitorMetricAlertRuleDestroy(s *terraform.State) error { - client := acceptance.AzureProvider.Meta().(*clients.Client).Monitor.AlertRulesClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_monitor_metric_alertrule" { - continue - } - - 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 - } - - return err - } - - return fmt.Errorf("Alert Rule still exists:\n%#v", resp) - } - - return nil -} - -func testAccAzureRMMonitorMetricAlertRule_virtualMachineCpu(data acceptance.TestData, enabled bool) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "acctsub-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" -} - -resource "azurerm_network_interface" "test" { - name = "acctni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - } -} - -resource "azurerm_virtual_machine" "test" { - name = "acctvm-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - network_interface_ids = ["${azurerm_network_interface.test.id}"] - vm_size = "Standard_D1_v2" - - storage_image_reference { - publisher = "Canonical" - offer = "UbuntuServer" - sku = "16.04-LTS" - version = "latest" - } - - storage_os_disk { - name = "osd-%d" - caching = "ReadWrite" - create_option = "FromImage" - disk_size_gb = "50" - managed_disk_type = "Standard_LRS" - } - - os_profile { - computer_name = "hn%d" - admin_username = "testadmin" - admin_password = "Password1234!" - } - - os_profile_linux_config { - disable_password_authentication = false - } - - tags = { - environment = "Production" - cost-center = "Ops" - } -} - -resource "azurerm_monitor_metric_alertrule" "test" { - name = "${azurerm_virtual_machine.test.name}-cpu" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - - description = "An alert rule to watch the metric Percentage CPU" - - enabled = %t - - resource_id = "${azurerm_virtual_machine.test.id}" - metric_name = "Percentage CPU" - operator = "GreaterThan" - threshold = 75 - aggregation = "Average" - period = "PT5M" - - email_action { - send_to_service_owners = false - - custom_emails = [ - "support@azure.microsoft.com", - ] - } - - webhook_action { - service_uri = "https://requestb.in/18jamc41" - - properties = { - severity = "incredible" - acceptance_test = "true" - } - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, enabled) -} - -func testAccAzureRMMonitorMetricAlertRule_requiresImport(data acceptance.TestData, enabled bool) string { - template := testAccAzureRMMonitorMetricAlertRule_virtualMachineCpu(data, enabled) - return fmt.Sprintf(` -%s - -resource "azurerm_monitor_metric_alertrule" "import" { - name = "${azurerm_monitor_metric_alertrule.test.name}" - resource_group_name = "${azurerm_monitor_metric_alertrule.test.resource_group_name}" - location = "${azurerm_monitor_metric_alertrule.test.location}" - description = "${azurerm_monitor_metric_alertrule.test.description}" - enabled = "${azurerm_monitor_metric_alertrule.test.enabled}" - - resource_id = "${azurerm_virtual_machine.test.id}" - metric_name = "Percentage CPU" - operator = "GreaterThan" - threshold = 75 - aggregation = "Average" - period = "PT5M" - - email_action { - send_to_service_owners = false - - custom_emails = [ - "support@azure.microsoft.com", - ] - } - - webhook_action { - service_uri = "https://requestb.in/18jamc41" - - properties = { - severity = "incredible" - acceptance_test = "true" - } - } -} -`, template) -} - -func testAccAzureRMMonitorMetricAlertRule_sqlDatabaseStorage(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "acctsub-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" -} - -resource "azurerm_network_interface" "test" { - name = "acctni-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - } -} - -resource "azurerm_virtual_machine" "test" { - name = "acctvm-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - network_interface_ids = ["${azurerm_network_interface.test.id}"] - vm_size = "Standard_D1_v2" - - storage_image_reference { - publisher = "Canonical" - offer = "UbuntuServer" - sku = "16.04-LTS" - version = "latest" - } - - storage_os_disk { - name = "osd-%d" - caching = "ReadWrite" - create_option = "FromImage" - disk_size_gb = "50" - managed_disk_type = "Standard_LRS" - } - - os_profile { - computer_name = "hn%d" - admin_username = "testadmin" - admin_password = "Password1234!" - } - - os_profile_linux_config { - disable_password_authentication = false - } - - tags = { - environment = "Production" - cost-center = "Ops" - } -} - -resource "azurerm_monitor_metric_alertrule" "test" { - name = "${azurerm_sql_database.test.name}-storage" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - - description = "An alert rule to watch the metric Storage" - - enabled = true - - resource_id = "${azurerm_sql_database.test.id}" - metric_name = "storage" - operator = "GreaterThan" - threshold = 1073741824 - aggregation = "Maximum" - period = "PT10M" - - email_action { - send_to_service_owners = false - - custom_emails = [ - "support@azure.microsoft.com", - ] - } - - webhook_action { - service_uri = "https://requestb.in/18jamc41" - - properties = { - severity = "incredible" - acceptance_test = "true" - } - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} diff --git a/azurerm/internal/services/network/data_source_private_link_endpoint_connection.go b/azurerm/internal/services/network/data_source_private_link_endpoint_connection.go deleted file mode 100644 index 505d1943146b7..0000000000000 --- a/azurerm/internal/services/network/data_source_private_link_endpoint_connection.go +++ /dev/null @@ -1,167 +0,0 @@ -package network - -import ( - "fmt" - "time" - - "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-09-01/network" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func dataSourceArmPrivateLinkEndpointConnection() *schema.Resource { - return &schema.Resource{ - DeprecationMessage: `The 'azurerm_private_link_endpoint_connection' resource is being deprecated in favour of the renamed version 'azurerm_private_endpoint_connection'. - -Information on migrating to the renamed resource can be found here: https://terraform.io/docs/providers/azurerm/guides/migrating-between-renamed-resources.html - -As such the existing 'azurerm_private_link_endpoint_connection' resource is deprecated and will be removed in the next major version of the AzureRM Provider (2.0). -`, - - Read: dataSourceArmPrivateLinkEndpointConnectionRead, - Timeouts: &schema.ResourceTimeout{ - Read: schema.DefaultTimeout(5 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ValidateFunc: ValidatePrivateLinkName, - }, - - "location": azure.SchemaLocationForDataSource(), - - "resource_group_name": azure.SchemaResourceGroupNameForDataSource(), - - "private_service_connection": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Computed: true, - }, - "request_response": { - Type: schema.TypeString, - Computed: true, - }, - "status": { - Type: schema.TypeString, - Computed: true, - }, - "private_ip_address": { - Type: schema.TypeString, - Computed: true, - }, - }, - }, - }, - }, - } -} - -func dataSourceArmPrivateLinkEndpointConnectionRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Network.PrivateEndpointClient - nicsClient := meta.(*clients.Client).Network.InterfacesClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - name := d.Get("name").(string) - resourceGroup := d.Get("resource_group_name").(string) - - resp, err := client.Get(ctx, resourceGroup, name, "") - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil - } - return fmt.Errorf("Error reading Private Link Endpoint %q (Resource Group %q): %+v", name, resourceGroup, err) - } - if resp.ID == nil || *resp.ID == "" { - return fmt.Errorf("API returns a nil/empty id on Private Link Endpoint %q (Resource Group %q): %+v", name, resourceGroup, err) - } - - d.SetId(*resp.ID) - d.Set("name", resp.Name) - d.Set("resource_group_name", resourceGroup) - if location := resp.Location; location != nil { - d.Set("location", azure.NormalizeLocation(*location)) - } - - if props := resp.PrivateEndpointProperties; props != nil { - privateIpAddress := "" - - if nics := props.NetworkInterfaces; nics != nil && len(*nics) > 0 { - nic := (*nics)[0] - if nic.ID != nil && *nic.ID != "" { - privateIpAddress = getPrivateIpAddress(ctx, nicsClient, *nic.ID) - } - } - - if err := d.Set("private_service_connection", dataSourceFlattenArmPrivateLinkEndpointServiceConnection(props.PrivateLinkServiceConnections, props.ManualPrivateLinkServiceConnections, privateIpAddress)); err != nil { - return fmt.Errorf("Error setting `private_service_connection`: %+v", err) - } - } - - return nil -} - -func dataSourceFlattenArmPrivateLinkEndpointServiceConnection(serviceConnections *[]network.PrivateLinkServiceConnection, manualServiceConnections *[]network.PrivateLinkServiceConnection, privateIpAddress string) []interface{} { - results := make([]interface{}, 0) - if serviceConnections == nil && manualServiceConnections == nil { - return results - } - - if serviceConnections != nil { - for _, item := range *serviceConnections { - result := make(map[string]interface{}) - result["private_ip_address"] = privateIpAddress - - if v := item.Name; v != nil { - result["name"] = *v - } - if props := item.PrivateLinkServiceConnectionProperties; props != nil { - if v := props.PrivateLinkServiceConnectionState; v != nil { - if s := v.Status; s != nil { - result["status"] = *s - } - if d := v.Description; d != nil { - result["request_response"] = *d - } - } - } - - results = append(results, result) - } - } - - if manualServiceConnections != nil { - for _, item := range *manualServiceConnections { - result := make(map[string]interface{}) - result["private_ip_address"] = privateIpAddress - - if v := item.Name; v != nil { - result["name"] = *v - } - if props := item.PrivateLinkServiceConnectionProperties; props != nil { - if v := props.PrivateLinkServiceConnectionState; v != nil { - if s := v.Status; s != nil { - result["status"] = *s - } - if d := v.Description; d != nil { - result["request_response"] = *d - } - } - } - - results = append(results, result) - } - } - - return results -} diff --git a/azurerm/internal/services/network/registration.go b/azurerm/internal/services/network/registration.go index 53b0e69c56034..a9fbaafdfc570 100644 --- a/azurerm/internal/services/network/registration.go +++ b/azurerm/internal/services/network/registration.go @@ -32,7 +32,6 @@ func (r Registration) SupportedDataSources() map[string]*schema.Resource { "azurerm_network_interface": dataSourceArmNetworkInterface(), "azurerm_network_security_group": dataSourceArmNetworkSecurityGroup(), "azurerm_network_watcher": dataSourceArmNetworkWatcher(), - "azurerm_private_link_endpoint_connection": dataSourceArmPrivateLinkEndpointConnection(), "azurerm_private_endpoint_connection": dataSourceArmPrivateEndpointConnection(), "azurerm_private_link_service": dataSourceArmPrivateLinkService(), "azurerm_private_link_service_endpoint_connections": dataSourceArmPrivateLinkServiceEndpointConnections(), @@ -54,8 +53,6 @@ func (r Registration) SupportedResources() map[string]*schema.Resource { "azurerm_application_gateway": resourceArmApplicationGateway(), "azurerm_application_security_group": resourceArmApplicationSecurityGroup(), "azurerm_bastion_host": resourceArmBastionHost(), - "azurerm_connection_monitor": resourceArmConnectionMonitor(), - "azurerm_ddos_protection_plan": resourceArmDDoSProtectionPlan(), "azurerm_express_route_circuit_authorization": resourceArmExpressRouteCircuitAuthorization(), "azurerm_express_route_circuit_peering": resourceArmExpressRouteCircuitPeering(), "azurerm_express_route_circuit": resourceArmExpressRouteCircuit(), @@ -85,7 +82,6 @@ func (r Registration) SupportedResources() map[string]*schema.Resource { "azurerm_network_profile": resourceArmNetworkProfile(), "azurerm_packet_capture": resourceArmPacketCapture(), "azurerm_point_to_site_vpn_gateway": resourceArmPointToSiteVPNGateway(), - "azurerm_private_link_endpoint": resourceArmPrivateLinkEndpoint(), "azurerm_private_endpoint": resourceArmPrivateEndpoint(), "azurerm_private_link_service": resourceArmPrivateLinkService(), "azurerm_public_ip": resourceArmPublicIp(), diff --git a/azurerm/internal/services/network/resource_arm_connection_monitor.go b/azurerm/internal/services/network/resource_arm_connection_monitor.go deleted file mode 100644 index e9a794a120270..0000000000000 --- a/azurerm/internal/services/network/resource_arm_connection_monitor.go +++ /dev/null @@ -1,351 +0,0 @@ -package network - -import ( - "fmt" - "time" - - "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-09-01/network" - "github.com/hashicorp/go-azure-helpers/response" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmConnectionMonitor() *schema.Resource { - return &schema.Resource{ - Create: resourceArmConnectionMonitorCreateUpdate, - Read: resourceArmConnectionMonitorRead, - Update: resourceArmConnectionMonitorCreateUpdate, - Delete: resourceArmConnectionMonitorDelete, - - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), - }, - - DeprecationMessage: `The 'azurerm_connection_monitor' resource is deprecated in favour of the renamed version 'azurerm_network_connection_monitor'. - -Information on migrating to the renamed resource can be found here: https://terraform.io/docs/providers/azurerm/guides/migrating-between-renamed-resources.html - -As such the existing 'azurerm_connection_monitor' resource is deprecated and will be removed in the next major version of the AzureRM Provider (2.0). -`, - - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - - "resource_group_name": azure.SchemaResourceGroupName(), - - "network_watcher_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - - "location": azure.SchemaLocation(), - - "auto_start": { - Type: schema.TypeBool, - Optional: true, - ForceNew: true, - Default: true, - }, - - "interval_in_seconds": { - Type: schema.TypeInt, - Optional: true, - Default: 60, - ValidateFunc: validation.IntAtLeast(30), - }, - - "source": { - Type: schema.TypeList, - Required: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "virtual_machine_id": { - Type: schema.TypeString, - Required: true, - ValidateFunc: azure.ValidateResourceID, - }, - "port": { - Type: schema.TypeInt, - Optional: true, - Default: 0, - ValidateFunc: validate.PortNumberOrZero, - }, - }, - }, - }, - - "destination": { - Type: schema.TypeList, - Required: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "virtual_machine_id": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: azure.ValidateResourceID, - ConflictsWith: []string{"destination.0.address"}, - }, - "address": { - Type: schema.TypeString, - Optional: true, - ConflictsWith: []string{"destination.0.virtual_machine_id"}, - }, - "port": { - Type: schema.TypeInt, - Required: true, - ValidateFunc: validate.PortNumber, - }, - }, - }, - }, - - "tags": tags.Schema(), - }, - } -} - -func resourceArmConnectionMonitorCreateUpdate(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Network.ConnectionMonitorsClient - ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) - defer cancel() - - name := d.Get("name").(string) - watcherName := d.Get("network_watcher_name").(string) - resourceGroup := d.Get("resource_group_name").(string) - location := azure.NormalizeLocation(d.Get("location").(string)) - autoStart := d.Get("auto_start").(bool) - intervalInSeconds := int32(d.Get("interval_in_seconds").(int)) - - source, err := expandArmConnectionMonitorSource(d) - if err != nil { - return err - } - - dest, err := expandArmConnectionMonitorDestination(d) - if err != nil { - return err - } - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, resourceGroup, watcherName, name) - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing Connection Monitor %q (Watcher %q / Resource Group %q): %s", name, watcherName, resourceGroup, err) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_connection_monitor", *existing.ID) - } - } - - t := d.Get("tags").(map[string]interface{}) - - properties := network.ConnectionMonitor{ - Location: utils.String(location), - Tags: tags.Expand(t), - ConnectionMonitorParameters: &network.ConnectionMonitorParameters{ - Source: source, - Destination: dest, - AutoStart: utils.Bool(autoStart), - MonitoringIntervalInSeconds: utils.Int32(intervalInSeconds), - }, - } - - future, err := client.CreateOrUpdate(ctx, resourceGroup, watcherName, name, properties) - if err != nil { - return fmt.Errorf("Error creating Connection Monitor %q (Watcher %q / Resource Group %q): %+v", name, watcherName, resourceGroup, err) - } - - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for completion of Connection Monitor %q (Watcher %q / Resource Group %q): %+v", name, watcherName, resourceGroup, err) - } - - resp, err := client.Get(ctx, resourceGroup, watcherName, name) - if err != nil { - return fmt.Errorf("Error retrieving Connection Monitor %q (Watcher %q / Resource Group %q): %+v", name, watcherName, resourceGroup, err) - } - if resp.ID == nil { - return fmt.Errorf("Cannot read Connection Monitor %q (Watcher %q / Resource Group %q) ID", name, watcherName, resourceGroup) - } - - d.SetId(*resp.ID) - - return resourceArmConnectionMonitorRead(d, meta) -} - -func resourceArmConnectionMonitorRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Network.ConnectionMonitorsClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - resourceGroup := id.ResourceGroup - watcherName := id.Path["networkWatchers"] - name := id.Path["connectionMonitors"] - - resp, err := client.Get(ctx, resourceGroup, watcherName, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil - } - return fmt.Errorf("Error reading Connection Monitor %q (Watcher %q / Resource Group %q) %+v", name, watcherName, resourceGroup, err) - } - - d.Set("name", name) - d.Set("network_watcher_name", watcherName) - d.Set("resource_group_name", resourceGroup) - if location := resp.Location; location != nil { - d.Set("location", azure.NormalizeLocation(*location)) - } - - if props := resp.ConnectionMonitorResultProperties; props != nil { - d.Set("auto_start", props.AutoStart) - d.Set("interval_in_seconds", props.MonitoringIntervalInSeconds) - - source := flattenArmConnectionMonitorSource(props.Source) - if err := d.Set("source", source); err != nil { - return fmt.Errorf("Error setting `source`: %+v", err) - } - - dest := flattenArmConnectionMonitorDestination(props.Destination) - if err := d.Set("destination", dest); err != nil { - return fmt.Errorf("Error setting `destination`: %+v", err) - } - } - - return tags.FlattenAndSet(d, resp.Tags) -} - -func resourceArmConnectionMonitorDelete(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Network.ConnectionMonitorsClient - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - resourceGroup := id.ResourceGroup - watcherName := id.Path["networkWatchers"] - name := id.Path["connectionMonitors"] - - future, err := client.Delete(ctx, resourceGroup, watcherName, name) - if err != nil { - if !response.WasNotFound(future.Response()) { - return fmt.Errorf("Error deleting Connection Monitor %q (Watcher %q / Resource Group %q): %+v", name, watcherName, resourceGroup, err) - } - } - - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for the deletion of Connection Monitor %q (Watcher %q / Resource Group %q): %+v", name, watcherName, resourceGroup, err) - } - - return nil -} - -func flattenArmConnectionMonitorSource(input *network.ConnectionMonitorSource) []interface{} { - if input == nil { - return []interface{}{} - } - - output := make(map[string]interface{}) - - if resourceID := input.ResourceID; resourceID != nil { - output["virtual_machine_id"] = *resourceID - } - if port := input.Port; port != nil { - output["port"] = *port - } - - return []interface{}{output} -} - -func expandArmConnectionMonitorSource(d *schema.ResourceData) (*network.ConnectionMonitorSource, error) { - sources := d.Get("source").([]interface{}) - source := sources[0].(map[string]interface{}) - - monitorSource := network.ConnectionMonitorSource{} - if v := source["virtual_machine_id"]; v != "" { - monitorSource.ResourceID = utils.String(v.(string)) - } - if v := source["port"]; v != "" { - monitorSource.Port = utils.Int32(int32(v.(int))) - } - - return &monitorSource, nil -} - -func flattenArmConnectionMonitorDestination(input *network.ConnectionMonitorDestination) []interface{} { - if input == nil { - return []interface{}{} - } - - output := make(map[string]interface{}) - - // When monitoring a VM, the address field will contain the current address - // of the VM. We only want to copy over the address field if the virtual - // machine field is not set to avoid unwanted diffs. - if resourceID := input.ResourceID; resourceID != nil { - output["virtual_machine_id"] = *resourceID - } else if address := input.Address; address != nil { - output["address"] = *address - } - - if port := input.Port; port != nil { - output["port"] = *port - } - - return []interface{}{output} -} - -func expandArmConnectionMonitorDestination(d *schema.ResourceData) (*network.ConnectionMonitorDestination, error) { - dests := d.Get("destination").([]interface{}) - dest := dests[0].(map[string]interface{}) - - monitorDest := network.ConnectionMonitorDestination{} - - if v := dest["virtual_machine_id"]; v != "" { - monitorDest.ResourceID = utils.String(v.(string)) - } - if v := dest["address"]; v != "" { - monitorDest.Address = utils.String(v.(string)) - } - if v := dest["port"]; v != "" { - monitorDest.Port = utils.Int32(int32(v.(int))) - } - - if monitorDest.ResourceID == nil && monitorDest.Address == nil { - return nil, fmt.Errorf("Error: either `destination.virtual_machine_id` or `destination.address` must be specified") - } - - return &monitorDest, nil -} diff --git a/azurerm/internal/services/network/resource_arm_ddos_protection_plan.go b/azurerm/internal/services/network/resource_arm_ddos_protection_plan.go deleted file mode 100644 index 10c5377ba10e7..0000000000000 --- a/azurerm/internal/services/network/resource_arm_ddos_protection_plan.go +++ /dev/null @@ -1,254 +0,0 @@ -package network - -import ( - "fmt" - "log" - "time" - - "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-09-01/network" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/locks" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -const azureDDoSProtectionPlanResourceName = "azurerm_ddos_protection_plan" - -func resourceArmDDoSProtectionPlan() *schema.Resource { - return &schema.Resource{ - Create: resourceArmDDoSProtectionPlanCreateUpdate, - Read: resourceArmDDoSProtectionPlanRead, - Update: resourceArmDDoSProtectionPlanCreateUpdate, - Delete: resourceArmDDoSProtectionPlanDelete, - - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), - }, - - DeprecationMessage: `The 'azurerm_ddos_protection_plan' resource is deprecated in favour of the renamed version 'azurerm_network_ddos_protection_plan'. - -Information on migrating to the renamed resource can be found here: https://terraform.io/docs/providers/azurerm/guides/migrating-between-renamed-resources.html - -As such the existing 'azurerm_ddos_protection_plan' resource is deprecated and will be removed in the next major version of the AzureRM Provider (2.0). -`, - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - }, - - "location": azure.SchemaLocation(), - - "resource_group_name": azure.SchemaResourceGroupName(), - - "virtual_network_ids": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - - "tags": tags.Schema(), - }, - } -} - -func resourceArmDDoSProtectionPlanCreateUpdate(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Network.DDOSProtectionPlansClient - ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) - defer cancel() - - log.Printf("[INFO] preparing arguments for DDoS protection plan creation") - - name := d.Get("name").(string) - resourceGroup := d.Get("resource_group_name").(string) - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, resourceGroup, name) - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing DDoS Protection Plan %q (Resource Group %q): %s", name, resourceGroup, err) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_ddos_protection_plan", *existing.ID) - } - } - - location := azure.NormalizeLocation(d.Get("location").(string)) - t := d.Get("tags").(map[string]interface{}) - - vnetsToLock, err := extractVnetNames(d) - if err != nil { - return fmt.Errorf("Error extracting names of Virtual Network: %+v", err) - } - - locks.ByName(name, azureDDoSProtectionPlanResourceName) - defer locks.UnlockByName(name, azureDDoSProtectionPlanResourceName) - - locks.MultipleByName(vnetsToLock, VirtualNetworkResourceName) - defer locks.UnlockMultipleByName(vnetsToLock, VirtualNetworkResourceName) - - parameters := network.DdosProtectionPlan{ - Location: &location, - Tags: tags.Expand(t), - } - - future, err := client.CreateOrUpdate(ctx, resourceGroup, name, parameters) - if err != nil { - return fmt.Errorf("Error creating/updating DDoS Protection Plan %q (Resource Group %q): %+v", name, resourceGroup, err) - } - - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for creation/update of DDoS Protection Plan %q (Resource Group %q): %+v", name, resourceGroup, err) - } - - plan, err := client.Get(ctx, resourceGroup, name) - if err != nil { - return fmt.Errorf("Error retrieving DDoS Protection Plan %q (Resource Group %q): %+v", name, resourceGroup, err) - } - - if plan.ID == nil { - return fmt.Errorf("Cannot read DDoS Protection Plan %q (Resource Group %q) ID", name, resourceGroup) - } - - d.SetId(*plan.ID) - - return resourceArmDDoSProtectionPlanRead(d, meta) -} - -func resourceArmDDoSProtectionPlanRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Network.DDOSProtectionPlansClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - resourceGroup := id.ResourceGroup - name := id.Path["ddosProtectionPlans"] - - plan, err := client.Get(ctx, resourceGroup, name) - if err != nil { - if utils.ResponseWasNotFound(plan.Response) { - log.Printf("[DEBUG] DDoS Protection Plan %q was not found in Resource Group %q - removing from state!", name, resourceGroup) - d.SetId("") - return nil - } - - return fmt.Errorf("Error making Read request on DDoS Protection Plan %q (Resource Group %q): %+v", name, resourceGroup, err) - } - - d.Set("name", plan.Name) - d.Set("resource_group_name", resourceGroup) - if location := plan.Location; location != nil { - d.Set("location", azure.NormalizeLocation(*location)) - } - - if props := plan.DdosProtectionPlanPropertiesFormat; props != nil { - vNetIDs := flattenArmVirtualNetworkIDs(props.VirtualNetworks) - if err := d.Set("virtual_network_ids", vNetIDs); err != nil { - return fmt.Errorf("Error setting `virtual_network_ids`: %+v", err) - } - } - - return tags.FlattenAndSet(d, plan.Tags) -} - -func resourceArmDDoSProtectionPlanDelete(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Network.DDOSProtectionPlansClient - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - resourceGroup := id.ResourceGroup - name := id.Path["ddosProtectionPlans"] - - read, err := client.Get(ctx, resourceGroup, name) - if err != nil { - if utils.ResponseWasNotFound(read.Response) { - // deleted outside of TF - log.Printf("[DEBUG] DDoS Protection Plan %q was not found in Resource Group %q - assuming removed!", name, resourceGroup) - return nil - } - - return fmt.Errorf("Error retrieving DDoS Protection Plan %q (Resource Group %q): %+v", name, resourceGroup, err) - } - - vnetsToLock, err := extractVnetNames(d) - if err != nil { - return fmt.Errorf("Error extracting names of Virtual Network: %+v", err) - } - - locks.ByName(name, azureDDoSProtectionPlanResourceName) - defer locks.UnlockByName(name, azureDDoSProtectionPlanResourceName) - - locks.MultipleByName(vnetsToLock, VirtualNetworkResourceName) - defer locks.UnlockMultipleByName(vnetsToLock, VirtualNetworkResourceName) - - future, err := client.Delete(ctx, resourceGroup, name) - if err != nil { - return fmt.Errorf("Error deleting DDoS Protection Plan %q (Resource Group %q): %+v", name, resourceGroup, err) - } - - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for the deletion of DDoS Protection Plan %q (Resource Group %q): %+v", name, resourceGroup, err) - } - - return err -} - -func extractVnetNames(d *schema.ResourceData) (*[]string, error) { - vnetIDs := d.Get("virtual_network_ids").([]interface{}) - vnetNames := make([]string, 0) - - for _, vnetID := range vnetIDs { - vnetResourceID, err := azure.ParseAzureResourceID(vnetID.(string)) - if err != nil { - return nil, err - } - - vnetName := vnetResourceID.Path["virtualNetworks"] - - if !azure.SliceContainsValue(vnetNames, vnetName) { - vnetNames = append(vnetNames, vnetName) - } - } - - return &vnetNames, nil -} - -func flattenArmVirtualNetworkIDs(input *[]network.SubResource) []string { - vnetIDs := make([]string, 0) - if input == nil { - return vnetIDs - } - - // if-continue is used to simplify the deeply nested if-else statement. - for _, subRes := range *input { - if subRes.ID != nil { - vnetIDs = append(vnetIDs, *subRes.ID) - } - } - - return vnetIDs -} diff --git a/azurerm/internal/services/network/resource_arm_network_ddos_protection_plan.go b/azurerm/internal/services/network/resource_arm_network_ddos_protection_plan.go index 3f8f2f8dfb534..e7664d5b366f3 100644 --- a/azurerm/internal/services/network/resource_arm_network_ddos_protection_plan.go +++ b/azurerm/internal/services/network/resource_arm_network_ddos_protection_plan.go @@ -246,3 +246,23 @@ func flattenArmNetworkDDoSProtectionPlanVirtualNetworkIDs(input *[]network.SubRe return vnetIDs } + +func extractVnetNames(d *schema.ResourceData) (*[]string, error) { + vnetIDs := d.Get("virtual_network_ids").([]interface{}) + vnetNames := make([]string, 0) + + for _, vnetID := range vnetIDs { + vnetResourceID, err := azure.ParseAzureResourceID(vnetID.(string)) + if err != nil { + return nil, err + } + + vnetName := vnetResourceID.Path["virtualNetworks"] + + if !azure.SliceContainsValue(vnetNames, vnetName) { + vnetNames = append(vnetNames, vnetName) + } + } + + return &vnetNames, nil +} diff --git a/azurerm/internal/services/network/resource_arm_private_link_endpoint.go b/azurerm/internal/services/network/resource_arm_private_link_endpoint.go deleted file mode 100644 index b4f420a316494..0000000000000 --- a/azurerm/internal/services/network/resource_arm_private_link_endpoint.go +++ /dev/null @@ -1,242 +0,0 @@ -package network - -import ( - "fmt" - "log" - "time" - - "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-09-01/network" - "github.com/hashicorp/go-azure-helpers/response" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmPrivateLinkEndpoint() *schema.Resource { - return &schema.Resource{ - DeprecationMessage: `The 'azurerm_private_link_endpoint' resource is being deprecated in favour of the renamed version 'azurerm_private_endpoint'. - -Information on migrating to the renamed resource can be found here: https://terraform.io/docs/providers/azurerm/guides/migrating-between-renamed-resources.html - -As such the existing 'azurerm_private_link_endpoint' resource is deprecated and will be removed in the next major version of the AzureRM Provider (2.0). -`, - - Create: resourceArmPrivateLinkEndpointCreateUpdate, - Read: resourceArmPrivateLinkEndpointRead, - Update: resourceArmPrivateLinkEndpointCreateUpdate, - Delete: resourceArmPrivateLinkEndpointDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(60 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(60 * time.Minute), - Delete: schema.DefaultTimeout(60 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: ValidatePrivateLinkName, - }, - - "location": azure.SchemaLocation(), - - "resource_group_name": azure.SchemaResourceGroupNameDiffSuppress(), - - "subnet_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - }, - - "private_service_connection": { - Type: schema.TypeList, - Required: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: ValidatePrivateLinkName, - }, - "is_manual_connection": { - Type: schema.TypeBool, - Required: true, - ForceNew: true, - }, - "private_connection_resource_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - }, - "subresource_names": { - Type: schema.TypeList, - Optional: true, - ForceNew: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - ValidateFunc: ValidatePrivateLinkSubResourceName, - }, - }, - "request_message": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringLenBetween(1, 140), - }, - }, - }, - }, - - // tags has been removed - // API Issue "Unable to remove Tags from Private Link Endpoint": https://github.com/Azure/azure-sdk-for-go/issues/6467 - }, - } -} - -func resourceArmPrivateLinkEndpointCreateUpdate(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Network.PrivateEndpointClient - ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) - defer cancel() - - name := d.Get("name").(string) - resourceGroup := d.Get("resource_group_name").(string) - - if err := ValidatePrivateEndpointSettings(d); err != nil { - return fmt.Errorf("Error validating the configuration for the Private Link Endpoint %q (Resource Group %q): %+v", name, resourceGroup, err) - } - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, resourceGroup, name, "") - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing Private Link Endpoint %q (Resource Group %q): %+v", name, resourceGroup, err) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_private_link_endpoint", *existing.ID) - } - } - - location := azure.NormalizeLocation(d.Get("location").(string)) - privateServiceConnections := d.Get("private_service_connection").([]interface{}) - subnetId := d.Get("subnet_id").(string) - - parameters := network.PrivateEndpoint{ - Location: utils.String(location), - PrivateEndpointProperties: &network.PrivateEndpointProperties{ - PrivateLinkServiceConnections: expandArmPrivateLinkEndpointServiceConnection(privateServiceConnections, false), - ManualPrivateLinkServiceConnections: expandArmPrivateLinkEndpointServiceConnection(privateServiceConnections, true), - Subnet: &network.Subnet{ - ID: utils.String(subnetId), - }, - }, - } - - future, err := client.CreateOrUpdate(ctx, resourceGroup, name, parameters) - if err != nil { - return fmt.Errorf("Error creating Private Link Endpoint %q (Resource Group %q): %+v", name, resourceGroup, err) - } - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for creation of Private Link Endpoint %q (Resource Group %q): %+v", name, resourceGroup, err) - } - - resp, err := client.Get(ctx, resourceGroup, name, "") - if err != nil { - return fmt.Errorf("Error retrieving Private Link Endpoint %q (Resource Group %q): %+v", name, resourceGroup, err) - } - if resp.ID == nil || *resp.ID == "" { - return fmt.Errorf("API returns a nil/empty id on Private Link Endpoint %q (Resource Group %q): %+v", name, resourceGroup, err) - } - d.SetId(*resp.ID) - - return resourceArmPrivateLinkEndpointRead(d, meta) -} - -func resourceArmPrivateLinkEndpointRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Network.PrivateEndpointClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - resourceGroup := id.ResourceGroup - name := id.Path["privateEndpoints"] - - resp, err := client.Get(ctx, resourceGroup, name, "") - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - log.Printf("[INFO] Private Link Endpoint %q does not exist - removing from state", d.Id()) - d.SetId("") - return nil - } - return fmt.Errorf("Error reading Private Link Endpoint %q (Resource Group %q): %+v", name, resourceGroup, err) - } - - d.Set("name", resp.Name) - d.Set("resource_group_name", resourceGroup) - if location := resp.Location; location != nil { - d.Set("location", azure.NormalizeLocation(*location)) - } - - if props := resp.PrivateEndpointProperties; props != nil { - flattenedConnection := flattenArmPrivateLinkEndpointServiceConnection(props.PrivateLinkServiceConnections, props.ManualPrivateLinkServiceConnections) - if err := d.Set("private_service_connection", flattenedConnection); err != nil { - return fmt.Errorf("Error setting `private_service_connection`: %+v", err) - } - - subnetId := "" - if subnet := props.Subnet; subnet != nil { - subnetId = *subnet.ID - } - d.Set("subnet_id", subnetId) - } - - // API Issue "Unable to remove Tags from Private Link Endpoint": https://github.com/Azure/azure-sdk-for-go/issues/6467 - return nil -} - -func resourceArmPrivateLinkEndpointDelete(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).Network.PrivateEndpointClient - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - resourceGroup := id.ResourceGroup - name := id.Path["privateEndpoints"] - - future, err := client.Delete(ctx, resourceGroup, name) - if err != nil { - if response.WasNotFound(future.Response()) { - return nil - } - return fmt.Errorf("Error deleting Private Link Endpoint %q (Resource Group %q): %+v", name, resourceGroup, err) - } - - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - if !response.WasNotFound(future.Response()) { - return fmt.Errorf("Error waiting for deletion of Private Link Endpoint %q (Resource Group %q): %+v", name, resourceGroup, err) - } - } - - return nil -} diff --git a/azurerm/internal/services/network/tests/data_source_private_link_endpoint_connection_test.go b/azurerm/internal/services/network/tests/data_source_private_link_endpoint_connection_test.go deleted file mode 100644 index ede0b0744a080..0000000000000 --- a/azurerm/internal/services/network/tests/data_source_private_link_endpoint_connection_test.go +++ /dev/null @@ -1,37 +0,0 @@ -package tests - -import ( - "fmt" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" -) - -func TestAccDataSourceAzureRMPrivateLinkEndpointConnection_complete(t *testing.T) { - data := acceptance.BuildTestData(t, "data.azurerm_private_link_endpoint_connection", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - Steps: []resource.TestStep{ - { - Config: testAccDataSourcePrivateLinkEndpointConnection_complete(data), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(data.ResourceName, "private_service_connection.0.status", "Approved"), - ), - }, - }, - }) -} - -func testAccDataSourcePrivateLinkEndpointConnection_complete(data acceptance.TestData) string { - return fmt.Sprintf(` -%s - -data "azurerm_private_link_endpoint_connection" "test" { - name = azurerm_private_link_endpoint.test.name - resource_group_name = azurerm_resource_group.test.name -} -`, testAccAzureRMPrivateLinkEndpoint_basic(data)) -} diff --git a/azurerm/internal/services/network/tests/resource_arm_connection_monitor_test.go b/azurerm/internal/services/network/tests/resource_arm_connection_monitor_test.go deleted file mode 100644 index 04240aa2f761e..0000000000000 --- a/azurerm/internal/services/network/tests/resource_arm_connection_monitor_test.go +++ /dev/null @@ -1,648 +0,0 @@ -package tests - -import ( - "fmt" - "net/http" - "regexp" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" -) - -func testAccAzureRMConnectionMonitor_addressBasic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_connection_monitor", "test") - - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMConnectionMonitorDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMConnectionMonitor_basicAddressConfig(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMConnectionMonitorExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "resource_group_name"), - resource.TestCheckResourceAttr(data.ResourceName, "location", azure.NormalizeLocation(data.Locations.Primary)), - resource.TestCheckResourceAttr(data.ResourceName, "auto_start", "true"), - resource.TestCheckResourceAttr(data.ResourceName, "interval_in_seconds", "60"), - ), - }, - data.ImportStep(), - }, - }) -} - -func testAccAzureRMConnectionMonitor_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - - data := acceptance.BuildTestData(t, "azurerm_connection_monitor", "test") - - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMConnectionMonitorDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMConnectionMonitor_basicAddressConfig(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMConnectionMonitorExists(data.ResourceName), - ), - }, - { - Config: testAccAzureRMConnectionMonitor_requiresImportConfig(data), - ExpectError: acceptance.RequiresImportError("azurerm_connection_monitor"), - }, - }, - }) -} - -func testAccAzureRMConnectionMonitor_addressComplete(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_connection_monitor", "test") - - autoStart := "false" - - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMConnectionMonitorDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMConnectionMonitor_completeAddressConfig(data, autoStart), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMConnectionMonitorExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "auto_start", "false"), - resource.TestCheckResourceAttr(data.ResourceName, "interval_in_seconds", "30"), - resource.TestCheckResourceAttr(data.ResourceName, "source.0.port", "20020"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.env", "test"), - ), - }, - data.ImportStep(), - }, - }) -} - -func testAccAzureRMConnectionMonitor_addressUpdate(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_connection_monitor", "test") - - autoStart := "true" - - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMConnectionMonitorDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMConnectionMonitor_basicAddressConfig(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMConnectionMonitorExists(data.ResourceName), - ), - }, - { - Config: testAccAzureRMConnectionMonitor_completeAddressConfig(data, autoStart), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMConnectionMonitorExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "auto_start", "true"), - resource.TestCheckResourceAttr(data.ResourceName, "interval_in_seconds", "30"), - resource.TestCheckResourceAttr(data.ResourceName, "source.0.port", "20020"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.env", "test"), - ), - }, - data.ImportStep(), - }, - }) -} - -func testAccAzureRMConnectionMonitor_vmBasic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_connection_monitor", "test") - - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMConnectionMonitorDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMConnectionMonitor_basicVmConfig(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMConnectionMonitorExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "resource_group_name"), - resource.TestCheckResourceAttr(data.ResourceName, "location", azure.NormalizeLocation(data.Locations.Primary)), - resource.TestCheckResourceAttr(data.ResourceName, "auto_start", "true"), - resource.TestCheckResourceAttr(data.ResourceName, "interval_in_seconds", "60"), - ), - }, - data.ImportStep(), - }, - }) -} - -func testAccAzureRMConnectionMonitor_vmComplete(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_connection_monitor", "test") - - autoStart := "false" - - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMConnectionMonitorDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMConnectionMonitor_completeVmConfig(data, autoStart), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMConnectionMonitorExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "auto_start", "false"), - resource.TestCheckResourceAttr(data.ResourceName, "interval_in_seconds", "30"), - resource.TestCheckResourceAttr(data.ResourceName, "source.0.port", "20020"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.env", "test"), - ), - }, - data.ImportStep(), - }, - }) -} - -func testAccAzureRMConnectionMonitor_vmUpdate(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_connection_monitor", "test") - - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMConnectionMonitorDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMConnectionMonitor_basicVmConfig(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMConnectionMonitorExists(data.ResourceName), - ), - }, - { - Config: testAccAzureRMConnectionMonitor_completeVmConfig(data, "true"), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMConnectionMonitorExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "auto_start", "true"), - resource.TestCheckResourceAttr(data.ResourceName, "interval_in_seconds", "30"), - resource.TestCheckResourceAttr(data.ResourceName, "source.0.port", "20020"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.env", "test"), - ), - }, - data.ImportStep(), - }, - }) -} - -func testAccAzureRMConnectionMonitor_destinationUpdate(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_connection_monitor", "test") - - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMConnectionMonitorDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMConnectionMonitor_basicAddressConfig(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMConnectionMonitorExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "destination.0.address"), - ), - }, - { - Config: testAccAzureRMConnectionMonitor_basicVmConfig(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMConnectionMonitorExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "destination.0.virtual_machine_id"), - ), - }, - { - Config: testAccAzureRMConnectionMonitor_basicAddressConfig(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMConnectionMonitorExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "destination.0.address"), - ), - }, - data.ImportStep(), - }, - }) -} - -func testAccAzureRMConnectionMonitor_missingDestination(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_connection_monitor", "test") - - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMConnectionMonitorDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMConnectionMonitor_missingDestinationConfig(data), - ExpectError: regexp.MustCompile("Error: either `destination.virtual_machine_id` or `destination.address` must be specified"), - }, - }, - }) -} - -func testAccAzureRMConnectionMonitor_conflictingDestinations(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_connection_monitor", "test") - - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMConnectionMonitorDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMConnectionMonitor_conflictingDestinationsConfig(data), - ExpectError: regexp.MustCompile("conflicts with destination.0.address"), - }, - }, - }) -} - -func testCheckAzureRMConnectionMonitorExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - client := acceptance.AzureProvider.Meta().(*clients.Client).Network.ConnectionMonitorsClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - rs, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %s", resourceName) - } - - resourceGroup := rs.Primary.Attributes["resource_group_name"] - watcherName := rs.Primary.Attributes["network_watcher_name"] - connectionMonitorName := rs.Primary.Attributes["name"] - - resp, err := client.Get(ctx, resourceGroup, watcherName, connectionMonitorName) - if err != nil { - return fmt.Errorf("Bad: Get on connectionMonitorsClient: %s", err) - } - - if resp.StatusCode == http.StatusNotFound { - return fmt.Errorf("Connection Monitor does not exist: %s", connectionMonitorName) - } - - return nil - } -} - -func testCheckAzureRMConnectionMonitorDestroy(s *terraform.State) error { - client := acceptance.AzureProvider.Meta().(*clients.Client).Network.ConnectionMonitorsClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_connection_monitor" { - continue - } - - resourceGroup := rs.Primary.Attributes["resource_group_name"] - watcherName := rs.Primary.Attributes["network_watcher_name"] - connectionMonitorName := rs.Primary.Attributes["name"] - - resp, err := client.Get(ctx, resourceGroup, watcherName, connectionMonitorName) - - if err != nil { - return nil - } - - if resp.StatusCode != http.StatusNotFound { - return fmt.Errorf("Connection Monitor still exists:%s", *resp.Name) - } - } - - return nil -} - -func testAccAzureRMConnectionMonitor_baseConfig(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_network_watcher" "test" { - name = "acctnw-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_virtual_network" "test" { - name = "acctvn-%d" - address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "internal" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test.name}" - address_prefix = "10.0.2.0/24" -} - -resource "azurerm_network_interface" "src" { - name = "acctni-src%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - } -} - -resource "azurerm_virtual_machine" "src" { - name = "acctvm-src%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - network_interface_ids = ["${azurerm_network_interface.src.id}"] - vm_size = "Standard_D1_v2" - - storage_image_reference { - publisher = "Canonical" - offer = "UbuntuServer" - sku = "16.04-LTS" - version = "latest" - } - - storage_os_disk { - name = "osdisk-src%d" - caching = "ReadWrite" - create_option = "FromImage" - managed_disk_type = "Standard_LRS" - } - - os_profile { - computer_name = "hostname%d" - admin_username = "testadmin" - admin_password = "Password1234!" - } - - os_profile_linux_config { - disable_password_authentication = false - } -} - -resource "azurerm_virtual_machine_extension" "src" { - name = "network-watcher" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_machine_name = "${azurerm_virtual_machine.src.name}" - publisher = "Microsoft.Azure.NetworkWatcher" - type = "NetworkWatcherAgentLinux" - type_handler_version = "1.4" - auto_upgrade_minor_version = true -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - -func testAccAzureRMConnectionMonitor_baseWithDestConfig(data acceptance.TestData) string { - config := testAccAzureRMConnectionMonitor_baseConfig(data) - return fmt.Sprintf(` -%s - -resource "azurerm_network_interface" "dest" { - name = "acctni-dest%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "testconfiguration1" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - } -} - -resource "azurerm_virtual_machine" "dest" { - name = "acctvm-dest%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - network_interface_ids = ["${azurerm_network_interface.dest.id}"] - vm_size = "Standard_D1_v2" - - storage_image_reference { - publisher = "Canonical" - offer = "UbuntuServer" - sku = "16.04-LTS" - version = "latest" - } - - storage_os_disk { - name = "osdisk-dest%d" - caching = "ReadWrite" - create_option = "FromImage" - managed_disk_type = "Standard_LRS" - } - - os_profile { - computer_name = "hostname%d" - admin_username = "testadmin" - admin_password = "Password1234!" - } - - os_profile_linux_config { - disable_password_authentication = false - } -} -`, config, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - -func testAccAzureRMConnectionMonitor_basicAddressConfig(data acceptance.TestData) string { - config := testAccAzureRMConnectionMonitor_baseConfig(data) - return fmt.Sprintf(` -%s - -resource "azurerm_connection_monitor" "test" { - name = "acctestcm-%d" - network_watcher_name = "${azurerm_network_watcher.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_network_watcher.test.location}" - - source { - virtual_machine_id = "${azurerm_virtual_machine.src.id}" - } - - destination { - address = "terraform.io" - port = 80 - } - - depends_on = ["azurerm_virtual_machine_extension.src"] -} -`, config, data.RandomInteger) -} - -func testAccAzureRMConnectionMonitor_completeAddressConfig(data acceptance.TestData, autoStart string) string { - config := testAccAzureRMConnectionMonitor_baseConfig(data) - return fmt.Sprintf(` -%s - -resource "azurerm_connection_monitor" "test" { - name = "acctestcm-%d" - network_watcher_name = "${azurerm_network_watcher.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_network_watcher.test.location}" - - auto_start = %s - interval_in_seconds = 30 - - source { - virtual_machine_id = "${azurerm_virtual_machine.src.id}" - port = 20020 - } - - destination { - address = "terraform.io" - port = 443 - } - - tags = { - env = "test" - } - - depends_on = ["azurerm_virtual_machine_extension.src"] -} -`, config, data.RandomInteger, autoStart) -} - -func testAccAzureRMConnectionMonitor_basicVmConfig(data acceptance.TestData) string { - config := testAccAzureRMConnectionMonitor_baseWithDestConfig(data) - return fmt.Sprintf(` -%s - -resource "azurerm_connection_monitor" "test" { - name = "acctestcm-%d" - network_watcher_name = "${azurerm_network_watcher.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_network_watcher.test.location}" - - source { - virtual_machine_id = "${azurerm_virtual_machine.src.id}" - } - - destination { - virtual_machine_id = "${azurerm_virtual_machine.dest.id}" - port = 80 - } - - depends_on = ["azurerm_virtual_machine_extension.src"] -} -`, config, data.RandomInteger) -} - -func testAccAzureRMConnectionMonitor_completeVmConfig(data acceptance.TestData, autoStart string) string { - config := testAccAzureRMConnectionMonitor_baseWithDestConfig(data) - return fmt.Sprintf(` -%s - -resource "azurerm_connection_monitor" "test" { - name = "acctestcm-%d" - network_watcher_name = "${azurerm_network_watcher.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_network_watcher.test.location}" - - auto_start = %s - interval_in_seconds = 30 - - source { - virtual_machine_id = "${azurerm_virtual_machine.src.id}" - port = 20020 - } - - destination { - virtual_machine_id = "${azurerm_virtual_machine.dest.id}" - port = 443 - } - - tags = { - env = "test" - } - - depends_on = ["azurerm_virtual_machine_extension.src"] -} -`, config, data.RandomInteger, autoStart) -} - -func testAccAzureRMConnectionMonitor_missingDestinationConfig(data acceptance.TestData) string { - config := testAccAzureRMConnectionMonitor_baseConfig(data) - return fmt.Sprintf(` -%s - -resource "azurerm_connection_monitor" "test" { - name = "acctestcm-%d" - network_watcher_name = "${azurerm_network_watcher.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_network_watcher.test.location}" - - source { - virtual_machine_id = "${azurerm_virtual_machine.src.id}" - } - - destination { - port = 80 - } - - depends_on = ["azurerm_virtual_machine_extension.src"] -} -`, config, data.RandomInteger) -} - -func testAccAzureRMConnectionMonitor_conflictingDestinationsConfig(data acceptance.TestData) string { - config := testAccAzureRMConnectionMonitor_baseConfig(data) - return fmt.Sprintf(` -%s - -resource "azurerm_connection_monitor" "test" { - name = "acctestcm-%d" - network_watcher_name = "${azurerm_network_watcher.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_network_watcher.test.location}" - - source { - virtual_machine_id = "${azurerm_virtual_machine.src.id}" - } - - destination { - address = "terraform.io" - virtual_machine_id = "${azurerm_virtual_machine.src.id}" - port = 80 - } - - depends_on = ["azurerm_virtual_machine_extension.src"] -} -`, config, data.RandomInteger) -} - -func testAccAzureRMConnectionMonitor_requiresImportConfig(data acceptance.TestData) string { - config := testAccAzureRMConnectionMonitor_basicAddressConfig(data) - return fmt.Sprintf(` -%s - -resource "azurerm_connection_monitor" "import" { - name = "${azurerm_connection_monitor.test.name}" - network_watcher_name = "${azurerm_connection_monitor.test.network_watcher_name}" - resource_group_name = "${azurerm_connection_monitor.test.resource_group_name}" - location = "${azurerm_connection_monitor.test.location}" - - source { - virtual_machine_id = "${azurerm_virtual_machine.src.id}" - } - - destination { - address = "terraform.io" - port = 80 - } - - depends_on = ["azurerm_virtual_machine_extension.src"] -} -`, config) -} diff --git a/azurerm/internal/services/network/tests/resource_arm_ddos_protection_plan_test.go b/azurerm/internal/services/network/tests/resource_arm_ddos_protection_plan_test.go deleted file mode 100644 index ef8045b066b18..0000000000000 --- a/azurerm/internal/services/network/tests/resource_arm_ddos_protection_plan_test.go +++ /dev/null @@ -1,264 +0,0 @@ -package tests - -import ( - "fmt" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func testAccAzureRMDDoSProtectionPlan_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_ddos_protection_plan", "test") - - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMDDoSProtectionPlanDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMDDoSProtectionPlan_basicConfig(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMDDoSProtectionPlanExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "virtual_network_ids.#"), - ), - }, - data.ImportStep(), - }, - }) -} - -func testAccAzureRMDDoSProtectionPlan_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - - data := acceptance.BuildTestData(t, "azurerm_ddos_protection_plan", "test") - - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMDDoSProtectionPlanDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMDDoSProtectionPlan_basicConfig(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMDDoSProtectionPlanExists(data.ResourceName), - ), - }, - { - Config: testAccAzureRMDDoSProtectionPlan_requiresImportConfig(data), - ExpectError: acceptance.RequiresImportError("azurerm_ddos_protection_plan"), - }, - }, - }) -} - -func testAccAzureRMDDoSProtectionPlan_withTags(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_ddos_protection_plan", "test") - - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMDDoSProtectionPlanDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMDDoSProtectionPlan_withTagsConfig(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMDDoSProtectionPlanExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "2"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.environment", "Production"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.cost_center", "MSFT"), - ), - }, - { - Config: testAccAzureRMDDoSProtectionPlan_withUpdatedTagsConfig(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMDDoSProtectionPlanExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.environment", "Staging"), - ), - }, - data.ImportStep(), - }, - }) -} - -func testAccAzureRMDDoSProtectionPlan_disappears(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_ddos_protection_plan", "test") - - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMDDoSProtectionPlanDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMDDoSProtectionPlan_basicConfig(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMDDoSProtectionPlanExists(data.ResourceName), - testCheckAzureRMDDoSProtectionPlanDisappears(data.ResourceName), - ), - ExpectNonEmptyPlan: true, - }, - }, - }) -} - -func testCheckAzureRMDDoSProtectionPlanExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - client := acceptance.AzureProvider.Meta().(*clients.Client).Network.DDOSProtectionPlansClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - // Ensure we have enough information in state to look up in API - rs, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %s", resourceName) - } - - name := rs.Primary.Attributes["name"] - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for DDoS Protection Plan: %q", name) - } - - resp, err := client.Get(ctx, resourceGroup, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - return fmt.Errorf("Bad: DDoS Protection Plan %q (Resource Group: %q) does not exist", name, resourceGroup) - } - - return fmt.Errorf("Bad: Get on ddosProtectionPlanClient: %+v", err) - } - - return nil - } -} - -func testCheckAzureRMDDoSProtectionPlanDisappears(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - client := acceptance.AzureProvider.Meta().(*clients.Client).Network.DDOSProtectionPlansClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - // Ensure we have enough information in state to look up in API - rs, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %s", resourceName) - } - - name := rs.Primary.Attributes["name"] - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for DDoS Protection Plan: %q", name) - } - - future, err := client.Delete(ctx, resourceGroup, name) - if err != nil { - return fmt.Errorf("Bad: Delete on ddosProtectionPlanClient: %+v", err) - } - - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Bad: waiting for Deletion on ddosProtectionPlanClient: %+v", err) - } - - return nil - } -} - -func testCheckAzureRMDDoSProtectionPlanDestroy(s *terraform.State) error { - client := acceptance.AzureProvider.Meta().(*clients.Client).Network.DDOSProtectionPlansClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_ddos_protection_plan" { - continue - } - - 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 - } - - return err - } - - return fmt.Errorf("DDoS Protection Plan still exists:\n%#v", resp.DdosProtectionPlanPropertiesFormat) - } - - return nil -} - -func testAccAzureRMDDoSProtectionPlan_basicConfig(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_ddos_protection_plan" "test" { - name = "acctestddospplan-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - -func testAccAzureRMDDoSProtectionPlan_requiresImportConfig(data acceptance.TestData) string { - basicConfig := testAccAzureRMDDoSProtectionPlan_basicConfig(data) - return fmt.Sprintf(` -%s - -resource "azurerm_ddos_protection_plan" "import" { - name = "${azurerm_ddos_protection_plan.test.name}" - location = "${azurerm_ddos_protection_plan.test.location}" - resource_group_name = "${azurerm_ddos_protection_plan.test.resource_group_name}" -} -`, basicConfig) -} - -func testAccAzureRMDDoSProtectionPlan_withTagsConfig(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_ddos_protection_plan" "test" { - name = "acctestddospplan-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - tags = { - environment = "Production" - cost_center = "MSFT" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - -func testAccAzureRMDDoSProtectionPlan_withUpdatedTagsConfig(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_ddos_protection_plan" "test" { - name = "acctestddospplan-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - tags = { - environment = "Staging" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} diff --git a/azurerm/internal/services/network/tests/resource_arm_private_link_endpoint_test.go b/azurerm/internal/services/network/tests/resource_arm_private_link_endpoint_test.go deleted file mode 100644 index 60749548ec854..0000000000000 --- a/azurerm/internal/services/network/tests/resource_arm_private_link_endpoint_test.go +++ /dev/null @@ -1,102 +0,0 @@ -package tests - -import ( - "fmt" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" -) - -func TestAccAzureRMPrivateLinkEndpoint_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_private_link_endpoint", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMPrivateEndpointDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMPrivateLinkEndpoint_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMPrivateEndpointExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "subnet_id"), - ), - }, - data.ImportStep(), - }, - }) -} - -func TestAccAzureRMPrivateLinkEndpoint_requestMessage(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_private_link_endpoint", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMPrivateEndpointDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMPrivateLinkEndpoint_requestMessage(data, "CATS: ALL YOUR BASE ARE BELONG TO US."), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMPrivateEndpointExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "subnet_id"), - resource.TestCheckResourceAttr(data.ResourceName, "private_service_connection.0.request_message", "CATS: ALL YOUR BASE ARE BELONG TO US."), - ), - }, - data.ImportStep(), - { - Config: testAccAzureRMPrivateLinkEndpoint_requestMessage(data, "CAPTAIN: WHAT YOU SAY!!"), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMPrivateEndpointExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "subnet_id"), - resource.TestCheckResourceAttr(data.ResourceName, "private_service_connection.0.request_message", "CAPTAIN: WHAT YOU SAY!!"), - ), - }, - data.ImportStep(), - }, - }) -} - -// The update and complete test cases had to be totally removed since there is a bug with tags and the support for -// tags has been removed, all other attributes are ForceNew. -// API Issue "Unable to remove Tags from Private Link Endpoint": https://github.com/Azure/azure-sdk-for-go/issues/6467 - -func testAccAzureRMPrivateLinkEndpoint_basic(data acceptance.TestData) string { - return fmt.Sprintf(` -%s - -resource "azurerm_private_link_endpoint" "test" { - name = "acctest-privatelink-%d" - resource_group_name = azurerm_resource_group.test.name - location = azurerm_resource_group.test.location - subnet_id = azurerm_subnet.endpoint.id - - private_service_connection { - name = azurerm_private_link_service.test.name - is_manual_connection = false - private_connection_resource_id = azurerm_private_link_service.test.id - } -} -`, testAccAzureRMPrivateEndpointTemplate_template(data, testAccAzureRMPrivateEndpoint_serviceAutoApprove(data)), data.RandomInteger) -} - -func testAccAzureRMPrivateLinkEndpoint_requestMessage(data acceptance.TestData, msg string) string { - return fmt.Sprintf(` -%s - -resource "azurerm_private_link_endpoint" "test" { - name = "acctest-privatelink-%d" - resource_group_name = azurerm_resource_group.test.name - location = azurerm_resource_group.test.location - subnet_id = azurerm_subnet.endpoint.id - - private_service_connection { - name = azurerm_private_link_service.test.name - is_manual_connection = true - private_connection_resource_id = azurerm_private_link_service.test.id - request_message = %q - } -} -`, testAccAzureRMPrivateEndpointTemplate_template(data, testAccAzureRMPrivateEndpoint_serviceManualApprove(data)), data.RandomInteger, msg) -} diff --git a/azurerm/internal/services/network/tests/resource_arm_virtual_network_test.go b/azurerm/internal/services/network/tests/resource_arm_virtual_network_test.go index f146d94925120..48fd8ade8b646 100644 --- a/azurerm/internal/services/network/tests/resource_arm_virtual_network_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_virtual_network_test.go @@ -323,7 +323,7 @@ resource "azurerm_resource_group" "test" { location = "%s" } -resource "azurerm_ddos_protection_plan" "test" { +resource "azurerm_network_ddos_protection_plan" "test" { name = "acctestddospplan-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" @@ -336,7 +336,7 @@ resource "azurerm_virtual_network" "test" { resource_group_name = "${azurerm_resource_group.test.name}" ddos_protection_plan { - id = "${azurerm_ddos_protection_plan.test.id}" + id = "${azurerm_network_ddos_protection_plan.test.id}" enable = true } diff --git a/azurerm/internal/services/recoveryservices/data_source_recovery_services_protection_policy_vm.go b/azurerm/internal/services/recoveryservices/data_source_backup_policy_vm.go similarity index 72% rename from azurerm/internal/services/recoveryservices/data_source_recovery_services_protection_policy_vm.go rename to azurerm/internal/services/recoveryservices/data_source_backup_policy_vm.go index 401ff7fa38a9a..626a073105c99 100644 --- a/azurerm/internal/services/recoveryservices/data_source_recovery_services_protection_policy_vm.go +++ b/azurerm/internal/services/recoveryservices/data_source_backup_policy_vm.go @@ -14,9 +14,9 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func dataSourceArmRecoveryServicesProtectionPolicyVm() *schema.Resource { +func dataSourceArmBackupPolicyVm() *schema.Resource { return &schema.Resource{ - Read: dataSourceArmRecoveryServicesProtectionPolicyVmRead, + Read: dataSourceArmBackupPolicyVmRead, Timeouts: &schema.ResourceTimeout{ Read: schema.DefaultTimeout(5 * time.Minute), @@ -41,7 +41,7 @@ func dataSourceArmRecoveryServicesProtectionPolicyVm() *schema.Resource { } } -func dataSourceArmRecoveryServicesProtectionPolicyVmRead(d *schema.ResourceData, meta interface{}) error { +func dataSourceArmBackupPolicyVmRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).RecoveryServices.ProtectionPoliciesClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -50,15 +50,15 @@ func dataSourceArmRecoveryServicesProtectionPolicyVmRead(d *schema.ResourceData, resourceGroup := d.Get("resource_group_name").(string) vaultName := d.Get("recovery_vault_name").(string) - log.Printf("[DEBUG] Reading Recovery Service Protection Policy %q (resource group %q)", name, resourceGroup) + log.Printf("[DEBUG] Reading Recovery Service Policy %q (resource group %q)", name, resourceGroup) protectionPolicy, err := client.Get(ctx, vaultName, resourceGroup, name) if err != nil { if utils.ResponseWasNotFound(protectionPolicy.Response) { - return fmt.Errorf("Error: Recovery Services Protection Policy %q (Resource Group %q) was not found", name, resourceGroup) + return fmt.Errorf("Error: Backup Policy %q (Resource Group %q) was not found", name, resourceGroup) } - return fmt.Errorf("Error making Read request on Recovery Service Protection Policy %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error making Read request on Backup Policy %q (Resource Group %q): %+v", name, resourceGroup, err) } id := strings.Replace(*protectionPolicy.ID, "Subscriptions", "subscriptions", 1) diff --git a/azurerm/internal/services/recoveryservices/registration.go b/azurerm/internal/services/recoveryservices/registration.go index 16724dc1d1789..4ad4baf1c1ed1 100644 --- a/azurerm/internal/services/recoveryservices/registration.go +++ b/azurerm/internal/services/recoveryservices/registration.go @@ -21,33 +21,25 @@ 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_recovery_services_vault": dataSourceArmRecoveryServicesVault(), - "azurerm_recovery_services_protection_policy_vm": dataSourceArmRecoveryServicesProtectionPolicyVm(), + "azurerm_recovery_services_vault": dataSourceArmRecoveryServicesVault(), + "azurerm_backup_policy_vm": dataSourceArmBackupPolicyVm(), } } // SupportedResources returns the supported Resources supported by this Service func (r Registration) SupportedResources() map[string]*schema.Resource { return map[string]*schema.Resource{ - "azurerm_backup_container_storage_account": resourceArmBackupProtectionContainerStorageAccount(), - "azurerm_backup_policy_file_share": resourceArmBackupProtectionPolicyFileShare(), - "azurerm_backup_protected_file_share": resourceArmBackupProtectedFileShare(), - "azurerm_backup_protected_vm": resourceArmRecoveryServicesBackupProtectedVM(), - "azurerm_backup_policy_vm": resourceArmBackupProtectionPolicyVM(), - "azurerm_recovery_network_mapping": resourceArmRecoveryServicesNetworkMapping(), - "azurerm_recovery_replicated_vm": resourceArmRecoveryServicesReplicatedVm(), - "azurerm_recovery_services_fabric": resourceArmRecoveryServicesFabric(), - "azurerm_recovery_services_protected_vm": resourceArmRecoveryServicesProtectedVm(), - "azurerm_recovery_services_protection_container": resourceArmRecoveryServicesProtectionContainer(), - "azurerm_recovery_services_protection_container_mapping": resourceArmRecoveryServicesProtectionContainerMapping(), - "azurerm_recovery_services_protection_policy_vm": resourceArmRecoveryServicesProtectionPolicyVm(), - "azurerm_recovery_services_replication_policy": resourceArmRecoveryServicesReplicationPolicy(), - "azurerm_recovery_services_vault": resourceArmRecoveryServicesVault(), - "azurerm_site_recovery_fabric": resourceArmSiteRecoveryFabric(), - "azurerm_site_recovery_network_mapping": resourceArmSiteRecoveryNetworkMapping(), - "azurerm_site_recovery_protection_container": resourceArmSiteRecoveryProtectionContainer(), - "azurerm_site_recovery_protection_container_mapping": resourceArmSiteRecoveryProtectionContainerMapping(), - "azurerm_site_recovery_replicated_vm": resourceArmSiteRecoveryReplicatedVM(), - "azurerm_site_recovery_replication_policy": resourceArmSiteRecoveryReplicationPolicy(), + "azurerm_backup_container_storage_account": resourceArmBackupProtectionContainerStorageAccount(), + "azurerm_backup_policy_file_share": resourceArmBackupProtectionPolicyFileShare(), + "azurerm_backup_protected_file_share": resourceArmBackupProtectedFileShare(), + "azurerm_backup_protected_vm": resourceArmRecoveryServicesBackupProtectedVM(), + "azurerm_backup_policy_vm": resourceArmBackupProtectionPolicyVM(), + "azurerm_recovery_services_vault": resourceArmRecoveryServicesVault(), + "azurerm_site_recovery_fabric": resourceArmSiteRecoveryFabric(), + "azurerm_site_recovery_network_mapping": resourceArmSiteRecoveryNetworkMapping(), + "azurerm_site_recovery_protection_container": resourceArmSiteRecoveryProtectionContainer(), + "azurerm_site_recovery_protection_container_mapping": resourceArmSiteRecoveryProtectionContainerMapping(), + "azurerm_site_recovery_replicated_vm": resourceArmSiteRecoveryReplicatedVM(), + "azurerm_site_recovery_replication_policy": resourceArmSiteRecoveryReplicationPolicy(), } } diff --git a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_fabric.go b/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_fabric.go deleted file mode 100644 index bb0d6e00b0b8f..0000000000000 --- a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_fabric.go +++ /dev/null @@ -1,164 +0,0 @@ -package recoveryservices - -import ( - "fmt" - "time" - - "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2018-01-10/siterecovery" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmRecoveryServicesFabric() *schema.Resource { - return &schema.Resource{ - DeprecationMessage: "`azurerm_recovery_services_fabric` resource is deprecated in favor of `azurerm_site_recovery_fabric` and will be removed in v2.0 of the AzureRM Provider", - Create: resourceArmRecoveryServicesFabricCreate, - Read: resourceArmRecoveryServicesFabricRead, - Update: nil, - Delete: resourceArmRecoveryServicesFabricDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "resource_group_name": azure.SchemaResourceGroupName(), - - "recovery_vault_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateRecoveryServicesVaultName, - }, - "location": azure.SchemaLocation(), - }, - } -} - -func resourceArmRecoveryServicesFabricCreate(d *schema.ResourceData, meta interface{}) error { - resGroup := d.Get("resource_group_name").(string) - vaultName := d.Get("recovery_vault_name").(string) - location := azure.NormalizeLocation(d.Get("location").(string)) - name := d.Get("name").(string) - - client := meta.(*clients.Client).RecoveryServices.FabricClient(resGroup, vaultName) - ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) - defer cancel() - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, name) - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing rec overy services fabric %s (vault %s): %+v", name, vaultName, err) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_resource_group", azure.HandleAzureSdkForGoBug2824(*existing.ID)) - } - } - - parameters := siterecovery.FabricCreationInput{ - Properties: &siterecovery.FabricCreationInputProperties{ - CustomDetails: siterecovery.AzureFabricCreationInput{ - InstanceType: "Azure", - Location: &location, - }, - }, - } - - future, err := client.Create(ctx, name, parameters) - if err != nil { - return fmt.Errorf("Error creating recovery services fabric %s (vault %s): %+v", name, vaultName, err) - } - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error creating recovery services fabric %s (vault %s): %+v", name, vaultName, err) - } - - resp, err := client.Get(ctx, name) - if err != nil { - return fmt.Errorf("Error retrieving recovery services fabric %s (vault %s): %+v", name, vaultName, err) - } - - d.SetId(azure.HandleAzureSdkForGoBug2824(*resp.ID)) - - return resourceArmRecoveryServicesFabricRead(d, meta) -} - -func resourceArmRecoveryServicesFabricRead(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - name := id.Path["replicationFabrics"] - - client := meta.(*clients.Client).RecoveryServices.FabricClient(resGroup, vaultName) - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - resp, err := client.Get(ctx, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil - } - return fmt.Errorf("Error making Read request on recovery services fabric %s (vault %s): %+v", name, vaultName, err) - } - - d.Set("name", resp.Name) - d.Set("resource_group_name", resGroup) - if props := resp.Properties; props != nil { - if azureDetails, isAzureDetails := props.CustomDetails.AsAzureFabricSpecificDetails(); isAzureDetails { - d.Set("location", azureDetails.Location) - } - } - d.Set("recovery_vault_name", vaultName) - return nil -} - -func resourceArmRecoveryServicesFabricDelete(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - name := id.Path["replicationFabrics"] - - client := meta.(*clients.Client).RecoveryServices.FabricClient(resGroup, vaultName) - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - future, err := client.Delete(ctx, name) - if err != nil { - return fmt.Errorf("Error deleting recovery services fabric %s (vault %s): %+v", name, vaultName, err) - } - - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for deletion of recovery services fabric %s (vault %s): %+v", name, vaultName, err) - } - - return nil -} diff --git a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_network_mapping.go b/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_network_mapping.go deleted file mode 100644 index fc6a4d24a3ba8..0000000000000 --- a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_network_mapping.go +++ /dev/null @@ -1,216 +0,0 @@ -package recoveryservices - -import ( - "fmt" - "time" - - "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2018-01-10/siterecovery" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmRecoveryServicesNetworkMapping() *schema.Resource { - return &schema.Resource{ - DeprecationMessage: "`azurerm_recovery_network_mapping` resource is deprecated in favor of `azurerm_site_recovery_network_mapping` and will be removed in v2.0 of the AzureRM Provider", - Create: resourceArmRecoveryNetworkMappingCreate, - Read: resourceArmRecoveryNetworkMappingRead, - Delete: resourceArmRecoveryNetworkMappingDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "resource_group_name": azure.SchemaResourceGroupName(), - - "recovery_vault_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateRecoveryServicesVaultName, - }, - "source_recovery_fabric_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "target_recovery_fabric_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "source_network_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - "target_network_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - }, - } -} - -func resourceArmRecoveryNetworkMappingCreate(d *schema.ResourceData, meta interface{}) error { - resGroup := d.Get("resource_group_name").(string) - vaultName := d.Get("recovery_vault_name").(string) - fabricName := d.Get("source_recovery_fabric_name").(string) - targetFabricName := d.Get("target_recovery_fabric_name").(string) - sourceNetworkId := d.Get("source_network_id").(string) - targetNetworkId := d.Get("target_network_id").(string) - name := d.Get("name").(string) - - client := meta.(*clients.Client).RecoveryServices.NetworkMappingClient(resGroup, vaultName) - ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) - defer cancel() - - //get network name from id - parsedSourceNetworkId, err := azure.ParseAzureResourceID(sourceNetworkId) - if err != nil { - return fmt.Errorf("[ERROR] Unable to parse source_network_id '%s' (network mapping %s): %+v", sourceNetworkId, name, err) - } - sourceNetworkName, hasName := parsedSourceNetworkId.Path["virtualNetworks"] - if !hasName { - sourceNetworkName, hasName = parsedSourceNetworkId.Path["virtualnetworks"] // Handle that different APIs return different ID casings - if !hasName { - return fmt.Errorf("[ERROR] parsed source_network_id '%s' doesn't contain 'virtualnetworks'", parsedSourceNetworkId) - } - } - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, fabricName, sourceNetworkName, name) - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing recovery services fabric %s (vault %s): %+v", name, vaultName, err) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_recovery_network_mapping", azure.HandleAzureSdkForGoBug2824(*existing.ID)) - } - } - - var parameters = siterecovery.CreateNetworkMappingInput{ - Properties: &siterecovery.CreateNetworkMappingInputProperties{ - RecoveryNetworkID: &targetNetworkId, - RecoveryFabricName: &targetFabricName, - FabricSpecificDetails: siterecovery.AzureToAzureCreateNetworkMappingInput{ - PrimaryNetworkID: &sourceNetworkId, - }, - }, - } - future, err := client.Create(ctx, fabricName, sourceNetworkName, name, parameters) - if err != nil { - return fmt.Errorf("Error creating recovery network mapping %s (vault %s): %+v", name, vaultName, err) - } - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error creating recovery network mapping %s (vault %s): %+v", name, vaultName, err) - } - - resp, err := client.Get(ctx, fabricName, sourceNetworkName, name) - if err != nil { - return fmt.Errorf("Error retrieving recovery network mapping %s (vault %s): %+v", name, vaultName, err) - } - - d.SetId(azure.HandleAzureSdkForGoBug2824(*resp.ID)) - - return resourceArmRecoveryNetworkMappingRead(d, meta) -} - -func resourceArmRecoveryNetworkMappingRead(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - fabricName := id.Path["replicationFabrics"] - networkName := id.Path["replicationNetworks"] - name := id.Path["replicationNetworkMappings"] - - client := meta.(*clients.Client).RecoveryServices.NetworkMappingClient(resGroup, vaultName) - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - resp, err := client.Get(ctx, fabricName, networkName, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil - } - return fmt.Errorf("Error making Read request on recovery services protection container mapping %s (vault %s): %+v", name, vaultName, err) - } - - d.Set("resource_group_name", resGroup) - d.Set("recovery_vault_name", vaultName) - d.Set("source_recovery_fabric_name", fabricName) - d.Set("name", resp.Name) - if props := resp.Properties; props != nil { - d.Set("source_network_id", props.PrimaryNetworkID) - d.Set("target_network_id", props.RecoveryNetworkID) - - targetFabricId, err := azure.ParseAzureResourceID(azure.HandleAzureSdkForGoBug2824(*resp.Properties.RecoveryFabricArmID)) - if err != nil { - return err - } - d.Set("target_recovery_fabric_name", targetFabricId.Path["replicationFabrics"]) - } - - return nil -} - -func resourceArmRecoveryNetworkMappingDelete(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - fabricName := id.Path["replicationFabrics"] - networkName := id.Path["replicationNetworks"] - name := id.Path["replicationNetworkMappings"] - - client := meta.(*clients.Client).RecoveryServices.NetworkMappingClient(resGroup, vaultName) - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - future, err := client.Delete(ctx, fabricName, networkName, name) - if err != nil { - return fmt.Errorf("Error deleting recovery services protection container mapping %s (vault %s): %+v", name, vaultName, err) - } - - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for deletion of recovery services protection container mapping %s (vault %s): %+v", name, vaultName, err) - } - - return nil -} diff --git a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protected_vm.go b/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protected_vm.go deleted file mode 100644 index 68181b97366c5..0000000000000 --- a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protected_vm.go +++ /dev/null @@ -1,283 +0,0 @@ -package recoveryservices - -import ( - "context" - "fmt" - "log" - "strings" - "time" - - "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2019-05-13/backup" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmRecoveryServicesProtectedVm() *schema.Resource { - return &schema.Resource{ - DeprecationMessage: "`azurerm_recovery_services_protected_vm` resource is deprecated in favor of `azurerm_backup_protected_vm` and will be removed in v2.0 of the AzureRM Provider", - Create: resourceArmRecoveryServicesProtectedVmCreateUpdate, - Read: resourceArmRecoveryServicesProtectedVmRead, - Update: resourceArmRecoveryServicesProtectedVmCreateUpdate, - Delete: resourceArmRecoveryServicesProtectedVmDelete, - - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(80 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(80 * time.Minute), - Delete: schema.DefaultTimeout(80 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - - "resource_group_name": azure.SchemaResourceGroupName(), - - "recovery_vault_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateRecoveryServicesVaultName, - }, - - "source_vm_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - }, - - "backup_policy_id": { - Type: schema.TypeString, - Required: true, - ValidateFunc: azure.ValidateResourceID, - }, - - "tags": tags.Schema(), - }, - } -} - -func resourceArmRecoveryServicesProtectedVmCreateUpdate(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).RecoveryServices.ProtectedItemsClient - ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) - defer cancel() - - resourceGroup := d.Get("resource_group_name").(string) - t := d.Get("tags").(map[string]interface{}) - - vaultName := d.Get("recovery_vault_name").(string) - vmId := d.Get("source_vm_id").(string) - policyId := d.Get("backup_policy_id").(string) - - //get VM name from id - parsedVmId, err := azure.ParseAzureResourceID(vmId) - if err != nil { - return fmt.Errorf("[ERROR] Unable to parse source_vm_id '%s': %+v", vmId, err) - } - vmName, hasName := parsedVmId.Path["virtualMachines"] - if !hasName { - return fmt.Errorf("[ERROR] parsed source_vm_id '%s' doesn't contain 'virtualMachines'", vmId) - } - - protectedItemName := fmt.Sprintf("VM;iaasvmcontainerv2;%s;%s", parsedVmId.ResourceGroup, vmName) - containerName := fmt.Sprintf("iaasvmcontainer;iaasvmcontainerv2;%s;%s", parsedVmId.ResourceGroup, vmName) - - log.Printf("[DEBUG] Creating/updating Recovery Service Protected VM %s (resource group %q)", protectedItemName, resourceGroup) - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err2 := client.Get(ctx, vaultName, resourceGroup, "Azure", containerName, protectedItemName, "") - if err2 != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing Recovery Service Protected VM %q (Resource Group %q): %+v", protectedItemName, resourceGroup, err2) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_recovery_services_protected_vm", *existing.ID) - } - } - - item := backup.ProtectedItemResource{ - Tags: tags.Expand(t), - Properties: &backup.AzureIaaSComputeVMProtectedItem{ - PolicyID: &policyId, - ProtectedItemType: backup.ProtectedItemTypeMicrosoftClassicComputevirtualMachines, - WorkloadType: backup.DataSourceTypeVM, - SourceResourceID: utils.String(vmId), - FriendlyName: utils.String(vmName), - VirtualMachineID: utils.String(vmId), - }, - } - - if _, err = client.CreateOrUpdate(ctx, vaultName, resourceGroup, "Azure", containerName, protectedItemName, item); err != nil { - return fmt.Errorf("Error creating/updating Recovery Service Protected VM %q (Resource Group %q): %+v", protectedItemName, resourceGroup, err) - } - - resp, err := resourceArmRecoveryServicesProtectedVmWaitForStateCreateUpdate(ctx, client, vaultName, resourceGroup, containerName, protectedItemName, policyId, d) - if err != nil { - return err - } - - id := strings.Replace(*resp.ID, "Subscriptions", "subscriptions", 1) // This code is a workaround for this bug https://github.com/Azure/azure-sdk-for-go/issues/2824 - d.SetId(id) - - return resourceArmRecoveryServicesProtectedVmRead(d, meta) -} - -func resourceArmRecoveryServicesProtectedVmRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).RecoveryServices.ProtectedItemsClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - protectedItemName := id.Path["protectedItems"] - vaultName := id.Path["vaults"] - resourceGroup := id.ResourceGroup - containerName := id.Path["protectionContainers"] - - log.Printf("[DEBUG] Reading Recovery Service Protected VM %q (resource group %q)", protectedItemName, resourceGroup) - - resp, err := client.Get(ctx, vaultName, resourceGroup, "Azure", containerName, protectedItemName, "") - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil - } - - return fmt.Errorf("Error making Read request on Recovery Service Protected VM %q (Resource Group %q): %+v", protectedItemName, resourceGroup, err) - } - - d.Set("resource_group_name", resourceGroup) - d.Set("recovery_vault_name", vaultName) - - if properties := resp.Properties; properties != nil { - if vm, ok := properties.AsAzureIaaSComputeVMProtectedItem(); ok { - d.Set("source_vm_id", vm.SourceResourceID) - - if v := vm.PolicyID; v != nil { - d.Set("backup_policy_id", strings.Replace(*v, "Subscriptions", "subscriptions", 1)) - } - } - } - - return tags.FlattenAndSet(d, resp.Tags) -} - -func resourceArmRecoveryServicesProtectedVmDelete(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).RecoveryServices.ProtectedItemsClient - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - protectedItemName := id.Path["protectedItems"] - resourceGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - containerName := id.Path["protectionContainers"] - - log.Printf("[DEBUG] Deleting Recovery Service Protected Item %q (resource group %q)", protectedItemName, resourceGroup) - - resp, err := client.Delete(ctx, vaultName, resourceGroup, "Azure", containerName, protectedItemName) - if err != nil { - if !utils.ResponseWasNotFound(resp) { - return fmt.Errorf("Error issuing delete request for Recovery Service Protected VM %q (Resource Group %q): %+v", protectedItemName, resourceGroup, err) - } - } - - if _, err := resourceArmRecoveryServicesProtectedVmWaitForDeletion(ctx, client, vaultName, resourceGroup, containerName, protectedItemName, "", d); err != nil { - return err - } - - return nil -} - -func resourceArmRecoveryServicesProtectedVmWaitForStateCreateUpdate(ctx context.Context, client *backup.ProtectedItemsClient, vaultName, resourceGroup, containerName, protectedItemName string, policyId string, d *schema.ResourceData) (backup.ProtectedItemResource, error) { - state := &resource.StateChangeConf{ - MinTimeout: 30 * time.Second, - Delay: 10 * time.Second, - Pending: []string{"NotFound"}, - Target: []string{"Found"}, - Refresh: resourceArmRecoveryServicesProtectedVmRefreshFunc(ctx, client, vaultName, resourceGroup, containerName, protectedItemName, policyId, true), - } - - if d.IsNewResource() { - state.Timeout = d.Timeout(schema.TimeoutCreate) - } else { - state.Timeout = d.Timeout(schema.TimeoutUpdate) - } - - resp, err := state.WaitForState() - if err != nil { - i, _ := resp.(backup.ProtectedItemResource) - return i, fmt.Errorf("Error waiting for the Recovery Service Protected VM %q to be true (Resource Group %q) to provision: %+v", protectedItemName, resourceGroup, err) - } - - return resp.(backup.ProtectedItemResource), nil -} - -func resourceArmRecoveryServicesProtectedVmWaitForDeletion(ctx context.Context, client *backup.ProtectedItemsClient, vaultName, resourceGroup, containerName, protectedItemName string, policyId string, d *schema.ResourceData) (backup.ProtectedItemResource, error) { - state := &resource.StateChangeConf{ - MinTimeout: 30 * time.Second, - Delay: 10 * time.Second, - Pending: []string{"Found"}, - Target: []string{"NotFound"}, - Refresh: resourceArmRecoveryServicesProtectedVmRefreshFunc(ctx, client, vaultName, resourceGroup, containerName, protectedItemName, policyId, false), - Timeout: d.Timeout(schema.TimeoutDelete), - } - - resp, err := state.WaitForState() - if err != nil { - i, _ := resp.(backup.ProtectedItemResource) - return i, fmt.Errorf("Error waiting for the Recovery Service Protected VM %q to be false (Resource Group %q) to provision: %+v", protectedItemName, resourceGroup, err) - } - - return resp.(backup.ProtectedItemResource), nil -} - -func resourceArmRecoveryServicesProtectedVmRefreshFunc(ctx context.Context, client *backup.ProtectedItemsClient, vaultName, resourceGroup, containerName, protectedItemName string, policyId string, newResource bool) resource.StateRefreshFunc { - // TODO: split this into two functions - return func() (interface{}, string, error) { - resp, err := client.Get(ctx, vaultName, resourceGroup, "Azure", containerName, protectedItemName, "") - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - return resp, "NotFound", nil - } - - return resp, "Error", fmt.Errorf("Error making Read request on Recovery Service Protected VM %q (Resource Group %q): %+v", protectedItemName, resourceGroup, err) - } else if !newResource && policyId != "" { - if properties := resp.Properties; properties != nil { - if vm, ok := properties.AsAzureIaaSComputeVMProtectedItem(); ok { - if v := vm.PolicyID; v != nil { - if strings.Replace(*v, "Subscriptions", "subscriptions", 1) != policyId { - return resp, "NotFound", nil - } - } else { - return resp, "Error", fmt.Errorf("Error reading policy ID attribute nil on Recovery Service Protected VM %q (Resource Group %q)", protectedItemName, resourceGroup) - } - } else { - return resp, "Error", fmt.Errorf("Error reading properties on Recovery Service Protected VM %q (Resource Group %q)", protectedItemName, resourceGroup) - } - } else { - return resp, "Error", fmt.Errorf("Error reading properties on empty Recovery Service Protected VM %q (Resource Group %q)", protectedItemName, resourceGroup) - } - } - return resp, "Found", nil - } -} diff --git a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_container.go b/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_container.go deleted file mode 100644 index f31bbd4c16266..0000000000000 --- a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_container.go +++ /dev/null @@ -1,162 +0,0 @@ -package recoveryservices - -import ( - "fmt" - "time" - - "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2018-01-10/siterecovery" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmRecoveryServicesProtectionContainer() *schema.Resource { - return &schema.Resource{ - DeprecationMessage: "`azurerm_recovery_services_protection_container` resource is deprecated in favor of `azurerm_site_recovery_protection_container` and will be removed in v2.0 of the AzureRM Provider", - Create: resourceArmRecoveryServicesProtectionContainerCreate, - Read: resourceArmRecoveryServicesProtectionContainerRead, - Update: nil, - Delete: resourceArmRecoveryServicesProtectionContainerDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "resource_group_name": azure.SchemaResourceGroupName(), - - "recovery_vault_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateRecoveryServicesVaultName, - }, - "recovery_fabric_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - }, - } -} - -func resourceArmRecoveryServicesProtectionContainerCreate(d *schema.ResourceData, meta interface{}) error { - resGroup := d.Get("resource_group_name").(string) - vaultName := d.Get("recovery_vault_name").(string) - fabricName := d.Get("recovery_fabric_name").(string) - name := d.Get("name").(string) - - client := meta.(*clients.Client).RecoveryServices.ProtectionContainerClient(resGroup, vaultName) - ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) - defer cancel() - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, fabricName, name) - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing recovery services protection container %s (fabric %s): %+v", name, fabricName, err) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_recovery_services_protection_container", azure.HandleAzureSdkForGoBug2824(*existing.ID)) - } - } - - parameters := siterecovery.CreateProtectionContainerInput{ - Properties: &siterecovery.CreateProtectionContainerInputProperties{}, - } - - future, err := client.Create(ctx, fabricName, name, parameters) - if err != nil { - return fmt.Errorf("Error creating recovery services protection container %s (fabric %s): %+v", name, fabricName, err) - } - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error creating recovery services protection container %s (fabric %s): %+v", name, fabricName, err) - } - - resp, err := client.Get(ctx, fabricName, name) - if err != nil { - return fmt.Errorf("Error retrieving site recovery protection container %s (fabric %s): %+v", name, fabricName, err) - } - - d.SetId(azure.HandleAzureSdkForGoBug2824(*resp.ID)) - - return resourceArmRecoveryServicesProtectionContainerRead(d, meta) -} - -func resourceArmRecoveryServicesProtectionContainerRead(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - fabricName := id.Path["replicationFabrics"] - name := id.Path["replicationProtectionContainers"] - - client := meta.(*clients.Client).RecoveryServices.ProtectionContainerClient(resGroup, vaultName) - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - resp, err := client.Get(ctx, fabricName, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil - } - return fmt.Errorf("Error making Read request on recovery services protection container %s (fabric %s): %+v", name, fabricName, err) - } - - d.Set("name", resp.Name) - d.Set("resource_group_name", resGroup) - d.Set("recovery_vault_name", vaultName) - d.Set("recovery_fabric_name", fabricName) - return nil -} - -func resourceArmRecoveryServicesProtectionContainerDelete(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - fabricName := id.Path["replicationFabrics"] - name := id.Path["replicationProtectionContainers"] - - client := meta.(*clients.Client).RecoveryServices.ProtectionContainerClient(resGroup, vaultName) - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - future, err := client.Delete(ctx, fabricName, name) - if err != nil { - return fmt.Errorf("Error deleting recovery services protection container %s (fabric %s): %+v", name, fabricName, err) - } - - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for deletion of recovery services protection container %s (fabric %s): %+v", name, fabricName, err) - } - - return nil -} diff --git a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_container_mapping.go b/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_container_mapping.go deleted file mode 100644 index cbeea35521bf9..0000000000000 --- a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_container_mapping.go +++ /dev/null @@ -1,203 +0,0 @@ -package recoveryservices - -import ( - "fmt" - "time" - - "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2018-01-10/siterecovery" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmRecoveryServicesProtectionContainerMapping() *schema.Resource { - return &schema.Resource{ - DeprecationMessage: "`azurerm_recovery_services_protection_container_mapping` resource is deprecated in favor of `azurerm_site_recovery_protection_container_mapping` and will be removed in v2.0 of the AzureRM Provider", - Create: resourceArmRecoveryServicesContainerMappingCreate, - Read: resourceArmRecoveryServicesContainerMappingRead, - Update: nil, - Delete: resourceArmRecoveryServicesContainerMappingDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "resource_group_name": azure.SchemaResourceGroupName(), - - "recovery_vault_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateRecoveryServicesVaultName, - }, - "recovery_fabric_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "recovery_replication_policy_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - "recovery_source_protection_container_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "recovery_target_protection_container_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - }, - } -} - -func resourceArmRecoveryServicesContainerMappingCreate(d *schema.ResourceData, meta interface{}) error { - resGroup := d.Get("resource_group_name").(string) - vaultName := d.Get("recovery_vault_name").(string) - fabricName := d.Get("recovery_fabric_name").(string) - policyId := d.Get("recovery_replication_policy_id").(string) - protectionContainerName := d.Get("recovery_source_protection_container_name").(string) - targetContainerId := d.Get("recovery_target_protection_container_id").(string) - name := d.Get("name").(string) - - client := meta.(*clients.Client).RecoveryServices.ContainerMappingClient(resGroup, vaultName) - ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) - defer cancel() - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, fabricName, protectionContainerName, name) - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing recovery services protection container mapping %s (fabric %s, container %s): %+v", name, fabricName, protectionContainerName, err) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_recovery_services_protection_container_mapping", azure.HandleAzureSdkForGoBug2824(*existing.ID)) - } - } - - var parameters = siterecovery.CreateProtectionContainerMappingInput{ - Properties: &siterecovery.CreateProtectionContainerMappingInputProperties{ - TargetProtectionContainerID: &targetContainerId, - PolicyID: &policyId, - ProviderSpecificInput: siterecovery.ReplicationProviderSpecificContainerMappingInput{}, - }, - } - future, err := client.Create(ctx, fabricName, protectionContainerName, name, parameters) - if err != nil { - return fmt.Errorf("Error creating recovery services protection container mapping %s (vault %s): %+v", name, vaultName, err) - } - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error creating recovery services protection container mapping %s (vault %s): %+v", name, vaultName, err) - } - - resp, err := client.Get(ctx, fabricName, protectionContainerName, name) - if err != nil { - return fmt.Errorf("Error retrieving site recovery protection container mapping %s (vault %s): %+v", name, vaultName, err) - } - - d.SetId(azure.HandleAzureSdkForGoBug2824(*resp.ID)) - - return resourceArmRecoveryServicesContainerMappingRead(d, meta) -} - -func resourceArmRecoveryServicesContainerMappingRead(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - fabricName := id.Path["replicationFabrics"] - protectionContainerName := id.Path["replicationProtectionContainers"] - name := id.Path["replicationProtectionContainerMappings"] - - client := meta.(*clients.Client).RecoveryServices.ContainerMappingClient(resGroup, vaultName) - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - resp, err := client.Get(ctx, fabricName, protectionContainerName, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil - } - return fmt.Errorf("Error making Read request on recovery services protection container mapping %s (vault %s): %+v", name, vaultName, err) - } - - d.Set("resource_group_name", resGroup) - d.Set("recovery_vault_name", vaultName) - d.Set("recovery_fabric_name", fabricName) - d.Set("recovery_source_protection_container_name", resp.Properties.SourceProtectionContainerFriendlyName) - d.Set("name", resp.Name) - d.Set("recovery_replication_policy_id", resp.Properties.PolicyID) - d.Set("recovery_target_protection_container_id", resp.Properties.TargetProtectionContainerID) - return nil -} - -func resourceArmRecoveryServicesContainerMappingDelete(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - fabricName := id.Path["replicationFabrics"] - protectionContainerName := id.Path["replicationProtectionContainers"] - name := id.Path["replicationProtectionContainerMappings"] - instanceType := string(siterecovery.InstanceTypeBasicReplicationProviderSpecificContainerMappingInputInstanceTypeA2A) - - client := meta.(*clients.Client).RecoveryServices.ContainerMappingClient(resGroup, vaultName) - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - input := siterecovery.RemoveProtectionContainerMappingInput{ - Properties: &siterecovery.RemoveProtectionContainerMappingInputProperties{ - ProviderSpecificInput: &siterecovery.ReplicationProviderContainerUnmappingInput{ - InstanceType: &instanceType, - }, - }, - } - - future, err := client.Delete(ctx, fabricName, protectionContainerName, name, input) - if err != nil { - return fmt.Errorf("Error deleting recovery services protection container mapping %s (vault %s): %+v", name, vaultName, err) - } - - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for deletion of recovery services protection container mapping %s (vault %s): %+v", name, vaultName, err) - } - - return nil -} diff --git a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_policy_vm.go b/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_policy_vm.go deleted file mode 100644 index 9239c1d793493..0000000000000 --- a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_protection_policy_vm.go +++ /dev/null @@ -1,764 +0,0 @@ -package recoveryservices - -import ( - "context" - "fmt" - "log" - "regexp" - "strings" - "time" - - "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2019-05-13/backup" - "github.com/Azure/go-autorest/autorest/date" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/set" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmRecoveryServicesProtectionPolicyVm() *schema.Resource { - return &schema.Resource{ - DeprecationMessage: "`azurerm_recovery_services_protection_policy_vm` resource is deprecated in favor of `azurerm_backup_policy_vm` and will be removed in v2.0 of the AzureRM Provider", - Create: resourceArmRecoveryServicesProtectionPolicyVmCreateUpdate, - Read: resourceArmRecoveryServicesProtectionPolicyVmRead, - Update: resourceArmRecoveryServicesProtectionPolicyVmCreateUpdate, - Delete: resourceArmRecoveryServicesProtectionPolicyVmDelete, - - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringMatch( - regexp.MustCompile("^[a-zA-Z][-_!a-zA-Z0-9]{2,149}$"), - "Backup Policy name must be 3 - 150 characters long, start with a letter, contain only letters and numbers.", - ), - }, - - "resource_group_name": azure.SchemaResourceGroupName(), - - "recovery_vault_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateRecoveryServicesVaultName, - }, - - "timezone": { - Type: schema.TypeString, - Optional: true, - Default: "UTC", - }, - - "backup": { - Type: schema.TypeList, - MaxItems: 1, - Required: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - - "frequency": { - Type: schema.TypeString, - Required: true, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validation.StringInSlice([]string{ - string(backup.ScheduleRunTypeDaily), - string(backup.ScheduleRunTypeWeekly), - }, true), - }, - - "time": { //applies to all backup schedules & retention times (they all must be the same) - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringMatch( - regexp.MustCompile("^([01][0-9]|[2][0-3]):([03][0])$"), //time must be on the hour or half past - "Time of day must match the format HH:mm where HH is 00-23 and mm is 00 or 30", - ), - }, - - "weekdays": { //only for weekly - Type: schema.TypeSet, - Optional: true, - Set: set.HashStringIgnoreCase, - Elem: &schema.Schema{ - Type: schema.TypeString, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validate.DayOfTheWeek(true), - }, - }, - }, - }, - }, - - "retention_daily": { - Type: schema.TypeList, - MaxItems: 1, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "count": { - Type: schema.TypeInt, - Required: true, - ValidateFunc: validation.IntBetween(1, 9999), - }, - }, - }, - }, - - "retention_weekly": { - Type: schema.TypeList, - MaxItems: 1, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "count": { - Type: schema.TypeInt, - Required: true, - ValidateFunc: validation.IntBetween(1, 9999), - }, - - "weekdays": { - Type: schema.TypeSet, - Required: true, - Set: set.HashStringIgnoreCase, - Elem: &schema.Schema{ - Type: schema.TypeString, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validate.DayOfTheWeek(true), - }, - }, - }, - }, - }, - - "retention_monthly": { - Type: schema.TypeList, - MaxItems: 1, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "count": { - Type: schema.TypeInt, - Required: true, - ValidateFunc: validation.IntBetween(1, 9999), - }, - - "weeks": { - Type: schema.TypeSet, - Required: true, - Set: set.HashStringIgnoreCase, - Elem: &schema.Schema{ - Type: schema.TypeString, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validation.StringInSlice([]string{ - string(backup.WeekOfMonthFirst), - string(backup.WeekOfMonthSecond), - string(backup.WeekOfMonthThird), - string(backup.WeekOfMonthFourth), - string(backup.WeekOfMonthLast), - }, true), - }, - }, - - "weekdays": { - Type: schema.TypeSet, - Required: true, - Set: set.HashStringIgnoreCase, - Elem: &schema.Schema{ - Type: schema.TypeString, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validate.DayOfTheWeek(true), - }, - }, - }, - }, - }, - - "retention_yearly": { - Type: schema.TypeList, - MaxItems: 1, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "count": { - Type: schema.TypeInt, - Required: true, - ValidateFunc: validation.IntBetween(1, 9999), - }, - - "months": { - Type: schema.TypeSet, - Required: true, - Set: set.HashStringIgnoreCase, - Elem: &schema.Schema{ - Type: schema.TypeString, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validate.Month(true), - }, - }, - - "weeks": { - Type: schema.TypeSet, - Required: true, - Set: set.HashStringIgnoreCase, - Elem: &schema.Schema{ - Type: schema.TypeString, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validation.StringInSlice([]string{ - string(backup.WeekOfMonthFirst), - string(backup.WeekOfMonthSecond), - string(backup.WeekOfMonthThird), - string(backup.WeekOfMonthFourth), - string(backup.WeekOfMonthLast), - }, true), - }, - }, - - "weekdays": { - Type: schema.TypeSet, - Required: true, - Set: set.HashStringIgnoreCase, - Elem: &schema.Schema{ - Type: schema.TypeString, - DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validate.DayOfTheWeek(true), - }, - }, - }, - }, - }, - - "tags": tags.Schema(), - }, - - //if daily, we need daily retention - //if weekly daily cannot be set, and we need weekly - CustomizeDiff: func(diff *schema.ResourceDiff, v interface{}) error { - _, hasDaily := diff.GetOk("retention_daily") - _, hasWeekly := diff.GetOk("retention_weekly") - - frequencyI, _ := diff.GetOk("backup.0.frequency") - frequency := strings.ToLower(frequencyI.(string)) - if frequency == "daily" { - if !hasDaily { - return fmt.Errorf("`retention_daily` must be set when backup.0.frequency is daily") - } - - if _, ok := diff.GetOk("backup.0.weekdays"); ok { - return fmt.Errorf("`backup.0.weekdays` should be not set when backup.0.frequency is daily") - } - } else if frequency == "weekly" { - if hasDaily { - return fmt.Errorf("`retention_daily` must be not set when backup.0.frequency is weekly") - } - if !hasWeekly { - return fmt.Errorf("`retention_weekly` must be set when backup.0.frequency is weekly") - } - } else { - return fmt.Errorf("Unrecognized value for backup.0.frequency") - } - - return nil - }, - } -} - -func resourceArmRecoveryServicesProtectionPolicyVmCreateUpdate(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).RecoveryServices.ProtectionPoliciesClient - ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) - defer cancel() - - policyName := d.Get("name").(string) - resourceGroup := d.Get("resource_group_name").(string) - vaultName := d.Get("recovery_vault_name").(string) - t := d.Get("tags").(map[string]interface{}) - - log.Printf("[DEBUG] Creating/updating Recovery Service Protection Policy %s (resource group %q)", policyName, resourceGroup) - - //getting this ready now because its shared between *everything*, time is... complicated for this resource - timeOfDay := d.Get("backup.0.time").(string) - dateOfDay, err := time.Parse(time.RFC3339, fmt.Sprintf("2018-07-30T%s:00Z", timeOfDay)) - if err != nil { - return fmt.Errorf("Error generating time from %q for policy %q (Resource Group %q): %+v", timeOfDay, policyName, resourceGroup, err) - } - times := append(make([]date.Time, 0), date.Time{Time: dateOfDay}) - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err2 := client.Get(ctx, vaultName, resourceGroup, policyName) - if err2 != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing Recovery Service Protection Policy %q (Resource Group %q): %+v", policyName, resourceGroup, err2) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_recovery_services_protection_policy_vm", *existing.ID) - } - } - - policy := backup.ProtectionPolicyResource{ - Tags: tags.Expand(t), - Properties: &backup.AzureIaaSVMProtectionPolicy{ - TimeZone: utils.String(d.Get("timezone").(string)), - BackupManagementType: backup.BackupManagementTypeAzureIaasVM, - SchedulePolicy: expandArmRecoveryServicesProtectionPolicySchedule(d, times), - RetentionPolicy: &backup.LongTermRetentionPolicy{ //SimpleRetentionPolicy only has duration property ¯\_(ツ)_/¯ - RetentionPolicyType: backup.RetentionPolicyTypeLongTermRetentionPolicy, - DailySchedule: expandArmRecoveryServicesProtectionPolicyRetentionDaily(d, times), - WeeklySchedule: expandArmRecoveryServicesProtectionPolicyRetentionWeekly(d, times), - MonthlySchedule: expandArmRecoveryServicesProtectionPolicyRetentionMonthly(d, times), - YearlySchedule: expandArmRecoveryServicesProtectionPolicyRetentionYearly(d, times), - }, - }, - } - if _, err = client.CreateOrUpdate(ctx, vaultName, resourceGroup, policyName, policy); err != nil { - return fmt.Errorf("Error creating/updating Recovery Service Protection Policy %q (Resource Group %q): %+v", policyName, resourceGroup, err) - } - - resp, err := resourceArmRecoveryServicesProtectionPolicyWaitForUpdate(ctx, client, vaultName, resourceGroup, policyName, d) - if err != nil { - return err - } - - id := strings.Replace(*resp.ID, "Subscriptions", "subscriptions", 1) - d.SetId(id) - - return resourceArmRecoveryServicesProtectionPolicyVmRead(d, meta) -} - -func resourceArmRecoveryServicesProtectionPolicyVmRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).RecoveryServices.ProtectionPoliciesClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - policyName := id.Path["backupPolicies"] - vaultName := id.Path["vaults"] - resourceGroup := id.ResourceGroup - - log.Printf("[DEBUG] Reading Recovery Service Protection Policy %q (resource group %q)", policyName, resourceGroup) - - resp, err := client.Get(ctx, vaultName, resourceGroup, policyName) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil - } - - return fmt.Errorf("Error making Read request on Recovery Service Protection Policy %q (Resource Group %q): %+v", policyName, resourceGroup, err) - } - - d.Set("name", policyName) - d.Set("resource_group_name", resourceGroup) - d.Set("recovery_vault_name", vaultName) - - if properties, ok := resp.Properties.AsAzureIaaSVMProtectionPolicy(); ok && properties != nil { - d.Set("timezone", properties.TimeZone) - - if schedule, ok := properties.SchedulePolicy.AsSimpleSchedulePolicy(); ok && schedule != nil { - if err := d.Set("backup", flattenArmRecoveryServicesProtectionPolicySchedule(schedule)); err != nil { - return fmt.Errorf("Error setting `backup`: %+v", err) - } - } - - if retention, ok := properties.RetentionPolicy.AsLongTermRetentionPolicy(); ok && retention != nil { - if s := retention.DailySchedule; s != nil { - if err := d.Set("retention_daily", flattenArmRecoveryServicesProtectionPolicyRetentionDaily(s)); err != nil { - return fmt.Errorf("Error setting `retention_daily`: %+v", err) - } - } else { - d.Set("retention_daily", nil) - } - - if s := retention.WeeklySchedule; s != nil { - if err := d.Set("retention_weekly", flattenArmRecoveryServicesProtectionPolicyRetentionWeekly(s)); err != nil { - return fmt.Errorf("Error setting `retention_weekly`: %+v", err) - } - } else { - d.Set("retention_weekly", nil) - } - - if s := retention.MonthlySchedule; s != nil { - if err := d.Set("retention_monthly", flattenArmRecoveryServicesProtectionPolicyRetentionMonthly(s)); err != nil { - return fmt.Errorf("Error setting `retention_monthly`: %+v", err) - } - } else { - d.Set("retention_monthly", nil) - } - - if s := retention.YearlySchedule; s != nil { - if err := d.Set("retention_yearly", flattenArmRecoveryServicesProtectionPolicyRetentionYearly(s)); err != nil { - return fmt.Errorf("Error setting `retention_yearly`: %+v", err) - } - } else { - d.Set("retention_yearly", nil) - } - } - } - - return tags.FlattenAndSet(d, resp.Tags) -} - -func resourceArmRecoveryServicesProtectionPolicyVmDelete(d *schema.ResourceData, meta interface{}) error { - client := meta.(*clients.Client).RecoveryServices.ProtectionPoliciesClient - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - policyName := id.Path["backupPolicies"] - resourceGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - - log.Printf("[DEBUG] Deleting Recovery Service Protected Item %q (resource group %q)", policyName, resourceGroup) - - resp, err := client.Delete(ctx, vaultName, resourceGroup, policyName) - if err != nil { - if !utils.ResponseWasNotFound(resp) { - return fmt.Errorf("Error issuing delete request for Recovery Service Protection Policy %q (Resource Group %q): %+v", policyName, resourceGroup, err) - } - } - - if _, err := resourceArmRecoveryServicesProtectionPolicyWaitForDeletion(ctx, client, vaultName, resourceGroup, policyName, d); err != nil { - return err - } - - return nil -} - -func expandArmRecoveryServicesProtectionPolicySchedule(d *schema.ResourceData, times []date.Time) *backup.SimpleSchedulePolicy { - if bb, ok := d.Get("backup").([]interface{}); ok && len(bb) > 0 { - block := bb[0].(map[string]interface{}) - - schedule := backup.SimpleSchedulePolicy{ //LongTermSchedulePolicy has no properties - SchedulePolicyType: backup.SchedulePolicyTypeSimpleSchedulePolicy, - ScheduleRunTimes: ×, - } - - if v, ok := block["frequency"].(string); ok { - schedule.ScheduleRunFrequency = backup.ScheduleRunType(v) - } - - if v, ok := block["weekdays"].(*schema.Set); ok { - days := make([]backup.DayOfWeek, 0) - for _, day := range v.List() { - days = append(days, backup.DayOfWeek(day.(string))) - } - schedule.ScheduleRunDays = &days - } - - return &schedule - } - - return nil -} - -func expandArmRecoveryServicesProtectionPolicyRetentionDaily(d *schema.ResourceData, times []date.Time) *backup.DailyRetentionSchedule { - if rb, ok := d.Get("retention_daily").([]interface{}); ok && len(rb) > 0 { - block := rb[0].(map[string]interface{}) - - return &backup.DailyRetentionSchedule{ - RetentionTimes: ×, - RetentionDuration: &backup.RetentionDuration{ - Count: utils.Int32(int32(block["count"].(int))), - DurationType: backup.RetentionDurationTypeDays, - }, - } - } - - return nil -} - -func expandArmRecoveryServicesProtectionPolicyRetentionWeekly(d *schema.ResourceData, times []date.Time) *backup.WeeklyRetentionSchedule { - if rb, ok := d.Get("retention_weekly").([]interface{}); ok && len(rb) > 0 { - block := rb[0].(map[string]interface{}) - - retention := backup.WeeklyRetentionSchedule{ - RetentionTimes: ×, - RetentionDuration: &backup.RetentionDuration{ - Count: utils.Int32(int32(block["count"].(int))), - DurationType: backup.RetentionDurationTypeWeeks, - }, - } - - if v, ok := block["weekdays"].(*schema.Set); ok { - days := make([]backup.DayOfWeek, 0) - for _, day := range v.List() { - days = append(days, backup.DayOfWeek(day.(string))) - } - retention.DaysOfTheWeek = &days - } - - return &retention - } - - return nil -} - -func expandArmRecoveryServicesProtectionPolicyRetentionMonthly(d *schema.ResourceData, times []date.Time) *backup.MonthlyRetentionSchedule { - if rb, ok := d.Get("retention_monthly").([]interface{}); ok && len(rb) > 0 { - block := rb[0].(map[string]interface{}) - - retention := backup.MonthlyRetentionSchedule{ - RetentionScheduleFormatType: backup.RetentionScheduleFormatWeekly, //this is always weekly ¯\_(ツ)_/¯ - RetentionScheduleDaily: nil, //and this is always nil.. - RetentionScheduleWeekly: expandArmRecoveryServicesProtectionPolicyRetentionWeeklyFormat(block), - RetentionTimes: ×, - RetentionDuration: &backup.RetentionDuration{ - Count: utils.Int32(int32(block["count"].(int))), - DurationType: backup.RetentionDurationTypeMonths, - }, - } - - return &retention - } - - return nil -} - -func expandArmRecoveryServicesProtectionPolicyRetentionYearly(d *schema.ResourceData, times []date.Time) *backup.YearlyRetentionSchedule { - if rb, ok := d.Get("retention_yearly").([]interface{}); ok && len(rb) > 0 { - block := rb[0].(map[string]interface{}) - - retention := backup.YearlyRetentionSchedule{ - RetentionScheduleFormatType: backup.RetentionScheduleFormatWeekly, //this is always weekly ¯\_(ツ)_/¯ - RetentionScheduleDaily: nil, //and this is always nil.. - RetentionScheduleWeekly: expandArmRecoveryServicesProtectionPolicyRetentionWeeklyFormat(block), - RetentionTimes: ×, - RetentionDuration: &backup.RetentionDuration{ - Count: utils.Int32(int32(block["count"].(int))), - DurationType: backup.RetentionDurationTypeYears, - }, - } - - if v, ok := block["months"].(*schema.Set); ok { - months := make([]backup.MonthOfYear, 0) - for _, month := range v.List() { - months = append(months, backup.MonthOfYear(month.(string))) - } - retention.MonthsOfYear = &months - } - - return &retention - } - - return nil -} - -func expandArmRecoveryServicesProtectionPolicyRetentionWeeklyFormat(block map[string]interface{}) *backup.WeeklyRetentionFormat { - weekly := backup.WeeklyRetentionFormat{} - - if v, ok := block["weekdays"].(*schema.Set); ok { - days := make([]backup.DayOfWeek, 0) - for _, day := range v.List() { - days = append(days, backup.DayOfWeek(day.(string))) - } - weekly.DaysOfTheWeek = &days - } - - if v, ok := block["weeks"].(*schema.Set); ok { - weeks := make([]backup.WeekOfMonth, 0) - for _, week := range v.List() { - weeks = append(weeks, backup.WeekOfMonth(week.(string))) - } - weekly.WeeksOfTheMonth = &weeks - } - - return &weekly -} - -func flattenArmRecoveryServicesProtectionPolicySchedule(schedule *backup.SimpleSchedulePolicy) []interface{} { - block := map[string]interface{}{} - - block["frequency"] = string(schedule.ScheduleRunFrequency) - - if times := schedule.ScheduleRunTimes; times != nil && len(*times) > 0 { - block["time"] = (*times)[0].Format("15:04") - } - - if days := schedule.ScheduleRunDays; days != nil { - weekdays := make([]interface{}, 0) - for _, d := range *days { - weekdays = append(weekdays, string(d)) - } - block["weekdays"] = schema.NewSet(schema.HashString, weekdays) - } - - return []interface{}{block} -} - -func flattenArmRecoveryServicesProtectionPolicyRetentionDaily(daily *backup.DailyRetentionSchedule) []interface{} { - block := map[string]interface{}{} - - if duration := daily.RetentionDuration; duration != nil { - if v := duration.Count; v != nil { - block["count"] = *v - } - } - - return []interface{}{block} -} - -func flattenArmRecoveryServicesProtectionPolicyRetentionWeekly(weekly *backup.WeeklyRetentionSchedule) []interface{} { - block := map[string]interface{}{} - - if duration := weekly.RetentionDuration; duration != nil { - if v := duration.Count; v != nil { - block["count"] = *v - } - } - - if days := weekly.DaysOfTheWeek; days != nil { - weekdays := make([]interface{}, 0) - for _, d := range *days { - weekdays = append(weekdays, string(d)) - } - block["weekdays"] = schema.NewSet(schema.HashString, weekdays) - } - - return []interface{}{block} -} - -func flattenArmRecoveryServicesProtectionPolicyRetentionMonthly(monthly *backup.MonthlyRetentionSchedule) []interface{} { - block := map[string]interface{}{} - - if duration := monthly.RetentionDuration; duration != nil { - if v := duration.Count; v != nil { - block["count"] = *v - } - } - - if weekly := monthly.RetentionScheduleWeekly; weekly != nil { - block["weekdays"], block["weeks"] = flattenArmRecoveryServicesProtectionPolicyRetentionWeeklyFormat(weekly) - } - - return []interface{}{block} -} - -func flattenArmRecoveryServicesProtectionPolicyRetentionYearly(yearly *backup.YearlyRetentionSchedule) []interface{} { - block := map[string]interface{}{} - - if duration := yearly.RetentionDuration; duration != nil { - if v := duration.Count; v != nil { - block["count"] = *v - } - } - - if weekly := yearly.RetentionScheduleWeekly; weekly != nil { - block["weekdays"], block["weeks"] = flattenArmRecoveryServicesProtectionPolicyRetentionWeeklyFormat(weekly) - } - - if months := yearly.MonthsOfYear; months != nil { - slice := make([]interface{}, 0) - for _, d := range *months { - slice = append(slice, string(d)) - } - block["months"] = schema.NewSet(schema.HashString, slice) - } - - return []interface{}{block} -} - -func flattenArmRecoveryServicesProtectionPolicyRetentionWeeklyFormat(retention *backup.WeeklyRetentionFormat) (weekdays, weeks *schema.Set) { - if days := retention.DaysOfTheWeek; days != nil { - slice := make([]interface{}, 0) - for _, d := range *days { - slice = append(slice, string(d)) - } - weekdays = schema.NewSet(schema.HashString, slice) - } - - if days := retention.WeeksOfTheMonth; days != nil { - slice := make([]interface{}, 0) - for _, d := range *days { - slice = append(slice, string(d)) - } - weeks = schema.NewSet(schema.HashString, slice) - } - - return weekdays, weeks -} - -func resourceArmRecoveryServicesProtectionPolicyWaitForUpdate(ctx context.Context, client *backup.ProtectionPoliciesClient, vaultName, resourceGroup, policyName string, d *schema.ResourceData) (backup.ProtectionPolicyResource, error) { - state := &resource.StateChangeConf{ - MinTimeout: 30 * time.Second, - Delay: 10 * time.Second, - Pending: []string{"NotFound"}, - Target: []string{"Found"}, - Refresh: resourceArmRecoveryServicesProtectionPolicyRefreshFunc(ctx, client, vaultName, resourceGroup, policyName), - } - - if d.IsNewResource() { - state.Timeout = d.Timeout(schema.TimeoutCreate) - } else { - state.Timeout = d.Timeout(schema.TimeoutUpdate) - } - - resp, err := state.WaitForState() - if err != nil { - return resp.(backup.ProtectionPolicyResource), fmt.Errorf("Error waiting for the Recovery Service Protection Policy %q to be true (Resource Group %q) to provision: %+v", policyName, resourceGroup, err) - } - - return resp.(backup.ProtectionPolicyResource), nil -} - -func resourceArmRecoveryServicesProtectionPolicyWaitForDeletion(ctx context.Context, client *backup.ProtectionPoliciesClient, vaultName, resourceGroup, policyName string, d *schema.ResourceData) (backup.ProtectionPolicyResource, error) { - state := &resource.StateChangeConf{ - MinTimeout: 30 * time.Second, - Delay: 10 * time.Second, - Pending: []string{"Found"}, - Target: []string{"NotFound"}, - Refresh: resourceArmRecoveryServicesProtectionPolicyRefreshFunc(ctx, client, vaultName, resourceGroup, policyName), - Timeout: d.Timeout(schema.TimeoutDelete), - } - - resp, err := state.WaitForState() - if err != nil { - return resp.(backup.ProtectionPolicyResource), fmt.Errorf("Error waiting for the Recovery Service Protection Policy %q to be false (Resource Group %q) to provision: %+v", policyName, resourceGroup, err) - } - - return resp.(backup.ProtectionPolicyResource), nil -} - -func resourceArmRecoveryServicesProtectionPolicyRefreshFunc(ctx context.Context, client *backup.ProtectionPoliciesClient, vaultName, resourceGroup, policyName string) resource.StateRefreshFunc { - return func() (interface{}, string, error) { - resp, err := client.Get(ctx, vaultName, resourceGroup, policyName) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - return resp, "NotFound", nil - } - - return resp, "Error", fmt.Errorf("Error making Read request on Recovery Service Protection Policy %q (Resource Group %q): %+v", policyName, resourceGroup, err) - } - - return resp, "Found", nil - } -} diff --git a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_replicated_vm.go b/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_replicated_vm.go deleted file mode 100644 index a93c4937d8d1c..0000000000000 --- a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_replicated_vm.go +++ /dev/null @@ -1,353 +0,0 @@ -package recoveryservices - -import ( - "bytes" - "fmt" - "strings" - "time" - - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute" - "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2018-01-10/siterecovery" - "github.com/hashicorp/terraform-plugin-sdk/helper/hashcode" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmRecoveryServicesReplicatedVm() *schema.Resource { - return &schema.Resource{ - DeprecationMessage: "`azurerm_recovery_replicated_vm` resource is deprecated in favor of `azurerm_site_recovery_replicated_vm` and will be removed in v2.0 of the AzureRM Provider", - Create: resourceArmRecoveryReplicatedItemCreate, - Read: resourceArmRecoveryReplicatedItemRead, - Delete: resourceArmRecoveryReplicatedItemDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(80 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(80 * time.Minute), - Delete: schema.DefaultTimeout(80 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "resource_group_name": azure.SchemaResourceGroupName(), - - "recovery_vault_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateRecoveryServicesVaultName, - }, - "source_recovery_fabric_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "source_vm_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - "target_recovery_fabric_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - "recovery_replication_policy_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - "source_recovery_protection_container_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "target_recovery_protection_container_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - "target_resource_group_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - "target_availability_set_id": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - "managed_disk": { - Type: schema.TypeSet, - ConfigMode: schema.SchemaConfigModeAttr, - Optional: true, - ForceNew: true, - Set: resourceArmRecoveryReplicatedVmDiskHash, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "disk_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - DiffSuppressFunc: suppress.CaseDifference, - }, - "staging_storage_account_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - "target_resource_group_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - DiffSuppressFunc: suppress.CaseDifference, - }, - "target_disk_type": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringInSlice([]string{ - string(compute.StandardLRS), - string(compute.PremiumLRS), - string(compute.StandardSSDLRS), - string(compute.UltraSSDLRS), - }, true), - DiffSuppressFunc: suppress.CaseDifference, - }, - "target_replica_disk_type": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringInSlice([]string{ - string(compute.StandardLRS), - string(compute.PremiumLRS), - string(compute.StandardSSDLRS), - string(compute.UltraSSDLRS), - }, true), - DiffSuppressFunc: suppress.CaseDifference, - }, - }, - }, - }, - }, - } -} - -func resourceArmRecoveryReplicatedItemCreate(d *schema.ResourceData, meta interface{}) error { - name := d.Get("name").(string) - resGroup := d.Get("resource_group_name").(string) - vaultName := d.Get("recovery_vault_name").(string) - fabricName := d.Get("source_recovery_fabric_name").(string) - sourceVmId := d.Get("source_vm_id").(string) - policyId := d.Get("recovery_replication_policy_id").(string) - sourceProtectionContainerName := d.Get("source_recovery_protection_container_name").(string) - targetProtectionContainerId := d.Get("target_recovery_protection_container_id").(string) - targetResourceGroupId := d.Get("target_resource_group_id").(string) - - var targetAvailabilitySetID *string - if id, isSet := d.GetOk("target_availability_set_id"); isSet { - tmp := id.(string) - targetAvailabilitySetID = &tmp - } else { - targetAvailabilitySetID = nil - } - - client := meta.(*clients.Client).RecoveryServices.ReplicationMigrationItemsClient(resGroup, vaultName) - ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) - defer cancel() - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, fabricName, sourceProtectionContainerName, name) - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing recovery services replicated vm %s (vault %s): %+v", name, vaultName, err) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_recovery_replicated_vm", azure.HandleAzureSdkForGoBug2824(*existing.ID)) - } - } - - managedDisks := []siterecovery.A2AVMManagedDiskInputDetails{} - - for _, raw := range d.Get("managed_disk").(*schema.Set).List() { - diskInput := raw.(map[string]interface{}) - diskId := diskInput["disk_id"].(string) - primaryStagingAzureStorageAccountID := diskInput["staging_storage_account_id"].(string) - recoveryResourceGroupId := diskInput["target_resource_group_id"].(string) - targetReplicaDiskType := diskInput["target_replica_disk_type"].(string) - targetDiskType := diskInput["target_disk_type"].(string) - - managedDisks = append(managedDisks, siterecovery.A2AVMManagedDiskInputDetails{ - DiskID: &diskId, - PrimaryStagingAzureStorageAccountID: &primaryStagingAzureStorageAccountID, - RecoveryResourceGroupID: &recoveryResourceGroupId, - RecoveryReplicaDiskAccountType: &targetReplicaDiskType, - RecoveryTargetDiskAccountType: &targetDiskType, - }) - } - - var parameters = siterecovery.EnableProtectionInput{ - Properties: &siterecovery.EnableProtectionInputProperties{ - PolicyID: &policyId, - ProviderSpecificDetails: siterecovery.A2AEnableProtectionInput{ - FabricObjectID: &sourceVmId, - RecoveryContainerID: &targetProtectionContainerId, - RecoveryResourceGroupID: &targetResourceGroupId, - RecoveryAvailabilitySetID: targetAvailabilitySetID, - VMManagedDisks: &managedDisks, - }, - }, - } - future, err := client.Create(ctx, fabricName, sourceProtectionContainerName, name, parameters) - if err != nil { - return fmt.Errorf("Error creating replicated vm %s (vault %s): %+v", name, vaultName, err) - } - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error creating replicated vm %s (vault %s): %+v", name, vaultName, err) - } - - resp, err := client.Get(ctx, fabricName, sourceProtectionContainerName, name) - if err != nil { - return fmt.Errorf("Error retrieving replicated vm %s (vault %s): %+v", name, vaultName, err) - } - - d.SetId(azure.HandleAzureSdkForGoBug2824(*resp.ID)) - - return resourceArmRecoveryReplicatedItemRead(d, meta) -} - -func resourceArmRecoveryReplicatedItemRead(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - fabricName := id.Path["replicationFabrics"] - protectionContainerName := id.Path["replicationProtectionContainers"] - name := id.Path["replicationProtectedItems"] - - client := meta.(*clients.Client).RecoveryServices.ReplicationMigrationItemsClient(resGroup, vaultName) - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - resp, err := client.Get(ctx, fabricName, protectionContainerName, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil - } - return fmt.Errorf("Error making Read request on recovery services replicated vm %s (vault %s): %+v", name, vaultName, err) - } - - d.Set("name", name) - d.Set("resource_group_name", resGroup) - d.Set("recovery_vault_name", vaultName) - d.Set("source_recovery_fabric_name", fabricName) - d.Set("target_recovery_fabric_id", resp.Properties.RecoveryFabricID) - d.Set("recovery_replication_policy_id", resp.Properties.PolicyID) - d.Set("source_recovery_protection_container_name", protectionContainerName) - d.Set("target_recovery_protection_container_id", resp.Properties.RecoveryContainerID) - - if a2aDetails, isA2a := resp.Properties.ProviderSpecificDetails.AsA2AReplicationDetails(); isA2a { - d.Set("source_vm_id", a2aDetails.FabricObjectID) - d.Set("target_resource_group_id", a2aDetails.RecoveryAzureResourceGroupID) - d.Set("target_availability_set_id", a2aDetails.RecoveryAvailabilitySet) - if a2aDetails.ProtectedManagedDisks != nil { - disksOutput := make([]interface{}, 0) - for _, disk := range *a2aDetails.ProtectedManagedDisks { - diskOutput := make(map[string]interface{}) - diskOutput["disk_id"] = *disk.DiskID - diskOutput["staging_storage_account_id"] = *disk.PrimaryStagingAzureStorageAccountID - diskOutput["target_resource_group_id"] = *disk.RecoveryResourceGroupID - diskOutput["target_replica_disk_type"] = *disk.RecoveryReplicaDiskAccountType - diskOutput["target_disk_type"] = *disk.RecoveryTargetDiskAccountType - - disksOutput = append(disksOutput, diskOutput) - } - d.Set("managed_disk", schema.NewSet(resourceArmRecoveryReplicatedVmDiskHash, disksOutput)) - } - } - - return nil -} - -func resourceArmRecoveryReplicatedItemDelete(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - fabricName := id.Path["replicationFabrics"] - protectionContainerName := id.Path["replicationProtectionContainers"] - name := id.Path["replicationProtectedItems"] - - disableProtectionInput := siterecovery.DisableProtectionInput{ - Properties: &siterecovery.DisableProtectionInputProperties{ - DisableProtectionReason: siterecovery.NotSpecified, - ReplicationProviderInput: siterecovery.DisableProtectionProviderSpecificInput{}, - }, - } - - client := meta.(*clients.Client).RecoveryServices.ReplicationMigrationItemsClient(resGroup, vaultName) - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - future, err := client.Delete(ctx, fabricName, protectionContainerName, name, disableProtectionInput) - if err != nil { - return fmt.Errorf("Error deleting recovery services replicated vm %s (vault %s): %+v", name, vaultName, err) - } - - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for deletion of recovery services replicated vm %s (vault %s): %+v", name, vaultName, err) - } - return nil -} - -func resourceArmRecoveryReplicatedVmDiskHash(v interface{}) int { - var buf bytes.Buffer - - if m, ok := v.(map[string]interface{}); ok { - if v, ok := m["disk_id"]; ok { - buf.WriteString(strings.ToLower(v.(string))) - } - } - - return hashcode.String(buf.String()) -} diff --git a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_replication_policy.go b/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_replication_policy.go deleted file mode 100644 index 2288499b6ac5d..0000000000000 --- a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_replication_policy.go +++ /dev/null @@ -1,215 +0,0 @@ -package recoveryservices - -import ( - "fmt" - "time" - - "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2018-01-10/siterecovery" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func resourceArmRecoveryServicesReplicationPolicy() *schema.Resource { - return &schema.Resource{ - DeprecationMessage: "`azurerm_recovery_services_replication_policy` resource is deprecated in favor of `azurerm_site_recovery_replication_policy` and will be removed in v2.0 of the AzureRM Provider", - Create: resourceArmRecoveryServicesReplicationPolicyCreate, - Read: resourceArmRecoveryServicesReplicationPolicyRead, - Update: resourceArmRecoveryServicesReplicationPolicyUpdate, - Delete: resourceArmRecoveryServicesReplicationPolicyDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - "resource_group_name": azure.SchemaResourceGroupName(), - - "recovery_vault_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: azure.ValidateRecoveryServicesVaultName, - }, - "recovery_point_retention_in_minutes": { - Type: schema.TypeInt, - Required: true, - ForceNew: false, - ValidateFunc: validation.IntBetween(1, 365*24*60), - }, - "application_consistent_snapshot_frequency_in_minutes": { - Type: schema.TypeInt, - Required: true, - ForceNew: false, - ValidateFunc: validation.IntBetween(1, 365*24*60), - }, - }, - } -} - -func resourceArmRecoveryServicesReplicationPolicyCreate(d *schema.ResourceData, meta interface{}) error { - resGroup := d.Get("resource_group_name").(string) - vaultName := d.Get("recovery_vault_name").(string) - name := d.Get("name").(string) - - client := meta.(*clients.Client).RecoveryServices.ReplicationPoliciesClient(resGroup, vaultName) - ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) - defer cancel() - - if features.ShouldResourcesBeImported() && d.IsNewResource() { - existing, err := client.Get(ctx, name) - if err != nil { - if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for presence of existing recovery services replication policy %s: %+v", name, err) - } - } - - if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_recovery_services_replication_policy", azure.HandleAzureSdkForGoBug2824(*existing.ID)) - } - } - - 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{ - Properties: &siterecovery.CreatePolicyInputProperties{ - ProviderSpecificInput: &siterecovery.A2APolicyCreationInput{ - RecoveryPointHistory: &recoveryPoint, - AppConsistentFrequencyInMinutes: &appConsitency, - MultiVMSyncStatus: siterecovery.Enable, - InstanceType: siterecovery.InstanceTypeBasicPolicyProviderSpecificInputInstanceTypeA2A, - }, - }, - } - future, err := client.Create(ctx, name, parameters) - if err != nil { - return fmt.Errorf("Error creating recovery services replication policy %s (vault %s): %+v", name, vaultName, err) - } - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error creating recovery services replication policy %s (vault %s): %+v", name, vaultName, err) - } - - resp, err := client.Get(ctx, name) - if err != nil { - return fmt.Errorf("Error retrieving site recovery replication policy %s (vault %s): %+v", name, vaultName, err) - } - - d.SetId(azure.HandleAzureSdkForGoBug2824(*resp.ID)) - - return resourceArmRecoveryServicesReplicationPolicyRead(d, meta) -} - -func resourceArmRecoveryServicesReplicationPolicyUpdate(d *schema.ResourceData, meta interface{}) error { - resGroup := d.Get("resource_group_name").(string) - vaultName := d.Get("recovery_vault_name").(string) - name := d.Get("name").(string) - - client := meta.(*clients.Client).RecoveryServices.ReplicationPoliciesClient(resGroup, vaultName) - ctx, cancel := timeouts.ForUpdate(meta.(*clients.Client).StopContext, d) - defer cancel() - - 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{ - Properties: &siterecovery.UpdatePolicyInputProperties{ - ReplicationProviderSettings: &siterecovery.A2APolicyCreationInput{ - RecoveryPointHistory: &recoveryPoint, - AppConsistentFrequencyInMinutes: &appConsitency, - MultiVMSyncStatus: siterecovery.Enable, - InstanceType: siterecovery.InstanceTypeBasicPolicyProviderSpecificInputInstanceTypeA2A, - }, - }, - } - future, err := client.Update(ctx, name, parameters) - if err != nil { - return fmt.Errorf("Error updating recovery services replication policy %s (vault %s): %+v", name, vaultName, err) - } - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error updating recovery services replication policy %s (vault %s): %+v", name, vaultName, err) - } - - resp, err := client.Get(ctx, name) - if err != nil { - return fmt.Errorf("Error retrieving site recovery replication policy %s (vault %s): %+v", name, vaultName, err) - } - - d.SetId(azure.HandleAzureSdkForGoBug2824(*resp.ID)) - - return resourceArmRecoveryServicesReplicationPolicyRead(d, meta) -} - -func resourceArmRecoveryServicesReplicationPolicyRead(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - name := id.Path["replicationPolicies"] - - client := meta.(*clients.Client).RecoveryServices.ReplicationPoliciesClient(resGroup, vaultName) - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - resp, err := client.Get(ctx, name) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil - } - return fmt.Errorf("Error making Read request on recovery services replication policy %s (vault %s): %+v", name, vaultName, err) - } - - d.Set("name", resp.Name) - d.Set("resource_group_name", resGroup) - d.Set("recovery_vault_name", vaultName) - if a2APolicyDetails, isA2A := resp.Properties.ProviderSpecificDetails.AsA2APolicyDetails(); isA2A { - d.Set("recovery_point_retention_in_minutes", a2APolicyDetails.RecoveryPointHistory) - d.Set("application_consistent_snapshot_frequency_in_minutes", a2APolicyDetails.AppConsistentFrequencyInMinutes) - } - return nil -} - -func resourceArmRecoveryServicesReplicationPolicyDelete(d *schema.ResourceData, meta interface{}) error { - id, err := azure.ParseAzureResourceID(d.Id()) - if err != nil { - return err - } - - resGroup := id.ResourceGroup - vaultName := id.Path["vaults"] - name := id.Path["replicationPolicies"] - - client := meta.(*clients.Client).RecoveryServices.ReplicationPoliciesClient(resGroup, vaultName) - ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) - defer cancel() - - future, err := client.Delete(ctx, name) - if err != nil { - return fmt.Errorf("Error deleting recovery services replication policy %s (vault %s): %+v", name, vaultName, err) - } - - if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for deletion of recovery services replication policy %s (vault %s): %+v", name, vaultName, err) - } - - return nil -} diff --git a/azurerm/internal/services/recoveryservices/resource_arm_site_recovery_protection_container.go b/azurerm/internal/services/recoveryservices/resource_arm_site_recovery_protection_container.go index ec0c32c3bb119..d0497ccd1f718 100644 --- a/azurerm/internal/services/recoveryservices/resource_arm_site_recovery_protection_container.go +++ b/azurerm/internal/services/recoveryservices/resource_arm_site_recovery_protection_container.go @@ -76,7 +76,7 @@ func resourceArmSiteRecoveryProtectionContainerCreate(d *schema.ResourceData, me } if existing.ID != nil && *existing.ID != "" { - return tf.ImportAsExistsError("azurerm_recovery_services_protection_container", azure.HandleAzureSdkForGoBug2824(*existing.ID)) + return tf.ImportAsExistsError("azurerm_site_recovery_protection_container", azure.HandleAzureSdkForGoBug2824(*existing.ID)) } } diff --git a/azurerm/internal/services/recoveryservices/tests/data_source_recovery_services_protection_policy_vm_test.go b/azurerm/internal/services/recoveryservices/tests/data_source_backup_policy_vm_test.go similarity index 53% rename from azurerm/internal/services/recoveryservices/tests/data_source_recovery_services_protection_policy_vm_test.go rename to azurerm/internal/services/recoveryservices/tests/data_source_backup_policy_vm_test.go index 03af8b3759efe..80c6f10272680 100644 --- a/azurerm/internal/services/recoveryservices/tests/data_source_recovery_services_protection_policy_vm_test.go +++ b/azurerm/internal/services/recoveryservices/tests/data_source_backup_policy_vm_test.go @@ -8,17 +8,17 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" ) -func TestAccDataSourceAzureRMRecoveryServicesProtectionPolicyVm_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "data.azurerm_recovery_services_protection_policy_vm", "test") +func TestAccDataSourceAzureRMBackupProtectionPolicyVm_basic(t *testing.T) { + data := acceptance.BuildTestData(t, "data.azurerm_backup_policy_vm", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, Steps: []resource.TestStep{ { - Config: testAccDataSourceRecoveryServicesProtectionPolicyVm_basic(data), + Config: testAccDataSourceBackupPolicyVm_basic(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMRecoveryServicesProtectionPolicyVmExists(data.ResourceName), + testCheckAzureRMBackupProtectionPolicyVmExists(data.ResourceName), resource.TestCheckResourceAttrSet(data.ResourceName, "name"), resource.TestCheckResourceAttrSet(data.ResourceName, "recovery_vault_name"), resource.TestCheckResourceAttrSet(data.ResourceName, "resource_group_name"), @@ -29,14 +29,14 @@ func TestAccDataSourceAzureRMRecoveryServicesProtectionPolicyVm_basic(t *testing }) } -func testAccDataSourceRecoveryServicesProtectionPolicyVm_basic(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data) +func testAccDataSourceBackupPolicyVm_basic(data acceptance.TestData) string { + template := testAccAzureRMBackupProtectionPolicyVM_basicDaily(data) return fmt.Sprintf(` %s -data "azurerm_recovery_services_protection_policy_vm" "test" { - name = "${azurerm_recovery_services_protection_policy_vm.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" +data "azurerm_backup_policy_vm" "test" { + name = "${azurerm_backup_policy_vm.test.name}" + recovery_vault_name = "${azurerm_backup_vault.test.name}" resource_group_name = "${azurerm_resource_group.test.name}" } `, template) diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_fabric_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_fabric_test.go deleted file mode 100644 index c832d65df33a7..0000000000000 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_fabric_test.go +++ /dev/null @@ -1,113 +0,0 @@ -package tests - -import ( - "fmt" - "net/http" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" -) - -func TestAccAzureRMRecoveryFabric_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_fabric", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryFabricDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryFabric_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMRecoveryFabricExists(data.ResourceName), - ), - }, - data.ImportStep(), - }, - }) -} - -func testAccAzureRMRecoveryFabric_basic(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-recovery-%d" - location = "%s" -} - -resource "azurerm_recovery_services_vault" "test" { - name = "acctest-vault-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku = "Standard" - - soft_delete_enabled = false -} - -resource "azurerm_recovery_services_fabric" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "acctest-fabric-%d" - location = "${azurerm_resource_group.test.location}" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) -} - -func testCheckAzureRMRecoveryFabricExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - // Ensure we have enough information in state to look up in API - state, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %s", resourceName) - } - - resourceGroupName := state.Primary.Attributes["resource_group_name"] - vaultName := state.Primary.Attributes["recovery_vault_name"] - fabricName := state.Primary.Attributes["name"] - - // Ensure fabric exists in API - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.FabricClient(resourceGroupName, vaultName) - - resp, err := client.Get(ctx, fabricName) - if err != nil { - return fmt.Errorf("Bad: Get on fabricClient: %+v", err) - } - - if resp.Response.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: fabric: %q does not exist", fabricName) - } - - return nil - } -} - -func testCheckAzureRMRecoveryFabricDestroy(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_recovery_services_fabric" { - continue - } - - resourceGroupName := rs.Primary.Attributes["resource_group_name"] - vaultName := rs.Primary.Attributes["recovery_vault_name"] - resourceGroup := rs.Primary.Attributes["name"] - - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.FabricClient(resourceGroupName, vaultName) - - resp, err := client.Get(ctx, resourceGroup) - if err != nil { - return nil - } - - if resp.StatusCode != http.StatusNotFound { - return fmt.Errorf("Recovery Services Fabric still exists:\n%#v", resp.Properties) - } - } - - return nil -} diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_network_mapping_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_network_mapping_test.go deleted file mode 100644 index fb9148d2e0091..0000000000000 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_network_mapping_test.go +++ /dev/null @@ -1,161 +0,0 @@ -package tests - -import ( - "fmt" - "net/http" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" -) - -func TestAccAzureRMRecoveryNetworkMapping_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_network_mapping", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryNetworkMappingDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryNetworkMapping_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMRecoveryNetworkMappingExists(data.ResourceName), - ), - }, - data.ImportStep(), - }, - }) -} - -func testAccAzureRMRecoveryNetworkMapping_basic(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-recovery-%d-1" - location = "%s" -} - -resource "azurerm_recovery_services_vault" "test" { - name = "acctest-vault-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku = "Standard" - - soft_delete_enabled = false -} - -resource "azurerm_recovery_services_fabric" "test1" { - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "acctest-fabric1-%d" - location = "${azurerm_resource_group.test.location}" -} - -resource "azurerm_recovery_services_fabric" "test2" { - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "acctest-fabric2-%d" - location = "%s" - depends_on = ["azurerm_recovery_services_fabric.test1"] -} - -resource "azurerm_virtual_network" "test1" { - name = "network1-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - address_space = ["192.168.1.0/24"] - location = "${azurerm_recovery_services_fabric.test1.location}" -} - -resource "azurerm_virtual_network" "test2" { - name = "network2-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - address_space = ["192.168.2.0/24"] - location = "${azurerm_recovery_services_fabric.test2.location}" -} - -resource "azurerm_recovery_network_mapping" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "mapping-%d" - source_recovery_fabric_name = "${azurerm_recovery_services_fabric.test1.name}" - target_recovery_fabric_name = "${azurerm_recovery_services_fabric.test2.name}" - source_network_id = "${azurerm_virtual_network.test1.id}" - target_network_id = "${azurerm_virtual_network.test2.id}" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.Locations.Secondary, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - -func testCheckAzureRMRecoveryNetworkMappingExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - // Ensure we have enough information in state to look up in API - state, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %s", resourceName) - } - - resourceGroupName := state.Primary.Attributes["resource_group_name"] - vaultName := state.Primary.Attributes["recovery_vault_name"] - fabricName := state.Primary.Attributes["source_recovery_fabric_name"] - networkId := state.Primary.Attributes["source_network_id"] - mappingName := state.Primary.Attributes["name"] - - id, err := azure.ParseAzureResourceID(networkId) - if err != nil { - return err - } - networkName := id.Path["virtualNetworks"] - - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.NetworkMappingClient(resourceGroupName, vaultName) - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - // TODO Fix Bad: networkMapping error - resp, err := client.Get(ctx, fabricName, networkName, mappingName) - if err != nil { - if resp.Response.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: networkMapping: %q (network %q) does not exist", mappingName, networkName) - } - - return fmt.Errorf("Bad: Get on networkMappingClient: %+v", err) - } - - return nil - } -} - -func testCheckAzureRMRecoveryNetworkMappingDestroy(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_recovery_network_mapping" { - continue - } - - resourceGroupName := rs.Primary.Attributes["resource_group_name"] - vaultName := rs.Primary.Attributes["recovery_vault_name"] - fabricName := rs.Primary.Attributes["source_recovery_fabric_name"] - networkId := rs.Primary.Attributes["source_network_id"] - mappingName := rs.Primary.Attributes["name"] - - id, err := azure.ParseAzureResourceID(networkId) - if err != nil { - return err - } - networkName := id.Path["virtualNetworks"] - - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.NetworkMappingClient(resourceGroupName, vaultName) - - resp, err := client.Get(ctx, fabricName, networkName, mappingName) - if err != nil { - return nil - } - - if resp.StatusCode != http.StatusNotFound { - return fmt.Errorf("Network Mapping still exists:\n%#v", resp.Properties) - } - } - - return nil -} diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protected_vm_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protected_vm_test.go deleted file mode 100644 index 6fcb6c1e6d365..0000000000000 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protected_vm_test.go +++ /dev/null @@ -1,642 +0,0 @@ -package tests - -import ( - "fmt" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func TestAccAzureRMRecoveryServicesProtectedVm_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protected_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectedVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectedVm_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMRecoveryServicesProtectedVmExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "resource_group_name"), - ), - }, - data.ImportStep(), - { //vault cannot be deleted unless we unregister all backups - Config: testAccAzureRMRecoveryServicesProtectedVm_base(data), - Check: resource.ComposeTestCheckFunc(), - }, - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectedVm_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protected_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectedVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectedVm_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMRecoveryServicesProtectedVmExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "resource_group_name"), - ), - }, - data.RequiresImportErrorStep(testAccAzureRMRecoveryServicesProtectedVm_requiresImport), - { //vault cannot be deleted unless we unregister all backups - Config: testAccAzureRMRecoveryServicesProtectedVm_base(data), - Check: resource.ComposeTestCheckFunc(), - }, - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectedVm_separateResourceGroups(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protected_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectedVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectedVm_separateResourceGroups(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMRecoveryServicesProtectedVmExists(data.ResourceName), - resource.TestCheckResourceAttrSet(data.ResourceName, "resource_group_name"), - ), - }, - data.ImportStep(), - { //vault cannot be deleted unless we unregister all backups - Config: testAccAzureRMRecoveryServicesProtectedVm_additionalVault(data), - Check: resource.ComposeTestCheckFunc(), - }, - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectedVm_updateBackupPolicyId(t *testing.T) { - virtualMachine := "azurerm_virtual_machine.test" - fBackupPolicyResourceName := "azurerm_recovery_services_protection_policy_vm.test" - sBackupPolicyResourceName := "azurerm_recovery_services_protection_policy_vm.test_change_backup" - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protected_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectedVmDestroy, - Steps: []resource.TestStep{ - { // Create resources and link first backup policy id - ResourceName: fBackupPolicyResourceName, - Config: testAccAzureRMRecoveryServicesProtectedVm_linkFirstBackupPolicy(data), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttrPair(data.ResourceName, "backup_policy_id", fBackupPolicyResourceName, "id"), - ), - }, - { // Modify backup policy id to the second one - // Set Destroy false to prevent error from cleaning up dangling resource - ResourceName: sBackupPolicyResourceName, - Config: testAccAzureRMRecoveryServicesProtectedVm_linkSecondBackupPolicy(data), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttrPair(data.ResourceName, "backup_policy_id", sBackupPolicyResourceName, "id"), - ), - }, - { // Remove backup policy link - // Backup policy link will need to be removed first so the VM's backup policy subsequently reverts to Default - // Azure API is quite sensitive, adding the step to control resource cleanup order - ResourceName: fBackupPolicyResourceName, - Config: testAccAzureRMRecoveryServicesProtectedVm_withVM(data), - Check: resource.ComposeTestCheckFunc(), - }, - { // Then VM can be removed - ResourceName: virtualMachine, - Config: testAccAzureRMRecoveryServicesProtectedVm_withSecondPolicy(data), - Check: resource.ComposeTestCheckFunc(), - }, - { // Remove backup policies and vault - ResourceName: data.ResourceName, - Config: testAccAzureRMRecoveryServicesProtectedVm_basePolicyTest(data), - Check: resource.ComposeTestCheckFunc(), - }, - }, - }) -} - -func testCheckAzureRMRecoveryServicesProtectedVmDestroy(s *terraform.State) error { - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ProtectedItemsClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_recovery_services_protected_vm" { - continue - } - - resourceGroup := rs.Primary.Attributes["resource_group_name"] - vaultName := rs.Primary.Attributes["recovery_vault_name"] - vmId := rs.Primary.Attributes["source_vm_id"] - - parsedVmId, err := azure.ParseAzureResourceID(vmId) - if err != nil { - return fmt.Errorf("[ERROR] Unable to parse source_vm_id '%s': %+v", vmId, err) - } - vmName, hasName := parsedVmId.Path["virtualMachines"] - if !hasName { - return fmt.Errorf("[ERROR] parsed source_vm_id '%s' doesn't contain 'virtualMachines'", vmId) - } - - protectedItemName := fmt.Sprintf("VM;iaasvmcontainerv2;%s;%s", parsedVmId.ResourceGroup, vmName) - containerName := fmt.Sprintf("iaasvmcontainer;iaasvmcontainerv2;%s;%s", parsedVmId.ResourceGroup, vmName) - - resp, err := client.Get(ctx, vaultName, resourceGroup, "Azure", containerName, protectedItemName, "") - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - return nil - } - - return err - } - - return fmt.Errorf("Recovery Services Protected VM still exists:\n%#v", resp) - } - - return nil -} - -func testCheckAzureRMRecoveryServicesProtectedVmExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ProtectedItemsClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - // Ensure we have enough information in state to look up in API - rs, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %q", resourceName) - } - - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for Recovery Services Protected VM: %q", resourceName) - } - - vaultName := rs.Primary.Attributes["recovery_vault_name"] - vmId := rs.Primary.Attributes["source_vm_id"] - - //get VM name from id - parsedVmId, err := azure.ParseAzureResourceID(vmId) - if err != nil { - return fmt.Errorf("[ERROR] Unable to parse source_vm_id '%s': %+v", vmId, err) - } - vmName, hasName := parsedVmId.Path["virtualMachines"] - if !hasName { - return fmt.Errorf("[ERROR] parsed source_vm_id '%s' doesn't contain 'virtualMachines'", vmId) - } - - protectedItemName := fmt.Sprintf("VM;iaasvmcontainerv2;%s;%s", parsedVmId.ResourceGroup, vmName) - containerName := fmt.Sprintf("iaasvmcontainer;iaasvmcontainerv2;%s;%s", parsedVmId.ResourceGroup, vmName) - - resp, err := client.Get(ctx, vaultName, resourceGroup, "Azure", containerName, protectedItemName, "") - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - return fmt.Errorf("Recovery Services Protected VM %q (resource group: %q) was not found: %+v", protectedItemName, resourceGroup, err) - } - - return fmt.Errorf("Bad: Get on recoveryServicesVaultsClient: %+v", err) - } - - return nil - } -} - -func testAccAzureRMRecoveryServicesProtectedVm_base(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-recovery-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "vnet" - location = "${azurerm_resource_group.test.location}" - address_space = ["10.0.0.0/16"] - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "acctest_subnet" - virtual_network_name = "${azurerm_virtual_network.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - address_prefix = "10.0.10.0/24" -} - -resource "azurerm_network_interface" "test" { - name = "acctest_nic" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "acctestipconfig" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - public_ip_address_id = "${azurerm_public_ip.test.id}" - } -} - -resource "azurerm_public_ip" "test" { - name = "acctest-ip" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - allocation_method = "Dynamic" - domain_name_label = "acctestip%d" -} - -resource "azurerm_storage_account" "test" { - name = "acctest%s" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - account_tier = "Standard" - account_replication_type = "LRS" -} - -resource "azurerm_managed_disk" "test" { - name = "acctest-datadisk" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - storage_account_type = "Standard_LRS" - create_option = "Empty" - disk_size_gb = "1023" -} - -resource "azurerm_virtual_machine" "test" { - name = "acctestvm" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - vm_size = "Standard_A0" - network_interface_ids = ["${azurerm_network_interface.test.id}"] - - storage_image_reference { - publisher = "Canonical" - offer = "UbuntuServer" - sku = "16.04-LTS" - version = "latest" - } - - storage_os_disk { - name = "acctest-osdisk" - managed_disk_type = "Standard_LRS" - caching = "ReadWrite" - create_option = "FromImage" - } - - storage_data_disk { - name = "acctest-datadisk" - managed_disk_id = "${azurerm_managed_disk.test.id}" - managed_disk_type = "Standard_LRS" - disk_size_gb = "${azurerm_managed_disk.test.disk_size_gb}" - create_option = "Attach" - lun = 0 - } - - os_profile { - computer_name = "acctest" - admin_username = "vmadmin" - admin_password = "Password123!@#" - } - - os_profile_linux_config { - disable_password_authentication = false - } - - boot_diagnostics { - enabled = true - storage_uri = "${azurerm_storage_account.test.primary_blob_endpoint}" - } -} - -resource "azurerm_recovery_services_vault" "test" { - name = "acctest-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku = "Standard" - - soft_delete_enabled = false -} - -resource "azurerm_recovery_services_protection_policy_vm" "test" { - name = "acctest-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - - backup { - frequency = "Daily" - time = "23:00" - } - - retention_daily { - count = 10 - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomString, data.RandomInteger, data.RandomInteger) -} - -func testAccAzureRMRecoveryServicesProtectedVm_basic(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectedVm_base(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protected_vm" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - source_vm_id = "${azurerm_virtual_machine.test.id}" - backup_policy_id = "${azurerm_recovery_services_protection_policy_vm.test.id}" -} -`, template) -} - -// For update backup policy id test -func testAccAzureRMRecoveryServicesProtectedVm_basePolicyTest(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-recovery-%d-1" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "vnet" - location = "${azurerm_resource_group.test.location}" - address_space = ["10.0.0.0/16"] - resource_group_name = "${azurerm_resource_group.test.name}" -} - -resource "azurerm_subnet" "test" { - name = "acctest_subnet" - virtual_network_name = "${azurerm_virtual_network.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - address_prefix = "10.0.10.0/24" -} - -resource "azurerm_network_interface" "test" { - name = "acctest_nic" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "acctestipconfig" - subnet_id = "${azurerm_subnet.test.id}" - private_ip_address_allocation = "Dynamic" - public_ip_address_id = "${azurerm_public_ip.test.id}" - } -} - -resource "azurerm_public_ip" "test" { - name = "acctest-ip" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - allocation_method = "Dynamic" - domain_name_label = "acctestip%d" -} - -resource "azurerm_storage_account" "test" { - name = "acctest%s" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - account_tier = "Standard" - account_replication_type = "LRS" -} - -resource "azurerm_managed_disk" "test" { - name = "acctest-datadisk" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - storage_account_type = "Standard_LRS" - create_option = "Empty" - disk_size_gb = "1023" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomString) -} - -// For update backup policy id test -func testAccAzureRMRecoveryServicesProtectedVm_withVault(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectedVm_basePolicyTest(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_vault" "test" { - name = "acctest-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku = "Standard" - - soft_delete_enabled = false -} -`, template, data.RandomInteger) -} - -// For update backup policy id test -func testAccAzureRMRecoveryServicesProtectedVm_withFirstPolicy(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectedVm_withVault(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protection_policy_vm" "test" { - name = "acctest-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - - backup { - frequency = "Daily" - time = "23:00" - } - - retention_daily { - count = 10 - } -} -`, template, data.RandomInteger) -} - -// For update backup policy id test -func testAccAzureRMRecoveryServicesProtectedVm_withSecondPolicy(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectedVm_withFirstPolicy(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protection_policy_vm" "test_change_backup" { - name = "acctest2-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - - backup { - frequency = "Daily" - time = "23:00" - } - - retention_daily { - count = 15 - } -} -`, template, data.RandomInteger) -} - -// For update backup policy id test -func testAccAzureRMRecoveryServicesProtectedVm_withVM(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectedVm_withSecondPolicy(data) - return fmt.Sprintf(` -%s - -resource "azurerm_virtual_machine" "test" { - name = "acctestvm-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - vm_size = "Standard_A0" - network_interface_ids = ["${azurerm_network_interface.test.id}"] - delete_os_disk_on_termination = true - - storage_image_reference { - publisher = "Canonical" - offer = "UbuntuServer" - sku = "16.04-LTS" - version = "latest" - } - - storage_os_disk { - name = "acctest-osdisk" - managed_disk_type = "Standard_LRS" - caching = "ReadWrite" - create_option = "FromImage" - } - - storage_data_disk { - name = "acctest-datadisk" - managed_disk_id = "${azurerm_managed_disk.test.id}" - managed_disk_type = "Standard_LRS" - disk_size_gb = "${azurerm_managed_disk.test.disk_size_gb}" - create_option = "Attach" - lun = 0 - } - - os_profile { - computer_name = "acctest" - admin_username = "vmadmin" - admin_password = "Password123!@#" - } - - os_profile_linux_config { - disable_password_authentication = false - } - - boot_diagnostics { - enabled = true - storage_uri = "${azurerm_storage_account.test.primary_blob_endpoint}" - } -} -`, template, data.RandomInteger) -} - -// For update backup policy id test -func testAccAzureRMRecoveryServicesProtectedVm_linkFirstBackupPolicy(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectedVm_withVM(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protected_vm" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - source_vm_id = "${azurerm_virtual_machine.test.id}" - backup_policy_id = "${azurerm_recovery_services_protection_policy_vm.test.id}" -} -`, template) -} - -// For update backup policy id test -func testAccAzureRMRecoveryServicesProtectedVm_linkSecondBackupPolicy(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectedVm_withVM(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protected_vm" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - source_vm_id = "${azurerm_virtual_machine.test.id}" - backup_policy_id = "${azurerm_recovery_services_protection_policy_vm.test_change_backup.id}" -} -`, template) -} - -func testAccAzureRMRecoveryServicesProtectedVm_requiresImport(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectedVm_basic(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protected_vm" "import" { - resource_group_name = "${azurerm_recovery_services_protected_vm.test.resource_group_name}" - recovery_vault_name = "${azurerm_recovery_services_protected_vm.test.recovery_vault_name}" - source_vm_id = "${azurerm_recovery_services_protected_vm.test.source_vm_id}" - backup_policy_id = "${azurerm_recovery_services_protected_vm.test.backup_policy_id}" -} -`, template) -} - -func testAccAzureRMRecoveryServicesProtectedVm_additionalVault(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectedVm_base(data) - return fmt.Sprintf(` -%s - -resource "azurerm_resource_group" "test2" { - name = "acctestRG-recovery-%d-2" - location = "%s" -} - -resource "azurerm_recovery_services_vault" "test2" { - name = "acctest2-%d" - location = "${azurerm_resource_group.test2.location}" - resource_group_name = "${azurerm_resource_group.test2.name}" - sku = "Standard" - - soft_delete_enabled = false -} - -resource "azurerm_recovery_services_protection_policy_vm" "test2" { - name = "acctest2-%d" - resource_group_name = "${azurerm_resource_group.test2.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test2.name}" - - backup { - frequency = "Daily" - time = "23:00" - } - - retention_daily { - count = 10 - } -} -`, template, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) -} - -func testAccAzureRMRecoveryServicesProtectedVm_separateResourceGroups(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectedVm_additionalVault(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protected_vm" "test" { - resource_group_name = "${azurerm_resource_group.test2.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test2.name}" - backup_policy_id = "${azurerm_recovery_services_protection_policy_vm.test2.id}" - source_vm_id = "${azurerm_virtual_machine.test.id}" -} -`, template) -} diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_container_mapping_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_container_mapping_test.go deleted file mode 100644 index 9bd3f3eabebe8..0000000000000 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_container_mapping_test.go +++ /dev/null @@ -1,158 +0,0 @@ -package tests - -import ( - "fmt" - "net/http" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" -) - -func TestAccAzureRMRecoveryProtectionContainerMapping_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_container_mapping", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryProtectionContainerMappingDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryProtectionContainerMapping_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMRecoveryProtectionContainerMappingExists(data.ResourceName), - ), - }, - data.ImportStep(), - }, - }) -} - -func testAccAzureRMRecoveryProtectionContainerMapping_basic(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test1" { - name = "acctestRG-recovery-%d-1" - location = "%s" -} - -resource "azurerm_recovery_services_vault" "test" { - name = "acctest-vault-%d" - location = "${azurerm_resource_group.test1.location}" - resource_group_name = "${azurerm_resource_group.test1.name}" - sku = "Standard" - - soft_delete_enabled = false -} - -resource "azurerm_recovery_services_fabric" "test1" { - resource_group_name = "${azurerm_resource_group.test1.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "acctest-fabric1-%d" - location = "${azurerm_resource_group.test1.location}" -} - -resource "azurerm_recovery_services_fabric" "test2" { - resource_group_name = "${azurerm_resource_group.test1.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "acctest-fabric2-%d" - location = "%s" - depends_on = ["azurerm_recovery_services_fabric.test1"] -} - -resource "azurerm_recovery_services_protection_container" "test1" { - resource_group_name = "${azurerm_resource_group.test1.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - recovery_fabric_name = "${azurerm_recovery_services_fabric.test1.name}" - name = "acctest-protection-cont1-%d" -} - -resource "azurerm_recovery_services_protection_container" "test2" { - resource_group_name = "${azurerm_resource_group.test1.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - recovery_fabric_name = "${azurerm_recovery_services_fabric.test2.name}" - name = "acctest-protection-cont2-%d" -} - -resource "azurerm_recovery_services_replication_policy" "test" { - resource_group_name = "${azurerm_resource_group.test1.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "acctest-policy-%d" - recovery_point_retention_in_minutes = "${24 * 60}" - application_consistent_snapshot_frequency_in_minutes = "${4 * 60}" -} - -resource "azurerm_recovery_services_protection_container_mapping" "test" { - resource_group_name = "${azurerm_resource_group.test1.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - recovery_fabric_name = "${azurerm_recovery_services_fabric.test1.name}" - recovery_source_protection_container_name = "${azurerm_recovery_services_protection_container.test1.name}" - recovery_target_protection_container_id = "${azurerm_recovery_services_protection_container.test2.id}" - recovery_replication_policy_id = "${azurerm_recovery_services_replication_policy.test.id}" - name = "mapping-%d" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.Locations.Secondary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - -func testCheckAzureRMRecoveryProtectionContainerMappingExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - // Ensure we have enough information in state to look up in API - state, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %s", resourceName) - } - - resourceGroupName := state.Primary.Attributes["resource_group_name"] - vaultName := state.Primary.Attributes["recovery_vault_name"] - fabricName := state.Primary.Attributes["recovery_fabric_name"] - protectionContainerName := state.Primary.Attributes["recovery_source_protection_container_name"] - mappingName := state.Primary.Attributes["name"] - - // Ensure mapping exists in API - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ContainerMappingClient(resourceGroupName, vaultName) - - resp, err := client.Get(ctx, fabricName, protectionContainerName, mappingName) - if err != nil { - return fmt.Errorf("Bad: Get on fabricClient: %+v", err) - } - - if resp.Response.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: fabric: %q does not exist", fabricName) - } - - return nil - } -} - -func testCheckAzureRMRecoveryProtectionContainerMappingDestroy(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_recovery_services_protection_container_mapping" { - continue - } - - resourceGroupName := rs.Primary.Attributes["resource_group_name"] - vaultName := rs.Primary.Attributes["recovery_vault_name"] - fabricName := rs.Primary.Attributes["recovery_fabric_name"] - protectionContainerName := rs.Primary.Attributes["recovery_source_protection_container_name"] - mappingName := rs.Primary.Attributes["name"] - - // Ensure mapping exists in API - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ContainerMappingClient(resourceGroupName, vaultName) - - resp, err := client.Get(ctx, fabricName, protectionContainerName, mappingName) - if err != nil { - return nil - } - - if resp.StatusCode != http.StatusNotFound { - return fmt.Errorf("Container Mapping still exists:\n%#v", resp.Properties) - } - } - - return nil -} diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_container_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_container_test.go deleted file mode 100644 index 28144fd3ae13d..0000000000000 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_container_test.go +++ /dev/null @@ -1,121 +0,0 @@ -package tests - -import ( - "fmt" - "net/http" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" -) - -func TestAccAzureRMRecoveryProtectionContainer_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_container", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryProtectionContainerDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryProtectionContainer_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMRecoveryProtectionContainerExists(data.ResourceName), - ), - }, - data.ImportStep(), - }, - }) -} - -func testAccAzureRMRecoveryProtectionContainer_basic(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-recovery-%d" - location = "%s" -} - -resource "azurerm_recovery_services_vault" "test" { - name = "acctest-vault-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku = "Standard" - - soft_delete_enabled = false -} - -resource "azurerm_recovery_services_fabric" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "acctest-fabric-%d" - location = "${azurerm_resource_group.test.location}" -} - -resource "azurerm_recovery_services_protection_container" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - recovery_fabric_name = "${azurerm_recovery_services_fabric.test.name}" - name = "acctest-protection-cont-%d" -} - -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - -func testCheckAzureRMRecoveryProtectionContainerExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - state, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %s", resourceName) - } - - resourceGroupName := state.Primary.Attributes["resource_group_name"] - vaultName := state.Primary.Attributes["recovery_vault_name"] - fabricName := state.Primary.Attributes["recovery_fabric_name"] - protectionContainerName := state.Primary.Attributes["name"] - - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ProtectionContainerClient(resourceGroupName, vaultName) - - resp, err := client.Get(ctx, fabricName, protectionContainerName) - if err != nil { - return fmt.Errorf("Bad: Get on RecoveryServices.ProtectionContainerClient: %+v", err) - } - - if resp.Response.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: Protection Container: %q does not exist", fabricName) - } - - return nil - } -} - -func testCheckAzureRMRecoveryProtectionContainerDestroy(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_recovery_services_protection_container" { - continue - } - - resourceGroupName := rs.Primary.Attributes["resource_group_name"] - vaultName := rs.Primary.Attributes["recovery_vault_name"] - fabricName := rs.Primary.Attributes["recovery_fabric_name"] - protectionContainerName := rs.Primary.Attributes["name"] - - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ProtectionContainerClient(resourceGroupName, vaultName) - - resp, err := client.Get(ctx, fabricName, protectionContainerName) - if err != nil { - return nil - } - - if resp.StatusCode != http.StatusNotFound { - return fmt.Errorf("Protection Container Client still exists:\n%#v", resp.Properties) - } - } - - return nil -} diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_policy_vm_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_policy_vm_test.go deleted file mode 100644 index 06811f24f7233..0000000000000 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_protection_policy_vm_test.go +++ /dev/null @@ -1,555 +0,0 @@ -package tests - -import ( - "fmt" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" -) - -func TestAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_policy_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectionPolicyVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data.ResourceName, data.RandomInteger), - }, - data.ImportStep(), - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectionPolicyVm_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_policy_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectionPolicyVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data.ResourceName, data.RandomInteger), - }, - data.RequiresImportErrorStep(testAccAzureRMRecoveryServicesProtectionPolicyVm_requiresImport), - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectionPolicyVm_basicWeekly(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_policy_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectionPolicyVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_basicWeekly(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_basicWeekly(data.ResourceName, data.RandomInteger), - }, - data.ImportStep(), - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectionPolicyVm_completeDaily(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_policy_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectionPolicyVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_completeDaily(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_completeDaily(data.ResourceName, data.RandomInteger), - }, - data.ImportStep(), - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeekly(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_policy_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectionPolicyVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeekly(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeekly(data.ResourceName, data.RandomInteger), - }, - data.ImportStep(), - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectionPolicyVm_updateDaily(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_policy_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectionPolicyVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data.ResourceName, data.RandomInteger), - }, - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_completeDaily(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_completeDaily(data.ResourceName, data.RandomInteger), - }, - data.ImportStep(), - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectionPolicyVm_updateWeekly(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_policy_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectionPolicyVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_basicWeekly(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_basicWeekly(data.ResourceName, data.RandomInteger), - }, - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeekly(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeekly(data.ResourceName, data.RandomInteger), - }, - data.ImportStep(), - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectionPolicyVm_updateDailyToWeekly(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_policy_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectionPolicyVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data.ResourceName, data.RandomInteger), - }, - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_basicWeekly(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_basicWeekly(data.ResourceName, data.RandomInteger), - }, - data.ImportStep(), - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectionPolicyVm_updateWeeklyToDaily(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_policy_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectionPolicyVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_basicWeekly(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_basicWeekly(data.ResourceName, data.RandomInteger), - }, - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data.ResourceName, data.RandomInteger), - }, - data.ImportStep(), - }, - }) -} - -func TestAccAzureRMRecoveryServicesProtectionPolicyVm_updateWeeklyToPartial(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_protection_policy_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryServicesProtectionPolicyVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeekly(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeekly(data.ResourceName, data.RandomInteger), - }, - { - Config: testAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeeklyPartial(data), - Check: checkAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeeklyPartial(data.ResourceName, data.RandomInteger), - }, - data.ImportStep(), - }, - }) -} - -func testCheckAzureRMRecoveryServicesProtectionPolicyVmDestroy(s *terraform.State) error { - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ProtectionPoliciesClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_recovery_services_protection_policy_vm" { - continue - } - - resourceGroup := rs.Primary.Attributes["resource_group_name"] - vaultName := rs.Primary.Attributes["recovery_vault_name"] - policyName := rs.Primary.Attributes["name"] - - resp, err := client.Get(ctx, vaultName, resourceGroup, policyName) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - return nil - } - - return err - } - - return fmt.Errorf("Recovery Services Vault Policy still exists:\n%#v", resp) - } - - return nil -} - -func testCheckAzureRMRecoveryServicesProtectionPolicyVmExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ProtectionPoliciesClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - // Ensure we have enough information in state to look up in API - rs, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %q", resourceName) - } - - vaultName := rs.Primary.Attributes["recovery_vault_name"] - policyName := rs.Primary.Attributes["name"] - resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] - if !hasResourceGroup { - return fmt.Errorf("Bad: no resource group found in state for Recovery Services Vault %q Policy: %q", vaultName, policyName) - } - - resp, err := client.Get(ctx, vaultName, resourceGroup, policyName) - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - return fmt.Errorf("Recovery Services Vault Policy %q (resource group: %q) was not found: %+v", policyName, resourceGroup, err) - } - - return fmt.Errorf("Bad: Get on recoveryServicesVaultsClient: %+v", err) - } - - return nil - } -} - -func testAccAzureRMRecoveryServicesProtectionPolicyVm_base(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%[1]d" - location = "%[2]s" -} - -resource "azurerm_recovery_services_vault" "test" { - name = "acctest-%[1]d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku = "Standard" - - soft_delete_enabled = false -} -`, data.RandomInteger, data.Locations.Primary) -} - -func testAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectionPolicyVm_base(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protection_policy_vm" "test" { - name = "acctest-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - - backup { - frequency = "Daily" - time = "23:00" - } - - retention_daily { - count = 10 - } -} -`, template, data.RandomInteger) -} - -func testAccAzureRMRecoveryServicesProtectionPolicyVm_requiresImport(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protection_policy_vm" "import" { - name = "${azurerm_recovery_services_protection_policy_vm.test.name}" - resource_group_name = "${azurerm_recovery_services_protection_policy_vm.test.resource_group_name}" - recovery_vault_name = "${azurerm_recovery_services_protection_policy_vm.test.recovery_vault_name}" - - backup { - frequency = "Daily" - time = "23:00" - } - - retention_daily { - count = 10 - } -} -`, template) -} - -func checkAccAzureRMRecoveryServicesProtectionPolicyVm_basicDaily(resourceName string, ri int) resource.TestCheckFunc { - return resource.ComposeAggregateTestCheckFunc( - testCheckAzureRMRecoveryServicesProtectionPolicyVmExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("acctest-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "resource_group_name", fmt.Sprintf("acctestRG-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "recovery_vault_name", fmt.Sprintf("acctest-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "backup.0.frequency", "Daily"), - resource.TestCheckResourceAttr(resourceName, "backup.0.time", "23:00"), - resource.TestCheckResourceAttr(resourceName, "retention_daily.0.count", "10"), - ) -} - -func testAccAzureRMRecoveryServicesProtectionPolicyVm_basicWeekly(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectionPolicyVm_base(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protection_policy_vm" "test" { - name = "acctest-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - - backup { - frequency = "Weekly" - time = "23:00" - weekdays = ["Sunday", "Wednesday"] - } - - retention_weekly { - count = 42 - weekdays = ["Sunday", "Wednesday"] - } -} -`, template, data.RandomInteger) -} - -func checkAccAzureRMRecoveryServicesProtectionPolicyVm_basicWeekly(resourceName string, ri int) resource.TestCheckFunc { - return resource.ComposeAggregateTestCheckFunc( - testCheckAzureRMRecoveryServicesProtectionPolicyVmExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("acctest-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "resource_group_name", fmt.Sprintf("acctestRG-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "recovery_vault_name", fmt.Sprintf("acctest-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "backup.0.frequency", "Weekly"), - resource.TestCheckResourceAttr(resourceName, "backup.0.time", "23:00"), - resource.TestCheckResourceAttr(resourceName, "retention_weekly.0.count", "42"), - resource.TestCheckResourceAttr(resourceName, "retention_weekly.0.weekdays.#", "2"), - ) -} - -func testAccAzureRMRecoveryServicesProtectionPolicyVm_completeDaily(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectionPolicyVm_base(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protection_policy_vm" "test" { - name = "acctest-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - - backup { - frequency = "Daily" - time = "23:00" - } - - retention_daily { - count = 10 - } - - retention_weekly { - count = 42 - weekdays = ["Sunday", "Wednesday"] - } - - retention_monthly { - count = 7 - weekdays = ["Sunday", "Wednesday"] - weeks = ["First", "Last"] - } - - retention_yearly { - count = 77 - weekdays = ["Sunday", "Wednesday"] - weeks = ["First", "Last"] - months = ["January", "July"] - } -} -`, template, data.RandomInteger) -} - -func checkAccAzureRMRecoveryServicesProtectionPolicyVm_completeDaily(resourceName string, ri int) resource.TestCheckFunc { - return resource.ComposeAggregateTestCheckFunc( - testCheckAzureRMRecoveryServicesProtectionPolicyVmExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("acctest-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "resource_group_name", fmt.Sprintf("acctestRG-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "recovery_vault_name", fmt.Sprintf("acctest-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "backup.0.frequency", "Daily"), - resource.TestCheckResourceAttr(resourceName, "backup.0.time", "23:00"), - resource.TestCheckResourceAttr(resourceName, "retention_daily.0.count", "10"), - resource.TestCheckResourceAttr(resourceName, "retention_weekly.0.count", "42"), - resource.TestCheckResourceAttr(resourceName, "retention_weekly.0.weekdays.#", "2"), - resource.TestCheckResourceAttr(resourceName, "retention_monthly.0.count", "7"), - resource.TestCheckResourceAttr(resourceName, "retention_monthly.0.weekdays.#", "2"), - resource.TestCheckResourceAttr(resourceName, "retention_monthly.0.weeks.#", "2"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.count", "77"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.weekdays.#", "2"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.weeks.#", "2"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.months.#", "2"), - ) -} - -func testAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeekly(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectionPolicyVm_base(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protection_policy_vm" "test" { - name = "acctest-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - - backup { - frequency = "Weekly" - time = "23:00" - weekdays = ["Sunday", "Wednesday", "Friday", "Saturday"] - } - - retention_weekly { - count = 42 - weekdays = ["Sunday", "Wednesday", "Friday", "Saturday"] - } - - retention_monthly { - count = 7 - weekdays = ["Sunday", "Wednesday", "Friday", "Saturday"] - weeks = ["First", "Last"] - } - - retention_yearly { - count = 77 - weekdays = ["Sunday", "Wednesday", "Friday", "Saturday"] - weeks = ["First", "Last"] - months = ["January", "July"] - } -} -`, template, data.RandomInteger) -} - -func checkAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeekly(resourceName string, ri int) resource.TestCheckFunc { - return resource.ComposeAggregateTestCheckFunc( - testCheckAzureRMRecoveryServicesProtectionPolicyVmExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("acctest-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "resource_group_name", fmt.Sprintf("acctestRG-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "recovery_vault_name", fmt.Sprintf("acctest-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "backup.0.frequency", "Weekly"), - resource.TestCheckResourceAttr(resourceName, "backup.0.time", "23:00"), - resource.TestCheckResourceAttr(resourceName, "backup.0.weekdays.#", "4"), - resource.TestCheckResourceAttr(resourceName, "retention_weekly.0.count", "42"), - resource.TestCheckResourceAttr(resourceName, "retention_weekly.0.weekdays.#", "4"), - resource.TestCheckResourceAttr(resourceName, "retention_monthly.0.count", "7"), - resource.TestCheckResourceAttr(resourceName, "retention_monthly.0.weekdays.#", "4"), - resource.TestCheckResourceAttr(resourceName, "retention_monthly.0.weeks.#", "2"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.count", "77"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.weekdays.#", "4"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.weeks.#", "2"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.months.#", "2"), - ) -} - -func testAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeeklyPartial(data acceptance.TestData) string { - template := testAccAzureRMRecoveryServicesProtectionPolicyVm_base(data) - return fmt.Sprintf(` -%s - -resource "azurerm_recovery_services_protection_policy_vm" "test" { - name = "acctest-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - - backup { - frequency = "Weekly" - time = "23:00" - weekdays = ["Sunday", "Wednesday", "Friday", "Saturday"] - } - - retention_weekly { - count = 42 - weekdays = ["Sunday", "Wednesday", "Friday"] - } - - retention_monthly { - count = 7 - weekdays = ["Sunday", "Wednesday"] - weeks = ["First", "Last"] - } - - retention_yearly { - count = 77 - weekdays = ["Sunday"] - weeks = ["Last"] - months = ["January"] - } -} -`, template, data.RandomInteger) -} - -func checkAccAzureRMRecoveryServicesProtectionPolicyVm_completeWeeklyPartial(resourceName string, ri int) resource.TestCheckFunc { - return resource.ComposeAggregateTestCheckFunc( - testCheckAzureRMRecoveryServicesProtectionPolicyVmExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("acctest-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "resource_group_name", fmt.Sprintf("acctestRG-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "recovery_vault_name", fmt.Sprintf("acctest-%d", ri)), - resource.TestCheckResourceAttr(resourceName, "backup.0.frequency", "Weekly"), - resource.TestCheckResourceAttr(resourceName, "backup.0.time", "23:00"), - resource.TestCheckResourceAttr(resourceName, "backup.0.weekdays.#", "4"), - resource.TestCheckResourceAttr(resourceName, "retention_weekly.0.count", "42"), - resource.TestCheckResourceAttr(resourceName, "retention_weekly.0.weekdays.#", "3"), - resource.TestCheckResourceAttr(resourceName, "retention_monthly.0.count", "7"), - resource.TestCheckResourceAttr(resourceName, "retention_monthly.0.weekdays.#", "2"), - resource.TestCheckResourceAttr(resourceName, "retention_monthly.0.weeks.#", "2"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.count", "77"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.weekdays.#", "1"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.weeks.#", "1"), - resource.TestCheckResourceAttr(resourceName, "retention_yearly.0.months.#", "1"), - ) -} diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_replicated_vm_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_replicated_vm_test.go deleted file mode 100644 index ed035ebfd46ee..0000000000000 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_replicated_vm_test.go +++ /dev/null @@ -1,269 +0,0 @@ -package tests - -import ( - "fmt" - "net/http" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" -) - -func TestAccAzureRMRecoveryReplicatedVm_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_replicated_vm", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryReplicatedVmDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryReplicatedVm_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMRecoveryReplicatedVmExists(data.ResourceName), - ), - }, - data.ImportStep(), - }, - }) -} - -func testAccAzureRMRecoveryReplicatedVm_basic(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-recovery-%d-1" - location = "%s" -} - -resource "azurerm_resource_group" "test2" { - name = "acctestRG-recovery-%d-2" - location = "%s" -} - -resource "azurerm_recovery_services_vault" "test" { - name = "acctest-vault-%d" - location = "${azurerm_resource_group.test2.location}" - resource_group_name = "${azurerm_resource_group.test2.name}" - sku = "Standard" - - soft_delete_enabled = false -} - -resource "azurerm_recovery_services_fabric" "test1" { - resource_group_name = "${azurerm_resource_group.test2.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "acctest-fabric1-%d" - location = "${azurerm_resource_group.test.location}" -} - -resource "azurerm_recovery_services_fabric" "test2" { - resource_group_name = "${azurerm_resource_group.test2.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "acctest-fabric2-%d" - location = "${azurerm_resource_group.test2.location}" - depends_on = ["azurerm_recovery_services_fabric.test1"] -} - -resource "azurerm_recovery_services_protection_container" "test1" { - resource_group_name = "${azurerm_resource_group.test2.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - recovery_fabric_name = "${azurerm_recovery_services_fabric.test1.name}" - name = "acctest-protection-cont1-%d" -} - -resource "azurerm_recovery_services_protection_container" "test2" { - resource_group_name = "${azurerm_resource_group.test2.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - recovery_fabric_name = "${azurerm_recovery_services_fabric.test2.name}" - name = "acctest-protection-cont2-%d" -} - -resource "azurerm_recovery_services_replication_policy" "test" { - resource_group_name = "${azurerm_resource_group.test2.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "acctest-policy-%d" - recovery_point_retention_in_minutes = "${24 * 60}" - application_consistent_snapshot_frequency_in_minutes = "${4 * 60}" -} - -resource "azurerm_recovery_services_protection_container_mapping" "test" { - resource_group_name = "${azurerm_resource_group.test2.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - recovery_fabric_name = "${azurerm_recovery_services_fabric.test1.name}" - recovery_source_protection_container_name = "${azurerm_recovery_services_protection_container.test1.name}" - recovery_target_protection_container_id = "${azurerm_recovery_services_protection_container.test2.id}" - recovery_replication_policy_id = "${azurerm_recovery_services_replication_policy.test.id}" - name = "mapping-%d" -} - -resource "azurerm_virtual_network" "test1" { - name = "net-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - address_space = ["192.168.1.0/24"] - location = "${azurerm_recovery_services_fabric.test1.location}" -} -resource "azurerm_subnet" "test1" { - name = "snet-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - virtual_network_name = "${azurerm_virtual_network.test1.name}" - address_prefix = "192.168.1.0/24" -} - - -resource "azurerm_virtual_network" "test2" { - name = "net-%d" - resource_group_name = "${azurerm_resource_group.test2.name}" - address_space = ["192.168.2.0/24"] - location = "${azurerm_recovery_services_fabric.test2.location}" -} - -resource "azurerm_recovery_network_mapping" "test" { - resource_group_name = "${azurerm_resource_group.test2.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "mapping-%d" - source_recovery_fabric_name = "${azurerm_recovery_services_fabric.test1.name}" - target_recovery_fabric_name = "${azurerm_recovery_services_fabric.test2.name}" - source_network_id = "${azurerm_virtual_network.test1.id}" - target_network_id = "${azurerm_virtual_network.test2.id}" -} - -resource "azurerm_network_interface" "test" { - name = "vm-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - ip_configuration { - name = "vm-%d" - subnet_id = "${azurerm_subnet.test1.id}" - private_ip_address_allocation = "Dynamic" - } -} - -resource "azurerm_virtual_machine" "test" { - name = "vm-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - vm_size = "Standard_B1s" - - storage_image_reference { - publisher = "OpenLogic" - offer = "CentOS" - sku = "7.5" - version = "latest" - } - - storage_os_disk { - name = "disk-%d" - os_type = "Linux" - caching = "ReadWrite" - create_option = "FromImage" - managed_disk_type = "Premium_LRS" - } - - os_profile { - admin_username = "testadmin" - admin_password = "Password1234!" - computer_name = "vm-%d" - } - - os_profile_linux_config { - disable_password_authentication = false - - } - network_interface_ids = ["${azurerm_network_interface.test.id}"] -} - -resource "azurerm_storage_account" "test" { - name = "acct%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - account_tier = "Standard" - account_replication_type = "LRS" -} - -resource "azurerm_recovery_replicated_vm" "test" { - name = "repl-%d" - resource_group_name = "${azurerm_resource_group.test2.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - source_vm_id = "${azurerm_virtual_machine.test.id}" - source_recovery_fabric_name = "${azurerm_recovery_services_fabric.test1.name}" - recovery_replication_policy_id = "${azurerm_recovery_services_replication_policy.test.id}" - source_recovery_protection_container_name = "${azurerm_recovery_services_protection_container.test1.name}" - - target_resource_group_id = "${azurerm_resource_group.test2.id}" - target_recovery_fabric_id = "${azurerm_recovery_services_fabric.test2.id}" - target_recovery_protection_container_id = "${azurerm_recovery_services_protection_container.test2.id}" - - managed_disk { - disk_id = "${azurerm_virtual_machine.test.storage_os_disk.0.managed_disk_id}" - staging_storage_account_id = "${azurerm_storage_account.test.id}" - target_resource_group_id = "${azurerm_resource_group.test2.id}" - target_disk_type = "Premium_LRS" - target_replica_disk_type = "Premium_LRS" - } - depends_on = ["azurerm_recovery_services_protection_container_mapping.test", "azurerm_recovery_network_mapping.test"] -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.Locations.Secondary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) -} - -func testCheckAzureRMRecoveryReplicatedVmExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - state, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %s", resourceName) - } - - resourceGroupName := state.Primary.Attributes["resource_group_name"] - vaultName := state.Primary.Attributes["recovery_vault_name"] - fabricName := state.Primary.Attributes["source_recovery_fabric_name"] - protectionContainerName := state.Primary.Attributes["source_recovery_protection_container_name"] - replicationName := state.Primary.Attributes["name"] - - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ReplicationMigrationItemsClient(resourceGroupName, vaultName) - - resp, err := client.Get(ctx, fabricName, protectionContainerName, replicationName) - if err != nil { - return fmt.Errorf("Bad: Get on RecoveryServices.ReplicationMigrationItemsClient: %+v", err) - } - - if resp.Response.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: Recovery Services Replicated VM: %q does not exist", fabricName) - } - - return nil - } -} - -func testCheckAzureRMRecoveryReplicatedVmDestroy(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_recovery_replicated_vm" { - continue - } - - resourceGroupName := rs.Primary.Attributes["resource_group_name"] - vaultName := rs.Primary.Attributes["recovery_vault_name"] - fabricName := rs.Primary.Attributes["source_recovery_fabric_name"] - protectionContainerName := rs.Primary.Attributes["source_recovery_protection_container_name"] - replicationName := rs.Primary.Attributes["name"] - - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ReplicationMigrationItemsClient(resourceGroupName, vaultName) - - resp, err := client.Get(ctx, fabricName, protectionContainerName, replicationName) - if err != nil { - return nil - } - - if resp.StatusCode != http.StatusNotFound { - return fmt.Errorf("Recovery Services Replicated VM still exists:\n%#v", resp.Properties) - } - } - - return nil -} diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_replication_policy_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_replication_policy_test.go deleted file mode 100644 index a414f13e7aa17..0000000000000 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_replication_policy_test.go +++ /dev/null @@ -1,113 +0,0 @@ -package tests - -import ( - "fmt" - "net/http" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" -) - -func TestAccAzureRMRecoveryReplicationPolicy_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_recovery_services_replication_policy", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMRecoveryReplicationPolicyDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMRecoveryReplicationPolicy_basic(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMRecoveryReplicationPolicyExists(data.ResourceName), - ), - }, - data.ImportStep(), - }, - }) -} - -func testAccAzureRMRecoveryReplicationPolicy_basic(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-recovery-%d" - location = "%s" -} - -resource "azurerm_recovery_services_vault" "test" { - name = "acctest-vault-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - sku = "Standard" - - soft_delete_enabled = false -} - -resource "azurerm_recovery_services_replication_policy" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.test.name}" - name = "acctest-policy-%d" - recovery_point_retention_in_minutes = "${24 * 60}" - application_consistent_snapshot_frequency_in_minutes = "${4 * 60}" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) -} - -func testCheckAzureRMRecoveryReplicationPolicyExists(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - // Ensure we have enough information in state to look up in API - state, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("Not found: %s", resourceName) - } - - resourceGroupName := state.Primary.Attributes["resource_group_name"] - vaultName := state.Primary.Attributes["recovery_vault_name"] - policyName := state.Primary.Attributes["name"] - - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ReplicationPoliciesClient(resourceGroupName, vaultName) - - resp, err := client.Get(ctx, policyName) - if err != nil { - return fmt.Errorf("Bad: Get on RecoveryServices.ReplicationPoliciesClient: %+v", err) - } - - if resp.Response.StatusCode == http.StatusNotFound { - return fmt.Errorf("Bad: Replication Policies: %q does not exist", policyName) - } - - return nil - } -} - -func testCheckAzureRMRecoveryReplicationPolicyDestroy(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_recovery_services_replication_policy" { - continue - } - - resourceGroup := rs.Primary.Attributes["resource_group_name"] - vaultName := rs.Primary.Attributes["recovery_vault_name"] - policyName := rs.Primary.Attributes["name"] - - client := acceptance.AzureProvider.Meta().(*clients.Client).RecoveryServices.ReplicationPoliciesClient(resourceGroup, vaultName) - - resp, err := client.Get(ctx, policyName) - if err != nil { - return nil - } - - if resp.StatusCode != http.StatusNotFound { - return fmt.Errorf("Replication Policy still exists:\n%#v", resp.Properties) - } - } - - return nil -} diff --git a/examples/vm-scale-set/virtual_machine_scale_set/autoscale/main.tf b/examples/vm-scale-set/virtual_machine_scale_set/autoscale/main.tf index d68d242e8cad8..4e73608e82ff2 100644 --- a/examples/vm-scale-set/virtual_machine_scale_set/autoscale/main.tf +++ b/examples/vm-scale-set/virtual_machine_scale_set/autoscale/main.tf @@ -69,7 +69,7 @@ resource "azurerm_virtual_machine_scale_set" "example" { } } -resource "azurerm_autoscale_setting" "example" { +resource "azurerm_monitor_autoscale_setting" "example" { name = "autoscale-cpu" target_resource_id = "${azurerm_virtual_machine_scale_set.example.id}" location = "${azurerm_resource_group.example.location}" diff --git a/website/azurerm.erb b/website/azurerm.erb index 13e50d7b10782..8b0465af594bf 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -123,19 +123,19 @@
    • - azurerm_batch_account + azurerm_backup_protection_policy_vm
    • - azurerm_batch_certificate + azurerm_batch_account
    • - azurerm_batch_pool + azurerm_batch_certificate
    • - azurerm_builtin_role_definition + azurerm_batch_pool
    • @@ -378,10 +378,6 @@ azurerm_private_endpoint_connection
      • -
    • - azurerm_private_link_endpoint_connection -
      • -
    • azurerm_private_link_service
      • @@ -406,10 +402,6 @@ azurerm_recovery_services_vault -
    • - azurerm_recovery_services_protection_policy_vm -
      • -
    • azurerm_redis_cache
      • @@ -1678,10 +1670,6 @@
    • Monitor Resources
      • @@ -1727,22 +1708,10 @@ azurerm_application_security_group -
    • - azurerm_connection_monitor -
      • -
    • azurerm_bastion_host
      • -
    • - azurerm_network_connection_monitor -
      • - -
    • - azurerm_ddos_protection_plan -
      • -
    • azurerm_network_ddos_protection_plan
      • @@ -1851,10 +1820,6 @@ azurerm_private_endpoint -
    • - azurerm_private_link_endpoint -
      • -
    • azurerm_public_ip
      • @@ -2014,38 +1979,10 @@
    • Recovery Services
        -
      • - azurerm_recovery_network_mapping -
        • - -
      • - azurerm_recovery_services_fabric -
        • - -
      • - azurerm_recovery_services_protection_container -
        • - -
      • - azurerm_recovery_services_protection_container_mapping -
        • - -
      • - azurerm_recovery_services_protection_policy_vm -
        • - -
      • - azurerm_recovery_services_protected_vm -
        • -
      • azurerm_recovery_services_replicated_vm
        • -
      • - azurerm_recovery_services_replication_policy -
        • -
      • azurerm_recovery_services_vault
        • diff --git a/website/docs/d/recovery_services_protection_policy_vm.markdown b/website/docs/d/backup_policy_vm.markdown similarity index 62% rename from website/docs/d/recovery_services_protection_policy_vm.markdown rename to website/docs/d/backup_policy_vm.markdown index 18c5dce3909ce..b3bd03f66a17e 100644 --- a/website/docs/d/recovery_services_protection_policy_vm.markdown +++ b/website/docs/d/backup_policy_vm.markdown @@ -1,19 +1,19 @@ --- subcategory: "Recovery Services" layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_recovery_services_protection_policy_vm" +page_title: "Azure Resource Manager: azurerm_backup_policy_vm" description: |- - Gets information about an existing Recovery Services VM Protection Policy. + Gets information about an existing Backup VM Protection Policy. --- -# Data Source: azurerm_recovery_services_protection_policy_vm +# Data Source: azurerm_backup_protection_policy_vm -Use this data source to access information about an existing Recovery Services VM Protection Policy. +Use this data source to access information about an existing Backup VM Protection Policy. ## Example Usage ```hcl -data "azurerm_recovery_services_protection_policy_vm" "policy" { +data "azurerm_backup_protection_policy_vm" "policy" { name = "policy" recovery_vault_name = "recovery_vault" resource_group_name = "resource_group" @@ -24,7 +24,7 @@ data "azurerm_recovery_services_protection_policy_vm" "policy" { The following arguments are supported: -* `name` - Specifies the name of the Recovery Services VM Protection Policy. +* `name` - Specifies the name of the Backup VM Protection Policy. * `recovery_vault_name` - Specifies the name of the Recovery Services Vault. @@ -34,7 +34,7 @@ The following arguments are supported: The following attributes are exported: -* `id` - The ID of the Recovery Services VM Protection Policy. +* `id` - The ID of the Backup VM Protection Policy. * `tags` - A mapping of tags assigned to the resource. diff --git a/website/docs/d/builtin_role_definition.markdown b/website/docs/d/builtin_role_definition.markdown deleted file mode 100644 index 9e489a1822846..0000000000000 --- a/website/docs/d/builtin_role_definition.markdown +++ /dev/null @@ -1,51 +0,0 @@ ---- -subcategory: "Authorization" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_builtin_role_definition" -description: |- - Get information about an existing built-in Role Definition. ---- - -# Data Source: azurerm_builtin_role_definition - -Use this data source to access information about a built-in Role Definition. To access information about a custom Role Definition, [please see the `azurerm_role_definition` data source](role_definition.html) instead. - -~> **Note:** The this datasource has been deprecated in favour of `azurerm_role_definition` that now can look up role definitions by name. As such this data source will be removed in version 2.0 of the AzureRM Provider. - -## Example Usage - -```hcl -data "azurerm_builtin_role_definition" "contributor" { - name = "Contributor" -} - -output "contributor_role_definition_id" { - value = data.azurerm_builtin_role_definition.contributor.id -} -``` - -## Argument Reference - -* `name` - Specifies the name of the built-in Role Definition. Possible values are: `Contributor`, `Owner`, `Reader` and `VirtualMachineContributor`. - - -## Attributes Reference - -* `id` - the ID of the built-in Role Definition. -* `description` - the Description of the built-in Role. -* `type` - the Type of the Role. -* `permissions` - a `permissions` block as documented below. -* `assignable_scopes` - One or more assignable scopes for this Role Definition, such as `/subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333`, `/subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup`, or `/subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup/providers/Microsoft.Compute/virtualMachines/myVM`. - -A `permissions` block contains: - -* `actions` - a list of actions supported by this role -* `data_actions` - a list of data actions supported by this role -* `not_actions` - a list of actions which are denied by this role -* `not_data_actions` - a list of data actions which are denied by this role - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `read` - (Defaults to 5 minutes) Used when retrieving the Role Definition. diff --git a/website/docs/d/private_link_endpoint_connection.html.markdown b/website/docs/d/private_link_endpoint_connection.html.markdown deleted file mode 100644 index 727a46bb79de2..0000000000000 --- a/website/docs/d/private_link_endpoint_connection.html.markdown +++ /dev/null @@ -1,61 +0,0 @@ ---- -subcategory: "Network" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_private_link_endpoint_connection" -description: |- - Gets the connection status information about an existing Private Link Endpoint ---- --> **NOTE:** The 'azurerm_private_link_endpoint_connection' resource is being deprecated in favour of the renamed version 'azurerm_private_endpoint_connection'. -Information on migrating to the renamed resource can be found here: https://terraform.io/docs/providers/azurerm/guides/migrating-between-renamed-resources.html -As such the existing 'azurerm_private_link_endpoint_connection' resource is deprecated and will be removed in the next major version of the AzureRM Provider (2.0). - -# Data Source: azurerm_private_link_endpoint_connection - -Use this data source to access the connection status information about an existing Private Link Endpoint. - --> **NOTE** Private Link is currently in Public Preview. - -## Example Usage - -```hcl -data "azurerm_private_link_endpoint_connection" "example" { - name = "example-private-endpoint" - resource_group_name = "example-rg" -} - -output "private_link_endpoint_status" { - value = data.azurerm_private_link_endpoint_connection.example.private_service_connection.0.status -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - Specifies the Name of the private link endpoint. -* `resource_group_name` - Specifies the Name of the Resource Group within which the private link endpoint exists. - -## Attributes Reference - -The following attributes are exported: - -* `id` - The Azure resource ID of the Private Link Endpoint. -* `location` - The supported Azure location where the resource exists. - -A `private_service_connection` block exports the following: - -* `name` - The name of the Private Link endpoint. -* `status` - The current status of the Private Link endpoint request, possible values will be `Pending`, `Approved`, `Rejected`, or `Disconnected`. -* `private_ip_address` - The private IP address associated with the private link endpoint, note that you will have a private IP address assigned to the private link endpoint even if the connection request was `Rejected`. -* `request_response` - Possible values are as follows: - Value | Meaning - -- | -- - `Auto-Approved` | The remote resource owner has added you to the `Auto-Approved` RBAC permission list for the remote resource, all private link endpoint connection requests will be automatically `Approved`. - `Deleted state` | The resource owner has `Rejected` the private link endpoint connection request and has removed your private link endpoint request from the remote resource. - `request/response message` | If you submitted a manual private link endpoint connection request, while in the `Pending` status the `request_response` will display the same text from your `request_message` in the `private_service_connection` block above. If the private link endpoint connection request was `Rejected` by the owner of the remote resource, the text for the rejection will be displayed as the `request_response` text, if the private link endpoint connection request was `Approved` by the owner of the remote resource, the text for the approval will be displayed as the `request_response` text - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `read` - (Defaults to 5 minutes) Used when retrieving the Private Link Endpoint. diff --git a/website/docs/d/role_definition.html.markdown b/website/docs/d/role_definition.html.markdown index a272c15061609..36877a4f2c3b4 100644 --- a/website/docs/d/role_definition.html.markdown +++ b/website/docs/d/role_definition.html.markdown @@ -33,7 +33,7 @@ data "azurerm_role_definition" "custom-byname" { scope = data.azurerm_subscription.primary.id } -data "azurerm_builtin_role_definition" "builtin" { +data "azurerm_role_definition" "builtin" { name = "Contributor" } diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index 026dc51329dc2..8bd3a18cfe703 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -436,6 +436,16 @@ The `sku_name` field is now case sensitive. The deprecated `sku` block has been replaced by the `sku_name` field and will be removed. +### Resource: `azurerm_metric_alertrule` + +The `azurerm_metric_alertrule` resource will be deprecated in favour of the resource: `azurerm_monitor_metric_alert`. + + +### Resource: `azurerm_monitor_metric_alertrule` + +The `azurerm_monitor_metric_alertrule` resource will be deprecated in favour of the resource: `azurerm_monitor_metric_alert`. + + ### Resource: `azurerm_mysql_server` The deprecated `sku` block has been replaced by the `sku_name` field and will be removed. diff --git a/website/docs/guides/managed_service_identity.html.markdown b/website/docs/guides/managed_service_identity.html.markdown index 6840a990786c8..569735cf5c044 100644 --- a/website/docs/guides/managed_service_identity.html.markdown +++ b/website/docs/guides/managed_service_identity.html.markdown @@ -51,14 +51,14 @@ resource "azurerm_virtual_machine" "example" { } } -data "azurerm_builtin_role_definition" "contributor" { +data "azurerm_role_definition" "contributor" { name = "Contributor" } resource "azurerm_role_assignment" "example" { name = azurerm_virtual_machine.example.name scope = data.azurerm_subscription.primary.id - role_definition_id = "${data.azurerm_subscription.subscription.id}${data.azurerm_builtin_role_definition.contributor.id}" + role_definition_id = "${data.azurerm_subscription.subscription.id}${data.azurerm_role_definition.contributor.id}" principal_id = azurerm_virtual_machine.example.identity[0]["principal_id"] } ``` diff --git a/website/docs/r/autoscale_setting.html.markdown b/website/docs/r/autoscale_setting.html.markdown deleted file mode 100644 index ed0e29547d581..0000000000000 --- a/website/docs/r/autoscale_setting.html.markdown +++ /dev/null @@ -1,421 +0,0 @@ ---- -subcategory: "Monitor" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_autoscale_setting" -description: |- - Manages an AutoScale Setting which can be applied to Virtual Machine Scale Sets, App Services and other scalable resources. ---- - -# azurerm_autoscale_setting - -Manages an AutoScale Setting which can be applied to Virtual Machine Scale Sets, App Services and other scalable resources. - -~> **NOTE:** This resource has been deprecated in favour of the `azurerm_monitor_autoscale_setting` resource and will be removed in the next major version of the AzureRM Provider. The new resource shares the same fields as this one, and information on migrating across [can be found in this guide](../guides/migrating-between-renamed-resources.html). - -## Example Usage - -```hcl -resource "azurerm_resource_group" "example" { - name = "autoscalingTest" - location = "West US" -} - -resource "azurerm_virtual_machine_scale_set" "example" { - # ... -} - -resource "azurerm_autoscale_setting" "example" { - name = "myAutoscaleSetting" - resource_group_name = azurerm_resource_group.example.name - location = azurerm_resource_group.example.location - target_resource_id = azurerm_virtual_machine_scale_set.example.id - - profile { - name = "defaultProfile" - - capacity { - default = 1 - minimum = 1 - maximum = 10 - } - - rule { - metric_trigger { - metric_name = "Percentage CPU" - metric_resource_id = azurerm_virtual_machine_scale_set.example.id - time_grain = "PT1M" - statistic = "Average" - time_window = "PT5M" - time_aggregation = "Average" - operator = "GreaterThan" - threshold = 75 - } - - scale_action { - direction = "Increase" - type = "ChangeCount" - value = "1" - cooldown = "PT1M" - } - } - - rule { - metric_trigger { - metric_name = "Percentage CPU" - metric_resource_id = azurerm_virtual_machine_scale_set.example.id - time_grain = "PT1M" - statistic = "Average" - time_window = "PT5M" - time_aggregation = "Average" - operator = "LessThan" - threshold = 25 - } - - scale_action { - direction = "Decrease" - type = "ChangeCount" - value = "1" - cooldown = "PT1M" - } - } - } - - notification { - email { - send_to_subscription_administrator = true - send_to_subscription_co_administrator = true - custom_emails = ["admin@contoso.com"] - } - } -} -``` - -## Example Usage (repeating on weekends) - -```hcl -resource "azurerm_resource_group" "example" { - name = "autoscalingTest" - location = "West US" -} - -resource "azurerm_virtual_machine_scale_set" "example" { - # ... -} - -resource "azurerm_autoscale_setting" "example" { - name = "myAutoscaleSetting" - resource_group_name = "${azurerm_resource_group.example.name}" - location = "${azurerm_resource_group.example.location}" - target_resource_id = "${azurerm_virtual_machine_scale_set.example.id}" - - profile { - name = "Weekends" - - capacity { - default = 1 - minimum = 1 - maximum = 10 - } - - rule { - metric_trigger { - metric_name = "Percentage CPU" - metric_resource_id = "${azurerm_virtual_machine_scale_set.example.id}" - time_grain = "PT1M" - statistic = "Average" - time_window = "PT5M" - time_aggregation = "Average" - operator = "GreaterThan" - threshold = 90 - } - - scale_action { - direction = "Increase" - type = "ChangeCount" - value = "2" - cooldown = "PT1M" - } - } - - rule { - metric_trigger { - metric_name = "Percentage CPU" - metric_resource_id = "${azurerm_virtual_machine_scale_set.example.id}" - time_grain = "PT1M" - statistic = "Average" - time_window = "PT5M" - time_aggregation = "Average" - operator = "LessThan" - threshold = 10 - } - - scale_action { - direction = "Decrease" - type = "ChangeCount" - value = "2" - cooldown = "PT1M" - } - } - - recurrence { - frequency = "Week" - timezone = "Pacific Standard Time" - days = ["Saturday", "Sunday"] - hours = [12] - minutes = [0] - } - } - - notification { - email { - send_to_subscription_administrator = true - send_to_subscription_co_administrator = true - custom_emails = ["admin@contoso.com"] - } - } -} -``` - -## Example Usage (for fixed dates) - -```hcl -resource "azurerm_resource_group" "example" { - name = "autoscalingTest" - location = "West US" -} - -resource "azurerm_virtual_machine_scale_set" "example" { - # ... -} - -resource "azurerm_autoscale_setting" "example" { - name = "myAutoscaleSetting" - enabled = true - resource_group_name = azurerm_resource_group.example.name - location = azurerm_resource_group.example.location - target_resource_id = azurerm_virtual_machine_scale_set.example.id - - profile { - name = "forJuly" - - capacity { - default = 1 - minimum = 1 - maximum = 10 - } - - rule { - metric_trigger { - metric_name = "Percentage CPU" - metric_resource_id = azurerm_virtual_machine_scale_set.example.id - time_grain = "PT1M" - statistic = "Average" - time_window = "PT5M" - time_aggregation = "Average" - operator = "GreaterThan" - threshold = 90 - } - - scale_action { - direction = "Increase" - type = "ChangeCount" - value = "2" - cooldown = "PT1M" - } - } - - rule { - metric_trigger { - metric_name = "Percentage CPU" - metric_resource_id = azurerm_virtual_machine_scale_set.example.id - time_grain = "PT1M" - statistic = "Average" - time_window = "PT5M" - time_aggregation = "Average" - operator = "LessThan" - threshold = 10 - } - - scale_action { - direction = "Decrease" - type = "ChangeCount" - value = "2" - cooldown = "PT1M" - } - } - - fixed_date { - timezone = "Pacific Standard Time" - start = "2020-07-01T00:00:00Z" - end = "2020-07-31T23:59:59Z" - } - } - - notification { - email { - send_to_subscription_administrator = true - send_to_subscription_co_administrator = true - custom_emails = ["admin@contoso.com"] - } - } -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required) The name of the AutoScale Setting. Changing this forces a new resource to be created. - -* `resource_group_name` - (Required) The name of the Resource Group in the AutoScale Setting should be created. Changing this forces a new resource to be created. - -* `location` - (Required) Specifies the supported Azure location where the AutoScale Setting should exist. Changing this forces a new resource to be created. - -* `profile` - (Required) Specifies one or more (up to 20) `profile` blocks as defined below. - -* `target_resource_id` - (Required) Specifies the resource ID of the resource that the autoscale setting should be added to. - -* `enabled` - (Optional) Specifies whether automatic scaling is enabled for the target resource. Defaults to `true`. - -* `notification` - (Optional) Specifies a `notification` block as defined below. - -* `tags` - (Optional) A mapping of tags to assign to the resource. - ---- - -A `profile` block supports the following: - -* `name` - (Required) Specifies the name of the profile. - -* `capacity` - (Required) A `capacity` block as defined below. - -* `rule` - (Required) One or more (up to 10) `rule` blocks as defined below. - -* `fixed_date` - (Optional) A `fixed_date` block as defined below. This cannot be specified if a `recurrence` block is specified. - -* `recurrence` - (Optional) A `recurrence` block as defined below. This cannot be specified if a `fixed_date` block is specified. - ---- - -A `capacity` block supports the following: - -* `default` - (Required) The number of instances that are available for scaling if metrics are not available for evaluation. The default is only used if the current instance count is lower than the default. Valid values are between `0` and `1000`. - -* `maximum` - (Required) The maximum number of instances for this resource. Valid values are between `0` and `1000`. - --> **NOTE:** The maximum number of instances is also limited by the amount of Cores available in the subscription. - -* `minimum` - (Required) The minimum number of instances for this resource. Valid values are between `0` and `1000`. - ---- - -A `rule` block supports the following: - -* `metric_trigger` - (Required) A `metric_trigger` block as defined below. - -* `scale_action` - (Required) A `scale_action` block as defined below. - ---- - -A `metric_trigger` block supports the following: - -* `metric_name` - (Required) The name of the metric that defines what the rule monitors, such as `Percentage CPU` for `Virtual Machine Scale Sets` and `CpuPercentage` for `App Service Plan`. - --> **NOTE:** The allowed value of `metric_name` highly depends on the targeting resource type, please visit [Supported metrics with Azure Monitor](https://docs.microsoft.com/en-us/azure/azure-monitor/platform/metrics-supported) for more details. - -* `metric_resource_id` - (Required) The ID of the Resource which the Rule monitors. - -* `operator` - (Required) Specifies the operator used to compare the metric data and threshold. Possible values are: `Equals`, `NotEquals`, `GreaterThan`, `GreaterThanOrEqual`, `LessThan`, `LessThanOrEqual`. - -* `statistic` - (Required) Specifies how the metrics from multiple instances are combined. Possible values are `Average`, `Min` and `Max`. - -* `time_aggregation` - (Required) Specifies how the data that's collected should be combined over time. Possible values include `Average`, `Count`, `Maximum`, `Minimum`, `Last` and `Total`. Defaults to `Average`. - -* `time_grain` - (Required) Specifies the granularity of metrics that the rule monitors, which must be one of the pre-defined values returned from the metric definitions for the metric. This value must be between 1 minute and 12 hours an be formatted as an ISO 8601 string. - -* `time_window` - (Required) Specifies the time range for which data is collected, which must be greater than the delay in metric collection (which varies from resource to resource). This value must be between 5 minutes and 12 hours and be formatted as an ISO 8601 string. - -* `threshold` - (Required) Specifies the threshold of the metric that triggers the scale action. - ---- - -A `scale_action` block supports the following: - -* `cooldown` - (Required) The amount of time to wait since the last scaling action before this action occurs. Must be between 1 minute and 1 week and formatted as a ISO 8601 string. - -* `direction` - (Required) The scale direction. Possible values are `Increase` and `Decrease`. - -* `type` - (Required) The type of action that should occur. Possible values are `ChangeCount`, `ExactCount` and `PercentChangeCount`. - -* `value` - (Required) The number of instances involved in the scaling action. Defaults to `1`. - ---- - -A `fixed_date` block supports the following: - -* `end` - (Required) Specifies the end date for the profile, formatted as an RFC3339 date string. - -* `start` - (Required) Specifies the start date for the profile, formatted as an RFC3339 date string. - -* `timezone` (Optional) The Time Zone of the `start` and `end` times. A list of [possible values can be found here](https://msdn.microsoft.com/en-us/library/azure/dn931928.aspx). Defaults to `UTC`. - ---- - -A `recurrence` block supports the following: - -* `timezone` - (Required) The Time Zone used for the `hours` field. A list of [possible values can be found here](https://msdn.microsoft.com/en-us/library/azure/dn931928.aspx). Defaults to `UTC`. - -* `days` - (Required) A list of days that this profile takes effect on. Possible values include `Monday`, `Tuesday`, `Wednesday`, `Thursday`, `Friday`, `Saturday` and `Sunday`. - -* `hours` - (Required) A list containing a single item, which specifies the Hour interval at which this recurrence should be triggered (in 24-hour time). Possible values are from `0` to `23`. - -* `minutes` - (Required) A list containing a single item which specifies the Minute interval at which this recurrence should be triggered. - ---- - -A `notification` block supports the following: - -* `email` - (Required) A `email` block as defined below. - -* `webhook` - (Optional) One or more `webhook` blocks as defined below. - ---- - -A `email` block supports the following: - -* `send_to_subscription_administrator` - (Optional) Should email notifications be sent to the subscription administrator? Defaults to `false`. - -* `send_to_subscription_co_administrator` - (Optional) Should email notifications be sent to the subscription co-administrator? Defaults to `false`. - -* `custom_emails` - (Optional) Specifies a list of custom email addresses to which the email notifications will be sent. - ---- - -A `webhook` block supports the following: - -* `service_uri` - (Required) The HTTPS URI which should receive scale notifications. - -* `properties` - (Optional) A map of settings. - -## Attributes Reference - -The following attributes are exported: - -* `id` - The ID of the AutoScale Setting. - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `create` - (Defaults to 30 minutes) Used when creating the AutoScale Setting. -* `update` - (Defaults to 30 minutes) Used when updating the AutoScale Setting. -* `read` - (Defaults to 5 minutes) Used when retrieving the AutoScale Setting. -* `delete` - (Defaults to 30 minutes) Used when deleting the AutoScale Setting. - -## Import - -AutoScale Setting can be imported using the `resource id`, e.g. - -``` -terraform import azurerm_autoscale_setting.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/microsoft.insights/autoscalesettings/setting1 -``` diff --git a/website/docs/r/connection_monitor.html.markdown b/website/docs/r/connection_monitor.html.markdown deleted file mode 100644 index 88a8f8739f541..0000000000000 --- a/website/docs/r/connection_monitor.html.markdown +++ /dev/null @@ -1,181 +0,0 @@ ---- -subcategory: "Network" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_connection_monitor" -description: |- - Configures a Connection Monitor to monitor communication between a Virtual Machine and an endpoint using a Network Watcher. - ---- - -# azurerm_connection_monitor - -Configures a Connection Monitor to monitor communication between a Virtual Machine and an endpoint using a Network Watcher. - -~> **NOTE:** This resource has been deprecated in favour of the `azurerm_network_connection_monitor` resource and will be removed in the next major version of the AzureRM Provider. The new resource shares the same fields as this one, and information on migrating across [can be found in this guide](../guides/migrating-between-renamed-resources.html). - -## Example Usage - -```hcl -resource "azurerm_resource_group" "example" { - name = "connection-monitor-rg" - location = "West US" -} - -resource "azurerm_network_watcher" "example" { - name = "network-watcher" - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name -} - -resource "azurerm_virtual_network" "example" { - name = "production-network" - address_space = ["10.0.0.0/16"] - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name -} - -resource "azurerm_subnet" "example" { - name = "internal" - resource_group_name = azurerm_resource_group.example.name - virtual_network_name = azurerm_virtual_network.example.name - address_prefix = "10.0.2.0/24" -} - -resource "azurerm_network_interface" "example" { - name = "cmtest-nic" - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name - - ip_configuration { - name = "testconfiguration1" - subnet_id = azurerm_subnet.example.id - private_ip_address_allocation = "Dynamic" - } -} - -resource "azurerm_virtual_machine" "example" { - name = "cmtest-vm" - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name - network_interface_ids = [azurerm_network_interface.example.id] - vm_size = "Standard_F2" - - storage_image_reference { - publisher = "Canonical" - offer = "UbuntuServer" - sku = "16.04-LTS" - version = "latest" - } - - storage_os_disk { - name = "osdisk" - caching = "ReadWrite" - create_option = "FromImage" - managed_disk_type = "Standard_LRS" - } - - os_profile { - computer_name = "cmtest-vm" - admin_username = "testadmin" - admin_password = "Password1234!" - } - - os_profile_linux_config { - disable_password_authentication = false - } -} - -resource "azurerm_virtual_machine_extension" "example" { - name = "cmtest-vm-network-watcher" - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name - virtual_machine_name = azurerm_virtual_machine.example.name - publisher = "Microsoft.Azure.NetworkWatcher" - type = "NetworkWatcherAgentLinux" - type_handler_version = "1.4" - auto_upgrade_minor_version = true -} - -resource "azurerm_connection_monitor" "example" { - name = "cmtest-connectionmonitor" - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name - network_watcher_name = azurerm_network_watcher.example.name - - source { - virtual_machine_id = azurerm_virtual_machine.example.id - } - - destination { - address = "terraform.io" - port = 80 - } - - depends_on = [azurerm_virtual_machine_extension.example] -} -``` - -~> **NOTE:** This Resource requires that [the Network Watcher Agent Virtual Machine Extension](https://docs.microsoft.com/en-us/azure/network-watcher/connection-monitor) is installed on the Virtual Machine before monitoring can be started. The extension can be installed via [the `azurerm_virtual_machine_extension` resource](virtual_machine_extension.html). - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required) The name of the Connection Monitor. Changing this forces a new resource to be created. - -* `network_watcher_name` - (Required) The name of the Network Watcher. Changing this forces a new resource to be created. - -* `resource_group_name` - (Required) The name of the resource group in which to create the Connection Monitor. Changing this forces a new resource to be created. - -* `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. - -* `auto_start` - (Optional) Specifies whether the connection monitor will start automatically once created. Defaults to `true`. Changing this forces a new resource to be created. - -* `interval_in_seconds` - (Optional) Monitoring interval in seconds. Defaults to `60`. - -* `source` - (Required) A `source` block as defined below. - -* `destination` - (Required) A `destination` block as defined below. - -* `tags` - (Optional) A mapping of tags to assign to the resource. - ---- - -A `source` block contains: - -* `virtual_machine_id` - (Required) The ID of the Virtual Machine to monitor connectivity from. - -* `port` - (Optional) The port on the Virtual Machine to monitor connectivity from. Defaults to `0` (Dynamic Port Assignment). - -A `destination` block contains: - -* `virtual_machine_id` - (Optional) The ID of the Virtual Machine to monitor connectivity to. - -* `address` - (Optional) IP address or domain name to monitor connectivity to. - -* `port` - (Required) The port on the destination to monitor connectivity to. - -~> **NOTE:** One of `virtual_machine_id` or `address` must be specified. - -## Attributes Reference - -The following attributes are exported: - -* `id` - The ID of the Connection Monitor. - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `create` - (Defaults to 30 minutes) Used when creating the Connection Monitor. -* `update` - (Defaults to 30 minutes) Used when updating the Connection Monitor. -* `read` - (Defaults to 5 minutes) Used when retrieving the Connection Monitor. -* `delete` - (Defaults to 30 minutes) Used when deleting the Connection Monitor. - -## Import - -Connection Monitors can be imported using the `resource id`, e.g. - -```shell -terraform import azurerm_connection_monitor.monitor1 /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.Network/networkWatchers/watcher1/connectionMonitors/monitor1 -``` diff --git a/website/docs/r/ddos_protection_plan.html.markdown b/website/docs/r/ddos_protection_plan.html.markdown deleted file mode 100644 index db9aba1388b2c..0000000000000 --- a/website/docs/r/ddos_protection_plan.html.markdown +++ /dev/null @@ -1,68 +0,0 @@ ---- -subcategory: "Network" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_ddos_protection_plan" -description: |- - Manages an Azure DDoS Protection Plan. - ---- - -# azurerm_ddos_protection_plan - -Manages an Azure DDoS Protection Plan. - --> **NOTE** Azure only allow `one` DDoS Protection Plan per region. - -~> **NOTE:** This resource has been deprecated in favour of the `azurerm_network_ddos_protection_plan` resource and will be removed in the next major version of the AzureRM Provider. The new resource shares the same fields as this one, and information on migrating across [can be found in this guide](../guides/migrating-between-renamed-resources.html). - -## Example Usage - -```hcl -resource "azurerm_resource_group" "example" { - name = "example-resources" - location = "West Europe" -} - -resource "azurerm_ddos_protection_plan" "example" { - name = "example-protection-plan" - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required) Specifies the name of the DDoS Protection Plan. Changing this forces a new resource to be created. - -* `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. - -* `resource_group_name` - (Required) The name of the resource group in which to create the resource. Changing this forces a new resource to be created. - -* `tags` - (Optional) A mapping of tags to assign to the resource. - -## Attributes Reference - -The following attributes are exported: - -* `id` - The ID of the DDoS Protection Plan. - -* `virtual_network_ids` - The Resource ID list of the Virtual Networks associated with DDoS Protection Plan. - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `create` - (Defaults to 30 minutes) Used when creating the DDoS Protection Plan. -* `update` - (Defaults to 30 minutes) Used when updating the DDoS Protection Plan. -* `read` - (Defaults to 5 minutes) Used when retrieving the DDoS Protection Plan. -* `delete` - (Defaults to 30 minutes) Used when deleting the DDoS Protection Plan. - -## Import - -DDoS Protection Plan's can be imported using the `resource id`, e.g. - -```shell -terraform import azurerm_ddos_protection_plan.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.Network/ddosProtectionPlans/testddospplan -``` diff --git a/website/docs/r/metric_alertrule.html.markdown b/website/docs/r/metric_alertrule.html.markdown deleted file mode 100644 index 6d84a6be8dea8..0000000000000 --- a/website/docs/r/metric_alertrule.html.markdown +++ /dev/null @@ -1,167 +0,0 @@ ---- -subcategory: "Monitor" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_metric_alertrule" -description: |- - Manages a metric-based alert rule. - ---- - -# azurerm_metric_alertrule - -Manages a [metric-based alert rule](https://docs.microsoft.com/en-us/azure/monitoring-and-diagnostics/monitor-quick-resource-metric-alert-portal) in Azure Monitor. - -~> **NOTE:** This resource has been [deprecated](https://docs.microsoft.com/en-us/azure/azure-monitor/platform/monitoring-classic-retirement) in favour of the `azurerm_monitor_metric_alert` resource and will be removed in the next major version of the AzureRM Provider. The new resource shares the same fields as this one, and information on migrating across [can be found in this guide](../guides/migrating-between-renamed-resources.html). - -## Example Usage (CPU Percentage of a virtual machine) - -```hcl -resource "azurerm_metric_alertrule" "example" { - name = "${azurerm_virtual_machine.example.name}-cpu" - resource_group_name = azurerm_resource_group.example.name - location = azurerm_resource_group.example.location - - description = "An alert rule to watch the metric Percentage CPU" - - enabled = true - - resource_id = azurerm_virtual_machine.example.id - metric_name = "Percentage CPU" - operator = "GreaterThan" - threshold = 75 - aggregation = "Average" - period = "PT5M" - - email_action { - send_to_service_owners = false - - custom_emails = [ - "some.user@example.com", - ] - } - - webhook_action { - service_uri = "https://example.com/some-url" - - properties = { - severity = "incredible" - acceptance_test = "true" - } - } -} -``` - -## Example Usage (Storage usage of a SQL Database) - -```hcl -resource "azurerm_metric_alertrule" "example" { - name = "${azurerm_sql_database.example.name}-storage" - resource_group_name = azurerm_resource_group.example.name - location = azurerm_resource_group.example.location - - description = "An alert rule to watch the metric Storage" - - enabled = true - - resource_id = azurerm_sql_database.example.id - metric_name = "storage" - operator = "GreaterThan" - threshold = 1073741824 - aggregation = "Maximum" - period = "PT10M" - - email_action { - send_to_service_owners = false - - custom_emails = [ - "some.user@example.com", - ] - } - - webhook_action { - service_uri = "https://example.com/some-url" - - properties = { - severity = "incredible" - acceptance_test = "true" - } - } -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required) Specifies the name of the alert rule. Changing this forces a new resource to be created. - -* `resource_group_name` - (Required) The name of the resource group in which to create the alert rule. Changing this forces a new resource to be created. - -* `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. - -* `description` - (Optional) A verbose description of the alert rule that will be included in the alert email. - -* `enabled` - (Optional) If `true`, the alert rule is enabled. Defaults to `true`. - ---- - -* `resource_id` - (Required) The ID of the resource monitored by the alert rule. - -* `metric_name` - (Required) The metric that defines what the rule monitors. - --> For a comprehensive reference of supported `metric_name` values for types of `resource` refer to [Supported metrics with Azure Monitor](https://docs.microsoft.com/en-us/azure/monitoring-and-diagnostics/monitoring-supported-metrics) in the Azure documentation. In the referred table, the column "Metric" corresponds to supported values for `metric_name`. - -* `operator` - (Required) The operator used to compare the metric data and the threshold. Possible values are `GreaterThan`, `GreaterThanOrEqual`, `LessThan`, and `LessThanOrEqual`. - -* `threshold` - (Required) The threshold value that activates the alert. - -* `period` - (Required) The period of time formatted in [ISO 8601 duration format](https://en.wikipedia.org/wiki/ISO_8601#Durations) that is used to monitor the alert activity based on the threshold. The period must be between 5 minutes and 1 day. - -* `aggregation` - (Required) Defines how the metric data is combined over time. Possible values are `Average`, `Minimum`, `Maximum`, `Total`, and `Last`. - ---- - -* `email_action` - (Optional) A `email_action` block as defined below. - -* `webhook_action` - (Optional) A `webhook_action` block as defined below. - -* `tags` - (Optional) A mapping of tags to assign to the resource. Changing this forces a new resource to be created. - ---- - -`email_action` supports the following: - -* `send_to_service_owners` - (Optional) If `true`, the administrators (service and co-administrators) of the subscription are notified when the alert is triggered. Defaults to `false`. - -* `custom_emails` - (Optional) A list of email addresses to be notified when the alert is triggered. - ---- - -`webhook_action` supports the following: - -* `service_uri` - (Required) The service uri of the webhook to POST the notification when the alert is triggered. - -* `properties` - (Optional) A dictionary of custom properties to include with the webhook POST operation payload. - -## Attributes Reference - -The following attributes are exported: - -* `id` - The ID of the alert rule. - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `create` - (Defaults to 30 minutes) Used when creating the Alert Rule. -* `update` - (Defaults to 30 minutes) Used when updating the Alert Rule. -* `read` - (Defaults to 5 minutes) Used when retrieving the Alert Rule. -* `delete` - (Defaults to 30 minutes) Used when deleting the Alert Rule. - -## Import - -Metric Alert Rules can be imported using the `resource id`, e.g. - -``` -terraform import azurerm_metric_alertrule.alertrule1 /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/microsoft.insights/alertrules/alertrule1 -``` diff --git a/website/docs/r/monitor_metric_alertrule.html.markdown b/website/docs/r/monitor_metric_alertrule.html.markdown deleted file mode 100644 index f7ed89c46afb2..0000000000000 --- a/website/docs/r/monitor_metric_alertrule.html.markdown +++ /dev/null @@ -1,165 +0,0 @@ ---- -subcategory: "Monitor" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_monitor_metric_alertrule" -description: |- - Manages a metric-based alert rule in Azure Monitor. - ---- - -# azurerm_monitor_metric_alertrule - -Manages a [metric-based alert rule](https://docs.microsoft.com/en-us/azure/monitoring-and-diagnostics/monitor-quick-resource-metric-alert-portal) in Azure Monitor. - -## Example Usage (CPU Percentage of a virtual machine) - -```hcl -resource "azurerm_monitor_metric_alertrule" "example" { - name = "${azurerm_virtual_machine.example.name}-cpu" - resource_group_name = azurerm_resource_group.example.name - location = azurerm_resource_group.example.location - - description = "An alert rule to watch the metric Percentage CPU" - - enabled = true - - resource_id = azurerm_virtual_machine.example.id - metric_name = "Percentage CPU" - operator = "GreaterThan" - threshold = 75 - aggregation = "Average" - period = "PT5M" - - email_action { - send_to_service_owners = false - - custom_emails = [ - "some.user@example.com", - ] - } - - webhook_action { - service_uri = "https://example.com/some-url" - - properties = { - severity = "incredible" - acceptance_test = "true" - } - } -} -``` - -## Example Usage (Storage usage of a SQL Database) - -```hcl -resource "azurerm_monitor_metric_alertrule" "example" { - name = "${azurerm_sql_database.example.name}-storage" - resource_group_name = azurerm_resource_group.example.name - location = azurerm_resource_group.example.location - - description = "An alert rule to watch the metric Storage" - - enabled = true - - resource_id = azurerm_sql_database.example.id - metric_name = "storage" - operator = "GreaterThan" - threshold = 1073741824 - aggregation = "Maximum" - period = "PT10M" - - email_action { - send_to_service_owners = false - - custom_emails = [ - "some.user@example.com", - ] - } - - webhook_action { - service_uri = "https://example.com/some-url" - - properties = { - severity = "incredible" - acceptance_test = "true" - } - } -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required) Specifies the name of the alert rule. Changing this forces a new resource to be created. - -* `resource_group_name` - (Required) The name of the resource group in which to create the alert rule. Changing this forces a new resource to be created. - -* `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. - -* `description` - (Optional) A verbose description of the alert rule that will be included in the alert email. - -* `enabled` - (Optional) If `true`, the alert rule is enabled. Defaults to `true`. - ---- - -* `resource_id` - (Required) The ID of the resource monitored by the alert rule. - -* `metric_name` - (Required) The metric that defines what the rule monitors. - --> For a comprehensive reference of supported `metric_name` values for types of `resource` refer to [Supported metrics with Azure Monitor](https://docs.microsoft.com/en-us/azure/monitoring-and-diagnostics/monitoring-supported-metrics) in the Azure documentation. In the referred table, the column "Metric" corresponds to supported values for `metric_name`. - -* `operator` - (Required) The operator used to compare the metric data and the threshold. Possible values are `GreaterThan`, `GreaterThanOrEqual`, `LessThan`, and `LessThanOrEqual`. - -* `threshold` - (Required) The threshold value that activates the alert. - -* `period` - (Required) The period of time formatted in [ISO 8601 duration format](https://en.wikipedia.org/wiki/ISO_8601#Durations) that is used to monitor the alert activity based on the threshold. The period must be between 5 minutes and 1 day. - -* `aggregation` - (Required) Defines how the metric data is combined over time. Possible values are `Average`, `Minimum`, `Maximum`, `Total`, and `Last`. - ---- - -* `email_action` - (Optional) A `email_action` block as defined below. - -* `webhook_action` - (Optional) A `webhook_action` block as defined below. - -* `tags` - (Optional) A mapping of tags to assign to the resource. Changing this forces a new resource to be created. - ---- - -`email_action` supports the following: - -* `send_to_service_owners` - (Optional) If `true`, the administrators (service and co-administrators) of the subscription are notified when the alert is triggered. Defaults to `false`. - -* `custom_emails` - (Optional) A list of email addresses to be notified when the alert is triggered. - ---- - -`webhook_action` supports the following: - -* `service_uri` - (Required) The service uri of the webhook to POST the notification when the alert is triggered. - -* `properties` - (Optional) A dictionary of custom properties to include with the webhook POST operation payload. - -## Attributes Reference - -The following attributes are exported: - -* `id` - The ID of the alert rule. - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `create` - (Defaults to 30 minutes) Used when creating the Metric Alert Rule. -* `update` - (Defaults to 30 minutes) Used when updating the Metric Alert Rule. -* `read` - (Defaults to 5 minutes) Used when retrieving the Metric Alert Rule. -* `delete` - (Defaults to 30 minutes) Used when deleting the Metric Alert Rule. - -## Import - -Metric Alert Rules can be imported using the `resource id`, e.g. - -``` -terraform import azurerm_monitor_metric_alertrule.alertrule1 /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/microsoft.insights/alertrules/alertrule1 -``` diff --git a/website/docs/r/network_connection_monitor.html.markdown b/website/docs/r/network_connection_monitor.html.markdown deleted file mode 100644 index 4bc3e0c3f9a91..0000000000000 --- a/website/docs/r/network_connection_monitor.html.markdown +++ /dev/null @@ -1,179 +0,0 @@ ---- -subcategory: "Network" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_network_connection_monitor" -description: |- - Configures a Network Connection Monitor to monitor communication between a Virtual Machine and an endpoint using a Network Watcher. - ---- - -# azurerm_connection_monitor - -Configures a Network Connection Monitor to monitor communication between a Virtual Machine and an endpoint using a Network Watcher. - -## Example Usage - -```hcl -resource "azurerm_resource_group" "example" { - name = "connection-monitor-rg" - location = "West US" -} - -resource "azurerm_network_watcher" "example" { - name = "network-watcher" - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name -} - -resource "azurerm_virtual_network" "example" { - name = "production-network" - address_space = ["10.0.0.0/16"] - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name -} - -resource "azurerm_subnet" "example" { - name = "internal" - resource_group_name = azurerm_resource_group.example.name - virtual_network_name = azurerm_virtual_network.example.name - address_prefix = "10.0.2.0/24" -} - -resource "azurerm_network_interface" "example" { - name = "cmtest-nic" - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name - - ip_configuration { - name = "testconfiguration1" - subnet_id = azurerm_subnet.example.id - private_ip_address_allocation = "Dynamic" - } -} - -resource "azurerm_virtual_machine" "example" { - name = "cmtest-vm" - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name - network_interface_ids = [azurerm_network_interface.example.id] - vm_size = "Standard_F2" - - storage_image_reference { - publisher = "Canonical" - offer = "UbuntuServer" - sku = "16.04-LTS" - version = "latest" - } - - storage_os_disk { - name = "osdisk" - caching = "ReadWrite" - create_option = "FromImage" - managed_disk_type = "Standard_LRS" - } - - os_profile { - computer_name = "cmtest-vm" - admin_username = "testadmin" - admin_password = "Password1234!" - } - - os_profile_linux_config { - disable_password_authentication = false - } -} - -resource "azurerm_virtual_machine_extension" "example" { - name = "cmtest-vm-network-watcher" - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name - virtual_machine_name = azurerm_virtual_machine.example.name - publisher = "Microsoft.Azure.NetworkWatcher" - type = "NetworkWatcherAgentLinux" - type_handler_version = "1.4" - auto_upgrade_minor_version = true -} - -resource "azurerm_network_connection_monitor" "example" { - name = "cmtest-connectionmonitor" - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name - network_watcher_name = azurerm_network_watcher.example.name - - source { - virtual_machine_id = azurerm_virtual_machine.example.id - } - - destination { - address = "terraform.io" - port = 80 - } - - depends_on = [azurerm_virtual_machine_extension.example] -} -``` - -~> **NOTE:** This Resource requires that [the Network Watcher Agent Virtual Machine Extension](https://docs.microsoft.com/en-us/azure/network-watcher/connection-monitor) is installed on the Virtual Machine before monitoring can be started. The extension can be installed via [the `azurerm_virtual_machine_extension` resource](virtual_machine_extension.html). - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required) The name of the Network Connection Monitor. Changing this forces a new resource to be created. - -* `network_watcher_name` - (Required) The name of the Network Watcher. Changing this forces a new resource to be created. - -* `resource_group_name` - (Required) The name of the resource group in which to create the Connection Monitor. Changing this forces a new resource to be created. - -* `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. - -* `auto_start` - (Optional) Specifies whether the connection monitor will start automatically once created. Defaults to `true`. Changing this forces a new resource to be created. - -* `interval_in_seconds` - (Optional) Monitoring interval in seconds. Defaults to `60`. - -* `source` - (Required) A `source` block as defined below. - -* `destination` - (Required) A `destination` block as defined below. - -* `tags` - (Optional) A mapping of tags to assign to the resource. - ---- - -A `source` block contains: - -* `virtual_machine_id` - (Required) The ID of the Virtual Machine to monitor connectivity from. - -* `port` - (Optional) The port on the Virtual Machine to monitor connectivity from. Defaults to `0` (Dynamic Port Assignment). - -A `destination` block contains: - -* `virtual_machine_id` - (Optional) The ID of the Virtual Machine to monitor connectivity to. - -* `address` - (Optional) IP address or domain name to monitor connectivity to. - -* `port` - (Required) The port on the destination to monitor connectivity to. - -~> **NOTE:** One of `virtual_machine_id` or `address` must be specified. - -## Attributes Reference - -The following attributes are exported: - -* `id` - The ID of the Network Connection Monitor. - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `create` - (Defaults to 30 minutes) Used when creating the Network Connection Monitor. -* `update` - (Defaults to 30 minutes) Used when updating the Network Connection Monitor. -* `read` - (Defaults to 5 minutes) Used when retrieving the Network Connection Monitor. -* `delete` - (Defaults to 30 minutes) Used when deleting the Network Connection Monitor. - -## Import - -Network Connection Monitors can be imported using the `resource id`, e.g. - -```shell -terraform import azurerm_network_connection_monitor.monitor1 /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.Network/networkWatchers/watcher1/connectionMonitors/monitor1 -``` diff --git a/website/docs/r/private_link_endpoint.html.markdown b/website/docs/r/private_link_endpoint.html.markdown deleted file mode 100644 index 50d5e84d2a2c9..0000000000000 --- a/website/docs/r/private_link_endpoint.html.markdown +++ /dev/null @@ -1,162 +0,0 @@ ---- -subcategory: "Network" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_private_link_endpoint" -description: |- - Manages an Endpoint within a Private Link Service. ---- --> **NOTE:** The 'azurerm_private_link_endpoint' resource is being deprecated in favour of the renamed version 'azurerm_private_endpoint'. -Information on migrating to the renamed resource can be found here: https://terraform.io/docs/providers/azurerm/guides/migrating-between-renamed-resources.html -As such the existing 'azurerm_private_link_endpoint' resource is deprecated and will be removed in the next major version of the AzureRM Provider (2.0). - -# azurerm_private_link_endpoint - -Manages an Endpoint within a Private Link Service. - --> **NOTE** Private Link is currently in Public Preview. - -Azure Private Link Endpoint is a network interface that connects you privately and securely to a service powered by Azure Private Link. Private Link Endpoint uses a private IP address from your VNet, effectively bringing the service into your VNet. The service could be an Azure service such as Azure Storage, SQL, etc. or your own Private Link Service. - -## Example Usage - -```hcl -resource "azurerm_resource_group" "example" { - name = "example-resources" - location = "West Europe" -} - -resource "azurerm_virtual_network" "example" { - name = "example-network" - address_space = ["10.0.0.0/16"] - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name -} - -resource "azurerm_subnet" "service" { - name = "service" - resource_group_name = azurerm_resource_group.example.name - virtual_network_name = azurerm_virtual_network.example.name - address_prefix = "10.0.1.0/24" - - disable_private_link_service_network_policy_enforcement = true -} - -resource "azurerm_subnet" "endpoint" { - name = "endpoint" - resource_group_name = azurerm_resource_group.example.name - virtual_network_name = azurerm_virtual_network.example.name - address_prefix = "10.0.2.0/24" - - disable_private_link_endpoint_network_policy_enforcement = true -} - -resource "azurerm_public_ip" "example" { - name = "example-pip" - sku = "Standard" - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name - allocation_method = "Static" -} - -resource "azurerm_lb" "example" { - name = "example-lb" - sku = "Standard" - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name - - frontend_ip_configuration { - name = azurerm_public_ip.example.name - public_ip_address_id = azurerm_public_ip.example.id - } -} - -resource "azurerm_private_link_service" "example" { - name = "example-privatelink" - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name - - nat_ip_configuration { - name = azurerm_public_ip.example.name - primary = true - subnet_id = azurerm_subnet.service.id - } - - load_balancer_frontend_ip_configuration_ids = [ - azurerm_lb.example.frontend_ip_configuration.0.id, - ] -} - -resource "azurerm_private_link_endpoint" "example" { - name = "example-endpoint" - location = azurerm_resource_group.example.location - resource_group_name = azurerm_resource_group.example.name - subnet_id = azurerm_subnet.endpoint.id -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required) Specifies the Name of the Private Link Endpoint. Changing this forces a new resource to be created. - -* `resource_group_name` - (Required) Specifies the Name of the Resource Group within which the Private Link Endpoint should exist. Changing this forces a new resource to be created. - -* `location` - (Required) The supported Azure location where the resource exists. Changing this forces a new resource to be created. - -* `subnet_id` - (Required) The ID of the Subnet from which Private IP Addresses will be allocated for this Private Link Endpoint. Changing this forces a new resource to be created. - -* `private_service_connection` - (Required) A `private_service_connection` block as defined below. - ---- - -A `private_service_connection` supports the following: - -* `name` - (Required) Specifies the Name of the Private Service Connection. Changing this forces a new resource to be created. - -* `is_manual_connection` - (Required) Does the Private Link Endpoint require Manual Approval from the remote resource owner? Changing this forces a new resource to be created. - --> **NOTE:** If you are trying to connect the Private Link Endpoint to a remote resource without having the correct RBAC permissions on the remote resource set this value to `true`. - -* `private_connection_resource_id` - (Required) The ID of the Private Link Enabled Remote Resource which this Private Link Endpoint should be connected to. Changing this forces a new resource to be created. - -* `subresource_names` - (Optional) A list of subresource names which the Private Link Endpoint is able to connect to. Changing this forces a new resource to be created. - --> Several possible values for this field are shown below, however this is not extensive: - -| Resource Type | SubResource Name | Secondary SubResource Name | -| ----------------------------- | ---------------- | -------------------------- | -| Data Lake File System Gen2 | dfs | dfs_secondary | -| Sql Database / Data Warehouse | sqlServer | | -| Storage Account | blob | blob_secondary | -| Storage Account | file | file_secondary | -| Storage Account | queue | queue_secondary | -| Storage Account | table | table_secondary | -| Storage Account | web | web_secondary | - -See the product [documentation](https://docs.microsoft.com/en-us/azure/private-link/private-endpoint-overview#dns-configuration) for more information. - -* `request_message` - (Optional) A message passed to the owner of the remote resource when the private link endpoint attempts to establish the connection to the remote resource. The request message can be a maximum of `140` characters in length. Only valid if `is_manual_connection` is set to `true`. - -## Attributes Reference - -The following attributes are exported: - -* `id` - The ID of the Private Link Endpoint. - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `create` - (Defaults to 60 minutes) Used when creating the Private Link Endpoint. -* `update` - (Defaults to 60 minutes) Used when updating the Private Link Endpoint. -* `read` - (Defaults to 5 minutes) Used when retrieving the Private Link Endpoint. -* `delete` - (Defaults to 60 minutes) Used when deleting the Private Link Endpoint. - -## Import - -Private Link Endpoints can be imported using the `resource id`, e.g. - -```shell -$ terraform import azurerm_private_link_endpoint.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.Network/privateEndpoints/endpoint1 -``` diff --git a/website/docs/r/recovery_network_mapping.html.markdown b/website/docs/r/recovery_network_mapping.html.markdown deleted file mode 100644 index 87eb1738b4acf..0000000000000 --- a/website/docs/r/recovery_network_mapping.html.markdown +++ /dev/null @@ -1,114 +0,0 @@ ---- -subcategory: "Recovery Services" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_recovery_network_mapping" -description: |- - Manages a site recovery network mapping on Azure. ---- - -# azurerm_recovery_network_mapping - -~> **NOTE:** This resource has been deprecated in favour of the `azurerm_site_recovery_network_mapping` resource and will be removed in the next major version of the AzureRM Provider. The new resource shares the same fields as this one, and information on migrating across [can be found in this guide](../guides/migrating-between-renamed-resources.html). - -Manages a site recovery network mapping on Azure. A network mapping decides how to translate connected netwroks when a VM is migrated from one region to another. - -## Example Usage - -```hcl -resource "azurerm_resource_group" "primary" { - name = "tfex-network-mapping-primary" - location = "West US" -} - -resource "azurerm_resource_group" "secondary" { - name = "tfex-network-mapping-secondary" - location = "East US" -} - -resource "azurerm_recovery_services_vault" "vault" { - name = "example-recovery-vault" - location = azurerm_resource_group.secondary.location - resource_group_name = azurerm_resource_group.secondary.name - sku = "Standard" -} - -resource "azurerm_recovery_services_fabric" "primary" { - name = "primary-fabric" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - location = azurerm_resource_group.primary.location -} - -resource "azurerm_recovery_services_fabric" "secondary" { - name = "secondary-fabric" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - location = azurerm_resource_group.secondary.location - depends_on = [azurerm_recovery_services_fabric.primary] # Avoids issues with crearing fabrics simultainusly -} - -resource "azurerm_virtual_network" "primary" { - name = "network1" - resource_group_name = azurerm_resource_group.primary.name - address_space = ["192.168.1.0/24"] - location = azurerm_resource_group.primary.location -} - -resource "azurerm_virtual_network" "secondary" { - name = "network2" - resource_group_name = azurerm_resource_group.secondary.name - address_space = ["192.168.2.0/24"] - location = azurerm_resource_group.secondary.location -} - -resource "azurerm_recovery_network_mapping" "recovery-mapping" { - name = "recovery-network-mapping-1" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - source_recovery_fabric_name = "primary-fabric" - target_recovery_fabric_name = "secondary-fabric" - source_network_id = azurerm_virtual_network.primary.id - target_network_id = azurerm_virtual_network.secondary.id -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required) The name of the network mapping. - -* `resource_group_name` - (Required) Name of the resource group where the vault that should be updated is located. - -* `recovery_vault_name` - (Required) The name of the vault that should be updated. - -* `source_recovery_fabric_name` - (Required) Specifies the ASR fabric where mapping should be created. - -* `target_recovery_fabric_name` - (Required) The Azure Site Recovery fabric object corresponding to the recovery Azure region. - -* `source_network_id` - (Required) The id of the primary network. - -* `target_network_id` - (Required) The id of the recovery network. - -## Attributes Reference - -In addition to the arguments above, the following attributes are exported: - -* `id` - The ID of the Site Recovery Networking Mapping. - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `create` - (Defaults to 30 minutes) Used when creating the Site Recovery Networking Mapping. -* `update` - (Defaults to 30 minutes) Used when updating the Site Recovery Networking Mapping. -* `read` - (Defaults to 5 minutes) Used when retrieving the Site Recovery Networking Mapping. -* `delete` - (Defaults to 30 minutes) Used when deleting the Site Recovery Networking Mapping. - -## Import - -Site recovery network mapping can be imported using the `resource id`, e.g. - -```shell -terraform import azurerm_recovery_network_mapping.mymapping /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.RecoveryServices/vaults/recovery-vault-name/replicationFabrics/primary-fabric-name/replicationNetworks/azureNetwork/replicationNetworkMappings/mapping-name -``` diff --git a/website/docs/r/recovery_services_fabric.html.markdown b/website/docs/r/recovery_services_fabric.html.markdown deleted file mode 100644 index 441b7dfca1805..0000000000000 --- a/website/docs/r/recovery_services_fabric.html.markdown +++ /dev/null @@ -1,76 +0,0 @@ ---- -subcategory: "Recovery Services" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_recovery_services_fabric" -description: |- - Manages a site recovery services fabric on Azure. ---- - -# azurerm_recovery_services_fabric - -~> **NOTE:** This resource has been deprecated in favour of the `azurerm_site_recovery_fabric` resource and will be removed in the next major version of the AzureRM Provider. The new resource shares the same fields as this one, and information on migrating across [can be found in this guide](../guides/migrating-between-renamed-resources.html). - -Manages a Azure recovery vault fabric. - -## Example Usage - -```hcl -resource "azurerm_resource_group" "primary" { - name = "tfex-network-mapping-primary" - location = "West US" -} - -resource "azurerm_resource_group" "secondary" { - name = "tfex-network-mapping-secondary" - location = "East US" -} - -resource "azurerm_recovery_services_vault" "vault" { - name = "example-recovery-vault" - location = azurerm_resource_group.secondary.location - resource_group_name = azurerm_resource_group.secondary.name - sku = "Standard" -} - -resource "azurerm_recovery_services_fabric" "fabric" { - name = "primary-fabric" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - location = azurerm_resource_group.primary.location -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required) The name of the network mapping. - -* `resource_group_name` - (Required) Name of the resource group where the vault that should be updated is located. - -* `recovery_vault_name` - (Required) The name of the vault that should be updated. - -* `location` - (Required) In what region should the fabric be located. - -## Attributes Reference - -In addition to the arguments above, the following attributes are exported: - -* `id` - The ID of the Site Recovery Services Fabric. - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `create` - (Defaults to 30 minutes) Used when creating the Site Recovery Services Fabric. -* `update` - (Defaults to 30 minutes) Used when updating the Site Recovery Services Fabric. -* `read` - (Defaults to 5 minutes) Used when retrieving the Site Recovery Services Fabric. -* `delete` - (Defaults to 30 minutes) Used when deleting the Site Recovery Services Fabric. - -## Import - -Site Recovery Service Fabric's can be imported using the `resource id`, e.g. - -```shell -terraform import azurerm_recovery_services_fabric.myfabric /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.RecoveryServices/vaults/recovery-vault-name/replicationFabrics/fabric-name -``` diff --git a/website/docs/r/recovery_services_protected_vm.markdown b/website/docs/r/recovery_services_protected_vm.markdown deleted file mode 100644 index ea6b45cf49b8c..0000000000000 --- a/website/docs/r/recovery_services_protected_vm.markdown +++ /dev/null @@ -1,87 +0,0 @@ ---- -subcategory: "Recovery Services" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_recovery_services_protected_vm" -description: |- - Manages an Recovery Services Protected VM. ---- - -# azurerm_recovery_services_protected_vm - -~> **NOTE:** This resource has been deprecated in favour of the `azurerm_backup_protected_vm` resource and will be removed in the next major version of the AzureRM Provider. The new resource shares the same fields as this one, and information on migrating across [can be found in this guide](../guides/migrating-between-renamed-resources.html). - -Manages an Recovery Protected VM. - -## Example Usage - -```hcl -resource "azurerm_resource_group" "example" { - name = "tfex-recovery_vault" - location = "West US" -} - -resource "azurerm_recovery_services_vault" "example" { - name = "tfex-recovery-vault" - location = "${azurerm_resource_group.example.location}" - resource_group_name = "${azurerm_resource_group.example.name}" - sku = "Standard" -} - -resource "azurerm_recovery_services_protection_policy_vm" "example" { - name = "tfex-recovery-vault-policy" - resource_group_name = "${azurerm_resource_group.example.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.example.name}" - - backup { - frequency = "Daily" - time = "23:00" - } -} - -resource "azurerm_recovery_services_protected_vm" "vm1" { - resource_group_name = "${azurerm_resource_group.example.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.example.name}" - source_vm_id = "${azurerm_virtual_machine.example.id}" - backup_policy_id = "${azurerm_recovery_services_protection_policy_vm.example.id}" -} -``` - -## Argument Reference - -The following arguments are supported: - -* `resource_group_name` - (Required) The name of the resource group in which to create the Recovery Services Protected VM. Changing this forces a new resource to be created. - -* `recovery_vault_name` - (Required) Specifies the name of the Recovery Services Vault to use. Changing this forces a new resource to be created. - -* `source_vm_id` - (Required) Specifies the ID of the VM to backup. Changing this forces a new resource to be created. - -* `backup_policy_id` - (Required) Specifies the id of the backup policy to use. - -* `tags` - (Optional) A mapping of tags to assign to the resource. - -## Attributes Reference - -The following attributes are exported: - -* `id` - The ID of the Recovery Services Protected VM. - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `create` - (Defaults to 80 minutes) Used when creating the Recovery Services Protected VM. -* `update` - (Defaults to 80 minutes) Used when updating the Recovery Services Protected VM. -* `read` - (Defaults to 5 minutes) Used when retrieving the Recovery Services Protected VM. -* `delete` - (Defaults to 80 minutes) Used when deleting the Recovery Services Protected VM. - -## Import - -Recovery Services Protected VMs can be imported using the `resource id`, e.g. - -```shell -terraform import azurerm_recovery_services_protected_vm.item1 "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.RecoveryServices/vaults/example-recovery-vault/backupFabrics/Azure/protectionContainers/iaasvmcontainer;iaasvmcontainerv2;group1;vm1/protectedItems/vm;iaasvmcontainerv2;group1;vm1" -``` - -Note the ID requires quoting as there are semicolons -m diff --git a/website/docs/r/recovery_services_protection_container.html.markdown b/website/docs/r/recovery_services_protection_container.html.markdown deleted file mode 100644 index 39dc0f10c2bd6..0000000000000 --- a/website/docs/r/recovery_services_protection_container.html.markdown +++ /dev/null @@ -1,83 +0,0 @@ ---- -subcategory: "Recovery Services" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_recovery_services_protection_container" -description: |- - Manages a site recovery services protection container on Azure. ---- - -# azurerm_recovery_services_protection_container - -~> **NOTE:** This resource has been deprecated in favour of the `azurerm_site_recovery_protection_container` resource and will be removed in the next major version of the AzureRM Provider. The new resource shares the same fields as this one, and information on migrating across [can be found in this guide](../guides/migrating-between-renamed-resources.html). - -Manages a Azure recovery vault protection container. - -## Example Usage - -```hcl -resource "azurerm_resource_group" "primary" { - name = "tfex-network-mapping-primary" - location = "West US" -} - -resource "azurerm_resource_group" "secondary" { - name = "tfex-network-mapping-secondary" - location = "East US" -} - -resource "azurerm_recovery_services_vault" "vault" { - name = "example-recovery-vault" - location = azurerm_resource_group.secondary.location - resource_group_name = azurerm_resource_group.secondary.name - sku = "Standard" -} - -resource "azurerm_recovery_services_fabric" "fabric" { - name = "primary-fabric" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - location = azurerm_resource_group.primary.location -} - -resource "azurerm_recovery_services_protection_container" "protection-container" { - name = "protection-container" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - recovery_fabric_name = azurerm_recovery_services_fabric.fabric.name -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required) The name of the network mapping. - -* `resource_group_name` - (Required) Name of the resource group where the vault that should be updated is located. - -* `recovery_vault_name` - (Required) The name of the vault that should be updated. - -* `recovery_fabric_name` - (Required) Name of fabric that should contain this protection container. - -## Attributes Reference - -In addition to the arguments above, the following attributes are exported: - -* `id` - The ID of the Recovery Services Protection Container. - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `create` - (Defaults to 30 minutes) Used when creating the Recovery Services Protection Container. -* `update` - (Defaults to 30 minutes) Used when updating the Recovery Services Protection Container. -* `read` - (Defaults to 5 minutes) Used when retrieving the Recovery Services Protection Container. -* `delete` - (Defaults to 30 minutes) Used when deleting the Recovery Services Protection Container. - -## Import - -Recovery Services Protection Containers can be imported using the `resource id`, e.g. - -```shell -terraform import azurerm_recovery_services_protection_container.mycontainer /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.RecoveryServices/vaults/recovery-vault-name/replicationFabrics/fabric-name/replicationProtectionContainers/protection-container-name -``` diff --git a/website/docs/r/recovery_services_protection_container_mapping.html.markdown b/website/docs/r/recovery_services_protection_container_mapping.html.markdown deleted file mode 100644 index 43ebdcb14ed22..0000000000000 --- a/website/docs/r/recovery_services_protection_container_mapping.html.markdown +++ /dev/null @@ -1,121 +0,0 @@ ---- -subcategory: "Recovery Services" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_recovery_services_protection_container_mapping" -description: |- - Manages a site recovery services protection container mappings on Azure. ---- - -# azurerm_recovery_services_protection_container_mapping - -~> **NOTE:** This resource has been deprecated in favour of the `azurerm_site_recovery_protection_container_mapping` resource and will be removed in the next major version of the AzureRM Provider. The new resource shares the same fields as this one, and information on migrating across [can be found in this guide](../guides/migrating-between-renamed-resources.html). - -Manages a Azure recovery vault protection container mapping. A network protection container mapping decides how to translate the protection container when a VM is migrated from one region to another. - -## Example Usage - -```hcl -resource "azurerm_resource_group" "primary" { - name = "tfex-network-mapping-primary" - location = "West US" -} - -resource "azurerm_resource_group" "secondary" { - name = "tfex-network-mapping-secondary" - location = "East US" -} - -resource "azurerm_recovery_services_vault" "vault" { - name = "example-recovery-vault" - location = azurerm_resource_group.secondary.location - resource_group_name = azurerm_resource_group.secondary.name - sku = "Standard" -} - -resource "azurerm_recovery_services_fabric" "primary" { - name = "primary-fabric" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - location = azurerm_resource_group.primary.location -} - -resource "azurerm_recovery_services_fabric" "secondary" { - name = "secondary-fabric" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - location = azurerm_resource_group.secondary.location -} - -resource "azurerm_recovery_services_protection_container" "primary" { - name = "primary-protection-container" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - recovery_fabric_name = azurerm_recovery_services_fabric.primary.name -} - -resource "azurerm_recovery_services_protection_container" "secondary" { - name = "secondary-protection-container" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - recovery_fabric_name = azurerm_recovery_services_fabric.secondary.name -} - -resource "azurerm_recovery_services_replication_policy" "policy" { - name = "policy" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - recovery_point_retention_in_minutes = 24 * 60 - application_consistent_snapshot_frequency_in_minutes = 4 * 60 -} - -resource "azurerm_recovery_services_protection_container_mapping" "container-mapping" { - name = "container-mapping" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - recovery_fabric_name = azurerm_recovery_services_fabric.primary.name - recovery_source_protection_container_name = azurerm_recovery_services_protection_container.primary.name - recovery_target_protection_container_id = azurerm_recovery_services_protection_container.secondary.id - recovery_replication_policy_id = azurerm_recovery_services_replication_policy.policy.id -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required) The name of the network mapping. - -* `resource_group_name` - (Required) Name of the resource group where the vault that should be updated is located. - -* `recovery_vault_name` - (Required) The name of the vault that should be updated. - -* `recovery_fabric_name` - (Required) Name of fabric that should contains the protection container to map. - -* `recovery_source_protection_container_name` - (Required) Name of the protection container to map. - -* `recovery_target_protection_container_id` - (Required) Id of protection container to map to. - -* `recovery_replication_policy_id` - (Required) Id of the policy to use for this mapping. - -## Attributes Reference - -In addition to the arguments above, the following attributes are exported: - -* `id` - The ID of the Recovery Services Protection Container Mapping. - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `create` - (Defaults to 30 minutes) Used when creating the Recovery Services Protection Container Mapping. -* `update` - (Defaults to 30 minutes) Used when updating the Recovery Services Protection Container Mapping. -* `read` - (Defaults to 5 minutes) Used when retrieving the Recovery Services Protection Container Mapping. -* `delete` - (Defaults to 30 minutes) Used when deleting the Recovery Services Protection Container Mapping. - -## Import - -Recovery Services Protection Container Mappings can be imported using the `resource id`, e.g. - -```shell -terraform import azurerm_recovery_services_protection_container_mapping.mymapping /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.RecoveryServices/vaults/recovery-vault-name/ -``` diff --git a/website/docs/r/recovery_services_protection_policy_vm.markdown b/website/docs/r/recovery_services_protection_policy_vm.markdown deleted file mode 100644 index da5a9ef5e60bc..0000000000000 --- a/website/docs/r/recovery_services_protection_policy_vm.markdown +++ /dev/null @@ -1,159 +0,0 @@ ---- -subcategory: "Recovery Services" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_recovery_services_protection_policy_vm" -description: |- - Manages an Recovery Services VM Protection Policy. ---- - -# azurerm_recovery_services_protection_policy_vm - -~> **NOTE:** This resource has been deprecated in favour of the `azurerm_backup_policy_vm` resource and will be removed in the next major version of the AzureRM Provider. The new resource shares the same fields as this one, and information on migrating across [can be found in this guide](../guides/migrating-between-renamed-resources.html). - -Manages an Recovery Services VM Protection Policy. - -## Example Usage - -```hcl -resource "azurerm_resource_group" "example" { - name = "tfex-recovery_vault" - location = "West US" -} - -resource "azurerm_recovery_services_vault" "example" { - name = "tfex-recovery-vault" - location = "${azurerm_resource_group.example.location}" - resource_group_name = "${azurerm_resource_group.example.name}" - sku = "Standard" -} - -resource "azurerm_recovery_services_protection_policy_vm" "example" { - name = "tfex-recovery-vault-policy" - resource_group_name = "${azurerm_resource_group.example.name}" - recovery_vault_name = "${azurerm_recovery_services_vault.example.name}" - - timezone = "UTC" - - backup { - frequency = "Daily" - time = "23:00" - } - - retention_daily { - count = 10 - } - - retention_weekly { - count = 42 - weekdays = ["Sunday", "Wednesday", "Friday", "Saturday"] - } - - retention_monthly { - count = 7 - weekdays = ["Sunday", "Wednesday"] - weeks = ["First", "Last"] - } - - retention_yearly { - count = 77 - weekdays = ["Sunday"] - weeks = ["Last"] - months = ["January"] - } -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required) Specifies the name of the Recovery Services Vault Policy. Changing this forces a new resource to be created. - -* `resource_group_name` - (Required) The name of the resource group in which to create the Recovery Services Protected VM. Changing this forces a new resource to be created. - -* `recovery_vault_name` - (Required) Specifies the name of the Recovery Services Vault to use. Changing this forces a new resource to be created. - -* `backup` - (Required) Configures the Policy backup frequecent, times & days as documented in the `backup` block below. - -* `timezone` - (Optional) Specifies the timezone. Defaults to `UTC` - -* `retention_daily` - (Optional) Configures the policy daily retention as documented in the `retention_daily` block below. Required when backup frequency is `Daily`. - -* `retention_weekly` - (Optional) Configures the policy weekly retention as documented in the `retention_weekly` block below. Required when backup frequency is `Weekly`. - -* `retention_monthly` - (Optional) Configures the policy monthly retention as documented in the `retention_monthly` block below. - -* `retention_yearly` - (Optional) Configures the policy yearly retention as documented in the `retention_yearly` block below. - -* `tags` - (Optional) A mapping of tags to assign to the resource. - ---- - -The `backup` block supports: - -* `frequency` - (Required) Sets the backup frequency. Must be either `Daily` or`Weekly`. - -* `times` - (Required) The time of day to perform the backup in 24hour format. - -* `weekdays` - (Optional) The days of the week to perform backups on. Must be one of `Sunday`, `Monday`, `Tuesday`, `Wednesday`, `Thursday`, `Friday` or `Saturday`. - ---- - -The `retention_daily` block supports: - -* `count` - (Required) The number of daily backups to keep. Must be between `1` and `9999` - ---- - -The `retention_weekly` block supports: - -* `count` - (Required) The number of weekly backups to keep. Must be between `1` and `9999` - -* `weekdays` - (Required) The weekday backups to retain. Must be one of `Sunday`, `Monday`, `Tuesday`, `Wednesday`, `Thursday`, `Friday` or `Saturday`. - ---- - -The `retention_monthly` block supports: - -* `count` - (Required) The number of monthly backups to keep. Must be between `1` and `9999` - -* `weekdays` - (Required) The weekday backups to retain . Must be one of `Sunday`, `Monday`, `Tuesday`, `Wednesday`, `Thursday`, `Friday` or `Saturday`. - -* `weeks` - (Required) The weeks of the month to retain backups of. Must be one of `First`, `Second`, `Third`, `Fourth`, `Last`. - ---- - -The `retention_yearly` block supports: - -* `count` - (Required) The number of yearly backups to keep. Must be between `1` and `9999` - -* `weekdays` - (Required) The weekday backups to retain . Must be one of `Sunday`, `Monday`, `Tuesday`, `Wednesday`, `Thursday`, `Friday` or `Saturday`. - -* `weeks` - (Required) The weeks of the month to retain backups of. Must be one of `First`, `Second`, `Third`, `Fourth`, `Last`. - -* `months` - (Required) The months of the year to retain backups of. Must be one of `January`, `February`, `March`, `April`, `May`, `June`, `July`, `Augest`, `September`, `October`, `November` and `December`. - ---- - -## Attributes Reference - -The following attributes are exported: - -* `id` - The ID of the Recovery Services VM Protection Policy. - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `create` - (Defaults to 30 minutes) Used when creating the Recovery Services VM Protection Policy. -* `update` - (Defaults to 30 minutes) Used when updating the Recovery Services VM Protection Policy. -* `read` - (Defaults to 5 minutes) Used when retrieving the Recovery Services VM Protection Policy. -* `delete` - (Defaults to 30 minutes) Used when deleting the Recovery Services VM Protection Policy. - -## Import - -Recovery Services VM Protection Policy can be imported using the `resource id`, e.g. - -```shell -terraform import azurerm_recovery_services_protection_policy_vm.policy1 /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.RecoveryServices/vaults/example-recovery-vault/backupPolicies/policy1 -``` diff --git a/website/docs/r/recovery_services_replicated_vm.html.markdown b/website/docs/r/recovery_services_replicated_vm.html.markdown deleted file mode 100644 index 7e8a5fa8253fa..0000000000000 --- a/website/docs/r/recovery_services_replicated_vm.html.markdown +++ /dev/null @@ -1,232 +0,0 @@ ---- -subcategory: "Recovery Services" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_recovery_replicated_vm" -description: |- - Manages a site recovery services protection container mappings on Azure. ---- - -# azurerm_recovery_replicated_vm - -~> **NOTE:** This resource has been deprecated in favour of the `azurerm_site_recovery_replicated_vm` resource and will be removed in the next major version of the AzureRM Provider. The new resource shares the same fields as this one, and information on migrating across [can be found in this guide](../guides/migrating-between-renamed-resources.html). - -Manages a Azure recovery replicated vms (Azure to Azure). An replicated VM keeps a copiously updated image of the vm in another region in order to be able to start the VM in that region in case of a disaster. - -## Example Usage - -```hcl -resource "azurerm_resource_group" "primary" { - name = "tfex-replicated-vm-primary" - location = "West US" -} - -resource "azurerm_resource_group" "secondary" { - name = "tfex-replicated-vm-secondary" - location = "East US" -} - -resource "azurerm_virtual_machine" "vm" { - name = "vm" - location = azurerm_resource_group.primary.location - resource_group_name = azurerm_resource_group.primary.name - vm_size = "Standard_B1s" - network_interface_ids = [azurerm_network_interface.vm.id] - - storage_image_reference { - publisher = "OpenLogic" - offer = "CentOS" - sku = "7.5" - version = "latest" - } - - storage_os_disk { - name = "vm-os-disk" - os_type = "Linux" - caching = "ReadWrite" - create_option = "FromImage" - managed_disk_type = "Premium_LRS" - } - - os_profile { - admin_username = "test-admin-123" - admin_password = "test-pwd-123" - computer_name = "vm" - } - - os_profile_linux_config { - disable_password_authentication = false - } -} - -resource "azurerm_recovery_services_vault" "vault" { - name = "example-recovery-vault" - location = azurerm_resource_group.secondary.location - resource_group_name = azurerm_resource_group.secondary.name - sku = "Standard" -} - -resource "azurerm_recovery_services_fabric" "primary" { - name = "primary-fabric" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - location = azurerm_resource_group.primary.location -} - -resource "azurerm_recovery_services_fabric" "secondary" { - name = "secondary-fabric" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - location = azurerm_resource_group.secondary.location -} - -resource "azurerm_recovery_services_protection_container" "primary" { - name = "primary-protection-container" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - recovery_fabric_name = azurerm_recovery_services_fabric.primary.name -} - -resource "azurerm_recovery_services_protection_container" "secondary" { - name = "secondary-protection-container" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - recovery_fabric_name = azurerm_recovery_services_fabric.secondary.name -} - -resource "azurerm_recovery_services_replication_policy" "policy" { - name = "policy" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - recovery_point_retention_in_minutes = 24 * 60 - application_consistent_snapshot_frequency_in_minutes = 4 * 60 -} - -resource "azurerm_recovery_services_protection_container_mapping" "container-mapping" { - name = "container-mapping" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - recovery_fabric_name = azurerm_recovery_services_fabric.primary.name - recovery_source_protection_container_name = azurerm_recovery_services_protection_container.primary.name - recovery_target_protection_container_id = azurerm_recovery_services_protection_container.secondary.id - recovery_replication_policy_id = azurerm_recovery_services_replication_policy.policy.id -} - -resource "azurerm_storage_account" "primary" { - name = "primaryrecoverycache" - location = azurerm_resource_group.primary.location - resource_group_name = azurerm_resource_group.primary.name - account_tier = "Standard" - account_replication_type = "LRS" -} - -resource "azurerm_virtual_network" "primary" { - name = "network1" - resource_group_name = azurerm_resource_group.primary.name - address_space = ["192.168.1.0/24"] - location = azurerm_resource_group.primary.location -} - -resource "azurerm_subnet" "primary" { - name = "network1-subnet" - resource_group_name = azurerm_resource_group.primary.name - virtual_network_name = azurerm_virtual_network.primary.name - address_prefix = "192.168.1.0/24" -} - -resource "azurerm_network_interface" "vm" { - name = "vm-nic" - location = azurerm_resource_group.primary.location - resource_group_name = azurerm_resource_group.primary.name - - ip_configuration { - name = "vm" - subnet_id = azurerm_subnet.primary.id - private_ip_address_allocation = "Dynamic" - } -} - -resource "azurerm_recovery_replicated_vm" "vm-replication" { - name = "vm-replication" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - source_recovery_fabric_name = azurerm_recovery_services_fabric.primary.name - source_vm_id = azurerm_virtual_machine.vm.id - recovery_replication_policy_id = azurerm_recovery_services_replication_policy.policy.id - source_recovery_protection_container_name = azurerm_recovery_services_protection_container.primary.name - - target_resource_group_id = azurerm_resource_group.secondary.id - target_recovery_fabric_id = azurerm_recovery_services_fabric.secondary.id - target_recovery_protection_container_id = azurerm_recovery_services_protection_container.secondary.id - - managed_disk { - disk_id = azurerm_virtual_machine.vm.storage_os_disk[0].managed_disk_id - staging_storage_account_id = azurerm_storage_account.primary.id - target_resource_group_id = azurerm_resource_group.secondary.id - target_disk_type = "Premium_LRS" - target_replica_disk_type = "Premium_LRS" - } -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required) The name of the network mapping. - -* `resource_group_name` - (Required) Name of the resource group where the vault that should be updated is located. - -* `recovery_vault_name` - (Required) The name of the vault that should be updated. - -* `source_recovery_fabric_name` - (Required) Name of fabric that should contains this replication. - -* `source_vm_id` - (Required) Id of the VM to replicate - -* `source_recovery_protection_container_name` - (Required) Name of the protection container to use. - -* `target_resource_group_id` - (Required) Id of resource group where the VM should be created when a failover is done. - -* `target_recovery_fabric_id` - (Required) Id of fabric where the VM replication should be handled when a failover is done. - -* `target_recovery_protection_container_id` - (Required) Id of protection container where the VM replication should be created when a failover is done. - -* `target_availability_set_id` - (Optional) Id of availability set that the new VM should belong to when a failover is done. - -* `managed_disk` - (Required) One or more `managed_disk` block. - ---- - -A `managed_disk` block supports the following: - -* `disk_id` - (Required) Id of disk that should be replicated. - -* `staging_storage_account_id` - (Required) Storage account that should be used for caching. - -* `target_resource_group_id` - (Required) Resource group disk should belong to when a failover is done. - -* `target_disk_type` - (Required) What type should the disk be when a failover is done. - -* `target_replica_disk_type` - (Required) What type should the disk be that holds the replication data. - -## Attributes Reference - -In addition to the arguments above, the following attributes are exported: - -* `id` - The ID of the Recovery Services Replicated VM. - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `create` - (Defaults to 80 minutes) Used when creating the Recovery Services Replicated VM. -* `update` - (Defaults to 80 minutes) Used when updating the Recovery Services Replicated VM. -* `read` - (Defaults to 5 minutes) Used when retrieving the Recovery Services Replicated VM. -* `delete` - (Defaults to 80 minutes) Used when deleting the Recovery Services Replicated VM. - -## Import - -Recovery Services Replicated VM's can be imported using the `resource id`, e.g. - -```shell -terraform import azurerm_recovery_replicated_vm.vmreplication /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.RecoveryServices/vaults/recovery-vault-name/replicationFabrics/fabric-name/replicationProtectionContainers/protection-container-name/replicationProtectedItems/vm-replication-name -``` diff --git a/website/docs/r/recovery_services_replication_policy.html.markdown b/website/docs/r/recovery_services_replication_policy.html.markdown deleted file mode 100644 index 82cf328713a8d..0000000000000 --- a/website/docs/r/recovery_services_replication_policy.html.markdown +++ /dev/null @@ -1,74 +0,0 @@ ---- -subcategory: "Recovery Services" -layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_recovery_services_replication_policy" -description: |- - Manages a site recovery services replication policy on Azure. ---- - -# azurerm_recovery_services_replication_policy - -~> **NOTE:** This resource has been deprecated in favour of the `azurerm_site_recovery_replication_policy` resource and will be removed in the next major version of the AzureRM Provider. The new resource shares the same fields as this one, and information on migrating across [can be found in this guide](../guides/migrating-between-renamed-resources.html). - -Manages a Azure recovery vault replication policy. - -## Example Usage - -```hcl -resource "azurerm_resource_group" "secondary" { - name = "tfex-network-mapping-secondary" - location = "East US" -} - -resource "azurerm_recovery_services_vault" "vault" { - name = "example-recovery-vault" - location = azurerm_resource_group.secondary.location - resource_group_name = azurerm_resource_group.secondary.name - sku = "Standard" -} - -resource "azurerm_recovery_services_replication_policy" "policy" { - name = "policy" - resource_group_name = azurerm_resource_group.secondary.name - recovery_vault_name = azurerm_recovery_services_vault.vault.name - recovery_point_retention_in_minutes = 24 * 60 - application_consistent_snapshot_frequency_in_minutes = 4 * 60 -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required) The name of the network mapping. - -* `resource_group_name` - (Required) Name of the resource group where the vault that should be updated is located. - -* `recovery_vault_name` - (Required) The name of the vault that should be updated. - -* `recovery_point_retention_in_minutes` - (Required) Retain the recovery points for given time in minutes. - -* `application_consistent_snapshot_frequency_in_minutes` - (Required) Specifies the frequency(in minutes) at which to create application consistent recovery points. - -## Attributes Reference - -In addition to the arguments above, the following attributes are exported: - -* `id` - The ID of the Recovery Services Replication Policy. - -## Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: - -* `create` - (Defaults to 30 minutes) Used when creating the Recovery Services Replication Policy. -* `update` - (Defaults to 30 minutes) Used when updating the Recovery Services Replication Policy. -* `read` - (Defaults to 5 minutes) Used when retrieving the Recovery Services Replication Policy. -* `delete` - (Defaults to 30 minutes) Used when deleting the Recovery Services Replication Policy. - -## Import - -Recovery Services Replication Policies can be imported using the `resource id`, e.g. - -```shell -terraform import azurerm_recovery_services_protection_container.mycontainer /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.RecoveryServices/vaults/recovery-vault-name/replicationPolicies/policy-name -``` diff --git a/website/docs/r/virtual_network.html.markdown b/website/docs/r/virtual_network.html.markdown index 9f83590910c8d..037f626166879 100644 --- a/website/docs/r/virtual_network.html.markdown +++ b/website/docs/r/virtual_network.html.markdown @@ -29,7 +29,7 @@ resource "azurerm_network_security_group" "example" { resource_group_name = azurerm_resource_group.example.name } -resource "azurerm_ddos_protection_plan" "example" { +resource "azurerm_network_ddos_protection_plan" "example" { name = "ddospplan1" location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name @@ -43,7 +43,7 @@ resource "azurerm_virtual_network" "example" { dns_servers = ["10.0.0.4", "10.0.0.5"] ddos_protection_plan { - id = azurerm_ddos_protection_plan.example.id + id = azurerm_network_ddos_protection_plan.example.id enable = true } From 1736632e927d8c7fcd767c2cfd98c51e4a6926e8 Mon Sep 17 00:00:00 2001 From: Jeffrey Cline <20408400+WodansSon@users.noreply.github.com> Date: Fri, 21 Feb 2020 18:45:03 -0800 Subject: [PATCH 340/498] Updates to CMK --- azurerm/helpers/azure/key_vault.go | 64 +++++++++++++++ ...rm_storage_account_customer_managed_key.go | 10 +-- ...orage_account_customer_managed_key_test.go | 78 ++++++++++++++++--- ...account_customer_managed_key.html.markdown | 10 +-- 4 files changed, 140 insertions(+), 22 deletions(-) diff --git a/azurerm/helpers/azure/key_vault.go b/azurerm/helpers/azure/key_vault.go index 7957380bb5946..36233887e95b2 100644 --- a/azurerm/helpers/azure/key_vault.go +++ b/azurerm/helpers/azure/key_vault.go @@ -3,6 +3,7 @@ package azure import ( "context" "fmt" + "time" "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2018-02-14/keyvault" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" @@ -118,3 +119,66 @@ func KeyVaultExists(ctx context.Context, client *keyvault.VaultsClient, keyVault return true, nil } + +func KeyVaultGetSoftDeletedState(ctx context.Context, client *keyvault.VaultsClient, name string, location string) (deleteDate interface{}, purgeDate interface{}, err error) { + softDel, err := client.GetDeleted(ctx, name, location) + if err != nil { + return nil, nil, fmt.Errorf("unable to get soft delete state information: %+v", err) + } + + // the logic is this way because the GetDeleted call will return an existing key vault + // that is not soft deleted, but the Deleted Vault properties will be nil + if props := softDel.Properties; props != nil { + var delDate interface{} + var purgeDate interface{} + + if dd := props.DeletionDate; dd != nil { + delDate = (*dd).Format(time.RFC3339) + } + if pg := props.ScheduledPurgeDate; pg != nil { + purgeDate = (*pg).Format(time.RFC3339) + } + if delDate != nil && purgeDate != nil { + return delDate, purgeDate, nil + } + } + + // this means we found an existing key vault that is not soft deleted + return nil, nil, nil +} + +func KeyVaultIsSoftDeleteAndPurgeProtected(ctx context.Context, client *keyvault.VaultsClient, keyVaultId string) bool { + name, resourceGroup, err := ParseNameAndResourceGroupFromResourceId(keyVaultId, "vaults") + if err != nil { + return false + } + + resp, err := client.Get(ctx, resourceGroup.(string), name.(string)) + + if props := resp.Properties; props != nil { + softDeleteEnabled := false + purgeProtectionEnabled := false + + if esd := props.EnableSoftDelete; esd != nil { + softDeleteEnabled = *esd + } + if epp := props.EnableSoftDelete; epp != nil { + purgeProtectionEnabled = *epp + } + + if softDeleteEnabled && purgeProtectionEnabled { + return true + } + } + + return false +} + +func ParseNameAndResourceGroupFromResourceId(resourceId string, namePathKey string) (resourceName interface{}, resourceGroup interface{}, err error) { + id, err := ParseAzureResourceID(resourceId) + if err != nil { + return nil, nil, err + } + + return id.Path[namePathKey], id.ResourceGroup, nil +} diff --git a/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go b/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go index f56c98db9a7a6..e363995ed0424 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go @@ -74,12 +74,12 @@ func resourceArmStorageAccountCustomerManagedKeyCreateUpdate(d *schema.ResourceD storageAccountId := d.Get("storage_account_id").(string) encryptionServices := true - storageAccountName, storageAccountResourceGroupName, err := azure.KeyVaultGetResourceNameResource(storageAccountId, "storageAccounts") + storageAccountName, storageAccountResourceGroupName, err := azure.ParseNameAndResourceGroupFromResourceId(storageAccountId, "storageAccounts") if err != nil { return err } - keyVaultAccountName, keyVaultResourceGroupName, err := azure.KeyVaultGetResourceNameResource(keyVaultId, "vaults") + keyVaultAccountName, keyVaultResourceGroupName, err := azure.ParseNameAndResourceGroupFromResourceId(keyVaultId, "vaults") if err != nil { return err } @@ -137,7 +137,7 @@ func resourceArmStorageAccountCustomerManagedKeyRead(d *schema.ResourceData, met d.Set("storage_account_id", storageAccountId) d.Set("key_vault_id", keyVaultId) - name, resGroup, err := azure.KeyVaultGetResourceNameResource(storageAccountId, "storageAccounts") + name, resGroup, err := azure.ParseNameAndResourceGroupFromResourceId(storageAccountId, "storageAccounts") if err != nil { return err } @@ -172,7 +172,7 @@ func resourceArmStorageAccountCustomerManagedKeyDelete(d *schema.ResourceData, m storageAccountId := d.Get("storage_account_id").(string) encryptionServices := true - storageAccountName, resourceGroupName, err := azure.KeyVaultGetResourceNameResource(storageAccountId, "storageAccounts") + storageAccountName, resourceGroupName, err := azure.ParseNameAndResourceGroupFromResourceId(storageAccountId, "storageAccounts") if err != nil { return err } @@ -215,7 +215,7 @@ func resourceArmStorageAccountCustomerManagedKeyImportState(d *schema.ResourceDa d.Set("storage_account_id", id) d.Set("key_vault_id", "") - name, resourceGroup, err := azure.KeyVaultGetResourceNameResource(id, "storageAccounts") + name, resourceGroup, err := azure.ParseNameAndResourceGroupFromResourceId(id, "storageAccounts") if err != nil { return nil, err } diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go index 5a735cf7ba5c6..7117033077816 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go @@ -15,7 +15,7 @@ import ( ) func TestAccAzureRMStorageAccountCustomerManagedKey_basic(t *testing.T) { - parentResourceName := "azurerm_storage_account.testsa" + parentResourceName := "azurerm_storage_account.test" data := acceptance.BuildTestData(t, "azurerm_storage_account_customer_managed_key", "custom") preConfig := testAccAzureRMStorageAccountCustomerManagedKey_basic(data) postConfig := testAccAzureRMStorageAccountCustomerManagedKey_basicDelete(data) @@ -46,7 +46,7 @@ func TestAccAzureRMStorageAccountCustomerManagedKey_basic(t *testing.T) { } func TestAccAzureRMStorageAccountCustomerManagedKey_disappears(t *testing.T) { - parentResourceName := "azurerm_storage_account.testsa" + parentResourceName := "azurerm_storage_account.test" data := acceptance.BuildTestData(t, "azurerm_storage_account_customer_managed_key", "custom") preConfig := testAccAzureRMStorageAccountCustomerManagedKey_basic(data) postConfig := testAccAzureRMStorageAccountCustomerManagedKey_basicDelete(data) @@ -174,28 +174,86 @@ func testCheckAzureRMStorageAccountCustomerManagedKeyDestroyed(resourceName stri func testAccAzureRMStorageAccountCustomerManagedKey_basic(data acceptance.TestData) string { return fmt.Sprintf(` +data "azurerm_client_config" "current" {} + +provider "azurerm" { + features { + key_vault { + purge_soft_delete_on_destroy = false + } + } +} + resource "azurerm_resource_group" "testrg" { name = "acctestRG-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { - name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" +resource "azurerm_key_vault" "test" { + name = "vault%d" + location = azurerm_resource_group.testrg.location + resource_group_name = azurerm_resource_group.testrg.name + tenant_id = data.azurerm_client_config.current.tenant_id + sku_name = "standard" + + soft_delete_enabled = true + purge_protection_enabled = true + + tags = { + environment = "testing" + } +} - location = "${azurerm_resource_group.testrg.location}" +resource "azurerm_key_vault_key" "test" { + name = "key%d" + key_vault_id = azurerm_key_vault.test.id + key_vault_access_policy_id = azurerm_key_vault_access_policy.storage.id + key_type = "RSA" + key_size = 2048 + key_opts = ["decrypt", "encrypt", "sign", "unwrapKey", "verify", "wrapKey"] +} + +resource "azurerm_key_vault_access_policy" "storage" { + key_vault_id = azurerm_key_vault.test.id + tenant_id = data.azurerm_client_config.current.tenant_id + object_id = azurerm_storage_account.test.identity.0.principal_id + + key_permissions = ["get", "create", "list", "restore", "recover", "unwrapkey", "wrapkey", "purge", "encrypt", "decrypt", "sign", "verify"] + secret_permissions = ["get"] +} + +resource "azurerm_key_vault_access_policy" "client" { + key_vault_id = azurerm_key_vault.test.id + tenant_id = data.azurerm_client_config.current.tenant_id + object_id = data.azurerm_client_config.current.service_principal_application_id + + key_permissions = ["get", "create", "delete", "list", "restore", "recover", "unwrapkey", "wrapkey", "purge", "encrypt", "decrypt", "sign", "verify"] + secret_permissions = ["get"] +} + +resource "azurerm_storage_account" "test" { + name = "unlikely23exst2acct%s" + resource_group_name = azurerm_resource_group.testrg.name + location = azurerm_resource_group.testrg.location account_tier = "Standard" account_replication_type = "LRS" + identity { + type = "SystemAssigned" + } + tags = { - environment = "production" + environment = "testing" } } resource "azurerm_storage_account_customer_managed_key" "custom" { - storage_account_id = "${azurerm_storage_account.testsa.id}" + storage_account_id = azurerm_storage_account.test.id + key_vault_id = azurerm_key_vault.test.id + key_name = azurerm_key_vault_key.test.name + key_version = azurerm_key_vault_key.test.version } -`, data.RandomInteger, data.Locations.Primary, data.RandomStringOfLength(4)) +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomStringOfLength(4)) } func testAccAzureRMStorageAccountCustomerManagedKey_basicDelete(data acceptance.TestData) string { @@ -209,7 +267,7 @@ resource "azurerm_storage_account" "testsa" { name = "unlikely23exst2acct%s" resource_group_name = "${azurerm_resource_group.testrg.name}" - location = "${azurerm_resource_group.testrg.location}" + location = azurerm_resource_group.testrg.location account_tier = "Standard" account_replication_type = "LRS" diff --git a/website/docs/r/storage_account_customer_managed_key.html.markdown b/website/docs/r/storage_account_customer_managed_key.html.markdown index 74058b8101a9f..ce782079124da 100644 --- a/website/docs/r/storage_account_customer_managed_key.html.markdown +++ b/website/docs/r/storage_account_customer_managed_key.html.markdown @@ -16,8 +16,6 @@ Manages the customer managed key of an Azure Storage Account. data "azurerm_client_config" "current" {} provider "azurerm" { - alias = "keyVault" - features { key_vault { purge_soft_delete_on_destroy = false @@ -32,16 +30,14 @@ resource "azurerm_resource_group" "tfex" { resource "azurerm_key_vault" "tfex" { name = "tfex-key-vault" - provider = azurerm.keyVault location = azurerm_resource_group.tfex.location resource_group_name = azurerm_resource_group.tfex.name tenant_id = data.azurerm_client_config.current.tenant_id + sku_name = "standard" soft_delete_enabled = true purge_protection_enabled = true - sku_name = "standard" - tags = { environment = "testing" } @@ -61,14 +57,14 @@ resource "azurerm_key_vault_access_policy" "storage" { tenant_id = data.azurerm_client_config.current.tenant_id object_id = azurerm_storage_account.tfex.identity.0.principal_id - key_permissions = ["get", "create", "delete", "list", "restore", "recover", "unwrapkey", "wrapkey", "purge", "encrypt", "decrypt", "sign", "verify"] + key_permissions = ["get", "create", "list", "restore", "recover", "unwrapkey", "wrapkey", "purge", "encrypt", "decrypt", "sign", "verify"] secret_permissions = ["get"] } resource "azurerm_key_vault_access_policy" "client" { key_vault_id = azurerm_key_vault.tfex.id tenant_id = data.azurerm_client_config.current.tenant_id - object_id = azurerm_storage_account.tfex.identity.0.principal_id + object_id = data.azurerm_client_config.current.service_principal_application_id key_permissions = ["get", "create", "delete", "list", "restore", "recover", "unwrapkey", "wrapkey", "purge", "encrypt", "decrypt", "sign", "verify"] secret_permissions = ["get"] From fcd9affeadfcaad09049f2fee49cf5d7b429469f Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sat, 22 Feb 2020 08:26:23 +0100 Subject: [PATCH 341/498] recoveryservices: renaming the files --- ...ion_policy_vm_test.go => data_source_backup_policy_vm_test.go} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename azurerm/internal/services/recoveryservices/tests/{data_source_recovery_services_protection_policy_vm_test.go => data_source_backup_policy_vm_test.go} (100%) diff --git a/azurerm/internal/services/recoveryservices/tests/data_source_recovery_services_protection_policy_vm_test.go b/azurerm/internal/services/recoveryservices/tests/data_source_backup_policy_vm_test.go similarity index 100% rename from azurerm/internal/services/recoveryservices/tests/data_source_recovery_services_protection_policy_vm_test.go rename to azurerm/internal/services/recoveryservices/tests/data_source_backup_policy_vm_test.go From 3ce6b8c6685cd685704383faf1298ccbf8d37c37 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sat, 22 Feb 2020 08:41:37 +0100 Subject: [PATCH 342/498] r/key_vault_key: formatting --- .../internal/services/keyvault/resource_arm_key_vault_key.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go b/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go index 79c6ca98b38bb..88735f042eac6 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go @@ -350,7 +350,7 @@ func resourceArmKeyVaultKeyRead(d *schema.ResourceData, meta interface{}) error d.Set("name", id.Name) d.Set("key_vault_access_policy_id", keyVaultAccessPolicyId) - if key := resp.Key; key != nil { + if key := resp.Key; key != nil { d.Set("key_type", string(key.Kty)) options := flattenKeyVaultKeyOptions(key.KeyOps) From 6c246151355cd290d5b105fba35f40452c9d23f0 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Sat, 22 Feb 2020 11:30:16 +0100 Subject: [PATCH 343/498] updating to include #5816 --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1832848d4279d..e85b6aa168203 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ BREAKING CHANGES: * Data Source: `azurerm_kubernetes_cluster` - removing the field `dns_prefix` from the `agent_pool_profile` block [GH-5823] * Data Source: `azurerm_network_interface` - removing the deprecated field `internal_fqdn` [GH-5823] * Data Source: `azurerm_private_link_service` - removing the deprecated field `network_interface_ids` [GH-5823] +* Data Source: `azurerm_recovery_services_protection_policy_vm` has been renamed to `azurerm_backup_policy_vm` [GH-5816] * Data Source: `azurerm_role_definition` - removing the alias `VirtualMachineContributor` which has been deprecated in favour of the full name `Virtual Machine Contributor` [GH-5733] * Data Source: `azurerm_scheduler_job_collection` - This data source has been removed since it was deprecated [GH-5712] * Data Source: `azurerm_subnet` - removing the deprecated `ip_configuration` field [GH-5801] @@ -129,6 +130,14 @@ BREAKING CHANGES: * `azurerm_private_link_service` - removing the deprecated field `network_interface_ids` [GH-5823] * `azurerm_public_ip` - making the `allocation_method` field required [GH-5823] * `azurerm_public_ip` - removing the deprecated field `public_ip_address_allocation` [GH-5823] +* `azurerm_recovery_network_mapping` - the deprecated resource has been removed [GH-5816] +* `azurerm_recovery_replicated_vm` - the deprecated resource has been removed [GH-5816] +* `azurerm_recovery_services_fabric` - the deprecated resource has been removed [GH-5816] +* `azurerm_recovery_services_protected_vm` - the deprecated resource has been removed [GH-5816] +* `azurerm_recovery_services_protection_container` - the deprecated resource has been removed [GH-5816] +* `azurerm_recovery_services_protection_container_mapping` - the deprecated resource has been removed [GH-5816] +* `azurerm_recovery_services_protection_policy_vm` - the deprecated resource has been removed [GH-5816] +* `azurerm_recovery_services_replication_policy` - the deprecated resource has been removed [GH-5816] * `azurerm_relay_namespace` - removing the `sku` block in favour of the `sku_name` field [GH-5719] * `azurerm_scheduler_job` - This resource has been removed since it was deprecated [GH-5712] * `azurerm_scheduler_job_collection` - This resource has been removed since it was deprecated [GH-5712] From 8bf7e312ad7294aa5864718ecd53160989a661a4 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sat, 22 Feb 2020 11:35:50 +0100 Subject: [PATCH 344/498] r/app_service_plan: increasing the timeouts to 60m for ASE's --- .../internal/services/web/resource_arm_app_service_plan.go | 6 +++--- website/docs/r/app_service_plan.html.markdown | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/azurerm/internal/services/web/resource_arm_app_service_plan.go b/azurerm/internal/services/web/resource_arm_app_service_plan.go index 3a40be35b8a13..66ac7d4f8e815 100644 --- a/azurerm/internal/services/web/resource_arm_app_service_plan.go +++ b/azurerm/internal/services/web/resource_arm_app_service_plan.go @@ -33,10 +33,10 @@ func resourceArmAppServicePlan() *schema.Resource { }), Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), + Create: schema.DefaultTimeout(60 * time.Minute), Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), + Update: schema.DefaultTimeout(60 * time.Minute), + Delete: schema.DefaultTimeout(60 * time.Minute), }, Schema: map[string]*schema.Schema{ diff --git a/website/docs/r/app_service_plan.html.markdown b/website/docs/r/app_service_plan.html.markdown index 061859390bf04..5a0ce52bd049c 100644 --- a/website/docs/r/app_service_plan.html.markdown +++ b/website/docs/r/app_service_plan.html.markdown @@ -143,10 +143,10 @@ The following attributes are exported: The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: -* `create` - (Defaults to 30 minutes) Used when creating the App Service Plan. -* `update` - (Defaults to 30 minutes) Used when updating the App Service Plan. +* `create` - (Defaults to 60 minutes) Used when creating the App Service Plan. +* `update` - (Defaults to 60 minutes) Used when updating the App Service Plan. * `read` - (Defaults to 5 minutes) Used when retrieving the App Service Plan. -* `delete` - (Defaults to 30 minutes) Used when deleting the App Service Plan. +* `delete` - (Defaults to 60 minutes) Used when deleting the App Service Plan. ## Import From db64f0d3d39d3d39d5eaeb4c8d129ad7492582e7 Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Sat, 22 Feb 2020 11:25:47 -0600 Subject: [PATCH 345/498] Fix type assertions; simplify cross-resource query example --- ...arm_monitor_scheduled_query_rules_alert.go | 6 ++--- ..._scheduled_query_rules_alert.html.markdown | 27 ++++++++++--------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go index 25ede04fd1690..161439a24acab 100644 --- a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go +++ b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go @@ -379,13 +379,13 @@ func resourceArmMonitorScheduledQueryRulesAlertDelete(d *schema.ResourceData, me } func expandMonitorScheduledQueryRulesAlertingAction(d *schema.ResourceData) *insights.AlertingAction { - alertActionRaw := d.Get("action").(*schema.Set).List() + alertActionRaw := d.Get("action").([]interface{}) alertAction := expandMonitorScheduledQueryRulesAlertAction(alertActionRaw) severityRaw := d.Get("severity").(int) severity := strconv.Itoa(severityRaw) throttling := d.Get("throttling").(int) - triggerRaw := d.Get("trigger").(*schema.Set).List() + triggerRaw := d.Get("trigger").([]interface{}) trigger := expandMonitorScheduledQueryRulesAlertTrigger(triggerRaw) action := insights.AlertingAction{ @@ -472,7 +472,7 @@ func expandMonitorScheduledQueryRulesAlertTrigger(input []interface{}) *insights if !ok { continue } - metricTriggerRaw := v["metric_trigger"].(*schema.Set).List() + metricTriggerRaw := v["metric_trigger"].([]interface{}) result.ThresholdOperator = insights.ConditionalOperator(v["operator"].(string)) result.Threshold = utils.Float(v["threshold"].(float64)) diff --git a/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown b/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown index d00a1f636a4f0..63b0d54188595 100644 --- a/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown +++ b/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown @@ -25,19 +25,17 @@ resource "azurerm_application_insights" "example" { application_type = "web" } -resource "azurerm_log_analytics_workspace" "example" { - name = "loganalytics" - location = azurerm_resource_group.example.location +resource "azurerm_application_insights" "example2" { + name = "appinsights2" + location = var.location resource_group_name = azurerm_resource_group.example.name - sku = "PerGB2018" - retention_in_days = 30 + application_type = "web" } - # Example: Alerting Action with result count trigger # Alert if more than three HTTP requests returned a >= 500 result code # in the past 30 minutes -resource "azurerm_scheduled_query_rule_alert" "example" { +resource "azurerm_monitor_scheduled_query_rules_alert" "example" { name = format("%s-queryrule", var.prefix) location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name @@ -63,7 +61,7 @@ resource "azurerm_scheduled_query_rule_alert" "example" { # Example: Alerting Action with metric trigger # Alert if more than three HTTP requests returned a >= 500 result code # in the past 30 minutes that have the same operation (ie: GET /) -resource "azurerm_scheduled_query_rule_alert" "example" { +resource "azurerm_monitor_scheduled_query_rules_alert" "example" { name = format("%s-queryrule", var.prefix) location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name @@ -93,13 +91,16 @@ resource "azurerm_scheduled_query_rule_alert" "example" { } # Example: Alerting Action Cross-Resource -resource "azurerm_scheduled_query_rule_alert" "example2" { +# Enables use of cross-resource queries to analyze query results across +# multiple Application Insights or Log Analytics resources. +# Alert if more than three HTTP requests returned a >= 500 result code +# in either of the Insights resources in the past 30 minutes. +resource "azurerm_monitor_scheduled_query_rules_alert" "example2" { name = format("%s-queryrule2", var.prefix) location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name - authorized_resource_ids = [azurerm_application_insights.example.id, - azurerm_log_analytics_workspace.example.id] + authorized_resource_ids = [azurerm_application_insights.example2.id] action { action_group = [] email_subject = "Email Header" @@ -109,8 +110,8 @@ resource "azurerm_scheduled_query_rule_alert" "example2" { description = "Scheduled query rule Alerting Action cross-resource example" enabled = true frequency = 5 - query = format("let a=workspace('%s').Perf | where Computer='dependency' and TimeGenerated > ago(1h) | where ObjectName == 'Processor' and CounterName == '%% Processor Time' | summarize cpu=avg(CounterValue) by bin(TimeGenerated, 1m) | extend ts=tostring(TimeGenerated); let b=requests | where resultCode == '200' and timestamp > ago(1h) | summarize reqs=count() by bin(timestamp, 1m) | extend ts = tostring(timestamp); a | join b on $left.ts == $right.ts | where cpu > 50 and reqs > 5", azurerm_log_analytics_workspace.test.id) - severity = "1" + query = format("let a=requests | where toint(resultCode) >= 500 | extend fail=1; let b=app('%s').requests | where toint(resultCode) >= 500 | extend fail=1; a | join b on fail", azurerm_application_insights.example2.id) + severity = 1 time_window = 30 trigger { operator = "GreaterThan" From 37b2c396cccbe6271262b6ba363f7518a092cf8c Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Sat, 22 Feb 2020 12:27:01 -0600 Subject: [PATCH 346/498] Review updates - Add metric alerts to LogToMetric tests and docs - Fix type assert from change to TypeList - Fix a couple typos --- ...e_arm_monitor_scheduled_query_rules_log.go | 2 +- ...onitor_scheduled_query_rules_alert_test.go | 4 +- ..._monitor_scheduled_query_rules_log_test.go | 74 +++++++++++-------- ...or_scheduled_query_rules_log.html.markdown | 54 +++++++++++--- 4 files changed, 90 insertions(+), 44 deletions(-) diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go index 1ff8e7ca63ae2..3027f48b85513 100644 --- a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go +++ b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go @@ -301,7 +301,7 @@ func expandMonitorScheduledQueryRulesLogCriteria(input []interface{}) *[]insight } func expandMonitorScheduledQueryRulesLogToMetricAction(d *schema.ResourceData) *insights.LogToMetricAction { - criteriaRaw := d.Get("criteria").(*schema.Set).List() + criteriaRaw := d.Get("criteria").([]interface{}) criteria := expandMonitorScheduledQueryRulesLogCriteria(criteriaRaw) action := insights.LogToMetricAction{ diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go index 3ecf0a52bb0a0..274c4f0d9636e 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go @@ -258,8 +258,8 @@ resource "azurerm_application_insights" "test" { resource "azurerm_log_analytics_workspace" "test" { name = "acctestWorkspace-%d" - location = azurerm_resource_group.test.location - resource_group_name = azurerm_resource_group.test.name + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" sku = "PerGB2018" retention_in_days = 30 } diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go index fb742cd513ee2..d1ea512b1dd31 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go @@ -82,17 +82,12 @@ resource "azurerm_resource_group" "test" { location = "%s" } -resource "azurerm_application_insights" "test" { - name = "acctestAppInsights-%d" +resource "azurerm_log_analytics_workspace" "test" { + name = "acctestWorkspace-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - application_type = "web" -} - -resource "azurerm_monitor_action_group" "test" { - name = "acctestActionGroup-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - short_name = "acctestag" + sku = "PerGB2018" + retention_in_days = 30 } resource "azurerm_monitor_scheduled_query_rules_log" "test" { @@ -100,18 +95,18 @@ resource "azurerm_monitor_scheduled_query_rules_log" "test" { resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" - data_source_id = "${azurerm_application_insights.test.id}" + data_source_id = "${azurerm_log_analytics_workspace.test.id}" criteria { metric_name = "Average_%% Idle Time" dimension { name = "InstanceName" operator = "Include" - values = ["50"] + values = ["1"] } } } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) } func testAccAzureRMMonitorScheduledQueryRulesLogToMetricActionConfig_update(data acceptance.TestData) string { @@ -121,17 +116,12 @@ resource "azurerm_resource_group" "test" { location = "%s" } -resource "azurerm_application_insights" "test" { - name = "acctestAppInsights-%d" +resource "azurerm_log_analytics_workspace" "test" { + name = "acctestWorkspace-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - application_type = "web" -} - -resource "azurerm_monitor_action_group" "test" { - name = "acctestActionGroup-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - short_name = "acctestag" + sku = "PerGB2018" + retention_in_days = 30 } resource "azurerm_monitor_scheduled_query_rules_log" "test" { @@ -141,18 +131,18 @@ resource "azurerm_monitor_scheduled_query_rules_log" "test" { description = "test log to metric action" enabled = true - data_source_id = "${azurerm_application_insights.test.id}" + data_source_id = "${azurerm_log_analytics_workspace.test.id}" criteria { metric_name = "Average_%% Idle Time" dimension { - name = "Computer" + name = "InstanceName" operator = "Include" - values = ["25"] + values = ["2"] } } } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) } func testAccAzureRMMonitorScheduledQueryRulesLogToMetricActionConfig_complete(data acceptance.TestData) string { @@ -162,11 +152,12 @@ resource "azurerm_resource_group" "test" { location = "%s" } -resource "azurerm_application_insights" "test" { - name = "acctestAppInsights-%d" +resource "azurerm_log_analytics_workspace" "test" { + name = "acctestWorkspace-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - application_type = "web" + sku = "PerGB2018" + retention_in_days = 30 } resource "azurerm_monitor_action_group" "test" { @@ -182,18 +173,37 @@ resource "azurerm_monitor_scheduled_query_rules_log" "test" { description = "test log to metric action" enabled = true - data_source_id = "${azurerm_application_insights.test.id}" + data_source_id = "${azurerm_log_analytics_workspace.test.id}" criteria { metric_name = "Average_%% Idle Time" dimension { - name = "InstanceName" + name = "Computer" operator = "Include" - values = ["50"] + values = ["*"] } } } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) + +resource "azurerm_monitor_metric_alert" "test" { + name = "acctestmal-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + scopes = ["${azurerm_log_analytics_workspace.test.id}"] + description = "Action will be triggered when Average %% Idle Time is less than 10." + + criteria { + metric_namespace = "Microsoft.OperationalInsights/workspaces" + metric_name = "${azurerm_monitor_scheduled_query_rules_log.test.criteria[0].metric_name}" + aggregation = "Average" + operator = "LessThan" + threshold = 10 + } + + action { + action_group_id = "${azurerm_monitor_action_group.test.id}" + } +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) } func testCheckAzureRMMonitorScheduledQueryRulesLogDestroy(s *terraform.State) error { diff --git a/website/docs/r/monitor_scheduled_query_rules_log.html.markdown b/website/docs/r/monitor_scheduled_query_rules_log.html.markdown index d804aa2180d2d..20d2db6663e96 100644 --- a/website/docs/r/monitor_scheduled_query_rules_log.html.markdown +++ b/website/docs/r/monitor_scheduled_query_rules_log.html.markdown @@ -18,30 +18,66 @@ resource "azurerm_resource_group" "example" { location = "West US" } -resource "azurerm_application_insights" "example" { - name = "appinsights" - location = var.location +resource "azurerm_log_analytics_workspace" "example" { + name = "loganalytics" + location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name - application_type = "web" + sku = "PerGB2018" + retention_in_days = 30 } -resource "azurerm_scheduled_query_rule_log" "example3" { - name = format("%s-queryrule3", var.prefix) +# Create Azure Monitor metric from log analytics data for +# the Computer named 'targetVM'. +resource "azurerm_scheduled_query_rule_log" "example" { + name = format("%s-queryrule", var.prefix) location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name criteria { metric_name = "Average_% Idle Time" dimensions { - name = "InstanceName" + name = "Computer" operator = "Include" - values = [""] + values = ["targetVM"] } } - data_source_id = azurerm_application_insights.example.id + data_source_id = azurerm_log_analytics_workspace.example.id description = "Scheduled query rule LogToMetric example" enabled = true } + +resource "azurerm_monitor_action_group" "example" { + name = "example-actiongroup" + resource_group_name = azurerm_resource_group.example.name + short_name = "exampleact" + + webhook_receiver { + name = "callmyapi" + service_uri = "http://example.com/alert" + } +} + +# Create an alert on the new Scheduled Query Rules metric +resource "azurerm_monitor_metric_alert" "example" { + name = "example-metricalert" + resource_group_name = azurerm_resource_group.example.name + scopes = [azurerm_log_analytics_workspace.example.id] + description = "Action will be triggered when Average_% Idle Time metric is less than 10." + frequency = "PT1M" + window_size = "PT5M" + + criteria { + metric_namespace = "Microsoft.OperationalInsights/workspaces" + metric_name = azurerm_scheduled_query_rules_log.example.criteria[0].metric_name + aggregation = "Average" + operator = "LessThan" + threshold = 10 + } + + action { + action_group_id = azurerm_monitor_action_group.example.id + } +} ``` ## Argument Reference From 347753ae1a95e52208d69dee813976a0dd310ad5 Mon Sep 17 00:00:00 2001 From: David McPike Date: Sat, 22 Feb 2020 15:33:43 -0600 Subject: [PATCH 347/498] Add MaxItems for cross-resource query --- .../monitor/resource_arm_monitor_scheduled_query_rules_alert.go | 1 + 1 file changed, 1 insertion(+) diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go index 161439a24acab..4b8b335fafd1f 100644 --- a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go +++ b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go @@ -52,6 +52,7 @@ func resourceArmMonitorScheduledQueryRulesAlert() *schema.Resource { "authorized_resource_ids": { Type: schema.TypeSet, Optional: true, + MaxItems: 100, Elem: &schema.Schema{ Type: schema.TypeString, ValidateFunc: azure.ValidateResourceID, From f9f006e8cfd97aa915aea6db9ff7ebd1b0e56a67 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 23 Feb 2020 09:51:28 +0100 Subject: [PATCH 348/498] r/app_service_environment: checking the ID's from the state --- .../web/resource_arm_app_service_plan.go | 14 ++++-- .../app_service_environment_resource_test.go | 45 +------------------ 2 files changed, 11 insertions(+), 48 deletions(-) diff --git a/azurerm/internal/services/web/resource_arm_app_service_plan.go b/azurerm/internal/services/web/resource_arm_app_service_plan.go index 66ac7d4f8e815..6e9d7e38421d7 100644 --- a/azurerm/internal/services/web/resource_arm_app_service_plan.go +++ b/azurerm/internal/services/web/resource_arm_app_service_plan.go @@ -264,17 +264,23 @@ func resourceArmAppServicePlanRead(d *schema.ResourceData, meta interface{}) err d.Set("kind", resp.Kind) if props := resp.AppServicePlanProperties; props != nil { - if profile := props.HostingEnvironmentProfile; profile != nil { - d.Set("app_service_environment_id", profile.ID) + appServiceEnvironmentId := "" + if props.HostingEnvironmentProfile != nil && props.HostingEnvironmentProfile.ID != nil { + appServiceEnvironmentId = *props.HostingEnvironmentProfile.ID } + d.Set("app_service_environment_id", appServiceEnvironmentId) + maximumNumberOfWorkers := 0 if props.MaximumNumberOfWorkers != nil { - d.Set("maximum_number_of_workers", int(*props.MaximumNumberOfWorkers)) + maximumNumberOfWorkers = int(*props.MaximumNumberOfWorkers) } + d.Set("maximum_number_of_workers", maximumNumberOfWorkers) + maximumElasticWorkerCount := 0 if props.MaximumElasticWorkerCount != nil { - d.Set("maximum_elastic_worker_count", int(*props.MaximumElasticWorkerCount)) + maximumElasticWorkerCount = int(*props.MaximumElasticWorkerCount) } + d.Set("maximum_elastic_worker_count", maximumElasticWorkerCount) d.Set("per_site_scaling", props.PerSiteScaling) d.Set("reserved", props.Reserved) 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 0e0ef9687f649..e70014f111228 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 @@ -118,7 +118,7 @@ func TestAccAzureRMAppServiceEnvironment_withAppServicePlan(t *testing.T) { Config: testAccAzureRMAppServiceEnvironment_withAppServicePlan(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMAppServiceEnvironmentExists(data.ResourceName), - testCheckAppServicePlanMemberOfAppServiceEnvironment(data.ResourceName, aspData.ResourceName), + resource.TestCheckResourceAttrPair(data.ResourceName, "id", aspData.ResourceName, "app_service_environment_id"), ), }, data.ImportStep(), @@ -182,49 +182,6 @@ func testCheckAzureRMAppServiceEnvironmentDestroy(s *terraform.State) error { return nil } -func testCheckAppServicePlanMemberOfAppServiceEnvironment(ase string, asp string) resource.TestCheckFunc { - return func(s *terraform.State) error { - aseClient := acceptance.AzureProvider.Meta().(*clients.Client).Web.AppServiceEnvironmentsClient - aspClient := acceptance.AzureProvider.Meta().(*clients.Client).Web.AppServicePlansClient - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - - aseResource, ok := s.RootModule().Resources[ase] - if !ok { - return fmt.Errorf("Not found: %s", ase) - } - - appServiceEnvironmentName := aseResource.Primary.Attributes["name"] - appServiceEnvironmentResourceGroup := aseResource.Primary.Attributes["resource_group_name"] - - aseResp, err := aseClient.Get(ctx, appServiceEnvironmentResourceGroup, appServiceEnvironmentName) - if err != nil { - if utils.ResponseWasNotFound(aseResp.Response) { - return fmt.Errorf("Bad: App Service Environment %q (resource group %q) does not exist: %+v", appServiceEnvironmentName, appServiceEnvironmentResourceGroup, err) - } - } - - aspResource, ok := s.RootModule().Resources[asp] - if !ok { - return fmt.Errorf("Not found: %s", ase) - } - - appServicePlanName := aspResource.Primary.Attributes["name"] - appServicePlanResourceGroup := aspResource.Primary.Attributes["resource_group_name"] - - aspResp, err := aspClient.Get(ctx, appServicePlanResourceGroup, appServicePlanName) - if err != nil { - if utils.ResponseWasNotFound(aseResp.Response) { - return fmt.Errorf("Bad: App Service Plan %q (resource group %q) does not exist: %+v", appServicePlanName, appServicePlanResourceGroup, err) - } - } - if aspResp.HostingEnvironmentProfile.ID != aseResp.ID { - return fmt.Errorf("Bad: App Service Plan %s not a member of App Service Environment %s", appServicePlanName, appServiceEnvironmentName) - } - - return nil - } -} - func testAccAzureRMAppServiceEnvironment_basic(data acceptance.TestData) string { template := testAccAzureRMAppServiceEnvironment_template(data) return fmt.Sprintf(` From 3480dbbd3a90585ecdd47bfaa16ae4b9bcc95843 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 23 Feb 2020 10:48:26 +0100 Subject: [PATCH 349/498] r/(monitor_)metric_alert_rule: removing since these are EOL Fixes #5766 --- website/docs/guides/2.0-upgrade-guide.html.markdown | 6 ++---- .../migrating-between-renamed-resources.html.markdown | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index 6ec10281d22f2..39076e9fb2682 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -473,13 +473,11 @@ The deprecated `sku` block has been replaced by the `sku_name` field and will be ### Resource: `azurerm_metric_alertrule` -The `azurerm_metric_alertrule` resource will be deprecated in favour of the resource: `azurerm_monitor_metric_alert`. - +The `azurerm_metric_alertrule` resource will be removed since this is no longer supported by Azure. ### Resource: `azurerm_monitor_metric_alertrule` -The `azurerm_monitor_metric_alertrule` resource will be deprecated in favour of the resource: `azurerm_monitor_metric_alert`. - +The `azurerm_monitor_metric_alertrule` resource will be removed since this is no longer supported by Azure. ### Resource: `azurerm_mysql_server` diff --git a/website/docs/guides/migrating-between-renamed-resources.html.markdown b/website/docs/guides/migrating-between-renamed-resources.html.markdown index bb761cf208b7b..792401ac713f4 100644 --- a/website/docs/guides/migrating-between-renamed-resources.html.markdown +++ b/website/docs/guides/migrating-between-renamed-resources.html.markdown @@ -22,7 +22,6 @@ This guide shows how to migrate from a resource which have been deprecated to it | azurerm_log_analytics_workspace_linked_service | azurerm_log_analytics_linked_service | | azurerm_iot_dps_certificate | azurerm_iothub_dps_certificate | | azurerm_iot_dps | azurerm_iothub_dps | -| azurerm_metric_alertrule | azurerm_monitor_metric_alertrule | | azurerm_private_link_endpoint | azurerm_private_endpoint | | azurerm_private_link_endpoint_connection (Data Source) | azurerm_private_endpoint_connection | | azurerm_recovery_network_mapping | azurerm_site_recovery_network_mapping | From c7d0095194af715068b2adfce8a8248faf6e0467 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Sun, 23 Feb 2020 18:47:28 +0100 Subject: [PATCH 350/498] updating to include #5508 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e85b6aa168203..4b64206521513 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,9 @@ FEATURES: * **Custom Timeouts:** - all resources within the Azure Provider now allow configuring custom timeouts - please [see Terraform's Timeout documentation](https://www.terraform.io/docs/configuration/resources.html#operation-timeouts) and the documentation in each data source resource for more information. * **Requires Import:** The Azure Provider now checks for the presence of an existing resource prior to creating it - which means that if you try and create a resource which already exists (without importing it) you'll be prompted to import this into the state. +* **New Data Source:** `azurerm_app_service_environment [GH-5508] * **New Data Source:** `azurerm_eventhub_authorization_rule` [GH-5805] +* **New Resource:** `azurerm_app_service_environment [GH-5508] * **New Resource:** `azurerm_express_route_gateway` [GH-5523] * **New Resource:** `azurerm_linux_virtual_machine` [GH-5705] * **New Resource:** `azurerm_linux_virtual_machine_scale_set` [GH-5705] From 2be06d68725744261fdd265ee660fab9ac433073 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 23 Feb 2020 18:48:52 +0100 Subject: [PATCH 351/498] sidebar: removing a dead link --- website/azurerm.erb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/website/azurerm.erb b/website/azurerm.erb index 083baf1ffd817..e051dae81b238 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -1979,10 +1979,6 @@
      • Recovery Services
          -
        • - azurerm_recovery_services_replicated_vm -
          • -
        • azurerm_recovery_services_vault
          • From edf8e37693ac7ab7c6d525053b21cdd73bf5c1b1 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 23 Feb 2020 18:54:23 +0100 Subject: [PATCH 352/498] building: removing references to dead tests --- ...resource_arm_network_ddos_protection_plan_test.go | 6 ------ .../tests/resource_arm_network_watcher_test.go | 12 ------------ 2 files changed, 18 deletions(-) diff --git a/azurerm/internal/services/network/tests/resource_arm_network_ddos_protection_plan_test.go b/azurerm/internal/services/network/tests/resource_arm_network_ddos_protection_plan_test.go index a246d3c33d1b4..6777f2a94a65d 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_ddos_protection_plan_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_ddos_protection_plan_test.go @@ -25,12 +25,6 @@ func TestAccAzureRMNetworkDDoSProtectionPlan(t *testing.T) { "datasource": { "basic": testAccAzureRMNetworkDDoSProtectionPlanDataSource_basic, }, - "deprecated": { - "basic": testAccAzureRMDDoSProtectionPlan_basic, - "requiresImport": testAccAzureRMDDoSProtectionPlan_requiresImport, - "withTags": testAccAzureRMDDoSProtectionPlan_withTags, - "disappears": testAccAzureRMDDoSProtectionPlan_disappears, - }, } for group, steps := range testCases { diff --git a/azurerm/internal/services/network/tests/resource_arm_network_watcher_test.go b/azurerm/internal/services/network/tests/resource_arm_network_watcher_test.go index 855f58eec3365..3160cf96cb172 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_watcher_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_watcher_test.go @@ -28,18 +28,6 @@ func TestAccAzureRMNetworkWatcher(t *testing.T) { "DataSource": { "basic": testAccDataSourceAzureRMNetworkWatcher_basic, }, - "ConnectionMonitorOld": { - "addressBasic": testAccAzureRMConnectionMonitor_addressBasic, - "addressComplete": testAccAzureRMConnectionMonitor_addressComplete, - "addressUpdate": testAccAzureRMConnectionMonitor_addressUpdate, - "vmBasic": testAccAzureRMConnectionMonitor_vmBasic, - "vmComplete": testAccAzureRMConnectionMonitor_vmComplete, - "vmUpdate": testAccAzureRMConnectionMonitor_vmUpdate, - "destinationUpdate": testAccAzureRMConnectionMonitor_destinationUpdate, - "missingDestinationInvalid": testAccAzureRMConnectionMonitor_missingDestination, - "bothDestinationsInvalid": testAccAzureRMConnectionMonitor_conflictingDestinations, - "requiresImport": testAccAzureRMConnectionMonitor_requiresImport, - }, "PacketCaptureOld": { "localDisk": testAccAzureRMPacketCapture_localDisk, "storageAccount": testAccAzureRMPacketCapture_storageAccount, From fb8e38281a8073ac4ef5bfbbf7bd425ef256e647 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 23 Feb 2020 19:37:57 +0100 Subject: [PATCH 353/498] r/storage_account: locking on the correct key during update --- azurerm/internal/services/iothub/resource_arm_iothub.go | 2 ++ .../services/storage/resource_arm_storage_account.go | 7 ++++--- .../storage/resource_arm_storage_account_network_rules.go | 2 -- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/azurerm/internal/services/iothub/resource_arm_iothub.go b/azurerm/internal/services/iothub/resource_arm_iothub.go index 270efa6c597c5..f0587350b78b6 100644 --- a/azurerm/internal/services/iothub/resource_arm_iothub.go +++ b/azurerm/internal/services/iothub/resource_arm_iothub.go @@ -26,6 +26,8 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) +// TODO: outside of this pr make this private + var IothubResourceName = "azurerm_iothub" func suppressIfTypeIsNot(t string) schema.SchemaDiffSuppressFunc { diff --git a/azurerm/internal/services/storage/resource_arm_storage_account.go b/azurerm/internal/services/storage/resource_arm_storage_account.go index 5d7991f2fc27c..3a924d8395df6 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account.go @@ -20,7 +20,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/locks" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/iothub" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" @@ -31,6 +30,8 @@ import ( const blobStorageAccountDefaultAccessTier = "Hot" +var storageAccountResourceName = "azurerm_storage_account" + func resourceArmStorageAccount() *schema.Resource { return &schema.Resource{ Create: resourceArmStorageAccountCreate, @@ -749,8 +750,8 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e storageAccountName := id.Path["storageAccounts"] resourceGroupName := id.ResourceGroup - locks.ByName(storageAccountName, iothub.IothubResourceName) - defer locks.UnlockByName(storageAccountName, iothub.IothubResourceName) + locks.ByName(storageAccountName, storageAccountResourceName) + defer locks.UnlockByName(storageAccountName, storageAccountResourceName) accountTier := d.Get("account_tier").(string) replicationType := d.Get("account_replication_type").(string) diff --git a/azurerm/internal/services/storage/resource_arm_storage_account_network_rules.go b/azurerm/internal/services/storage/resource_arm_storage_account_network_rules.go index 7bbfda7558ce8..2d8f676f3c881 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account_network_rules.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account_network_rules.go @@ -17,8 +17,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -var storageAccountResourceName = "azurerm_storage_account" - func resourceArmStorageAccountNetworkRules() *schema.Resource { return &schema.Resource{ Create: resourceArmStorageAccountNetworkRulesCreateUpdate, From efe21993be54560949700260418bf3e594516ad8 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Sun, 23 Feb 2020 22:09:10 +0100 Subject: [PATCH 354/498] updating to include #5842 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b64206521513..28da51f29de6e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -181,6 +181,7 @@ BUG FIXES: * `azurerm_eventhub_namespace` - the field `ip_rule` within the `network_rulesets` block now supports a maximum of 128 items [GH-5831] * `azurerm_eventhub_namespace` - the field `virtual_network_rule` within the `network_rulesets` block now supports a maximum of 128 items [GH-5831] * `azurerm_linux_virtual_machine` - using the delete custom timeout during deletion [GH-5764] +* `azurerm_netapp_account` - allowing the `-` character to be used in the `name` field [GH-5842] * `azurerm_network_interface` - the `dns_servers` field now respects ordering [GH-5784] * `azurerm_public_ip_prefix` - fixing the validation for the `prefix_length` to match the Azure API [GH-5693] * `azurerm_recovery_services_vault` - using the requested cloud rather than the default [GH-5825] From 83102459fea5a9f12f32270d69b91d77f8972cee Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 23 Feb 2020 22:09:51 +0100 Subject: [PATCH 355/498] r/storage_account_customer_managed_key: comments from code review ``` $ TF_ACC=1 go test -v ./azurerm/internal/services/storage/tests/ -timeout=60m -run=TestAccAzureRMStorageAccountCustomerManagedKey === RUN TestAccAzureRMStorageAccountCustomerManagedKey_basic === PAUSE TestAccAzureRMStorageAccountCustomerManagedKey_basic === RUN TestAccAzureRMStorageAccountCustomerManagedKey_requiresImport === PAUSE TestAccAzureRMStorageAccountCustomerManagedKey_requiresImport === RUN TestAccAzureRMStorageAccountCustomerManagedKey_updateKey === PAUSE TestAccAzureRMStorageAccountCustomerManagedKey_updateKey === CONT TestAccAzureRMStorageAccountCustomerManagedKey_basic === CONT TestAccAzureRMStorageAccountCustomerManagedKey_updateKey === CONT TestAccAzureRMStorageAccountCustomerManagedKey_requiresImport --- PASS: TestAccAzureRMStorageAccountCustomerManagedKey_requiresImport (381.82s) --- PASS: TestAccAzureRMStorageAccountCustomerManagedKey_updateKey (410.36s) --- PASS: TestAccAzureRMStorageAccountCustomerManagedKey_basic (507.32s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/storage/tests 507.376s ``` --- azurerm/helpers/azure/key_vault.go | 64 ----- .../services/keyvault/parse/key_vault_id.go | 31 +++ ...rm_storage_account_customer_managed_key.go | 235 ++++++++++-------- ...orage_account_customer_managed_key_test.go | 207 ++++++++------- .../resource_arm_storage_account_test.go | 1 + website/docs/d/key_vault_key.html.markdown | 2 +- ...account_customer_managed_key.html.markdown | 101 ++------ 7 files changed, 292 insertions(+), 349 deletions(-) create mode 100644 azurerm/internal/services/keyvault/parse/key_vault_id.go diff --git a/azurerm/helpers/azure/key_vault.go b/azurerm/helpers/azure/key_vault.go index 36233887e95b2..7957380bb5946 100644 --- a/azurerm/helpers/azure/key_vault.go +++ b/azurerm/helpers/azure/key_vault.go @@ -3,7 +3,6 @@ package azure import ( "context" "fmt" - "time" "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2018-02-14/keyvault" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" @@ -119,66 +118,3 @@ func KeyVaultExists(ctx context.Context, client *keyvault.VaultsClient, keyVault return true, nil } - -func KeyVaultGetSoftDeletedState(ctx context.Context, client *keyvault.VaultsClient, name string, location string) (deleteDate interface{}, purgeDate interface{}, err error) { - softDel, err := client.GetDeleted(ctx, name, location) - if err != nil { - return nil, nil, fmt.Errorf("unable to get soft delete state information: %+v", err) - } - - // the logic is this way because the GetDeleted call will return an existing key vault - // that is not soft deleted, but the Deleted Vault properties will be nil - if props := softDel.Properties; props != nil { - var delDate interface{} - var purgeDate interface{} - - if dd := props.DeletionDate; dd != nil { - delDate = (*dd).Format(time.RFC3339) - } - if pg := props.ScheduledPurgeDate; pg != nil { - purgeDate = (*pg).Format(time.RFC3339) - } - if delDate != nil && purgeDate != nil { - return delDate, purgeDate, nil - } - } - - // this means we found an existing key vault that is not soft deleted - return nil, nil, nil -} - -func KeyVaultIsSoftDeleteAndPurgeProtected(ctx context.Context, client *keyvault.VaultsClient, keyVaultId string) bool { - name, resourceGroup, err := ParseNameAndResourceGroupFromResourceId(keyVaultId, "vaults") - if err != nil { - return false - } - - resp, err := client.Get(ctx, resourceGroup.(string), name.(string)) - - if props := resp.Properties; props != nil { - softDeleteEnabled := false - purgeProtectionEnabled := false - - if esd := props.EnableSoftDelete; esd != nil { - softDeleteEnabled = *esd - } - if epp := props.EnableSoftDelete; epp != nil { - purgeProtectionEnabled = *epp - } - - if softDeleteEnabled && purgeProtectionEnabled { - return true - } - } - - return false -} - -func ParseNameAndResourceGroupFromResourceId(resourceId string, namePathKey string) (resourceName interface{}, resourceGroup interface{}, err error) { - id, err := ParseAzureResourceID(resourceId) - if err != nil { - return nil, nil, err - } - - return id.Path[namePathKey], id.ResourceGroup, nil -} diff --git a/azurerm/internal/services/keyvault/parse/key_vault_id.go b/azurerm/internal/services/keyvault/parse/key_vault_id.go new file mode 100644 index 0000000000000..65944f1892411 --- /dev/null +++ b/azurerm/internal/services/keyvault/parse/key_vault_id.go @@ -0,0 +1,31 @@ +package parse + +import ( + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type KeyVaultId struct { + Name string + ResourceGroup string +} + +func KeyVaultID(input string) (*KeyVaultId, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, err + } + + account := KeyVaultId{ + ResourceGroup: id.ResourceGroup, + } + + if account.Name, err = id.PopSegment("vaults"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &account, nil +} diff --git a/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go b/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go index e363995ed0424..d0bf0cb672434 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go @@ -2,24 +2,30 @@ package storage import ( "fmt" + "log" "time" "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-04-01/storage" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/locks" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/keyvault/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/storage/parsers" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func resourceArmStorageAccountCustomerManagedKey() *schema.Resource { return &schema.Resource{ - Read: resourceArmStorageAccountCustomerManagedKeyRead, - Create: resourceArmStorageAccountCustomerManagedKeyCreateUpdate, - Update: resourceArmStorageAccountCustomerManagedKeyCreateUpdate, - Delete: resourceArmStorageAccountCustomerManagedKeyDelete, - SchemaVersion: 2, + Create: resourceArmStorageAccountCustomerManagedKeyCreateUpdate, + Read: resourceArmStorageAccountCustomerManagedKeyRead, + Update: resourceArmStorageAccountCustomerManagedKeyCreateUpdate, + Delete: resourceArmStorageAccountCustomerManagedKeyDelete, + + // TODO: this needs a custom ID validating importer Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, }, @@ -35,7 +41,8 @@ func resourceArmStorageAccountCustomerManagedKey() *schema.Resource { "storage_account_id": { Type: schema.TypeString, Required: true, - ValidateFunc: azure.ValidateResourceID, + ForceNew: true, + ValidateFunc: azure.ValidateResourceID, // TODO: validation }, "key_vault_id": { @@ -49,118 +56,176 @@ func resourceArmStorageAccountCustomerManagedKey() *schema.Resource { Required: true, ValidateFunc: validate.NoEmptyStrings, }, + "key_version": { Type: schema.TypeString, Required: true, ValidateFunc: validate.NoEmptyStrings, }, - "key_vault_uri": { - Type: schema.TypeString, - Computed: true, - }, }, } } func resourceArmStorageAccountCustomerManagedKeyCreateUpdate(d *schema.ResourceData, meta interface{}) error { - vaultClient := meta.(*clients.Client).KeyVault.VaultsClient storageClient := meta.(*clients.Client).Storage.AccountsClient - ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) + vaultsClient := meta.(*clients.Client).KeyVault.VaultsClient + ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() - keyVaultId := d.Get("key_vault_id").(string) - keyName := d.Get("key_name").(string) - keyVersion := d.Get("key_version").(string) - storageAccountId := d.Get("storage_account_id").(string) - encryptionServices := true - - storageAccountName, storageAccountResourceGroupName, err := azure.ParseNameAndResourceGroupFromResourceId(storageAccountId, "storageAccounts") + storageAccountIdRaw := d.Get("storage_account_id").(string) + storageAccountId, err := parsers.ParseAccountID(storageAccountIdRaw) if err != nil { return err } - keyVaultAccountName, keyVaultResourceGroupName, err := azure.ParseNameAndResourceGroupFromResourceId(keyVaultId, "vaults") + locks.ByName(storageAccountId.Name, storageAccountResourceName) + defer locks.UnlockByName(storageAccountId.Name, storageAccountResourceName) + + storageAccount, err := storageClient.GetProperties(ctx, storageAccountId.ResourceGroup, storageAccountId.Name, "") + if err != nil { + return fmt.Errorf("Error retrieving Storage Account %q (Resource Group %q): %+v", storageAccountId.Name, storageAccountId.ResourceGroup, err) + } + if storageAccount.AccountProperties == nil { + return fmt.Errorf("Error retrieving Storage Account %q (Resource Group %q): `properties` was nil", storageAccountId.Name, storageAccountId.ResourceGroup) + } + + // since we're mutating the storage account here, we can use that as the ID + resourceId := storageAccountIdRaw + + if d.IsNewResource() { + // whilst this looks superflurious given encryption is enabled by default, due to the way + // the Azure API works this technically can be nil + if storageAccount.AccountProperties.Encryption != nil { + if storageAccount.AccountProperties.Encryption.KeySource == storage.MicrosoftKeyvault { + return tf.ImportAsExistsError("azurerm_storage_account_customer_managed_key", resourceId) + } + } + } + + keyVaultIdRaw := d.Get("key_vault_id").(string) + keyVaultId, err := parse.KeyVaultID(keyVaultIdRaw) if err != nil { return err } - // First check to see if the key vault is configured correctly or not - if !azure.KeyVaultIsSoftDeleteAndPurgeProtected(ctx, vaultClient, keyVaultId) { - return fmt.Errorf("Key Vault %q (Resource Group %q) is not configured correctly, please make sure that both 'soft_delete_enabled' and 'purge_protection_enabled' arguments are set to 'true'", keyVaultAccountName, keyVaultResourceGroupName) + keyVault, err := vaultsClient.Get(ctx, keyVaultId.ResourceGroup, keyVaultId.Name) + if err != nil { + return fmt.Errorf("Error retrieving Key Vault %q (Resource Group %q): %+v", keyVaultId.Name, keyVaultId.ResourceGroup, err) } - pKeyVaultBaseURL, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultClient, keyVaultId) + softDeleteEnabled := false + purgeProtectionEnabled := false + if props := keyVault.Properties; props != nil { + if esd := props.EnableSoftDelete; esd != nil { + softDeleteEnabled = *esd + } + if epp := props.EnablePurgeProtection; epp != nil { + purgeProtectionEnabled = *epp + } + } + if !softDeleteEnabled || !purgeProtectionEnabled { + return fmt.Errorf("Key Vault %q (Resource Group %q) must be configured for both Purge Protection and Soft Delete", keyVaultId.Name, keyVaultId.ResourceGroup) + } + + keyVaultBaseURL, err := azure.GetKeyVaultBaseUrlFromID(ctx, vaultsClient, keyVaultIdRaw) if err != nil { - return fmt.Errorf("Error looking up Key Vault URI from Key Vault %q (Resource Group %q): %+v", keyVaultAccountName, keyVaultResourceGroupName, err) + return fmt.Errorf("Error looking up Key Vault URI from Key Vault %q (Resource Group %q): %+v", keyVaultId.Name, keyVaultId.ResourceGroup, err) } + keyName := d.Get("key_name").(string) + keyVersion := d.Get("key_version").(string) props := storage.AccountUpdateParameters{ AccountPropertiesUpdateParameters: &storage.AccountPropertiesUpdateParameters{ Encryption: &storage.Encryption{ Services: &storage.EncryptionServices{ Blob: &storage.EncryptionService{ - Enabled: utils.Bool(encryptionServices), + Enabled: utils.Bool(true), }, File: &storage.EncryptionService{ - Enabled: utils.Bool(encryptionServices), + Enabled: utils.Bool(true), }, }, KeySource: storage.MicrosoftKeyvault, KeyVaultProperties: &storage.KeyVaultProperties{ KeyName: utils.String(keyName), KeyVersion: utils.String(keyVersion), - KeyVaultURI: utils.String(pKeyVaultBaseURL), + KeyVaultURI: utils.String(keyVaultBaseURL), }, }, }, } - _, err = storageClient.Update(ctx, storageAccountResourceGroupName.(string), storageAccountName.(string), props) - if err != nil { - return fmt.Errorf("Error updating Azure Storage Account %q (Resource Group %q) Customer Managed Key: %+v", storageAccountName, storageAccountResourceGroupName, err) + if _, err = storageClient.Update(ctx, storageAccountId.ResourceGroup, storageAccountId.Name, props); err != nil { + return fmt.Errorf("Error updating Customer Managed Key for Storage Account %q (Resource Group %q): %+v", storageAccountId.Name, storageAccountId.ResourceGroup, err) } - resourceId := fmt.Sprintf("%s/customerManagedKey", storageAccountId) d.SetId(resourceId) - return resourceArmStorageAccountCustomerManagedKeyRead(d, meta) } func resourceArmStorageAccountCustomerManagedKeyRead(d *schema.ResourceData, meta interface{}) error { storageClient := meta.(*clients.Client).Storage.AccountsClient + vaultsClient := meta.(*clients.Client).KeyVault.VaultsClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() - storageAccountId := d.Get("storage_account_id").(string) - keyVaultId := d.Get("key_vault_id").(string) - - d.Set("storage_account_id", storageAccountId) - d.Set("key_vault_id", keyVaultId) - - name, resGroup, err := azure.ParseNameAndResourceGroupFromResourceId(storageAccountId, "storageAccounts") + storageAccountId, err := parsers.ParseAccountID(d.Id()) if err != nil { return err } - resp, err := storageClient.GetProperties(ctx, resGroup.(string), name.(string), "") + storageAccount, err := storageClient.GetProperties(ctx, storageAccountId.ResourceGroup, storageAccountId.Name, "") if err != nil { - if utils.ResponseWasNotFound(resp.Response) { + if utils.ResponseWasNotFound(storageAccount.Response) { + log.Printf("[DEBUG] Storage Account %q could not be found in Resource Group %q - removing from state!", storageAccountId.Name, storageAccountId.ResourceGroup) d.SetId("") return nil } - return fmt.Errorf("Error reading the state of AzureRM Storage Account %q (Resource Group %q): %+v", name, resGroup, err) + + return fmt.Errorf("Error retrieving Storage Account %q (Resource Group %q): %+v", storageAccountId.Name, storageAccountId.ResourceGroup, err) + } + if storageAccount.AccountProperties == nil { + return fmt.Errorf("Error retrieving Storage Account %q (Resource Group %q): `properties` was nil", storageAccountId.Name, storageAccountId.ResourceGroup) + } + if storageAccount.AccountProperties.Encryption == nil || storageAccount.AccountProperties.Encryption.KeySource != storage.MicrosoftKeyvault { + log.Printf("[DEBUG] Customer Managed Key was not defined for Storage Account %q (Resource Group %q) - removing from state!", storageAccountId.Name, storageAccountId.ResourceGroup) + d.SetId("") + return nil } - if props := resp.AccountProperties; props != nil { - if encryption := props.Encryption; encryption != nil { - if keyVaultProperties := encryption.KeyVaultProperties; keyVaultProperties != nil { - d.Set("key_name", *keyVaultProperties.KeyName) - d.Set("key_version", *keyVaultProperties.KeyVersion) - d.Set("key_vault_uri", *keyVaultProperties.KeyVaultURI) - } + encryption := *storageAccount.AccountProperties.Encryption + + keyName := "" + keyVaultUri := "" + keyVersion := "" + if props := encryption.KeyVaultProperties; props != nil { + if props.KeyName != nil { + keyName = *props.KeyName } + if props.KeyVaultURI != nil { + keyVaultUri = *props.KeyVaultURI + } + if props.KeyVersion != nil { + keyVersion = *props.KeyVersion + } + } + + if keyVaultUri == "" { + return fmt.Errorf("Error retrieving Storage Account %q (Resource Group %q): `properties.encryption.keyVaultProperties.keyVaultUri` was nil") } + keyVaultId, err := azure.GetKeyVaultIDFromBaseUrl(ctx, vaultsClient, keyVaultUri) + if err != nil { + return fmt.Errorf("Error retrieving Key Vault ID from the Base URI %q: %+v", keyVaultUri, err) + } + + // now we have the key vault uri we can look up the ID + + d.Set("storage_account_id", d.Id()) + d.Set("key_vault_id", keyVaultId) + d.Set("key_name", keyName) + d.Set("key_version", keyVersion) + return nil } @@ -169,14 +234,24 @@ func resourceArmStorageAccountCustomerManagedKeyDelete(d *schema.ResourceData, m ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() - storageAccountId := d.Get("storage_account_id").(string) - encryptionServices := true - - storageAccountName, resourceGroupName, err := azure.ParseNameAndResourceGroupFromResourceId(storageAccountId, "storageAccounts") + storageAccountId, err := parsers.ParseAccountID(d.Id()) if err != nil { return err } + locks.ByName(storageAccountId.Name, storageAccountResourceName) + defer locks.UnlockByName(storageAccountId.Name, storageAccountResourceName) + + // confirm it still exists prior to trying to update it, else we'll get an error + storageAccount, err := storageClient.GetProperties(ctx, storageAccountId.ResourceGroup, storageAccountId.Name, "") + if err != nil { + if utils.ResponseWasNotFound(storageAccount.Response) { + return nil + } + + return fmt.Errorf("Error retrieving Storage Account %q (Resource Group %q): %+v", storageAccountId.Name, storageAccountId.ResourceGroup, err) + } + // Since this isn't a real object, just modifying an existing object // "Delete" doesn't really make sense it should really be a "Revert to Default" // So instead of the Delete func actually deleting the Storage Account I am @@ -186,10 +261,10 @@ func resourceArmStorageAccountCustomerManagedKeyDelete(d *schema.ResourceData, m Encryption: &storage.Encryption{ Services: &storage.EncryptionServices{ Blob: &storage.EncryptionService{ - Enabled: utils.Bool(encryptionServices), + Enabled: utils.Bool(true), }, File: &storage.EncryptionService{ - Enabled: utils.Bool(encryptionServices), + Enabled: utils.Bool(true), }, }, KeySource: storage.MicrosoftStorage, @@ -197,53 +272,9 @@ func resourceArmStorageAccountCustomerManagedKeyDelete(d *schema.ResourceData, m }, } - _, err = storageClient.Update(ctx, resourceGroupName.(string), storageAccountName.(string), props) - if err != nil { - return fmt.Errorf("Error deleting AzureRM Storage Account %q (Resource Group %q) %q: %+v", storageAccountName.(string), resourceGroupName.(string), err) + if _, err = storageClient.Update(ctx, storageAccountId.ResourceGroup, storageAccountId.Name, props); err != nil { + return fmt.Errorf("Error removing Customer Managed Key for Storage Account %q (Resource Group %q): %+v", storageAccountId.Name, storageAccountId.ResourceGroup, err) } return nil } - -func resourceArmStorageAccountCustomerManagedKeyImportState(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { - storageClient := meta.(*clients.Client).Storage.AccountsClient - ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) - defer cancel() - - id := d.Id() - - d.Set("storage_account_id", id) - d.Set("key_vault_id", "") - - name, resourceGroup, err := azure.ParseNameAndResourceGroupFromResourceId(id, "storageAccounts") - if err != nil { - return nil, err - } - - resp, err := storageClient.GetProperties(ctx, resourceGroup.(string), name.(string), "") - if err != nil { - if utils.ResponseWasNotFound(resp.Response) { - d.SetId("") - return nil, nil - } - return nil, fmt.Errorf("Error importing the state of AzureRM Storage Account %q (Resource Group %q): %+v", name.(string), resourceGroup.(string), err) - } - - if props := resp.AccountProperties; props != nil { - if encryption := props.Encryption; encryption != nil { - if keyVaultProperties := encryption.KeyVaultProperties; keyVaultProperties != nil { - d.Set("key_name", keyVaultProperties.KeyName) - d.Set("key_version", keyVaultProperties.KeyVersion) - d.Set("key_vault_uri", keyVaultProperties.KeyVaultURI) - } - } - } - - resourceId := fmt.Sprintf("%s/customerManagedKey", id) - d.SetId(resourceId) - - results := make([]*schema.ResourceData, 1) - - results[0] = d - return results, nil -} diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go index 7117033077816..5b94b55c585ab 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go @@ -15,60 +15,74 @@ import ( ) func TestAccAzureRMStorageAccountCustomerManagedKey_basic(t *testing.T) { - parentResourceName := "azurerm_storage_account.test" - data := acceptance.BuildTestData(t, "azurerm_storage_account_customer_managed_key", "custom") - preConfig := testAccAzureRMStorageAccountCustomerManagedKey_basic(data) - postConfig := testAccAzureRMStorageAccountCustomerManagedKey_basicDelete(data) + data := acceptance.BuildTestData(t, "azurerm_storage_account_customer_managed_key", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMStorageAccountDestroyed, + CheckDestroy: testCheckAzureRMStorageAccountDestroy, Steps: []resource.TestStep{ { - Config: preConfig, + Config: testAccAzureRMStorageAccountCustomerManagedKey_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountCustomerManagedKeyExists(data.ResourceName), ), }, + data.ImportStep(), { // Delete the encryption settings resource and verify it is gone - // Whilst making sure the encryption settings on the storage account - // have been reverted to their default state - Config: postConfig, + Config: testAccAzureRMStorageAccountCustomerManagedKey_template(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMStorageAccountExistsWithDefaultSettings(parentResourceName), - testCheckAzureRMStorageAccountCustomerManagedKeyDestroyed(data.ResourceName), + // Then ensure the encryption settings on the storage account + // have been reverted to their default state + testCheckAzureRMStorageAccountExistsWithDefaultSettings("azurerm_storage_account.test"), ), }, }, }) } -func TestAccAzureRMStorageAccountCustomerManagedKey_disappears(t *testing.T) { - parentResourceName := "azurerm_storage_account.test" - data := acceptance.BuildTestData(t, "azurerm_storage_account_customer_managed_key", "custom") - preConfig := testAccAzureRMStorageAccountCustomerManagedKey_basic(data) - postConfig := testAccAzureRMStorageAccountCustomerManagedKey_basicDelete(data) +func TestAccAzureRMStorageAccountCustomerManagedKey_requiresImport(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_storage_account_customer_managed_key", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMStorageAccountDestroyed, + CheckDestroy: testCheckAzureRMStorageAccountDestroy, Steps: []resource.TestStep{ { - Config: preConfig, + Config: testAccAzureRMStorageAccountCustomerManagedKey_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountCustomerManagedKeyExists(data.ResourceName), ), }, + data.RequiresImportErrorStep(testAccAzureRMStorageAccountCustomerManagedKey_requiresImport), + }, + }) +} + +func TestAccAzureRMStorageAccountCustomerManagedKey_updateKey(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_storage_account_customer_managed_key", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMStorageAccountDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMStorageAccountCustomerManagedKey_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMStorageAccountCustomerManagedKeyExists(data.ResourceName), + ), + }, + data.ImportStep(), { - Config: postConfig, + Config: testAccAzureRMStorageAccountCustomerManagedKey_updated(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMStorageAccountExistsWithDefaultSettings(parentResourceName), - testCheckAzureRMStorageAccountCustomerManagedKeyDestroyed(data.ResourceName), + testCheckAzureRMStorageAccountCustomerManagedKeyExists(data.ResourceName), ), }, + data.ImportStep(), }, }) } @@ -136,43 +150,58 @@ func testCheckAzureRMStorageAccountCustomerManagedKeyExists(resourceName string) } } -func testCheckAzureRMStorageAccountDestroyed(s *terraform.State) error { - ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext - conn := acceptance.AzureProvider.Meta().(*clients.Client).Storage.AccountsClient +func testAccAzureRMStorageAccountCustomerManagedKey_basic(data acceptance.TestData) string { + template := testAccAzureRMStorageAccountCustomerManagedKey_template(data) + return fmt.Sprintf(` +%s - for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_storage_account" { - continue - } +resource "azurerm_storage_account_customer_managed_key" "test" { + storage_account_id = azurerm_storage_account.test.id + key_vault_id = azurerm_key_vault.test.id + key_name = azurerm_key_vault_key.first.name + key_version = azurerm_key_vault_key.first.version +} +`, template) +} - name := rs.Primary.Attributes["name"] - resourceGroup := rs.Primary.Attributes["resource_group_name"] +func testAccAzureRMStorageAccountCustomerManagedKey_requiresImport(data acceptance.TestData) string { + template := testAccAzureRMStorageAccountCustomerManagedKey_basic(data) + return fmt.Sprintf(` +%s - resp, err := conn.GetProperties(ctx, resourceGroup, name, "") - if err != nil { - return nil - } +resource "azurerm_storage_account_customer_managed_key" "import" { + storage_account_id = azurerm_storage_account_customer_managed_key.test.storage_account_id + key_vault_id = azurerm_storage_account_customer_managed_key.test.key_vault_id + key_name = azurerm_storage_account_customer_managed_key.test.key_name + key_version = azurerm_storage_account_customer_managed_key.test.key_version +} +`, template) +} - if resp.StatusCode != http.StatusNotFound { - return fmt.Errorf("Storage Account still exists:\n%#v", resp.AccountProperties) - } - } +func testAccAzureRMStorageAccountCustomerManagedKey_updated(data acceptance.TestData) string { + template := testAccAzureRMStorageAccountCustomerManagedKey_template(data) + return fmt.Sprintf(` +%s - return nil +resource "azurerm_key_vault_key" "second" { + name = "second" + key_vault_id = azurerm_key_vault.test.id + key_vault_access_policy_id = azurerm_key_vault_access_policy.storage.id + key_type = "RSA" + key_size = 2048 + key_opts = ["decrypt", "encrypt", "sign", "unwrapKey", "verify", "wrapKey"] } -func testCheckAzureRMStorageAccountCustomerManagedKeyDestroyed(resourceName string) resource.TestCheckFunc { - return func(s *terraform.State) error { - _, ok := s.RootModule().Resources[resourceName] - if !ok { - return nil - } - - return fmt.Errorf("Found: %s", resourceName) - } +resource "azurerm_storage_account_customer_managed_key" "test" { + storage_account_id = azurerm_storage_account.test.id + key_vault_id = azurerm_key_vault.test.id + key_name = azurerm_key_vault_key.second.name + key_version = azurerm_key_vault_key.second.version +} +`, template) } -func testAccAzureRMStorageAccountCustomerManagedKey_basic(data acceptance.TestData) string { +func testAccAzureRMStorageAccountCustomerManagedKey_template(data acceptance.TestData) string { return fmt.Sprintf(` data "azurerm_client_config" "current" {} @@ -184,33 +213,19 @@ provider "azurerm" { } } -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" } resource "azurerm_key_vault" "test" { - name = "vault%d" - location = azurerm_resource_group.testrg.location - resource_group_name = azurerm_resource_group.testrg.name - tenant_id = data.azurerm_client_config.current.tenant_id - sku_name = "standard" - + name = "acctestkv%s" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + tenant_id = data.azurerm_client_config.current.tenant_id + sku_name = "standard" soft_delete_enabled = true purge_protection_enabled = true - - tags = { - environment = "testing" - } -} - -resource "azurerm_key_vault_key" "test" { - name = "key%d" - key_vault_id = azurerm_key_vault.test.id - key_vault_access_policy_id = azurerm_key_vault_access_policy.storage.id - key_type = "RSA" - key_size = 2048 - key_opts = ["decrypt", "encrypt", "sign", "unwrapKey", "verify", "wrapKey"] } resource "azurerm_key_vault_access_policy" "storage" { @@ -225,55 +240,33 @@ resource "azurerm_key_vault_access_policy" "storage" { resource "azurerm_key_vault_access_policy" "client" { key_vault_id = azurerm_key_vault.test.id tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_application_id + object_id = data.azurerm_client_config.current.object_id key_permissions = ["get", "create", "delete", "list", "restore", "recover", "unwrapkey", "wrapkey", "purge", "encrypt", "decrypt", "sign", "verify"] secret_permissions = ["get"] } -resource "azurerm_storage_account" "test" { - name = "unlikely23exst2acct%s" - resource_group_name = azurerm_resource_group.testrg.name - location = azurerm_resource_group.testrg.location - account_tier = "Standard" - account_replication_type = "LRS" - - identity { - type = "SystemAssigned" - } - - tags = { - environment = "testing" - } -} - -resource "azurerm_storage_account_customer_managed_key" "custom" { - storage_account_id = azurerm_storage_account.test.id - key_vault_id = azurerm_key_vault.test.id - key_name = azurerm_key_vault_key.test.name - key_version = azurerm_key_vault_key.test.version -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomStringOfLength(4)) -} +resource "azurerm_key_vault_key" "first" { + name = "first" + key_vault_id = azurerm_key_vault.test.id + key_vault_access_policy_id = azurerm_key_vault_access_policy.storage.id + key_type = "RSA" + key_size = 2048 + key_opts = ["decrypt", "encrypt", "sign", "unwrapKey", "verify", "wrapKey"] -func testAccAzureRMStorageAccountCustomerManagedKey_basicDelete(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { - name = "acctestRG-%d" - location = "%s" + depends_on = [azurerm_key_vault_access_policy.client] } -resource "azurerm_storage_account" "testsa" { - name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" - - location = azurerm_resource_group.testrg.location +resource "azurerm_storage_account" "test" { + name = "acctestsa%s" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location account_tier = "Standard" account_replication_type = "LRS" - tags = { - environment = "production" + identity { + type = "SystemAssigned" } } -`, data.RandomInteger, data.Locations.Primary, data.RandomStringOfLength(4)) +`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go index 12f16a5ed1f2a..23811ddb0629f 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go @@ -325,6 +325,7 @@ func TestAccAzureRMStorageAccount_fileStorageWithUpdate(t *testing.T) { }, }) } + func TestAccAzureRMStorageAccount_storageV2WithUpdate(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_storage_account", "test") diff --git a/website/docs/d/key_vault_key.html.markdown b/website/docs/d/key_vault_key.html.markdown index 8e9128f2ba817..d02dcc30b0506 100644 --- a/website/docs/d/key_vault_key.html.markdown +++ b/website/docs/d/key_vault_key.html.markdown @@ -23,7 +23,7 @@ data "azurerm_key_vault_key" "example" { } output "key_type" { - value = data.azurerm_key_vault_secret.example.key_type + value = data.azurerm_key_vault_key.example.key_type } ``` diff --git a/website/docs/r/storage_account_customer_managed_key.html.markdown b/website/docs/r/storage_account_customer_managed_key.html.markdown index ce782079124da..9e5cb40195acc 100644 --- a/website/docs/r/storage_account_customer_managed_key.html.markdown +++ b/website/docs/r/storage_account_customer_managed_key.html.markdown @@ -3,94 +3,43 @@ subcategory: "Storage" layout: "azurerm" page_title: "Azure Resource Manager: azurerm_storage_account_customer_managed_key" description: |- - Manages the customer managed key of an Azure Storage Account. + Manages a Customer Managed Key for a Storage Account. --- # azurerm_storage_account_customer_managed_key -Manages the customer managed key of an Azure Storage Account. +Manages a Customer Managed Key for a Storage Account. ## Example Usage ```hcl -data "azurerm_client_config" "current" {} - -provider "azurerm" { - features { - key_vault { - purge_soft_delete_on_destroy = false - } - } -} - -resource "azurerm_resource_group" "tfex" { - name = "tfex-RG" - location = "westeurope" -} - -resource "azurerm_key_vault" "tfex" { - name = "tfex-key-vault" - location = azurerm_resource_group.tfex.location - resource_group_name = azurerm_resource_group.tfex.name - tenant_id = data.azurerm_client_config.current.tenant_id - sku_name = "standard" - - soft_delete_enabled = true - purge_protection_enabled = true - - tags = { - environment = "testing" - } -} - -resource "azurerm_key_vault_key" "tfex" { - name = "tfex-key" - key_vault_id = azurerm_key_vault.tfex.id - key_vault_access_policy_id = azurerm_key_vault_access_policy.storage.id - key_type = "RSA" - key_size = 2048 - key_opts = ["decrypt", "encrypt", "sign", "unwrapKey", "verify", "wrapKey"] +data "azurerm_key_vault" "example" { + name = "mykeyvault" + resource_group_name = "some-resource-group" } -resource "azurerm_key_vault_access_policy" "storage" { - key_vault_id = azurerm_key_vault.tfex.id - tenant_id = data.azurerm_client_config.current.tenant_id - object_id = azurerm_storage_account.tfex.identity.0.principal_id - - key_permissions = ["get", "create", "list", "restore", "recover", "unwrapkey", "wrapkey", "purge", "encrypt", "decrypt", "sign", "verify"] - secret_permissions = ["get"] -} - -resource "azurerm_key_vault_access_policy" "client" { - key_vault_id = azurerm_key_vault.tfex.id - tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_application_id - - key_permissions = ["get", "create", "delete", "list", "restore", "recover", "unwrapkey", "wrapkey", "purge", "encrypt", "decrypt", "sign", "verify"] - secret_permissions = ["get"] +data "azurerm_key_vault_key" "example" { + name = "secret-sauce" + key_vault_id = data.azurerm_key_vault.example.id } resource "azurerm_storage_account" "tfex" { - name = "tfexstorageaccount" - resource_group_name = azurerm_resource_group.tfex.name - location = azurerm_resource_group.tfex.location + name = "exampleaccount" + resource_group_name = data.azurerm_key_vault.example.name + location = data.azurerm_key_vault.example.location account_tier = "Standard" account_replication_type = "GRS" identity { type = "SystemAssigned" } - - tags = { - environment = "testing" - } } -resource "azurerm_storage_account_customer_managed_key" "tfex" { - storage_account_id = azurerm_storage_account.tfex.id - key_vault_id = azurerm_key_vault.tfex.id - key_name = azurerm_key_vault_key.tfex.name - key_version = azurerm_key_vault_key.tfex.version +resource "azurerm_storage_account_customer_managed_key" "example" { + storage_account_id = azurerm_storage_account.example.id + key_vault_id = data.azurerm_key_vault.example.id + key_name = data.azurerm_key_vault_key.example.name + key_version = data.azurerm_key_vault_key.example.version } ``` @@ -98,24 +47,26 @@ resource "azurerm_storage_account_customer_managed_key" "tfex" { The following arguments are supported: -* `storage_account_id` - (Required) The id of the storage account to manage the encryption settings for. -* `key_vault_id` - (Required) The ID of the Key Vault. -* `key_name` - (Required) The name of Key Vault key. -* `key_version` - (Required) The version of Key Vault key. +* `storage_account_id` - (Required) The ID of the Storage Account. Changing this forces a new resource to be created. + +* `key_vault_id` - (Required) The ID of the Key Vault. Changing this forces a new resource to be created. + +* `key_name` - (Required) The name of Key Vault Key. + +* `key_version` - (Required) The version of Key Vault Key. ## Attributes Reference The following attributes are exported in addition to the arguments listed above: -* `id` - The storage account encryption settings Resource ID. -* `key_vault_uri` - The base URI of the Key Vault. +* `id` - The ID of the Storage Account. --- ## Import -Storage Accounts Encryption Settings can be imported using the `resource id`, e.g. +Customer Managed Keys for a Storage Account can be imported using the `resource id` of the Storage Account, e.g. ```shell -terraform import azurerm_storage_account_customer_managed_key.tfex /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myresourcegroup/providers/Microsoft.Storage/storageAccounts/myaccount +terraform import azurerm_storage_account_customer_managed_key.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myresourcegroup/providers/Microsoft.Storage/storageAccounts/myaccount ``` \ No newline at end of file From 675364aa11f2b982127e54448f83facc34347e44 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 23 Feb 2020 22:16:55 +0100 Subject: [PATCH 356/498] r/storage_account_customer_managed_key: adding validation --- .../keyvault/parse/key_vault_id_test.go | 73 +++++++++++++++++++ .../keyvault/validate/key_vault_id.go | 22 ++++++ ...rm_storage_account_customer_managed_key.go | 18 +++-- .../storage/validate/storage_account.go | 22 ++++++ 4 files changed, 127 insertions(+), 8 deletions(-) create mode 100644 azurerm/internal/services/keyvault/parse/key_vault_id_test.go create mode 100644 azurerm/internal/services/keyvault/validate/key_vault_id.go create mode 100644 azurerm/internal/services/storage/validate/storage_account.go diff --git a/azurerm/internal/services/keyvault/parse/key_vault_id_test.go b/azurerm/internal/services/keyvault/parse/key_vault_id_test.go new file mode 100644 index 0000000000000..9c73991d5cf23 --- /dev/null +++ b/azurerm/internal/services/keyvault/parse/key_vault_id_test.go @@ -0,0 +1,73 @@ +package parse + +import ( + "testing" +) + +func TestKeyVaultID(t *testing.T) { + testData := []struct { + Name string + Input string + Expected *KeyVaultId + }{ + { + Name: "Empty", + Input: "", + Expected: nil, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Expected: nil, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Expected: nil, + }, + { + Name: "Resource Group ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", + Expected: nil, + }, + { + Name: "Missing Vaults Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.KeyVault/vaults/", + Expected: nil, + }, + { + Name: "Key Vault ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.KeyVault/vaults/vault1", + Expected: &KeyVaultId{ + Name: "vault1", + ResourceGroup: "resGroup1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.KeyVault/Vaults/vault1", + Expected: nil, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Name) + + actual, err := KeyVaultID(v.Input) + if err != nil { + if v.Expected == nil { + continue + } + + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.Name != v.Expected.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expected.Name, actual.Name) + } + + if actual.ResourceGroup != v.Expected.ResourceGroup { + t.Fatalf("Expected %q but got %q for Resource Group", v.Expected.ResourceGroup, actual.ResourceGroup) + } + } +} diff --git a/azurerm/internal/services/keyvault/validate/key_vault_id.go b/azurerm/internal/services/keyvault/validate/key_vault_id.go new file mode 100644 index 0000000000000..5b365e71ce475 --- /dev/null +++ b/azurerm/internal/services/keyvault/validate/key_vault_id.go @@ -0,0 +1,22 @@ +package validate + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/keyvault/parse" +) + +func KeyVaultID(i interface{}, k string) (warnings []string, errors []error) { + v, ok := i.(string) + if !ok { + errors = append(errors, fmt.Errorf("expected type of %q to be string", k)) + return + } + + if _, err := parse.KeyVaultID(v); err != nil { + errors = append(errors, fmt.Errorf("Can not parse %q as a resource id: %v", k, err)) + return + } + + return warnings, errors +} diff --git a/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go b/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go index d0bf0cb672434..d469bf8bee240 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go @@ -12,8 +12,10 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/locks" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/keyvault/parse" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/storage/parsers" + keyVaultParse "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/keyvault/parse" + keyVaultValidate "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/keyvault/validate" + storageParse "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/storage/parsers" + storageValidate "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/storage/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -42,13 +44,13 @@ func resourceArmStorageAccountCustomerManagedKey() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: azure.ValidateResourceID, // TODO: validation + ValidateFunc: storageValidate.StorageAccountID, }, "key_vault_id": { Type: schema.TypeString, Required: true, - ValidateFunc: azure.ValidateResourceID, + ValidateFunc: keyVaultValidate.KeyVaultID, }, "key_name": { @@ -73,7 +75,7 @@ func resourceArmStorageAccountCustomerManagedKeyCreateUpdate(d *schema.ResourceD defer cancel() storageAccountIdRaw := d.Get("storage_account_id").(string) - storageAccountId, err := parsers.ParseAccountID(storageAccountIdRaw) + storageAccountId, err := storageParse.ParseAccountID(storageAccountIdRaw) if err != nil { return err } @@ -103,7 +105,7 @@ func resourceArmStorageAccountCustomerManagedKeyCreateUpdate(d *schema.ResourceD } keyVaultIdRaw := d.Get("key_vault_id").(string) - keyVaultId, err := parse.KeyVaultID(keyVaultIdRaw) + keyVaultId, err := keyVaultParse.KeyVaultID(keyVaultIdRaw) if err != nil { return err } @@ -169,7 +171,7 @@ func resourceArmStorageAccountCustomerManagedKeyRead(d *schema.ResourceData, met ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() - storageAccountId, err := parsers.ParseAccountID(d.Id()) + storageAccountId, err := storageParse.ParseAccountID(d.Id()) if err != nil { return err } @@ -234,7 +236,7 @@ func resourceArmStorageAccountCustomerManagedKeyDelete(d *schema.ResourceData, m ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() - storageAccountId, err := parsers.ParseAccountID(d.Id()) + storageAccountId, err := storageParse.ParseAccountID(d.Id()) if err != nil { return err } diff --git a/azurerm/internal/services/storage/validate/storage_account.go b/azurerm/internal/services/storage/validate/storage_account.go new file mode 100644 index 0000000000000..3fe3b6d2710b9 --- /dev/null +++ b/azurerm/internal/services/storage/validate/storage_account.go @@ -0,0 +1,22 @@ +package validate + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/storage/parsers" +) + +func StorageAccountID(i interface{}, k string) (warnings []string, errors []error) { + v, ok := i.(string) + if !ok { + errors = append(errors, fmt.Errorf("expected type of %q to be string", k)) + return + } + + if _, err := parsers.ParseAccountID(v); err != nil { + errors = append(errors, fmt.Errorf("Can not parse %q as a resource id: %v", k, err)) + return + } + + return warnings, errors +} From 73412bb09a7d4469f8c596063a47f256206a01aa Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Sun, 23 Feb 2020 22:21:20 +0100 Subject: [PATCH 357/498] updating to include #5844 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28da51f29de6e..bc5a65145f38a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ BREAKING CHANGES: * Data Source: `azurerm_app_service_plan` - the deprecated `properties` block has been removed since these properties have been moved to the top level [GH-5717] * Data Source: `azurerm_azuread_application` - This data source has been removed since it was deprecated [GH-5748] * Data Source: `azurerm_azuread_service_principal` - This data source has been removed since it was deprecated [GH-5748] +* Data Source: `azurerm_builtin_role_definition` - the deprecated data source has been removed [GH-5844] * Data Source: `azurerm_dns_zone` - removing the deprecated `zone_type` field [GH-5794] * Data Source: `azurerm_dns_zone` - removing the deprecated `registration_virtual_network_ids` field [GH-5794] * Data Source: `azurerm_dns_zone` - removing the deprecated `resolution_virtual_network_ids` field [GH-5794] @@ -39,6 +40,7 @@ BREAKING CHANGES: * Data Source: `azurerm_kubernetes_cluster` - removing the field `dns_prefix` from the `agent_pool_profile` block [GH-5823] * Data Source: `azurerm_network_interface` - removing the deprecated field `internal_fqdn` [GH-5823] * Data Source: `azurerm_private_link_service` - removing the deprecated field `network_interface_ids` [GH-5823] +* Data Source: `azurerm_private_link_endpoint_connection` - the deprecated data source has been removed [GH-5844] * Data Source: `azurerm_recovery_services_protection_policy_vm` has been renamed to `azurerm_backup_policy_vm` [GH-5816] * Data Source: `azurerm_role_definition` - removing the alias `VirtualMachineContributor` which has been deprecated in favour of the full name `Virtual Machine Contributor` [GH-5733] * Data Source: `azurerm_scheduler_job_collection` - This data source has been removed since it was deprecated [GH-5712] @@ -64,6 +66,7 @@ BREAKING CHANGES: * `azurerm_automation_credential` - removing the deprecated `account_name` field [GH-5781] * `azurerm_automation_runbook` - removing the deprecated `account_name` field [GH-5781] * `azurerm_automation_schedule` - removing the deprecated `account_name` field [GH-5781] +* `azurerm_autoscale_setting` - the deprecated resource has been removed [GH-5844] * `azurerm_availability_set` - updating the default value for `managed` from `false` to `true` [GH-5724] * `azurerm_azuread_application` - This resource has been removed since it was deprecated [GH-5748] * `azurerm_azuread_service_principal_password` - This resource has been removed since it was deprecated [GH-5748] @@ -71,6 +74,7 @@ BREAKING CHANGES: * `azurerm_client_config` - removing the deprecated field `service_principal_application_id` [GH-5823] * `azurerm_client_config` - removing the deprecated field `service_principal_object_id` [GH-5823] * `azurerm_cognitive_account` - removing the deprecated `sku_name` block [GH-5797] +* `azurerm_connection_monitor` - the deprecated resource has been removed [GH-5844] * `azurerm_container_group` - removing the `port` field from the `container` block [GH-5823] * `azurerm_container_group` - removing the `protocol` field from the `container` block [GH-5823] * `azurerm_container_group` - the `ports` field is no longer Computed [GH-5823] @@ -78,6 +82,7 @@ BREAKING CHANGES: * `azurerm_container_group` - removing the deprecated field `command` [GH-5823] * `azurerm_container_registry` - removing the deprecated `storage_account` block [GH-5823] * `azurerm_container_service` - This resource has been removed since it was deprecated [GH-5709] +* `azurerm_ddos_protection_plan` - the deprecated resource has been removed [GH-5844] * `azurerm_devspace_controller` - removing the deprecated `sku` block [GH-5795] * `azurerm_dns_cname_record` - removing the deprecated `records` field [GH-5794] * `azurerm_dns_ns_record` - removing the deprecated `records` field [GH-5794] @@ -117,6 +122,8 @@ BREAKING CHANGES: * `azurerm_log_analytics_linked_service` - The `resource_id` field has been moved from the `linked_service_properties` block to the top-level and the deprecated field `linked_service_properties` will be removed. This has been replaced by the `resource_id` resource [GH-5775] * `azurerm_maps_account` - the `sku_name` field is now case-sensitive [GH-5776] * `azurerm_mariadb_server` - removing the `sku` block since it's been deprecated in favour of the `sku_name` field [GH-5777] +* `azurerm_metric_alertrule` - the deprecated resource has been removed [GH-5844] +* `azurerm_monitor_metric_alertrule` - the deprecated resource has been removed [GH-5844] * `azurerm_mssql_elasticpool` - removing the deprecated `elastic_pool_properties` block [GH-5744] * `azurerm_mysql_server` - removing the deprecated `sku` block [GH-5743] * `azurerm_network_interface` - removing the deprecated `application_gateway_backend_address_pools_ids` field from the `ip_configurations` block [GH-5784] @@ -129,6 +136,7 @@ BREAKING CHANGES: * `azurerm_network_interface` - the `virtual_machine_id` field is now computed-only since it's not setable [GH-5784] * `azurerm_notification_hub_namesapce` - removing the `sku` block in favour of the `sku_name` argument [GH-5722] * `azurerm_postgresql_server` - removing the `sku` block which has been deprecated in favour of the `sku_name` field [GH-5721] +* `azurerm_private_link_endpoint` - the deprecated resource has been removed [GH-5844] * `azurerm_private_link_service` - removing the deprecated field `network_interface_ids` [GH-5823] * `azurerm_public_ip` - making the `allocation_method` field required [GH-5823] * `azurerm_public_ip` - removing the deprecated field `public_ip_address_allocation` [GH-5823] From c80abda2499e6ba4e5841845e7ea67ca70e2e11a Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 23 Feb 2020 22:34:55 +0100 Subject: [PATCH 358/498] r/key_vault_key: removing the unused `key_vault_access_policy_id` field --- .../services/keyvault/resource_arm_key_vault_key.go | 10 ---------- ..._arm_storage_account_customer_managed_key_test.go | 12 +++++++++--- website/docs/r/key_vault_key.html.markdown | 2 -- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go b/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go index 88735f042eac6..74f87464b3a87 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go @@ -52,13 +52,6 @@ func resourceArmKeyVaultKey() *schema.Resource { ValidateFunc: azure.ValidateResourceID, }, - "key_vault_access_policy_id": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, - ValidateFunc: azure.ValidateResourceID, - }, - "key_type": { Type: schema.TypeString, Required: true, @@ -309,8 +302,6 @@ func resourceArmKeyVaultKeyRead(d *schema.ResourceData, meta interface{}) error ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() - keyVaultAccessPolicyId := d.Get("key_vault_access_policy_id").(string) - id, err := azure.ParseKeyVaultChildID(d.Id()) if err != nil { return err @@ -348,7 +339,6 @@ func resourceArmKeyVaultKeyRead(d *schema.ResourceData, meta interface{}) error } d.Set("name", id.Name) - d.Set("key_vault_access_policy_id", keyVaultAccessPolicyId) if key := resp.Key; key != nil { d.Set("key_type", string(key.Kty)) diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go index 5b94b55c585ab..91c4dcdea3af3 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go @@ -186,10 +186,14 @@ func testAccAzureRMStorageAccountCustomerManagedKey_updated(data acceptance.Test resource "azurerm_key_vault_key" "second" { name = "second" key_vault_id = azurerm_key_vault.test.id - key_vault_access_policy_id = azurerm_key_vault_access_policy.storage.id key_type = "RSA" key_size = 2048 key_opts = ["decrypt", "encrypt", "sign", "unwrapKey", "verify", "wrapKey"] + + depends_on = [ + azurerm_key_vault_access_policy.client, + azurerm_key_vault_access_policy.storage, + ] } resource "azurerm_storage_account_customer_managed_key" "test" { @@ -249,12 +253,14 @@ resource "azurerm_key_vault_access_policy" "client" { resource "azurerm_key_vault_key" "first" { name = "first" key_vault_id = azurerm_key_vault.test.id - key_vault_access_policy_id = azurerm_key_vault_access_policy.storage.id key_type = "RSA" key_size = 2048 key_opts = ["decrypt", "encrypt", "sign", "unwrapKey", "verify", "wrapKey"] - depends_on = [azurerm_key_vault_access_policy.client] + depends_on = [ + azurerm_key_vault_access_policy.client, + azurerm_key_vault_access_policy.storage, + ] } resource "azurerm_storage_account" "test" { diff --git a/website/docs/r/key_vault_key.html.markdown b/website/docs/r/key_vault_key.html.markdown index f850cb88abf88..9a6a8df1ec680 100644 --- a/website/docs/r/key_vault_key.html.markdown +++ b/website/docs/r/key_vault_key.html.markdown @@ -82,8 +82,6 @@ The following arguments are supported: * `key_vault_id` - (Required) The ID of the Key Vault where the Key should be created. Changing this forces a new resource to be created. -* `key_vault_access_policy_id` - (Optional) The ID of the Key Vault Access Policy which should exist before the Key should be created. Changing this forces a new resource to be created. - * `key_type` - (Required) Specifies the Key Type to use for this Key Vault Key. Possible values are `EC` (Elliptic Curve), `EC-HSM`, `Oct` (Octet), `RSA` and `RSA-HSM`. Changing this forces a new resource to be created. * `key_size` - (Optional) Specifies the Size of the RSA key to create in bytes. For example, 1024 or 2048. *Note*: This field is required if `key_type` is `RSA` or `RSA-HSM`. Changing this forces a new resource to be created. From 7edd1c9da7910e6c9c064f941a420d05c03e6902 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 23 Feb 2020 22:35:17 +0100 Subject: [PATCH 359/498] r/storage_account_customer_managed_key: fixing the example --- ...account_customer_managed_key.html.markdown | 68 +++++++++++++++---- 1 file changed, 55 insertions(+), 13 deletions(-) diff --git a/website/docs/r/storage_account_customer_managed_key.html.markdown b/website/docs/r/storage_account_customer_managed_key.html.markdown index 9e5cb40195acc..4ae7721d8e444 100644 --- a/website/docs/r/storage_account_customer_managed_key.html.markdown +++ b/website/docs/r/storage_account_customer_managed_key.html.markdown @@ -13,20 +13,62 @@ Manages a Customer Managed Key for a Storage Account. ## Example Usage ```hcl -data "azurerm_key_vault" "example" { - name = "mykeyvault" - resource_group_name = "some-resource-group" + +data "azurerm_client_config" "current" {} + +resource "azurerm_resource_group" "example" { + name = "example-resources" + location = "West Europe" +} + +resource "azurerm_key_vault" "example" { + name = "examplekv" + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name + tenant_id = data.azurerm_client_config.current.tenant_id + sku_name = "standard" + + soft_delete_enabled = true + purge_protection_enabled = true +} + +resource "azurerm_key_vault_access_policy" "storage" { + key_vault_id = azurerm_key_vault.example.id + tenant_id = data.azurerm_client_config.current.tenant_id + object_id = azurerm_storage_account.example.identity.0.principal_id + + key_permissions = ["get", "create", "list", "restore", "recover", "unwrapkey", "wrapkey", "purge", "encrypt", "decrypt", "sign", "verify"] + secret_permissions = ["get"] } -data "azurerm_key_vault_key" "example" { - name = "secret-sauce" - key_vault_id = data.azurerm_key_vault.example.id +resource "azurerm_key_vault_access_policy" "client" { + key_vault_id = azurerm_key_vault.example.id + tenant_id = data.azurerm_client_config.current.tenant_id + object_id = data.azurerm_client_config.current.object_id + + key_permissions = ["get", "create", "delete", "list", "restore", "recover", "unwrapkey", "wrapkey", "purge", "encrypt", "decrypt", "sign", "verify"] + secret_permissions = ["get"] } -resource "azurerm_storage_account" "tfex" { - name = "exampleaccount" - resource_group_name = data.azurerm_key_vault.example.name - location = data.azurerm_key_vault.example.location + +resource "azurerm_key_vault_key" "example" { + name = "tfex-key" + key_vault_id = azurerm_key_vault.example.id + key_type = "RSA" + key_size = 2048 + key_opts = ["decrypt", "encrypt", "sign", "unwrapKey", "verify", "wrapKey"] + + depends_on = [ + azurerm_key_vault_access_policy.client, + azurerm_key_vault_access_policy.storage, + ] +} + + +resource "azurerm_storage_account" "example" { + name = "examplestor" + resource_group_name = azurerm_resource_group.example.name + location = azurerm_resource_group.example.location account_tier = "Standard" account_replication_type = "GRS" @@ -37,9 +79,9 @@ resource "azurerm_storage_account" "tfex" { resource "azurerm_storage_account_customer_managed_key" "example" { storage_account_id = azurerm_storage_account.example.id - key_vault_id = data.azurerm_key_vault.example.id - key_name = data.azurerm_key_vault_key.example.name - key_version = data.azurerm_key_vault_key.example.version + key_vault_id = azurerm_key_vault.example.id + key_name = azurerm_key_vault_key.example.name + key_version = azurerm_key_vault_key.example.version } ``` From 4976245dfb70e62cf530ddd2f9d2c963b7270a7a Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Sun, 23 Feb 2020 13:38:16 -0800 Subject: [PATCH 360/498] changing storage account accout kind default to StorageV2 --- .../internal/services/storage/resource_arm_storage_account.go | 2 +- website/docs/guides/2.0-upgrade-guide.html.markdown | 2 ++ website/docs/r/storage_account.html.markdown | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/storage/resource_arm_storage_account.go b/azurerm/internal/services/storage/resource_arm_storage_account.go index e7faa93212012..f29fb6bb814e7 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account.go @@ -75,7 +75,7 @@ func resourceArmStorageAccount() *schema.Resource { string(storage.FileStorage), string(storage.StorageV2), }, true), - Default: string(storage.Storage), + Default: string(storage.StorageV2), }, "account_tier": { diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index 39076e9fb2682..175d9748c4825 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -603,6 +603,8 @@ The deprecated `enable_advanced_threat_protection` field will be removed. This f The default value for the field `enable_https_traffic_only` has changed from `false` to `true`. +The default value for the field `account_kind` has changed from `Storage` to `StorageV2`. + ### Resource: `azurerm_storage_blob` The deprecated `attempts` field will be removed, since Terraform now handles retries automatically. diff --git a/website/docs/r/storage_account.html.markdown b/website/docs/r/storage_account.html.markdown index 50da869e31bd6..62c4e1858eccc 100644 --- a/website/docs/r/storage_account.html.markdown +++ b/website/docs/r/storage_account.html.markdown @@ -84,7 +84,7 @@ The following arguments are supported: * `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. -* `account_kind` - (Optional) Defines the Kind of account. Valid options are `BlobStorage`, `BlockBlobStorage`, `FileStorage`, `Storage` and `StorageV2`. Changing this forces a new resource to be created. Defaults to `Storage`. +* `account_kind` - (Optional) Defines the Kind of account. Valid options are `BlobStorage`, `BlockBlobStorage`, `FileStorage`, `Storage` and `StorageV2`. Changing this forces a new resource to be created. Defaults to `StorageV2`. * `account_tier` - (Required) Defines the Tier to use for this storage account. Valid options are `Standard` and `Premium`. For `FileStorage` accounts only `Premium` is valid. Changing this forces a new resource to be created. From e775d4e9812926e86f0d1c530ac330b0b6950cc6 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 23 Feb 2020 10:54:33 +0100 Subject: [PATCH 361/498] r/hdinsight*: removing the `resource_group_name` argument from the test configs --- .../hdinsight/tests/resource_arm_hdinsight_hbase_cluster_test.go | 1 - .../resource_arm_hdinsight_interactive_query_cluster_test.go | 1 - .../hdinsight/tests/resource_arm_hdinsight_kafka_cluster_test.go | 1 - .../tests/resource_arm_hdinsight_ml_services_cluster_test.go | 1 - .../tests/resource_arm_hdinsight_rserver_cluster_test.go | 1 - .../hdinsight/tests/resource_arm_hdinsight_spark_cluster_test.go | 1 - .../hdinsight/tests/resource_arm_hdinsight_storm_cluster_test.go | 1 - 7 files changed, 7 deletions(-) diff --git a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_hbase_cluster_test.go b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_hbase_cluster_test.go index d7e4fb404ff09..8dc9b76531e12 100644 --- a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_hbase_cluster_test.go +++ b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_hbase_cluster_test.go @@ -606,7 +606,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "acctest" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } diff --git a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_interactive_query_cluster_test.go b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_interactive_query_cluster_test.go index 80adb0a0e264a..eda40a93bfcdb 100644 --- a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_interactive_query_cluster_test.go +++ b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_interactive_query_cluster_test.go @@ -608,7 +608,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "acctest" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } diff --git a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_kafka_cluster_test.go b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_kafka_cluster_test.go index be933e1545c95..654fc13525b7b 100644 --- a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_kafka_cluster_test.go +++ b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_kafka_cluster_test.go @@ -617,7 +617,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "acctest" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } diff --git a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_ml_services_cluster_test.go b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_ml_services_cluster_test.go index 983ff39f5a4aa..123ee92fd1b68 100644 --- a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_ml_services_cluster_test.go +++ b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_ml_services_cluster_test.go @@ -564,7 +564,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "acctest" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } diff --git a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_rserver_cluster_test.go b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_rserver_cluster_test.go index 5d4818cb076ed..48d5ea2836678 100644 --- a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_rserver_cluster_test.go +++ b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_rserver_cluster_test.go @@ -564,7 +564,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "acctest" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } diff --git a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_spark_cluster_test.go b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_spark_cluster_test.go index 0e16380f7599b..72852ea900a37 100644 --- a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_spark_cluster_test.go +++ b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_spark_cluster_test.go @@ -608,7 +608,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "acctest" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } diff --git a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_storm_cluster_test.go b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_storm_cluster_test.go index 1e80c779ac03d..97b0b0bfd16fa 100644 --- a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_storm_cluster_test.go +++ b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_storm_cluster_test.go @@ -528,7 +528,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "acctest" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } From e80074922d24e21391825b6fb83bb6337b223ca2 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 23 Feb 2020 10:56:45 +0100 Subject: [PATCH 362/498] switching from `service_principal_object_id` to `object_id` --- .../tests/resource_arm_role_assignment_test.go | 12 ++++++------ .../compute/tests/data_source_snapshot_test.go | 2 +- .../linux_virtual_machine_resource_disk_os_test.go | 2 +- .../linux_virtual_machine_resource_other_test.go | 2 +- .../tests/resource_arm_disk_encryption_set_test.go | 2 +- ...nux_virtual_machine_scale_set_disk_data_test.go | 2 +- ...linux_virtual_machine_scale_set_disk_os_test.go | 2 +- ...m_linux_virtual_machine_scale_set_other_test.go | 2 +- .../tests/resource_arm_managed_disk_test.go | 4 ++-- .../compute/tests/resource_arm_snapshot_test.go | 2 +- ...ource_arm_virtual_machine_managed_disks_test.go | 2 +- ...ows_virtual_machine_scale_set_disk_data_test.go | 2 +- ...ndows_virtual_machine_scale_set_disk_os_test.go | 2 +- ...windows_virtual_machine_scale_set_other_test.go | 4 ++-- ...indows_virtual_machine_resource_disk_os_test.go | 2 +- .../windows_virtual_machine_resource_other_test.go | 4 ++-- .../tests/resource_arm_healthcare_service_test.go | 6 +++--- .../resource_arm_key_vault_access_policy_test.go | 10 +++++----- .../resource_arm_key_vault_certificate_test.go | 12 ++++++------ .../tests/resource_arm_key_vault_key_test.go | 14 +++++++------- .../tests/resource_arm_key_vault_secret_test.go | 6 +++--- .../tests/resource_arm_application_gateway_test.go | 2 +- .../tests/resource_arm_template_deployment_test.go | 2 +- ...arm_app_service_custom_hostname_binding_test.go | 2 +- examples/managed-disks/encrypted/main.tf | 2 +- .../provisioners/windows/2-certificates.tf | 2 +- .../windows/service-fabric/2-key-vault.tf | 2 +- website/docs/r/disk_encryption_set.html.markdown | 2 +- website/docs/r/key_vault_certificate.html.markdown | 4 ++-- website/docs/r/key_vault_key.html.markdown | 2 +- website/docs/r/key_vault_secret.html.markdown | 2 +- website/docs/r/role_assignment.html.markdown | 4 ++-- 32 files changed, 61 insertions(+), 61 deletions(-) diff --git a/azurerm/internal/services/authorization/tests/resource_arm_role_assignment_test.go b/azurerm/internal/services/authorization/tests/resource_arm_role_assignment_test.go index df2e193fe5e24..3059127c58385 100644 --- a/azurerm/internal/services/authorization/tests/resource_arm_role_assignment_test.go +++ b/azurerm/internal/services/authorization/tests/resource_arm_role_assignment_test.go @@ -349,7 +349,7 @@ data "azurerm_role_definition" "test" { resource "azurerm_role_assignment" "test" { scope = "${data.azurerm_subscription.primary.id}" role_definition_id = "${data.azurerm_subscription.primary.id}${data.azurerm_role_definition.test.id}" - principal_id = "${data.azurerm_client_config.test.service_principal_object_id}" + principal_id = "${data.azurerm_client_config.test.object_id}" } ` } @@ -364,7 +364,7 @@ resource "azurerm_role_assignment" "test" { name = "%s" scope = "${data.azurerm_subscription.primary.id}" role_definition_name = "Log Analytics Reader" - principal_id = "${data.azurerm_client_config.test.service_principal_object_id}" + principal_id = "${data.azurerm_client_config.test.object_id}" } `, id) } @@ -392,7 +392,7 @@ resource "azurerm_role_assignment" "test" { name = "%s" scope = "${data.azurerm_subscription.primary.id}" role_definition_name = "Virtual Machine User Login" - principal_id = "${data.azurerm_client_config.test.service_principal_object_id}" + principal_id = "${data.azurerm_client_config.test.object_id}" } `, id) } @@ -411,7 +411,7 @@ resource "azurerm_role_assignment" "test" { name = "%s" scope = "${data.azurerm_subscription.primary.id}" role_definition_id = "${data.azurerm_subscription.primary.id}${data.azurerm_role_definition.test.id}" - principal_id = "${data.azurerm_client_config.test.service_principal_object_id}" + principal_id = "${data.azurerm_client_config.test.object_id}" } `, id) } @@ -442,7 +442,7 @@ resource "azurerm_role_assignment" "test" { name = "%s" scope = "${data.azurerm_subscription.primary.id}" role_definition_id = "${azurerm_role_definition.test.id}" - principal_id = "${data.azurerm_client_config.test.service_principal_object_id}" + principal_id = "${data.azurerm_client_config.test.object_id}" } `, roleDefinitionId, rInt, roleAssignmentId) } @@ -524,7 +524,7 @@ resource "azurerm_management_group" "test" { resource "azurerm_role_assignment" "test" { scope = "${azurerm_management_group.test.id}" role_definition_id = "${data.azurerm_role_definition.test.id}" - principal_id = "${data.azurerm_client_config.test.service_principal_object_id}" + principal_id = "${data.azurerm_client_config.test.object_id}" } `, groupId) } diff --git a/azurerm/internal/services/compute/tests/data_source_snapshot_test.go b/azurerm/internal/services/compute/tests/data_source_snapshot_test.go index 18eedd4b7a1e8..fd43f6dfd7582 100644 --- a/azurerm/internal/services/compute/tests/data_source_snapshot_test.go +++ b/azurerm/internal/services/compute/tests/data_source_snapshot_test.go @@ -106,7 +106,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" key_permissions = [ "create", diff --git a/azurerm/internal/services/compute/tests/linux_virtual_machine_resource_disk_os_test.go b/azurerm/internal/services/compute/tests/linux_virtual_machine_resource_disk_os_test.go index 0c77de60d552f..5243a950f8811 100644 --- a/azurerm/internal/services/compute/tests/linux_virtual_machine_resource_disk_os_test.go +++ b/azurerm/internal/services/compute/tests/linux_virtual_machine_resource_disk_os_test.go @@ -480,7 +480,7 @@ resource "azurerm_key_vault" "test" { resource "azurerm_key_vault_access_policy" "service-principal" { key_vault_id = azurerm_key_vault.test.id tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_object_id + object_id = data.azurerm_client_config.current.object_id key_permissions = [ "create", diff --git a/azurerm/internal/services/compute/tests/linux_virtual_machine_resource_other_test.go b/azurerm/internal/services/compute/tests/linux_virtual_machine_resource_other_test.go index 7ce162b5461d9..ec3b13a7ba369 100644 --- a/azurerm/internal/services/compute/tests/linux_virtual_machine_resource_other_test.go +++ b/azurerm/internal/services/compute/tests/linux_virtual_machine_resource_other_test.go @@ -781,7 +781,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_object_id + object_id = data.azurerm_client_config.current.object_id certificate_permissions = [ "create", diff --git a/azurerm/internal/services/compute/tests/resource_arm_disk_encryption_set_test.go b/azurerm/internal/services/compute/tests/resource_arm_disk_encryption_set_test.go index 4f4fbaead703f..8f4bae755836c 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_disk_encryption_set_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_disk_encryption_set_test.go @@ -236,7 +236,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_object_id + object_id = data.azurerm_client_config.current.object_id key_permissions = [ "create", diff --git a/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_disk_data_test.go b/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_disk_data_test.go index c8265413d5c5e..5f21bbda637a9 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_disk_data_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_disk_data_test.go @@ -456,7 +456,7 @@ resource "azurerm_key_vault" "test" { resource "azurerm_key_vault_access_policy" "service-principal" { key_vault_id = azurerm_key_vault.test.id tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_object_id + object_id = data.azurerm_client_config.current.object_id key_permissions = [ "create", diff --git a/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_disk_os_test.go b/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_disk_os_test.go index ebae79a7d3d66..54b07d2ee3386 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_disk_os_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_disk_os_test.go @@ -326,7 +326,7 @@ resource "azurerm_key_vault" "test" { resource "azurerm_key_vault_access_policy" "service-principal" { key_vault_id = azurerm_key_vault.test.id tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_object_id + object_id = data.azurerm_client_config.current.object_id key_permissions = [ "create", diff --git a/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_other_test.go b/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_other_test.go index 041785647d9d1..574711dd48d6d 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_other_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_other_test.go @@ -978,7 +978,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_object_id + object_id = data.azurerm_client_config.current.object_id certificate_permissions = [ "create", diff --git a/azurerm/internal/services/compute/tests/resource_arm_managed_disk_test.go b/azurerm/internal/services/compute/tests/resource_arm_managed_disk_test.go index 4530331de32c8..b5a50b3288a36 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_managed_disk_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_managed_disk_test.go @@ -697,7 +697,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" key_permissions = [ "create", @@ -867,7 +867,7 @@ resource "azurerm_key_vault" "test" { resource "azurerm_key_vault_access_policy" "service-principal" { key_vault_id = azurerm_key_vault.test.id tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_object_id + object_id = data.azurerm_client_config.current.object_id key_permissions = [ "create", diff --git a/azurerm/internal/services/compute/tests/resource_arm_snapshot_test.go b/azurerm/internal/services/compute/tests/resource_arm_snapshot_test.go index 732846f7135f2..e3d4db8795812 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_snapshot_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_snapshot_test.go @@ -359,7 +359,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" key_permissions = [ "create", diff --git a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go index 53e13627c3365..1e689b96860f9 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go @@ -820,7 +820,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" key_permissions = [ "backup", diff --git a/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_disk_data_test.go b/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_disk_data_test.go index 9dcd347223ada..bed5fc86872ef 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_disk_data_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_disk_data_test.go @@ -503,7 +503,7 @@ resource "azurerm_key_vault" "test" { resource "azurerm_key_vault_access_policy" "service-principal" { key_vault_id = azurerm_key_vault.test.id tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_object_id + object_id = data.azurerm_client_config.current.object_id key_permissions = [ "create", diff --git a/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_disk_os_test.go b/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_disk_os_test.go index 79eaae757412e..a45eedda0b0e0 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_disk_os_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_disk_os_test.go @@ -326,7 +326,7 @@ resource "azurerm_key_vault" "test" { resource "azurerm_key_vault_access_policy" "service-principal" { key_vault_id = azurerm_key_vault.test.id tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_object_id + object_id = data.azurerm_client_config.current.object_id key_permissions = [ "create", diff --git a/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_other_test.go b/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_other_test.go index 5b23cd2a5984c..c5b8330420908 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_other_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_other_test.go @@ -1169,7 +1169,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_object_id + object_id = data.azurerm_client_config.current.object_id certificate_permissions = [ "create", @@ -1519,7 +1519,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_object_id + object_id = data.azurerm_client_config.current.object_id key_permissions = [ "backup", diff --git a/azurerm/internal/services/compute/tests/windows_virtual_machine_resource_disk_os_test.go b/azurerm/internal/services/compute/tests/windows_virtual_machine_resource_disk_os_test.go index 41a7aca08fb15..4558419c2f96b 100644 --- a/azurerm/internal/services/compute/tests/windows_virtual_machine_resource_disk_os_test.go +++ b/azurerm/internal/services/compute/tests/windows_virtual_machine_resource_disk_os_test.go @@ -503,7 +503,7 @@ resource "azurerm_key_vault" "test" { resource "azurerm_key_vault_access_policy" "service-principal" { key_vault_id = azurerm_key_vault.test.id tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_object_id + object_id = data.azurerm_client_config.current.object_id key_permissions = [ "create", diff --git a/azurerm/internal/services/compute/tests/windows_virtual_machine_resource_other_test.go b/azurerm/internal/services/compute/tests/windows_virtual_machine_resource_other_test.go index 672b9bd485878..3b80434a80485 100644 --- a/azurerm/internal/services/compute/tests/windows_virtual_machine_resource_other_test.go +++ b/azurerm/internal/services/compute/tests/windows_virtual_machine_resource_other_test.go @@ -1122,7 +1122,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_object_id + object_id = data.azurerm_client_config.current.object_id certificate_permissions = [ "create", @@ -1509,7 +1509,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_object_id + object_id = data.azurerm_client_config.current.object_id key_permissions = [ "backup", diff --git a/azurerm/internal/services/healthcare/tests/resource_arm_healthcare_service_test.go b/azurerm/internal/services/healthcare/tests/resource_arm_healthcare_service_test.go index 662a6ce55ea2c..2fa3b9b0daa60 100644 --- a/azurerm/internal/services/healthcare/tests/resource_arm_healthcare_service_test.go +++ b/azurerm/internal/services/healthcare/tests/resource_arm_healthcare_service_test.go @@ -148,7 +148,7 @@ resource "azurerm_healthcare_service" "test" { resource_group_name = "${azurerm_resource_group.test.name}" access_policy_object_ids = [ - "${data.azurerm_client_config.current.service_principal_object_id}", + "${data.azurerm_client_config.current.object_id}", ] } `, data.RandomInteger, location, data.RandomIntOfLength(17)) //name can only be 24 chars long @@ -165,7 +165,7 @@ resource "azurerm_healthcare_service" "import" { resource_group_name = azurerm_healthcare_service.test.resource_group_name access_policy_object_ids = [ - "${data.azurerm_client_config.current.service_principal_object_id}", + "${data.azurerm_client_config.current.object_id}", ] } `, template) @@ -194,7 +194,7 @@ resource "azurerm_healthcare_service" "test" { } access_policy_object_ids = [ - "${data.azurerm_client_config.current.service_principal_object_id}", + "${data.azurerm_client_config.current.object_id}", ] authentication_configuration { diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_access_policy_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_access_policy_test.go index 788ff00d413bc..bbf0df6dec2c9 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_access_policy_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_access_policy_test.go @@ -213,7 +213,7 @@ resource "azurerm_key_vault_access_policy" "test" { ] tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" } `, template) } @@ -265,7 +265,7 @@ resource "azurerm_key_vault_access_policy" "test_with_application_id" { application_id = "${data.azurerm_client_config.current.service_principal_application_id}" tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" } resource "azurerm_key_vault_access_policy" "test_no_application_id" { @@ -304,7 +304,7 @@ resource "azurerm_key_vault_access_policy" "test_no_application_id" { ] tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" } `, template) } @@ -325,7 +325,7 @@ resource "azurerm_key_vault_access_policy" "test" { secret_permissions = [] tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" } `, template) } @@ -381,7 +381,7 @@ resource "azurerm_key_vault_access_policy" "test" { key_vault_id = "${azurerm_key_vault.test.id}NOPE" tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" key_permissions = [ "get", diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_certificate_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_certificate_test.go index 8748d336fbde2..ae11b920b93bc 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_certificate_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_certificate_test.go @@ -353,7 +353,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" certificate_permissions = [ "delete", @@ -453,7 +453,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" certificate_permissions = [ "create", @@ -543,7 +543,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" certificate_permissions = [ "create", @@ -640,7 +640,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" certificate_permissions = [ "create", @@ -730,7 +730,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" certificate_permissions = [ "create", @@ -826,7 +826,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" certificate_permissions = [ "create", diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go index 5802cf4290d9a..2655b689b6a60 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go @@ -369,7 +369,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" key_permissions = [ "create", @@ -441,7 +441,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" key_permissions = [ "create", @@ -499,7 +499,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" key_permissions = [ "create", @@ -556,7 +556,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" key_permissions = [ "create", @@ -619,7 +619,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" key_permissions = [ "create", @@ -676,7 +676,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" key_permissions = [ "create", @@ -729,7 +729,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" key_permissions = [ "create", diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go index 2fb2f3e813c5c..6454718d54a7e 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go @@ -293,7 +293,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" key_permissions = [ "get", @@ -351,7 +351,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" key_permissions = [ "create", @@ -403,7 +403,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" key_permissions = [ "create", diff --git a/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go index 73dc260c6cfba..06d7794d98cf2 100644 --- a/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go @@ -1686,7 +1686,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = "${data.azurerm_client_config.test.tenant_id}" - object_id = "${data.azurerm_client_config.test.service_principal_object_id}" + object_id = "${data.azurerm_client_config.test.object_id}" secret_permissions = ["delete", "get", "set"] certificate_permissions = ["create", "delete", "get", "import"] } 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 7c46116dd6a3d..6ccea641468c9 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 @@ -505,7 +505,7 @@ resource "azurerm_key_vault" "test-kv" { access_policy { key_permissions = [] - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" secret_permissions = [ "delete", 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 7e94ac1e7f6e8..1867102921fb7 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 @@ -289,7 +289,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = "${data.azurerm_client_config.test.tenant_id}" - object_id = "${data.azurerm_client_config.test.service_principal_object_id}" + object_id = "${data.azurerm_client_config.test.object_id}" secret_permissions = ["delete", "get", "set"] certificate_permissions = ["create", "delete", "get", "import"] } diff --git a/examples/managed-disks/encrypted/main.tf b/examples/managed-disks/encrypted/main.tf index 0edbfe5d88b56..f969e87d62886 100644 --- a/examples/managed-disks/encrypted/main.tf +++ b/examples/managed-disks/encrypted/main.tf @@ -2,7 +2,7 @@ resource "azurerm_key_vault_access_policy" "service-principal" { key_vault_id = azurerm_key_vault.test.id tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_object_id + object_id = data.azurerm_client_config.current.object_id key_permissions = [ "create", diff --git a/examples/virtual-machines/virtual_machine/provisioners/windows/2-certificates.tf b/examples/virtual-machines/virtual_machine/provisioners/windows/2-certificates.tf index 2745ea950598f..9d0e42e31e440 100644 --- a/examples/virtual-machines/virtual_machine/provisioners/windows/2-certificates.tf +++ b/examples/virtual-machines/virtual_machine/provisioners/windows/2-certificates.tf @@ -15,7 +15,7 @@ resource "azurerm_key_vault" "example" { access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${data.azurerm_client_config.current.service_principal_object_id}" + object_id = "${data.azurerm_client_config.current.object_id}" certificate_permissions = [ "create", diff --git a/examples/vm-scale-set/windows/service-fabric/2-key-vault.tf b/examples/vm-scale-set/windows/service-fabric/2-key-vault.tf index 42e36b5639466..6d782b391b0a2 100644 --- a/examples/vm-scale-set/windows/service-fabric/2-key-vault.tf +++ b/examples/vm-scale-set/windows/service-fabric/2-key-vault.tf @@ -10,7 +10,7 @@ resource "azurerm_key_vault" "main" { access_policy { tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_object_id + object_id = data.azurerm_client_config.current.object_id certificate_permissions = [ "create", diff --git a/website/docs/r/disk_encryption_set.html.markdown b/website/docs/r/disk_encryption_set.html.markdown index d50ad86a79f7f..ef0892de704b1 100644 --- a/website/docs/r/disk_encryption_set.html.markdown +++ b/website/docs/r/disk_encryption_set.html.markdown @@ -33,7 +33,7 @@ resource "azurerm_key_vault" "example" { access_policy { tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_object_id + object_id = data.azurerm_client_config.current.object_id key_permissions = [ "create", diff --git a/website/docs/r/key_vault_certificate.html.markdown b/website/docs/r/key_vault_certificate.html.markdown index 6b463189a5ec1..105bb44dce3d7 100644 --- a/website/docs/r/key_vault_certificate.html.markdown +++ b/website/docs/r/key_vault_certificate.html.markdown @@ -34,7 +34,7 @@ resource "azurerm_key_vault" "example" { access_policy { tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_object_id + object_id = data.azurerm_client_config.current.object_id certificate_permissions = [ "create", @@ -136,7 +136,7 @@ resource "azurerm_key_vault" "example" { access_policy { tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_object_id + object_id = data.azurerm_client_config.current.object_id certificate_permissions = [ "create", diff --git a/website/docs/r/key_vault_key.html.markdown b/website/docs/r/key_vault_key.html.markdown index 9a6a8df1ec680..31a2c1ad3219b 100644 --- a/website/docs/r/key_vault_key.html.markdown +++ b/website/docs/r/key_vault_key.html.markdown @@ -40,7 +40,7 @@ resource "azurerm_key_vault" "example" { access_policy { tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_object_id + object_id = data.azurerm_client_config.current.object_id key_permissions = [ "create", diff --git a/website/docs/r/key_vault_secret.html.markdown b/website/docs/r/key_vault_secret.html.markdown index 0aea0abf46545..3f03faa8c6066 100644 --- a/website/docs/r/key_vault_secret.html.markdown +++ b/website/docs/r/key_vault_secret.html.markdown @@ -43,7 +43,7 @@ resource "azurerm_key_vault" "example" { access_policy { tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_object_id + object_id = data.azurerm_client_config.current.object_id key_permissions = [ "create", diff --git a/website/docs/r/role_assignment.html.markdown b/website/docs/r/role_assignment.html.markdown index bf1acdd6e5c32..0e192005a7717 100644 --- a/website/docs/r/role_assignment.html.markdown +++ b/website/docs/r/role_assignment.html.markdown @@ -23,7 +23,7 @@ data "azurerm_client_config" "example" { resource "azurerm_role_assignment" "example" { scope = data.azurerm_subscription.primary.id role_definition_name = "Reader" - principal_id = data.azurerm_client_config.example.service_principal_object_id + principal_id = data.azurerm_client_config.example.object_id } ``` @@ -55,7 +55,7 @@ resource "azurerm_role_assignment" "example" { name = "00000000-0000-0000-0000-000000000000" scope = data.azurerm_subscription.primary.id role_definition_id = azurerm_role_definition.example.id - principal_id = data.azurerm_client_config.example.service_principal_object_id + principal_id = data.azurerm_client_config.example.object_id } ``` From 5cb20c71cfea98b4ec2c5d8a65199b948417ba38 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 23 Feb 2020 10:57:45 +0100 Subject: [PATCH 363/498] switching from `service_principal_application_id` to `client_id` --- .../tests/resource_arm_bot_channels_registration_test.go | 6 +++--- .../services/bot/tests/resource_arm_bot_web_app_test.go | 6 +++--- .../tests/resource_arm_key_vault_access_policy_test.go | 2 +- .../services/keyvault/tests/resource_arm_key_vault_test.go | 2 +- website/docs/d/client_config.html.markdown | 2 +- website/docs/r/bot_channel_email.markdown | 2 +- website/docs/r/bot_channel_ms_teams.markdown | 2 +- website/docs/r/bot_channel_slack.markdown | 2 +- website/docs/r/bot_channels_registration.markdown | 2 +- website/docs/r/bot_connection.markdown | 2 +- website/docs/r/bot_web_app.markdown | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/azurerm/internal/services/bot/tests/resource_arm_bot_channels_registration_test.go b/azurerm/internal/services/bot/tests/resource_arm_bot_channels_registration_test.go index 3ac73f98663a0..bd2692b1aab05 100644 --- a/azurerm/internal/services/bot/tests/resource_arm_bot_channels_registration_test.go +++ b/azurerm/internal/services/bot/tests/resource_arm_bot_channels_registration_test.go @@ -185,7 +185,7 @@ resource "azurerm_bot_channels_registration" "test" { location = "global" resource_group_name = "${azurerm_resource_group.test.name}" sku = "F0" - microsoft_app_id = "${data.azurerm_client_config.current.service_principal_application_id}" + microsoft_app_id = "${data.azurerm_client_config.current.client_id}" tags = { environment = "production" @@ -208,7 +208,7 @@ resource "azurerm_bot_channels_registration" "test" { location = "global" resource_group_name = "${azurerm_resource_group.test.name}" sku = "F0" - microsoft_app_id = "${data.azurerm_client_config.current.service_principal_application_id}" + microsoft_app_id = "${data.azurerm_client_config.current.client_id}" tags = { environment = "production" @@ -243,7 +243,7 @@ resource "azurerm_bot_channels_registration" "test" { name = "acctestdf%d" location = "global" resource_group_name = "${azurerm_resource_group.test.name}" - microsoft_app_id = "${data.azurerm_client_config.current.service_principal_application_id}" + microsoft_app_id = "${data.azurerm_client_config.current.client_id}" sku = "F0" endpoint = "https://example.com" diff --git a/azurerm/internal/services/bot/tests/resource_arm_bot_web_app_test.go b/azurerm/internal/services/bot/tests/resource_arm_bot_web_app_test.go index d2d21ab6cfa1f..10479fc1e18f3 100644 --- a/azurerm/internal/services/bot/tests/resource_arm_bot_web_app_test.go +++ b/azurerm/internal/services/bot/tests/resource_arm_bot_web_app_test.go @@ -146,7 +146,7 @@ resource "azurerm_bot_web_app" "test" { location = "global" resource_group_name = "${azurerm_resource_group.test.name}" sku = "F0" - microsoft_app_id = "${data.azurerm_client_config.current.service_principal_application_id}" + microsoft_app_id = "${data.azurerm_client_config.current.client_id}" tags = { environment = "production" @@ -169,7 +169,7 @@ resource "azurerm_bot_web_app" "test" { location = "global" resource_group_name = "${azurerm_resource_group.test.name}" sku = "F0" - microsoft_app_id = "${data.azurerm_client_config.current.service_principal_application_id}" + microsoft_app_id = "${data.azurerm_client_config.current.client_id}" tags = { environment = "production" @@ -204,7 +204,7 @@ resource "azurerm_bot_web_app" "test" { name = "acctestdf%d" location = "global" resource_group_name = "${azurerm_resource_group.test.name}" - microsoft_app_id = "${data.azurerm_client_config.current.service_principal_application_id}" + microsoft_app_id = "${data.azurerm_client_config.current.client_id}" sku = "F0" endpoint = "https://example.com" diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_access_policy_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_access_policy_test.go index bbf0df6dec2c9..115a4d2f53aca 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_access_policy_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_access_policy_test.go @@ -263,7 +263,7 @@ resource "azurerm_key_vault_access_policy" "test_with_application_id" { "delete", ] - application_id = "${data.azurerm_client_config.current.service_principal_application_id}" + application_id = "${data.azurerm_client_config.current.client_id}" tenant_id = "${data.azurerm_client_config.current.tenant_id}" object_id = "${data.azurerm_client_config.current.object_id}" } diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go index f308e2ae1d5f7..486796fb84715 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go @@ -881,7 +881,7 @@ resource "azurerm_key_vault" "test" { access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" object_id = "${data.azurerm_client_config.current.client_id}" - application_id = "${data.azurerm_client_config.current.service_principal_application_id}" + application_id = "${data.azurerm_client_config.current.client_id}" certificate_permissions = [ "get", diff --git a/website/docs/d/client_config.html.markdown b/website/docs/d/client_config.html.markdown index f63a262ce5c9c..ce6aa6825cc3b 100644 --- a/website/docs/d/client_config.html.markdown +++ b/website/docs/d/client_config.html.markdown @@ -17,7 +17,7 @@ data "azurerm_client_config" "current" { } output "account_id" { - value = data.azurerm_client_config.current.service_principal_application_id + value = data.azurerm_client_config.current.client_id } ``` diff --git a/website/docs/r/bot_channel_email.markdown b/website/docs/r/bot_channel_email.markdown index ee988ab86571e..3eae9f810207f 100644 --- a/website/docs/r/bot_channel_email.markdown +++ b/website/docs/r/bot_channel_email.markdown @@ -27,7 +27,7 @@ resource "azurerm_bot_channels_registration" "example" { location = "global" resource_group_name = "${azurerm_resource_group.example.name}" sku = "F0" - microsoft_app_id = "${data.azurerm_client_config.current.service_principal_application_id}" + microsoft_app_id = "${data.azurerm_client_config.current.client_id}" } resource "azurerm_bot_channel_Email" "example" { diff --git a/website/docs/r/bot_channel_ms_teams.markdown b/website/docs/r/bot_channel_ms_teams.markdown index 287d03b2ea5e5..b5901094dc673 100644 --- a/website/docs/r/bot_channel_ms_teams.markdown +++ b/website/docs/r/bot_channel_ms_teams.markdown @@ -27,7 +27,7 @@ resource "azurerm_bot_channels_registration" "example" { location = "global" resource_group_name = "${azurerm_resource_group.example.name}" sku = "F0" - microsoft_app_id = "${data.azurerm_client_config.current.service_principal_application_id}" + microsoft_app_id = "${data.azurerm_client_config.current.client_id}" } resource "azurerm_bot_channel_ms_teams" "example" { diff --git a/website/docs/r/bot_channel_slack.markdown b/website/docs/r/bot_channel_slack.markdown index 385ed4fce523a..1ca9343ca52bb 100644 --- a/website/docs/r/bot_channel_slack.markdown +++ b/website/docs/r/bot_channel_slack.markdown @@ -27,7 +27,7 @@ resource "azurerm_bot_channels_registration" "example" { location = "global" resource_group_name = "${azurerm_resource_group.example.name}" sku = "F0" - microsoft_app_id = "${data.azurerm_client_config.current.service_principal_application_id}" + microsoft_app_id = "${data.azurerm_client_config.current.client_id}" } resource "azurerm_bot_channel_slack" "example" { diff --git a/website/docs/r/bot_channels_registration.markdown b/website/docs/r/bot_channels_registration.markdown index cfea342c295fe..b9e24174964bd 100644 --- a/website/docs/r/bot_channels_registration.markdown +++ b/website/docs/r/bot_channels_registration.markdown @@ -25,7 +25,7 @@ resource "azurerm_bot_channels_registration" "example" { location = "global" resource_group_name = "${azurerm_resource_group.example.name}" sku = "F0" - microsoft_app_id = "${data.azurerm_client_config.current.service_principal_application_id}" + microsoft_app_id = "${data.azurerm_client_config.current.client_id}" } ``` diff --git a/website/docs/r/bot_connection.markdown b/website/docs/r/bot_connection.markdown index 836badd0ca13f..30207040041da 100644 --- a/website/docs/r/bot_connection.markdown +++ b/website/docs/r/bot_connection.markdown @@ -25,7 +25,7 @@ resource "azurerm_bot_channels_registration" "example" { location = "global" resource_group_name = "${azurerm_resource_group.example.name}" sku = "F0" - microsoft_app_id = "${data.azurerm_client_config.current.service_principal_application_id}" + microsoft_app_id = "${data.azurerm_client_config.current.client_id}" } resource "azurerm_bot_connection" "example" { diff --git a/website/docs/r/bot_web_app.markdown b/website/docs/r/bot_web_app.markdown index 14285b7ea0a1c..a7198070a3f88 100644 --- a/website/docs/r/bot_web_app.markdown +++ b/website/docs/r/bot_web_app.markdown @@ -25,7 +25,7 @@ resource "azurerm_bot_web_app" "example" { location = "global" resource_group_name = "${azurerm_resource_group.example.name}" sku = "F0" - microsoft_app_id = "${data.azurerm_client_config.current.service_principal_application_id}" + microsoft_app_id = "${data.azurerm_client_config.current.client_id}" } ``` From 3f1272ba28a12a32930601090a6eed12a30bff25 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 23 Feb 2020 11:03:35 +0100 Subject: [PATCH 364/498] r/maps_account: fixing the casing --- azurerm/internal/services/maps/resource_arm_maps_account.go | 4 ++-- website/docs/r/maps_account.html.markdown | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/azurerm/internal/services/maps/resource_arm_maps_account.go b/azurerm/internal/services/maps/resource_arm_maps_account.go index 96380765ad5f0..df3e23a2c55fb 100644 --- a/azurerm/internal/services/maps/resource_arm_maps_account.go +++ b/azurerm/internal/services/maps/resource_arm_maps_account.go @@ -53,8 +53,8 @@ func resourceArmMapsAccount() *schema.Resource { Required: true, ForceNew: true, ValidateFunc: validation.StringInSlice([]string{ - "s0", - "s1", + "S0", + "S1", }, false), }, diff --git a/website/docs/r/maps_account.html.markdown b/website/docs/r/maps_account.html.markdown index 2842b14c0ebe4..9a5896500586c 100644 --- a/website/docs/r/maps_account.html.markdown +++ b/website/docs/r/maps_account.html.markdown @@ -21,7 +21,7 @@ resource "azurerm_resource_group" "example" { resource "azurerm_maps_account" "example" { name = "example-maps-account" resource_group_name = azurerm_resource_group.example.name - sku_name = "s1" + sku_name = "S1" tags = { environment = "Test" @@ -37,7 +37,7 @@ The following arguments are supported: * `resource_group_name` - (Required) The name of the Resource Group in which the Azure Maps Account should exist. Changing this forces a new resource to be created. -* `sku_name` - (Required) The sku of the Azure Maps Account. Possible values are `s0` and `s1`. +* `sku_name` - (Required) The sku of the Azure Maps Account. Possible values are `S0` and `S1`. * `tags` - (Optional) A mapping of tags to assign to the Azure Maps Account. From 1a3436358c245e1441a6267f56e891287738b353 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 23 Feb 2020 11:06:20 +0100 Subject: [PATCH 365/498] r/mariadb: fixing the sku block --- .../tests/resource_arm_mariadb_server_test.go | 55 ------------------- ...e_arm_mariadb_virtual_network_rule_test.go | 32 ++--------- 2 files changed, 4 insertions(+), 83 deletions(-) diff --git a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_server_test.go b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_server_test.go index 1ced8513a0f17..eca1a3c3dbce6 100644 --- a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_server_test.go +++ b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_server_test.go @@ -34,28 +34,6 @@ func TestAccAzureRMMariaDbServer_basic(t *testing.T) { }) } -func TestAccAzureRMMariaDbServer_basicOldSku(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_mariadb_server", "test") - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMariaDbServerDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMMariaDbServer_basicOldSku(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMariaDbServerExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "administrator_login", "acctestun"), - resource.TestCheckResourceAttr(data.ResourceName, "version", "10.2"), - resource.TestCheckResourceAttr(data.ResourceName, "ssl_enforcement", "Enabled"), - ), - }, - data.ImportStep("administrator_login_password"), // not returned as sensitive - }, - }) -} - func TestAccAzureRMMariaDbServer_requiresImport(t *testing.T) { if !features.ShouldResourcesBeImported() { t.Skip("Skipping since resources aren't required to be imported") @@ -346,39 +324,6 @@ resource "azurerm_mariadb_server" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } -func testAccAzureRMMariaDbServer_basicOldSku(data acceptance.TestData) string { - return fmt.Sprintf(` -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_mariadb_server" "test" { - name = "acctestmariadbsvr-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - - sku { - name = "B_Gen5_2" - capacity = 2 - tier = "Basic" - family = "Gen5" - } - - storage_profile { - storage_mb = 51200 - backup_retention_days = 7 - geo_redundant_backup = "Disabled" - } - - administrator_login = "acctestun" - administrator_login_password = "H@Sh1CoR3!" - version = "10.2" - ssl_enforcement = "Enabled" -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} - func testAccAzureRMMariaDbServer_requiresImport(data acceptance.TestData) string { template := testAccAzureRMMariaDbServer_basic(data) return fmt.Sprintf(` diff --git a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_virtual_network_rule_test.go b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_virtual_network_rule_test.go index 6ccd92c61a6b0..0997bbf8fae8a 100644 --- a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_virtual_network_rule_test.go +++ b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_virtual_network_rule_test.go @@ -255,13 +255,7 @@ resource "azurerm_mariadb_server" "test" { administrator_login_password = "H@Sh1CoR3!" version = "10.2" ssl_enforcement = "Enabled" - - sku { - name = "GP_Gen5_2" - capacity = 2 - tier = "GeneralPurpose" - family = "Gen5" - } + sku_name = "GP_Gen5_2" storage_profile { storage_mb = 51200 @@ -330,13 +324,7 @@ resource "azurerm_mariadb_server" "test" { administrator_login_password = "H@Sh1CoR3!" version = "10.2" ssl_enforcement = "Enabled" - - sku { - name = "GP_Gen5_2" - capacity = 2 - tier = "GeneralPurpose" - family = "Gen5" - } + sku_name = "GP_Gen5_2" storage_profile { storage_mb = 51200 @@ -392,13 +380,7 @@ resource "azurerm_mariadb_server" "test" { administrator_login_password = "H@Sh1CoR3!" version = "10.2" ssl_enforcement = "Enabled" - - sku { - name = "GP_Gen5_2" - capacity = 2 - tier = "GeneralPurpose" - family = "Gen5" - } + sku_name = "GP_Gen5_2" storage_profile { storage_mb = 51200 @@ -469,13 +451,7 @@ resource "azurerm_mariadb_server" "test" { administrator_login_password = "H@Sh1CoR3!" version = "10.2" ssl_enforcement = "Enabled" - - sku { - name = "GP_Gen5_2" - capacity = 2 - tier = "GeneralPurpose" - family = "Gen5" - } + sku_name = "GP_Gen5_2" storage_profile { storage_mb = 51200 From f46f1af80c2296ef064b4093ca7342f76e88794d Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 23 Feb 2020 11:08:36 +0100 Subject: [PATCH 366/498] r/network_interface_backend_address_pool_association - removing the deprecated location field --- ...rm_network_interface_backend_address_pool_association_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_backend_address_pool_association_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_backend_address_pool_association_test.go index ae067fb3fb8c8..3a34d2773a880 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_backend_address_pool_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_backend_address_pool_association_test.go @@ -321,7 +321,6 @@ resource "azurerm_lb" "test" { } resource "azurerm_lb_backend_address_pool" "test" { - location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" loadbalancer_id = "${azurerm_lb.test.id}" name = "acctestpool" From f503811f848d0aa97ff2a43ac673b3ec0b12832e Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 23 Feb 2020 11:09:08 +0100 Subject: [PATCH 367/498] r/template_deployment: removing the deprecated resource_group_name field from `azurerm_storage_container` --- .../resource/tests/resource_arm_template_deployment_test.go | 1 - 1 file changed, 1 deletion(-) 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 6ccea641468c9..16e242c7fb7af 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 @@ -634,7 +634,6 @@ output "test" { resource "azurerm_storage_container" "using-outputs" { name = "vhds" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_template_deployment.test.outputs["accountName"]}" container_access_type = "private" } From 15538367fd49b36e7ac46792efa98a68202f1449 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 23 Feb 2020 11:13:32 +0100 Subject: [PATCH 368/498] removing `resource_group_name` from the storage_container resource --- .../services/batch/tests/resource_arm_batch_pool_test.go | 1 - .../tests/resource_arm_eventgrid_event_subscription_test.go | 4 ---- .../services/sql/tests/resource_arm_sql_database_test.go | 1 - .../tests/resource_arm_stream_analytics_output_blob_test.go | 2 -- ...resource_arm_stream_analytics_reference_input_blob_test.go | 1 - .../docs/r/hdinsight_interactive_query_cluster.html.markdown | 1 - 6 files changed, 10 deletions(-) diff --git a/azurerm/internal/services/batch/tests/resource_arm_batch_pool_test.go b/azurerm/internal/services/batch/tests/resource_arm_batch_pool_test.go index c4a5bd44568cd..8315fc8eebbab 100644 --- a/azurerm/internal/services/batch/tests/resource_arm_batch_pool_test.go +++ b/azurerm/internal/services/batch/tests/resource_arm_batch_pool_test.go @@ -1067,7 +1067,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "vhds" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "blob" } diff --git a/azurerm/internal/services/eventgrid/tests/resource_arm_eventgrid_event_subscription_test.go b/azurerm/internal/services/eventgrid/tests/resource_arm_eventgrid_event_subscription_test.go index 166b6e6aa10e4..9b64e1c4d64ff 100644 --- a/azurerm/internal/services/eventgrid/tests/resource_arm_eventgrid_event_subscription_test.go +++ b/azurerm/internal/services/eventgrid/tests/resource_arm_eventgrid_event_subscription_test.go @@ -202,7 +202,6 @@ resource "azurerm_storage_queue" "test" { resource "azurerm_storage_container" "test" { name = "vhds" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } @@ -263,13 +262,11 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_queue" "test" { name = "mysamplequeue-%d" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" } resource "azurerm_storage_container" "test" { name = "vhds" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } @@ -277,7 +274,6 @@ resource "azurerm_storage_container" "test" { resource "azurerm_storage_blob" "test" { name = "herpderp1.vhd" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" storage_container_name = "${azurerm_storage_container.test.name}" 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 887b9daf1c323..81d5b7d39f164 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 @@ -684,7 +684,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "bacpac" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_blob_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_blob_test.go index 071ffc09044ba..b53171f546597 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_blob_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_blob_test.go @@ -258,7 +258,6 @@ resource "azurerm_storage_account" "updated" { resource "azurerm_storage_container" "updated" { name = "example" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.updated.name}" container_access_type = "private" } @@ -318,7 +317,6 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "example" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_reference_input_blob_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_reference_input_blob_test.go index 3b78170c7508d..40b6827cecefa 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_reference_input_blob_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_reference_input_blob_test.go @@ -258,7 +258,6 @@ resource "azurerm_storage_account" "updated" { resource "azurerm_storage_container" "updated" { name = "example2" - resource_group_name = "${azurerm_resource_group.test.name}" storage_account_name = "${azurerm_storage_account.test.name}" container_access_type = "private" } diff --git a/website/docs/r/hdinsight_interactive_query_cluster.html.markdown b/website/docs/r/hdinsight_interactive_query_cluster.html.markdown index 9fbf57df1fee1..08cdde0403088 100644 --- a/website/docs/r/hdinsight_interactive_query_cluster.html.markdown +++ b/website/docs/r/hdinsight_interactive_query_cluster.html.markdown @@ -28,7 +28,6 @@ resource "azurerm_storage_account" "example" { resource "azurerm_storage_container" "example" { name = "hdinsight" - resource_group_name = azurerm_resource_group.example.name storage_account_name = azurerm_storage_account.example.name container_access_type = "private" } From a3e411df9f3e4fd9e71032c522d4bf67c641dd57 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Sun, 23 Feb 2020 23:03:48 +0100 Subject: [PATCH 369/498] quotes --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc5a65145f38a..328c4003c1c24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,9 +10,9 @@ FEATURES: * **Custom Timeouts:** - all resources within the Azure Provider now allow configuring custom timeouts - please [see Terraform's Timeout documentation](https://www.terraform.io/docs/configuration/resources.html#operation-timeouts) and the documentation in each data source resource for more information. * **Requires Import:** The Azure Provider now checks for the presence of an existing resource prior to creating it - which means that if you try and create a resource which already exists (without importing it) you'll be prompted to import this into the state. -* **New Data Source:** `azurerm_app_service_environment [GH-5508] +* **New Data Source:** `azurerm_app_service_environment` [GH-5508] * **New Data Source:** `azurerm_eventhub_authorization_rule` [GH-5805] -* **New Resource:** `azurerm_app_service_environment [GH-5508] +* **New Resource:** `azurerm_app_service_environment` [GH-5508] * **New Resource:** `azurerm_express_route_gateway` [GH-5523] * **New Resource:** `azurerm_linux_virtual_machine` [GH-5705] * **New Resource:** `azurerm_linux_virtual_machine_scale_set` [GH-5705] From ab5b5b32427f449705f57599daeb0ee2bbe13288 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 23 Feb 2020 23:12:13 +0100 Subject: [PATCH 370/498] d/key_vault_key: removing a dead field --- .../services/keyvault/data_source_key_vault_key.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/azurerm/internal/services/keyvault/data_source_key_vault_key.go b/azurerm/internal/services/keyvault/data_source_key_vault_key.go index 470d2c8c7e726..3b1277b7d91fe 100644 --- a/azurerm/internal/services/keyvault/data_source_key_vault_key.go +++ b/azurerm/internal/services/keyvault/data_source_key_vault_key.go @@ -28,13 +28,9 @@ func dataSourceArmKeyVaultKey() *schema.Resource { }, "key_vault_id": { - Type: schema.TypeString, - Computed: true, - }, - - "key_vault_access_policy_id": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: azure.ValidateResourceID, }, "key_type": { @@ -89,8 +85,6 @@ func dataSourceArmKeyVaultKeyRead(d *schema.ResourceData, meta interface{}) erro return fmt.Errorf("Error looking up Key %q vault url from id %q: %+v", name, keyVaultId, err) } - d.Set("key_vault_id", keyVaultId) - resp, err := client.GetKey(ctx, keyVaultBaseUri, name, "") if err != nil { if utils.ResponseWasNotFound(resp.Response) { From d7c87e2045e268b30dfa2ce8ea32949f4a816e0f Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 23 Feb 2020 23:18:30 +0100 Subject: [PATCH 371/498] d/storage_account: removing removed fields --- website/docs/d/storage_account.html.markdown | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/website/docs/d/storage_account.html.markdown b/website/docs/d/storage_account.html.markdown index eec3c0a3686cb..f20cdc38a7250 100644 --- a/website/docs/d/storage_account.html.markdown +++ b/website/docs/d/storage_account.html.markdown @@ -43,18 +43,10 @@ output "storage_account_tier" { * `access_tier` - The access tier for `BlobStorage` accounts. -* `enable_blob_encryption` - Are Encryption Services are enabled for Blob storage? See [here](https://azure.microsoft.com/en-us/documentation/articles/storage-service-encryption/) - for more information. - -* `enable_file_encryption` - Are Encryption Services are enabled for File storage? See [here](https://azure.microsoft.com/en-us/documentation/articles/storage-service-encryption/) - for more information. - * `enable_https_traffic_only` - Is traffic only allowed via HTTPS? See [here](https://docs.microsoft.com/en-us/azure/storage/storage-require-secure-transfer/) for more information. - -* `is_hns_enabled` - Is Hierarchical Namespace enabled? -* `account_encryption_source` - The Encryption Source for this Storage Account. +* `is_hns_enabled` - Is Hierarchical Namespace enabled? * `custom_domain` - A `custom_domain` block as documented below. From 5ae175fe215af522841b5424a1212a000e6b266f Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Sun, 23 Feb 2020 23:26:48 +0100 Subject: [PATCH 372/498] updating to include #5773 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 328c4003c1c24..c0ac63c9fdc2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -123,6 +123,7 @@ BREAKING CHANGES: * `azurerm_maps_account` - the `sku_name` field is now case-sensitive [GH-5776] * `azurerm_mariadb_server` - removing the `sku` block since it's been deprecated in favour of the `sku_name` field [GH-5777] * `azurerm_metric_alertrule` - the deprecated resource has been removed [GH-5844] +* `azurerm_monitor_metric_alert` - updating the default value for `auto_mitigate` from `false` to `true` [GH-5773] * `azurerm_monitor_metric_alertrule` - the deprecated resource has been removed [GH-5844] * `azurerm_mssql_elasticpool` - removing the deprecated `elastic_pool_properties` block [GH-5744] * `azurerm_mysql_server` - removing the deprecated `sku` block [GH-5743] From 674226db309c4008ee8122bc7bfd07b03814aea0 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 24 Feb 2020 06:43:31 +0100 Subject: [PATCH 373/498] updating to include #5668 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0ac63c9fdc2e..23b8610d85785 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ FEATURES: * **New Resource:** `azurerm_linux_virtual_machine` [GH-5705] * **New Resource:** `azurerm_linux_virtual_machine_scale_set` [GH-5705] * **New Resource:** `azurerm_network_interface_security_group_association` [GH-5784] +* **New Resource:** `azurerm_storage_account_customer_managed_key` [GH-5668] * **New Resource:** `azurerm_virtual_machine_scale_set_extension` [GH-5705] * **New Resource:** `azurerm_windows_virtual_machine` [GH-5705] * **New Resource:** `azurerm_windows_virtual_machine_scale_set` [GH-5705] @@ -43,6 +44,9 @@ BREAKING CHANGES: * Data Source: `azurerm_private_link_endpoint_connection` - the deprecated data source has been removed [GH-5844] * Data Source: `azurerm_recovery_services_protection_policy_vm` has been renamed to `azurerm_backup_policy_vm` [GH-5816] * Data Source: `azurerm_role_definition` - removing the alias `VirtualMachineContributor` which has been deprecated in favour of the full name `Virtual Machine Contributor` [GH-5733] +* Data Source: `azurerm_storage_account` - removing the `account_encryption_source` field since this is no longer configurable by Azure [GH-5668] +* Data Source: `azurerm_storage_account` - removing the `enable_blob_encryption` field since this is no longer configurable by Azure [GH-5668] +* Data Source: `azurerm_storage_account` - removing the `enable_file_encryption` field since this is no longer configurable by Azure [GH-5668] * Data Source: `azurerm_scheduler_job_collection` - This data source has been removed since it was deprecated [GH-5712] * Data Source: `azurerm_subnet` - removing the deprecated `ip_configuration` field [GH-5801] * Data Source: `azurerm_virtual_network` - removing the deprecated `address_spaces` field [GH-5823] @@ -155,6 +159,9 @@ BREAKING CHANGES: * `azurerm_storage_account` - removing the deprecated `account_type` field [GH-5710] * `azurerm_storage_account` - removing the deprecated `enable_advanced_threat_protection` field [GH-5710] * `azurerm_storage_account` - updating the default value for `enable_https_traffic_only` from `false` to `true` [GH-5808] +* `azurerm_storage_account` - removing the `account_encryption_source` field since this is no longer configurable by Azure [GH-5668] +* `azurerm_storage_account` - removing the `enable_blob_encryption` field since this is no longer configurable by Azure [GH-5668] +* `azurerm_storage_account` - removing the `enable_file_encryption` field since this is no longer configurable by Azure [GH-5668] * `azurerm_storage_blob` - making the `type` field case-sensitive [GH-5710] * `azurerm_storage_blob` - removing the deprecated `attempts` field [GH-5710] * `azurerm_storage_blob` - removing the deprecated `resource_group_name` field [GH-5710] @@ -196,6 +203,7 @@ BUG FIXES: * `azurerm_recovery_services_vault` - using the requested cloud rather than the default [GH-5825] * `azurerm_role_assignment` - validating that the `name` is a UUID [GH-5624] * `azurerm_signalr_service` - ensuring the SignalR segment is parsed in the correct case [GH-5737] +* `azurerm_storage_account` - locking on the storage account resource when updating the storage account [GH-5668] * `azurerm_subnet` - supporting updating of the `enforce_private_link_endpoint_network_policies` field [GH-5801] * `azurerm_subnet` - supporting updating of the `enforce_private_link_service_network_policies` field [GH-5801] * `azurerm_windows_virtual_machine` - using the delete custom timeout during deletion [GH-5764] From fb837ad446661442fd832a7ecaf24360a2ba4d6c Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 24 Feb 2020 06:48:12 +0100 Subject: [PATCH 374/498] linting --- ...orage_account_customer_managed_key_test.go | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go index 91c4dcdea3af3..8d4e45edc18ec 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go @@ -184,11 +184,11 @@ func testAccAzureRMStorageAccountCustomerManagedKey_updated(data acceptance.Test %s resource "azurerm_key_vault_key" "second" { - name = "second" - key_vault_id = azurerm_key_vault.test.id - key_type = "RSA" - key_size = 2048 - key_opts = ["decrypt", "encrypt", "sign", "unwrapKey", "verify", "wrapKey"] + name = "second" + key_vault_id = azurerm_key_vault.test.id + key_type = "RSA" + key_size = 2048 + key_opts = ["decrypt", "encrypt", "sign", "unwrapKey", "verify", "wrapKey"] depends_on = [ azurerm_key_vault_access_policy.client, @@ -251,11 +251,11 @@ resource "azurerm_key_vault_access_policy" "client" { } resource "azurerm_key_vault_key" "first" { - name = "first" - key_vault_id = azurerm_key_vault.test.id - key_type = "RSA" - key_size = 2048 - key_opts = ["decrypt", "encrypt", "sign", "unwrapKey", "verify", "wrapKey"] + name = "first" + key_vault_id = azurerm_key_vault.test.id + key_type = "RSA" + key_size = 2048 + key_opts = ["decrypt", "encrypt", "sign", "unwrapKey", "verify", "wrapKey"] depends_on = [ azurerm_key_vault_access_policy.client, From ef0105db9cf0367e9bf1ff7fe2101c7b0f646fc8 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 24 Feb 2020 06:48:22 +0100 Subject: [PATCH 375/498] r/storage_account_customer_managed_key: adding args to the error --- .../resource_arm_storage_account_customer_managed_key.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go b/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go index d469bf8bee240..5eecd10114edb 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go @@ -213,7 +213,7 @@ func resourceArmStorageAccountCustomerManagedKeyRead(d *schema.ResourceData, met } if keyVaultUri == "" { - return fmt.Errorf("Error retrieving Storage Account %q (Resource Group %q): `properties.encryption.keyVaultProperties.keyVaultUri` was nil") + return fmt.Errorf("Error retrieving Storage Account %q (Resource Group %q): `properties.encryption.keyVaultProperties.keyVaultUri` was nil", storageAccountId.Name, storageAccountId.ResourceGroup) } keyVaultId, err := azure.GetKeyVaultIDFromBaseUrl(ctx, vaultsClient, keyVaultUri) From b21bda7c4b36a05f1c23860f6b36851b8cfe998c Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 24 Feb 2020 06:51:18 +0100 Subject: [PATCH 376/498] updating to include #5850 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 23b8610d85785..5322abd0ec6db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -156,6 +156,7 @@ BREAKING CHANGES: * `azurerm_relay_namespace` - removing the `sku` block in favour of the `sku_name` field [GH-5719] * `azurerm_scheduler_job` - This resource has been removed since it was deprecated [GH-5712] * `azurerm_scheduler_job_collection` - This resource has been removed since it was deprecated [GH-5712] +* `azurerm_storage_account` - updating the default value for `account_kind` from `Storage` to `StorageV2` [GH-5850] * `azurerm_storage_account` - removing the deprecated `account_type` field [GH-5710] * `azurerm_storage_account` - removing the deprecated `enable_advanced_threat_protection` field [GH-5710] * `azurerm_storage_account` - updating the default value for `enable_https_traffic_only` from `false` to `true` [GH-5808] From da86e2431f11990be800fa0d1511eeb30631c216 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 24 Feb 2020 06:57:08 +0100 Subject: [PATCH 377/498] r/frontdoor: updating the default values within the `forwarding_configuration` block --- .../internal/services/frontdoor/resource_arm_frontdoor.go | 6 +++--- website/docs/guides/2.0-upgrade-guide.html.markdown | 6 +++++- website/docs/r/frontdoor.html.markdown | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/azurerm/internal/services/frontdoor/resource_arm_frontdoor.go b/azurerm/internal/services/frontdoor/resource_arm_frontdoor.go index 9110245f8b438..448f4a58e040a 100644 --- a/azurerm/internal/services/frontdoor/resource_arm_frontdoor.go +++ b/azurerm/internal/services/frontdoor/resource_arm_frontdoor.go @@ -175,7 +175,7 @@ func resourceArmFrontDoor() *schema.Resource { "cache_enabled": { Type: schema.TypeBool, Optional: true, - Default: true, + Default: false, }, "cache_use_dynamic_compression": { Type: schema.TypeBool, @@ -185,11 +185,11 @@ func resourceArmFrontDoor() *schema.Resource { "cache_query_parameter_strip_directive": { Type: schema.TypeString, Optional: true, + Default: string(frontdoor.StripAll), ValidateFunc: validation.StringInSlice([]string{ string(frontdoor.StripAll), string(frontdoor.StripNone), }, false), - Default: string(frontdoor.StripNone), }, "custom_forwarding_path": { Type: schema.TypeString, @@ -198,12 +198,12 @@ func resourceArmFrontDoor() *schema.Resource { "forwarding_protocol": { Type: schema.TypeString, Optional: true, + Default: string(frontdoor.HTTPSOnly), ValidateFunc: validation.StringInSlice([]string{ string(frontdoor.HTTPOnly), string(frontdoor.HTTPSOnly), string(frontdoor.MatchRequest), }, false), - Default: string(frontdoor.HTTPSOnly), }, }, }, diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index 39076e9fb2682..755f33d8cede7 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -353,7 +353,11 @@ The deprecated `internal_public_ip_address_id` field in the `ip_configuration` b ### Resource: `azurerm_frontdoor` -The `forwarding_protocol` property now defaults to `HttpsOnly` +The field `cache_enabled` within the `forwarding_configuration` block now defaults to `HttpsOnly` rather than `MatchRequest`. + +The field `cache_query_parameter_strip_directive` within the `forwarding_configuration` block now defaults to `StripAll` rather than `StripNone`. + +The field `forwarding_protocol` within the `forwarding_configuration` block now defaults to `HttpsOnly` rather than `MatchRequest`. ### Resource: `azurerm_function_app` diff --git a/website/docs/r/frontdoor.html.markdown b/website/docs/r/frontdoor.html.markdown index ba6dc9537da78..976aad277ebf1 100644 --- a/website/docs/r/frontdoor.html.markdown +++ b/website/docs/r/frontdoor.html.markdown @@ -197,11 +197,11 @@ The `forwarding_configuration` block supports the following: * `backend_pool_name` - (Required) Specifies the name of the Backend Pool to forward the incoming traffic to. -* `cache_enabled` - (Optional) Specifies whether to Enable caching or not. Valid options are `true` or `false`. Defaults to `true`. +* `cache_enabled` - (Optional) Specifies whether to Enable caching or not. Valid options are `true` or `false`. Defaults to `false`. * `cache_use_dynamic_compression` - (Optional) Whether to use dynamic compression when caching. Valid options are `true` or `false`. Defaults to `false`. -* `cache_query_parameter_strip_directive` - (Optional) Defines cache behavior in releation to query string parameters. Valid options are `StripAll` or `StripNone`. Defaults to `StripNone`. +* `cache_query_parameter_strip_directive` - (Optional) Defines cache behavior in releation to query string parameters. Valid options are `StripAll` or `StripNone`. Defaults to `StripAll`. * `custom_forwarding_path` - (Optional) Path to use when constructing the request to forward to the backend. This functions as a URL Rewrite. Default behavior preserves the URL path. From 65152bf9aa36c148f6f0fa662962660921134b19 Mon Sep 17 00:00:00 2001 From: kt Date: Sun, 23 Feb 2020 22:00:39 -0800 Subject: [PATCH 378/498] azurerm_cosmosdb_mongo_collection - remove deprecated property --- .../resource_arm_cosmosdb_mongo_collection.go | 75 ++----------------- .../guides/2.0-upgrade-guide.html.markdown | 4 + .../r/cosmosdb_mongo_collection.html.markdown | 8 -- 3 files changed, 10 insertions(+), 77 deletions(-) diff --git a/azurerm/internal/services/cosmos/resource_arm_cosmosdb_mongo_collection.go b/azurerm/internal/services/cosmos/resource_arm_cosmosdb_mongo_collection.go index c1a1b7447f985..5b6cb44645ec2 100644 --- a/azurerm/internal/services/cosmos/resource_arm_cosmosdb_mongo_collection.go +++ b/azurerm/internal/services/cosmos/resource_arm_cosmosdb_mongo_collection.go @@ -4,7 +4,6 @@ import ( "fmt" "log" "strconv" - "strings" "time" "github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb" @@ -83,30 +82,6 @@ func resourceArmCosmosDbMongoCollection() *schema.Resource { Computed: true, ValidateFunc: validate.CosmosThroughput, }, - - "indexes": { - Type: schema.TypeSet, - Optional: true, - Deprecated: "Indexes are ignored unless they are the shared key so have been deprecated.", - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "key": { - Type: schema.TypeString, // this is a list in the SDK/API, however any more then a single value causes a 404 - Required: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - - "unique": { - Type: schema.TypeBool, - Optional: true, - Default: true, // portal defaults to true - }, - - // expire_after_seconds is only allowed on `_ts`: - // Unable to parse request payload due to the following reason: 'The 'expireAfterSeconds' option is supported on '_ts' field only. - }, - }, - }, }, } } @@ -146,7 +121,7 @@ func resourceArmCosmosDbMongoCollectionCreate(d *schema.ResourceData, meta inter MongoDBCollectionCreateUpdateProperties: &documentdb.MongoDBCollectionCreateUpdateProperties{ Resource: &documentdb.MongoDBCollectionResource{ ID: &name, - Indexes: expandCosmosMongoCollectionIndexes(d.Get("indexes"), ttl), + Indexes: expandCosmosMongoCollectionIndexes(ttl), }, Options: map[string]*string{}, }, @@ -206,7 +181,7 @@ func resourceArmCosmosDbMongoCollectionUpdate(d *schema.ResourceData, meta inter MongoDBCollectionCreateUpdateProperties: &documentdb.MongoDBCollectionCreateUpdateProperties{ Resource: &documentdb.MongoDBCollectionResource{ ID: &id.Collection, - Indexes: expandCosmosMongoCollectionIndexes(d.Get("indexes"), ttl), + Indexes: expandCosmosMongoCollectionIndexes(ttl), }, Options: map[string]*string{}, }, @@ -289,11 +264,7 @@ func resourceArmCosmosDbMongoCollectionRead(d *schema.ResourceData, meta interfa } if props.Indexes != nil { - indexes, ttl := flattenCosmosMongoCollectionIndexes(props.Indexes) - d.Set("default_ttl_seconds", ttl) - if err := d.Set("indexes", indexes); err != nil { - return fmt.Errorf("Error setting `indexes`: %+v", err) - } + d.Set("default_ttl_seconds", flattenCosmosMongoCollectionIndexes(props.Indexes)) } } @@ -336,21 +307,9 @@ func resourceArmCosmosDbMongoCollectionDelete(d *schema.ResourceData, meta inter return nil } -func expandCosmosMongoCollectionIndexes(input interface{}, defaultTtl *int) *[]documentdb.MongoIndex { +func expandCosmosMongoCollectionIndexes(defaultTtl *int) *[]documentdb.MongoIndex { outputs := make([]documentdb.MongoIndex, 0) - for _, i := range input.(*schema.Set).List() { - b := i.(map[string]interface{}) - outputs = append(outputs, documentdb.MongoIndex{ - Key: &documentdb.MongoIndexKeys{ - Keys: &[]string{b["key"].(string)}, - }, - Options: &documentdb.MongoIndexOptions{ - Unique: utils.Bool(b["unique"].(bool)), - }, - }) - } - if defaultTtl != nil { outputs = append(outputs, documentdb.MongoIndex{ Key: &documentdb.MongoIndexKeys{ @@ -365,37 +324,15 @@ func expandCosmosMongoCollectionIndexes(input interface{}, defaultTtl *int) *[]d return &outputs } -func flattenCosmosMongoCollectionIndexes(indexes *[]documentdb.MongoIndex) (*[]map[string]interface{}, *int) { - slice := make([]map[string]interface{}, 0) - +func flattenCosmosMongoCollectionIndexes(indexes *[]documentdb.MongoIndex) *int { var ttl int for _, i := range *indexes { if key := i.Key; key != nil { - m := map[string]interface{}{} var ttlInner int32 - if options := i.Options; options != nil { - if v := options.Unique; v != nil { - m["unique"] = *v - } else { - m["unique"] = false // todo required? API sends back nothing for false - } - - if v := options.ExpireAfterSeconds; v != nil { - ttlInner = *v - } - } - if keys := key.Keys; keys != nil && len(*keys) > 0 { k := (*keys)[0] - if !strings.HasPrefix(k, "_") && k != "DocumentDBDefaultIndex" { // lets ignore system properties? - m["key"] = k - - // only append indexes with a non system key - slice = append(slice, m) - } - if k == "_ts" { ttl = int(ttlInner) } @@ -403,5 +340,5 @@ func flattenCosmosMongoCollectionIndexes(indexes *[]documentdb.MongoIndex) (*[]m } } - return &slice, &ttl + return &ttl } diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index 39076e9fb2682..f0f5c50962eb2 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -307,6 +307,10 @@ Azure Container Service (ACS) is being Deprecated in favour of Azure Kubernetes The deprecated `failover_policy` block will be removed. This has been replaced by the `geo_location` block. +### Resource: `azurerm_cosmosdb_mongodb_collection` + +The deprecated `indexes` will be removed. + ### Resource: `azurerm_devspace_controller` The deprecated `sku` block has been replaced by the `sku_name` field and will be removed. diff --git a/website/docs/r/cosmosdb_mongo_collection.html.markdown b/website/docs/r/cosmosdb_mongo_collection.html.markdown index f5443fc368610..b1261f1d08712 100644 --- a/website/docs/r/cosmosdb_mongo_collection.html.markdown +++ b/website/docs/r/cosmosdb_mongo_collection.html.markdown @@ -56,14 +56,6 @@ The following arguments are supported: * `default_ttl_seconds` - (Required) The default Time To Live in seconds. If the value is `-1` items are not automatically expired. * `shard_key` - (Required) The name of the key to partition on for sharding. There must not be any other unique index keys. * `throughput` - (Optional) The throughput of the MongoDB collection (RU/s). Must be set in increments of `100`. The minimum value is `400`. This must be set upon database creation otherwise it cannot be updated without a manual terraform destroy-apply. -* `indexes` - (Optional) One or more `indexes` blocks as defined below. - ---- - -An `indexes` block supports the following: - -* `key` - (Required) The name of the key to use for this index. -* `unique` - (Required) Whether the index key should be unique. ## Attributes Reference From 437e0e006da24a65fd85d1f5e9e4ad7cf926d513 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 24 Feb 2020 07:14:28 +0100 Subject: [PATCH 379/498] examples: adding the provider block to each example --- examples/app-service-certificate-order/standard/main.tf | 3 +++ examples/app-service-certificate-order/wildcard/main.tf | 3 +++ .../app-service-certificate/stored-in-keyvault/main.tf | 4 ++++ examples/app-service/backup/main.tf | 4 ++++ examples/app-service/docker-authentication/main.tf | 6 +++++- examples/app-service/docker-basic/main.tf | 4 ++++ examples/app-service/docker-compose/main.tf | 4 ++++ examples/app-service/docker-kubernetes/main.tf | 4 ++++ examples/app-service/linux-authentication/main.tf | 6 +++++- examples/app-service/linux-basic/main.tf | 4 ++++ examples/app-service/linux-nodejs/main.tf | 4 ++++ examples/app-service/linux-php/main.tf | 4 ++++ examples/app-service/windows-authentication/main.tf | 6 +++++- examples/app-service/windows-basic/main.tf | 4 ++++ examples/app-service/windows-container/main.tf | 4 ++++ examples/app-service/windows-java/main.tf | 4 ++++ examples/automation-account/main.tf | 4 ++++ examples/batch/basic/main.tf | 6 +++++- examples/batch/custom-image/main.tf | 5 ++++- examples/cdn/main.tf | 4 ++++ .../image-registry-credentials/main.tf | 4 ++++ examples/container-instance/multiple-containers/main.tf | 4 ++++ examples/container-instance/volume-mount/main.tf | 5 ++++- examples/container-registry/main.tf | 4 ++++ examples/cosmos-db/basic/main.tf | 4 ++++ examples/cosmos-db/failover/main.tf | 4 ++++ examples/datalake/main.tf | 4 ++++ examples/eventhub/main.tf | 4 ++++ .../kubernetes/advanced-networking-calico-policy/main.tf | 4 ++++ .../advanced-networking-multiple-agentpool/main.tf | 4 ++++ examples/kubernetes/advanced-networking/main.tf | 4 ++++ examples/kubernetes/basic/main.tf | 4 ++++ examples/kubernetes/basic/outputs.tf | 4 ++++ examples/kubernetes/monitoring/main.tf | 4 ++++ .../kubernetes/role-based-access-control-azuread/main.tf | 4 ++++ examples/kubernetes/role-based-access-control/main.tf | 4 ++++ examples/log-analytics/basic/main.tf | 4 ++++ examples/log-analytics/solution/main.tf | 4 ++++ examples/logic-app/main.tf | 4 ++++ examples/managed-disks/encrypted/1-dependencies.tf | 6 +++++- examples/media-services/basic/main.tf | 4 ++++ .../media-services/multiple-storage-accounts/main.tf | 4 ++++ examples/netapp/account/main.tf | 6 +++++- examples/netapp/pool/main.tf | 4 ++++ examples/netapp/snapshot/main.tf | 4 ++++ examples/netapp/volume/main.tf | 4 ++++ examples/policy-definition/main.tf | 4 ++++ examples/private_endpoint/main.tf | 4 ++++ examples/recovery-services/advanced-policy/main.tf | 4 ++++ examples/recovery-services/basic/main.tf | 4 ++++ examples/recovery-services/virtual-machine/main.tf | 4 ++++ examples/redis-cache/basic/main.tf | 4 ++++ examples/redis-cache/premium-with-backup/main.tf | 4 ++++ examples/redis-cache/premium-with-clustering/main.tf | 4 ++++ examples/redis-cache/standard/main.tf | 4 ++++ examples/search/main.tf | 4 ++++ examples/servicebus/basic/main.tf | 4 ++++ examples/servicebus/forwarding/main.tf | 4 ++++ examples/sql-azure/database/main.tf | 4 ++++ examples/stream-analytics/main.tf | 4 +++- examples/traffic-manager/basic/main.tf | 4 ++++ examples/traffic-manager/virtual-machine/main.tf | 4 ++++ examples/traffic-manager/vm-scale-set/main.tf | 4 ++++ examples/virtual-machines/README.md | 2 +- examples/virtual-machines/linux/basic-password/main.tf | 4 ++++ examples/virtual-machines/linux/basic-ssh/main.tf | 4 ++++ examples/virtual-machines/linux/custom-data/main.tf | 4 ++++ .../virtual-machines/linux/ephemeral-os-disk/main.tf | 4 ++++ examples/virtual-machines/linux/load-balanced/main.tf | 4 ++++ .../linux/managed-disk-attachments/main.tf | 6 +++++- examples/virtual-machines/linux/provisioner/main.tf | 4 ++++ examples/virtual-machines/linux/public-ip/main.tf | 6 ++++-- .../virtual_machine/2-vms-loadbalancer-lbrules/main.tf | 4 ++++ .../virtual-machines/virtual_machine/bastion-box/main.tf | 4 ++++ .../virtual_machine/encrypt-running-linux-vm/main.tf | 4 ++++ .../attaching-external-disks/1-dependencies.tf | 4 ++++ .../virtual_machine/managed-disks/basic/main.tf | 4 ++++ .../managed-disks/from-custom-image/main.tf | 4 ++++ .../managed-disks/from-marketplace-image/main.tf | 4 ++++ .../virtual_machine/managed-disks/public-ip/main.tf | 4 ++++ .../virtual_machine/multiple-network-interfaces/main.tf | 4 ++++ .../virtual_machine/openshift-origin/main.tf | 3 ++- .../virtual_machine/provisioners/linux/main.tf | 4 ++++ .../virtual_machine/provisioners/windows/main.tf | 4 ++++ .../spark-and-cassandra-on-centos/main.tf | 9 +++------ .../unmanaged-disks/basic/1-dependencies.tf | 4 ++++ .../from-existing-storage-account/main.tf | 9 +++------ examples/virtual-machines/windows/basic-password/main.tf | 4 ++++ examples/virtual-machines/windows/custom-data/main.tf | 4 ++++ .../virtual-machines/windows/ephemeral-os-disk/main.tf | 4 ++++ .../windows/vm-joined-to-active-directory/main.tf | 4 ++++ examples/virtual-networks/azure-firewall/main.tf | 9 ++++----- examples/virtual-networks/basic/main.tf | 4 ++++ examples/virtual-networks/multiple-subnets/main.tf | 4 ++++ examples/virtual-networks/network-security-group/main.tf | 4 ++++ examples/virtual-networks/private-link-service/main.tf | 4 ++++ examples/virtual-networks/virtual-hub/main.tf | 4 ++++ .../virtual-networks/virtual-network-peering/main.tf | 4 ++++ examples/vm-scale-set/README.md | 2 +- examples/vm-scale-set/extensions/custom-script/main.tf | 4 ++++ examples/vm-scale-set/linux/auto-scaling/main.tf | 4 ++++ examples/vm-scale-set/linux/basic/main.tf | 4 ++++ examples/vm-scale-set/linux/boot-diagnostics/main.tf | 4 ++++ examples/vm-scale-set/linux/custom-data/main.tf | 4 ++++ examples/vm-scale-set/linux/data-disks/main.tf | 4 ++++ examples/vm-scale-set/linux/ephemeral-os-disk/main.tf | 4 ++++ examples/vm-scale-set/linux/ipv6/main.tf | 4 ++++ examples/vm-scale-set/linux/multiple-nics/main.tf | 4 ++++ .../vm-scale-set/linux/public-ip-per-instance/main.tf | 4 ++++ .../vm-scale-set/linux/rolling-upgrade-policy/main.tf | 4 ++++ examples/vm-scale-set/linux/secrets/main.tf | 4 ++++ examples/vm-scale-set/linux/spot/main.tf | 4 ++++ examples/vm-scale-set/linux/ssh-keys/main.tf | 4 ++++ .../vm-scale-set/linux/system-assigned-identity/main.tf | 4 ++++ .../vm-scale-set/linux/user-assigned-identity/main.tf | 4 ++++ examples/vm-scale-set/linux/zones/main.tf | 4 ++++ .../automatic-rolling-updates/main.tf | 4 ++++ .../virtual_machine_scale_set/autoscale/main.tf | 4 ++++ .../vm-scale-set/virtual_machine_scale_set/basic/main.tf | 4 ++++ examples/vm-scale-set/windows/auto-scaling/main.tf | 4 ++++ examples/vm-scale-set/windows/basic/main.tf | 4 ++++ examples/vm-scale-set/windows/boot-diagnostics/main.tf | 4 ++++ examples/vm-scale-set/windows/custom-data/main.tf | 4 ++++ examples/vm-scale-set/windows/custom-timezone/main.tf | 4 ++++ examples/vm-scale-set/windows/data-disks/main.tf | 4 ++++ examples/vm-scale-set/windows/ephemeral-os-disk/main.tf | 4 ++++ examples/vm-scale-set/windows/hybrid-use-benefit/main.tf | 4 ++++ examples/vm-scale-set/windows/ipv6/main.tf | 4 ++++ examples/vm-scale-set/windows/multiple-nics/main.tf | 4 ++++ .../vm-scale-set/windows/public-ip-per-instance/main.tf | 4 ++++ .../vm-scale-set/windows/rolling-upgrade-policy/main.tf | 5 ++++- examples/vm-scale-set/windows/secrets/main.tf | 4 ++++ .../windows/service-fabric/1-dependencies.tf | 4 ++++ examples/vm-scale-set/windows/spot/main.tf | 4 ++++ .../windows/system-assigned-identity/main.tf | 4 ++++ .../vm-scale-set/windows/user-assigned-identity/main.tf | 4 ++++ examples/vm-scale-set/windows/zones/main.tf | 4 ++++ 137 files changed, 542 insertions(+), 33 deletions(-) diff --git a/examples/app-service-certificate-order/standard/main.tf b/examples/app-service-certificate-order/standard/main.tf index 2d4af869dcaf0..8004ee7be0ddf 100644 --- a/examples/app-service-certificate-order/standard/main.tf +++ b/examples/app-service-certificate-order/standard/main.tf @@ -1,3 +1,6 @@ +provider "azurerm" { + features {} +} resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" diff --git a/examples/app-service-certificate-order/wildcard/main.tf b/examples/app-service-certificate-order/wildcard/main.tf index daa880bba2ab7..3e844a3ff6263 100644 --- a/examples/app-service-certificate-order/wildcard/main.tf +++ b/examples/app-service-certificate-order/wildcard/main.tf @@ -1,3 +1,6 @@ +provider "azurerm" { + features {} +} resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" diff --git a/examples/app-service-certificate/stored-in-keyvault/main.tf b/examples/app-service-certificate/stored-in-keyvault/main.tf index a008c6e93fa8d..8ee248a3b9d0f 100644 --- a/examples/app-service-certificate/stored-in-keyvault/main.tf +++ b/examples/app-service-certificate/stored-in-keyvault/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "example" { diff --git a/examples/app-service/backup/main.tf b/examples/app-service/backup/main.tf index 3f9c6054f08b1..2b7eef2e94b9a 100644 --- a/examples/app-service/backup/main.tf +++ b/examples/app-service/backup/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/app-service/docker-authentication/main.tf b/examples/app-service/docker-authentication/main.tf index f61b5f12c02f2..17ddd0ebfa592 100644 --- a/examples/app-service/docker-authentication/main.tf +++ b/examples/app-service/docker-authentication/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = "${var.location}" @@ -46,7 +50,7 @@ resource "azurerm_app_service" "main" { "someallowedaudience", ] } - + microsoft { client_id = "microsoftclientid" client_secret = "microsoftclientsecret" diff --git a/examples/app-service/docker-basic/main.tf b/examples/app-service/docker-basic/main.tf index 5af67ee5dfb18..4d359c4e29f31 100644 --- a/examples/app-service/docker-basic/main.tf +++ b/examples/app-service/docker-basic/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/app-service/docker-compose/main.tf b/examples/app-service/docker-compose/main.tf index 4d86a641203e5..b2b268bf7253b 100644 --- a/examples/app-service/docker-compose/main.tf +++ b/examples/app-service/docker-compose/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/app-service/docker-kubernetes/main.tf b/examples/app-service/docker-kubernetes/main.tf index 79e1492b5294f..2f326ecb99ab3 100644 --- a/examples/app-service/docker-kubernetes/main.tf +++ b/examples/app-service/docker-kubernetes/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/app-service/linux-authentication/main.tf b/examples/app-service/linux-authentication/main.tf index 2b16e8f2ff317..e4974b520cf54 100644 --- a/examples/app-service/linux-authentication/main.tf +++ b/examples/app-service/linux-authentication/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = "${var.location}" @@ -42,7 +46,7 @@ resource "azurerm_app_service" "main" { "someallowedaudience", ] } - + microsoft { client_id = "microsoftclientid" client_secret = "microsoftclientsecret" diff --git a/examples/app-service/linux-basic/main.tf b/examples/app-service/linux-basic/main.tf index 447eba328ef80..4bbfb7ced340d 100644 --- a/examples/app-service/linux-basic/main.tf +++ b/examples/app-service/linux-basic/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/app-service/linux-nodejs/main.tf b/examples/app-service/linux-nodejs/main.tf index 87d7c4d1a1ab4..8ae6f73755bdd 100644 --- a/examples/app-service/linux-nodejs/main.tf +++ b/examples/app-service/linux-nodejs/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/app-service/linux-php/main.tf b/examples/app-service/linux-php/main.tf index 0066efaff9b91..ddad68a750ddb 100644 --- a/examples/app-service/linux-php/main.tf +++ b/examples/app-service/linux-php/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/app-service/windows-authentication/main.tf b/examples/app-service/windows-authentication/main.tf index 15d14744ecd5d..7f2344befc9ef 100644 --- a/examples/app-service/windows-authentication/main.tf +++ b/examples/app-service/windows-authentication/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = "${var.location}" @@ -40,7 +44,7 @@ resource "azurerm_app_service" "main" { "someallowedaudience", ] } - + microsoft { client_id = "microsoftclientid" client_secret = "microsoftclientsecret" diff --git a/examples/app-service/windows-basic/main.tf b/examples/app-service/windows-basic/main.tf index 6bef7d99f6f0b..14229b041fa52 100644 --- a/examples/app-service/windows-basic/main.tf +++ b/examples/app-service/windows-basic/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/app-service/windows-container/main.tf b/examples/app-service/windows-container/main.tf index 315f98c6b7979..448570b8f56b7 100644 --- a/examples/app-service/windows-container/main.tf +++ b/examples/app-service/windows-container/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/app-service/windows-java/main.tf b/examples/app-service/windows-java/main.tf index a35f94b93093b..22b6d7be99e40 100644 --- a/examples/app-service/windows-java/main.tf +++ b/examples/app-service/windows-java/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/automation-account/main.tf b/examples/automation-account/main.tf index 0952366492914..84accde8f5795 100644 --- a/examples/automation-account/main.tf +++ b/examples/automation-account/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/batch/basic/main.tf b/examples/batch/basic/main.tf index 258e5c5d49779..7198b4d072b4e 100644 --- a/examples/batch/basic/main.tf +++ b/examples/batch/basic/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" @@ -54,7 +58,7 @@ resource "azurerm_batch_pool" "fixed" { } } } - + metadata ={ "tagName"= "Example tag" } diff --git a/examples/batch/custom-image/main.tf b/examples/batch/custom-image/main.tf index 62abcd70c9447..cb038a97fb875 100644 --- a/examples/batch/custom-image/main.tf +++ b/examples/batch/custom-image/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" @@ -52,7 +56,6 @@ resource "azurerm_storage_account" "example" { resource "azurerm_storage_container" "example" { name = "vhds" - resource_group_name = "${azurerm_resource_group.example.name}" storage_account_name = "${azurerm_storage_account.example.name}" container_access_type = "blob" } diff --git a/examples/cdn/main.tf b/examples/cdn/main.tf index bc17f892bf94f..7a10454da8e79 100644 --- a/examples/cdn/main.tf +++ b/examples/cdn/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/container-instance/image-registry-credentials/main.tf b/examples/container-instance/image-registry-credentials/main.tf index 5da2f6435fb8f..3f35c418ff2cd 100644 --- a/examples/container-instance/image-registry-credentials/main.tf +++ b/examples/container-instance/image-registry-credentials/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/container-instance/multiple-containers/main.tf b/examples/container-instance/multiple-containers/main.tf index c24961f122913..29f5d4f718abf 100644 --- a/examples/container-instance/multiple-containers/main.tf +++ b/examples/container-instance/multiple-containers/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/container-instance/volume-mount/main.tf b/examples/container-instance/volume-mount/main.tf index 69cb8753dd198..b66038f0ae70a 100644 --- a/examples/container-instance/volume-mount/main.tf +++ b/examples/container-instance/volume-mount/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" @@ -13,7 +17,6 @@ resource "azurerm_storage_account" "example" { resource "azurerm_storage_share" "example" { name = "aci-test-share" - resource_group_name = "${azurerm_resource_group.example.name}" storage_account_name = "${azurerm_storage_account.example.name}" quota = 50 } diff --git a/examples/container-registry/main.tf b/examples/container-registry/main.tf index d1e9ca362fe33..50033798c560d 100644 --- a/examples/container-registry/main.tf +++ b/examples/container-registry/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/cosmos-db/basic/main.tf b/examples/cosmos-db/basic/main.tf index f67f8a601a431..187b8be2c2a7b 100644 --- a/examples/cosmos-db/basic/main.tf +++ b/examples/cosmos-db/basic/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/cosmos-db/failover/main.tf b/examples/cosmos-db/failover/main.tf index dbebf15f94c76..af407034c61c6 100644 --- a/examples/cosmos-db/failover/main.tf +++ b/examples/cosmos-db/failover/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/datalake/main.tf b/examples/datalake/main.tf index e6cbf0d541a37..efc6a3851cf66 100644 --- a/examples/datalake/main.tf +++ b/examples/datalake/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/eventhub/main.tf b/examples/eventhub/main.tf index 56e0b6d1ad985..8ed8bccbc915f 100644 --- a/examples/eventhub/main.tf +++ b/examples/eventhub/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/kubernetes/advanced-networking-calico-policy/main.tf b/examples/kubernetes/advanced-networking-calico-policy/main.tf index cf95062ee80ca..f09178789362d 100644 --- a/examples/kubernetes/advanced-networking-calico-policy/main.tf +++ b/examples/kubernetes/advanced-networking-calico-policy/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "${var.prefix}-anw-resources" location = "${var.location}" diff --git a/examples/kubernetes/advanced-networking-multiple-agentpool/main.tf b/examples/kubernetes/advanced-networking-multiple-agentpool/main.tf index bb3c463d167ed..35ec53cf91c65 100644 --- a/examples/kubernetes/advanced-networking-multiple-agentpool/main.tf +++ b/examples/kubernetes/advanced-networking-multiple-agentpool/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-anw-resources" location = "${var.location}" diff --git a/examples/kubernetes/advanced-networking/main.tf b/examples/kubernetes/advanced-networking/main.tf index 762b4db9718d8..c3866d252667a 100644 --- a/examples/kubernetes/advanced-networking/main.tf +++ b/examples/kubernetes/advanced-networking/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-anw-resources" location = "${var.location}" diff --git a/examples/kubernetes/basic/main.tf b/examples/kubernetes/basic/main.tf index 5106fd0d2b598..9bfa51a850a6b 100644 --- a/examples/kubernetes/basic/main.tf +++ b/examples/kubernetes/basic/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-k8s-resources" location = "${var.location}" diff --git a/examples/kubernetes/basic/outputs.tf b/examples/kubernetes/basic/outputs.tf index 808ce2f713222..292ede1c02cdf 100644 --- a/examples/kubernetes/basic/outputs.tf +++ b/examples/kubernetes/basic/outputs.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + output "id" { value = "${azurerm_kubernetes_cluster.example.id}" } diff --git a/examples/kubernetes/monitoring/main.tf b/examples/kubernetes/monitoring/main.tf index 0d228ac0e4a2c..506e46fe5a952 100644 --- a/examples/kubernetes/monitoring/main.tf +++ b/examples/kubernetes/monitoring/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-mon-resources" location = "${var.location}" diff --git a/examples/kubernetes/role-based-access-control-azuread/main.tf b/examples/kubernetes/role-based-access-control-azuread/main.tf index 5a26f23167928..c96e0203e14b3 100644 --- a/examples/kubernetes/role-based-access-control-azuread/main.tf +++ b/examples/kubernetes/role-based-access-control-azuread/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-rbac-resources" location = "${var.location}" diff --git a/examples/kubernetes/role-based-access-control/main.tf b/examples/kubernetes/role-based-access-control/main.tf index 47d4f74c8c10c..e282308318a77 100644 --- a/examples/kubernetes/role-based-access-control/main.tf +++ b/examples/kubernetes/role-based-access-control/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-rbac-resources" location = "${var.location}" diff --git a/examples/log-analytics/basic/main.tf b/examples/log-analytics/basic/main.tf index 31dee2406f789..713e90970565d 100644 --- a/examples/log-analytics/basic/main.tf +++ b/examples/log-analytics/basic/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/log-analytics/solution/main.tf b/examples/log-analytics/solution/main.tf index f99ec2fb20d73..70d03fdbcc18e 100644 --- a/examples/log-analytics/solution/main.tf +++ b/examples/log-analytics/solution/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/logic-app/main.tf b/examples/logic-app/main.tf index a8734fb727c1b..48598de637b72 100644 --- a/examples/logic-app/main.tf +++ b/examples/logic-app/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/managed-disks/encrypted/1-dependencies.tf b/examples/managed-disks/encrypted/1-dependencies.tf index 7b9428c170cf4..c9dc1002684fe 100644 --- a/examples/managed-disks/encrypted/1-dependencies.tf +++ b/examples/managed-disks/encrypted/1-dependencies.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { @@ -12,4 +16,4 @@ resource "azurerm_key_vault" "test" { tenant_id = data.azurerm_client_config.current.tenant_id sku_name = "premium" enabled_for_disk_encryption = true -} \ No newline at end of file +} diff --git a/examples/media-services/basic/main.tf b/examples/media-services/basic/main.tf index 489127bd301ef..2f0d477085162 100644 --- a/examples/media-services/basic/main.tf +++ b/examples/media-services/basic/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/media-services/multiple-storage-accounts/main.tf b/examples/media-services/multiple-storage-accounts/main.tf index e3dec4fce391b..702f25242a588 100644 --- a/examples/media-services/multiple-storage-accounts/main.tf +++ b/examples/media-services/multiple-storage-accounts/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/netapp/account/main.tf b/examples/netapp/account/main.tf index bc66ddf5ee432..7b3a3fbd82d58 100644 --- a/examples/netapp/account/main.tf +++ b/examples/netapp/account/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" @@ -16,4 +20,4 @@ resource "azurerm_netapp_account" "example" { domain = "westcentralus.com" organizational_unit = "OU=FirstLevel" } -} \ No newline at end of file +} diff --git a/examples/netapp/pool/main.tf b/examples/netapp/pool/main.tf index a1c773af94d75..0ad5596cc4208 100644 --- a/examples/netapp/pool/main.tf +++ b/examples/netapp/pool/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/netapp/snapshot/main.tf b/examples/netapp/snapshot/main.tf index ba881d4a697ca..657008c9759e3 100644 --- a/examples/netapp/snapshot/main.tf +++ b/examples/netapp/snapshot/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/netapp/volume/main.tf b/examples/netapp/volume/main.tf index 7a4a1f54cec84..dd1883b3aff7d 100644 --- a/examples/netapp/volume/main.tf +++ b/examples/netapp/volume/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/policy-definition/main.tf b/examples/policy-definition/main.tf index 8f203f28a5294..0a5d01312ad33 100644 --- a/examples/policy-definition/main.tf +++ b/examples/policy-definition/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_policy_definition" "example" { name = "${var.prefix}-policy" policy_type = "Custom" diff --git a/examples/private_endpoint/main.tf b/examples/private_endpoint/main.tf index 7527d4be83137..277c7b72b3047 100644 --- a/examples/private_endpoint/main.tf +++ b/examples/private_endpoint/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/recovery-services/advanced-policy/main.tf b/examples/recovery-services/advanced-policy/main.tf index 55d3393bbb1dc..1e5913954d234 100644 --- a/examples/recovery-services/advanced-policy/main.tf +++ b/examples/recovery-services/advanced-policy/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/recovery-services/basic/main.tf b/examples/recovery-services/basic/main.tf index f39454fcceef7..442479cd6a924 100644 --- a/examples/recovery-services/basic/main.tf +++ b/examples/recovery-services/basic/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/recovery-services/virtual-machine/main.tf b/examples/recovery-services/virtual-machine/main.tf index 2a5353760ce40..4fdf3043fd2fc 100644 --- a/examples/recovery-services/virtual-machine/main.tf +++ b/examples/recovery-services/virtual-machine/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/redis-cache/basic/main.tf b/examples/redis-cache/basic/main.tf index 2a889e35dd823..3957c2d204209 100644 --- a/examples/redis-cache/basic/main.tf +++ b/examples/redis-cache/basic/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/redis-cache/premium-with-backup/main.tf b/examples/redis-cache/premium-with-backup/main.tf index 380954b738e61..fcc98a9c1998f 100644 --- a/examples/redis-cache/premium-with-backup/main.tf +++ b/examples/redis-cache/premium-with-backup/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/redis-cache/premium-with-clustering/main.tf b/examples/redis-cache/premium-with-clustering/main.tf index 05b8af149ac57..f67a6fa8d5c3f 100644 --- a/examples/redis-cache/premium-with-clustering/main.tf +++ b/examples/redis-cache/premium-with-clustering/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/redis-cache/standard/main.tf b/examples/redis-cache/standard/main.tf index d89dc76312dd1..015f55d38b555 100644 --- a/examples/redis-cache/standard/main.tf +++ b/examples/redis-cache/standard/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/search/main.tf b/examples/search/main.tf index 239193346dfc3..f95ec9d5b1ad0 100644 --- a/examples/search/main.tf +++ b/examples/search/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/servicebus/basic/main.tf b/examples/servicebus/basic/main.tf index 59db52eb917de..130bdf4489dba 100644 --- a/examples/servicebus/basic/main.tf +++ b/examples/servicebus/basic/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/servicebus/forwarding/main.tf b/examples/servicebus/forwarding/main.tf index d8d8d552982bb..1d086f083cc8c 100644 --- a/examples/servicebus/forwarding/main.tf +++ b/examples/servicebus/forwarding/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/sql-azure/database/main.tf b/examples/sql-azure/database/main.tf index f539558c3acf2..2871fa2c5cab8 100644 --- a/examples/sql-azure/database/main.tf +++ b/examples/sql-azure/database/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/stream-analytics/main.tf b/examples/stream-analytics/main.tf index 13302eb1c749e..f7712f55467b1 100644 --- a/examples/stream-analytics/main.tf +++ b/examples/stream-analytics/main.tf @@ -1,4 +1,6 @@ -provider "azurerm" {} +provider "azurerm" { + features {} +} resource "azurerm_resource_group" "example" { name = "${var.prefix}-example-resources" diff --git a/examples/traffic-manager/basic/main.tf b/examples/traffic-manager/basic/main.tf index 1157f126b669f..e012cf45ba56a 100644 --- a/examples/traffic-manager/basic/main.tf +++ b/examples/traffic-manager/basic/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/traffic-manager/virtual-machine/main.tf b/examples/traffic-manager/virtual-machine/main.tf index 97a4b915caaf9..ddf43f2b47520 100644 --- a/examples/traffic-manager/virtual-machine/main.tf +++ b/examples/traffic-manager/virtual-machine/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/traffic-manager/vm-scale-set/main.tf b/examples/traffic-manager/vm-scale-set/main.tf index faef3825c5cac..774d0d6453c6a 100644 --- a/examples/traffic-manager/vm-scale-set/main.tf +++ b/examples/traffic-manager/vm-scale-set/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-tmresources" location = "${var.location}" diff --git a/examples/virtual-machines/README.md b/examples/virtual-machines/README.md index b9916d9f7a1bc..de75c823fbcff 100644 --- a/examples/virtual-machines/README.md +++ b/examples/virtual-machines/README.md @@ -2,7 +2,7 @@ In 1.x versions of the Provider, Terraform has a single resource for Virtual Machines: `azurerm_virtual_machine`. -Version 2.0 of the Azure Provider will introduce several new resources which supersede the existing `azurerm_virtual_machine` resource: +Version 2.0 of the Azure Provider introduces several new resources which supersede the existing `azurerm_virtual_machine` resource: * `azurerm_linux_virtual_machine` * `azurerm_windows_virtual_machine` diff --git a/examples/virtual-machines/linux/basic-password/main.tf b/examples/virtual-machines/linux/basic-password/main.tf index d24039189835f..e762fd66ccb7f 100644 --- a/examples/virtual-machines/linux/basic-password/main.tf +++ b/examples/virtual-machines/linux/basic-password/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/virtual-machines/linux/basic-ssh/main.tf b/examples/virtual-machines/linux/basic-ssh/main.tf index eedb9906ad866..e01b4f6ce97ac 100644 --- a/examples/virtual-machines/linux/basic-ssh/main.tf +++ b/examples/virtual-machines/linux/basic-ssh/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/virtual-machines/linux/custom-data/main.tf b/examples/virtual-machines/linux/custom-data/main.tf index 27eb92d3b460a..3cce28cb0b0f6 100644 --- a/examples/virtual-machines/linux/custom-data/main.tf +++ b/examples/virtual-machines/linux/custom-data/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/virtual-machines/linux/ephemeral-os-disk/main.tf b/examples/virtual-machines/linux/ephemeral-os-disk/main.tf index fbfc7959cf74b..187ed6eb85dca 100644 --- a/examples/virtual-machines/linux/ephemeral-os-disk/main.tf +++ b/examples/virtual-machines/linux/ephemeral-os-disk/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/virtual-machines/linux/load-balanced/main.tf b/examples/virtual-machines/linux/load-balanced/main.tf index e985536a0e1dc..1d770315b6a77 100644 --- a/examples/virtual-machines/linux/load-balanced/main.tf +++ b/examples/virtual-machines/linux/load-balanced/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/virtual-machines/linux/managed-disk-attachments/main.tf b/examples/virtual-machines/linux/managed-disk-attachments/main.tf index 07af2a871705f..a1df2b5ff0c52 100644 --- a/examples/virtual-machines/linux/managed-disk-attachments/main.tf +++ b/examples/virtual-machines/linux/managed-disk-attachments/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location @@ -68,4 +72,4 @@ resource "azurerm_virtual_machine_data_disk_attachment" "data" { managed_disk_id = azurerm_managed_disk.data.id lun = 0 caching = "None" -} \ No newline at end of file +} diff --git a/examples/virtual-machines/linux/provisioner/main.tf b/examples/virtual-machines/linux/provisioner/main.tf index 87cbca12e7c5c..499d357b99729 100644 --- a/examples/virtual-machines/linux/provisioner/main.tf +++ b/examples/virtual-machines/linux/provisioner/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/virtual-machines/linux/public-ip/main.tf b/examples/virtual-machines/linux/public-ip/main.tf index 21b7fd28dc6b3..02371d8526cb2 100644 --- a/examples/virtual-machines/linux/public-ip/main.tf +++ b/examples/virtual-machines/linux/public-ip/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location @@ -17,7 +21,6 @@ resource "azurerm_subnet" "internal" { address_prefix = "10.0.2.0/24" } - resource "azurerm_public_ip" "pip" { name = "${var.prefix}-pip" resource_group_name = azurerm_resource_group.main.name @@ -93,4 +96,3 @@ resource "azurerm_linux_virtual_machine" "main" { caching = "ReadWrite" } } - diff --git a/examples/virtual-machines/virtual_machine/2-vms-loadbalancer-lbrules/main.tf b/examples/virtual-machines/virtual_machine/2-vms-loadbalancer-lbrules/main.tf index da792fdedd20e..2de6f93df24d5 100644 --- a/examples/virtual-machines/virtual_machine/2-vms-loadbalancer-lbrules/main.tf +++ b/examples/virtual-machines/virtual_machine/2-vms-loadbalancer-lbrules/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "rg" { name = "${var.resource_group}" location = "${var.location}" diff --git a/examples/virtual-machines/virtual_machine/bastion-box/main.tf b/examples/virtual-machines/virtual_machine/bastion-box/main.tf index 53864138b3649..289b8d3eb4281 100644 --- a/examples/virtual-machines/virtual_machine/bastion-box/main.tf +++ b/examples/virtual-machines/virtual_machine/bastion-box/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + locals { virtual_machine_name = "${var.prefix}-vm" admin_username = "testadmin" diff --git a/examples/virtual-machines/virtual_machine/encrypt-running-linux-vm/main.tf b/examples/virtual-machines/virtual_machine/encrypt-running-linux-vm/main.tf index 00910c48f2d81..2e44748cded89 100644 --- a/examples/virtual-machines/virtual_machine/encrypt-running-linux-vm/main.tf +++ b/examples/virtual-machines/virtual_machine/encrypt-running-linux-vm/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "rg" { name = "${var.resource_group}" location = "${var.location}" diff --git a/examples/virtual-machines/virtual_machine/managed-disks/attaching-external-disks/1-dependencies.tf b/examples/virtual-machines/virtual_machine/managed-disks/attaching-external-disks/1-dependencies.tf index e0c5ec481350b..6b457b73e37da 100644 --- a/examples/virtual-machines/virtual_machine/managed-disks/attaching-external-disks/1-dependencies.tf +++ b/examples/virtual-machines/virtual_machine/managed-disks/attaching-external-disks/1-dependencies.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/virtual-machines/virtual_machine/managed-disks/basic/main.tf b/examples/virtual-machines/virtual_machine/managed-disks/basic/main.tf index 34f8ec8df4540..298f30dea4bf4 100644 --- a/examples/virtual-machines/virtual_machine/managed-disks/basic/main.tf +++ b/examples/virtual-machines/virtual_machine/managed-disks/basic/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_virtual_machine" "example" { name = "${var.prefix}-vm" location = "${azurerm_resource_group.example.location}" diff --git a/examples/virtual-machines/virtual_machine/managed-disks/from-custom-image/main.tf b/examples/virtual-machines/virtual_machine/managed-disks/from-custom-image/main.tf index 9b83115989a3e..0111ce697787b 100644 --- a/examples/virtual-machines/virtual_machine/managed-disks/from-custom-image/main.tf +++ b/examples/virtual-machines/virtual_machine/managed-disks/from-custom-image/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + # we assume that this Custom Image already exists data "azurerm_image" "custom" { name = "${var.custom_image_name}" diff --git a/examples/virtual-machines/virtual_machine/managed-disks/from-marketplace-image/main.tf b/examples/virtual-machines/virtual_machine/managed-disks/from-marketplace-image/main.tf index 99813f781202e..49f4d70958c35 100644 --- a/examples/virtual-machines/virtual_machine/managed-disks/from-marketplace-image/main.tf +++ b/examples/virtual-machines/virtual_machine/managed-disks/from-marketplace-image/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + locals { virtual_machine_name = "${var.prefix}-vm" } diff --git a/examples/virtual-machines/virtual_machine/managed-disks/public-ip/main.tf b/examples/virtual-machines/virtual_machine/managed-disks/public-ip/main.tf index c4c83846be490..b83f3f3b35512 100644 --- a/examples/virtual-machines/virtual_machine/managed-disks/public-ip/main.tf +++ b/examples/virtual-machines/virtual_machine/managed-disks/public-ip/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_public_ip" "example" { name = "${var.prefix}-pip" location = "${azurerm_resource_group.example.location}" diff --git a/examples/virtual-machines/virtual_machine/multiple-network-interfaces/main.tf b/examples/virtual-machines/virtual_machine/multiple-network-interfaces/main.tf index 95bce505ff85d..7e6b9805c00e3 100644 --- a/examples/virtual-machines/virtual_machine/multiple-network-interfaces/main.tf +++ b/examples/virtual-machines/virtual_machine/multiple-network-interfaces/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + locals { virtual_machine_name = "${var.prefix}vm" } diff --git a/examples/virtual-machines/virtual_machine/openshift-origin/main.tf b/examples/virtual-machines/virtual_machine/openshift-origin/main.tf index 7bcd4aabd3d4e..6ff9ba380a5e0 100644 --- a/examples/virtual-machines/virtual_machine/openshift-origin/main.tf +++ b/examples/virtual-machines/virtual_machine/openshift-origin/main.tf @@ -1,4 +1,6 @@ provider "azurerm" { + features {} + subscription_id = "${var.subscription_id}" client_id = "${var.aad_client_id}" client_secret = "${var.aad_client_secret}" @@ -831,4 +833,3 @@ resource "azurerm_virtual_machine" "node" { # } # SETTINGS # } - diff --git a/examples/virtual-machines/virtual_machine/provisioners/linux/main.tf b/examples/virtual-machines/virtual_machine/provisioners/linux/main.tf index edf039f9c567c..7c8805836ea8a 100644 --- a/examples/virtual-machines/virtual_machine/provisioners/linux/main.tf +++ b/examples/virtual-machines/virtual_machine/provisioners/linux/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_virtual_machine" "example" { name = "${local.virtual_machine_name}" location = "${azurerm_resource_group.example.location}" diff --git a/examples/virtual-machines/virtual_machine/provisioners/windows/main.tf b/examples/virtual-machines/virtual_machine/provisioners/windows/main.tf index d5d1bacc66a0a..36c26e9dadbd1 100644 --- a/examples/virtual-machines/virtual_machine/provisioners/windows/main.tf +++ b/examples/virtual-machines/virtual_machine/provisioners/windows/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + locals { custom_data_params = "Param($ComputerName = \"${local.virtual_machine_name}\")" custom_data_content = "${local.custom_data_params} ${file("./files/winrm.ps1")}" diff --git a/examples/virtual-machines/virtual_machine/spark-and-cassandra-on-centos/main.tf b/examples/virtual-machines/virtual_machine/spark-and-cassandra-on-centos/main.tf index bd12aedd91e2d..62faefc2eb57f 100644 --- a/examples/virtual-machines/virtual_machine/spark-and-cassandra-on-centos/main.tf +++ b/examples/virtual-machines/virtual_machine/spark-and-cassandra-on-centos/main.tf @@ -1,9 +1,6 @@ -# provider "azurerm" { -# subscription_id = "${var.subscription_id}" -# client_id = "${var.client_id}" -# client_secret = "${var.client_secret}" -# tenant_id = "${var.tenant_id}" -# } +provider "azurerm" { + features {} +} resource "azurerm_resource_group" "rg" { name = "${var.resource_group}" diff --git a/examples/virtual-machines/virtual_machine/unmanaged-disks/basic/1-dependencies.tf b/examples/virtual-machines/virtual_machine/unmanaged-disks/basic/1-dependencies.tf index 7ca9bbb153e34..76357103edc70 100644 --- a/examples/virtual-machines/virtual_machine/unmanaged-disks/basic/1-dependencies.tf +++ b/examples/virtual-machines/virtual_machine/unmanaged-disks/basic/1-dependencies.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/virtual-machines/virtual_machine/unmanaged-disks/from-existing-storage-account/main.tf b/examples/virtual-machines/virtual_machine/unmanaged-disks/from-existing-storage-account/main.tf index 7a8d7c1efaa10..bfb4d7d67a168 100644 --- a/examples/virtual-machines/virtual_machine/unmanaged-disks/from-existing-storage-account/main.tf +++ b/examples/virtual-machines/virtual_machine/unmanaged-disks/from-existing-storage-account/main.tf @@ -1,9 +1,6 @@ -# provider "azurerm" { -# subscription_id = "REPLACE-WITH-YOUR-SUBSCRIPTION-ID" -# client_id = "REPLACE-WITH-YOUR-CLIENT-ID" -# client_secret = "REPLACE-WITH-YOUR-CLIENT-SECRET" -# tenant_id = "REPLACE-WITH-YOUR-TENANT-ID" -# } +provider "azurerm" { + features {} +} resource "azurerm_resource_group" "rg" { name = "${var.resource_group}" diff --git a/examples/virtual-machines/windows/basic-password/main.tf b/examples/virtual-machines/windows/basic-password/main.tf index 92a6a7fed5b13..a7225b1024b25 100644 --- a/examples/virtual-machines/windows/basic-password/main.tf +++ b/examples/virtual-machines/windows/basic-password/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/virtual-machines/windows/custom-data/main.tf b/examples/virtual-machines/windows/custom-data/main.tf index 4dfdd7f11ab96..050adf27a5460 100644 --- a/examples/virtual-machines/windows/custom-data/main.tf +++ b/examples/virtual-machines/windows/custom-data/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/virtual-machines/windows/ephemeral-os-disk/main.tf b/examples/virtual-machines/windows/ephemeral-os-disk/main.tf index 0a7fea2a3c74d..a687988ef7e83 100644 --- a/examples/virtual-machines/windows/ephemeral-os-disk/main.tf +++ b/examples/virtual-machines/windows/ephemeral-os-disk/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/virtual-machines/windows/vm-joined-to-active-directory/main.tf b/examples/virtual-machines/windows/vm-joined-to-active-directory/main.tf index 3644dee957cd5..58f8111570ff1 100644 --- a/examples/virtual-machines/windows/vm-joined-to-active-directory/main.tf +++ b/examples/virtual-machines/windows/vm-joined-to-active-directory/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { location = var.location name = "${var.prefix}-rg" diff --git a/examples/virtual-networks/azure-firewall/main.tf b/examples/virtual-networks/azure-firewall/main.tf index 1aaf9e8033a6d..59f8fa610e25b 100644 --- a/examples/virtual-networks/azure-firewall/main.tf +++ b/examples/virtual-networks/azure-firewall/main.tf @@ -1,6 +1,5 @@ -# Configure the Azure Provider provider "azurerm" { - version = "=1.31.0" + features {} } # Create a resource group @@ -15,7 +14,7 @@ resource "random_string" "azustring" { special = false upper = false number = false - + } # Storage account to hold diag data from VMs and Azure Resources @@ -261,7 +260,7 @@ resource "azurerm_virtual_machine" "vmserver" { storage_uri = "${azurerm_storage_account.azusa.primary_blob_endpoint}" } - + tags = { environment = "Staging" owner = "Someone@contoso.com" @@ -335,4 +334,4 @@ resource "azurerm_firewall_network_rule_collection" "azufwnetr1" { "TCP", ] } -} \ No newline at end of file +} diff --git a/examples/virtual-networks/basic/main.tf b/examples/virtual-networks/basic/main.tf index 28e2b75c7e720..4b505a3e475c0 100644 --- a/examples/virtual-networks/basic/main.tf +++ b/examples/virtual-networks/basic/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/virtual-networks/multiple-subnets/main.tf b/examples/virtual-networks/multiple-subnets/main.tf index 6ba887e8956a6..b3f06e62754d4 100644 --- a/examples/virtual-networks/multiple-subnets/main.tf +++ b/examples/virtual-networks/multiple-subnets/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/virtual-networks/network-security-group/main.tf b/examples/virtual-networks/network-security-group/main.tf index 5500bd4c05140..d958ff2f766df 100644 --- a/examples/virtual-networks/network-security-group/main.tf +++ b/examples/virtual-networks/network-security-group/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/virtual-networks/private-link-service/main.tf b/examples/virtual-networks/private-link-service/main.tf index 9aed70b3a642c..0a4206b293b39 100644 --- a/examples/virtual-networks/private-link-service/main.tf +++ b/examples/virtual-networks/private-link-service/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = var.resource_group_name location = var.location diff --git a/examples/virtual-networks/virtual-hub/main.tf b/examples/virtual-networks/virtual-hub/main.tf index 85fc9b7eae10f..c708319514526 100644 --- a/examples/virtual-networks/virtual-hub/main.tf +++ b/examples/virtual-networks/virtual-hub/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/virtual-networks/virtual-network-peering/main.tf b/examples/virtual-networks/virtual-network-peering/main.tf index 59585dcec77cc..d85e4746d8957 100644 --- a/examples/virtual-networks/virtual-network-peering/main.tf +++ b/examples/virtual-networks/virtual-network-peering/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/vm-scale-set/README.md b/examples/vm-scale-set/README.md index edfe1e17b5f13..69242af24c92e 100644 --- a/examples/vm-scale-set/README.md +++ b/examples/vm-scale-set/README.md @@ -2,7 +2,7 @@ In 1.x versions of the Provider, Terraform has a single resource for Virtual Machine Scale Sets: `azurerm_virtual_machine_scale_set`. -Version 2.0 of the Azure Provider will introduce several new resources which supersede the existing `azurerm_virtual_machine_scale_set` resource: +Version 2.0 of the Azure Provider introduces several new resources which supersede the existing `azurerm_virtual_machine_scale_set` resource: * `azurerm_linux_virtual_machine_scale_set` * `azurerm_virtual_machine_scale_set_extension` diff --git a/examples/vm-scale-set/extensions/custom-script/main.tf b/examples/vm-scale-set/extensions/custom-script/main.tf index 07d672f3fecc8..9cddff32b5f1e 100644 --- a/examples/vm-scale-set/extensions/custom-script/main.tf +++ b/examples/vm-scale-set/extensions/custom-script/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/linux/auto-scaling/main.tf b/examples/vm-scale-set/linux/auto-scaling/main.tf index 3a7454a83f04b..30c3285c10eac 100644 --- a/examples/vm-scale-set/linux/auto-scaling/main.tf +++ b/examples/vm-scale-set/linux/auto-scaling/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/linux/basic/main.tf b/examples/vm-scale-set/linux/basic/main.tf index 281642d0fb22a..c05e9ca4ad7c6 100644 --- a/examples/vm-scale-set/linux/basic/main.tf +++ b/examples/vm-scale-set/linux/basic/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/linux/boot-diagnostics/main.tf b/examples/vm-scale-set/linux/boot-diagnostics/main.tf index 1350ea9f4dc67..3059bbc5cde2d 100644 --- a/examples/vm-scale-set/linux/boot-diagnostics/main.tf +++ b/examples/vm-scale-set/linux/boot-diagnostics/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/linux/custom-data/main.tf b/examples/vm-scale-set/linux/custom-data/main.tf index a9e8ea20f9bbf..ad59a2bd29b7f 100644 --- a/examples/vm-scale-set/linux/custom-data/main.tf +++ b/examples/vm-scale-set/linux/custom-data/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/linux/data-disks/main.tf b/examples/vm-scale-set/linux/data-disks/main.tf index 138843b1d51b3..624e9a57dd068 100644 --- a/examples/vm-scale-set/linux/data-disks/main.tf +++ b/examples/vm-scale-set/linux/data-disks/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/linux/ephemeral-os-disk/main.tf b/examples/vm-scale-set/linux/ephemeral-os-disk/main.tf index fed5b1f2d7f8c..e1e6ad9e8eeda 100644 --- a/examples/vm-scale-set/linux/ephemeral-os-disk/main.tf +++ b/examples/vm-scale-set/linux/ephemeral-os-disk/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/linux/ipv6/main.tf b/examples/vm-scale-set/linux/ipv6/main.tf index 9d4b2a404b460..4fbb9b462b015 100644 --- a/examples/vm-scale-set/linux/ipv6/main.tf +++ b/examples/vm-scale-set/linux/ipv6/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/linux/multiple-nics/main.tf b/examples/vm-scale-set/linux/multiple-nics/main.tf index 3f8a727190e32..91ce17363065f 100644 --- a/examples/vm-scale-set/linux/multiple-nics/main.tf +++ b/examples/vm-scale-set/linux/multiple-nics/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/linux/public-ip-per-instance/main.tf b/examples/vm-scale-set/linux/public-ip-per-instance/main.tf index 41826cc56df89..0d1f5493300a2 100644 --- a/examples/vm-scale-set/linux/public-ip-per-instance/main.tf +++ b/examples/vm-scale-set/linux/public-ip-per-instance/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/linux/rolling-upgrade-policy/main.tf b/examples/vm-scale-set/linux/rolling-upgrade-policy/main.tf index e642b3f37701d..b96b3e3befe1a 100644 --- a/examples/vm-scale-set/linux/rolling-upgrade-policy/main.tf +++ b/examples/vm-scale-set/linux/rolling-upgrade-policy/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/linux/secrets/main.tf b/examples/vm-scale-set/linux/secrets/main.tf index f15da6152b5fd..725369e2d204c 100644 --- a/examples/vm-scale-set/linux/secrets/main.tf +++ b/examples/vm-scale-set/linux/secrets/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/linux/spot/main.tf b/examples/vm-scale-set/linux/spot/main.tf index deafa20804e7e..ce27eb0450b47 100644 --- a/examples/vm-scale-set/linux/spot/main.tf +++ b/examples/vm-scale-set/linux/spot/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/linux/ssh-keys/main.tf b/examples/vm-scale-set/linux/ssh-keys/main.tf index f479bcee7de44..23216166fe6cc 100644 --- a/examples/vm-scale-set/linux/ssh-keys/main.tf +++ b/examples/vm-scale-set/linux/ssh-keys/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/linux/system-assigned-identity/main.tf b/examples/vm-scale-set/linux/system-assigned-identity/main.tf index d813697046b2f..3089495d8b907 100644 --- a/examples/vm-scale-set/linux/system-assigned-identity/main.tf +++ b/examples/vm-scale-set/linux/system-assigned-identity/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/linux/user-assigned-identity/main.tf b/examples/vm-scale-set/linux/user-assigned-identity/main.tf index 3dfba6f53f837..5ef59c188c96d 100644 --- a/examples/vm-scale-set/linux/user-assigned-identity/main.tf +++ b/examples/vm-scale-set/linux/user-assigned-identity/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/linux/zones/main.tf b/examples/vm-scale-set/linux/zones/main.tf index b7116ed2e4370..b93ecc52acb29 100644 --- a/examples/vm-scale-set/linux/zones/main.tf +++ b/examples/vm-scale-set/linux/zones/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/virtual_machine_scale_set/automatic-rolling-updates/main.tf b/examples/vm-scale-set/virtual_machine_scale_set/automatic-rolling-updates/main.tf index 80b668c17d32c..fcff93ae55cb7 100644 --- a/examples/vm-scale-set/virtual_machine_scale_set/automatic-rolling-updates/main.tf +++ b/examples/vm-scale-set/virtual_machine_scale_set/automatic-rolling-updates/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + locals { frontend_ip_configuration_name = "internal" } diff --git a/examples/vm-scale-set/virtual_machine_scale_set/autoscale/main.tf b/examples/vm-scale-set/virtual_machine_scale_set/autoscale/main.tf index 4e73608e82ff2..489d38127c082 100644 --- a/examples/vm-scale-set/virtual_machine_scale_set/autoscale/main.tf +++ b/examples/vm-scale-set/virtual_machine_scale_set/autoscale/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + locals { instance_count = 2 } diff --git a/examples/vm-scale-set/virtual_machine_scale_set/basic/main.tf b/examples/vm-scale-set/virtual_machine_scale_set/basic/main.tf index 8e37fb53c6ac6..8819bc2eb9e1a 100644 --- a/examples/vm-scale-set/virtual_machine_scale_set/basic/main.tf +++ b/examples/vm-scale-set/virtual_machine_scale_set/basic/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "example" { name = "${var.prefix}-resources" location = "${var.location}" diff --git a/examples/vm-scale-set/windows/auto-scaling/main.tf b/examples/vm-scale-set/windows/auto-scaling/main.tf index cf3835daeaaaa..9fd7b483da61f 100644 --- a/examples/vm-scale-set/windows/auto-scaling/main.tf +++ b/examples/vm-scale-set/windows/auto-scaling/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/windows/basic/main.tf b/examples/vm-scale-set/windows/basic/main.tf index fd550e48d8a83..34f9f1deebd93 100644 --- a/examples/vm-scale-set/windows/basic/main.tf +++ b/examples/vm-scale-set/windows/basic/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/windows/boot-diagnostics/main.tf b/examples/vm-scale-set/windows/boot-diagnostics/main.tf index e3b679e05fa9d..3d16c35a195ab 100644 --- a/examples/vm-scale-set/windows/boot-diagnostics/main.tf +++ b/examples/vm-scale-set/windows/boot-diagnostics/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/windows/custom-data/main.tf b/examples/vm-scale-set/windows/custom-data/main.tf index 4ea38d1c9ca57..450db3bcb7b2d 100644 --- a/examples/vm-scale-set/windows/custom-data/main.tf +++ b/examples/vm-scale-set/windows/custom-data/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/windows/custom-timezone/main.tf b/examples/vm-scale-set/windows/custom-timezone/main.tf index 859b84f63c402..0fedb60dad7bc 100644 --- a/examples/vm-scale-set/windows/custom-timezone/main.tf +++ b/examples/vm-scale-set/windows/custom-timezone/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/windows/data-disks/main.tf b/examples/vm-scale-set/windows/data-disks/main.tf index 525a8ab474186..0edc38cf16ed1 100644 --- a/examples/vm-scale-set/windows/data-disks/main.tf +++ b/examples/vm-scale-set/windows/data-disks/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/windows/ephemeral-os-disk/main.tf b/examples/vm-scale-set/windows/ephemeral-os-disk/main.tf index f92deaf82919c..55382c13256bd 100644 --- a/examples/vm-scale-set/windows/ephemeral-os-disk/main.tf +++ b/examples/vm-scale-set/windows/ephemeral-os-disk/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/windows/hybrid-use-benefit/main.tf b/examples/vm-scale-set/windows/hybrid-use-benefit/main.tf index a90eee1704caf..3d882e62ff2e1 100644 --- a/examples/vm-scale-set/windows/hybrid-use-benefit/main.tf +++ b/examples/vm-scale-set/windows/hybrid-use-benefit/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/windows/ipv6/main.tf b/examples/vm-scale-set/windows/ipv6/main.tf index c36ee6bf5efbf..425101e615c68 100644 --- a/examples/vm-scale-set/windows/ipv6/main.tf +++ b/examples/vm-scale-set/windows/ipv6/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/windows/multiple-nics/main.tf b/examples/vm-scale-set/windows/multiple-nics/main.tf index 3f146ce22756f..11555964ce0af 100644 --- a/examples/vm-scale-set/windows/multiple-nics/main.tf +++ b/examples/vm-scale-set/windows/multiple-nics/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/windows/public-ip-per-instance/main.tf b/examples/vm-scale-set/windows/public-ip-per-instance/main.tf index 973789b600f3c..f08ec54a8bd43 100644 --- a/examples/vm-scale-set/windows/public-ip-per-instance/main.tf +++ b/examples/vm-scale-set/windows/public-ip-per-instance/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/windows/rolling-upgrade-policy/main.tf b/examples/vm-scale-set/windows/rolling-upgrade-policy/main.tf index 3762a9db83aed..c671e12468efd 100644 --- a/examples/vm-scale-set/windows/rolling-upgrade-policy/main.tf +++ b/examples/vm-scale-set/windows/rolling-upgrade-policy/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location @@ -17,7 +21,6 @@ resource "azurerm_subnet" "internal" { address_prefix = "10.0.2.0/24" } - resource "azurerm_public_ip" "main" { name = "${var.prefix}-publicip" location = azurerm_resource_group.main.location diff --git a/examples/vm-scale-set/windows/secrets/main.tf b/examples/vm-scale-set/windows/secrets/main.tf index ce6e25c06604d..64ead775ecde7 100644 --- a/examples/vm-scale-set/windows/secrets/main.tf +++ b/examples/vm-scale-set/windows/secrets/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/windows/service-fabric/1-dependencies.tf b/examples/vm-scale-set/windows/service-fabric/1-dependencies.tf index 3720cde6c8112..a51e1accf2fa7 100644 --- a/examples/vm-scale-set/windows/service-fabric/1-dependencies.tf +++ b/examples/vm-scale-set/windows/service-fabric/1-dependencies.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + locals { vmss_name = "${var.prefix}-vmss" vmss_count = 3 diff --git a/examples/vm-scale-set/windows/spot/main.tf b/examples/vm-scale-set/windows/spot/main.tf index b7f4bb4363055..a6f5b85ec176c 100644 --- a/examples/vm-scale-set/windows/spot/main.tf +++ b/examples/vm-scale-set/windows/spot/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/windows/system-assigned-identity/main.tf b/examples/vm-scale-set/windows/system-assigned-identity/main.tf index f66803522f921..54c7ffaf596aa 100644 --- a/examples/vm-scale-set/windows/system-assigned-identity/main.tf +++ b/examples/vm-scale-set/windows/system-assigned-identity/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/windows/user-assigned-identity/main.tf b/examples/vm-scale-set/windows/user-assigned-identity/main.tf index 579c1363a6fc1..004613bb016a7 100644 --- a/examples/vm-scale-set/windows/user-assigned-identity/main.tf +++ b/examples/vm-scale-set/windows/user-assigned-identity/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location diff --git a/examples/vm-scale-set/windows/zones/main.tf b/examples/vm-scale-set/windows/zones/main.tf index fa79d17d96190..59ecc01dca7d6 100644 --- a/examples/vm-scale-set/windows/zones/main.tf +++ b/examples/vm-scale-set/windows/zones/main.tf @@ -1,3 +1,7 @@ +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "main" { name = "${var.prefix}-resources" location = var.location From 112329d310108929e26588f981758b1adf597bf1 Mon Sep 17 00:00:00 2001 From: Austin Cheung Date: Mon, 24 Feb 2020 00:14:45 -0800 Subject: [PATCH 380/498] add enable_disk_encryption to azurerm_kusto_cluster --- .../kusto/resource_arm_kusto_cluster.go | 11 ++++- .../tests/resource_arm_kusto_cluster_test.go | 47 +++++++++++++++++++ website/docs/r/kusto_cluster.html.markdown | 2 + 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/azurerm/internal/services/kusto/resource_arm_kusto_cluster.go b/azurerm/internal/services/kusto/resource_arm_kusto_cluster.go index 9dd4c0e4589a6..67be71203d541 100644 --- a/azurerm/internal/services/kusto/resource_arm_kusto_cluster.go +++ b/azurerm/internal/services/kusto/resource_arm_kusto_cluster.go @@ -83,6 +83,11 @@ func resourceArmKustoCluster() *schema.Resource { }, }, + "enable_disk_encryption": { + Type: schema.TypeBool, + Optional: true, + }, + "uri": { Type: schema.TypeString, Computed: true, @@ -107,6 +112,7 @@ func resourceArmKustoClusterCreateUpdate(d *schema.ResourceData, meta interface{ name := d.Get("name").(string) resourceGroup := d.Get("resource_group_name").(string) + enableDiskEncryption := d.Get("enable_disk_encryption").(bool) if features.ShouldResourcesBeImported() && d.IsNewResource() { server, err := client.Get(ctx, resourceGroup, name) @@ -128,7 +134,9 @@ func resourceArmKustoClusterCreateUpdate(d *schema.ResourceData, meta interface{ return err } - clusterProperties := kusto.ClusterProperties{} + clusterProperties := kusto.ClusterProperties{ + EnableDiskEncryption: utils.Bool(enableDiskEncryption), + } t := d.Get("tags").(map[string]interface{}) @@ -200,6 +208,7 @@ func resourceArmKustoClusterRead(d *schema.ResourceData, meta interface{}) error if clusterProperties := clusterResponse.ClusterProperties; clusterProperties != nil { d.Set("uri", clusterProperties.URI) d.Set("data_ingestion_uri", clusterProperties.DataIngestionURI) + d.Set("enable_disk_encryption", clusterProperties.EnableDiskEncryption) } return tags.FlattenAndSet(d, clusterResponse.Tags) diff --git a/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go b/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go index 5e6634c48e0f8..8ba80a433c1ab 100644 --- a/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go +++ b/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go @@ -87,6 +87,32 @@ func TestAccAzureRMKustoCluster_sku(t *testing.T) { }) } +func TestAccAzureRMKustoCluster_enableDiskEncryption(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_kusto_cluster", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMKustoClusterDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMKustoCluster_enableDiskEncryption(data, true), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKustoClusterExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "enable_disk_encryption", "true"), + ), + }, + { + Config: testAccAzureRMKustoCluster_enableDiskEncryption(data, false), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKustoClusterExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "enable_disk_encryption", "false"), + ), + }, + }, + }) +} + func testAccAzureRMKustoCluster_basic(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { @@ -176,6 +202,27 @@ resource "azurerm_kusto_cluster" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomString) } +func testAccAzureRMKustoCluster_enableDiskEncryption(data acceptance.TestData, enableDiskEncryption bool) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_kusto_cluster" "test" { + name = "acctestkc%s" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + enable_disk_encryption = %t + + sku { + name = "Dev(No SLA)_Standard_D11_v2" + capacity = 1 + } +} +`, data.RandomInteger, data.Locations.Primary, data.RandomString, enableDiskEncryption) +} + func testCheckAzureRMKustoClusterDestroy(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).Kusto.ClustersClient ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext diff --git a/website/docs/r/kusto_cluster.html.markdown b/website/docs/r/kusto_cluster.html.markdown index a5a40cda6579b..c850f3e6e9767 100644 --- a/website/docs/r/kusto_cluster.html.markdown +++ b/website/docs/r/kusto_cluster.html.markdown @@ -46,6 +46,8 @@ The following arguments are supported: * `sku` - (Required) A `sku` block as defined below. +* `enable_disk_encryption` - (Options) Indicates if the cluster's disks are encrypted + * `tags` - (Optional) A mapping of tags to assign to the resource. --- From a77e70431573fdadbb938b5484e24ef277f23b42 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 24 Feb 2020 10:05:59 +0100 Subject: [PATCH 381/498] typo --- website/docs/guides/2.0-upgrade-guide.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index 755f33d8cede7..af2c0e42ef8d7 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -353,7 +353,7 @@ The deprecated `internal_public_ip_address_id` field in the `ip_configuration` b ### Resource: `azurerm_frontdoor` -The field `cache_enabled` within the `forwarding_configuration` block now defaults to `HttpsOnly` rather than `MatchRequest`. +The field `cache_enabled` within the `forwarding_configuration` block now defaults to `false` rather than `true`. The field `cache_query_parameter_strip_directive` within the `forwarding_configuration` block now defaults to `StripAll` rather than `StripNone`. From 5c45d2fede841818180005fbfc2648c71dfd0254 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 24 Feb 2020 10:06:44 +0100 Subject: [PATCH 382/498] updating to include #5852 --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5322abd0ec6db..0139d20d5c966 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -100,7 +100,9 @@ BREAKING CHANGES: * `azurerm_eventhub_namespace_authorization_rule` - removing the deprecated `location` field [GH-5793] * `azurerm_firewall` - removing the deprecated field `internal_public_ip_address_id` from the `ip_configuration` block [GH-5823] * `azurerm_firewall` - the field `public_ip_address_id` within the `ip_configuration` block is now required [GH-5823] -* `azurerm_frontdoor` - The `forwarding_protocol` property now defaults to `HttpsOnly` [GH-5792] +* `azurerm_frontdoor` - field `cache_enabled` within the `forwarding_configuration` block now defaults to `false` rather than `true` [GH-5852] +* `azurerm_frontdoor` - the field `cache_query_parameter_strip_directive` within the `forwarding_configuration` block now defaults to `StripAll` rather than `StripNone`. [GH-5852] +* `azurerm_frontdoor` - the field `forwarding_protocol` within the `forwarding_configuration` block now defaults to `HttpsOnly` rather than `MatchRequest` [GH-5852] * `azurerm_function_app` - removing the field `virtual_network_name` from the `site_config` block [GH-5823] * `azurerm_function_app` - updating the field `ip_address` within the `ip_restriction` block to accept a CIDR rather than an IP Address to match the updated API behaviour [GH-5823] * `azurerm_iot_dps` - This resource has been removed since it was deprecated [GH-5753] From 88ae24cfca45709bc1994a7587b8cfba80a2dab6 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 24 Feb 2020 10:08:02 +0100 Subject: [PATCH 383/498] updating to include #5853 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0139d20d5c966..e1b4360aba197 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -86,6 +86,7 @@ BREAKING CHANGES: * `azurerm_container_group` - removing the deprecated field `command` [GH-5823] * `azurerm_container_registry` - removing the deprecated `storage_account` block [GH-5823] * `azurerm_container_service` - This resource has been removed since it was deprecated [GH-5709] +* `azurerm_cosmosdb_mongo_collection` - removing the deprecated `indexes` block [GH-5853] * `azurerm_ddos_protection_plan` - the deprecated resource has been removed [GH-5844] * `azurerm_devspace_controller` - removing the deprecated `sku` block [GH-5795] * `azurerm_dns_cname_record` - removing the deprecated `records` field [GH-5794] From 12cde409ad9a6cf29f5134dffed8331caac95903 Mon Sep 17 00:00:00 2001 From: njucz <740360112@qq.com> Date: Mon, 24 Feb 2020 17:24:38 +0800 Subject: [PATCH 384/498] more fields support for `azurerm_kusto_cluster` --- .../kusto/resource_arm_kusto_cluster.go | 21 +++++++- .../tests/resource_arm_kusto_cluster_test.go | 54 +++++++++++++++++++ website/docs/r/kusto_cluster.html.markdown | 4 ++ 3 files changed, 78 insertions(+), 1 deletion(-) diff --git a/azurerm/internal/services/kusto/resource_arm_kusto_cluster.go b/azurerm/internal/services/kusto/resource_arm_kusto_cluster.go index 9dd4c0e4589a6..09d8748a49626 100644 --- a/azurerm/internal/services/kusto/resource_arm_kusto_cluster.go +++ b/azurerm/internal/services/kusto/resource_arm_kusto_cluster.go @@ -83,6 +83,18 @@ func resourceArmKustoCluster() *schema.Resource { }, }, + "enable_disk_encryption": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + + "enable_streaming_ingest": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + "uri": { Type: schema.TypeString, Computed: true, @@ -122,13 +134,18 @@ func resourceArmKustoClusterCreateUpdate(d *schema.ResourceData, meta interface{ } location := azure.NormalizeLocation(d.Get("location").(string)) + enableDiskEncryption := d.Get("enable_disk_encryption").(bool) + enableStreamingIngest := d.Get("enable_streaming_ingest").(bool) sku, err := expandKustoClusterSku(d) if err != nil { return err } - clusterProperties := kusto.ClusterProperties{} + clusterProperties := kusto.ClusterProperties{ + EnableDiskEncryption: utils.Bool(enableDiskEncryption), + EnableStreamingIngest: utils.Bool(enableStreamingIngest), + } t := d.Get("tags").(map[string]interface{}) @@ -198,6 +215,8 @@ func resourceArmKustoClusterRead(d *schema.ResourceData, meta interface{}) error } if clusterProperties := clusterResponse.ClusterProperties; clusterProperties != nil { + d.Set("enable_disk_encryption", clusterProperties.EnableDiskEncryption) + d.Set("enable_streaming_ingest", clusterProperties.EnableStreamingIngest) d.Set("uri", clusterProperties.URI) d.Set("data_ingestion_uri", clusterProperties.DataIngestionURI) } diff --git a/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go b/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go index 5e6634c48e0f8..1a5f160342082 100644 --- a/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go +++ b/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go @@ -23,6 +23,37 @@ func TestAccAzureRMKustoCluster_basic(t *testing.T) { Config: testAccAzureRMKustoCluster_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMKustoClusterExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "enable_disk_encryption", "false"), + resource.TestCheckResourceAttr(data.ResourceName, "enable_streaming_ingest", "false"), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMKustoCluster_propsUpdate(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_kusto_cluster", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMKustoClusterDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMKustoCluster_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKustoClusterExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "enable_disk_encryption", "false"), + resource.TestCheckResourceAttr(data.ResourceName, "enable_streaming_ingest", "false"), + ), + }, + { + Config: testAccAzureRMKustoCluster_propsUpdate(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKustoClusterExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "enable_disk_encryption", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "enable_streaming_ingest", "true"), ), }, data.ImportStep(), @@ -176,6 +207,29 @@ resource "azurerm_kusto_cluster" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomString) } +func testAccAzureRMKustoCluster_propsUpdate(data acceptance.TestData) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_kusto_cluster" "test" { + name = "acctestkc%s" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + enable_disk_encryption = true + enable_streaming_ingest = true + + sku { + name = "Dev(No SLA)_Standard_D11_v2" + capacity = 1 + } +} +`, data.RandomInteger, data.Locations.Primary, data.RandomString) +} + func testCheckAzureRMKustoClusterDestroy(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).Kusto.ClustersClient ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext diff --git a/website/docs/r/kusto_cluster.html.markdown b/website/docs/r/kusto_cluster.html.markdown index a5a40cda6579b..1edaedafbe254 100644 --- a/website/docs/r/kusto_cluster.html.markdown +++ b/website/docs/r/kusto_cluster.html.markdown @@ -46,6 +46,10 @@ The following arguments are supported: * `sku` - (Required) A `sku` block as defined below. +* `enable_disk_encryption` - (Optional) Specifies if the cluster's disks are encrypted. Defaults to `false` + +* `enable_streaming_ingest` - (Optional) Specifies if the streaming ingest is enabled. Defaults to `false` + * `tags` - (Optional) A mapping of tags to assign to the resource. --- From 2190f5565087143c6d67b05270685eda8d4f115d Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Mon, 24 Feb 2020 16:13:35 +0000 Subject: [PATCH 385/498] v2.0.0 --- CHANGELOG.md | 382 +++++++++++++++++++++++++-------------------------- 1 file changed, 191 insertions(+), 191 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1b4360aba197..ba0909629ce8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 2.0.0 (Unreleased) +## 2.0.0 (February 24, 2020) NOTES: @@ -10,207 +10,207 @@ FEATURES: * **Custom Timeouts:** - all resources within the Azure Provider now allow configuring custom timeouts - please [see Terraform's Timeout documentation](https://www.terraform.io/docs/configuration/resources.html#operation-timeouts) and the documentation in each data source resource for more information. * **Requires Import:** The Azure Provider now checks for the presence of an existing resource prior to creating it - which means that if you try and create a resource which already exists (without importing it) you'll be prompted to import this into the state. -* **New Data Source:** `azurerm_app_service_environment` [GH-5508] -* **New Data Source:** `azurerm_eventhub_authorization_rule` [GH-5805] -* **New Resource:** `azurerm_app_service_environment` [GH-5508] -* **New Resource:** `azurerm_express_route_gateway` [GH-5523] -* **New Resource:** `azurerm_linux_virtual_machine` [GH-5705] -* **New Resource:** `azurerm_linux_virtual_machine_scale_set` [GH-5705] -* **New Resource:** `azurerm_network_interface_security_group_association` [GH-5784] -* **New Resource:** `azurerm_storage_account_customer_managed_key` [GH-5668] -* **New Resource:** `azurerm_virtual_machine_scale_set_extension` [GH-5705] -* **New Resource:** `azurerm_windows_virtual_machine` [GH-5705] -* **New Resource:** `azurerm_windows_virtual_machine_scale_set` [GH-5705] +* **New Data Source:** `azurerm_app_service_environment` ([#5508](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5508)) +* **New Data Source:** `azurerm_eventhub_authorization_rule` ([#5805](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5805)) +* **New Resource:** `azurerm_app_service_environment` ([#5508](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5508)) +* **New Resource:** `azurerm_express_route_gateway` ([#5523](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5523)) +* **New Resource:** `azurerm_linux_virtual_machine` ([#5705](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5705)) +* **New Resource:** `azurerm_linux_virtual_machine_scale_set` ([#5705](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5705)) +* **New Resource:** `azurerm_network_interface_security_group_association` ([#5784](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5784)) +* **New Resource:** `azurerm_storage_account_customer_managed_key` ([#5668](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5668)) +* **New Resource:** `azurerm_virtual_machine_scale_set_extension` ([#5705](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5705)) +* **New Resource:** `azurerm_windows_virtual_machine` ([#5705](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5705)) +* **New Resource:** `azurerm_windows_virtual_machine_scale_set` ([#5705](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5705)) BREAKING CHANGES: * The Environment Variable `DISABLE_CORRELATION_REQUEST_ID` has been renamed to `ARM_DISABLE_CORRELATION_REQUEST_ID` to match the other Environment Variables * The field `tags` is no longer `computed` -* Data Source: `azurerm_api_management` - removing the deprecated `sku` block [GH-5725] -* Data Source: `azurerm_app_service` - removing the deprecated field `subnet_mask` from the `site_config` block [GH-5823] -* Data Source: `azurerm_app_service_plan` - the deprecated `properties` block has been removed since these properties have been moved to the top level [GH-5717] -* Data Source: `azurerm_azuread_application` - This data source has been removed since it was deprecated [GH-5748] -* Data Source: `azurerm_azuread_service_principal` - This data source has been removed since it was deprecated [GH-5748] -* Data Source: `azurerm_builtin_role_definition` - the deprecated data source has been removed [GH-5844] -* Data Source: `azurerm_dns_zone` - removing the deprecated `zone_type` field [GH-5794] -* Data Source: `azurerm_dns_zone` - removing the deprecated `registration_virtual_network_ids` field [GH-5794] -* Data Source: `azurerm_dns_zone` - removing the deprecated `resolution_virtual_network_ids` field [GH-5794] -* Data Source: `azurerm_key_vault` - removing the `sku` block since this has been deprecated in favour of the `sku_name` field [GH-5774] -* Data Source: `azurerm_key_vault_key` - removing the deprecated `vault_uri` field [GH-5774] -* Data Source: `azurerm_key_vault_secret` - removing the deprecated `vault_uri` field [GH-5774] -* Data Source: `azurerm_kubernetes_cluster` - removing the field `dns_prefix` from the `agent_pool_profile` block [GH-5823] -* Data Source: `azurerm_network_interface` - removing the deprecated field `internal_fqdn` [GH-5823] -* Data Source: `azurerm_private_link_service` - removing the deprecated field `network_interface_ids` [GH-5823] -* Data Source: `azurerm_private_link_endpoint_connection` - the deprecated data source has been removed [GH-5844] -* Data Source: `azurerm_recovery_services_protection_policy_vm` has been renamed to `azurerm_backup_policy_vm` [GH-5816] -* Data Source: `azurerm_role_definition` - removing the alias `VirtualMachineContributor` which has been deprecated in favour of the full name `Virtual Machine Contributor` [GH-5733] -* Data Source: `azurerm_storage_account` - removing the `account_encryption_source` field since this is no longer configurable by Azure [GH-5668] -* Data Source: `azurerm_storage_account` - removing the `enable_blob_encryption` field since this is no longer configurable by Azure [GH-5668] -* Data Source: `azurerm_storage_account` - removing the `enable_file_encryption` field since this is no longer configurable by Azure [GH-5668] -* Data Source: `azurerm_scheduler_job_collection` - This data source has been removed since it was deprecated [GH-5712] -* Data Source: `azurerm_subnet` - removing the deprecated `ip_configuration` field [GH-5801] -* Data Source: `azurerm_virtual_network` - removing the deprecated `address_spaces` field [GH-5823] -* `azurerm_api_management` - removing the deprecated `sku` block [GH-5725] -* `azurerm_api_management` - removing the deprecated fields in the `security` block [GH-5725] -* `azurerm_application_gateway` - the field `fqdns` within the `backend_address_pool` block is no longer computed [GH-5823] -* `azurerm_application_gateway` - the field `ip_addresses` within the `backend_address_pool` block is no longer computed [GH-5823] -* `azurerm_application_gateway` - the deprecated field `fqdn_list` within the `backend_address_pool` block has been removed [GH-5823] -* `azurerm_application_gateway` - the deprecated field `ip_address_list` within the `backend_address_pool` block has been removed [GH-5823] -* `azurerm_application_gateway` - the deprecated field `disabled_ssl_protocols` has been removed [GH-5823] -* `azurerm_application_gateway` - the field `disabled_protocols` within the `ssl_policy` block is no longer computed [GH-5823] -* `azurerm_app_service` - removing the field `subnet_mask` from the `site_config` block [GH-5823] -* `azurerm_app_service` - the field `ip_address` within the `site_config` block now refers to a CIDR block, rather than an IP Address to match the Azure API [GH-5823] -* `azurerm_app_service` - removing the field `virtual_network_name` from the `site_config` block [GH-5823] -* `azurerm_app_service_plan` - the deprecated `properties` block has been removed since these properties have been moved to the top level [GH-5717] -* `azurerm_app_service_slot` - removing the field `subnet_mask` from the `site_config` block [GH-5823] -* `azurerm_app_service_slot` - the field `ip_address` within the `site_config` block now refers to a CIDR block, rather than an IP Address to match the Azure API [GH-5823] -* `azurerm_app_service_slot` - removing the field `virtual_network_name` from the `site_config` block [GH-5823] -* `azurerm_application_gateway` - updating the default value for the `body` field within the `match` block from `*` to an empty string [GH-5752] -* `azurerm_automation_account` - removing the `sku` block which has been deprecated in favour of the `sku_name` field [GH-5781] -* `azurerm_automation_credential` - removing the deprecated `account_name` field [GH-5781] -* `azurerm_automation_runbook` - removing the deprecated `account_name` field [GH-5781] -* `azurerm_automation_schedule` - removing the deprecated `account_name` field [GH-5781] -* `azurerm_autoscale_setting` - the deprecated resource has been removed [GH-5844] -* `azurerm_availability_set` - updating the default value for `managed` from `false` to `true` [GH-5724] -* `azurerm_azuread_application` - This resource has been removed since it was deprecated [GH-5748] -* `azurerm_azuread_service_principal_password` - This resource has been removed since it was deprecated [GH-5748] -* `azurerm_azuread_service_principal` - This resource has been removed since it was deprecated [GH-5748] -* `azurerm_client_config` - removing the deprecated field `service_principal_application_id` [GH-5823] -* `azurerm_client_config` - removing the deprecated field `service_principal_object_id` [GH-5823] -* `azurerm_cognitive_account` - removing the deprecated `sku_name` block [GH-5797] -* `azurerm_connection_monitor` - the deprecated resource has been removed [GH-5844] -* `azurerm_container_group` - removing the `port` field from the `container` block [GH-5823] -* `azurerm_container_group` - removing the `protocol` field from the `container` block [GH-5823] -* `azurerm_container_group` - the `ports` field is no longer Computed [GH-5823] -* `azurerm_container_group` - the `protocol` field within the `ports` block is no longer Computed and now defaults to `TCP` [GH-5823] -* `azurerm_container_group` - removing the deprecated field `command` [GH-5823] -* `azurerm_container_registry` - removing the deprecated `storage_account` block [GH-5823] -* `azurerm_container_service` - This resource has been removed since it was deprecated [GH-5709] -* `azurerm_cosmosdb_mongo_collection` - removing the deprecated `indexes` block [GH-5853] -* `azurerm_ddos_protection_plan` - the deprecated resource has been removed [GH-5844] -* `azurerm_devspace_controller` - removing the deprecated `sku` block [GH-5795] -* `azurerm_dns_cname_record` - removing the deprecated `records` field [GH-5794] -* `azurerm_dns_ns_record` - removing the deprecated `records` field [GH-5794] -* `azurerm_dns_zone` - removing the deprecated `zone_type` field [GH-5794] -* `azurerm_dns_zone` - removing the deprecated `registration_virtual_network_ids` field [GH-5794] -* `azurerm_dns_zone` - removing the deprecated `resolution_virtual_network_ids` field [GH-5794] -* `azurerm_eventhub` - removing the deprecated `location` field [GH-5793] -* `azurerm_eventhub_authorization_rule` - removing the deprecated `location` field [GH-5793] -* `azurerm_eventhub_consumer_group` - removing the deprecated `location` field [GH-5793] -* `azurerm_eventhub_namespace` - removing the deprecated `kafka_enabled` field since this is now managed by Azure [GH-5793] -* `azurerm_eventhub_namespace_authorization_rule` - removing the deprecated `location` field [GH-5793] -* `azurerm_firewall` - removing the deprecated field `internal_public_ip_address_id` from the `ip_configuration` block [GH-5823] -* `azurerm_firewall` - the field `public_ip_address_id` within the `ip_configuration` block is now required [GH-5823] -* `azurerm_frontdoor` - field `cache_enabled` within the `forwarding_configuration` block now defaults to `false` rather than `true` [GH-5852] -* `azurerm_frontdoor` - the field `cache_query_parameter_strip_directive` within the `forwarding_configuration` block now defaults to `StripAll` rather than `StripNone`. [GH-5852] -* `azurerm_frontdoor` - the field `forwarding_protocol` within the `forwarding_configuration` block now defaults to `HttpsOnly` rather than `MatchRequest` [GH-5852] -* `azurerm_function_app` - removing the field `virtual_network_name` from the `site_config` block [GH-5823] -* `azurerm_function_app` - updating the field `ip_address` within the `ip_restriction` block to accept a CIDR rather than an IP Address to match the updated API behaviour [GH-5823] -* `azurerm_iot_dps` - This resource has been removed since it was deprecated [GH-5753] -* `azurerm_iot_dps_certificate` - This resource has been removed since it was deprecated [GH-5753] -* `azurerm_iothub`- The deprecated `sku.tier` property will be removed. [GH-5790] -* `azurerm_iothub_dps` - The deprecated `sku.tier` property will be removed. [GH-5790] -* `azurerm_key_vault` - removing the `sku` block since this has been deprecated in favour of the `sku_name` field [GH-5774] -* `azurerm_key_vault_access_policy` - removing the deprecated field `vault_name` which has been superseded by the `key_vault_id` field [GH-5774] -* `azurerm_key_vault_access_policy` - removing the deprecated field `resource_group_name ` which has been superseded by the `key_vault_id` field [GH-5774] -* `azurerm_key_vault_certificate` - removing the deprecated `vault_uri` field [GH-5774] -* `azurerm_key_vault_key` - removing the deprecated `vault_uri` field [GH-5774] -* `azurerm_key_vault_secret` - removing the deprecated `vault_uri` field [GH-5774] -* `azurerm_kubernetes_cluster` - updating the default value for `load_balancer_sku` to `Standard` from `Basic` [GH-5747] -* `azurerm_kubernetes_cluster` - the block `default_node_pool` is now required [GH-5823] -* `azurerm_kubernetes_cluster` - removing the deprecated `agent_pool_profile` block [GH-5823] -* `azurerm_kubernetes_cluster` - the field `enable_pod_security_policy` is no longer computed [GH-5823] -* `azurerm_lb_backend_address_pool` - removing the deprecated `location` field [GH-5823] -* `azurerm_lb_nat_pool` - removing the deprecated `location` field [GH-5823] -* `azurerm_lb_nat_rule` - removing the deprecated `location` field [GH-5823] -* `azurerm_lb_probe` - removing the deprecated `location` field [GH-5823] -* `azurerm_lb_rule` - removing the deprecated `location` field [GH-5823] -* `azurerm_log_analytics_workspace_linked_service` - This resource has been removed since it was deprecated [GH-5754] -* `azurerm_log_analytics_linked_service` - The `resource_id` field has been moved from the `linked_service_properties` block to the top-level and the deprecated field `linked_service_properties` will be removed. This has been replaced by the `resource_id` resource [GH-5775] -* `azurerm_maps_account` - the `sku_name` field is now case-sensitive [GH-5776] -* `azurerm_mariadb_server` - removing the `sku` block since it's been deprecated in favour of the `sku_name` field [GH-5777] -* `azurerm_metric_alertrule` - the deprecated resource has been removed [GH-5844] -* `azurerm_monitor_metric_alert` - updating the default value for `auto_mitigate` from `false` to `true` [GH-5773] -* `azurerm_monitor_metric_alertrule` - the deprecated resource has been removed [GH-5844] -* `azurerm_mssql_elasticpool` - removing the deprecated `elastic_pool_properties` block [GH-5744] -* `azurerm_mysql_server` - removing the deprecated `sku` block [GH-5743] -* `azurerm_network_interface` - removing the deprecated `application_gateway_backend_address_pools_ids` field from the `ip_configurations` block [GH-5784] -* `azurerm_network_interface` - removing the deprecated `application_security_group_ids ` field from the `ip_configurations` block [GH-5784] -* `azurerm_network_interface` - removing the deprecated `load_balancer_backend_address_pools_ids ` field from the `ip_configurations` block [GH-5784] -* `azurerm_network_interface` - removing the deprecated `load_balancer_inbound_nat_rules_ids ` field from the `ip_configurations` block [GH-5784] -* `azurerm_network_interface` - removing the deprecated `internal_fqdn` field [GH-5784] -* `azurerm_network_interface` - removing the `network_security_group_id` field in favour of a new split-out resource `azurerm_network_interface_security_group_association` [GH-5784] -* `azurerm_network_interface_application_security_group_association` - removing the `ip_configuration_name` field associations between Network Interfaces and Application Security Groups now need to be made to all IP Configurations [GH-5815] -* `azurerm_network_interface` - the `virtual_machine_id` field is now computed-only since it's not setable [GH-5784] -* `azurerm_notification_hub_namesapce` - removing the `sku` block in favour of the `sku_name` argument [GH-5722] -* `azurerm_postgresql_server` - removing the `sku` block which has been deprecated in favour of the `sku_name` field [GH-5721] -* `azurerm_private_link_endpoint` - the deprecated resource has been removed [GH-5844] -* `azurerm_private_link_service` - removing the deprecated field `network_interface_ids` [GH-5823] -* `azurerm_public_ip` - making the `allocation_method` field required [GH-5823] -* `azurerm_public_ip` - removing the deprecated field `public_ip_address_allocation` [GH-5823] -* `azurerm_recovery_network_mapping` - the deprecated resource has been removed [GH-5816] -* `azurerm_recovery_replicated_vm` - the deprecated resource has been removed [GH-5816] -* `azurerm_recovery_services_fabric` - the deprecated resource has been removed [GH-5816] -* `azurerm_recovery_services_protected_vm` - the deprecated resource has been removed [GH-5816] -* `azurerm_recovery_services_protection_container` - the deprecated resource has been removed [GH-5816] -* `azurerm_recovery_services_protection_container_mapping` - the deprecated resource has been removed [GH-5816] -* `azurerm_recovery_services_protection_policy_vm` - the deprecated resource has been removed [GH-5816] -* `azurerm_recovery_services_replication_policy` - the deprecated resource has been removed [GH-5816] -* `azurerm_relay_namespace` - removing the `sku` block in favour of the `sku_name` field [GH-5719] -* `azurerm_scheduler_job` - This resource has been removed since it was deprecated [GH-5712] -* `azurerm_scheduler_job_collection` - This resource has been removed since it was deprecated [GH-5712] -* `azurerm_storage_account` - updating the default value for `account_kind` from `Storage` to `StorageV2` [GH-5850] -* `azurerm_storage_account` - removing the deprecated `account_type` field [GH-5710] -* `azurerm_storage_account` - removing the deprecated `enable_advanced_threat_protection` field [GH-5710] -* `azurerm_storage_account` - updating the default value for `enable_https_traffic_only` from `false` to `true` [GH-5808] -* `azurerm_storage_account` - removing the `account_encryption_source` field since this is no longer configurable by Azure [GH-5668] -* `azurerm_storage_account` - removing the `enable_blob_encryption` field since this is no longer configurable by Azure [GH-5668] -* `azurerm_storage_account` - removing the `enable_file_encryption` field since this is no longer configurable by Azure [GH-5668] -* `azurerm_storage_blob` - making the `type` field case-sensitive [GH-5710] -* `azurerm_storage_blob` - removing the deprecated `attempts` field [GH-5710] -* `azurerm_storage_blob` - removing the deprecated `resource_group_name` field [GH-5710] -* `azurerm_storage_container` - removing the deprecated `resource_group_name` field [GH-5710] -* `azurerm_storage_container` - removing the deprecated `properties` block [GH-5710] -* `azurerm_storage_queue` - removing the deprecated `resource_group_name` field [GH-5710] -* `azurerm_storage_share` - removing the deprecated `resource_group_name` field [GH-5710] -* `azurerm_storage_table` - removing the deprecated `resource_group_name` field [GH-5710] -* `azurerm_subnet` - removing the deprecated `ip_configuration` field [GH-5801] -* `azurerm_subnet` - removing the deprecated `network_security_group_id` field [GH-5801] -* `azurerm_subnet` - removing the deprecated `route_table_id` field [GH-5801] -* `azurerm_subnet` - making the `actions` list within the `service_delegation` block within the `service_endpoints` block non-computed [GH-5801] -* `azurerm_virtual_network_peering` - `allow_virtual_network_access` now defaults to true, matching the API and Portal behaviours. [GH-5832] -* `azurerm_virtual_wan` - removing the deprecated field `security_provider_name` [GH-5823] +* Data Source: `azurerm_api_management` - removing the deprecated `sku` block ([#5725](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5725)) +* Data Source: `azurerm_app_service` - removing the deprecated field `subnet_mask` from the `site_config` block ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* Data Source: `azurerm_app_service_plan` - the deprecated `properties` block has been removed since these properties have been moved to the top level ([#5717](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5717)) +* Data Source: `azurerm_azuread_application` - This data source has been removed since it was deprecated ([#5748](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5748)) +* Data Source: `azurerm_azuread_service_principal` - This data source has been removed since it was deprecated ([#5748](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5748)) +* Data Source: `azurerm_builtin_role_definition` - the deprecated data source has been removed ([#5844](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5844)) +* Data Source: `azurerm_dns_zone` - removing the deprecated `zone_type` field ([#5794](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5794)) +* Data Source: `azurerm_dns_zone` - removing the deprecated `registration_virtual_network_ids` field ([#5794](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5794)) +* Data Source: `azurerm_dns_zone` - removing the deprecated `resolution_virtual_network_ids` field ([#5794](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5794)) +* Data Source: `azurerm_key_vault` - removing the `sku` block since this has been deprecated in favour of the `sku_name` field ([#5774](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5774)) +* Data Source: `azurerm_key_vault_key` - removing the deprecated `vault_uri` field ([#5774](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5774)) +* Data Source: `azurerm_key_vault_secret` - removing the deprecated `vault_uri` field ([#5774](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5774)) +* Data Source: `azurerm_kubernetes_cluster` - removing the field `dns_prefix` from the `agent_pool_profile` block ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* Data Source: `azurerm_network_interface` - removing the deprecated field `internal_fqdn` ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* Data Source: `azurerm_private_link_service` - removing the deprecated field `network_interface_ids` ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* Data Source: `azurerm_private_link_endpoint_connection` - the deprecated data source has been removed ([#5844](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5844)) +* Data Source: `azurerm_recovery_services_protection_policy_vm` has been renamed to `azurerm_backup_policy_vm` ([#5816](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5816)) +* Data Source: `azurerm_role_definition` - removing the alias `VirtualMachineContributor` which has been deprecated in favour of the full name `Virtual Machine Contributor` ([#5733](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5733)) +* Data Source: `azurerm_storage_account` - removing the `account_encryption_source` field since this is no longer configurable by Azure ([#5668](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5668)) +* Data Source: `azurerm_storage_account` - removing the `enable_blob_encryption` field since this is no longer configurable by Azure ([#5668](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5668)) +* Data Source: `azurerm_storage_account` - removing the `enable_file_encryption` field since this is no longer configurable by Azure ([#5668](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5668)) +* Data Source: `azurerm_scheduler_job_collection` - This data source has been removed since it was deprecated ([#5712](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5712)) +* Data Source: `azurerm_subnet` - removing the deprecated `ip_configuration` field ([#5801](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5801)) +* Data Source: `azurerm_virtual_network` - removing the deprecated `address_spaces` field ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_api_management` - removing the deprecated `sku` block ([#5725](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5725)) +* `azurerm_api_management` - removing the deprecated fields in the `security` block ([#5725](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5725)) +* `azurerm_application_gateway` - the field `fqdns` within the `backend_address_pool` block is no longer computed ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_application_gateway` - the field `ip_addresses` within the `backend_address_pool` block is no longer computed ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_application_gateway` - the deprecated field `fqdn_list` within the `backend_address_pool` block has been removed ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_application_gateway` - the deprecated field `ip_address_list` within the `backend_address_pool` block has been removed ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_application_gateway` - the deprecated field `disabled_ssl_protocols` has been removed ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_application_gateway` - the field `disabled_protocols` within the `ssl_policy` block is no longer computed ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_app_service` - removing the field `subnet_mask` from the `site_config` block ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_app_service` - the field `ip_address` within the `site_config` block now refers to a CIDR block, rather than an IP Address to match the Azure API ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_app_service` - removing the field `virtual_network_name` from the `site_config` block ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_app_service_plan` - the deprecated `properties` block has been removed since these properties have been moved to the top level ([#5717](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5717)) +* `azurerm_app_service_slot` - removing the field `subnet_mask` from the `site_config` block ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_app_service_slot` - the field `ip_address` within the `site_config` block now refers to a CIDR block, rather than an IP Address to match the Azure API ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_app_service_slot` - removing the field `virtual_network_name` from the `site_config` block ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_application_gateway` - updating the default value for the `body` field within the `match` block from `*` to an empty string ([#5752](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5752)) +* `azurerm_automation_account` - removing the `sku` block which has been deprecated in favour of the `sku_name` field ([#5781](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5781)) +* `azurerm_automation_credential` - removing the deprecated `account_name` field ([#5781](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5781)) +* `azurerm_automation_runbook` - removing the deprecated `account_name` field ([#5781](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5781)) +* `azurerm_automation_schedule` - removing the deprecated `account_name` field ([#5781](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5781)) +* `azurerm_autoscale_setting` - the deprecated resource has been removed ([#5844](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5844)) +* `azurerm_availability_set` - updating the default value for `managed` from `false` to `true` ([#5724](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5724)) +* `azurerm_azuread_application` - This resource has been removed since it was deprecated ([#5748](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5748)) +* `azurerm_azuread_service_principal_password` - This resource has been removed since it was deprecated ([#5748](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5748)) +* `azurerm_azuread_service_principal` - This resource has been removed since it was deprecated ([#5748](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5748)) +* `azurerm_client_config` - removing the deprecated field `service_principal_application_id` ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_client_config` - removing the deprecated field `service_principal_object_id` ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_cognitive_account` - removing the deprecated `sku_name` block ([#5797](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5797)) +* `azurerm_connection_monitor` - the deprecated resource has been removed ([#5844](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5844)) +* `azurerm_container_group` - removing the `port` field from the `container` block ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_container_group` - removing the `protocol` field from the `container` block ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_container_group` - the `ports` field is no longer Computed ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_container_group` - the `protocol` field within the `ports` block is no longer Computed and now defaults to `TCP` ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_container_group` - removing the deprecated field `command` ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_container_registry` - removing the deprecated `storage_account` block ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_container_service` - This resource has been removed since it was deprecated ([#5709](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5709)) +* `azurerm_cosmosdb_mongo_collection` - removing the deprecated `indexes` block ([#5853](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5853)) +* `azurerm_ddos_protection_plan` - the deprecated resource has been removed ([#5844](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5844)) +* `azurerm_devspace_controller` - removing the deprecated `sku` block ([#5795](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5795)) +* `azurerm_dns_cname_record` - removing the deprecated `records` field ([#5794](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5794)) +* `azurerm_dns_ns_record` - removing the deprecated `records` field ([#5794](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5794)) +* `azurerm_dns_zone` - removing the deprecated `zone_type` field ([#5794](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5794)) +* `azurerm_dns_zone` - removing the deprecated `registration_virtual_network_ids` field ([#5794](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5794)) +* `azurerm_dns_zone` - removing the deprecated `resolution_virtual_network_ids` field ([#5794](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5794)) +* `azurerm_eventhub` - removing the deprecated `location` field ([#5793](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5793)) +* `azurerm_eventhub_authorization_rule` - removing the deprecated `location` field ([#5793](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5793)) +* `azurerm_eventhub_consumer_group` - removing the deprecated `location` field ([#5793](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5793)) +* `azurerm_eventhub_namespace` - removing the deprecated `kafka_enabled` field since this is now managed by Azure ([#5793](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5793)) +* `azurerm_eventhub_namespace_authorization_rule` - removing the deprecated `location` field ([#5793](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5793)) +* `azurerm_firewall` - removing the deprecated field `internal_public_ip_address_id` from the `ip_configuration` block ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_firewall` - the field `public_ip_address_id` within the `ip_configuration` block is now required ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_frontdoor` - field `cache_enabled` within the `forwarding_configuration` block now defaults to `false` rather than `true` ([#5852](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5852)) +* `azurerm_frontdoor` - the field `cache_query_parameter_strip_directive` within the `forwarding_configuration` block now defaults to `StripAll` rather than `StripNone`. ([#5852](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5852)) +* `azurerm_frontdoor` - the field `forwarding_protocol` within the `forwarding_configuration` block now defaults to `HttpsOnly` rather than `MatchRequest` ([#5852](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5852)) +* `azurerm_function_app` - removing the field `virtual_network_name` from the `site_config` block ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_function_app` - updating the field `ip_address` within the `ip_restriction` block to accept a CIDR rather than an IP Address to match the updated API behaviour ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_iot_dps` - This resource has been removed since it was deprecated ([#5753](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5753)) +* `azurerm_iot_dps_certificate` - This resource has been removed since it was deprecated ([#5753](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5753)) +* `azurerm_iothub`- The deprecated `sku.tier` property will be removed. ([#5790](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5790)) +* `azurerm_iothub_dps` - The deprecated `sku.tier` property will be removed. ([#5790](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5790)) +* `azurerm_key_vault` - removing the `sku` block since this has been deprecated in favour of the `sku_name` field ([#5774](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5774)) +* `azurerm_key_vault_access_policy` - removing the deprecated field `vault_name` which has been superseded by the `key_vault_id` field ([#5774](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5774)) +* `azurerm_key_vault_access_policy` - removing the deprecated field `resource_group_name ` which has been superseded by the `key_vault_id` field ([#5774](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5774)) +* `azurerm_key_vault_certificate` - removing the deprecated `vault_uri` field ([#5774](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5774)) +* `azurerm_key_vault_key` - removing the deprecated `vault_uri` field ([#5774](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5774)) +* `azurerm_key_vault_secret` - removing the deprecated `vault_uri` field ([#5774](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5774)) +* `azurerm_kubernetes_cluster` - updating the default value for `load_balancer_sku` to `Standard` from `Basic` ([#5747](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5747)) +* `azurerm_kubernetes_cluster` - the block `default_node_pool` is now required ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_kubernetes_cluster` - removing the deprecated `agent_pool_profile` block ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_kubernetes_cluster` - the field `enable_pod_security_policy` is no longer computed ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_lb_backend_address_pool` - removing the deprecated `location` field ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_lb_nat_pool` - removing the deprecated `location` field ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_lb_nat_rule` - removing the deprecated `location` field ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_lb_probe` - removing the deprecated `location` field ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_lb_rule` - removing the deprecated `location` field ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_log_analytics_workspace_linked_service` - This resource has been removed since it was deprecated ([#5754](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5754)) +* `azurerm_log_analytics_linked_service` - The `resource_id` field has been moved from the `linked_service_properties` block to the top-level and the deprecated field `linked_service_properties` will be removed. This has been replaced by the `resource_id` resource ([#5775](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5775)) +* `azurerm_maps_account` - the `sku_name` field is now case-sensitive ([#5776](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5776)) +* `azurerm_mariadb_server` - removing the `sku` block since it's been deprecated in favour of the `sku_name` field ([#5777](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5777)) +* `azurerm_metric_alertrule` - the deprecated resource has been removed ([#5844](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5844)) +* `azurerm_monitor_metric_alert` - updating the default value for `auto_mitigate` from `false` to `true` ([#5773](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5773)) +* `azurerm_monitor_metric_alertrule` - the deprecated resource has been removed ([#5844](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5844)) +* `azurerm_mssql_elasticpool` - removing the deprecated `elastic_pool_properties` block ([#5744](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5744)) +* `azurerm_mysql_server` - removing the deprecated `sku` block ([#5743](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5743)) +* `azurerm_network_interface` - removing the deprecated `application_gateway_backend_address_pools_ids` field from the `ip_configurations` block ([#5784](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5784)) +* `azurerm_network_interface` - removing the deprecated `application_security_group_ids ` field from the `ip_configurations` block ([#5784](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5784)) +* `azurerm_network_interface` - removing the deprecated `load_balancer_backend_address_pools_ids ` field from the `ip_configurations` block ([#5784](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5784)) +* `azurerm_network_interface` - removing the deprecated `load_balancer_inbound_nat_rules_ids ` field from the `ip_configurations` block ([#5784](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5784)) +* `azurerm_network_interface` - removing the deprecated `internal_fqdn` field ([#5784](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5784)) +* `azurerm_network_interface` - removing the `network_security_group_id` field in favour of a new split-out resource `azurerm_network_interface_security_group_association` ([#5784](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5784)) +* `azurerm_network_interface_application_security_group_association` - removing the `ip_configuration_name` field associations between Network Interfaces and Application Security Groups now need to be made to all IP Configurations ([#5815](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5815)) +* `azurerm_network_interface` - the `virtual_machine_id` field is now computed-only since it's not setable ([#5784](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5784)) +* `azurerm_notification_hub_namesapce` - removing the `sku` block in favour of the `sku_name` argument ([#5722](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5722)) +* `azurerm_postgresql_server` - removing the `sku` block which has been deprecated in favour of the `sku_name` field ([#5721](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5721)) +* `azurerm_private_link_endpoint` - the deprecated resource has been removed ([#5844](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5844)) +* `azurerm_private_link_service` - removing the deprecated field `network_interface_ids` ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_public_ip` - making the `allocation_method` field required ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_public_ip` - removing the deprecated field `public_ip_address_allocation` ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* `azurerm_recovery_network_mapping` - the deprecated resource has been removed ([#5816](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5816)) +* `azurerm_recovery_replicated_vm` - the deprecated resource has been removed ([#5816](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5816)) +* `azurerm_recovery_services_fabric` - the deprecated resource has been removed ([#5816](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5816)) +* `azurerm_recovery_services_protected_vm` - the deprecated resource has been removed ([#5816](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5816)) +* `azurerm_recovery_services_protection_container` - the deprecated resource has been removed ([#5816](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5816)) +* `azurerm_recovery_services_protection_container_mapping` - the deprecated resource has been removed ([#5816](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5816)) +* `azurerm_recovery_services_protection_policy_vm` - the deprecated resource has been removed ([#5816](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5816)) +* `azurerm_recovery_services_replication_policy` - the deprecated resource has been removed ([#5816](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5816)) +* `azurerm_relay_namespace` - removing the `sku` block in favour of the `sku_name` field ([#5719](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5719)) +* `azurerm_scheduler_job` - This resource has been removed since it was deprecated ([#5712](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5712)) +* `azurerm_scheduler_job_collection` - This resource has been removed since it was deprecated ([#5712](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5712)) +* `azurerm_storage_account` - updating the default value for `account_kind` from `Storage` to `StorageV2` ([#5850](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5850)) +* `azurerm_storage_account` - removing the deprecated `account_type` field ([#5710](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5710)) +* `azurerm_storage_account` - removing the deprecated `enable_advanced_threat_protection` field ([#5710](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5710)) +* `azurerm_storage_account` - updating the default value for `enable_https_traffic_only` from `false` to `true` ([#5808](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5808)) +* `azurerm_storage_account` - removing the `account_encryption_source` field since this is no longer configurable by Azure ([#5668](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5668)) +* `azurerm_storage_account` - removing the `enable_blob_encryption` field since this is no longer configurable by Azure ([#5668](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5668)) +* `azurerm_storage_account` - removing the `enable_file_encryption` field since this is no longer configurable by Azure ([#5668](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5668)) +* `azurerm_storage_blob` - making the `type` field case-sensitive ([#5710](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5710)) +* `azurerm_storage_blob` - removing the deprecated `attempts` field ([#5710](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5710)) +* `azurerm_storage_blob` - removing the deprecated `resource_group_name` field ([#5710](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5710)) +* `azurerm_storage_container` - removing the deprecated `resource_group_name` field ([#5710](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5710)) +* `azurerm_storage_container` - removing the deprecated `properties` block ([#5710](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5710)) +* `azurerm_storage_queue` - removing the deprecated `resource_group_name` field ([#5710](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5710)) +* `azurerm_storage_share` - removing the deprecated `resource_group_name` field ([#5710](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5710)) +* `azurerm_storage_table` - removing the deprecated `resource_group_name` field ([#5710](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5710)) +* `azurerm_subnet` - removing the deprecated `ip_configuration` field ([#5801](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5801)) +* `azurerm_subnet` - removing the deprecated `network_security_group_id` field ([#5801](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5801)) +* `azurerm_subnet` - removing the deprecated `route_table_id` field ([#5801](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5801)) +* `azurerm_subnet` - making the `actions` list within the `service_delegation` block within the `service_endpoints` block non-computed ([#5801](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5801)) +* `azurerm_virtual_network_peering` - `allow_virtual_network_access` now defaults to true, matching the API and Portal behaviours. ([#5832](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5832)) +* `azurerm_virtual_wan` - removing the deprecated field `security_provider_name` ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) IMPROVEMENTS: -* web: updating to API version `2019-08-01` [GH-5823] -* Data Source: `azurerm_kubernetes_service_version` - support for filtering of preview releases [GH-5662] -* `azurerm_dedicated_host` - support for setting `sku_name` to `DSv3-Type2` and `ESv3-Type2` [GH-5768] -* `azurerm_key_vault` - support for configuring `purge_protection_enabled` [GH-5344] -* `azurerm_key_vault` - support for configuring `soft_delete_enabled` [GH-5344] -* `azurerm_sql_database` - support for configuring `zone_redundant` [GH-5772] -* `azurerm_storage_account` - support for configuring the `static_website` block [GH-5649] -* `azurerm_storage_account` - support for configuring `cors_rules` within the `blob_properties` block [GH-5425] -* `azurerm_subnet` - support for delta updates [GH-5801] -* `azurerm_windows_virtual_machine` - fixing a bug when provisioning from a Shared Gallery image [GH-5661] +* web: updating to API version `2019-08-01` ([#5823](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5823)) +* Data Source: `azurerm_kubernetes_service_version` - support for filtering of preview releases ([#5662](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5662)) +* `azurerm_dedicated_host` - support for setting `sku_name` to `DSv3-Type2` and `ESv3-Type2` ([#5768](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5768)) +* `azurerm_key_vault` - support for configuring `purge_protection_enabled` ([#5344](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5344)) +* `azurerm_key_vault` - support for configuring `soft_delete_enabled` ([#5344](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5344)) +* `azurerm_sql_database` - support for configuring `zone_redundant` ([#5772](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5772)) +* `azurerm_storage_account` - support for configuring the `static_website` block ([#5649](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5649)) +* `azurerm_storage_account` - support for configuring `cors_rules` within the `blob_properties` block ([#5425](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5425)) +* `azurerm_subnet` - support for delta updates ([#5801](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5801)) +* `azurerm_windows_virtual_machine` - fixing a bug when provisioning from a Shared Gallery image ([#5661](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5661)) BUG FIXES: -* `azurerm_application_insights` - the `application_type` field is now case sensitive as documented [GH-5817] -* `azurerm_api_management_api` - allows blank `path` field [GH-5833] -* `azurerm_eventhub_namespace` - the field `ip_rule` within the `network_rulesets` block now supports a maximum of 128 items [GH-5831] -* `azurerm_eventhub_namespace` - the field `virtual_network_rule` within the `network_rulesets` block now supports a maximum of 128 items [GH-5831] -* `azurerm_linux_virtual_machine` - using the delete custom timeout during deletion [GH-5764] -* `azurerm_netapp_account` - allowing the `-` character to be used in the `name` field [GH-5842] -* `azurerm_network_interface` - the `dns_servers` field now respects ordering [GH-5784] -* `azurerm_public_ip_prefix` - fixing the validation for the `prefix_length` to match the Azure API [GH-5693] -* `azurerm_recovery_services_vault` - using the requested cloud rather than the default [GH-5825] -* `azurerm_role_assignment` - validating that the `name` is a UUID [GH-5624] -* `azurerm_signalr_service` - ensuring the SignalR segment is parsed in the correct case [GH-5737] -* `azurerm_storage_account` - locking on the storage account resource when updating the storage account [GH-5668] -* `azurerm_subnet` - supporting updating of the `enforce_private_link_endpoint_network_policies` field [GH-5801] -* `azurerm_subnet` - supporting updating of the `enforce_private_link_service_network_policies` field [GH-5801] -* `azurerm_windows_virtual_machine` - using the delete custom timeout during deletion [GH-5764] +* `azurerm_application_insights` - the `application_type` field is now case sensitive as documented ([#5817](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5817)) +* `azurerm_api_management_api` - allows blank `path` field ([#5833](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5833)) +* `azurerm_eventhub_namespace` - the field `ip_rule` within the `network_rulesets` block now supports a maximum of 128 items ([#5831](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5831)) +* `azurerm_eventhub_namespace` - the field `virtual_network_rule` within the `network_rulesets` block now supports a maximum of 128 items ([#5831](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5831)) +* `azurerm_linux_virtual_machine` - using the delete custom timeout during deletion ([#5764](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5764)) +* `azurerm_netapp_account` - allowing the `-` character to be used in the `name` field ([#5842](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5842)) +* `azurerm_network_interface` - the `dns_servers` field now respects ordering ([#5784](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5784)) +* `azurerm_public_ip_prefix` - fixing the validation for the `prefix_length` to match the Azure API ([#5693](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5693)) +* `azurerm_recovery_services_vault` - using the requested cloud rather than the default ([#5825](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5825)) +* `azurerm_role_assignment` - validating that the `name` is a UUID ([#5624](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5624)) +* `azurerm_signalr_service` - ensuring the SignalR segment is parsed in the correct case ([#5737](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5737)) +* `azurerm_storage_account` - locking on the storage account resource when updating the storage account ([#5668](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5668)) +* `azurerm_subnet` - supporting updating of the `enforce_private_link_endpoint_network_policies` field ([#5801](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5801)) +* `azurerm_subnet` - supporting updating of the `enforce_private_link_service_network_policies` field ([#5801](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5801)) +* `azurerm_windows_virtual_machine` - using the delete custom timeout during deletion ([#5764](https://github.com/terraform-providers/terraform-provider-azurerm/issues/5764)) --- From 6d87e7a972fa33800789d68227df3885bbaa0173 Mon Sep 17 00:00:00 2001 From: tf-release-bot Date: Mon, 24 Feb 2020 16:30:18 +0000 Subject: [PATCH 386/498] Cleanup after v2.0.0 release --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba0909629ce8b..6c1e2b1c255e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +## 2.1.0 (Unreleased) ## 2.0.0 (February 24, 2020) NOTES: From fc5f56c4a531c747b8eb1fa88f6179f0413c5758 Mon Sep 17 00:00:00 2001 From: Stephen Dowsland Date: Mon, 24 Feb 2020 21:13:55 +0000 Subject: [PATCH 387/498] Add network interface and security group association --- examples/virtual-machines/linux/public-ip/main.tf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/examples/virtual-machines/linux/public-ip/main.tf b/examples/virtual-machines/linux/public-ip/main.tf index 02371d8526cb2..a93700ea26652 100644 --- a/examples/virtual-machines/linux/public-ip/main.tf +++ b/examples/virtual-machines/linux/public-ip/main.tf @@ -45,7 +45,6 @@ resource "azurerm_network_interface" "internal" { name = "${var.prefix}-nic2" resource_group_name = azurerm_resource_group.main.name location = azurerm_resource_group.main.location - network_security_group_id = azurerm_network_security_group.webserver.id ip_configuration { name = "internal" @@ -71,6 +70,11 @@ resource "azurerm_network_security_group" "webserver" { } } +resource "azurerm_network_interface_security_group_association" "main" { + network_interface_id = azurerm_network_interface.internal.id + network_security_group_id = azurerm_network_security_group.webserver.id +} + resource "azurerm_linux_virtual_machine" "main" { name = "${var.prefix}-vm" resource_group_name = azurerm_resource_group.main.name From 5397d96e0a6efc1588a63479073b9dcd2232802e Mon Sep 17 00:00:00 2001 From: Austin Cheung Date: Mon, 24 Feb 2020 17:31:39 -0800 Subject: [PATCH 388/498] remove duplicate set and undo changes from prettier --- .../kusto/resource_arm_kusto_cluster.go | 1 - website/docs/r/kusto_cluster.html.markdown | 32 +++++++++---------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/azurerm/internal/services/kusto/resource_arm_kusto_cluster.go b/azurerm/internal/services/kusto/resource_arm_kusto_cluster.go index 48e8ff3270689..0361a8fe1a316 100644 --- a/azurerm/internal/services/kusto/resource_arm_kusto_cluster.go +++ b/azurerm/internal/services/kusto/resource_arm_kusto_cluster.go @@ -217,7 +217,6 @@ func resourceArmKustoClusterRead(d *schema.ResourceData, meta interface{}) error d.Set("enable_streaming_ingest", clusterProperties.EnableStreamingIngest) d.Set("uri", clusterProperties.URI) d.Set("data_ingestion_uri", clusterProperties.DataIngestionURI) - d.Set("enable_disk_encryption", clusterProperties.EnableDiskEncryption) } return tags.FlattenAndSet(d, clusterResponse.Tags) diff --git a/website/docs/r/kusto_cluster.html.markdown b/website/docs/r/kusto_cluster.html.markdown index 95a51839c8c7d..e3589ab74f0e8 100644 --- a/website/docs/r/kusto_cluster.html.markdown +++ b/website/docs/r/kusto_cluster.html.markdown @@ -38,46 +38,46 @@ resource "azurerm_kusto_cluster" "example" { The following arguments are supported: -- `name` - (Required) The name of the Kusto Cluster to create. Changing this forces a new resource to be created. +* `name` - (Required) The name of the Kusto Cluster to create. Changing this forces a new resource to be created. -- `location` - (Required) The location where the Kusto Cluster should be created. Changing this forces a new resource to be created. +* `location` - (Required) The location where the Kusto Cluster should be created. Changing this forces a new resource to be created. -- `resource_group_name` - (Required) Specifies the Resource Group where the Kusto Cluster should exist. Changing this forces a new resource to be created. +* `resource_group_name` - (Required) Specifies the Resource Group where the Kusto Cluster should exist. Changing this forces a new resource to be created. -- `sku` - (Required) A `sku` block as defined below. +* `sku` - (Required) A `sku` block as defined below. -- `enable_disk_encryption` - (Optional) Specifies if the cluster's disks are encrypted. +* `enable_disk_encryption` - (Optional) Specifies if the cluster's disks are encrypted. -- `enable_streaming_ingest` - (Optional) Specifies if the streaming ingest is enabled. +* `enable_streaming_ingest` - (Optional) Specifies if the streaming ingest is enabled. -- `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A mapping of tags to assign to the resource. --- A `sku` block supports the following: -- `name` - (Required) The name of the SKU. Valid values are: `Dev(No SLA)_Standard_D11_v2`, `Standard_D11_v2`, `Standard_D12_v2`, `Standard_D13_v2`, `Standard_D14_v2`, `Standard_DS13_v2+1TB_PS`, `Standard_DS13_v2+2TB_PS`, `Standard_DS14_v2+3TB_PS`, `Standard_DS14_v2+4TB_PS`, `Standard_L16s`, `Standard_L4s` and `Standard_L8s` +* `name` - (Required) The name of the SKU. Valid values are: `Dev(No SLA)_Standard_D11_v2`, `Standard_D11_v2`, `Standard_D12_v2`, `Standard_D13_v2`, `Standard_D14_v2`, `Standard_DS13_v2+1TB_PS`, `Standard_DS13_v2+2TB_PS`, `Standard_DS14_v2+3TB_PS`, `Standard_DS14_v2+4TB_PS`, `Standard_L16s`, `Standard_L4s` and `Standard_L8s` -- `capacity` - (Required) Specifies the node count for the cluster. Boundaries depend on the sku name. +* `capacity` - (Required) Specifies the node count for the cluster. Boundaries depend on the sku name. ## Attributes Reference The following attributes are exported: -- `id` - The Kusto Cluster ID. +* `id` - The Kusto Cluster ID. -- `uri` - The FQDN of the Azure Kusto Cluster. +* `uri` - The FQDN of the Azure Kusto Cluster. -- `data_ingestion_uri` - The Kusto Cluster URI to be used for data ingestion. +* `data_ingestion_uri` - The Kusto Cluster URI to be used for data ingestion. ## Timeouts The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: -- `create` - (Defaults to 60 minutes) Used when creating the Kusto Cluster. -- `update` - (Defaults to 60 minutes) Used when updating the Kusto Cluster. -- `read` - (Defaults to 5 minutes) Used when retrieving the Kusto Cluster. -- `delete` - (Defaults to 60 minutes) Used when deleting the Kusto Cluster. +* `create` - (Defaults to 60 minutes) Used when creating the Kusto Cluster. +* `update` - (Defaults to 60 minutes) Used when updating the Kusto Cluster. +* `read` - (Defaults to 5 minutes) Used when retrieving the Kusto Cluster. +* `delete` - (Defaults to 60 minutes) Used when deleting the Kusto Cluster. ## Import From 2c8bcd070e292c9ecf1eaad682cc799c8df0e47b Mon Sep 17 00:00:00 2001 From: Brent Harrison Date: Tue, 25 Feb 2020 01:00:36 -0500 Subject: [PATCH 389/498] Add Type to Virtual WAN properties --- .../services/network/resource_arm_virtual_wan.go | 9 +++++++++ .../network/tests/resource_arm_virtual_wan_test.go | 1 + website/docs/r/virtual_wan.html.markdown | 2 ++ 3 files changed, 12 insertions(+) diff --git a/azurerm/internal/services/network/resource_arm_virtual_wan.go b/azurerm/internal/services/network/resource_arm_virtual_wan.go index 13dc3b71bade2..d0d49e7c82a06 100644 --- a/azurerm/internal/services/network/resource_arm_virtual_wan.go +++ b/azurerm/internal/services/network/resource_arm_virtual_wan.go @@ -77,6 +77,12 @@ func resourceArmVirtualWan() *schema.Resource { Default: string(network.OfficeTrafficCategoryNone), }, + "type": { + Type: schema.TypeString, + Optional: true, + Default: "Standard", + }, + "tags": tags.Schema(), }, } @@ -96,6 +102,7 @@ func resourceArmVirtualWanCreateUpdate(d *schema.ResourceData, meta interface{}) allowBranchToBranchTraffic := d.Get("allow_branch_to_branch_traffic").(bool) allowVnetToVnetTraffic := d.Get("allow_vnet_to_vnet_traffic").(bool) office365LocalBreakoutCategory := d.Get("office365_local_breakout_category").(string) + virtualWanType := d.Get("type").(string) t := d.Get("tags").(map[string]interface{}) if features.ShouldResourcesBeImported() && d.IsNewResource() { @@ -119,6 +126,7 @@ func resourceArmVirtualWanCreateUpdate(d *schema.ResourceData, meta interface{}) AllowBranchToBranchTraffic: utils.Bool(allowBranchToBranchTraffic), AllowVnetToVnetTraffic: utils.Bool(allowVnetToVnetTraffic), Office365LocalBreakoutCategory: network.OfficeTrafficCategory(office365LocalBreakoutCategory), + Type: utils.String(virtualWanType), }, } @@ -177,6 +185,7 @@ func resourceArmVirtualWanRead(d *schema.ResourceData, meta interface{}) error { d.Set("allow_branch_to_branch_traffic", props.AllowBranchToBranchTraffic) d.Set("allow_vnet_to_vnet_traffic", props.AllowVnetToVnetTraffic) d.Set("office365_local_breakout_category", props.Office365LocalBreakoutCategory) + d.Set("type", props.Type) } return tags.FlattenAndSet(d, resp.Tags) diff --git a/azurerm/internal/services/network/tests/resource_arm_virtual_wan_test.go b/azurerm/internal/services/network/tests/resource_arm_virtual_wan_test.go index 81d1499709de6..5d87f58df093d 100644 --- a/azurerm/internal/services/network/tests/resource_arm_virtual_wan_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_virtual_wan_test.go @@ -179,6 +179,7 @@ resource "azurerm_virtual_wan" "test" { allow_branch_to_branch_traffic = true allow_vnet_to_vnet_traffic = true office365_local_breakout_category = "All" + type = "Standard" tags = { Hello = "There" diff --git a/website/docs/r/virtual_wan.html.markdown b/website/docs/r/virtual_wan.html.markdown index ec1c59626dce2..e8ef87506d9c0 100644 --- a/website/docs/r/virtual_wan.html.markdown +++ b/website/docs/r/virtual_wan.html.markdown @@ -44,6 +44,8 @@ The following arguments are supported: * `office365_local_breakout_category` - (Optional) Specifies the Office365 local breakout category. Possible values include: `Optimize`, `OptimizeAndAllow`, `All`, `None`. Defaults to `None`. +* `type` - (Optional) Specifies the Virtual WAN type. Possible Values include: `Basic` and `Standard`. Defaults to `Standard`. + * `tags` - (Optional) A mapping of tags to assign to the Virtual WAN. ## Attributes Reference From ecbc9caba7e4f7624204d20e151af8125f7bcd29 Mon Sep 17 00:00:00 2001 From: njucz <740360112@qq.com> Date: Tue, 25 Feb 2020 14:56:26 +0800 Subject: [PATCH 390/498] remove reference to non-existing page --- examples/virtual-machines/README.md | 2 -- examples/vm-scale-set/README.md | 2 -- 2 files changed, 4 deletions(-) diff --git a/examples/virtual-machines/README.md b/examples/virtual-machines/README.md index de75c823fbcff..61eddd45a9b43 100644 --- a/examples/virtual-machines/README.md +++ b/examples/virtual-machines/README.md @@ -9,8 +9,6 @@ Version 2.0 of the Azure Provider introduces several new resources which superse [More details can be found in this issue](https://github.com/terraform-providers/terraform-provider-azurerm/issues/2807) - however these resources will replace the existing `azurerm_virtual_machine` resource in the long-term. -Version 1.43 of the Azure Provider will allow you to opt-into the Beta of these resources to provide feedback - [more information on how to do that can be found in this guide](https://terraform.io/docs/providers/azurerm/guides/2.0-beta.html). - This directory contains 4 sub-directories: * `./virtual_machine` - which are examples of how to use the `azurerm_virtual_machine` resource. diff --git a/examples/vm-scale-set/README.md b/examples/vm-scale-set/README.md index 69242af24c92e..65adf7ceac3d6 100644 --- a/examples/vm-scale-set/README.md +++ b/examples/vm-scale-set/README.md @@ -10,8 +10,6 @@ Version 2.0 of the Azure Provider introduces several new resources which superse [More details can be found in this issue](https://github.com/terraform-providers/terraform-provider-azurerm/issues/2807) - however these resources will replace the existing `azurerm_virtual_machine_scale_set` resource in the long-term. -Version 1.43 of the Azure Provider will allow you to opt-into the Beta of these resources to provide feedback - [more information on how to do that can be found in this guide](https://terraform.io/docs/providers/azurerm/guides/2.0-beta.html). - This directory contains 4 sub-directories: * `./virtual_machine_scale_set` - which are examples of how to use the `azurerm_virtual_machine_scale_set` resource. From bdf5fa3191cd79b67888e9e41d30a859318d4e68 Mon Sep 17 00:00:00 2001 From: matus-cuper Date: Tue, 25 Feb 2020 10:18:33 +0100 Subject: [PATCH 391/498] Update cosmosdb_mongo_collection.html.markdown Fix default TTL seconds example according to actual behaviour. --- website/docs/r/cosmosdb_mongo_collection.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/cosmosdb_mongo_collection.html.markdown b/website/docs/r/cosmosdb_mongo_collection.html.markdown index b1261f1d08712..e9070951ebdb8 100644 --- a/website/docs/r/cosmosdb_mongo_collection.html.markdown +++ b/website/docs/r/cosmosdb_mongo_collection.html.markdown @@ -53,7 +53,7 @@ The following arguments are supported: * `name` - (Required) Specifies the name of the Cosmos DB Mongo Collection. Changing this forces a new resource to be created. * `resource_group_name` - (Required) The name of the resource group in which the Cosmos DB Mongo Collection is created. Changing this forces a new resource to be created. * `database_name` - (Required) The name of the Cosmos DB Mongo Database in which the Cosmos DB Mongo Collection is created. Changing this forces a new resource to be created. -* `default_ttl_seconds` - (Required) The default Time To Live in seconds. If the value is `-1` items are not automatically expired. +* `default_ttl_seconds` - (Required) The default Time To Live in seconds. If the value is `0` items are not automatically expired. * `shard_key` - (Required) The name of the key to partition on for sharding. There must not be any other unique index keys. * `throughput` - (Optional) The throughput of the MongoDB collection (RU/s). Must be set in increments of `100`. The minimum value is `400`. This must be set upon database creation otherwise it cannot be updated without a manual terraform destroy-apply. From 4c092adb41b3f3e0dedd9f04a80cdd9660fec527 Mon Sep 17 00:00:00 2001 From: Francis Mercier Date: Tue, 25 Feb 2020 10:31:36 -0500 Subject: [PATCH 392/498] Improper import examples The import example contained a lot of wrong path. For instance, half of the "my" elements, such as "myResourceGroups" were not variable elements. The path really is ResourceGroups then followed by a myGroup1 variable element. Suggested change make sure the non-variable elements are correctly prefixed. --- website/docs/r/batch_pool.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/batch_pool.html.markdown b/website/docs/r/batch_pool.html.markdown index 5c5635639fb68..795c68f5a0d60 100644 --- a/website/docs/r/batch_pool.html.markdown +++ b/website/docs/r/batch_pool.html.markdown @@ -321,5 +321,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d Batch Pools can be imported using the `resource id`, e.g. ```shell - terraform import azurerm_batch_pool.example /subscriptions/00000000-0000-0000-0000-000000000000/myResourceGroups/myGroup1/providers/Microsoft.Batch/myBatchAccounts/myBatchAccount1/myBatchPools/myBatchPool1 +terraform import azurerm_batch_pool.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myGroup1/providers/Microsoft.Batch/batchAccounts/myBatchAccount1/pools/myBatchPool1 ``` From d4b66c696d549202553f532f74796ef7e5c1ff90 Mon Sep 17 00:00:00 2001 From: Arturo Ochoa Date: Tue, 25 Feb 2020 12:41:27 -0600 Subject: [PATCH 393/498] fix source_image_id for linux scalesets --- .../resource_arm_linux_virtual_machine_scale_set.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/azurerm/internal/services/compute/resource_arm_linux_virtual_machine_scale_set.go b/azurerm/internal/services/compute/resource_arm_linux_virtual_machine_scale_set.go index 4d92448063b71..a5ad834ca0a6f 100644 --- a/azurerm/internal/services/compute/resource_arm_linux_virtual_machine_scale_set.go +++ b/azurerm/internal/services/compute/resource_arm_linux_virtual_machine_scale_set.go @@ -196,9 +196,13 @@ func resourceArmLinuxVirtualMachineScaleSet() *schema.Resource { }, "source_image_id": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: computeValidate.ImageID, + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.Any( + computeValidate.ImageID, + computeValidate.SharedImageID, + computeValidate.SharedImageVersionID, + ), }, "source_image_reference": sourceImageReferenceSchema(false), From dfe4781eaffb7a63e4f68fd2035534ec809e8027 Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 25 Feb 2020 12:58:21 -0800 Subject: [PATCH 394/498] Update CHANGELOG>md to include #5901 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c1e2b1c255e7..7c5c97affb47f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ ## 2.1.0 (Unreleased) + +BUG FIXES: + +* `azurerm_linux_virtual_machine_scale_set` - correct `source_image_id` validation [GH-5901] + ## 2.0.0 (February 24, 2020) NOTES: From 7ca24f045434879f11428119fb00a7a8729dde03 Mon Sep 17 00:00:00 2001 From: njucz <740360112@qq.com> Date: Wed, 26 Feb 2020 08:08:28 +0800 Subject: [PATCH 395/498] Fixes #5622 #5208 * add `private_ip_address` * Added computed to the private_ip_address desc Co-authored-by: WS <20408400+WodansSon@users.noreply.github.com> --- .../network/resource_arm_private_endpoint.go | 18 ++++++++++++++++++ .../resource_arm_private_endpoint_test.go | 1 + website/docs/r/private_endpoint.html.markdown | 2 ++ 3 files changed, 21 insertions(+) diff --git a/azurerm/internal/services/network/resource_arm_private_endpoint.go b/azurerm/internal/services/network/resource_arm_private_endpoint.go index cce2878f8e830..db7d08aae658e 100644 --- a/azurerm/internal/services/network/resource_arm_private_endpoint.go +++ b/azurerm/internal/services/network/resource_arm_private_endpoint.go @@ -90,6 +90,10 @@ func resourceArmPrivateEndpoint() *schema.Resource { Optional: true, ValidateFunc: validation.StringLenBetween(1, 140), }, + "private_ip_address": { + Type: schema.TypeString, + Computed: true, + }, }, }, }, @@ -166,6 +170,7 @@ func resourceArmPrivateEndpointCreateUpdate(d *schema.ResourceData, meta interfa func resourceArmPrivateEndpointRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Network.PrivateEndpointClient + nicsClient := meta.(*clients.Client).Network.InterfacesClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -193,7 +198,20 @@ func resourceArmPrivateEndpointRead(d *schema.ResourceData, meta interface{}) er } if props := resp.PrivateEndpointProperties; props != nil { + privateIpAddress := "" + + if nics := props.NetworkInterfaces; nics != nil && len(*nics) > 0 { + nic := (*nics)[0] + if nic.ID != nil && *nic.ID != "" { + privateIpAddress = getPrivateIpAddress(ctx, nicsClient, *nic.ID) + } + } + flattenedConnection := flattenArmPrivateLinkEndpointServiceConnection(props.PrivateLinkServiceConnections, props.ManualPrivateLinkServiceConnections) + for _, item := range flattenedConnection { + v := item.(map[string]interface{}) + v["private_ip_address"] = privateIpAddress + } if err := d.Set("private_service_connection", flattenedConnection); err != nil { return fmt.Errorf("Error setting `private_service_connection`: %+v", err) } diff --git a/azurerm/internal/services/network/tests/resource_arm_private_endpoint_test.go b/azurerm/internal/services/network/tests/resource_arm_private_endpoint_test.go index 0357699e654a8..3548306180a8b 100644 --- a/azurerm/internal/services/network/tests/resource_arm_private_endpoint_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_private_endpoint_test.go @@ -24,6 +24,7 @@ func TestAccAzureRMPrivateEndpoint_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMPrivateEndpointExists(data.ResourceName), resource.TestCheckResourceAttrSet(data.ResourceName, "subnet_id"), + resource.TestCheckResourceAttrSet(data.ResourceName, "private_service_connection.0.private_ip_address"), ), }, data.ImportStep(), diff --git a/website/docs/r/private_endpoint.html.markdown b/website/docs/r/private_endpoint.html.markdown index 2a0c8428d9717..8c47cda30ef89 100644 --- a/website/docs/r/private_endpoint.html.markdown +++ b/website/docs/r/private_endpoint.html.markdown @@ -141,6 +141,8 @@ See the product [documentation](https://docs.microsoft.com/en-us/azure/private-l * `request_message` - (Optional) A message passed to the owner of the remote resource when the private endpoint attempts to establish the connection to the remote resource. The request message can be a maximum of `140` characters in length. Only valid if `is_manual_connection` is set to `true`. +* `private_ip_address` - (Computed) The private IP address associated with the private endpoint, note that you will have a private IP address assigned to the private endpoint even if the connection request was `Rejected`. + ## Attributes Reference The following attributes are exported: From b6c410e6dbe56c1401296480ee69763a5331554f Mon Sep 17 00:00:00 2001 From: WS <20408400+WodansSon@users.noreply.github.com> Date: Tue, 25 Feb 2020 16:12:00 -0800 Subject: [PATCH 396/498] Update CHANGELOG.md to include #5838 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c5c97affb47f..8959e45cc2d90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ BUG FIXES: * `azurerm_linux_virtual_machine_scale_set` - correct `source_image_id` validation [GH-5901] +IMPROVEMENTS: + +* `azurerm_private_endpoint` - exposed `private_ip_address` as a computed attribute [GH-5838] + ## 2.0.0 (February 24, 2020) NOTES: From 2a7838b89e7b19780528b8cfeba109f02e2ca020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20P=C3=A9rez=20Esteso?= Date: Wed, 26 Feb 2020 13:46:00 +0100 Subject: [PATCH 397/498] Correct typo --- website/docs/r/storage_management_policy.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/storage_management_policy.html.markdown b/website/docs/r/storage_management_policy.html.markdown index a8a2861c31299..ef9f84efc2c5e 100644 --- a/website/docs/r/storage_management_policy.html.markdown +++ b/website/docs/r/storage_management_policy.html.markdown @@ -135,5 +135,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d Storage Account Management Policies can be imported using the `resource id`, e.g. ```shell -terraform import azurerm_storage_management_policy.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.Storage/storageAccounts/myaccountname/managementPoliices/default +terraform import azurerm_storage_management_policy.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.Storage/storageAccounts/myaccountname/managementPolicies/default ``` From e4b368415528493210fd78f47bea0a939b25ed8c Mon Sep 17 00:00:00 2001 From: jackofallops Date: Wed, 26 Feb 2020 12:55:24 -0500 Subject: [PATCH 398/498] exclude app_service_environment_id from update when empty --- .../internal/services/web/resource_arm_app_service_plan.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/web/resource_arm_app_service_plan.go b/azurerm/internal/services/web/resource_arm_app_service_plan.go index 6e9d7e38421d7..66e725ade3004 100644 --- a/azurerm/internal/services/web/resource_arm_app_service_plan.go +++ b/azurerm/internal/services/web/resource_arm_app_service_plan.go @@ -179,8 +179,10 @@ func resourceArmAppServicePlanCreateUpdate(d *schema.ResourceData, meta interfac } if v, exists := d.GetOkExists("app_service_environment_id"); exists { - appServicePlan.AppServicePlanProperties.HostingEnvironmentProfile = &web.HostingEnvironmentProfile{ - ID: utils.String(v.(string)), + if v != "" { + appServicePlan.AppServicePlanProperties.HostingEnvironmentProfile = &web.HostingEnvironmentProfile{ + ID: utils.String(v.(string)), + } } } From df191e12f7026660a32504d9e7f0fda42a59742a Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 26 Feb 2020 11:57:37 -0800 Subject: [PATCH 399/498] Update CHANGELOG.md to include #5877 --- CHANGELOG.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8959e45cc2d90..277e922b5b013 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,13 @@ ## 2.1.0 (Unreleased) -BUG FIXES: - -* `azurerm_linux_virtual_machine_scale_set` - correct `source_image_id` validation [GH-5901] - IMPROVEMENTS: * `azurerm_private_endpoint` - exposed `private_ip_address` as a computed attribute [GH-5838] +* `azurerm_virtual_wan` - support for the `type` property [GH-5877] + +BUG FIXES: + +* `azurerm_linux_virtual_machine_scale_set` - correct `source_image_id` validation [GH-5901] ## 2.0.0 (February 24, 2020) From fbb8e97266091be0a4eafdb1762695798ef45219 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 26 Feb 2020 12:53:40 -0800 Subject: [PATCH 400/498] Update CHANGELOG.md to include #5827 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 277e922b5b013..2b1e6bc81c86f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ IMPROVEMENTS: +* `azurerm_automation_dsc_configuration` - support for the `tags` property [GH-5827] * `azurerm_private_endpoint` - exposed `private_ip_address` as a computed attribute [GH-5838] * `azurerm_virtual_wan` - support for the `type` property [GH-5877] From de5f224192f57d8269e1506c506a39326a7a6099 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 26 Feb 2020 13:01:17 -0800 Subject: [PATCH 401/498] linting: terrafmt doesn't depend on terraform anymore --- .travis.yml | 8 ++------ scripts/terrafmt-acctests.sh | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8db23ad3830fd..49dd6ab0e4c3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,16 +34,12 @@ matrix: #- name: "make lintunused" # script: GOGC=5 make lintunused - name: "make tflint" - script: - - GO111MODULE=off go get -u github.com/hashicorp/terraform - - make tflint + script: make tflint - name: "make test" script: make test - name: "make depscheck" script: make depscheck - name: "make website-lint" - script: - - GO111MODULE=off go get -u github.com/hashicorp/terraform - - make website-lint + script: make website-lint - name: "make website-test" script: make website-test diff --git a/scripts/terrafmt-acctests.sh b/scripts/terrafmt-acctests.sh index 5aebb9609c8e5..b0f6042b3ec83 100755 --- a/scripts/terrafmt-acctests.sh +++ b/scripts/terrafmt-acctests.sh @@ -16,7 +16,7 @@ if ${error}; then echo "You can fix this by running make tools and then terrafmt on them." echo "" echo "format a single file:" - echo "$ terrafmt fmt ./azurerm/internal/services/service/tests/resource_test.go" + echo "$ terrafmt fmt -f ./azurerm/internal/services/service/tests/resource_test.go" echo "" echo "format all website files:" echo "$ find azurerm | egrep \"_test.go\" | sort | while read f; do terrafmt fmt -f \$f; done" From 8d97688159ca2d04df4c0c82f77505796be595af Mon Sep 17 00:00:00 2001 From: Steve <11830746+jackofallops@users.noreply.github.com> Date: Wed, 26 Feb 2020 16:12:23 -0500 Subject: [PATCH 402/498] Updated for 5839 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b1e6bc81c86f..73110284a5b78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ IMPROVEMENTS: * `azurerm_automation_dsc_configuration` - support for the `tags` property [GH-5827] * `azurerm_private_endpoint` - exposed `private_ip_address` as a computed attribute [GH-5838] * `azurerm_virtual_wan` - support for the `type` property [GH-5877] +* `azurerm_function_app` - Added `os_type` field to facilitate support of `linux` function apps [GH-5839] BUG FIXES: From eacb58b8b6f64a7d4967e00ab5a78c291f47a51b Mon Sep 17 00:00:00 2001 From: aqche <39076898+aqche@users.noreply.github.com> Date: Wed, 26 Feb 2020 16:09:09 -0800 Subject: [PATCH 403/498] Apply suggestions from code review Co-Authored-By: kt --- azurerm/internal/services/kusto/resource_arm_kusto_cluster.go | 2 +- .../services/kusto/tests/resource_arm_kusto_cluster_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/azurerm/internal/services/kusto/resource_arm_kusto_cluster.go b/azurerm/internal/services/kusto/resource_arm_kusto_cluster.go index 0361a8fe1a316..98ba7616bbe73 100644 --- a/azurerm/internal/services/kusto/resource_arm_kusto_cluster.go +++ b/azurerm/internal/services/kusto/resource_arm_kusto_cluster.go @@ -141,7 +141,7 @@ func resourceArmKustoClusterCreateUpdate(d *schema.ResourceData, meta interface{ } clusterProperties := kusto.ClusterProperties{ - EnableDiskEncryption: utils.Bool(enableDiskEncryption), + EnableDiskEncryption: utils.Bool(d.Get("enable_disk_encryption").(bool)), EnableStreamingIngest: utils.Bool(enableStreamingIngest), } diff --git a/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go b/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go index 9700e71825fa8..7808be8d704c9 100644 --- a/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go +++ b/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go @@ -30,7 +30,7 @@ func TestAccAzureRMKustoCluster_basic(t *testing.T) { }) } -func TestAccAzureRMKustoCluster_propsUpdate(t *testing.T) { +func TestAccAzureRMKustoCluster_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_kusto_cluster", "test") resource.ParallelTest(t, resource.TestCase{ @@ -205,7 +205,7 @@ resource "azurerm_kusto_cluster" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomString) } -func testAccAzureRMKustoCluster_propsUpdate(data acceptance.TestData) string { +func testAccAzureRMKustoCluster_update(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" From b248a832588dc2f400ea91540ceab379217e537a Mon Sep 17 00:00:00 2001 From: Austin Cheung Date: Wed, 26 Feb 2020 16:10:46 -0800 Subject: [PATCH 404/498] apply changes from code review --- .../services/kusto/resource_arm_kusto_cluster.go | 6 ++---- .../tests/resource_arm_kusto_cluster_test.go | 16 +++++++++++++--- website/docs/r/kusto_cluster.html.markdown | 3 +++ 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/azurerm/internal/services/kusto/resource_arm_kusto_cluster.go b/azurerm/internal/services/kusto/resource_arm_kusto_cluster.go index 0361a8fe1a316..956f7f28bfd2b 100644 --- a/azurerm/internal/services/kusto/resource_arm_kusto_cluster.go +++ b/azurerm/internal/services/kusto/resource_arm_kusto_cluster.go @@ -132,8 +132,6 @@ func resourceArmKustoClusterCreateUpdate(d *schema.ResourceData, meta interface{ } location := azure.NormalizeLocation(d.Get("location").(string)) - enableDiskEncryption := d.Get("enable_disk_encryption").(bool) - enableStreamingIngest := d.Get("enable_streaming_ingest").(bool) sku, err := expandKustoClusterSku(d) if err != nil { @@ -141,8 +139,8 @@ func resourceArmKustoClusterCreateUpdate(d *schema.ResourceData, meta interface{ } clusterProperties := kusto.ClusterProperties{ - EnableDiskEncryption: utils.Bool(enableDiskEncryption), - EnableStreamingIngest: utils.Bool(enableStreamingIngest), + EnableDiskEncryption: utils.Bool(d.Get("enable_disk_encryption").(bool)), + EnableStreamingIngest: utils.Bool(d.Get("enable_streaming_ingest").(bool)), } t := d.Get("tags").(map[string]interface{}) diff --git a/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go b/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go index 9700e71825fa8..86213ba77fed9 100644 --- a/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go +++ b/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go @@ -30,7 +30,7 @@ func TestAccAzureRMKustoCluster_basic(t *testing.T) { }) } -func TestAccAzureRMKustoCluster_propsUpdate(t *testing.T) { +func TestAccAzureRMKustoCluster_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_kusto_cluster", "test") resource.ParallelTest(t, resource.TestCase{ @@ -46,8 +46,9 @@ func TestAccAzureRMKustoCluster_propsUpdate(t *testing.T) { resource.TestCheckResourceAttr(data.ResourceName, "enable_streaming_ingest", "false"), ), }, + data.ImportStep(), { - Config: testAccAzureRMKustoCluster_propsUpdate(data), + Config: testAccAzureRMKustoCluster_update(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMKustoClusterExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "enable_disk_encryption", "true"), @@ -55,6 +56,15 @@ func TestAccAzureRMKustoCluster_propsUpdate(t *testing.T) { ), }, data.ImportStep(), + { + Config: testAccAzureRMKustoCluster_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKustoClusterExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "enable_disk_encryption", "false"), + resource.TestCheckResourceAttr(data.ResourceName, "enable_streaming_ingest", "false"), + ), + }, + data.ImportStep(), }, }) } @@ -205,7 +215,7 @@ resource "azurerm_kusto_cluster" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomString) } -func testAccAzureRMKustoCluster_propsUpdate(data acceptance.TestData) string { +func testAccAzureRMKustoCluster_update(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" diff --git a/website/docs/r/kusto_cluster.html.markdown b/website/docs/r/kusto_cluster.html.markdown index e3589ab74f0e8..330a8d0febc57 100644 --- a/website/docs/r/kusto_cluster.html.markdown +++ b/website/docs/r/kusto_cluster.html.markdown @@ -60,6 +60,7 @@ A `sku` block supports the following: * `capacity` - (Required) Specifies the node count for the cluster. Boundaries depend on the sku name. + ## Attributes Reference The following attributes are exported: @@ -72,6 +73,8 @@ The following attributes are exported: ## Timeouts + + The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: * `create` - (Defaults to 60 minutes) Used when creating the Kusto Cluster. From 5ac08834b2d67ca8f49f7c3eafc8b1e8e1878e2f Mon Sep 17 00:00:00 2001 From: njucz <740360112@qq.com> Date: Thu, 27 Feb 2020 16:07:52 +0800 Subject: [PATCH 405/498] update --- .../services/automation/resource_arm_automation_schedule.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/azurerm/internal/services/automation/resource_arm_automation_schedule.go b/azurerm/internal/services/automation/resource_arm_automation_schedule.go index da4b12fc03a19..c2be124ebfa21 100644 --- a/azurerm/internal/services/automation/resource_arm_automation_schedule.go +++ b/azurerm/internal/services/automation/resource_arm_automation_schedule.go @@ -82,7 +82,7 @@ func resourceArmAutomationSchedule() *schema.Resource { Optional: true, Computed: true, DiffSuppressFunc: suppress.RFC3339Time, - ValidateFunc: validate.RFC3339DateInFutureBy(time.Duration(5) * time.Minute), + ValidateFunc: validate.RFC3339Time, //defaults to now + 7 minutes in create function if not set }, @@ -240,6 +240,10 @@ func resourceArmAutomationScheduleCreateUpdate(d *schema.ResourceData, meta inte //start time can default to now + 7 (5 could be invalid by the time the API is called) if v, ok := d.GetOk("start_time"); ok { t, _ := time.Parse(time.RFC3339, v.(string)) //should be validated by the schema + duration := time.Duration(5) * time.Minute + if time.Until(t) < duration { + return fmt.Errorf("start_time is %q and should be at least %q in the future", t, duration) + } properties.StartTime = &date.Time{Time: t} } else { properties.StartTime = &date.Time{Time: time.Now().Add(time.Duration(7) * time.Minute)} From 5709cfe4aa6ba619c7c45dbf8c55b92e809bb809 Mon Sep 17 00:00:00 2001 From: Marc Denman Date: Thu, 27 Feb 2020 10:35:45 +0000 Subject: [PATCH 406/498] Update vmss extension type_handler_version docs --- .../docs/r/virtual_machine_scale_set_extension.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/virtual_machine_scale_set_extension.html.markdown b/website/docs/r/virtual_machine_scale_set_extension.html.markdown index 9eb9724ef2645..cec5f85492c63 100644 --- a/website/docs/r/virtual_machine_scale_set_extension.html.markdown +++ b/website/docs/r/virtual_machine_scale_set_extension.html.markdown @@ -45,7 +45,7 @@ The following arguments are supported: * `type` - (Required) Specifies the Type of the Extension. Changing this forces a new resource to be created. -* `type_handler_version` - (Required) Specifies the version of the Script Handler which should be used. +* `type_handler_version` - (Required) Specifies the version of the extension to use, available versions can be found using the Azure CLI. --- From ef71ab945ba99f16959fceeb9e8cfcac9fa981fe Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 27 Feb 2020 12:14:12 -0800 Subject: [PATCH 407/498] run upgrade012 on all acc tests --- .../analysis_services_server_resource_test.go | 50 +- .../data_source_api_management_api_test.go | 16 +- ...rce_api_management_api_version_set_test.go | 6 +- .../data_source_api_management_group_test.go | 14 +- ...data_source_api_management_product_test.go | 14 +- .../tests/data_source_api_management_test.go | 8 +- .../data_source_api_management_user_test.go | 14 +- ...pi_management_api_operation_policy_test.go | 27 +- ...e_arm_api_management_api_operation_test.go | 68 +- ...urce_arm_api_management_api_policy_test.go | 37 +- .../resource_arm_api_management_api_test.go | 68 +- ...arm_api_management_api_version_set_test.go | 32 +- ...pi_management_authorization_server_test.go | 28 +- ...esource_arm_api_management_backend_test.go | 50 +- ...rce_arm_api_management_certificate_test.go | 20 +- ...urce_arm_api_management_diagnostic_test.go | 16 +- .../resource_arm_api_management_group_test.go | 24 +- ...urce_arm_api_management_group_user_test.go | 28 +- ...i_management_identity_provider_aad_test.go | 26 +- ...agement_identity_provider_facebook_test.go | 24 +- ...anagement_identity_provider_google_test.go | 24 +- ...gement_identity_provider_microsoft_test.go | 24 +- ...nagement_identity_provider_twitter_test.go | 24 +- ...resource_arm_api_management_logger_test.go | 58 +- ...management_openid_connect_provider_test.go | 26 +- ...rce_arm_api_management_product_api_test.go | 28 +- ...e_arm_api_management_product_group_test.go | 28 +- ..._arm_api_management_product_policy_test.go | 37 +- ...esource_arm_api_management_product_test.go | 54 +- ...source_arm_api_management_property_test.go | 16 +- ...ce_arm_api_management_subscription_test.go | 46 +- .../tests/resource_arm_api_management_test.go | 53 +- .../resource_arm_api_management_user_test.go | 46 +- .../resource_arm_app_configuration_test.go | 25 +- .../data_source_application_insights_test.go | 8 +- ...pplication_insights_analytics_item_test.go | 22 +- ...e_arm_application_insights_api_key_test.go | 14 +- .../resource_arm_application_insights_test.go | 16 +- ..._arm_application_insights_webtests_test.go | 34 +- .../tests/data_source_role_definition_test.go | 15 +- .../resource_arm_role_assignment_test.go | 91 +- .../resource_arm_role_definition_test.go | 43 +- .../data_source_automation_account_test.go | 10 +- ...ta_source_automation_variable_bool_test.go | 6 +- ...ource_automation_variable_datetime_test.go | 6 +- ...ata_source_automation_variable_int_test.go | 6 +- ..._source_automation_variable_string_test.go | 6 +- .../resource_arm_automation_account_test.go | 14 +- ...resource_arm_automation_credential_test.go | 27 +- ...e_arm_automation_dsc_configuration_test.go | 12 +- ...m_automation_dsc_nodeconfiguration_test.go | 25 +- ...source_arm_automation_job_schedule_test.go | 41 +- .../resource_arm_automation_module_test.go | 28 +- .../resource_arm_automation_runbook_test.go | 39 +- .../resource_arm_automation_schedule_test.go | 36 +- ...ource_arm_automation_variable_bool_test.go | 18 +- ...e_arm_automation_variable_datetime_test.go | 16 +- ...source_arm_automation_variable_int_test.go | 16 +- ...rce_arm_automation_variable_string_test.go | 16 +- .../tests/data_source_batch_account_test.go | 22 +- .../data_source_batch_certificate_test.go | 16 +- .../tests/data_source_batch_pool_test.go | 40 +- .../tests/resource_arm_batch_account_test.go | 32 +- .../resource_arm_batch_application_test.go | 14 +- .../resource_arm_batch_certificate_test.go | 40 +- .../tests/resource_arm_batch_pool_test.go | 183 ++- .../resource_arm_bot_channel_email_test.go | 12 +- .../resource_arm_bot_channel_ms_teams_test.go | 12 +- .../resource_arm_bot_channel_slack_test.go | 12 +- ...urce_arm_bot_channels_registration_test.go | 31 +- .../tests/resource_arm_bot_connection_test.go | 18 +- .../tests/resource_arm_bot_web_app_test.go | 31 +- .../cdn/tests/data_source_cdn_profile_test.go | 16 +- .../tests/resource_arm_cdn_endpoint_test.go | 88 +- .../tests/resource_arm_cdn_profile_test.go | 32 +- .../resource_arm_cognitive_account_test.go | 20 +- .../data_source_availability_set_test.go | 8 +- .../data_source_dedicated_host_group_test.go | 4 +- .../data_source_disk_encryption_set_test.go | 4 +- .../compute/tests/data_source_image_test.go | 93 +- .../tests/data_source_managed_disk_test.go | 16 +- ...a_source_proximity_placement_group_test.go | 4 +- .../data_source_shared_image_gallery_test.go | 8 +- .../tests/data_source_shared_image_test.go | 12 +- .../data_source_shared_image_version_test.go | 8 +- .../tests/data_source_snapshot_test.go | 14 +- .../tests/data_source_virtual_machine_test.go | 30 +- .../resource_arm_availability_set_test.go | 36 +- .../resource_arm_dedicated_host_group_test.go | 14 +- .../compute/tests/resource_arm_image_test.go | 305 ++-- .../tests/resource_arm_managed_disk_test.go | 82 +- ...urce_arm_proximity_placement_group_test.go | 18 +- .../resource_arm_shared_image_gallery_test.go | 14 +- .../tests/resource_arm_shared_image_test.go | 30 +- .../resource_arm_shared_image_version_test.go | 60 +- .../tests/resource_arm_snapshot_test.go | 91 +- ...rtual_machine_data_disk_attachment_test.go | 120 +- ...urce_arm_virtual_machine_extension_test.go | 119 +- ..._arm_virtual_machine_managed_disks_test.go | 442 +++--- ...urce_arm_virtual_machine_scale_set_test.go | 1040 ++++++------- .../resource_arm_virtual_machine_test.go | 149 +- ...rm_virtual_machine_unmanaged_disks_test.go | 674 ++++----- .../data_source_container_registry_test.go | 4 +- .../data_source_kubernetes_cluster_test.go | 80 +- .../resource_arm_container_group_test.go | 68 +- .../resource_arm_container_registry_test.go | 69 +- ...source_arm_kubernetes_cluster_auth_test.go | 4 +- ...ource_arm_kubernetes_cluster_other_test.go | 4 +- .../data_source_cosmos_db_account_test.go | 8 +- ...urce_arm_cosmosdb_account_failover_test.go | 42 +- .../resource_arm_cosmosdb_account_test.go | 65 +- ...ce_arm_cosmosdb_cassandra_keyspace_test.go | 8 +- ...urce_arm_cosmosdb_gremlin_database_test.go | 14 +- ...esource_arm_cosmosdb_gremlin_graph_test.go | 34 +- ...urce_arm_cosmosdb_mongo_collection_test.go | 24 +- ...source_arm_cosmosdb_mongo_database_test.go | 8 +- ...esource_arm_cosmosdb_sql_container_test.go | 22 +- ...resource_arm_cosmosdb_sql_database_test.go | 8 +- .../tests/resource_arm_cosmosdb_table_test.go | 8 +- .../resource_arm_databricks_workspace_test.go | 50 +- .../tests/data_source_data_factory_test.go | 4 +- ...rce_arm_data_factory_dataset_mysql_test.go | 42 +- ...rm_data_factory_dataset_postgresql_test.go | 42 +- ...a_factory_dataset_sql_server_table_test.go | 42 +- ...ked_service_data_lake_storage_gen2_test.go | 39 +- ..._data_factory_linked_service_mysql_test.go | 24 +- ..._factory_linked_service_postgresql_test.go | 24 +- ..._factory_linked_service_sql_server_test.go | 16 +- ...resource_arm_data_factory_pipeline_test.go | 24 +- .../tests/resource_arm_data_factory_test.go | 24 +- ..._arm_data_factory_trigger_schedule_test.go | 30 +- .../tests/data_source_data_lake_store_test.go | 12 +- ...ce_arm_data_lake_analytics_account_test.go | 32 +- ..._data_lake_analytics_firewall_rule_test.go | 24 +- .../resource_arm_data_lake_store_file_test.go | 12 +- ..._arm_data_lake_store_firewall_rule_test.go | 18 +- .../resource_arm_data_lake_store_test.go | 30 +- .../tests/data_source_dev_test_lab_test.go | 16 +- ...ta_source_dev_test_virtual_network_test.go | 16 +- ...resource_arm_dev_test_lab_schedule_test.go | 68 +- .../tests/resource_arm_dev_test_lab_test.go | 14 +- ...arm_dev_test_linux_virtual_machine_test.go | 70 +- .../resource_arm_dev_test_policy_test.go | 22 +- ...ource_arm_dev_test_virtual_network_test.go | 22 +- ...m_dev_test_windows_virtual_machine_test.go | 60 +- .../dns/tests/data_source_dns_zone_test.go | 16 +- .../tests/resource_arm_dns_a_record_test.go | 72 +- .../resource_arm_dns_aaaa_record_test.go | 78 +- .../tests/resource_arm_dns_caa_record_test.go | 30 +- .../resource_arm_dns_cname_record_test.go | 78 +- .../tests/resource_arm_dns_mx_record_test.go | 36 +- .../tests/resource_arm_dns_ns_record_test.go | 30 +- .../tests/resource_arm_dns_ptr_record_test.go | 30 +- .../tests/resource_arm_dns_srv_record_test.go | 30 +- .../tests/resource_arm_dns_txt_record_test.go | 30 +- .../dns/tests/resource_arm_dns_zone_test.go | 10 +- .../tests/data_source_eventgrid_topic_test.go | 4 +- .../resource_arm_eventgrid_domain_test.go | 12 +- ...e_arm_eventgrid_event_subscription_test.go | 34 +- .../resource_arm_eventgrid_topic_test.go | 14 +- ...source_eventhub_authorization_rule_test.go | 8 +- ...ata_source_eventhub_consumer_group_test.go | 22 +- ...nthub_namespace_authorization_rule_test.go | 14 +- .../data_source_eventhub_namespace_test.go | 16 +- ...ce_arm_eventhub_authorization_rule_test.go | 28 +- ...source_arm_eventhub_consumer_group_test.go | 36 +- ...nthub_namespace_authorization_rule_test.go | 20 +- ...namespace_disaster_recovery_config_test.go | 49 +- .../tests/resource_arm_eventhub_test.go | 60 +- .../data_source_hdinsight_cluster_test.go | 32 +- ...ource_arm_hdinsight_hadoop_cluster_test.go | 195 ++- ...source_arm_hdinsight_hbase_cluster_test.go | 170 ++- ...dinsight_interactive_query_cluster_test.go | 170 ++- ...source_arm_hdinsight_kafka_cluster_test.go | 171 ++- ..._arm_hdinsight_ml_services_cluster_test.go | 185 ++- ...urce_arm_hdinsight_rserver_cluster_test.go | 185 ++- ...source_arm_hdinsight_spark_cluster_test.go | 170 ++- ...source_arm_hdinsight_storm_cluster_test.go | 170 ++- .../data_source_healthcare_service_test.go | 6 +- .../resource_arm_healthcare_service_test.go | 18 +- ...ce_iothub_dps_shared_access_policy_test.go | 17 +- .../tests/data_source_iothub_dps_test.go | 4 +- ...source_iothub_shared_access_policy_test.go | 6 +- ...resource_arm_iothub_consumer_group_test.go | 16 +- ...esource_arm_iothub_dps_certificate_test.go | 28 +- ...rm_iothub_dps_shared_access_policy_test.go | 40 +- .../tests/resource_arm_iothub_dps_test.go | 28 +- ...ource_arm_iothub_endpoint_eventhub_test.go | 30 +- ...m_iothub_endpoint_servicebus_queue_test.go | 31 +- ...m_iothub_endpoint_servicebus_topic_test.go | 30 +- ..._iothub_endpoint_storage_container_test.go | 22 +- ...resource_arm_iothub_fallback_route_test.go | 48 +- .../tests/resource_arm_iothub_route_test.go | 60 +- ...ce_arm_iothub_shared_access_policy_test.go | 20 +- .../iothub/tests/resource_arm_iothub_test.go | 66 +- .../tests/data_source_key_vault_key_test.go | 4 +- .../data_source_key_vault_secret_test.go | 8 +- .../tests/data_source_key_vault_test.go | 12 +- ...source_arm_key_vault_access_policy_test.go | 54 +- ...resource_arm_key_vault_certificate_test.go | 98 +- .../tests/resource_arm_key_vault_key_test.go | 109 +- .../resource_arm_key_vault_secret_test.go | 51 +- .../tests/resource_arm_key_vault_test.go | 159 +- .../tests/resource_arm_kusto_cluster_test.go | 16 +- ...arm_kusto_eventhub_data_connection_test.go | 36 +- ...ata_source_log_analytics_workspace_test.go | 4 +- ...e_arm_log_analytics_linked_service_test.go | 26 +- ...esource_arm_log_analytics_solution_test.go | 34 +- ...source_arm_log_analytics_workspace_test.go | 14 +- .../data_source_logic_app_workflow_test.go | 8 +- ...source_arm_logic_app_action_custom_test.go | 13 +- ...resource_arm_logic_app_action_http_test.go | 16 +- ...ource_arm_logic_app_trigger_custom_test.go | 13 +- ...arm_logic_app_trigger_http_request_test.go | 19 +- ...e_arm_logic_app_trigger_recurrence_test.go | 20 +- .../resource_arm_logic_app_workflow_test.go | 14 +- .../data_source_management_group_test.go | 2 +- .../resource_arm_management_group_test.go | 14 +- .../tests/data_source_mariadb_server_test.go | 8 +- .../resource_arm_mariadb_database_test.go | 18 +- ...resource_arm_mariadb_firewall_rule_test.go | 10 +- .../tests/resource_arm_mariadb_server_test.go | 38 +- ...e_arm_mariadb_virtual_network_rule_test.go | 112 +- ...esource_arm_media_services_account_test.go | 46 +- .../data_source_monitor_action_group_test.go | 12 +- ...urce_monitor_diagnostic_categories_test.go | 18 +- .../data_source_monitor_log_profile_test.go | 14 +- .../resource_arm_monitor_action_group_test.go | 55 +- ...rce_arm_monitor_activity_log_alert_test.go | 46 +- ...urce_arm_monitor_autoscale_setting_test.go | 94 +- ...rce_arm_monitor_diagnostic_setting_test.go | 84 +- .../resource_arm_monitor_log_profile_test.go | 34 +- .../resource_arm_monitor_metric_alert_test.go | 30 +- ...data_source_user_assigned_identity_test.go | 8 +- ...esource_arm_user_assigned_identity_test.go | 10 +- .../data_source_mssql_elasticpool_test.go | 16 +- .../resource_arm_mssql_elasticpool_test.go | 38 +- ...mssql_server_security_alert_policy_test.go | 6 +- .../resource_arm_mysql_configuration_test.go | 4 +- .../tests/resource_arm_mysql_database_test.go | 34 +- .../resource_arm_mysql_firewall_rule_test.go | 18 +- .../tests/resource_arm_mysql_server_test.go | 30 +- ...rce_arm_mysql_virtual_network_rule_test.go | 130 +- .../tests/data_source_netapp_account_test.go | 4 +- .../tests/data_source_netapp_pool_test.go | 6 +- .../tests/data_source_netapp_snapshot_test.go | 10 +- .../tests/data_source_netapp_volume_test.go | 8 +- .../tests/resource_arm_netapp_account_test.go | 14 +- .../tests/resource_arm_netapp_pool_test.go | 26 +- .../resource_arm_netapp_snapshot_test.go | 82 +- .../tests/resource_arm_netapp_volume_test.go | 72 +- ..._source_application_security_group_test.go | 16 +- .../data_source_express_route_circuit_test.go | 6 +- .../tests/data_source_firewall_test.go | 24 +- ..._loadbalancer_backend_address_pool_test.go | 4 +- .../tests/data_source_loadbalancer_test.go | 4 +- .../tests/data_source_nat_gateway_test.go | 8 +- ...ource_network_ddos_protection_plan_test.go | 4 +- ...data_source_network_security_group_test.go | 24 +- .../tests/data_source_network_watcher_test.go | 8 +- .../tests/data_source_public_ip_test.go | 16 +- .../tests/data_source_public_ips_test.go | 36 +- .../tests/data_source_route_table_test.go | 12 +- ...virtual_network_gateway_connection_test.go | 140 +- ...ata_source_virtual_network_gateway_test.go | 24 +- .../tests/data_source_virtual_network_test.go | 40 +- ...ecurity_group_association_resource_test.go | 12 +- .../resource_arm_application_gateway_test.go | 1333 ++++++++--------- ...rce_arm_application_security_group_test.go | 14 +- .../tests/resource_arm_bastion_host_test.go | 50 +- ...xpress_route_circuit_authorization_test.go | 26 +- ..._arm_express_route_circuit_peering_test.go | 40 +- ...resource_arm_express_route_circuit_test.go | 22 +- ...rewall_application_rule_collection_test.go | 46 +- ...e_arm_firewall_nat_rule_collection_test.go | 58 +- ...m_firewall_network_rule_collection_test.go | 38 +- .../tests/resource_arm_firewall_test.go | 116 +- ..._loadbalancer_backend_address_pool_test.go | 30 +- ...resource_arm_loadbalancer_nat_pool_test.go | 68 +- ...resource_arm_loadbalancer_nat_rule_test.go | 18 +- ...rce_arm_loadbalancer_outbound_rule_test.go | 128 +- .../resource_arm_loadbalancer_probe_test.go | 94 +- .../resource_arm_loadbalancer_rule_test.go | 18 +- .../tests/resource_arm_loadbalancer_test.go | 82 +- ...resource_arm_local_network_gateway_test.go | 22 +- .../tests/resource_arm_nat_gateway_test.go | 20 +- ...rce_arm_network_connection_monitor_test.go | 90 +- ...e_arm_network_ddos_protection_plan_test.go | 18 +- ...ce_application_gateway_association_test.go | 52 +- ...e_backend_address_pool_association_test.go | 28 +- ...ork_interface_nat_rule_association_test.go | 28 +- .../resource_arm_network_interface_test.go | 4 +- ...esource_arm_network_packet_capture_test.go | 54 +- .../resource_arm_network_profile_test.go | 54 +- ...esource_arm_network_security_group_test.go | 50 +- ...resource_arm_network_security_rule_test.go | 78 +- ...ource_arm_network_watcher_flow_log_test.go | 90 +- .../resource_arm_network_watcher_test.go | 14 +- .../tests/resource_arm_packet_capture_test.go | 54 +- .../resource_arm_public_ip_prefix_test.go | 16 +- .../tests/resource_arm_public_ip_test.go | 90 +- .../tests/resource_arm_route_table_test.go | 42 +- .../network/tests/resource_arm_route_test.go | 34 +- ...network_security_group_association_test.go | 8 +- ...virtual_network_gateway_connection_test.go | 170 +-- ...source_arm_virtual_network_gateway_test.go | 233 +-- ...source_arm_virtual_network_peering_test.go | 50 +- .../resource_arm_virtual_network_test.go | 32 +- ...rm_web_application_firewall_policy_test.go | 8 +- ..._source_notification_hub_namespace_test.go | 4 +- .../data_source_notification_hub_test.go | 6 +- ...otification_hub_authorization_rule_test.go | 57 +- ...rce_arm_notification_hub_namespace_test.go | 12 +- .../resource_arm_notification_hub_test.go | 10 +- .../data_source_policy_definition_test.go | 10 +- .../resource_arm_policy_assignment_test.go | 35 +- .../resource_arm_policy_definition_test.go | 19 +- ...resource_arm_policy_set_definition_test.go | 18 +- .../data_source_postgresql_server_test.go | 4 +- ...ource_arm_postgresql_configuration_test.go | 8 +- .../resource_arm_postgresql_database_test.go | 42 +- ...ource_arm_postgresql_firewall_rule_test.go | 18 +- .../resource_arm_postgresql_server_test.go | 34 +- ...rm_postgresql_virtual_network_rule_test.go | 112 +- .../resource_arm_private_dns_a_record_test.go | 30 +- ...source_arm_private_dns_aaaa_record_test.go | 30 +- ...ource_arm_private_dns_cname_record_test.go | 36 +- ...resource_arm_private_dns_mx_record_test.go | 36 +- ...esource_arm_private_dns_ptr_record_test.go | 30 +- ...esource_arm_private_dns_srv_record_test.go | 30 +- .../resource_arm_private_dns_zone_test.go | 10 +- ...vate_dns_zone_virtual_network_link_test.go | 8 +- ...m_backup_container_storage_account_test.go | 14 +- ...ource_arm_backup_policy_file_share_test.go | 14 +- .../resource_arm_backup_policy_vm_test.go | 26 +- ...ce_arm_backup_protected_file_share_test.go | 46 +- .../resource_arm_backup_protected_vm_test.go | 104 +- ...source_arm_recovery_services_vault_test.go | 16 +- .../resource_arm_site_recovery_fabric_test.go | 10 +- ..._arm_site_recovery_network_mapping_test.go | 36 +- ...overy_protection_container_mapping_test.go | 48 +- ...site_recovery_protection_container_test.go | 17 +- ...ce_arm_site_recovery_replicated_vm_test.go | 122 +- ...m_site_recovery_replication_policy_test.go | 12 +- .../tests/data_source_redis_cache_test.go | 4 +- .../tests/resource_arm_redis_cache_test.go | 151 +- .../resource_arm_redis_firewall_rule_test.go | 30 +- ...source_arm_relay_hybrid_connection_test.go | 24 +- .../resource_arm_relay_namespace_test.go | 14 +- .../tests/data_source_resource_group_test.go | 2 +- .../tests/data_source_resources_test.go | 14 +- .../resource_arm_management_lock_test.go | 36 +- .../tests/resource_arm_resource_group_test.go | 4 +- .../resource_arm_template_deployment_test.go | 40 +- .../tests/resource_arm_search_service_test.go | 16 +- ...rce_arm_advanced_threat_protection_test.go | 20 +- ...source_arm_security_center_contact_test.go | 8 +- ...urce_arm_security_center_workspace_test.go | 16 +- ...cebus_namespace_authorization_rule_test.go | 6 +- .../data_source_servicebus_namespace_test.go | 8 +- ...cebus_namespace_authorization_rule_test.go | 20 +- .../resource_arm_servicebus_namespace_test.go | 32 +- ...ervicebus_queue_authorization_rule_test.go | 30 +- .../resource_arm_servicebus_queue_test.go | 94 +- ...e_arm_servicebus_subscription_rule_test.go | 84 +- ...source_arm_servicebus_subscription_test.go | 11 +- ...ervicebus_topic_authorization_rule_test.go | 30 +- .../resource_arm_servicebus_topic_test.go | 70 +- ...esource_arm_service_fabric_cluster_test.go | 122 +- .../tests/data_source_signalr_service_test.go | 4 +- .../resource_arm_signalr_service_test.go | 22 +- .../services/sql/resource_arm_sql_database.go | 6 + .../tests/data_source_sql_database_test.go | 18 +- .../sql/tests/data_source_sql_server_test.go | 4 +- .../resource_arm_sql_administrator_test.go | 40 +- .../tests/resource_arm_sql_database_test.go | 152 +- .../resource_arm_sql_elasticpool_test.go | 34 +- .../resource_arm_sql_failover_group_test.go | 74 +- .../resource_arm_sql_firewall_rule_test.go | 26 +- .../sql/tests/resource_arm_sql_server_test.go | 28 +- ...ource_arm_sql_virtual_network_rule_test.go | 168 +-- ...storage_account_blob_container_sas_test.go | 10 +- .../data_source_storage_account_sas_test.go | 6 +- .../tests/data_source_storage_account_test.go | 14 +- ...a_source_storage_management_policy_test.go | 8 +- ..._arm_storage_account_network_rules_test.go | 48 +- .../resource_arm_storage_account_test.go | 140 +- .../tests/resource_arm_storage_blob_test.go | 137 +- .../resource_arm_storage_container_test.go | 30 +- ..._storage_data_lake_gen2_filesystem_test.go | 4 +- ...urce_arm_storage_management_policy_test.go | 18 +- .../tests/resource_arm_storage_queue_test.go | 18 +- ...source_arm_storage_share_directory_test.go | 36 +- .../tests/resource_arm_storage_share_test.go | 20 +- .../resource_arm_storage_table_entity_test.go | 18 +- .../tests/resource_arm_storage_table_test.go | 22 +- .../data_source_stream_analytics_job_test.go | 4 +- ..._analytics_function_javascript_udf_test.go | 15 +- .../resource_arm_stream_analytics_job_test.go | 39 +- ...e_arm_stream_analytics_output_blob_test.go | 85 +- ...m_stream_analytics_output_eventhub_test.go | 85 +- ..._arm_stream_analytics_output_mssql_test.go | 55 +- ..._analytics_output_servicebus_queue_test.go | 85 +- ..._analytics_output_servicebus_topic_test.go | 85 +- ...eam_analytics_reference_input_blob_test.go | 73 +- ...stream_analytics_stream_input_blob_test.go | 57 +- ...am_analytics_stream_input_eventhub_test.go | 106 +- ...ream_analytics_stream_input_iothub_test.go | 45 +- ...ource_arm_traffic_manager_endpoint_test.go | 166 +- ...source_arm_traffic_manager_profile_test.go | 14 +- ...urce_app_service_certificate_order_test.go | 12 +- ...ata_source_app_service_certificate_test.go | 4 +- .../data_source_app_service_plan_test.go | 32 +- .../web/tests/data_source_app_service_test.go | 40 +- .../tests/data_source_function_app_test.go | 12 +- ...source_arm_app_service_active_slot_test.go | 88 +- ..._arm_app_service_certificate_order_test.go | 16 +- ...pp_service_custom_hostname_binding_test.go | 65 +- .../resource_arm_app_service_plan_test.go | 52 +- .../resource_arm_app_service_slot_test.go | 860 +++++------ .../tests/resource_arm_app_service_test.go | 632 ++++---- ...ervice_virtual_network_association_test.go | 32 +- .../tests/resource_arm_function_app_test.go | 484 +++--- 423 files changed, 11160 insertions(+), 10475 deletions(-) diff --git a/azurerm/internal/services/analysisservices/tests/analysis_services_server_resource_test.go b/azurerm/internal/services/analysisservices/tests/analysis_services_server_resource_test.go index 53686c49f569f..198991e59440d 100644 --- a/azurerm/internal/services/analysisservices/tests/analysis_services_server_resource_test.go +++ b/azurerm/internal/services/analysisservices/tests/analysis_services_server_resource_test.go @@ -218,8 +218,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_analysis_services_server" "test" { name = "acctestass%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku = "B1" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) @@ -234,8 +234,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_analysis_services_server" "test" { name = "acctestass%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku = "B1" tags = { @@ -254,8 +254,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_analysis_services_server" "test" { name = "acctestass%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku = "B1" tags = { @@ -275,8 +275,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_analysis_services_server" "test" { name = "acctestass%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku = "B1" querypool_connection_mode = "%s" } @@ -292,8 +292,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_analysis_services_server" "test" { name = "acctestass%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku = "B1" enable_power_bi_service = %t } @@ -309,8 +309,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_analysis_services_server" "test" { name = "acctestass%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku = "B1" enable_power_bi_service = %t @@ -332,8 +332,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_analysis_services_server" "test" { name = "acctestass%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku = "B1" enable_power_bi_service = %t @@ -361,8 +361,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_analysis_services_server" "test" { name = "acctestass%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku = "B1" admin_users = ["%s"] } @@ -378,8 +378,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_analysis_services_server" "test" { name = "acctestass%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku = "B1" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) @@ -394,8 +394,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_storage_account" "test" { name = "acctestass%s" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location account_kind = "BlobStorage" account_tier = "Standard" account_replication_type = "LRS" @@ -403,13 +403,13 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "assbackup" - storage_account_name = "${azurerm_storage_account.test.name}" + storage_account_name = azurerm_storage_account.test.name container_access_type = "private" } data "azurerm_storage_account_blob_container_sas" "test" { - connection_string = "${azurerm_storage_account.test.primary_connection_string}" - container_name = "${azurerm_storage_container.test.name}" + connection_string = azurerm_storage_account.test.primary_connection_string + container_name = azurerm_storage_container.test.name https_only = true start = "2018-06-01" @@ -427,8 +427,8 @@ data "azurerm_storage_account_blob_container_sas" "test" { resource "azurerm_analysis_services_server" "test" { name = "acctestass%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku = "B1" backup_blob_container_uri = "${azurerm_storage_account.test.primary_blob_endpoint}${azurerm_storage_container.test.name}${data.azurerm_storage_account_blob_container_sas.test.sas}" diff --git a/azurerm/internal/services/apimanagement/tests/data_source_api_management_api_test.go b/azurerm/internal/services/apimanagement/tests/data_source_api_management_api_test.go index d08c94c5f9755..a1b8aa4b16022 100644 --- a/azurerm/internal/services/apimanagement/tests/data_source_api_management_api_test.go +++ b/azurerm/internal/services/apimanagement/tests/data_source_api_management_api_test.go @@ -63,10 +63,10 @@ func testAccDataSourceApiManagementApi_basic(data acceptance.TestData) string { %s data "azurerm_api_management_api" "test" { - name = "${azurerm_api_management_api.test.name}" - api_management_name = "${azurerm_api_management_api.test.api_management_name}" - resource_group_name = "${azurerm_api_management_api.test.resource_group_name}" - revision = "${azurerm_api_management_api.test.revision}" + name = azurerm_api_management_api.test.name + api_management_name = azurerm_api_management_api.test.api_management_name + resource_group_name = azurerm_api_management_api.test.resource_group_name + revision = azurerm_api_management_api.test.revision } `, template) } @@ -77,10 +77,10 @@ func testAccDataSourceApiManagementApi_complete(data acceptance.TestData) string %s data "azurerm_api_management_api" "test" { - name = "${azurerm_api_management_api.test.name}" - api_management_name = "${azurerm_api_management_api.test.api_management_name}" - resource_group_name = "${azurerm_api_management_api.test.resource_group_name}" - revision = "${azurerm_api_management_api.test.revision}" + name = azurerm_api_management_api.test.name + api_management_name = azurerm_api_management_api.test.api_management_name + resource_group_name = azurerm_api_management_api.test.resource_group_name + revision = azurerm_api_management_api.test.revision } `, template) } diff --git a/azurerm/internal/services/apimanagement/tests/data_source_api_management_api_version_set_test.go b/azurerm/internal/services/apimanagement/tests/data_source_api_management_api_version_set_test.go index 2c5005bfda88f..b5ed626b090a7 100644 --- a/azurerm/internal/services/apimanagement/tests/data_source_api_management_api_version_set_test.go +++ b/azurerm/internal/services/apimanagement/tests/data_source_api_management_api_version_set_test.go @@ -33,9 +33,9 @@ func testAccDataSourceApiManagementApiVersionSet_basic(data acceptance.TestData) %s data "azurerm_api_management_api_version_set" "test" { - name = "${azurerm_api_management_api_version_set.test.name}" - resource_group_name = "${azurerm_api_management_api_version_set.test.resource_group_name}" - api_management_name = "${azurerm_api_management_api_version_set.test.api_management_name}" + name = azurerm_api_management_api_version_set.test.name + resource_group_name = azurerm_api_management_api_version_set.test.resource_group_name + api_management_name = azurerm_api_management_api_version_set.test.api_management_name } `, config) } diff --git a/azurerm/internal/services/apimanagement/tests/data_source_api_management_group_test.go b/azurerm/internal/services/apimanagement/tests/data_source_api_management_group_test.go index 91cc90ac5597c..64662b2796ac2 100644 --- a/azurerm/internal/services/apimanagement/tests/data_source_api_management_group_test.go +++ b/azurerm/internal/services/apimanagement/tests/data_source_api_management_group_test.go @@ -37,8 +37,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" @@ -46,15 +46,15 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_group" "test" { name = "acctestAMGroup-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name display_name = "Test Group" } data "azurerm_api_management_group" "test" { - name = "${azurerm_api_management_group.test.name}" - api_management_name = "${azurerm_api_management_group.test.api_management_name}" - resource_group_name = "${azurerm_api_management_group.test.resource_group_name}" + name = azurerm_api_management_group.test.name + api_management_name = azurerm_api_management_group.test.api_management_name + resource_group_name = azurerm_api_management_group.test.resource_group_name } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) } diff --git a/azurerm/internal/services/apimanagement/tests/data_source_api_management_product_test.go b/azurerm/internal/services/apimanagement/tests/data_source_api_management_product_test.go index 58d0a5d663c1f..f4f5af2ad70e4 100644 --- a/azurerm/internal/services/apimanagement/tests/data_source_api_management_product_test.go +++ b/azurerm/internal/services/apimanagement/tests/data_source_api_management_product_test.go @@ -43,14 +43,14 @@ resource "azurerm_api_management" "test" { publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name } resource "azurerm_api_management_product" "test" { product_id = "test-product" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name display_name = "Test Product" subscription_required = true approval_required = true @@ -61,9 +61,9 @@ resource "azurerm_api_management_product" "test" { } data "azurerm_api_management_product" "test" { - product_id = "${azurerm_api_management_product.test.product_id}" - api_management_name = "${azurerm_api_management_product.test.api_management_name}" - resource_group_name = "${azurerm_api_management_product.test.resource_group_name}" + product_id = azurerm_api_management_product.test.product_id + api_management_name = azurerm_api_management_product.test.api_management_name + resource_group_name = azurerm_api_management_product.test.resource_group_name } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } diff --git a/azurerm/internal/services/apimanagement/tests/data_source_api_management_test.go b/azurerm/internal/services/apimanagement/tests/data_source_api_management_test.go index aeca7634a929f..6063cd7ca5bc8 100644 --- a/azurerm/internal/services/apimanagement/tests/data_source_api_management_test.go +++ b/azurerm/internal/services/apimanagement/tests/data_source_api_management_test.go @@ -43,13 +43,13 @@ resource "azurerm_api_management" "test" { publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name } data "azurerm_api_management" "test" { - name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_api_management.test.resource_group_name}" + name = azurerm_api_management.test.name + resource_group_name = azurerm_api_management.test.resource_group_name } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } diff --git a/azurerm/internal/services/apimanagement/tests/data_source_api_management_user_test.go b/azurerm/internal/services/apimanagement/tests/data_source_api_management_user_test.go index ed655416f8e53..cecd7a4c12073 100644 --- a/azurerm/internal/services/apimanagement/tests/data_source_api_management_user_test.go +++ b/azurerm/internal/services/apimanagement/tests/data_source_api_management_user_test.go @@ -42,14 +42,14 @@ resource "azurerm_api_management" "test" { publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name } resource "azurerm_api_management_user" "test" { user_id = "test-user" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name first_name = "Acceptance" last_name = "Test" email = "azure-acctest%d@example.com" @@ -58,9 +58,9 @@ resource "azurerm_api_management_user" "test" { } data "azurerm_api_management_user" "test" { - user_id = "${azurerm_api_management_user.test.user_id}" - api_management_name = "${azurerm_api_management_user.test.api_management_name}" - resource_group_name = "${azurerm_api_management_user.test.resource_group_name}" + user_id = azurerm_api_management_user.test.user_id + api_management_name = azurerm_api_management_user.test.api_management_name + resource_group_name = azurerm_api_management_user.test.resource_group_name } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) } diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_policy_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_policy_test.go index f2a6b6ecb6056..9743d0aed9ae9 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_policy_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_policy_test.go @@ -154,10 +154,10 @@ func testAccAzureRMApiManagementAPIOperationPolicy_basic(data acceptance.TestDat %s resource "azurerm_api_management_api_operation_policy" "test" { - api_name = "${azurerm_api_management_api.test.name}" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - operation_id = "${azurerm_api_management_api_operation.test.operation_id}" + api_name = azurerm_api_management_api.test.name + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name + operation_id = azurerm_api_management_api_operation.test.operation_id xml_link = "https://gist.githubusercontent.com/riordanp/ca22f8113afae0eb38cc12d718fd048d/raw/d6ac89a2f35a6881a7729f8cb4883179dc88eea1/example.xml" } `, template) @@ -169,11 +169,11 @@ func testAccAzureRMApiManagementAPIOperationPolicy_requiresImport(data acceptanc %s resource "azurerm_api_management_api_operation_policy" "import" { - api_name = "${azurerm_api_management_api_policy.test.api_name}" - api_management_name = "${azurerm_api_management_api_policy.test.api_management_name}" - resource_group_name = "${azurerm_api_management_api_policy.test.resource_group_name}" - operation_id = "${azurerm_api_management_api_operation.test.operation_id}" - xml_link = "${azurerm_api_management_api_policy.test.xml_link}" + api_name = azurerm_api_management_api_policy.test.api_name + api_management_name = azurerm_api_management_api_policy.test.api_management_name + resource_group_name = azurerm_api_management_api_policy.test.resource_group_name + operation_id = azurerm_api_management_api_operation.test.operation_id + xml_link = azurerm_api_management_api_policy.test.xml_link } `, template) } @@ -184,10 +184,10 @@ func testAccAzureRMApiManagementAPIOperationPolicy_updated(data acceptance.TestD %s resource "azurerm_api_management_api_operation_policy" "test" { - api_name = "${azurerm_api_management_api.test.name}" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - operation_id = "${azurerm_api_management_api_operation.test.operation_id}" + api_name = azurerm_api_management_api.test.name + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name + operation_id = azurerm_api_management_api_operation.test.operation_id xml_content = < @@ -197,6 +197,7 @@ resource "azurerm_api_management_api_operation_policy" "test" { XML + } `, template) } diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_test.go index b6f49aaf5039d..a46a00e50244c 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_test.go @@ -211,9 +211,9 @@ func testAccAzureRMApiManagementApiOperation_basic(data acceptance.TestData) str resource "azurerm_api_management_api_operation" "test" { operation_id = "acctest-operation" - api_name = "${azurerm_api_management_api.test.name}" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_name = azurerm_api_management_api.test.name + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name display_name = "DELETE Resource" method = "DELETE" url_template = "/resource" @@ -228,9 +228,9 @@ func testAccAzureRMApiManagementApiOperation_customMethod(data acceptance.TestDa resource "azurerm_api_management_api_operation" "test" { operation_id = "acctest-operation" - api_name = "${azurerm_api_management_api.test.name}" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_name = azurerm_api_management_api.test.name + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name display_name = "HAMMERTIME Resource" method = "HAMMERTIME" url_template = "/resource" @@ -244,13 +244,13 @@ func testAccAzureRMApiManagementApiOperation_requiresImport(data acceptance.Test %s resource "azurerm_api_management_api_operation" "import" { - operation_id = "${azurerm_api_management_api_operation.test.operation_id}" - api_name = "${azurerm_api_management_api_operation.test.api_name}" - api_management_name = "${azurerm_api_management_api_operation.test.api_management_name}" - resource_group_name = "${azurerm_api_management_api_operation.test.resource_group_name}" - display_name = "${azurerm_api_management_api_operation.test.display_name}" - method = "${azurerm_api_management_api_operation.test.method}" - url_template = "${azurerm_api_management_api_operation.test.url_template}" + operation_id = azurerm_api_management_api_operation.test.operation_id + api_name = azurerm_api_management_api_operation.test.api_name + api_management_name = azurerm_api_management_api_operation.test.api_management_name + resource_group_name = azurerm_api_management_api_operation.test.resource_group_name + display_name = azurerm_api_management_api_operation.test.display_name + method = azurerm_api_management_api_operation.test.method + url_template = azurerm_api_management_api_operation.test.url_template } `, template) } @@ -262,9 +262,9 @@ func testAccAzureRMApiManagementApiOperation_requestRepresentation(data acceptan resource "azurerm_api_management_api_operation" "test" { operation_id = "acctest-operation" - api_name = "${azurerm_api_management_api.test.name}" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_name = azurerm_api_management_api.test.name + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name display_name = "Acceptance Test Operation" method = "DELETE" url_template = "/user1" @@ -289,9 +289,9 @@ func testAccAzureRMApiManagementApiOperation_requestRepresentationUpdated(data a resource "azurerm_api_management_api_operation" "test" { operation_id = "acctest-operation" - api_name = "${azurerm_api_management_api.test.name}" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_name = azurerm_api_management_api.test.name + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name display_name = "Acceptance Test Operation" method = "DELETE" url_template = "/user1" @@ -316,9 +316,9 @@ func testAccAzureRMApiManagementApiOperation_headers(data acceptance.TestData) s resource "azurerm_api_management_api_operation" "test" { operation_id = "acctest-operation" - api_name = "${azurerm_api_management_api.test.name}" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_name = azurerm_api_management_api.test.name + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name display_name = "Acceptance Test Operation" method = "DELETE" url_template = "/user1" @@ -362,6 +362,7 @@ resource "azurerm_api_management_api_operation" "test" { SAMPLE + } } } @@ -375,9 +376,9 @@ func testAccAzureRMApiManagementApiOperation_representation(data acceptance.Test resource "azurerm_api_management_api_operation" "test" { operation_id = "acctest-operation" - api_name = "${azurerm_api_management_api.test.name}" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_name = azurerm_api_management_api.test.name + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name display_name = "Acceptance Test Operation" method = "DELETE" url_template = "/user1" @@ -409,6 +410,7 @@ resource "azurerm_api_management_api_operation" "test" { SAMPLE + } } } @@ -422,9 +424,9 @@ func testAccAzureRMApiManagementApiOperation_representationUpdated(data acceptan resource "azurerm_api_management_api_operation" "test" { operation_id = "acctest-operation" - api_name = "${azurerm_api_management_api.test.name}" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_name = azurerm_api_management_api.test.name + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name display_name = "Acceptance Test Operation" method = "DELETE" url_template = "/user1" @@ -456,6 +458,7 @@ resource "azurerm_api_management_api_operation" "test" { SAMPLE + } representation { @@ -477,6 +480,7 @@ SAMPLE } } SAMPLE + } } } @@ -492,8 +496,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" @@ -501,8 +505,8 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_api" "test" { name = "acctestapi-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name display_name = "Butter Parser" path = "butter-parser" protocols = ["https", "http"] diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_policy_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_policy_test.go index 43d008e446358..52d48662e6f43 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_policy_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_policy_test.go @@ -178,8 +178,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" @@ -187,8 +187,8 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_api" "test" { name = "acctestapi-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name display_name = "api1" path = "api1" protocols = ["https"] @@ -196,9 +196,9 @@ resource "azurerm_api_management_api" "test" { } resource "azurerm_api_management_api_policy" "test" { - api_name = "${azurerm_api_management_api.test.name}" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_name = azurerm_api_management_api.test.name + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name xml_link = "https://gist.githubusercontent.com/riordanp/ca22f8113afae0eb38cc12d718fd048d/raw/d6ac89a2f35a6881a7729f8cb4883179dc88eea1/example.xml" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) @@ -210,10 +210,10 @@ func testAccAzureRMApiManagementAPIPolicy_requiresImport(data acceptance.TestDat %s resource "azurerm_api_management_api_policy" "import" { - api_name = "${azurerm_api_management_api_policy.test.api_name}" - api_management_name = "${azurerm_api_management_api_policy.test.api_management_name}" - resource_group_name = "${azurerm_api_management_api_policy.test.resource_group_name}" - xml_link = "${azurerm_api_management_api_policy.test.xml_link}" + api_name = azurerm_api_management_api_policy.test.api_name + api_management_name = azurerm_api_management_api_policy.test.api_management_name + resource_group_name = azurerm_api_management_api_policy.test.resource_group_name + xml_link = azurerm_api_management_api_policy.test.xml_link } `, template) } @@ -227,8 +227,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" @@ -236,8 +236,8 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_api" "test" { name = "acctestapi-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name display_name = "api1" path = "api1" protocols = ["https"] @@ -245,9 +245,9 @@ resource "azurerm_api_management_api" "test" { } resource "azurerm_api_management_api_policy" "test" { - api_name = "${azurerm_api_management_api.test.name}" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_name = azurerm_api_management_api.test.name + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name xml_content = < @@ -257,6 +257,7 @@ resource "azurerm_api_management_api_policy" "test" { XML + } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) } diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_test.go index e80dbbb7a1a55..5eed7ee7fb201 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_test.go @@ -344,8 +344,8 @@ func testAccAzureRMApiManagementApi_basic(data acceptance.TestData) string { resource "azurerm_api_management_api" "test" { name = "acctestapi-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name display_name = "api1" path = "api1" protocols = ["https"] @@ -362,8 +362,8 @@ func testAccAzureRMApiManagementApi_basicClassic(data acceptance.TestData) strin resource "azurerm_api_management_api" "test" { name = "acctestapi-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name display_name = "api1" path = "api1" protocols = ["https"] @@ -379,8 +379,8 @@ func testAccAzureRMApiManagementApi_blankPath(data acceptance.TestData) string { resource "azurerm_api_management_api" "test" { name = "acctestapi-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name display_name = "api1" path = "" protocols = ["https"] @@ -396,8 +396,8 @@ func testAccAzureRMApiManagementApi_wordRevision(data acceptance.TestData) strin resource "azurerm_api_management_api" "test" { name = "acctestapi-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name display_name = "api1" path = "api1" protocols = ["https"] @@ -413,8 +413,8 @@ func testAccAzureRMApiManagementApi_soapPassthrough(data acceptance.TestData) st resource "azurerm_api_management_api" "test" { name = "acctestapi-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name display_name = "api1" path = "api1" protocols = ["https"] @@ -430,13 +430,13 @@ func testAccAzureRMApiManagementApi_requiresImport(data acceptance.TestData) str %s resource "azurerm_api_management_api" "import" { - name = "${azurerm_api_management_api.test.name}" - resource_group_name = "${azurerm_api_management_api.test.resource_group_name}" - api_management_name = "${azurerm_api_management_api.test.api_management_name}" - display_name = "${azurerm_api_management_api.test.display_name}" - path = "${azurerm_api_management_api.test.path}" - protocols = "${azurerm_api_management_api.test.protocols}" - revision = "${azurerm_api_management_api.test.revision}" + name = azurerm_api_management_api.test.name + resource_group_name = azurerm_api_management_api.test.resource_group_name + api_management_name = azurerm_api_management_api.test.api_management_name + display_name = azurerm_api_management_api.test.display_name + path = azurerm_api_management_api.test.path + protocols = azurerm_api_management_api.test.protocols + revision = azurerm_api_management_api.test.revision } `, template) } @@ -448,15 +448,15 @@ func testAccAzureRMApiManagementApi_importSwagger(data acceptance.TestData) stri resource "azurerm_api_management_api" "test" { name = "acctestapi-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name display_name = "api1" path = "api1" protocols = ["https"] revision = "1" import { - content_value = "${file("testdata/api_management_api_swagger.json")}" + content_value = file("testdata/api_management_api_swagger.json") content_format = "swagger-json" } } @@ -470,15 +470,15 @@ func testAccAzureRMApiManagementApi_importWsdl(data acceptance.TestData) string resource "azurerm_api_management_api" "test" { name = "acctestapi-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name display_name = "api1" path = "api1" protocols = ["https"] revision = "1" import { - content_value = "${file("testdata/api_management_api_wsdl.xml")}" + content_value = file("testdata/api_management_api_wsdl.xml") content_format = "wsdl" wsdl_selector { @@ -497,8 +497,8 @@ func testAccAzureRMApiManagementApi_complete(data acceptance.TestData) string { resource "azurerm_api_management_api" "test" { name = "acctestapi-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name display_name = "Butter Parser" path = "butter-parser" protocols = ["https", "http"] @@ -521,22 +521,22 @@ func testAccAzureRMApiManagementApi_versionSet(data acceptance.TestData) string resource "azurerm_api_management_api_version_set" "test" { name = "acctestAMAVS-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name display_name = "Butter Parser" versioning_scheme = "Segment" } resource "azurerm_api_management_api" "test" { name = "acctestapi-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name display_name = "api1" path = "api1" protocols = ["https"] revision = "1" version = "v1" - version_set_id = "${azurerm_api_management_api_version_set.test.id}" + version_set_id = azurerm_api_management_api_version_set.test.id } `, template, data.RandomInteger, data.RandomInteger) } @@ -550,8 +550,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" @@ -570,8 +570,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_version_set_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_version_set_test.go index 5cd88d2aa9452..fdf4f7792bbf5 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_version_set_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_version_set_test.go @@ -180,8 +180,8 @@ func testAccAzureRMApiManagementApiVersionSet_basic(data acceptance.TestData) st resource "azurerm_api_management_api_version_set" "test" { name = "acctestAMAVS-%d" - resource_group_name = "${azurerm_api_management.test.resource_group_name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_api_management.test.resource_group_name + api_management_name = azurerm_api_management.test.name description = "TestDescription1" display_name = "TestApiVersionSet1%d" versioning_scheme = "Segment" @@ -195,12 +195,12 @@ func testAccAzureRMApiManagementApiVersionSet_requiresImport(data acceptance.Tes %s resource "azurerm_api_management_api_version_set" "import" { - name = "${azurerm_api_management_api_version_set.test.name}" - resource_group_name = "${azurerm_api_management_api_version_set.test.resource_group_name}" - api_management_name = "${azurerm_api_management_api_version_set.test.api_management_name}" - description = "${azurerm_api_management_api_version_set.test.description}" - display_name = "${azurerm_api_management_api_version_set.test.display_name}" - versioning_scheme = "${azurerm_api_management_api_version_set.test.versioning_scheme}" + name = azurerm_api_management_api_version_set.test.name + resource_group_name = azurerm_api_management_api_version_set.test.resource_group_name + api_management_name = azurerm_api_management_api_version_set.test.api_management_name + description = azurerm_api_management_api_version_set.test.description + display_name = azurerm_api_management_api_version_set.test.display_name + versioning_scheme = azurerm_api_management_api_version_set.test.versioning_scheme } `, template) } @@ -212,8 +212,8 @@ func testAccAzureRMApiManagementApiVersionSet_header(data acceptance.TestData) s resource "azurerm_api_management_api_version_set" "test" { name = "acctestAMAVS-%d" - resource_group_name = "${azurerm_api_management.test.resource_group_name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_api_management.test.resource_group_name + api_management_name = azurerm_api_management.test.name description = "TestDescription1" display_name = "TestApiVersionSet1%d" versioning_scheme = "Header" @@ -229,8 +229,8 @@ func testAccAzureRMApiManagementApiVersionSet_query(data acceptance.TestData) st resource "azurerm_api_management_api_version_set" "test" { name = "acctestAMAVS-%d" - resource_group_name = "${azurerm_api_management.test.resource_group_name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_api_management.test.resource_group_name + api_management_name = azurerm_api_management.test.name description = "TestDescription1" display_name = "TestApiVersionSet1%d" versioning_scheme = "Query" @@ -246,8 +246,8 @@ func testAccAzureRMApiManagementApiVersionSet_update(data acceptance.TestData) s resource "azurerm_api_management_api_version_set" "test" { name = "acctestAMAVS-%d" - resource_group_name = "${azurerm_api_management.test.resource_group_name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_api_management.test.resource_group_name + api_management_name = azurerm_api_management.test.name description = "TestDescription2" display_name = "TestApiVersionSet2%d" versioning_scheme = "Segment" @@ -264,8 +264,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_authorization_server_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_authorization_server_test.go index 4f6f621c00763..5b97d4a197a31 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_authorization_server_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_authorization_server_test.go @@ -132,8 +132,8 @@ func testAccAzureRMAPIManagementAuthorizationServer_basic(data acceptance.TestDa resource "azurerm_api_management_authorization_server" "test" { name = "acctestauthsrv-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name display_name = "Test Group" authorization_endpoint = "https://azacctest.hashicorptest.com/client/authorize" client_id = "42424242-4242-4242-4242-424242424242" @@ -156,14 +156,14 @@ func testAccAzureRMAPIManagementAuthorizationServer_requiresImport(data acceptan %s resource "azurerm_api_management_authorization_server" "import" { - name = "${azurerm_api_management_authorization_server.test.name}" - resource_group_name = "${azurerm_api_management_authorization_server.test.resource_group_name}" - api_management_name = "${azurerm_api_management_authorization_server.test.api_management_name}" - display_name = "${azurerm_api_management_authorization_server.test.display_name}" - authorization_endpoint = "${azurerm_api_management_authorization_server.test.authorization_endpoint}" - client_id = "${azurerm_api_management_authorization_server.test.client_id}" - client_registration_endpoint = "${azurerm_api_management_authorization_server.test.client_registration_endpoint}" - grant_types = "${azurerm_api_management_authorization_server.test.grant_types}" + name = azurerm_api_management_authorization_server.test.name + resource_group_name = azurerm_api_management_authorization_server.test.resource_group_name + api_management_name = azurerm_api_management_authorization_server.test.api_management_name + display_name = azurerm_api_management_authorization_server.test.display_name + authorization_endpoint = azurerm_api_management_authorization_server.test.authorization_endpoint + client_id = azurerm_api_management_authorization_server.test.client_id + client_registration_endpoint = azurerm_api_management_authorization_server.test.client_registration_endpoint + grant_types = azurerm_api_management_authorization_server.test.grant_types authorization_methods = [ "GET", @@ -179,8 +179,8 @@ func testAccAzureRMAPIManagementAuthorizationServer_complete(data acceptance.Tes resource "azurerm_api_management_authorization_server" "test" { name = "acctestauthsrv-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name display_name = "Test Group" authorization_endpoint = "https://azacctest.hashicorptest.com/client/authorize" client_id = "42424242-4242-4242-4242-424242424242" @@ -218,8 +218,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_backend_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_backend_test.go index 33f50deae5a30..bd4fab4ea9231 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_backend_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_backend_test.go @@ -302,8 +302,8 @@ func testAccAzureRMApiManagementBackend_basic(data acceptance.TestData, testName resource "azurerm_api_management_backend" "test" { name = "acctestapi-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name protocol = "http" url = "https://acctest" } @@ -317,8 +317,8 @@ func testAccAzureRMApiManagementBackend_update(data acceptance.TestData) string resource "azurerm_api_management_backend" "test" { name = "acctestapi-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name protocol = "soap" url = "https://updatedacctest" description = "description" @@ -343,16 +343,16 @@ func testAccAzureRMApiManagementBackend_allProperties(data acceptance.TestData) resource "azurerm_api_management_certificate" "test" { name = "example-cert" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - data = "${filebase64("testdata/keyvaultcert.pfx")}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name + data = filebase64("testdata/keyvaultcert.pfx") password = "" } resource "azurerm_api_management_backend" "test" { name = "acctestapi-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name protocol = "http" url = "https://acctest" description = "description" @@ -364,7 +364,7 @@ resource "azurerm_api_management_backend" "test" { scheme = "scheme" } certificate = [ - "${azurerm_api_management_certificate.test.thumbprint}", + azurerm_api_management_certificate.test.thumbprint, ] header = { header1 = "header1value1,header1value2" @@ -395,20 +395,20 @@ func testAccAzureRMApiManagementBackend_serviceFabric(data acceptance.TestData) resource "azurerm_api_management_certificate" "test" { name = "example-cert" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - data = "${filebase64("testdata/keyvaultcert.pfx")}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name + data = filebase64("testdata/keyvaultcert.pfx") password = "" } resource "azurerm_api_management_backend" "test" { name = "acctestapi-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name protocol = "http" url = "https://acctest" service_fabric_cluster { - client_certificate_thumbprint = "${azurerm_api_management_certificate.test.thumbprint}" + client_certificate_thumbprint = azurerm_api_management_certificate.test.thumbprint management_endpoints = [ "https://acctestsf.com", ] @@ -428,11 +428,11 @@ func testAccAzureRMApiManagementBackend_requiresImport(data acceptance.TestData) %s resource "azurerm_api_management_backend" "import" { - name = "${azurerm_api_management_backend.test.name}" - resource_group_name = "${azurerm_api_management_backend.test.resource_group_name}" - api_management_name = "${azurerm_api_management_backend.test.api_management_name}" - protocol = "${azurerm_api_management_backend.test.protocol}" - url = "${azurerm_api_management_backend.test.url}" + name = azurerm_api_management_backend.test.name + resource_group_name = azurerm_api_management_backend.test.resource_group_name + api_management_name = azurerm_api_management_backend.test.api_management_name + protocol = azurerm_api_management_backend.test.protocol + url = azurerm_api_management_backend.test.url } `, template) } @@ -446,8 +446,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d-%s" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" @@ -462,8 +462,8 @@ func testAccAzureRMApiManagementBackend_credentialsNoCertificate(data acceptance resource "azurerm_api_management_backend" "test" { name = "acctestapi-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name protocol = "http" url = "https://acctest" description = "description" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_certificate_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_certificate_test.go index 96fcbdf2be1e3..11d37f563775c 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_certificate_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_certificate_test.go @@ -127,8 +127,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" @@ -136,9 +136,9 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_certificate" "test" { name = "example-cert" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" - data = "${filebase64("testdata/keyvaultcert.pfx")}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name + data = filebase64("testdata/keyvaultcert.pfx") password = "" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) @@ -150,11 +150,11 @@ func testAccAzureRMAPIManagementCertificate_requiresImport(data acceptance.TestD %s resource "azurerm_api_management_certificate" "import" { - name = "${azurerm_api_management_certificate.test.name}" - api_management_name = "${azurerm_api_management_certificate.test.api_management_name}" - resource_group_name = "${azurerm_api_management_certificate.test.resource_group_name}" - data = "${azurerm_api_management_certificate.test.data}" - password = "${azurerm_api_management_certificate.test.password}" + name = azurerm_api_management_certificate.test.name + api_management_name = azurerm_api_management_certificate.test.api_management_name + resource_group_name = azurerm_api_management_certificate.test.resource_group_name + data = azurerm_api_management_certificate.test.data + password = azurerm_api_management_certificate.test.password } `, template) } diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_diagnostic_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_diagnostic_test.go index ba0ea2ee5247b..a88b628620bc8 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_diagnostic_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_diagnostic_test.go @@ -115,8 +115,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" @@ -124,8 +124,8 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_diagnostic" "test" { identifier = "applicationinsights" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name enabled = true } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) @@ -137,10 +137,10 @@ func testAccAzureRMApiManagementDiagnostic_requiresImport(data acceptance.TestDa %s resource "azurerm_api_management_diagnostic" "import" { - identifier = "${azurerm_api_management_diagnostic.test.identifier}" - resource_group_name = "${azurerm_api_management_diagnostic.test.resource_group_name}" - api_management_name = "${azurerm_api_management_diagnostic.test.api_management_name}" - enabled = "${azurerm_api_management_diagnostic.test.enabled}" + identifier = azurerm_api_management_diagnostic.test.identifier + resource_group_name = azurerm_api_management_diagnostic.test.resource_group_name + api_management_name = azurerm_api_management_diagnostic.test.api_management_name + enabled = azurerm_api_management_diagnostic.test.enabled } `, template) } diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_group_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_group_test.go index fdfd6859b3f48..e1e512571c3e1 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_group_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_group_test.go @@ -180,8 +180,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" @@ -190,8 +190,8 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_group" "test" { name = "acctestAMGroup-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name display_name = "Test Group" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) @@ -203,10 +203,10 @@ func testAccAzureRMAPIManagementGroup_requiresImport(data acceptance.TestData) s %s resource "azurerm_api_management_group" "import" { - name = "${azurerm_api_management_group.test.name}" - resource_group_name = "${azurerm_api_management_group.test.resource_group_name}" - api_management_name = "${azurerm_api_management_group.test.api_management_name}" - display_name = "${azurerm_api_management_group.test.display_name}" + name = azurerm_api_management_group.test.name + resource_group_name = azurerm_api_management_group.test.resource_group_name + api_management_name = azurerm_api_management_group.test.api_management_name + display_name = azurerm_api_management_group.test.display_name } `, template) } @@ -220,8 +220,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" @@ -230,8 +230,8 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_group" "test" { name = "acctestAMGroup-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name display_name = "%s" description = "%s" type = "external" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_group_user_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_group_user_test.go index 14c79d3a454f6..6c992b5b929d9 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_group_user_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_group_user_test.go @@ -116,8 +116,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" @@ -126,25 +126,25 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_group" "test" { name = "acctestAMGroup-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name display_name = "Test Group" } resource "azurerm_api_management_user" "test" { user_id = "acctestuser%d" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name first_name = "Acceptance" last_name = "Test" email = "azure-acctest%d@example.com" } resource "azurerm_api_management_group_user" "test" { - user_id = "${azurerm_api_management_user.test.user_id}" - group_name = "${azurerm_api_management_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + user_id = azurerm_api_management_user.test.user_id + group_name = azurerm_api_management_group.test.name + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) } @@ -155,10 +155,10 @@ func testAccAzureRMAPIManagementGroupUser_requiresImport(data acceptance.TestDat %s resource "azurerm_api_management_group_user" "import" { - user_id = "${azurerm_api_management_group_user.test.user_id}" - group_name = "${azurerm_api_management_group_user.test.group_name}" - api_management_name = "${azurerm_api_management_group_user.test.api_management_name}" - resource_group_name = "${azurerm_api_management_group_user.test.resource_group_name}" + user_id = azurerm_api_management_group_user.test.user_id + group_name = azurerm_api_management_group_user.test.group_name + api_management_name = azurerm_api_management_group_user.test.api_management_name + resource_group_name = azurerm_api_management_group_user.test.resource_group_name } `, template) } diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_aad_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_aad_test.go index 982dbaa45ba03..34d2943ac994a 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_aad_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_aad_test.go @@ -148,16 +148,16 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" } resource "azurerm_api_management_identity_provider_aad" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name client_id = "00000000-0000-0000-0000-000000000000" client_secret = "00000000000000000000000000000000" allowed_tenants = ["%s"] @@ -174,16 +174,16 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" } resource "azurerm_api_management_identity_provider_aad" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name client_id = "11111111-1111-1111-1111-111111111111" client_secret = "11111111111111111111111111111111" allowed_tenants = ["%s", "%s"] @@ -197,11 +197,11 @@ func testAccAzureRMApiManagementIdentityProviderAAD_requiresImport(data acceptan %s resource "azurerm_api_management_identity_provider_aad" "import" { - resource_group_name = "${azurerm_api_management_identity_provider_aad.test.resource_group_name}" - api_management_name = "${azurerm_api_management_identity_provider_aad.test.api_management_name}" - client_id = "${azurerm_api_management_identity_provider_aad.test.client_id}" - client_secret = "${azurerm_api_management_identity_provider_aad.test.client_secret}" - allowed_tenants = "${azurerm_api_management_identity_provider_aad.test.allowed_tenants}" + resource_group_name = azurerm_api_management_identity_provider_aad.test.resource_group_name + api_management_name = azurerm_api_management_identity_provider_aad.test.api_management_name + client_id = azurerm_api_management_identity_provider_aad.test.client_id + client_secret = azurerm_api_management_identity_provider_aad.test.client_secret + allowed_tenants = azurerm_api_management_identity_provider_aad.test.allowed_tenants } `, template) } diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_facebook_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_facebook_test.go index daacd82573a57..ffdd25220bca5 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_facebook_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_facebook_test.go @@ -144,16 +144,16 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" } resource "azurerm_api_management_identity_provider_facebook" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name app_id = "00000000000000000000000000000000" app_secret = "00000000000000000000000000000000" } @@ -169,16 +169,16 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" } resource "azurerm_api_management_identity_provider_facebook" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name app_id = "11111111111111111111111111111111" app_secret = "11111111111111111111111111111111" } @@ -191,10 +191,10 @@ func testAccAzureRMApiManagementIdentityProviderFacebook_requiresImport(data acc %s resource "azurerm_api_management_identity_provider_facebook" "import" { - resource_group_name = "${azurerm_api_management_identity_provider_facebook.test.resource_group_name}" - api_management_name = "${azurerm_api_management_identity_provider_facebook.test.api_management_name}" - app_id = "${azurerm_api_management_identity_provider_facebook.test.app_id}" - app_secret = "${azurerm_api_management_identity_provider_facebook.test.app_secret}" + resource_group_name = azurerm_api_management_identity_provider_facebook.test.resource_group_name + api_management_name = azurerm_api_management_identity_provider_facebook.test.api_management_name + app_id = azurerm_api_management_identity_provider_facebook.test.app_id + app_secret = azurerm_api_management_identity_provider_facebook.test.app_secret } `, template) } diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_google_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_google_test.go index fd312367f7e03..b27e963c80219 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_google_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_google_test.go @@ -143,16 +143,16 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" } resource "azurerm_api_management_identity_provider_google" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name client_id = "00000000.apps.googleusercontent.com" client_secret = "00000000000000000000000000000000" } @@ -168,16 +168,16 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" } resource "azurerm_api_management_identity_provider_google" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name client_id = "11111111.apps.googleusercontent.com" client_secret = "11111111111111111111111111111111" } @@ -190,10 +190,10 @@ func testAccAzureRMApiManagementIdentityProviderGoogle_requiresImport(data accep %s resource "azurerm_api_management_identity_provider_google" "import" { - resource_group_name = "${azurerm_api_management_identity_provider_google.test.resource_group_name}" - api_management_name = "${azurerm_api_management_identity_provider_google.test.api_management_name}" - client_id = "${azurerm_api_management_identity_provider_google.test.client_id}" - client_secret = "${azurerm_api_management_identity_provider_google.test.client_secret}" + resource_group_name = azurerm_api_management_identity_provider_google.test.resource_group_name + api_management_name = azurerm_api_management_identity_provider_google.test.api_management_name + client_id = azurerm_api_management_identity_provider_google.test.client_id + client_secret = azurerm_api_management_identity_provider_google.test.client_secret } `, template) } diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_microsoft_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_microsoft_test.go index 1ead6b16570e3..43cbfffc2a8b6 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_microsoft_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_microsoft_test.go @@ -144,16 +144,16 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" } resource "azurerm_api_management_identity_provider_microsoft" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name client_id = "00000000-0000-0000-0000-000000000000" client_secret = "00000000000000000000000000000000" } @@ -169,16 +169,16 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" } resource "azurerm_api_management_identity_provider_microsoft" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name client_id = "11111111-1111-1111-1111-111111111111" client_secret = "11111111111111111111111111111111" } @@ -191,10 +191,10 @@ func testAccAzureRMApiManagementIdentityProviderMicrosoft_requiresImport(data ac %s resource "azurerm_api_management_identity_provider_microsoft" "import" { - resource_group_name = "${azurerm_api_management_identity_provider_microsoft.test.resource_group_name}" - api_management_name = "${azurerm_api_management_identity_provider_microsoft.test.api_management_name}" - client_id = "${azurerm_api_management_identity_provider_microsoft.test.client_id}" - client_secret = "${azurerm_api_management_identity_provider_microsoft.test.client_secret}" + resource_group_name = azurerm_api_management_identity_provider_microsoft.test.resource_group_name + api_management_name = azurerm_api_management_identity_provider_microsoft.test.api_management_name + client_id = azurerm_api_management_identity_provider_microsoft.test.client_id + client_secret = azurerm_api_management_identity_provider_microsoft.test.client_secret } `, template) } diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_twitter_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_twitter_test.go index f7565a70f230e..7933dbc014943 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_twitter_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_twitter_test.go @@ -144,16 +144,16 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" } resource "azurerm_api_management_identity_provider_twitter" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name api_key = "00000000000000000000000000000000" api_secret_key = "00000000000000000000000000000000" } @@ -169,16 +169,16 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" } resource "azurerm_api_management_identity_provider_twitter" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name api_key = "11111111111111111111111111111111" api_secret_key = "11111111111111111111111111111111" } @@ -191,10 +191,10 @@ func testAccAzureRMApiManagementIdentityProviderTwitter_requiresImport(data acce %s resource "azurerm_api_management_identity_provider_twitter" "import" { - resource_group_name = "${azurerm_api_management_identity_provider_twitter.test.resource_group_name}" - api_management_name = "${azurerm_api_management_identity_provider_twitter.test.api_management_name}" - api_key = "${azurerm_api_management_identity_provider_twitter.test.api_key}" - api_secret_key = "${azurerm_api_management_identity_provider_twitter.test.api_secret_key}" + resource_group_name = azurerm_api_management_identity_provider_twitter.test.resource_group_name + api_management_name = azurerm_api_management_identity_provider_twitter.test.api_management_name + api_key = azurerm_api_management_identity_provider_twitter.test.api_key + api_secret_key = azurerm_api_management_identity_provider_twitter.test.api_secret_key } `, template) } diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_logger_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_logger_test.go index bf410a65df16e..e07b78b1ab4ad 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_logger_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_logger_test.go @@ -261,23 +261,23 @@ resource "azurerm_resource_group" "test" { resource "azurerm_eventhub_namespace" "test" { name = "acctesteventhubnamespace-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = "azurerm_resource_group.test.location" + resource_group_name = "azurerm_resource_group.test.name" sku_name = "Basic_1" } resource "azurerm_eventhub" "test" { name = "acctesteventhub-%d" - namespace_name = "${azurerm_eventhub_namespace.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + namespace_name = "azurerm_eventhub_namespace.test.name" + resource_group_name = "azurerm_resource_group.test.name" partition_count = 2 message_retention = 1 } resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = "azurerm_resource_group.test.location" + resource_group_name = "azurerm_resource_group.test.name" publisher_name = "pub1" publisher_email = "pub1@email.com" @@ -286,12 +286,12 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_logger" "test" { name = "acctestapimnglogger-%d" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = "azurerm_api_management.test.name" + resource_group_name = "azurerm_resource_group.test.name" eventhub { - name = "${azurerm_eventhub.test.name}" - connection_string = "${azurerm_eventhub_namespace.test.default_primary_connection_string}" + name = "azurerm_eventhub.test.name" + connection_string = "azurerm_eventhub_namespace.test.default_primary_connection_string" } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) @@ -303,13 +303,13 @@ func testAccAzureRMApiManagementLogger_requiresImport(data acceptance.TestData) %s resource "azurerm_api_management_logger" "import" { - name = "${azurerm_api_management_logger.test.name}" - api_management_name = "${azurerm_api_management_logger.test.api_management_name}" - resource_group_name = "${azurerm_api_management_logger.test.resource_group_name}" + name = azurerm_api_management_logger.test.name + api_management_name = azurerm_api_management_logger.test.api_management_name + resource_group_name = azurerm_api_management_logger.test.resource_group_name eventhub { - name = "${azurerm_eventhub.test.name}" - connection_string = "${azurerm_eventhub_namespace.test.default_primary_connection_string}" + name = azurerm_eventhub.test.name + connection_string = azurerm_eventhub_namespace.test.default_primary_connection_string } } `, template) @@ -324,15 +324,15 @@ resource "azurerm_resource_group" "test" { resource "azurerm_application_insights" "test" { name = "acctestappinsights-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name application_type = "Other" } resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" @@ -341,11 +341,11 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_logger" "test" { name = "acctestapimnglogger-%d" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name application_insights { - instrumentation_key = "${azurerm_application_insights.test.instrumentation_key}" + instrumentation_key = azurerm_application_insights.test.instrumentation_key } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) @@ -360,15 +360,15 @@ resource "azurerm_resource_group" "test" { resource "azurerm_application_insights" "test" { name = "acctestappinsights-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name application_type = "Other" } resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" @@ -377,13 +377,13 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_logger" "test" { name = "acctestapimnglogger-%d" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name description = "%s" buffered = %s application_insights { - instrumentation_key = "${azurerm_application_insights.test.instrumentation_key}" + instrumentation_key = azurerm_application_insights.test.instrumentation_key } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, description, buffered) diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_openid_connect_provider_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_openid_connect_provider_test.go index fecf4454683b3..d685ff14ebc5d 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_openid_connect_provider_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_openid_connect_provider_test.go @@ -136,8 +136,8 @@ func testAccAzureRMApiManagementOpenIDConnectProvider_basic(data acceptance.Test resource "azurerm_api_management_openid_connect_provider" "test" { name = "acctest-%d" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name client_id = "00001111-2222-3333-%d" client_secret = "%d-cwdavsxbacsaxZX-%d" display_name = "Initial Name" @@ -152,13 +152,13 @@ func testAccAzureRMApiManagementOpenIDConnectProvider_requiresImport(data accept %s resource "azurerm_api_management_openid_connect_provider" "import" { - name = "${azurerm_api_management_openid_connect_provider.test.name}" - api_management_name = "${azurerm_api_management_openid_connect_provider.test.api_management_name}" - resource_group_name = "${azurerm_api_management_openid_connect_provider.test.resource_group_name}" - client_id = "${azurerm_api_management_openid_connect_provider.test.client_id}" - client_secret = "${azurerm_api_management_openid_connect_provider.test.client_secret}" - display_name = "${azurerm_api_management_openid_connect_provider.test.display_name}" - metadata_endpoint = "${azurerm_api_management_openid_connect_provider.test.metadata_endpoint}" + name = azurerm_api_management_openid_connect_provider.test.name + api_management_name = azurerm_api_management_openid_connect_provider.test.api_management_name + resource_group_name = azurerm_api_management_openid_connect_provider.test.resource_group_name + client_id = azurerm_api_management_openid_connect_provider.test.client_id + client_secret = azurerm_api_management_openid_connect_provider.test.client_secret + display_name = azurerm_api_management_openid_connect_provider.test.display_name + metadata_endpoint = azurerm_api_management_openid_connect_provider.test.metadata_endpoint } `, template) } @@ -170,8 +170,8 @@ func testAccAzureRMApiManagementOpenIDConnectProvider_complete(data acceptance.T resource "azurerm_api_management_openid_connect_provider" "test" { name = "acctest-%d" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name client_id = "00001111-3333-2222-%d" client_secret = "%d-423egvwdcsjx-%d" display_name = "Updated Name" @@ -190,8 +190,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_api_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_api_test.go index 5ab8edb53c6e6..8b8628c81c20d 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_api_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_api_test.go @@ -116,8 +116,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" @@ -126,8 +126,8 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_product" "test" { product_id = "test-product" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name display_name = "Test Product" subscription_required = true approval_required = false @@ -136,8 +136,8 @@ resource "azurerm_api_management_product" "test" { resource "azurerm_api_management_api" "test" { name = "acctestapi-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name display_name = "api1" path = "api1" protocols = ["https"] @@ -145,10 +145,10 @@ resource "azurerm_api_management_api" "test" { } resource "azurerm_api_management_product_api" "test" { - product_id = "${azurerm_api_management_product.test.product_id}" - api_name = "${azurerm_api_management_api.test.name}" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + product_id = azurerm_api_management_product.test.product_id + api_name = azurerm_api_management_api.test.name + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) } @@ -159,10 +159,10 @@ func testAccAzureRMAPIManagementProductApi_requiresImport(data acceptance.TestDa %s resource "azurerm_api_management_product_api" "import" { - api_name = "${azurerm_api_management_product_api.test.api_name}" - product_id = "${azurerm_api_management_product_api.test.product_id}" - api_management_name = "${azurerm_api_management_product_api.test.api_management_name}" - resource_group_name = "${azurerm_api_management_product_api.test.resource_group_name}" + api_name = azurerm_api_management_product_api.test.api_name + product_id = azurerm_api_management_product_api.test.product_id + api_management_name = azurerm_api_management_product_api.test.api_management_name + resource_group_name = azurerm_api_management_product_api.test.resource_group_name } `, template) } diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_group_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_group_test.go index 3dc49b4a82286..0b66598a973fd 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_group_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_group_test.go @@ -116,8 +116,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" @@ -126,8 +126,8 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_product" "test" { product_id = "test-product" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name display_name = "Test Product" subscription_required = true approval_required = false @@ -136,16 +136,16 @@ resource "azurerm_api_management_product" "test" { resource "azurerm_api_management_group" "test" { name = "acctestAMGroup-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_resource_group.test.name + api_management_name = azurerm_api_management.test.name display_name = "Test Group" } resource "azurerm_api_management_product_group" "test" { - product_id = "${azurerm_api_management_product.test.product_id}" - group_name = "${azurerm_api_management_group.test.name}" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + product_id = azurerm_api_management_product.test.product_id + group_name = azurerm_api_management_group.test.name + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) } @@ -156,10 +156,10 @@ func testAccAzureRMAPIManagementProductGroup_requiresImport(data acceptance.Test %s resource "azurerm_api_management_product_group" "import" { - product_id = "${azurerm_api_management_product_group.test.product_id}" - group_name = "${azurerm_api_management_product_group.test.group_name}" - api_management_name = "${azurerm_api_management_product_group.test.api_management_name}" - resource_group_name = "${azurerm_api_management_product_group.test.resource_group_name}" + product_id = azurerm_api_management_product_group.test.product_id + group_name = azurerm_api_management_product_group.test.group_name + api_management_name = azurerm_api_management_product_group.test.api_management_name + resource_group_name = azurerm_api_management_product_group.test.resource_group_name } `, template) } diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_policy_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_policy_test.go index c9bfb50e67e78..a2d142d1fd8da 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_policy_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_policy_test.go @@ -153,8 +153,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" @@ -162,17 +162,17 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_product" "test" { product_id = "test-product" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name display_name = "Test Product" subscription_required = false published = false } resource "azurerm_api_management_product_policy" "test" { - product_id = "${azurerm_api_management_product.test.product_id}" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + product_id = azurerm_api_management_product.test.product_id + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name xml_link = "https://gist.githubusercontent.com/riordanp/ca22f8113afae0eb38cc12d718fd048d/raw/d6ac89a2f35a6881a7729f8cb4883179dc88eea1/example.xml" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) @@ -184,10 +184,10 @@ func testAccAzureRMApiManagementProductPolicy_requiresImport(data acceptance.Tes %s resource "azurerm_api_management_product_policy" "import" { - product_id = "${azurerm_api_management_product_policy.test.product_id}" - api_management_name = "${azurerm_api_management_product_policy.test.api_management_name}" - resource_group_name = "${azurerm_api_management_product_policy.test.resource_group_name}" - xml_link = "${azurerm_api_management_product_policy.test.xml_link}" + product_id = azurerm_api_management_product_policy.test.product_id + api_management_name = azurerm_api_management_product_policy.test.api_management_name + resource_group_name = azurerm_api_management_product_policy.test.resource_group_name + xml_link = azurerm_api_management_product_policy.test.xml_link } `, template) } @@ -201,8 +201,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" @@ -210,17 +210,17 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_product" "test" { product_id = "test-product" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name display_name = "Test Product" subscription_required = false published = false } resource "azurerm_api_management_product_policy" "test" { - product_id = "${azurerm_api_management_product.test.product_id}" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + product_id = azurerm_api_management_product.test.product_id + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name xml_content = < @@ -230,6 +230,7 @@ resource "azurerm_api_management_product_policy" "test" { XML + } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_test.go index 669148dcab8f7..7530e784c4d84 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_test.go @@ -245,8 +245,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" @@ -255,8 +255,8 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_product" "test" { product_id = "test-product" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name display_name = "Test Product" subscription_required = false published = false @@ -270,13 +270,13 @@ func testAccAzureRMApiManagementProduct_requiresImport(data acceptance.TestData) %s resource "azurerm_api_management_product" "import" { - product_id = "${azurerm_api_management_product.test.product_id}" - api_management_name = "${azurerm_api_management_product.test.api_management_name}" - resource_group_name = "${azurerm_api_management_product.test.resource_group_name}" - display_name = "${azurerm_api_management_product.test.display_name}" - subscription_required = "${azurerm_api_management_product.test.subscription_required}" - approval_required = "${azurerm_api_management_product.test.approval_required}" - published = "${azurerm_api_management_product.test.published}" + product_id = azurerm_api_management_product.test.product_id + api_management_name = azurerm_api_management_product.test.api_management_name + resource_group_name = azurerm_api_management_product.test.resource_group_name + display_name = azurerm_api_management_product.test.display_name + subscription_required = azurerm_api_management_product.test.subscription_required + approval_required = azurerm_api_management_product.test.approval_required + published = azurerm_api_management_product.test.published } `, template) } @@ -290,8 +290,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" @@ -300,8 +300,8 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_product" "test" { product_id = "test-product" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name display_name = "Test Updated Product" subscription_required = true approval_required = true @@ -320,8 +320,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" @@ -330,8 +330,8 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_product" "test" { product_id = "test-product" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name display_name = "Test Product" subscription_required = true approval_required = true @@ -350,8 +350,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" @@ -360,8 +360,8 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_product" "test" { product_id = "test-product" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name display_name = "Test Product" subscription_required = true approval_required = true @@ -382,8 +382,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" sku_name = "Developer_1" @@ -391,8 +391,8 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_product" "test" { product_id = "test-product" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name display_name = "Test Product" approval_required = true subscription_required = false diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_property_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_property_test.go index 505406f7b9a69..d03ba06cbe8bd 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_property_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_property_test.go @@ -133,8 +133,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" @@ -143,8 +143,8 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_property" "test" { name = "acctestAMProperty-%d" - resource_group_name = "${azurerm_api_management.test.resource_group_name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_api_management.test.resource_group_name + api_management_name = azurerm_api_management.test.name display_name = "TestProperty%d" value = "Test Value" tags = ["tag1", "tag2"] @@ -161,8 +161,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" @@ -171,8 +171,8 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_property" "test" { name = "acctestAMProperty-%d" - resource_group_name = "${azurerm_api_management.test.resource_group_name}" - api_management_name = "${azurerm_api_management.test.name}" + resource_group_name = azurerm_api_management.test.resource_group_name + api_management_name = azurerm_api_management.test.name display_name = "TestProperty2%d" value = "Test Value2" secret = true diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_subscription_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_subscription_test.go index 0c8745eb05361..e0a63b0ce00c1 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_subscription_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_subscription_test.go @@ -182,10 +182,10 @@ func testAccAzureRMAPIManagementSubscription_basic(data acceptance.TestData) str %s resource "azurerm_api_management_subscription" "test" { - resource_group_name = "${azurerm_api_management.test.resource_group_name}" - api_management_name = "${azurerm_api_management.test.name}" - user_id = "${azurerm_api_management_user.test.id}" - product_id = "${azurerm_api_management_product.test.id}" + resource_group_name = azurerm_api_management.test.resource_group_name + api_management_name = azurerm_api_management.test.name + user_id = azurerm_api_management_user.test.id + product_id = azurerm_api_management_product.test.id display_name = "Butter Parser API Enterprise Edition" } `, template) @@ -197,11 +197,11 @@ func testAccAzureRMAPIManagementSubscription_requiresImport(data acceptance.Test %s resource "azurerm_api_management_subscription" "import" { - resource_group_name = "${azurerm_api_management_subscription.test.resource_group_name}" - api_management_name = "${azurerm_api_management_subscription.test.api_management_name}" - user_id = "${azurerm_api_management_subscription.test.user_id}" - product_id = "${azurerm_api_management_subscription.test.product_id}" - display_name = "${azurerm_api_management_subscription.test.display_name}" + resource_group_name = azurerm_api_management_subscription.test.resource_group_name + api_management_name = azurerm_api_management_subscription.test.api_management_name + user_id = azurerm_api_management_subscription.test.user_id + product_id = azurerm_api_management_subscription.test.product_id + display_name = azurerm_api_management_subscription.test.display_name } `, template) } @@ -212,10 +212,10 @@ func testAccAzureRMAPIManagementSubscription_update(data acceptance.TestData, st %s resource "azurerm_api_management_subscription" "test" { - resource_group_name = "${azurerm_api_management.test.resource_group_name}" - api_management_name = "${azurerm_api_management.test.name}" - user_id = "${azurerm_api_management_user.test.id}" - product_id = "${azurerm_api_management_product.test.id}" + resource_group_name = azurerm_api_management.test.resource_group_name + api_management_name = azurerm_api_management.test.name + user_id = azurerm_api_management_user.test.id + product_id = azurerm_api_management_product.test.id display_name = "Butter Parser API Enterprise Edition" state = "%s" } @@ -228,10 +228,10 @@ func testAccAzureRMAPIManagementSubscription_complete(data acceptance.TestData) %s resource "azurerm_api_management_subscription" "test" { - resource_group_name = "${azurerm_api_management.test.resource_group_name}" - api_management_name = "${azurerm_api_management.test.name}" - user_id = "${azurerm_api_management_user.test.id}" - product_id = "${azurerm_api_management_product.test.id}" + resource_group_name = azurerm_api_management.test.resource_group_name + api_management_name = azurerm_api_management.test.name + user_id = azurerm_api_management_user.test.id + product_id = azurerm_api_management_product.test.id display_name = "Butter Parser API Enterprise Edition" state = "active" } @@ -247,8 +247,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" @@ -257,8 +257,8 @@ resource "azurerm_api_management" "test" { resource "azurerm_api_management_product" "test" { product_id = "test-product" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name display_name = "Test Product" subscription_required = true approval_required = false @@ -267,8 +267,8 @@ resource "azurerm_api_management_product" "test" { resource "azurerm_api_management_user" "test" { user_id = "acctestuser%d" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name first_name = "Acceptance" last_name = "Test" email = "azure-acctest%d@example.com" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_test.go index 4bcf07de2babe..c8527a2978240 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_test.go @@ -234,8 +234,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" @@ -253,8 +253,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" @@ -268,6 +268,7 @@ resource "azurerm_api_management" "test" { XML + } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) @@ -282,8 +283,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" @@ -305,8 +306,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" @@ -323,11 +324,11 @@ func testAccAzureRMApiManagement_requiresImport(data acceptance.TestData) string %s resource "azurerm_api_management" "import" { - name = "${azurerm_api_management.test.name}" - location = "${azurerm_api_management.test.location}" - resource_group_name = "${azurerm_api_management.test.resource_group_name}" - publisher_name = "${azurerm_api_management.test.publisher_name}" - publisher_email = "${azurerm_api_management.test.publisher_email}" + name = azurerm_api_management.test.name + location = azurerm_api_management.test.location + resource_group_name = azurerm_api_management.test.resource_group_name + publisher_name = azurerm_api_management.test.publisher_name + publisher_email = azurerm_api_management.test.publisher_email sku_name = "Developer_1" } @@ -343,8 +344,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" @@ -367,8 +368,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" @@ -415,21 +416,21 @@ resource "azurerm_api_management" "test" { notification_sender_email = "notification@email.com" additional_location { - location = "${azurerm_resource_group.test2.location}" + location = azurerm_resource_group.test2.location } additional_location { - location = "${azurerm_resource_group.test3.location}" + location = azurerm_resource_group.test3.location } certificate { - encoded_certificate = "${filebase64("testdata/api_management_api_test.pfx")}" + encoded_certificate = filebase64("testdata/api_management_api_test.pfx") certificate_password = "terraform" store_name = "CertificateAuthority" } certificate { - encoded_certificate = "${filebase64("testdata/api_management_api_test.pfx")}" + encoded_certificate = filebase64("testdata/api_management_api_test.pfx") certificate_password = "terraform" store_name = "Root" } @@ -451,7 +452,7 @@ resource "azurerm_api_management" "test" { hostname_configuration { proxy { host_name = "api.terraform.io" - certificate = "${filebase64("testdata/api_management_api_test.pfx")}" + certificate = filebase64("testdata/api_management_api_test.pfx") certificate_password = "terraform" default_ssl_binding = true negotiate_client_certificate = false @@ -459,14 +460,14 @@ resource "azurerm_api_management" "test" { proxy { host_name = "api2.terraform.io" - certificate = "${filebase64("testdata/api_management_api2_test.pfx")}" + certificate = filebase64("testdata/api_management_api2_test.pfx") certificate_password = "terraform" negotiate_client_certificate = true } portal { host_name = "portal.terraform.io" - certificate = "${filebase64("testdata/api_management_portal_test.pfx")}" + certificate = filebase64("testdata/api_management_portal_test.pfx") certificate_password = "terraform" } } @@ -477,8 +478,8 @@ resource "azurerm_api_management" "test" { "Acceptance" = "Test" } - location = "${azurerm_resource_group.test1.location}" - resource_group_name = "${azurerm_resource_group.test1.name}" + location = azurerm_resource_group.test1.location + resource_group_name = azurerm_resource_group.test1.name } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.Locations.Secondary, data.RandomInteger, data.Locations.Ternary, data.RandomInteger) } diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_user_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_user_test.go index b3d7b1bae77da..999c8c305676b 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_user_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_user_test.go @@ -267,8 +267,8 @@ func testAccAzureRMApiManagementUser_basic(data acceptance.TestData) string { resource "azurerm_api_management_user" "test" { user_id = "acctestuser%d" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name first_name = "Acceptance" last_name = "Test" email = "azure-acctest%d@example.com" @@ -282,13 +282,13 @@ func testAccAzureRMApiManagementUser_requiresImport(data acceptance.TestData) st %s resource "azurerm_api_management_user" "import" { - user_id = "${azurerm_api_management_user.test.user_id}" - api_management_name = "${azurerm_api_management_user.test.api_management_name}" - resource_group_name = "${azurerm_api_management_user.test.resource_group_name}" - first_name = "${azurerm_api_management_user.test.first_name}" - last_name = "${azurerm_api_management_user.test.last_name}" - email = "${azurerm_api_management_user.test.email}" - state = "${azurerm_api_management_user.test.state}" + user_id = azurerm_api_management_user.test.user_id + api_management_name = azurerm_api_management_user.test.api_management_name + resource_group_name = azurerm_api_management_user.test.resource_group_name + first_name = azurerm_api_management_user.test.first_name + last_name = azurerm_api_management_user.test.last_name + email = azurerm_api_management_user.test.email + state = azurerm_api_management_user.test.state } `, template) } @@ -300,8 +300,8 @@ func testAccAzureRMApiManagementUser_password(data acceptance.TestData) string { resource "azurerm_api_management_user" "test" { user_id = "acctestuser%d" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name first_name = "Acceptance" last_name = "Test" email = "azure-acctest%d@example.com" @@ -318,8 +318,8 @@ func testAccAzureRMApiManagementUser_updatedActive(data acceptance.TestData) str resource "azurerm_api_management_user" "test" { user_id = "acctestuser%d" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name first_name = "Acceptance" last_name = "Test" email = "azure-acctest%d@example.com" @@ -335,8 +335,8 @@ func testAccAzureRMApiManagementUser_updatedBlocked(data acceptance.TestData) st resource "azurerm_api_management_user" "test" { user_id = "acctestuser%d" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name first_name = "Acceptance Updated" last_name = "Test Updated" email = "azure-acctest%d@example.com" @@ -352,8 +352,8 @@ func testAccAzureRMApiManagementUser_invited(data acceptance.TestData) string { resource "azurerm_api_management_user" "test" { user_id = "acctestuser%d" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name first_name = "Acceptance" last_name = "Test User" email = "azure-acctest%d@example.com" @@ -370,8 +370,8 @@ func testAccAzureRMApiManagementUser_signUp(data acceptance.TestData) string { resource "azurerm_api_management_user" "test" { user_id = "acctestuser%d" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name first_name = "Acceptance" last_name = "Test User" email = "azure-acctest%d@example.com" @@ -388,8 +388,8 @@ func testAccAzureRMApiManagementUser_complete(data acceptance.TestData) string { resource "azurerm_api_management_user" "test" { user_id = "acctestuser%d" - api_management_name = "${azurerm_api_management.test.name}" - resource_group_name = "${azurerm_resource_group.test.name}" + api_management_name = azurerm_api_management.test.name + resource_group_name = azurerm_resource_group.test.name first_name = "Acceptance" last_name = "Test" email = "azure-acctest%d@example.com" @@ -409,8 +409,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_api_management" "test" { name = "acctestAM-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name publisher_name = "pub1" publisher_email = "pub1@email.com" diff --git a/azurerm/internal/services/appconfiguration/tests/resource_arm_app_configuration_test.go b/azurerm/internal/services/appconfiguration/tests/resource_arm_app_configuration_test.go index 443fc88059f0a..fb127e502073a 100644 --- a/azurerm/internal/services/appconfiguration/tests/resource_arm_app_configuration_test.go +++ b/azurerm/internal/services/appconfiguration/tests/resource_arm_app_configuration_test.go @@ -241,8 +241,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_app_configuration" "test" { name = "testacc-appconf%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location sku = "free" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) @@ -257,8 +257,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_app_configuration" "test" { name = "testaccappconf%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location sku = "standard" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) @@ -270,11 +270,10 @@ func testAccAzureAppConfiguration_requiresImport(data acceptance.TestData) strin %s resource "azurerm_app_configuration" "import" { - name = "${azurerm_app_configuration.test.name}" - resource_group_name = "${azurerm_app_configuration.test.resource_group_name}" - location = "${azurerm_app_configuration.test.location}" - sku = "${azurerm_app_configuration.test.sku}" - + name = azurerm_app_configuration.test.name + resource_group_name = azurerm_app_configuration.test.resource_group_name + location = azurerm_app_configuration.test.location + sku = azurerm_app_configuration.test.sku } `, template) } @@ -288,8 +287,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_app_configuration" "test" { name = "testaccappconf%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location sku = "free" tags = { @@ -308,8 +307,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_app_configuration" "test" { name = "testaccappconf%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location sku = "free" tags = { diff --git a/azurerm/internal/services/applicationinsights/tests/data_source_application_insights_test.go b/azurerm/internal/services/applicationinsights/tests/data_source_application_insights_test.go index c189f74ff8012..923a80ff7ea4e 100644 --- a/azurerm/internal/services/applicationinsights/tests/data_source_application_insights_test.go +++ b/azurerm/internal/services/applicationinsights/tests/data_source_application_insights_test.go @@ -40,8 +40,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_application_insights" "test" { name = "acctestappinsights-%[1]d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name application_type = "other" tags = { @@ -50,8 +50,8 @@ resource "azurerm_application_insights" "test" { } data "azurerm_application_insights" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - name = "${azurerm_application_insights.test.name}" + resource_group_name = azurerm_resource_group.test.name + name = azurerm_application_insights.test.name } `, data.RandomInteger, data.Locations.Primary) } diff --git a/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_analytics_item_test.go b/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_analytics_item_test.go index 35eb2d2962064..a39a54886fa12 100644 --- a/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_analytics_item_test.go +++ b/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_analytics_item_test.go @@ -181,14 +181,14 @@ resource "azurerm_resource_group" "test" { resource "azurerm_application_insights" "test" { name = "acctestappinsights-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name application_type = "web" } resource "azurerm_application_insights_analytics_item" "test" { name = "testquery" - application_insights_id = "${azurerm_application_insights.test.id}" + application_insights_id = azurerm_application_insights.test.id content = "requests #test" scope = "shared" type = "query" @@ -205,14 +205,14 @@ resource "azurerm_resource_group" "test" { resource "azurerm_application_insights" "test" { name = "acctestappinsights-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name application_type = "web" } resource "azurerm_application_insights_analytics_item" "test" { name = "testquery" - application_insights_id = "${azurerm_application_insights.test.id}" + application_insights_id = azurerm_application_insights.test.id content = "requests #updated" scope = "shared" type = "query" @@ -229,14 +229,14 @@ resource "azurerm_resource_group" "test" { resource "azurerm_application_insights" "test" { name = "acctestappinsights-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name application_type = "web" } resource "azurerm_application_insights_analytics_item" "test1" { name = "testquery1" - application_insights_id = "${azurerm_application_insights.test.id}" + application_insights_id = azurerm_application_insights.test.id content = "requests #test1" scope = "shared" type = "query" @@ -244,7 +244,7 @@ resource "azurerm_application_insights_analytics_item" "test1" { resource "azurerm_application_insights_analytics_item" "test2" { name = "testquery2" - application_insights_id = "${azurerm_application_insights.test.id}" + application_insights_id = azurerm_application_insights.test.id content = "requests #test2" scope = "user" type = "query" @@ -252,7 +252,7 @@ resource "azurerm_application_insights_analytics_item" "test2" { resource "azurerm_application_insights_analytics_item" "test3" { name = "testfunction1" - application_insights_id = "${azurerm_application_insights.test.id}" + application_insights_id = azurerm_application_insights.test.id content = "requests #test3" scope = "shared" type = "function" diff --git a/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_api_key_test.go b/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_api_key_test.go index 49db3778f3cbb..de98794bb8fcf 100644 --- a/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_api_key_test.go +++ b/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_api_key_test.go @@ -214,14 +214,14 @@ resource "azurerm_resource_group" "test" { resource "azurerm_application_insights" "test" { name = "acctestappinsights-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name application_type = "web" } resource "azurerm_application_insights_api_key" "test" { name = "acctestappinsightsapikey-%d" - application_insights_id = "${azurerm_application_insights.test.id}" + application_insights_id = azurerm_application_insights.test.id read_permissions = %s write_permissions = %s } @@ -234,10 +234,10 @@ func testAccAzureRMApplicationInsightsAPIKey_requiresImport(data acceptance.Test %s resource "azurerm_application_insights_api_key" "import" { - name = "${azurerm_application_insights_api_key.test.name}" - application_insights_id = "${azurerm_application_insights_api_key.test.application_insights_id}" - read_permissions = "${azurerm_application_insights_api_key.test.read_permissions}" - write_permissions = "${azurerm_application_insights_api_key.test.write_permissions}" + name = azurerm_application_insights_api_key.test.name + application_insights_id = azurerm_application_insights_api_key.test.application_insights_id + read_permissions = azurerm_application_insights_api_key.test.read_permissions + write_permissions = azurerm_application_insights_api_key.test.write_permissions } `, template) } diff --git a/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_test.go b/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_test.go index 6d742ed2b8044..14c0a18e77196 100644 --- a/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_test.go +++ b/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_test.go @@ -270,8 +270,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_application_insights" "test" { name = "acctestappinsights-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name application_type = "%s" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, applicationType) @@ -283,10 +283,10 @@ func testAccAzureRMApplicationInsights_requiresImport(data acceptance.TestData, %s resource "azurerm_application_insights" "import" { - name = "${azurerm_application_insights.test.name}" - location = "${azurerm_application_insights.test.location}" - resource_group_name = "${azurerm_application_insights.test.resource_group_name}" - application_type = "${azurerm_application_insights.test.application_type}" + name = azurerm_application_insights.test.name + location = azurerm_application_insights.test.location + resource_group_name = azurerm_application_insights.test.resource_group_name + application_type = azurerm_application_insights.test.application_type } `, template) } @@ -300,8 +300,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_application_insights" "test" { name = "acctestappinsights-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name application_type = "%s" retention_in_days = 120 sampling_percentage = 50 diff --git a/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_webtests_test.go b/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_webtests_test.go index 96948b0b4df19..4fa0e7e700456 100644 --- a/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_webtests_test.go +++ b/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_webtests_test.go @@ -174,16 +174,16 @@ resource "azurerm_resource_group" "test" { resource "azurerm_application_insights" "test" { name = "acctestappinsights-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name application_type = "web" } resource "azurerm_application_insights_web_test" "test" { name = "acctestappinsightswebtests-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - application_insights_id = "${azurerm_application_insights.test.id}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + application_insights_id = azurerm_application_insights.test.id kind = "ping" geo_locations = ["us-tx-sn1-azr"] @@ -194,6 +194,7 @@ resource "azurerm_application_insights_web_test" "test" { XML + } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) } @@ -207,16 +208,16 @@ resource "azurerm_resource_group" "test" { resource "azurerm_application_insights" "test" { name = "acctestappinsights-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name application_type = "web" } resource "azurerm_application_insights_web_test" "test" { name = "acctestappinsightswebtests-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" - application_insights_id = "${azurerm_application_insights.test.id}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + application_insights_id = azurerm_application_insights.test.id kind = "ping" frequency = 900 timeout = 120 @@ -230,6 +231,7 @@ resource "azurerm_application_insights_web_test" "test" { XML + } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) } @@ -240,12 +242,12 @@ func testAccAzureRMApplicationInsightsWebTests_requiresImport(data acceptance.Te %s resource "azurerm_application_insights_web_test" "import" { - name = "${azurerm_application_insights_web_test.test.name}" - location = "${azurerm_application_insights_web_test.test.location}" - resource_group_name = "${azurerm_application_insights_web_test.test.resource_group_name}" - application_insights_id = "${azurerm_application_insights_web_test.test.application_insights_id}" - kind = "${azurerm_application_insights_web_test.test.kind}" - configuration = "${azurerm_application_insights_web_test.test.configuration}" + name = azurerm_application_insights_web_test.test.name + location = azurerm_application_insights_web_test.test.location + resource_group_name = azurerm_application_insights_web_test.test.resource_group_name + application_insights_id = azurerm_application_insights_web_test.test.application_insights_id + kind = azurerm_application_insights_web_test.test.kind + configuration = azurerm_application_insights_web_test.test.configuration } `, template) } diff --git a/azurerm/internal/services/authorization/tests/data_source_role_definition_test.go b/azurerm/internal/services/authorization/tests/data_source_role_definition_test.go index 74b292722433b..0bcf02cf8f874 100644 --- a/azurerm/internal/services/authorization/tests/data_source_role_definition_test.go +++ b/azurerm/internal/services/authorization/tests/data_source_role_definition_test.go @@ -165,12 +165,13 @@ data "azurerm_role_definition" "test" { func testAccDataSourceRoleDefinition_basic(id string, data acceptance.TestData) string { return fmt.Sprintf(` -data "azurerm_subscription" "primary" {} +data "azurerm_subscription" "primary" { +} resource "azurerm_role_definition" "test" { role_definition_id = "%s" name = "acctestrd-%d" - scope = "${data.azurerm_subscription.primary.id}" + scope = data.azurerm_subscription.primary.id description = "Created by the Data Source Role Definition Acceptance Test" permissions { @@ -184,13 +185,13 @@ resource "azurerm_role_definition" "test" { } assignable_scopes = [ - "${data.azurerm_subscription.primary.id}", + data.azurerm_subscription.primary.id, ] } data "azurerm_role_definition" "test" { - role_definition_id = "${azurerm_role_definition.test.role_definition_id}" - scope = "${data.azurerm_subscription.primary.id}" + role_definition_id = azurerm_role_definition.test.role_definition_id + scope = data.azurerm_subscription.primary.id } `, id, data.RandomInteger) } @@ -200,8 +201,8 @@ func testAccDataSourceRoleDefinition_byName(id string, data acceptance.TestData) %s data "azurerm_role_definition" "byName" { - name = "${azurerm_role_definition.test.name}" - scope = "${data.azurerm_subscription.primary.id}" + name = azurerm_role_definition.test.name + scope = data.azurerm_subscription.primary.id } `, testAccDataSourceRoleDefinition_basic(id, data)) } diff --git a/azurerm/internal/services/authorization/tests/resource_arm_role_assignment_test.go b/azurerm/internal/services/authorization/tests/resource_arm_role_assignment_test.go index 3059127c58385..777d7e9b255df 100644 --- a/azurerm/internal/services/authorization/tests/resource_arm_role_assignment_test.go +++ b/azurerm/internal/services/authorization/tests/resource_arm_role_assignment_test.go @@ -356,15 +356,17 @@ resource "azurerm_role_assignment" "test" { func testAccAzureRMRoleAssignment_roleNameConfig(id string) string { return fmt.Sprintf(` -data "azurerm_subscription" "primary" {} +data "azurerm_subscription" "primary" { +} -data "azurerm_client_config" "test" {} +data "azurerm_client_config" "test" { +} resource "azurerm_role_assignment" "test" { name = "%s" - scope = "${data.azurerm_subscription.primary.id}" + scope = data.azurerm_subscription.primary.id role_definition_name = "Log Analytics Reader" - principal_id = "${data.azurerm_client_config.test.object_id}" + principal_id = data.azurerm_client_config.test.object_id } `, id) } @@ -374,34 +376,38 @@ func testAccAzureRMRoleAssignment_requiresImportConfig(id string) string { %s resource "azurerm_role_assignment" "import" { - name = "${azurerm_role_assignment.test.name}" - scope = "${azurerm_role_assignment.test.id}" - role_definition_name = "${azurerm_role_assignment.test.role_definition_name}" - principal_id = "${azurerm_role_assignment.test.principal_id}" + name = azurerm_role_assignment.test.name + scope = azurerm_role_assignment.test.id + role_definition_name = azurerm_role_assignment.test.role_definition_name + principal_id = azurerm_role_assignment.test.principal_id } `, testAccAzureRMRoleAssignment_roleNameConfig(id)) } func testAccAzureRMRoleAssignment_dataActionsConfig(id string) string { return fmt.Sprintf(` -data "azurerm_subscription" "primary" {} +data "azurerm_subscription" "primary" { +} -data "azurerm_client_config" "test" {} +data "azurerm_client_config" "test" { +} resource "azurerm_role_assignment" "test" { name = "%s" - scope = "${data.azurerm_subscription.primary.id}" + scope = data.azurerm_subscription.primary.id role_definition_name = "Virtual Machine User Login" - principal_id = "${data.azurerm_client_config.test.object_id}" + principal_id = data.azurerm_client_config.test.object_id } `, id) } func testAccAzureRMRoleAssignment_builtinConfig(id string) string { return fmt.Sprintf(` -data "azurerm_subscription" "primary" {} +data "azurerm_subscription" "primary" { +} -data "azurerm_client_config" "test" {} +data "azurerm_client_config" "test" { +} data "azurerm_role_definition" "test" { name = "Site Recovery Reader" @@ -409,23 +415,25 @@ data "azurerm_role_definition" "test" { resource "azurerm_role_assignment" "test" { name = "%s" - scope = "${data.azurerm_subscription.primary.id}" + scope = data.azurerm_subscription.primary.id role_definition_id = "${data.azurerm_subscription.primary.id}${data.azurerm_role_definition.test.id}" - principal_id = "${data.azurerm_client_config.test.object_id}" + principal_id = data.azurerm_client_config.test.object_id } `, id) } func testAccAzureRMRoleAssignment_customConfig(roleDefinitionId string, roleAssignmentId string, rInt int) string { return fmt.Sprintf(` -data "azurerm_subscription" "primary" {} +data "azurerm_subscription" "primary" { +} -data "azurerm_client_config" "test" {} +data "azurerm_client_config" "test" { +} resource "azurerm_role_definition" "test" { role_definition_id = "%s" name = "acctestrd-%d" - scope = "${data.azurerm_subscription.primary.id}" + scope = data.azurerm_subscription.primary.id description = "Created by the Role Assignment Acceptance Test" permissions { @@ -434,57 +442,59 @@ resource "azurerm_role_definition" "test" { } assignable_scopes = [ - "${data.azurerm_subscription.primary.id}", + data.azurerm_subscription.primary.id, ] } resource "azurerm_role_assignment" "test" { name = "%s" - scope = "${data.azurerm_subscription.primary.id}" - role_definition_id = "${azurerm_role_definition.test.id}" - principal_id = "${data.azurerm_client_config.test.object_id}" + scope = data.azurerm_subscription.primary.id + role_definition_id = azurerm_role_definition.test.id + principal_id = data.azurerm_client_config.test.object_id } `, roleDefinitionId, rInt, roleAssignmentId) } func testAccAzureRMRoleAssignment_servicePrincipal(rInt int, roleAssignmentID string) string { return fmt.Sprintf(` -data "azurerm_subscription" "current" {} +data "azurerm_subscription" "current" { +} resource "azuread_application" "test" { name = "acctestspa-%d" } resource "azuread_service_principal" "test" { - application_id = "${azuread_application.test.application_id}" + application_id = azuread_application.test.application_id } resource "azurerm_role_assignment" "test" { name = "%s" - scope = "${data.azurerm_subscription.current.id}" + scope = data.azurerm_subscription.current.id role_definition_name = "Reader" - principal_id = "${azuread_service_principal.test.id}" + principal_id = azuread_service_principal.test.id } `, rInt, roleAssignmentID) } func testAccAzureRMRoleAssignment_servicePrincipalWithType(rInt int, roleAssignmentID string) string { return fmt.Sprintf(` -data "azurerm_subscription" "current" {} +data "azurerm_subscription" "current" { +} resource "azuread_application" "test" { name = "acctestspa-%d" } resource "azuread_service_principal" "test" { - application_id = "${azuread_application.test.application_id}" + application_id = azuread_application.test.application_id } resource "azurerm_role_assignment" "test" { name = "%s" - scope = "${data.azurerm_subscription.current.id}" + scope = data.azurerm_subscription.current.id role_definition_name = "Reader" - principal_id = "${azuread_service_principal.test.id}" + principal_id = azuread_service_principal.test.id skip_service_principal_aad_check = true } `, rInt, roleAssignmentID) @@ -492,7 +502,8 @@ resource "azurerm_role_assignment" "test" { func testAccAzureRMRoleAssignment_group(rInt int, roleAssignmentID string) string { return fmt.Sprintf(` -data "azurerm_subscription" "current" {} +data "azurerm_subscription" "current" { +} resource "azuread_group" "test" { name = "acctestspa-%d" @@ -500,18 +511,20 @@ resource "azuread_group" "test" { resource "azurerm_role_assignment" "test" { name = "%s" - scope = "${data.azurerm_subscription.current.id}" + scope = data.azurerm_subscription.current.id role_definition_name = "Reader" - principal_id = "${azuread_group.test.id}" + principal_id = azuread_group.test.id } `, rInt, roleAssignmentID) } func testAccAzureRMRoleAssignment_managementGroupConfig(groupId string) string { return fmt.Sprintf(` -data "azurerm_subscription" "primary" {} +data "azurerm_subscription" "primary" { +} -data "azurerm_client_config" "test" {} +data "azurerm_client_config" "test" { +} data "azurerm_role_definition" "test" { name = "Monitoring Reader" @@ -522,9 +535,9 @@ resource "azurerm_management_group" "test" { } resource "azurerm_role_assignment" "test" { - scope = "${azurerm_management_group.test.id}" - role_definition_id = "${data.azurerm_role_definition.test.id}" - principal_id = "${data.azurerm_client_config.test.object_id}" + scope = azurerm_management_group.test.id + role_definition_id = data.azurerm_role_definition.test.id + principal_id = data.azurerm_client_config.test.object_id } `, groupId) } diff --git a/azurerm/internal/services/authorization/tests/resource_arm_role_definition_test.go b/azurerm/internal/services/authorization/tests/resource_arm_role_definition_test.go index 5f22bd76ab0dd..83ce447b37671 100644 --- a/azurerm/internal/services/authorization/tests/resource_arm_role_definition_test.go +++ b/azurerm/internal/services/authorization/tests/resource_arm_role_definition_test.go @@ -224,12 +224,13 @@ func testCheckAzureRMRoleDefinitionDestroy(s *terraform.State) error { func testAccAzureRMRoleDefinition_basic(id string, data acceptance.TestData) string { return fmt.Sprintf(` -data "azurerm_subscription" "primary" {} +data "azurerm_subscription" "primary" { +} resource "azurerm_role_definition" "test" { role_definition_id = "%s" name = "acctestrd-%d" - scope = "${data.azurerm_subscription.primary.id}" + scope = data.azurerm_subscription.primary.id permissions { actions = ["*"] @@ -237,7 +238,7 @@ resource "azurerm_role_definition" "test" { } assignable_scopes = [ - "${data.azurerm_subscription.primary.id}", + data.azurerm_subscription.primary.id, ] } `, id, data.RandomInteger) @@ -248,9 +249,9 @@ func testAccAzureRMRoleDefinition_requiresImport(id string, data acceptance.Test %s resource "azurerm_role_definition" "import" { - role_definition_id = "${azurerm_role_definition.test.role_definition_id}" - name = "${azurerm_role_definition.test.name}" - scope = "${azurerm_role_definition.test.scope}" + role_definition_id = azurerm_role_definition.test.role_definition_id + name = azurerm_role_definition.test.name + scope = azurerm_role_definition.test.scope permissions { actions = ["*"] @@ -258,7 +259,7 @@ resource "azurerm_role_definition" "import" { } assignable_scopes = [ - "${data.azurerm_subscription.primary.id}", + data.azurerm_subscription.primary.id, ] } `, testAccAzureRMRoleDefinition_basic(id, data)) @@ -266,12 +267,13 @@ resource "azurerm_role_definition" "import" { func testAccAzureRMRoleDefinition_complete(id string, data acceptance.TestData) string { return fmt.Sprintf(` -data "azurerm_subscription" "primary" {} +data "azurerm_subscription" "primary" { +} resource "azurerm_role_definition" "test" { role_definition_id = "%s" name = "acctestrd-%d" - scope = "${data.azurerm_subscription.primary.id}" + scope = data.azurerm_subscription.primary.id description = "Acceptance Test Role Definition" permissions { @@ -282,7 +284,7 @@ resource "azurerm_role_definition" "test" { } assignable_scopes = [ - "${data.azurerm_subscription.primary.id}", + data.azurerm_subscription.primary.id, ] } `, id, data.RandomInteger) @@ -290,12 +292,13 @@ resource "azurerm_role_definition" "test" { func testAccAzureRMRoleDefinition_updated(id string, data acceptance.TestData) string { return fmt.Sprintf(` -data "azurerm_subscription" "primary" {} +data "azurerm_subscription" "primary" { +} resource "azurerm_role_definition" "test" { role_definition_id = "%s" name = "acctestrd-%d-updated" - scope = "${data.azurerm_subscription.primary.id}" + scope = data.azurerm_subscription.primary.id description = "Acceptance Test Role Definition" permissions { @@ -304,7 +307,7 @@ resource "azurerm_role_definition" "test" { } assignable_scopes = [ - "${data.azurerm_subscription.primary.id}", + data.azurerm_subscription.primary.id, ] } `, id, data.RandomInteger) @@ -312,11 +315,12 @@ resource "azurerm_role_definition" "test" { func testAccAzureRMRoleDefinition_emptyId(data acceptance.TestData) string { return fmt.Sprintf(` -data "azurerm_subscription" "primary" {} +data "azurerm_subscription" "primary" { +} resource "azurerm_role_definition" "test" { name = "acctestrd-%d" - scope = "${data.azurerm_subscription.primary.id}" + scope = data.azurerm_subscription.primary.id permissions { actions = ["*"] @@ -324,7 +328,7 @@ resource "azurerm_role_definition" "test" { } assignable_scopes = [ - "${data.azurerm_subscription.primary.id}", + data.azurerm_subscription.primary.id, ] } `, data.RandomInteger) @@ -332,11 +336,12 @@ resource "azurerm_role_definition" "test" { func testAccAzureRMRoleDefinition_updateEmptyId(data acceptance.TestData) string { return fmt.Sprintf(` -data "azurerm_subscription" "primary" {} +data "azurerm_subscription" "primary" { +} resource "azurerm_role_definition" "test" { name = "acctestrd-%d" - scope = "${data.azurerm_subscription.primary.id}" + scope = data.azurerm_subscription.primary.id permissions { actions = ["*"] @@ -344,7 +349,7 @@ resource "azurerm_role_definition" "test" { } assignable_scopes = [ - "${data.azurerm_subscription.primary.id}", + data.azurerm_subscription.primary.id, ] } `, data.RandomInteger) diff --git a/azurerm/internal/services/automation/tests/data_source_automation_account_test.go b/azurerm/internal/services/automation/tests/data_source_automation_account_test.go index 434c6dc5c372d..6c88f8cfa9fd1 100644 --- a/azurerm/internal/services/automation/tests/data_source_automation_account_test.go +++ b/azurerm/internal/services/automation/tests/data_source_automation_account_test.go @@ -32,15 +32,17 @@ resource "azurerm_resource_group" "test" { name = "%s" location = "%s" } + resource "azurerm_automation_account" "test" { name = "acctestautomationAccount-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku_name = "Basic" } + data "azurerm_automation_account" "test" { - resource_group_name = "${azurerm_resource_group.test.name}" - name = "${azurerm_automation_account.test.name}" + resource_group_name = azurerm_resource_group.test.name + name = azurerm_automation_account.test.name } `, resourceGroupName, data.Locations.Primary, data.RandomInteger) } diff --git a/azurerm/internal/services/automation/tests/data_source_automation_variable_bool_test.go b/azurerm/internal/services/automation/tests/data_source_automation_variable_bool_test.go index a8ea6810cd827..4acb067709edb 100644 --- a/azurerm/internal/services/automation/tests/data_source_automation_variable_bool_test.go +++ b/azurerm/internal/services/automation/tests/data_source_automation_variable_bool_test.go @@ -31,9 +31,9 @@ func testAccDataSourceAutomationVariableBool_basic(data acceptance.TestData) str %s data "azurerm_automation_variable_bool" "test" { - name = "${azurerm_automation_variable_bool.test.name}" - resource_group_name = "${azurerm_automation_variable_bool.test.resource_group_name}" - automation_account_name = "${azurerm_automation_variable_bool.test.automation_account_name}" + name = azurerm_automation_variable_bool.test.name + resource_group_name = azurerm_automation_variable_bool.test.resource_group_name + automation_account_name = azurerm_automation_variable_bool.test.automation_account_name } `, config) } diff --git a/azurerm/internal/services/automation/tests/data_source_automation_variable_datetime_test.go b/azurerm/internal/services/automation/tests/data_source_automation_variable_datetime_test.go index 34ba86460c1e8..f4c0874619ca0 100644 --- a/azurerm/internal/services/automation/tests/data_source_automation_variable_datetime_test.go +++ b/azurerm/internal/services/automation/tests/data_source_automation_variable_datetime_test.go @@ -31,9 +31,9 @@ func testAccDataSourceAutomationVariableDateTime_basic(data acceptance.TestData) %s data "azurerm_automation_variable_datetime" "test" { - name = "${azurerm_automation_variable_datetime.test.name}" - resource_group_name = "${azurerm_automation_variable_datetime.test.resource_group_name}" - automation_account_name = "${azurerm_automation_variable_datetime.test.automation_account_name}" + name = azurerm_automation_variable_datetime.test.name + resource_group_name = azurerm_automation_variable_datetime.test.resource_group_name + automation_account_name = azurerm_automation_variable_datetime.test.automation_account_name } `, config) } diff --git a/azurerm/internal/services/automation/tests/data_source_automation_variable_int_test.go b/azurerm/internal/services/automation/tests/data_source_automation_variable_int_test.go index 8a982d34dfb07..886bafcf646d6 100644 --- a/azurerm/internal/services/automation/tests/data_source_automation_variable_int_test.go +++ b/azurerm/internal/services/automation/tests/data_source_automation_variable_int_test.go @@ -31,9 +31,9 @@ func testAccDataSourceAutomationVariableInt_basic(data acceptance.TestData) stri %s data "azurerm_automation_variable_int" "test" { - name = "${azurerm_automation_variable_int.test.name}" - resource_group_name = "${azurerm_automation_variable_int.test.resource_group_name}" - automation_account_name = "${azurerm_automation_variable_int.test.automation_account_name}" + name = azurerm_automation_variable_int.test.name + resource_group_name = azurerm_automation_variable_int.test.resource_group_name + automation_account_name = azurerm_automation_variable_int.test.automation_account_name } `, config) } diff --git a/azurerm/internal/services/automation/tests/data_source_automation_variable_string_test.go b/azurerm/internal/services/automation/tests/data_source_automation_variable_string_test.go index 995bcd8d32de2..426b20dd90d30 100644 --- a/azurerm/internal/services/automation/tests/data_source_automation_variable_string_test.go +++ b/azurerm/internal/services/automation/tests/data_source_automation_variable_string_test.go @@ -31,9 +31,9 @@ func testAccDataSourceAutomationVariableString_basic(data acceptance.TestData) s %s data "azurerm_automation_variable_string" "test" { - name = "${azurerm_automation_variable_string.test.name}" - resource_group_name = "${azurerm_automation_variable_string.test.resource_group_name}" - automation_account_name = "${azurerm_automation_variable_string.test.automation_account_name}" + name = azurerm_automation_variable_string.test.name + resource_group_name = azurerm_automation_variable_string.test.resource_group_name + automation_account_name = azurerm_automation_variable_string.test.automation_account_name } `, config) } diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_account_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_account_test.go index f2d6252cce6fe..8dc403f88e304 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_account_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_account_test.go @@ -150,8 +150,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_automation_account" "test" { name = "acctest-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku_name = "Basic" } @@ -164,9 +164,9 @@ func testAccAzureRMAutomationAccount_requiresImport(data acceptance.TestData) st %s resource "azurerm_automation_account" "import" { - name = "${azurerm_automation_account.test.name}" - location = "${azurerm_automation_account.test.location}" - resource_group_name = "${azurerm_automation_account.test.resource_group_name}" + name = azurerm_automation_account.test.name + location = azurerm_automation_account.test.location + resource_group_name = azurerm_automation_account.test.resource_group_name sku_name = "Basic" } @@ -182,8 +182,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_automation_account" "test" { name = "acctest-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku_name = "Basic" diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_credential_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_credential_test.go index e2836e30d5fff..8a64a804f5ed1 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_credential_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_credential_test.go @@ -151,15 +151,15 @@ resource "azurerm_resource_group" "test" { resource "azurerm_automation_account" "test" { name = "acctest-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku_name = "Basic" } resource "azurerm_automation_credential" "test" { name = "acctest-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - automation_account_name = "${azurerm_automation_account.test.name}" + resource_group_name = azurerm_resource_group.test.name + automation_account_name = azurerm_automation_account.test.name username = "test_user" password = "test_pwd" } @@ -172,11 +172,11 @@ func testAccAzureRMAutomationCredential_requiresImport(data acceptance.TestData) %s resource "azurerm_automation_credential" "import" { - name = "${azurerm_automation_credential.test.name}" - resource_group_name = "${azurerm_automation_credential.test.resource_group_name}" - automation_account_name = "${azurerm_automation_credential.test.automation_account_name}" - username = "${azurerm_automation_credential.test.username}" - password = "${azurerm_automation_credential.test.password}" + name = azurerm_automation_credential.test.name + resource_group_name = azurerm_automation_credential.test.resource_group_name + automation_account_name = azurerm_automation_credential.test.automation_account_name + username = azurerm_automation_credential.test.username + password = azurerm_automation_credential.test.password } `, template) } @@ -190,16 +190,15 @@ resource "azurerm_resource_group" "test" { resource "azurerm_automation_account" "test" { name = "acctest-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku_name = "Basic" - } resource "azurerm_automation_credential" "test" { name = "acctest-%d" - resource_group_name = "${azurerm_resource_group.test.name}" - automation_account_name = "${azurerm_automation_account.test.name}" + resource_group_name = azurerm_resource_group.test.name + automation_account_name = azurerm_automation_account.test.name username = "test_user" password = "test_pwd" description = "This is a test credential for terraform acceptance test" diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_configuration_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_configuration_test.go index 3248254ca1ce0..7aa86ac7f3b60 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_configuration_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_configuration_test.go @@ -161,12 +161,12 @@ func testAccAzureRMAutomationDscConfiguration_requiresImport(data acceptance.Tes %s resource "azurerm_automation_dsc_configuration" "import" { - name = "${azurerm_automation_dsc_configuration.test.name}" - resource_group_name = "${azurerm_automation_dsc_configuration.test.resource_group_name}" - automation_account_name = "${azurerm_automation_dsc_configuration.test.automation_account_name}" - location = "${azurerm_automation_dsc_configuration.test.location}" - content_embedded = "${azurerm_automation_dsc_configuration.test.content_embedded}" - description = "${azurerm_automation_dsc_configuration.test.description}" + name = azurerm_automation_dsc_configuration.test.name + resource_group_name = azurerm_automation_dsc_configuration.test.resource_group_name + automation_account_name = azurerm_automation_dsc_configuration.test.automation_account_name + location = azurerm_automation_dsc_configuration.test.location + content_embedded = azurerm_automation_dsc_configuration.test.content_embedded + description = azurerm_automation_dsc_configuration.test.description } `, template) } diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_nodeconfiguration_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_nodeconfiguration_test.go index 43ff42acc6d0e..6c3b409ab8f71 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_nodeconfiguration_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_nodeconfiguration_test.go @@ -130,24 +130,24 @@ resource "azurerm_resource_group" "test" { resource "azurerm_automation_account" "test" { name = "acctest-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name sku_name = "Basic" } resource "azurerm_automation_dsc_configuration" "test" { name = "acctest" - resource_group_name = "${azurerm_resource_group.test.name}" - automation_account_name = "${azurerm_automation_account.test.name}" - location = "${azurerm_resource_group.test.location}" + resource_group_name = azurerm_resource_group.test.name + automation_account_name = azurerm_automation_account.test.name + location = azurerm_resource_group.test.location content_embedded = "configuration acctest {}" } resource "azurerm_automation_dsc_nodeconfiguration" "test" { name = "acctest.localhost" - resource_group_name = "${azurerm_resource_group.test.name}" - automation_account_name = "${azurerm_automation_account.test.name}" - depends_on = ["azurerm_automation_dsc_configuration.test"] + resource_group_name = azurerm_resource_group.test.name + automation_account_name = azurerm_automation_account.test.name + depends_on = [azurerm_automation_dsc_configuration.test] content_embedded = < Date: Thu, 27 Feb 2020 12:24:00 -0800 Subject: [PATCH 408/498] add provider block to acc tests --- .../analysis_services_server_resource_test.go | 40 +++ .../data_source_api_management_group_test.go | 4 + ...data_source_api_management_product_test.go | 4 + .../tests/data_source_api_management_test.go | 4 + .../data_source_api_management_user_test.go | 4 + ...e_arm_api_management_api_operation_test.go | 4 + ...urce_arm_api_management_api_policy_test.go | 8 + ...urce_arm_api_management_api_schema_test.go | 4 + .../resource_arm_api_management_api_test.go | 8 + ...arm_api_management_api_version_set_test.go | 4 + ...pi_management_authorization_server_test.go | 4 + ...esource_arm_api_management_backend_test.go | 4 + ...rce_arm_api_management_certificate_test.go | 4 + ...urce_arm_api_management_diagnostic_test.go | 4 + .../resource_arm_api_management_group_test.go | 8 + ...urce_arm_api_management_group_user_test.go | 4 + ...i_management_identity_provider_aad_test.go | 8 + ...agement_identity_provider_facebook_test.go | 8 + ...anagement_identity_provider_google_test.go | 8 + ...gement_identity_provider_microsoft_test.go | 8 + ...nagement_identity_provider_twitter_test.go | 8 + ...resource_arm_api_management_logger_test.go | 12 + ...management_openid_connect_provider_test.go | 4 + ...rce_arm_api_management_product_api_test.go | 4 + ...e_arm_api_management_product_group_test.go | 4 + ..._arm_api_management_product_policy_test.go | 8 + ...esource_arm_api_management_product_test.go | 20 ++ ...source_arm_api_management_property_test.go | 8 + ...ce_arm_api_management_subscription_test.go | 4 + .../tests/resource_arm_api_management_test.go | 24 ++ .../resource_arm_api_management_user_test.go | 4 + .../resource_arm_app_configuration_test.go | 16 ++ .../data_source_application_insights_test.go | 4 + ...pplication_insights_analytics_item_test.go | 12 + ...e_arm_application_insights_api_key_test.go | 4 + .../resource_arm_application_insights_test.go | 8 + ..._arm_application_insights_webtests_test.go | 8 + .../data_source_automation_account_test.go | 4 + .../resource_arm_automation_account_test.go | 8 + ...esource_arm_automation_certificate_test.go | 12 + ...resource_arm_automation_credential_test.go | 8 + ...e_arm_automation_dsc_configuration_test.go | 4 + ...m_automation_dsc_nodeconfiguration_test.go | 4 + ...source_arm_automation_job_schedule_test.go | 4 + .../resource_arm_automation_module_test.go | 8 + .../resource_arm_automation_runbook_test.go | 12 + .../resource_arm_automation_schedule_test.go | 4 + ...ource_arm_automation_variable_bool_test.go | 8 + ...e_arm_automation_variable_datetime_test.go | 8 + ...source_arm_automation_variable_int_test.go | 8 + ...rce_arm_automation_variable_string_test.go | 8 + .../tests/data_source_batch_account_test.go | 8 + .../data_source_batch_certificate_test.go | 4 + .../tests/data_source_batch_pool_test.go | 4 + .../tests/resource_arm_batch_account_test.go | 12 + .../resource_arm_batch_application_test.go | 4 + .../resource_arm_batch_certificate_test.go | 16 ++ .../tests/resource_arm_batch_pool_test.go | 44 ++++ .../cdn/tests/data_source_cdn_profile_test.go | 8 + .../tests/resource_arm_cdn_endpoint_test.go | 32 +++ .../tests/resource_arm_cdn_profile_test.go | 24 ++ .../resource_arm_cognitive_account_test.go | 12 + .../data_source_availability_set_test.go | 4 + .../compute/tests/data_source_image_test.go | 8 + .../tests/data_source_managed_disk_test.go | 8 + .../tests/data_source_snapshot_test.go | 4 + .../tests/data_source_virtual_machine_test.go | 4 + .../resource_arm_availability_set_test.go | 24 ++ .../resource_arm_dedicated_host_group_test.go | 8 + .../tests/resource_arm_dedicated_host_test.go | 4 + .../compute/tests/resource_arm_image_test.go | 32 +++ ..._virtual_machine_scale_set_network_test.go | 4 + .../tests/resource_arm_managed_disk_test.go | 32 +++ ...urce_arm_proximity_placement_group_test.go | 12 + .../resource_arm_shared_image_gallery_test.go | 8 + .../tests/resource_arm_shared_image_test.go | 8 + .../tests/resource_arm_snapshot_test.go | 20 ++ ...rtual_machine_data_disk_attachment_test.go | 16 ++ ...urce_arm_virtual_machine_extension_test.go | 16 ++ ..._arm_virtual_machine_managed_disks_test.go | 84 +++++++ ...irtual_machine_scale_set_extension_test.go | 8 + ...urce_arm_virtual_machine_scale_set_test.go | 176 ++++++++++++++ .../resource_arm_virtual_machine_test.go | 20 ++ ...rm_virtual_machine_unmanaged_disks_test.go | 108 +++++++++ ..._virtual_machine_scale_set_network_test.go | 4 + .../resource_arm_container_group_test.go | 48 ++++ .../resource_arm_container_registry_test.go | 40 +++ ...urce_arm_kubernetes_cluster_addons_test.go | 32 +++ ...source_arm_kubernetes_cluster_auth_test.go | 16 ++ ...rce_arm_kubernetes_cluster_network_test.go | 56 +++++ ...e_arm_kubernetes_cluster_node_pool_test.go | 19 ++ ...ource_arm_kubernetes_cluster_other_test.go | 36 +++ ...rce_arm_kubernetes_cluster_scaling_test.go | 16 ++ ...urce_arm_cosmosdb_account_failover_test.go | 28 +++ .../resource_arm_cosmosdb_account_test.go | 16 ++ .../resource_arm_databricks_workspace_test.go | 12 + ...rce_arm_data_factory_dataset_mysql_test.go | 12 + ...rm_data_factory_dataset_postgresql_test.go | 12 + ...a_factory_dataset_sql_server_table_test.go | 12 + ...actory_integration_runtime_managed_test.go | 16 ++ ...ked_service_data_lake_storage_gen2_test.go | 12 + ..._data_factory_linked_service_mysql_test.go | 12 + ..._factory_linked_service_postgresql_test.go | 12 + ..._factory_linked_service_sql_server_test.go | 8 + ...resource_arm_data_factory_pipeline_test.go | 12 + .../tests/resource_arm_data_factory_test.go | 24 ++ ..._arm_data_factory_trigger_schedule_test.go | 8 + .../tests/data_source_data_lake_store_test.go | 8 + ..._data_lake_analytics_firewall_rule_test.go | 4 + .../resource_arm_data_lake_store_file_test.go | 8 + ..._arm_data_lake_store_firewall_rule_test.go | 4 + .../resource_arm_data_lake_store_test.go | 24 ++ .../resource_arm_devspace_controller_test.go | 4 + .../tests/data_source_dev_test_lab_test.go | 8 + ...ta_source_dev_test_virtual_network_test.go | 4 + ...resource_arm_dev_test_lab_schedule_test.go | 20 ++ .../tests/resource_arm_dev_test_lab_test.go | 8 + ...arm_dev_test_linux_virtual_machine_test.go | 4 + .../resource_arm_dev_test_policy_test.go | 8 + ...ource_arm_dev_test_virtual_network_test.go | 8 + ...m_dev_test_windows_virtual_machine_test.go | 4 + .../dns/tests/data_source_dns_zone_test.go | 12 + .../tests/resource_arm_dns_a_record_test.go | 32 +++ .../resource_arm_dns_aaaa_record_test.go | 36 +++ .../tests/resource_arm_dns_caa_record_test.go | 16 ++ .../resource_arm_dns_cname_record_test.go | 36 +++ .../tests/resource_arm_dns_mx_record_test.go | 20 ++ .../tests/resource_arm_dns_ns_record_test.go | 16 ++ .../tests/resource_arm_dns_ptr_record_test.go | 16 ++ .../tests/resource_arm_dns_srv_record_test.go | 16 ++ .../tests/resource_arm_dns_txt_record_test.go | 16 ++ .../dns/tests/resource_arm_dns_zone_test.go | 12 + .../resource_arm_eventgrid_domain_test.go | 12 + ...e_arm_eventgrid_event_subscription_test.go | 16 ++ .../resource_arm_eventgrid_topic_test.go | 8 + ...ata_source_eventhub_consumer_group_test.go | 4 + ...nthub_namespace_authorization_rule_test.go | 4 + .../data_source_eventhub_namespace_test.go | 8 + ...ce_arm_eventhub_authorization_rule_test.go | 4 + ...source_arm_eventhub_consumer_group_test.go | 8 + ...nthub_namespace_authorization_rule_test.go | 4 + ...namespace_disaster_recovery_config_test.go | 16 ++ .../resource_arm_eventhub_namespace_test.go | 44 ++++ .../tests/resource_arm_eventhub_test.go | 20 ++ ...rce_arm_front_door_firewall_policy_test.go | 12 + .../tests/resource_arm_front_door_test.go | 29 +++ ...ource_arm_hdinsight_hadoop_cluster_test.go | 8 + ...source_arm_hdinsight_hbase_cluster_test.go | 8 + ...dinsight_interactive_query_cluster_test.go | 8 + ...source_arm_hdinsight_kafka_cluster_test.go | 8 + ..._arm_hdinsight_ml_services_cluster_test.go | 4 + ...urce_arm_hdinsight_rserver_cluster_test.go | 4 + ...source_arm_hdinsight_spark_cluster_test.go | 8 + ...source_arm_hdinsight_storm_cluster_test.go | 4 + ...ce_iothub_dps_shared_access_policy_test.go | 4 + ...resource_arm_iothub_consumer_group_test.go | 4 + ...esource_arm_iothub_dps_certificate_test.go | 8 + ...rm_iothub_dps_shared_access_policy_test.go | 16 ++ .../tests/resource_arm_iothub_dps_test.go | 16 ++ ...ource_arm_iothub_endpoint_eventhub_test.go | 4 + ...m_iothub_endpoint_servicebus_queue_test.go | 4 + ...m_iothub_endpoint_servicebus_topic_test.go | 4 + ..._iothub_endpoint_storage_container_test.go | 4 + ...resource_arm_iothub_fallback_route_test.go | 8 + .../tests/resource_arm_iothub_route_test.go | 8 + ...ce_arm_iothub_shared_access_policy_test.go | 8 + .../iothub/tests/resource_arm_iothub_test.go | 24 ++ .../tests/resource_arm_kusto_cluster_test.go | 16 ++ ...arm_kusto_eventhub_data_connection_test.go | 4 + ...e_arm_log_analytics_linked_service_test.go | 4 + ...esource_arm_log_analytics_solution_test.go | 8 + ...source_arm_log_analytics_workspace_test.go | 8 + ...source_arm_logic_app_action_custom_test.go | 4 + ...resource_arm_logic_app_action_http_test.go | 4 + ...ource_arm_logic_app_trigger_custom_test.go | 4 + ...arm_logic_app_trigger_http_request_test.go | 4 + ...e_arm_logic_app_trigger_recurrence_test.go | 8 + .../resource_arm_logic_app_workflow_test.go | 8 + .../tests/resource_arm_maps_account_test.go | 12 + .../tests/data_source_mariadb_server_test.go | 4 + ...resource_arm_mariadb_configuration_test.go | 4 + .../resource_arm_mariadb_database_test.go | 4 + ...resource_arm_mariadb_firewall_rule_test.go | 4 + .../tests/resource_arm_mariadb_server_test.go | 32 +++ ...e_arm_mariadb_virtual_network_rule_test.go | 16 ++ ...esource_arm_media_services_account_test.go | 4 + .../data_source_monitor_action_group_test.go | 12 + ...urce_monitor_diagnostic_categories_test.go | 8 + .../data_source_monitor_log_profile_test.go | 8 + .../resource_arm_monitor_action_group_test.go | 52 ++++ ...rce_arm_monitor_activity_log_alert_test.go | 12 + ...urce_arm_monitor_autoscale_setting_test.go | 4 + .../resource_arm_monitor_log_profile_test.go | 12 + .../resource_arm_monitor_metric_alert_test.go | 8 + ...data_source_user_assigned_identity_test.go | 4 + ...esource_arm_user_assigned_identity_test.go | 4 + .../data_source_mssql_elasticpool_test.go | 4 + ...erability_assessment_rule_baseline_test.go | 4 + .../resource_arm_mssql_elasticpool_test.go | 12 + ...mssql_server_security_alert_policy_test.go | 4 + ...ql_server_vulnerability_assessment_test.go | 4 + .../resource_arm_mysql_configuration_test.go | 4 + .../tests/resource_arm_mysql_database_test.go | 12 + .../resource_arm_mysql_firewall_rule_test.go | 4 + .../tests/resource_arm_mysql_server_test.go | 24 ++ ...rce_arm_mysql_virtual_network_rule_test.go | 20 ++ .../tests/resource_arm_netapp_account_test.go | 8 + .../tests/resource_arm_netapp_pool_test.go | 8 + .../resource_arm_netapp_snapshot_test.go | 4 + .../tests/resource_arm_netapp_volume_test.go | 4 + ..._source_application_security_group_test.go | 8 + .../tests/data_source_firewall_test.go | 4 + ...data_source_network_security_group_test.go | 12 + .../tests/data_source_network_watcher_test.go | 4 + .../data_source_public_ip_prefix_test.go | 4 + .../tests/data_source_public_ip_test.go | 8 + .../tests/data_source_public_ips_test.go | 12 + .../network/tests/data_source_subnet_test.go | 4 + ...ata_source_virtual_network_gateway_test.go | 4 + .../tests/data_source_virtual_network_test.go | 12 + ...ecurity_group_association_resource_test.go | 4 + ...ecurity_group_association_resource_test.go | 4 + .../resource_arm_application_gateway_test.go | 4 + ...rce_arm_application_security_group_test.go | 8 + .../tests/resource_arm_bastion_host_test.go | 8 + ...xpress_route_circuit_authorization_test.go | 8 + ..._arm_express_route_circuit_peering_test.go | 12 + ...resource_arm_express_route_circuit_test.go | 16 ++ ...resource_arm_express_route_gateway_test.go | 4 + .../tests/resource_arm_firewall_test.go | 20 ++ ..._loadbalancer_backend_address_pool_test.go | 8 + ...resource_arm_loadbalancer_nat_pool_test.go | 16 ++ ...resource_arm_loadbalancer_nat_rule_test.go | 4 + ...rce_arm_loadbalancer_outbound_rule_test.go | 20 ++ .../resource_arm_loadbalancer_probe_test.go | 24 ++ .../resource_arm_loadbalancer_rule_test.go | 4 + .../tests/resource_arm_loadbalancer_test.go | 32 +++ ...resource_arm_local_network_gateway_test.go | 16 ++ .../tests/resource_arm_nat_gateway_test.go | 8 + ...rce_arm_network_connection_monitor_test.go | 4 + ...e_arm_network_ddos_protection_plan_test.go | 12 + ...ce_application_gateway_association_test.go | 4 + ...e_backend_address_pool_association_test.go | 4 + ...ork_interface_nat_rule_association_test.go | 4 + .../resource_arm_network_interface_test.go | 4 + ...esource_arm_network_packet_capture_test.go | 4 + .../resource_arm_network_profile_test.go | 12 + ...esource_arm_network_security_group_test.go | 32 +++ ...resource_arm_network_security_rule_test.go | 8 + .../resource_arm_network_watcher_test.go | 8 + .../tests/resource_arm_packet_capture_test.go | 4 + ...urce_arm_point_to_site_vpn_gateway_test.go | 4 + .../resource_arm_public_ip_prefix_test.go | 16 ++ .../tests/resource_arm_public_ip_test.go | 64 +++++ .../tests/resource_arm_route_table_test.go | 36 +++ .../network/tests/resource_arm_route_test.go | 12 + ...arm_subnet_nat_gateway_association_test.go | 4 + ...network_security_group_association_test.go | 4 + ...arm_subnet_route_table_association_test.go | 4 + .../network/tests/resource_arm_subnet_test.go | 4 + .../tests/resource_arm_virtual_hub_test.go | 4 + ...source_arm_virtual_network_gateway_test.go | 40 +++ ...source_arm_virtual_network_peering_test.go | 8 + .../resource_arm_virtual_network_test.go | 20 ++ .../tests/resource_arm_virtual_wan_test.go | 8 + .../tests/resource_arm_vpn_gateway_test.go | 4 + ...ource_arm_vpn_server_configuration_test.go | 4 + ...rm_web_application_firewall_policy_test.go | 8 + ...otification_hub_authorization_rule_test.go | 4 + ...rce_arm_notification_hub_namespace_test.go | 4 + .../resource_arm_notification_hub_test.go | 4 + ...ource_arm_postgresql_configuration_test.go | 4 + .../resource_arm_postgresql_database_test.go | 16 ++ ...ource_arm_postgresql_firewall_rule_test.go | 4 + .../resource_arm_postgresql_server_test.go | 28 +++ ...rm_postgresql_virtual_network_rule_test.go | 16 ++ .../resource_arm_private_dns_a_record_test.go | 16 ++ ...source_arm_private_dns_aaaa_record_test.go | 16 ++ ...ource_arm_private_dns_cname_record_test.go | 20 ++ ...resource_arm_private_dns_mx_record_test.go | 20 ++ ...esource_arm_private_dns_ptr_record_test.go | 16 ++ ...esource_arm_private_dns_srv_record_test.go | 16 ++ .../resource_arm_private_dns_zone_test.go | 12 + ...vate_dns_zone_virtual_network_link_test.go | 12 + ...m_backup_container_storage_account_test.go | 4 + .../resource_arm_backup_protected_vm_test.go | 4 + ...source_arm_recovery_services_vault_test.go | 8 + .../resource_arm_site_recovery_fabric_test.go | 4 + ..._arm_site_recovery_network_mapping_test.go | 4 + ...site_recovery_protection_container_test.go | 4 + ...ce_arm_site_recovery_replicated_vm_test.go | 4 + ...m_site_recovery_replication_policy_test.go | 4 + .../tests/resource_arm_redis_cache_test.go | 64 +++++ .../resource_arm_redis_firewall_rule_test.go | 8 + ...source_arm_relay_hybrid_connection_test.go | 12 + .../resource_arm_relay_namespace_test.go | 8 + .../tests/data_source_resource_group_test.go | 4 + .../tests/data_source_resources_test.go | 4 + .../resource_arm_management_lock_test.go | 24 ++ .../tests/resource_arm_resource_group_test.go | 12 + .../resource_arm_template_deployment_test.go | 28 +++ .../tests/resource_arm_search_service_test.go | 8 + ...rce_arm_advanced_threat_protection_test.go | 8 + ...cebus_namespace_authorization_rule_test.go | 4 + .../resource_arm_servicebus_namespace_test.go | 24 ++ ...ervicebus_queue_authorization_rule_test.go | 4 + .../resource_arm_servicebus_queue_test.go | 44 ++++ ...e_arm_servicebus_subscription_rule_test.go | 4 + ...ervicebus_topic_authorization_rule_test.go | 4 + .../resource_arm_servicebus_topic_test.go | 32 +++ ...esource_arm_service_fabric_cluster_test.go | 72 ++++++ .../resource_arm_signalr_service_test.go | 16 ++ .../tests/resource_arm_sql_database_test.go | 48 ++++ .../resource_arm_sql_elasticpool_test.go | 8 + .../resource_arm_sql_failover_group_test.go | 12 + .../resource_arm_sql_firewall_rule_test.go | 8 + .../sql/tests/resource_arm_sql_server_test.go | 16 ++ ...ource_arm_sql_virtual_network_rule_test.go | 28 +++ .../data_source_storage_account_sas_test.go | 4 + .../tests/data_source_storage_account_test.go | 4 + .../data_source_storage_container_test.go | 4 + ...a_source_storage_management_policy_test.go | 4 + ..._arm_storage_account_network_rules_test.go | 12 + .../resource_arm_storage_account_test.go | 100 ++++++++ .../tests/resource_arm_storage_blob_test.go | 12 + .../resource_arm_storage_container_test.go | 4 + ..._storage_data_lake_gen2_filesystem_test.go | 4 + ...urce_arm_storage_management_policy_test.go | 12 + .../tests/resource_arm_storage_queue_test.go | 4 + ...source_arm_storage_share_directory_test.go | 4 + .../tests/resource_arm_storage_share_test.go | 4 + .../resource_arm_storage_table_entity_test.go | 4 + .../tests/resource_arm_storage_table_test.go | 12 + ..._analytics_function_javascript_udf_test.go | 4 + .../resource_arm_stream_analytics_job_test.go | 12 + ...e_arm_stream_analytics_output_blob_test.go | 4 + ...m_stream_analytics_output_eventhub_test.go | 4 + ..._arm_stream_analytics_output_mssql_test.go | 4 + ..._analytics_output_servicebus_queue_test.go | 4 + ..._analytics_output_servicebus_topic_test.go | 4 + ...eam_analytics_reference_input_blob_test.go | 4 + ...stream_analytics_stream_input_blob_test.go | 4 + ...am_analytics_stream_input_eventhub_test.go | 4 + ...ream_analytics_stream_input_iothub_test.go | 4 + ...ource_arm_traffic_manager_endpoint_test.go | 60 +++++ ...source_arm_traffic_manager_profile_test.go | 16 ++ .../app_service_environment_resource_test.go | 4 + .../data_source_app_service_plan_test.go | 16 ++ ...source_arm_app_service_active_slot_test.go | 12 + ..._arm_app_service_certificate_order_test.go | 12 + ...source_arm_app_service_certificate_test.go | 8 + ...pp_service_custom_hostname_binding_test.go | 8 + .../resource_arm_app_service_plan_test.go | 44 ++++ .../resource_arm_app_service_slot_test.go | 184 ++++++++++++++ .../tests/resource_arm_app_service_test.go | 228 ++++++++++++++++++ ...ervice_virtual_network_association_test.go | 4 + .../tests/resource_arm_function_app_test.go | 112 +++++++++ 357 files changed, 5056 insertions(+) diff --git a/azurerm/internal/services/analysisservices/tests/analysis_services_server_resource_test.go b/azurerm/internal/services/analysisservices/tests/analysis_services_server_resource_test.go index 198991e59440d..4fa6b04b8e39e 100644 --- a/azurerm/internal/services/analysisservices/tests/analysis_services_server_resource_test.go +++ b/azurerm/internal/services/analysisservices/tests/analysis_services_server_resource_test.go @@ -211,6 +211,10 @@ func TestAccAzureRMAnalysisServicesServer_backupBlobContainerUri(t *testing.T) { func testAccAzureRMAnalysisServicesServer_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -227,6 +231,10 @@ resource "azurerm_analysis_services_server" "test" { func testAccAzureRMAnalysisServicesServer_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -247,6 +255,10 @@ resource "azurerm_analysis_services_server" "test" { func testAccAzureRMAnalysisServicesServer_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -268,6 +280,10 @@ resource "azurerm_analysis_services_server" "test" { func testAccAzureRMAnalysisServicesServer_querypoolConnectionMode(data acceptance.TestData, connectionMode string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -285,6 +301,10 @@ resource "azurerm_analysis_services_server" "test" { func testAccAzureRMAnalysisServicesServer_firewallSettings1(data acceptance.TestData, enablePowerBIService bool) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -302,6 +322,10 @@ resource "azurerm_analysis_services_server" "test" { func testAccAzureRMAnalysisServicesServer_firewallSettings2(data acceptance.TestData, enablePowerBIService bool) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -325,6 +349,10 @@ resource "azurerm_analysis_services_server" "test" { func testAccAzureRMAnalysisServicesServer_firewallSettings3(data acceptance.TestData, enablePowerBIService bool) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -354,6 +382,10 @@ resource "azurerm_analysis_services_server" "test" { func testAccAzureRMAnalysisServicesServer_adminUsers(data acceptance.TestData, adminUsers []string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -371,6 +403,10 @@ resource "azurerm_analysis_services_server" "test" { func testAccAzureRMAnalysisServicesServer_serverFullName(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -387,6 +423,10 @@ resource "azurerm_analysis_services_server" "test" { func testAccAzureRMAnalysisServicesServer_backupBlobContainerUri(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/data_source_api_management_group_test.go b/azurerm/internal/services/apimanagement/tests/data_source_api_management_group_test.go index 64662b2796ac2..376eae63d1df1 100644 --- a/azurerm/internal/services/apimanagement/tests/data_source_api_management_group_test.go +++ b/azurerm/internal/services/apimanagement/tests/data_source_api_management_group_test.go @@ -30,6 +30,10 @@ func TestAccDataSourceAzureRMApiManagementGroup_basic(t *testing.T) { func testAccDataSourceApiManagementGroup_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/data_source_api_management_product_test.go b/azurerm/internal/services/apimanagement/tests/data_source_api_management_product_test.go index f4f5af2ad70e4..ad89dbed8310f 100644 --- a/azurerm/internal/services/apimanagement/tests/data_source_api_management_product_test.go +++ b/azurerm/internal/services/apimanagement/tests/data_source_api_management_product_test.go @@ -33,6 +33,10 @@ func TestAccDataSourceAzureRMApiManagementProduct_basic(t *testing.T) { func testAccDataSourceApiManagementProduct_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "amtestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/data_source_api_management_test.go b/azurerm/internal/services/apimanagement/tests/data_source_api_management_test.go index 6063cd7ca5bc8..013ecddd5f3ff 100644 --- a/azurerm/internal/services/apimanagement/tests/data_source_api_management_test.go +++ b/azurerm/internal/services/apimanagement/tests/data_source_api_management_test.go @@ -33,6 +33,10 @@ func TestAccDataSourceAzureRMApiManagement_basic(t *testing.T) { func testAccDataSourceApiManagement_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "amtestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/data_source_api_management_user_test.go b/azurerm/internal/services/apimanagement/tests/data_source_api_management_user_test.go index cecd7a4c12073..3432d3b70f637 100644 --- a/azurerm/internal/services/apimanagement/tests/data_source_api_management_user_test.go +++ b/azurerm/internal/services/apimanagement/tests/data_source_api_management_user_test.go @@ -32,6 +32,10 @@ func TestAccDataSourceAzureRMApiManagementUser_basic(t *testing.T) { func testAccDataSourceApiManagementUser_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "amtestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_test.go index a46a00e50244c..bd1e3adf3c1d6 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_test.go @@ -489,6 +489,10 @@ SAMPLE func testAccAzureRMApiManagementApiOperation_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_policy_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_policy_test.go index 52d48662e6f43..84d83a1d33e31 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_policy_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_policy_test.go @@ -171,6 +171,10 @@ func testCheckAzureRMApiManagementAPIPolicyDestroy(s *terraform.State) error { func testAccAzureRMApiManagementAPIPolicy_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -220,6 +224,10 @@ resource "azurerm_api_management_api_policy" "import" { func testAccAzureRMApiManagementAPIPolicy_customPolicy(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_schema_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_schema_test.go index 193082f8decb7..060951c3d6853 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_schema_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_schema_test.go @@ -146,6 +146,10 @@ resource "azurerm_api_management_api_schema" "import" { func testAccAzureRMApiManagementApiSchema_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_test.go index 5eed7ee7fb201..2e070de3d4662 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_test.go @@ -543,6 +543,10 @@ resource "azurerm_api_management_api" "test" { func testAccAzureRMApiManagementApi_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -563,6 +567,10 @@ resource "azurerm_api_management" "test" { // Remove in 2.0 func testAccAzureRMApiManagementApi_templateClassic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_version_set_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_version_set_test.go index fdf4f7792bbf5..e05f77f9c882f 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_version_set_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_version_set_test.go @@ -257,6 +257,10 @@ resource "azurerm_api_management_api_version_set" "test" { func testAccAzureRMApiManagementApiVersionSet_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_authorization_server_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_authorization_server_test.go index 5b97d4a197a31..04f50bb655cf6 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_authorization_server_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_authorization_server_test.go @@ -211,6 +211,10 @@ resource "azurerm_api_management_authorization_server" "test" { func testAccAzureRMAPIManagementAuthorizationServer_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_backend_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_backend_test.go index bd4fab4ea9231..a0bdc81d6bffc 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_backend_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_backend_test.go @@ -439,6 +439,10 @@ resource "azurerm_api_management_backend" "import" { func testAccAzureRMApiManagementBackend_template(data acceptance.TestData, testName string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d-%s" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_certificate_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_certificate_test.go index 11d37f563775c..83c5cc9a2c324 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_certificate_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_certificate_test.go @@ -120,6 +120,10 @@ func testCheckAzureRMAPIManagementCertificateExists(resourceName string) resourc func testAccAzureRMAPIManagementCertificate_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_diagnostic_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_diagnostic_test.go index a88b628620bc8..79aeb9642dd45 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_diagnostic_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_diagnostic_test.go @@ -108,6 +108,10 @@ func testCheckAzureRMApiManagementDiagnosticExists(resourceName string) resource func testAccAzureRMApiManagementDiagnostic_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_group_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_group_test.go index e1e512571c3e1..09e5dab51b8bc 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_group_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_group_test.go @@ -173,6 +173,10 @@ func testCheckAzureRMAPIManagementGroupExists(resourceName string) resource.Test func testAccAzureRMAPIManagementGroup_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -213,6 +217,10 @@ resource "azurerm_api_management_group" "import" { func testAccAzureRMAPIManagementGroup_complete(data acceptance.TestData, displayName, description string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_group_user_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_group_user_test.go index 6c992b5b929d9..d29703caf6f36 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_group_user_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_group_user_test.go @@ -109,6 +109,10 @@ func testCheckAzureRMAPIManagementGroupUserExists(resourceName string) resource. func testAccAzureRMAPIManagementGroupUser_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_aad_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_aad_test.go index 34d2943ac994a..414be8ef8ff12 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_aad_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_aad_test.go @@ -141,6 +141,10 @@ func testCheckAzureRMApiManagementIdentityProviderAADExists(resourceName string) func testAccAzureRMApiManagementIdentityProviderAAD_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-api-%d" location = "%s" @@ -167,6 +171,10 @@ resource "azurerm_api_management_identity_provider_aad" "test" { func testAccAzureRMApiManagementIdentityProviderAAD_update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-api-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_facebook_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_facebook_test.go index ffdd25220bca5..225645cb933d1 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_facebook_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_facebook_test.go @@ -137,6 +137,10 @@ func testCheckAzureRMApiManagementIdentityProviderFacebookExists(resourceName st func testAccAzureRMApiManagementIdentityProviderFacebook_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-api-%d" location = "%s" @@ -162,6 +166,10 @@ resource "azurerm_api_management_identity_provider_facebook" "test" { func testAccAzureRMApiManagementIdentityProviderFacebook_update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-api-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_google_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_google_test.go index b27e963c80219..8c566ce8f6b51 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_google_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_google_test.go @@ -136,6 +136,10 @@ func testCheckAzureRMApiManagementIdentityProviderGoogleExists(resourceName stri func testAccAzureRMApiManagementIdentityProviderGoogle_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-api-%d" location = "%s" @@ -161,6 +165,10 @@ resource "azurerm_api_management_identity_provider_google" "test" { func testAccAzureRMApiManagementIdentityProviderGoogle_update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-api-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_microsoft_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_microsoft_test.go index 43cbfffc2a8b6..801d8abab0061 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_microsoft_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_microsoft_test.go @@ -137,6 +137,10 @@ func testCheckAzureRMApiManagementIdentityProviderMicrosoftExists(resourceName s func testAccAzureRMApiManagementIdentityProviderMicrosoft_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-api-%d" location = "%s" @@ -162,6 +166,10 @@ resource "azurerm_api_management_identity_provider_microsoft" "test" { func testAccAzureRMApiManagementIdentityProviderMicrosoft_update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-api-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_twitter_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_twitter_test.go index 7933dbc014943..47ad166d2f83b 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_twitter_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_identity_provider_twitter_test.go @@ -137,6 +137,10 @@ func testCheckAzureRMApiManagementIdentityProviderTwtterExists(resourceName stri func testAccAzureRMApiManagementIdentityProviderTwitter_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-api-%d" location = "%s" @@ -162,6 +166,10 @@ resource "azurerm_api_management_identity_provider_twitter" "test" { func testAccAzureRMApiManagementIdentityProviderTwitter_update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-api-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_logger_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_logger_test.go index e07b78b1ab4ad..87f5549ad5a6a 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_logger_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_logger_test.go @@ -254,6 +254,10 @@ func testCheckAzureRMApiManagementLoggerDestroy(s *terraform.State) error { func testAccAzureRMApiManagementLogger_basicEventHub(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -317,6 +321,10 @@ resource "azurerm_api_management_logger" "import" { func testAccAzureRMApiManagementLogger_basicApplicationInsights(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -353,6 +361,10 @@ resource "azurerm_api_management_logger" "test" { func testAccAzureRMApiManagementLogger_complete(data acceptance.TestData, description, buffered string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_openid_connect_provider_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_openid_connect_provider_test.go index d685ff14ebc5d..725e9293f4fd8 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_openid_connect_provider_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_openid_connect_provider_test.go @@ -183,6 +183,10 @@ resource "azurerm_api_management_openid_connect_provider" "test" { func testAccAzureRMApiManagementOpenIDConnectProvider_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_api_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_api_test.go index 8b8628c81c20d..c7d8cf61de3e1 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_api_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_api_test.go @@ -109,6 +109,10 @@ func testCheckAzureRMAPIManagementProductApiExists(resourceName string) resource func testAccAzureRMAPIManagementProductApi_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_group_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_group_test.go index 0b66598a973fd..0696f98213109 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_group_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_group_test.go @@ -109,6 +109,10 @@ func testCheckAzureRMAPIManagementProductGroupExists(resourceName string) resour func testAccAzureRMAPIManagementProductGroup_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_policy_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_policy_test.go index a2d142d1fd8da..005f7fb710526 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_policy_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_policy_test.go @@ -146,6 +146,10 @@ func testCheckAzureRMApiManagementProductPolicyDestroy(s *terraform.State) error func testAccAzureRMApiManagementProductPolicy_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -194,6 +198,10 @@ resource "azurerm_api_management_product_policy" "import" { func testAccAzureRMApiManagementProductPolicy_updated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_test.go index 7530e784c4d84..729f486ece47a 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_product_test.go @@ -238,6 +238,10 @@ func testCheckAzureRMApiManagementProductExists(resourceName string) resource.Te func testAccAzureRMApiManagementProduct_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -283,6 +287,10 @@ resource "azurerm_api_management_product" "import" { func testAccAzureRMApiManagementProduct_updated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -313,6 +321,10 @@ resource "azurerm_api_management_product" "test" { func testAccAzureRMApiManagementProduct_subscriptionLimits(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -343,6 +355,10 @@ resource "azurerm_api_management_product" "test" { func testAccAzureRMApiManagementProduct_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -375,6 +391,10 @@ resource "azurerm_api_management_product" "test" { func testAccAzureRMApiManagementProduct_approvalRequiredError(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_property_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_property_test.go index d03ba06cbe8bd..a2cb8630738b6 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_property_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_property_test.go @@ -126,6 +126,10 @@ func testCheckAzureRMAPIManagementPropertyExists(resourceName string) resource.T func testAccAzureRMAPIManagementProperty_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -154,6 +158,10 @@ resource "azurerm_api_management_property" "test" { func testAccAzureRMAPIManagementProperty_update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_subscription_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_subscription_test.go index e0a63b0ce00c1..89d64fdccf2d4 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_subscription_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_subscription_test.go @@ -240,6 +240,10 @@ resource "azurerm_api_management_subscription" "test" { func testAccAzureRMAPIManagementSubscription_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_test.go index c8527a2978240..5cad4077dcdee 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_test.go @@ -227,6 +227,10 @@ func testCheckAzureRMApiManagementExists(resourceName string) resource.TestCheck func testAccAzureRMApiManagement_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -246,6 +250,10 @@ resource "azurerm_api_management" "test" { func testAccAzureRMApiManagement_policyXmlContent(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -276,6 +284,10 @@ XML func testAccAzureRMApiManagement_policyXmlLink(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -299,6 +311,10 @@ resource "azurerm_api_management" "test" { func testAccAzureRMApiManagement_policyRemoved(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -337,6 +353,10 @@ resource "azurerm_api_management" "import" { func testAccAzureRMApiManagement_customProps(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -361,6 +381,10 @@ resource "azurerm_api_management" "test" { func testAccAzureRMApiManagement_signInSignUpSettings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_user_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_user_test.go index 999c8c305676b..c2a18ed1c961d 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_user_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_user_test.go @@ -402,6 +402,10 @@ resource "azurerm_api_management_user" "test" { func testAccAzureRMApiManagementUser_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/appconfiguration/tests/resource_arm_app_configuration_test.go b/azurerm/internal/services/appconfiguration/tests/resource_arm_app_configuration_test.go index fb127e502073a..445ed626dc4b2 100644 --- a/azurerm/internal/services/appconfiguration/tests/resource_arm_app_configuration_test.go +++ b/azurerm/internal/services/appconfiguration/tests/resource_arm_app_configuration_test.go @@ -234,6 +234,10 @@ func testCheckAzureAppConfigurationExists(resourceName string) resource.TestChec func testAccAzureAppConfiguration_free(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -250,6 +254,10 @@ resource "azurerm_app_configuration" "test" { func testAccAzureAppConfiguration_standard(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -280,6 +288,10 @@ resource "azurerm_app_configuration" "import" { func testAccAzureAppConfiguration_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -300,6 +312,10 @@ resource "azurerm_app_configuration" "test" { func testAccAzureAppConfiguration_completeUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/applicationinsights/tests/data_source_application_insights_test.go b/azurerm/internal/services/applicationinsights/tests/data_source_application_insights_test.go index 923a80ff7ea4e..81b463feb3868 100644 --- a/azurerm/internal/services/applicationinsights/tests/data_source_application_insights_test.go +++ b/azurerm/internal/services/applicationinsights/tests/data_source_application_insights_test.go @@ -33,6 +33,10 @@ func TestAccDataSourceApplicationInsights_basic(t *testing.T) { func testAccResourceApplicationInsights_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" diff --git a/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_analytics_item_test.go b/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_analytics_item_test.go index a39a54886fa12..a4b4778cd49fc 100644 --- a/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_analytics_item_test.go +++ b/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_analytics_item_test.go @@ -174,6 +174,10 @@ func testCheckAzureRMApplicationInsightsAnalyticsItemExistsInternal(rs *terrafor func testAccAzureRMApplicationInsightsAnalyticsItem_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -198,6 +202,10 @@ resource "azurerm_application_insights_analytics_item" "test" { func testAccAzureRMApplicationInsightsAnalyticsItem_basic2(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -222,6 +230,10 @@ resource "azurerm_application_insights_analytics_item" "test" { func testAccAzureRMApplicationInsightsAnalyticsItem_multiple(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_api_key_test.go b/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_api_key_test.go index de98794bb8fcf..6b43ca8ba73b1 100644 --- a/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_api_key_test.go +++ b/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_api_key_test.go @@ -207,6 +207,10 @@ func testCheckAzureRMApplicationInsightsAPIKeyExists(resourceName string) resour func testAccAzureRMApplicationInsightsAPIKey_basic(data acceptance.TestData, readPerms, writePerms string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_test.go b/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_test.go index 14c0a18e77196..22ffbb3053b11 100644 --- a/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_test.go +++ b/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_test.go @@ -263,6 +263,10 @@ func TestAccAzureRMApplicationInsights_complete(t *testing.T) { func testAccAzureRMApplicationInsights_basic(data acceptance.TestData, applicationType string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -293,6 +297,10 @@ resource "azurerm_application_insights" "import" { func testAccAzureRMApplicationInsights_complete(data acceptance.TestData, applicationType string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_webtests_test.go b/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_webtests_test.go index 4fa0e7e700456..b9e892d9160cb 100644 --- a/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_webtests_test.go +++ b/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_webtests_test.go @@ -167,6 +167,10 @@ func testCheckAzureRMApplicationInsightsWebTestExists(resourceName string) resou func testAccAzureRMApplicationInsightsWebTests_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -201,6 +205,10 @@ XML func testAccAzureRMApplicationInsightsWebTests_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/automation/tests/data_source_automation_account_test.go b/azurerm/internal/services/automation/tests/data_source_automation_account_test.go index 6c88f8cfa9fd1..902c56fa0af6b 100644 --- a/azurerm/internal/services/automation/tests/data_source_automation_account_test.go +++ b/azurerm/internal/services/automation/tests/data_source_automation_account_test.go @@ -28,6 +28,10 @@ func TestAccDataSourceAutomationAccount(t *testing.T) { func testAccDataSourceAutomationAccount_complete(resourceGroupName string, data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "%s" location = "%s" diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_account_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_account_test.go index 8dc403f88e304..74a182fbbafe3 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_account_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_account_test.go @@ -143,6 +143,10 @@ func testCheckAzureRMAutomationAccountExists(resourceName string) resource.TestC func testAccAzureRMAutomationAccount_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -175,6 +179,10 @@ resource "azurerm_automation_account" "import" { func testAccAzureRMAutomationAccount_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_certificate_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_certificate_test.go index 6d4e06d529cd2..cf649eeb49eab 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_certificate_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_certificate_test.go @@ -173,6 +173,10 @@ func testCheckAzureRMAutomationCertificateExists(resourceName string) resource.T func testAccAzureRMAutomationCertificate_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -210,6 +214,10 @@ resource "azurerm_automation_certificate" "import" { func testAccAzureRMAutomationCertificate_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -234,6 +242,10 @@ resource "azurerm_automation_certificate" "test" { func testAccAzureRMAutomationCertificate_update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_credential_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_credential_test.go index 8a64a804f5ed1..63794d340812c 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_credential_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_credential_test.go @@ -144,6 +144,10 @@ func testCheckAzureRMAutomationCredentialExists(resourceName string) resource.Te func testAccAzureRMAutomationCredential_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -183,6 +187,10 @@ resource "azurerm_automation_credential" "import" { func testAccAzureRMAutomationCredential_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_configuration_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_configuration_test.go index 7aa86ac7f3b60..060332e8a7214 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_configuration_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_configuration_test.go @@ -128,6 +128,10 @@ func testCheckAzureRMAutomationDscConfigurationExists(resourceName string) resou func testAccAzureRMAutomationDscConfiguration_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_nodeconfiguration_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_nodeconfiguration_test.go index 6c3b409ab8f71..1c2cf6aa071fe 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_nodeconfiguration_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_dsc_nodeconfiguration_test.go @@ -123,6 +123,10 @@ func testCheckAzureRMAutomationDscNodeConfigurationExists(resourceName string) r func testAccAzureRMAutomationDscNodeConfiguration_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_job_schedule_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_job_schedule_test.go index 844c800ff8ca3..5d050ec94d09d 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_job_schedule_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_job_schedule_test.go @@ -174,6 +174,10 @@ func testCheckAzureRMAutomationJobScheduleExists(resourceName string) resource.T func testAccAzureRMAutomationJobSchedulePrerequisites(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_module_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_module_test.go index f1f1086a4253c..81bec05ec14eb 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_module_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_module_test.go @@ -141,6 +141,10 @@ func testCheckAzureRMAutomationModuleExists(resourceName string) resource.TestCh func testAccAzureRMAutomationModule_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -167,6 +171,10 @@ resource "azurerm_automation_module" "test" { func testAccAzureRMAutomationModule_multipleModules(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_runbook_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_runbook_test.go index 10e4251a64c89..9415173ee32c4 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_runbook_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_runbook_test.go @@ -164,6 +164,10 @@ func testCheckAzureRMAutomationRunbookExists(resourceName string) resource.TestC func testAccAzureRMAutomationRunbook_PSWorkflow(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -219,6 +223,10 @@ resource "azurerm_automation_runbook" "import" { func testAccAzureRMAutomationRunbook_PSWorkflowWithHash(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -257,6 +265,10 @@ resource "azurerm_automation_runbook" "test" { func testAccAzureRMAutomationRunbook_PSWithContent(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_schedule_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_schedule_test.go index e2d42954625ad..3d63a22505d5e 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_schedule_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_schedule_test.go @@ -284,6 +284,10 @@ func testCheckAzureRMAutomationScheduleExists(resourceName string) resource.Test func testAccAzureRMAutomationSchedule_prerequisites(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_variable_bool_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_variable_bool_test.go index 174436730f51e..535ec495990c7 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_variable_bool_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_variable_bool_test.go @@ -94,6 +94,10 @@ func testCheckAzureRMAutomationVariableBoolDestroy(s *terraform.State) error { func testAccAzureRMAutomationVariableBool_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -117,6 +121,10 @@ resource "azurerm_automation_variable_bool" "test" { func testAccAzureRMAutomationVariableBool_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_variable_datetime_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_variable_datetime_test.go index eeb8d377c76db..6020b2144172c 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_variable_datetime_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_variable_datetime_test.go @@ -94,6 +94,10 @@ func testCheckAzureRMAutomationVariableDateTimeDestroy(s *terraform.State) error func testAccAzureRMAutomationVariableDateTime_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -117,6 +121,10 @@ resource "azurerm_automation_variable_datetime" "test" { func testAccAzureRMAutomationVariableDateTime_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_variable_int_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_variable_int_test.go index 5ef2a6c570671..00084cb0b760d 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_variable_int_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_variable_int_test.go @@ -94,6 +94,10 @@ func testCheckAzureRMAutomationVariableIntDestroy(s *terraform.State) error { func testAccAzureRMAutomationVariableInt_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -117,6 +121,10 @@ resource "azurerm_automation_variable_int" "test" { func testAccAzureRMAutomationVariableInt_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_variable_string_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_variable_string_test.go index 768b1c6f544ea..ebbbac76768a8 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_variable_string_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_variable_string_test.go @@ -94,6 +94,10 @@ func testCheckAzureRMAutomationVariableStringDestroy(s *terraform.State) error { func testAccAzureRMAutomationVariableString_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -117,6 +121,10 @@ resource "azurerm_automation_variable_string" "test" { func testAccAzureRMAutomationVariableString_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/batch/tests/data_source_batch_account_test.go b/azurerm/internal/services/batch/tests/data_source_batch_account_test.go index 434f734d3eea2..94be38fbf0cd4 100644 --- a/azurerm/internal/services/batch/tests/data_source_batch_account_test.go +++ b/azurerm/internal/services/batch/tests/data_source_batch_account_test.go @@ -75,6 +75,10 @@ func TestAccDataSourceAzureRMBatchAccount_userSubscription(t *testing.T) { func testAccDataSourceAzureRMBatchAccount_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccRG-%d-batch" location = "%s" @@ -96,6 +100,10 @@ data "azurerm_batch_account" "test" { func testAccDataSourceAzureRMBatchAccount_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccRG-%d-batch" location = "%s" diff --git a/azurerm/internal/services/batch/tests/data_source_batch_certificate_test.go b/azurerm/internal/services/batch/tests/data_source_batch_certificate_test.go index 22b3812aa3df6..e03562c2267ad 100644 --- a/azurerm/internal/services/batch/tests/data_source_batch_certificate_test.go +++ b/azurerm/internal/services/batch/tests/data_source_batch_certificate_test.go @@ -32,6 +32,10 @@ func TestAccDataSourceAzureRMBatchCertificate_basic(t *testing.T) { func testAccDataSourceAzureRMBatchCertificate_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccbatch%d" location = "%s" diff --git a/azurerm/internal/services/batch/tests/data_source_batch_pool_test.go b/azurerm/internal/services/batch/tests/data_source_batch_pool_test.go index d6600e43362d7..817d2af5c82c1 100644 --- a/azurerm/internal/services/batch/tests/data_source_batch_pool_test.go +++ b/azurerm/internal/services/batch/tests/data_source_batch_pool_test.go @@ -60,6 +60,10 @@ func TestAccDataSourceAzureRMBatchPool_complete(t *testing.T) { func testAccDataSourceAzureRMBatchPool_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccRG-%d-batch" location = "%s" diff --git a/azurerm/internal/services/batch/tests/resource_arm_batch_account_test.go b/azurerm/internal/services/batch/tests/resource_arm_batch_account_test.go index 2089b4a44d31b..54833a5953320 100644 --- a/azurerm/internal/services/batch/tests/resource_arm_batch_account_test.go +++ b/azurerm/internal/services/batch/tests/resource_arm_batch_account_test.go @@ -199,6 +199,10 @@ func testCheckAzureRMBatchAccountDestroy(s *terraform.State) error { func testAccAzureRMBatchAccount_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccRG-%d-batchaccount" location = "%s" @@ -228,6 +232,10 @@ resource "azurerm_batch_account" "import" { func testAccAzureRMBatchAccount_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccRG-%d-batchaccount" location = "%s" @@ -257,6 +265,10 @@ resource "azurerm_batch_account" "test" { func testAccAzureRMBatchAccount_completeUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccRG-%d-batchaccount" location = "%s" diff --git a/azurerm/internal/services/batch/tests/resource_arm_batch_application_test.go b/azurerm/internal/services/batch/tests/resource_arm_batch_application_test.go index feda542d293ba..9d479b2c924fb 100644 --- a/azurerm/internal/services/batch/tests/resource_arm_batch_application_test.go +++ b/azurerm/internal/services/batch/tests/resource_arm_batch_application_test.go @@ -111,6 +111,10 @@ func testCheckAzureRMBatchApplicationDestroy(s *terraform.State) error { func testAccAzureRMBatchApplication_template(data acceptance.TestData, displayName string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/batch/tests/resource_arm_batch_certificate_test.go b/azurerm/internal/services/batch/tests/resource_arm_batch_certificate_test.go index a2c2a62d8cbdb..4af87c83a4636 100644 --- a/azurerm/internal/services/batch/tests/resource_arm_batch_certificate_test.go +++ b/azurerm/internal/services/batch/tests/resource_arm_batch_certificate_test.go @@ -102,6 +102,10 @@ func TestAccAzureRMBatchCertificate_CerWithPassword(t *testing.T) { func testAccAzureRMBatchCertificatePfx(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccbatch%d" location = "%s" @@ -128,6 +132,10 @@ resource "azurerm_batch_certificate" "test" { func testAccAzureRMBatchCertificatePfxWithoutPassword(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccbatch%d" location = "%s" @@ -152,6 +160,10 @@ resource "azurerm_batch_certificate" "test" { } func testAccAzureRMBatchCertificateCer(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccbatch%d" location = "%s" @@ -176,6 +188,10 @@ resource "azurerm_batch_certificate" "test" { } func testAccAzureRMBatchCertificateCerWithPassword(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccbatch%d" location = "%s" diff --git a/azurerm/internal/services/batch/tests/resource_arm_batch_pool_test.go b/azurerm/internal/services/batch/tests/resource_arm_batch_pool_test.go index 18abe3d3ac84e..d8ce7301b5346 100644 --- a/azurerm/internal/services/batch/tests/resource_arm_batch_pool_test.go +++ b/azurerm/internal/services/batch/tests/resource_arm_batch_pool_test.go @@ -437,6 +437,10 @@ func testCheckAzureRMBatchPoolDestroy(s *terraform.State) error { func testaccAzureRMBatchPool_fixedScale_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccRG-%d-batchpool" location = "%s" @@ -491,6 +495,10 @@ resource "azurerm_batch_pool" "test" { func testaccAzureRMBatchPool_autoScale_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccRG-%d-batchpool" location = "%s" @@ -550,6 +558,10 @@ EOF func testaccAzureRMBatchPool_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccRG-%d-batchpool" location = "%s" @@ -609,6 +621,10 @@ resource "azurerm_batch_pool" "import" { func testaccAzureRMBatchPoolStartTask_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccRG-%d-batchpool" location = "%s" @@ -666,6 +682,10 @@ resource "azurerm_batch_pool" "test" { func testaccAzureRMBatchPoolValidateResourceFileWithoutSource(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccbatch%d" location = "%s" @@ -724,6 +744,10 @@ resource "azurerm_batch_pool" "test" { func testaccAzureRMBatchPoolValidateResourceFileWithMultipleSources(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccbatch%d" location = "%s" @@ -782,6 +806,10 @@ resource "azurerm_batch_pool" "test" { func testaccAzureRMBatchPoolValidateResourceFileBlobPrefixWithoutAutoStorageContainerName(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccbatch%d" location = "%s" @@ -840,6 +868,10 @@ resource "azurerm_batch_pool" "test" { func testaccAzureRMBatchPoolValidateResourceFileHttpURLWithoutFilePath(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccbatch%d" location = "%s" @@ -897,6 +929,10 @@ resource "azurerm_batch_pool" "test" { func testaccAzureRMBatchPoolCertificates(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccbatch%d" location = "%s" @@ -962,6 +998,10 @@ resource "azurerm_batch_pool" "test" { func testaccAzureRMBatchPoolContainerConfiguration(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccbatch%d" location = "%s" @@ -1012,6 +1052,10 @@ resource "azurerm_batch_pool" "test" { func testaccAzureRMBatchPoolCustomImageConfiguration(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccRG-%d-batchpool" location = "%s" diff --git a/azurerm/internal/services/cdn/tests/data_source_cdn_profile_test.go b/azurerm/internal/services/cdn/tests/data_source_cdn_profile_test.go index 0fbbc7f013bd1..cfc2a67b2479f 100644 --- a/azurerm/internal/services/cdn/tests/data_source_cdn_profile_test.go +++ b/azurerm/internal/services/cdn/tests/data_source_cdn_profile_test.go @@ -49,6 +49,10 @@ func TestAccDataSourceAzureRMCdnProfile_withTags(t *testing.T) { func testAccDataSourceAzureRMCdnProfile_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -70,6 +74,10 @@ data "azurerm_cdn_profile" "test" { func testAccDataSourceAzureRMCdnProfile_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/cdn/tests/resource_arm_cdn_endpoint_test.go b/azurerm/internal/services/cdn/tests/resource_arm_cdn_endpoint_test.go index ce7f0fbb551d7..c26d754177047 100644 --- a/azurerm/internal/services/cdn/tests/resource_arm_cdn_endpoint_test.go +++ b/azurerm/internal/services/cdn/tests/resource_arm_cdn_endpoint_test.go @@ -319,6 +319,10 @@ func testCheckAzureRMCdnEndpointDestroy(s *terraform.State) error { func testAccAzureRMCdnEndpoint_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -370,6 +374,10 @@ resource "azurerm_cdn_endpoint" "import" { func testAccAzureRMCdnEndpoint_hostHeader(data acceptance.TestData, domain string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -406,6 +414,10 @@ resource "azurerm_cdn_endpoint" "test" { func testAccAzureRMCdnEndpoint_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -441,6 +453,10 @@ resource "azurerm_cdn_endpoint" "test" { func testAccAzureRMCdnEndpoint_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -475,6 +491,10 @@ resource "azurerm_cdn_endpoint" "test" { func testAccAzureRMCdnEndpoint_geoFilters(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -521,6 +541,10 @@ resource "azurerm_cdn_endpoint" "test" { func testAccAzureRMCdnEndpoint_optimized(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -554,6 +578,10 @@ resource "azurerm_cdn_endpoint" "test" { func testAccAzureRMCdnEndpoint_fullFields(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -603,6 +631,10 @@ resource "azurerm_cdn_endpoint" "test" { func testAccAzureRMCdnEndpoint_isHttpAndHttpsAllowed(data acceptance.TestData, isHttpAllowed string, isHttpsAllowed string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/cdn/tests/resource_arm_cdn_profile_test.go b/azurerm/internal/services/cdn/tests/resource_arm_cdn_profile_test.go index 04a52369a97cb..577a0da69c466 100644 --- a/azurerm/internal/services/cdn/tests/resource_arm_cdn_profile_test.go +++ b/azurerm/internal/services/cdn/tests/resource_arm_cdn_profile_test.go @@ -237,6 +237,10 @@ func testCheckAzureRMCdnProfileDestroy(s *terraform.State) error { func testAccAzureRMCdnProfile_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -267,6 +271,10 @@ resource "azurerm_cdn_profile" "import" { func testAccAzureRMCdnProfile_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -288,6 +296,10 @@ resource "azurerm_cdn_profile" "test" { func testAccAzureRMCdnProfile_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -308,6 +320,10 @@ resource "azurerm_cdn_profile" "test" { func testAccAzureRMCdnProfileNonStandardCasing(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -324,6 +340,10 @@ resource "azurerm_cdn_profile" "test" { func testAccAzureRMCdnProfile_standardAkamai(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -340,6 +360,10 @@ resource "azurerm_cdn_profile" "test" { func testAccAzureRMCdnProfile_standardMicrosoft(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/cognitive/tests/resource_arm_cognitive_account_test.go b/azurerm/internal/services/cognitive/tests/resource_arm_cognitive_account_test.go index 19e1677af31e0..f6cf7bf509e98 100644 --- a/azurerm/internal/services/cognitive/tests/resource_arm_cognitive_account_test.go +++ b/azurerm/internal/services/cognitive/tests/resource_arm_cognitive_account_test.go @@ -202,6 +202,10 @@ func testCheckAzureRMCognitiveAccountExists(resourceName string) resource.TestCh func testAccAzureRMCognitiveAccount_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -220,6 +224,10 @@ resource "azurerm_cognitive_account" "test" { func testAccAzureRMCognitiveAccount_speechServices(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -254,6 +262,10 @@ resource "azurerm_cognitive_account" "import" { func testAccAzureRMCognitiveAccount_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/compute/tests/data_source_availability_set_test.go b/azurerm/internal/services/compute/tests/data_source_availability_set_test.go index 89a5ea350fc29..579cae0a9903d 100644 --- a/azurerm/internal/services/compute/tests/data_source_availability_set_test.go +++ b/azurerm/internal/services/compute/tests/data_source_availability_set_test.go @@ -31,6 +31,10 @@ func TestAccDataSourceAvailabilitySet_basic(t *testing.T) { func testAccDataSourceAvailabilitySet_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" diff --git a/azurerm/internal/services/compute/tests/data_source_image_test.go b/azurerm/internal/services/compute/tests/data_source_image_test.go index 599eb52d601a6..77e97bd97a050 100644 --- a/azurerm/internal/services/compute/tests/data_source_image_test.go +++ b/azurerm/internal/services/compute/tests/data_source_image_test.go @@ -62,6 +62,10 @@ func TestAccDataSourceAzureRMImage_localFilter(t *testing.T) { func testAccDataSourceAzureRMImageBasic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -190,6 +194,10 @@ output "location" { func testAccDataSourceAzureRMImageLocalFilter(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/compute/tests/data_source_managed_disk_test.go b/azurerm/internal/services/compute/tests/data_source_managed_disk_test.go index 4c11fe6c7ae25..c15a958c7ff10 100644 --- a/azurerm/internal/services/compute/tests/data_source_managed_disk_test.go +++ b/azurerm/internal/services/compute/tests/data_source_managed_disk_test.go @@ -58,6 +58,10 @@ func TestAccDataSourceAzureRMManagedDisk_basic_withUltraSSD(t *testing.T) { func testAccDataSourceAzureRMManagedDiskBasic(data acceptance.TestData, name string, resourceGroupName string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "%s" location = "%s" @@ -86,6 +90,10 @@ data "azurerm_managed_disk" "test" { func testAccDataSourceAzureRMManagedDisk_basic_withUltraSSD(data acceptance.TestData, name string, resourceGroupName string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "%s" location = "%s" diff --git a/azurerm/internal/services/compute/tests/data_source_snapshot_test.go b/azurerm/internal/services/compute/tests/data_source_snapshot_test.go index 5154d82d426c2..353279caa86da 100644 --- a/azurerm/internal/services/compute/tests/data_source_snapshot_test.go +++ b/azurerm/internal/services/compute/tests/data_source_snapshot_test.go @@ -47,6 +47,10 @@ func TestAccDataSourceAzureRMSnapshot_encryption(t *testing.T) { func testAccDataSourceAzureRMSnapshot_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/compute/tests/data_source_virtual_machine_test.go b/azurerm/internal/services/compute/tests/data_source_virtual_machine_test.go index c1c598f8b6e77..391f04c0ba218 100644 --- a/azurerm/internal/services/compute/tests/data_source_virtual_machine_test.go +++ b/azurerm/internal/services/compute/tests/data_source_virtual_machine_test.go @@ -27,6 +27,10 @@ func TestAccDataSourceVirtualMachine_basic(t *testing.T) { func testAccDataSourceVirtualMachine_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" diff --git a/azurerm/internal/services/compute/tests/resource_arm_availability_set_test.go b/azurerm/internal/services/compute/tests/resource_arm_availability_set_test.go index dd8cc8d1296ba..a9d1908962d72 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_availability_set_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_availability_set_test.go @@ -266,6 +266,10 @@ func testCheckAzureRMAvailabilitySetDestroy(s *terraform.State) error { func testAccAzureRMAvailabilitySet_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -294,6 +298,10 @@ resource "azurerm_availability_set" "import" { func testAccAzureRMAvailabilitySet_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -314,6 +322,10 @@ resource "azurerm_availability_set" "test" { func testAccAzureRMAvailabilitySet_withUpdatedTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -333,6 +345,10 @@ resource "azurerm_availability_set" "test" { func testAccAzureRMAvailabilitySet_withPPG(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -356,6 +372,10 @@ resource "azurerm_availability_set" "test" { func testAccAzureRMAvailabilitySet_withDomainCounts(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -373,6 +393,10 @@ resource "azurerm_availability_set" "test" { func testAccAzureRMAvailabilitySet_unmanaged(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/compute/tests/resource_arm_dedicated_host_group_test.go b/azurerm/internal/services/compute/tests/resource_arm_dedicated_host_group_test.go index 69eec246ab149..d95192831f300 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_dedicated_host_group_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_dedicated_host_group_test.go @@ -131,6 +131,10 @@ func testCheckAzureRMDedicatedHostGroupDestroy(s *terraform.State) error { func testAccAzureRMDedicatedHostGroup_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-compute-%d" location = "%s" @@ -160,6 +164,10 @@ resource "azurerm_dedicated_host_group" "import" { func testAccAzureRMDedicatedHostGroup_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-compute-%d" location = "%s" diff --git a/azurerm/internal/services/compute/tests/resource_arm_dedicated_host_test.go b/azurerm/internal/services/compute/tests/resource_arm_dedicated_host_test.go index b3ab2b1549606..b7024fa7d8f6e 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_dedicated_host_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_dedicated_host_test.go @@ -313,6 +313,10 @@ resource "azurerm_dedicated_host" "import" { func testAccAzureRMDedicatedHost_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-compute-%d" location = "%s" diff --git a/azurerm/internal/services/compute/tests/resource_arm_image_test.go b/azurerm/internal/services/compute/tests/resource_arm_image_test.go index a02d7e878d745..c4ba7978be2ab 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_image_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_image_test.go @@ -501,6 +501,10 @@ func testCheckAzureRMImageDestroy(s *terraform.State) error { func testAccAzureRMImage_standaloneImage_setup(data acceptance.TestData, userName string, password string, hostName string, storageType string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -606,6 +610,10 @@ func testAccAzureRMImage_standaloneImage_provision(data acceptance.TestData, use } return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -754,6 +762,10 @@ resource "azurerm_image" "import" { func testAccAzureRMImage_customImage_fromVHD_setup(data acceptance.TestData, userName string, password string, hostName string, location string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -854,6 +866,10 @@ resource "azurerm_virtual_machine" "testsource" { func testAccAzureRMImage_customImage_fromVHD_provision(data acceptance.TestData, userName string, password string, hostName string, location string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1018,6 +1034,10 @@ resource "azurerm_virtual_machine" "testdestination" { func testAccAzureRMImage_customImage_fromVM_sourceVM(data acceptance.TestData, userName string, password string, hostName string, location string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1098,6 +1118,10 @@ resource "azurerm_virtual_machine" "testsource" { func testAccAzureRMImage_customImage_fromVM_destinationVM(data acceptance.TestData, userName string, password string, hostName string, location string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1235,6 +1259,10 @@ resource "azurerm_virtual_machine" "testdestination" { func testAccAzureRMImageVMSS_customImage_fromVHD_setup(data acceptance.TestData, userName string, password string, hostName string, location string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1335,6 +1363,10 @@ resource "azurerm_virtual_machine" "testsource" { func testAccAzureRMImageVMSS_customImage_fromVHD_provision(data acceptance.TestData, userName string, password string, hostName string, location string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_network_test.go b/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_network_test.go index c5c17daa38132..48ebd33dd1324 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_network_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_network_test.go @@ -624,6 +624,10 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" { func testAccAzureRMLinuxVirtualMachineScaleSet_networkApplicationGateway(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/compute/tests/resource_arm_managed_disk_test.go b/azurerm/internal/services/compute/tests/resource_arm_managed_disk_test.go index cbccbd3fd5254..5a0bf79c83611 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_managed_disk_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_managed_disk_test.go @@ -455,6 +455,10 @@ func testDeleteAzureRMVirtualMachine(resourceName string) resource.TestCheckFunc func testAccAzureRMManagedDisk_empty(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -499,6 +503,10 @@ resource "azurerm_managed_disk" "import" { func testAccAzureRMManagedDisk_empty_withZone(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -523,6 +531,10 @@ resource "azurerm_managed_disk" "test" { func testAccAzureRMManagedDisk_import(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -565,6 +577,10 @@ resource "azurerm_managed_disk" "test" { func testAccAzureRMManagedDisk_copy(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -603,6 +619,10 @@ resource "azurerm_managed_disk" "test" { func testAccAzureRMManagedDisk_empty_updated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -769,6 +789,10 @@ resource "azurerm_managed_disk" "test" { func testAccAzureRMManagedDisk_create_withUltraSSD(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -795,6 +819,10 @@ resource "azurerm_managed_disk" "test" { func testAccAzureRMManagedDisk_update_withUltraSSD(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -957,6 +985,10 @@ resource "azurerm_managed_disk" "test" { func testAccAzureRMManagedDisk_managedDiskAttached(data acceptance.TestData, diskSize int) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" diff --git a/azurerm/internal/services/compute/tests/resource_arm_proximity_placement_group_test.go b/azurerm/internal/services/compute/tests/resource_arm_proximity_placement_group_test.go index 0d19319290f64..534342b820a7b 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_proximity_placement_group_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_proximity_placement_group_test.go @@ -196,6 +196,10 @@ func testCheckAzureRMProximityPlacementGroupDestroy(s *terraform.State) error { func testAccProximityPlacementGroup_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -224,6 +228,10 @@ resource "azurerm_proximity_placement_group" "import" { func testAccProximityPlacementGroup_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -244,6 +252,10 @@ resource "azurerm_proximity_placement_group" "test" { func testAccProximityPlacementGroup_withUpdatedTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/compute/tests/resource_arm_shared_image_gallery_test.go b/azurerm/internal/services/compute/tests/resource_arm_shared_image_gallery_test.go index 37482109b394d..158e8b431fa26 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_shared_image_gallery_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_shared_image_gallery_test.go @@ -142,6 +142,10 @@ func testCheckAzureRMSharedImageGalleryExists(resourceName string) resource.Test func testAccAzureRMSharedImageGallery_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -169,6 +173,10 @@ resource "azurerm_shared_image_gallery" "import" { func testAccAzureRMSharedImageGallery_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/compute/tests/resource_arm_shared_image_test.go b/azurerm/internal/services/compute/tests/resource_arm_shared_image_test.go index 9b2e050302166..5854f0c4abfff 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_shared_image_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_shared_image_test.go @@ -140,6 +140,10 @@ func testCheckAzureRMSharedImageExists(resourceName string) resource.TestCheckFu func testAccAzureRMSharedImage_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -190,6 +194,10 @@ resource "azurerm_shared_image" "import" { func testAccAzureRMSharedImage_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/compute/tests/resource_arm_snapshot_test.go b/azurerm/internal/services/compute/tests/resource_arm_snapshot_test.go index 369945aec7d6f..5c3e5d8555970 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_snapshot_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_snapshot_test.go @@ -261,6 +261,10 @@ func testCheckAzureRMSnapshotExists(resourceName string) resource.TestCheckFunc func testAccAzureRMSnapshot_fromManagedDisk(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -301,6 +305,10 @@ resource "azurerm_snapshot" "import" { func testAccAzureRMSnapshot_fromManagedDiskUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -426,6 +434,10 @@ resource "azurerm_snapshot" "test" { func testAccAzureRMSnapshot_extendingManagedDisk(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -453,6 +465,10 @@ resource "azurerm_snapshot" "test" { func testAccAzureRMSnapshot_fromExistingSnapshot(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -487,6 +503,10 @@ resource "azurerm_snapshot" "second" { func testAccAzureRMSnapshot_fromUnmanagedDisk(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_data_disk_attachment_test.go b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_data_disk_attachment_test.go index 858bcaa5a9854..c58fdb10c1aba 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_data_disk_attachment_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_data_disk_attachment_test.go @@ -332,6 +332,10 @@ resource "azurerm_virtual_machine_data_disk_attachment" "import" { func testAccAzureRMVirtualMachineDataDiskAttachment_managedServiceIdentity(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -477,6 +481,10 @@ resource "azurerm_virtual_machine_data_disk_attachment" "test" { func testAccAzureRMVirtualMachineDataDiskAttachment_writeAccelerator(data acceptance.TestData, enabled bool) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -561,6 +569,10 @@ resource "azurerm_virtual_machine_data_disk_attachment" "test" { func testAccAzureRMVirtualMachineDataDiskAttachment_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -637,6 +649,10 @@ resource "azurerm_managed_disk" "test" { func testAccAzureRMVirtualMachineDataDiskAttachment_virtualMachineExtensionPrep(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_extension_test.go b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_extension_test.go index c49f5210eda51..784cb33ec1f19 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_extension_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_extension_test.go @@ -174,6 +174,10 @@ func testCheckAzureRMVirtualMachineExtensionDestroy(s *terraform.State) error { func testAccAzureRMVirtualMachineExtension_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -297,6 +301,10 @@ resource "azurerm_virtual_machine_extension" "import" { func testAccAzureRMVirtualMachineExtension_basicUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -402,6 +410,10 @@ SETTINGS func testAccAzureRMVirtualMachineExtension_concurrent(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -517,6 +529,10 @@ SETTINGS func testAccAzureRMVirtualMachineExtension_linuxDiagnostics(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go index 5408ccbb2ad08..4f2c3a36f477a 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go @@ -969,6 +969,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_withManagedServiceIdentity(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1050,6 +1054,10 @@ output "principal_id" { func testAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk_explicit(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1123,6 +1131,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk_standardSSD(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1241,6 +1253,10 @@ resource "azurerm_virtual_machine" "import" { func testAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk_implicit(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1313,6 +1329,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk_implicit_withZone(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1386,6 +1406,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk_attach(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1484,6 +1508,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk_empty(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1567,6 +1595,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk_DestroyDisksBefore(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1649,6 +1681,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk_DestroyDisksAfter(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1684,6 +1720,10 @@ resource "azurerm_network_interface" "test" { func testAccAzureRMVirtualMachine_basicLinuxMachineDeleteVM_managedDisk(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1719,6 +1759,10 @@ resource "azurerm_network_interface" "test" { func testAccAzureRMVirtualMachine_withDataDisk_managedDisk_explicit(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1800,6 +1844,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_withDataDisk_managedDisk_implicit(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1879,6 +1927,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_osDiskTypeConflict(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1962,6 +2014,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_dataDiskTypeConflict(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2054,6 +2110,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_bugAzureRM33(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2204,6 +2264,10 @@ func testGetAzureRMVirtualMachineManagedDisk(managedDiskID *string) (*compute.Di func testAccAzureRMVirtualMachine_linuxNoConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2267,6 +2331,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_windowsNoConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2330,6 +2398,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_multipleNICs(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2409,6 +2481,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_anWithVM(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2483,6 +2559,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_hasDiskInfoWhenStopped(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2558,6 +2638,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_ultraSSD(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_scale_set_extension_test.go b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_scale_set_extension_test.go index 5ae5f2e18ea80..9165a35c39983 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_scale_set_extension_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_scale_set_extension_test.go @@ -443,6 +443,10 @@ resource "azurerm_virtual_machine_scale_set_extension" "import" { func testAccAzureRMVirtualMachineScaleSetExtension_templateLinux(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -504,6 +508,10 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSetExtension_templateWindows(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_scale_set_test.go b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_scale_set_test.go index d51733b023221..09a59eb5d80b0 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_scale_set_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_scale_set_test.go @@ -1397,6 +1397,10 @@ func testCheckAzureRMVirtualMachineScaleSetHasDataDisks(name string) resource.Te func testAccAzureRMVirtualMachineScaleSet_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -1534,6 +1538,10 @@ resource "azurerm_virtual_machine_scale_set" "import" { func testAccAzureRMVirtualMachineScaleSet_evictionPolicyDelete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -1621,6 +1629,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_standardSSD(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -1707,6 +1719,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_withPPG(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -1801,6 +1817,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_basicPublicIP(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -1892,6 +1912,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_basicEmptyPublicIP(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -1987,6 +2011,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_basicEmptyPublicIP_updated_tags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -2082,6 +2110,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_basicEmptyNetworkProfile_true_ipforwarding(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -2178,6 +2210,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_basicEmptyPublicIP_updatedDNS_label(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -2273,6 +2309,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_basicApplicationSecurity(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -2365,6 +2405,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_basicAcceleratedNetworking(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -2451,6 +2495,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_basicIPForwarding(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -2537,6 +2585,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_basicDNSSettings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -2626,6 +2678,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_bootDiagnostic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -2715,6 +2771,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_networkSecurityGroup(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -2813,6 +2873,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_basicWindows(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -2907,6 +2971,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_singlePlacementGroupFalse(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -2993,6 +3061,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_linux(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -3109,6 +3181,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_linuxUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -3229,6 +3305,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_linuxCustomDataUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -3345,6 +3425,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_linuxKeyDataUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -3461,6 +3545,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_basicLinux_managedDisk(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -3528,6 +3616,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_basicLinux_managedDisk_withZones(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -3595,6 +3687,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_basicWindows_managedDisk(data acceptance.TestData, vmSize string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -3681,6 +3777,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_basicLinux_managedDiskNoName(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -3747,6 +3847,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSetApplicationGatewayTemplate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -3942,6 +4046,10 @@ resource "azurerm_application_gateway" "test" { func testAccAzureRMVirtualMachineScaleSetLoadBalancerTemplate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -4055,6 +4163,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSetOverProvisionTemplate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -4137,6 +4249,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSetPriorityTemplate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -4221,6 +4337,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSetSystemAssignedMSI(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -4315,6 +4435,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSetUserAssignedMSI(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -4417,6 +4541,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSetExtensionTemplate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -4530,6 +4658,10 @@ SETTINGS func testAccAzureRMVirtualMachineScaleSetExtensionTemplateUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -4644,6 +4776,10 @@ SETTINGS func testAccAzureRMVirtualMachineScaleSetMultipleExtensionsTemplate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -4757,6 +4893,10 @@ SETTINGS func testAccAzureRMVirtualMachineScaleSetMultipleExtensionsTemplate_provision_after_extension(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -4871,6 +5011,10 @@ SETTINGS func testAccAzureRMVirtualMachineScaleSet_osDiskTypeConflict(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -4939,6 +5083,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSetLoadBalancerTemplateManagedDataDisks(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -5033,6 +5181,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSetNonStandardCasing(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -5118,6 +5270,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_planManagedDisk(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -5190,6 +5346,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_customImage(data acceptance.TestData, userName string, password string, hostName string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -5349,6 +5509,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_multipleNetworkProfiles(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -5445,6 +5609,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSet_rollingAutoUpdates(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -5587,6 +5755,10 @@ func testAccAzureRMVirtualMachineScaleSet_upgradeModeUpdate(data acceptance.Test } return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -5713,6 +5885,10 @@ resource "azurerm_virtual_machine_scale_set" "test" { func testAccAzureRMVirtualMachineScaleSetMultipleAssignedMSI(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" diff --git a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_test.go b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_test.go index 928f1a97afb5b..dd0d25058bd95 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_test.go @@ -186,6 +186,10 @@ func testCheckAzureRMVirtualMachineDestroy(s *terraform.State) error { func testAccAzureRMVirtualMachine_winTimeZone(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -267,6 +271,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachineSystemAssignedIdentity(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -362,6 +370,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachineUserAssignedIdentity(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -465,6 +477,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachineMultipleAssignedIdentity(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -567,6 +583,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachinePPG(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" diff --git a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_unmanaged_disks_test.go b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_unmanaged_disks_test.go index 70b38b58987f3..b29fa520cd019 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_unmanaged_disks_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_unmanaged_disks_test.go @@ -596,6 +596,10 @@ func TestAccAzureRMVirtualMachine_primaryNetworkInterfaceId(t *testing.T) { func testAccAzureRMVirtualMachine_basicLinuxMachine(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -687,6 +691,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_basicLinuxMachine_destroyVM(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -740,6 +748,10 @@ resource "azurerm_storage_container" "test" { func testAccAzureRMVirtualMachine_basicLinuxMachine_storageBlob_attach(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -849,6 +861,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_basicLinuxMachineSSHOnly(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -988,6 +1004,10 @@ resource "azurerm_virtual_machine" "mirror" { func testAccAzureRMVirtualMachine_machineNameBeforeUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1079,6 +1099,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_basicLinuxMachineDestroyDisksBefore(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1186,6 +1210,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_basicLinuxMachineDestroyDisksAfter(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1244,6 +1272,10 @@ resource "azurerm_storage_container" "test" { func testAccAzureRMVirtualMachine_basicLinuxMachineDeleteVM(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1297,6 +1329,10 @@ resource "azurerm_storage_container" "test" { func testAccAzureRMVirtualMachine_withDataDisk(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1396,6 +1432,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_basicLinuxMachineUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1485,6 +1525,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_updatedLinuxMachine(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1570,6 +1614,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_basicWindowsMachine(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1656,6 +1704,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_windowsUnattendedConfig(data acceptance.TestData, vmSize string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1748,6 +1800,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_diagnosticsProfile(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1840,6 +1896,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_winRMConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1927,6 +1987,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_withAvailabilitySet(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2020,6 +2084,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_updateAvailabilitySet(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2113,6 +2181,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_updateMachineName(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2199,6 +2271,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_basicLinuxMachineStorageImageBefore(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2291,6 +2367,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_basicLinuxMachineStorageImageAfter(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2383,6 +2463,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_basicLinuxMachineWithOSDiskVhdUriChanged(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2474,6 +2558,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_plan(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2571,6 +2659,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_linuxMachineWithSSH(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2658,6 +2750,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_linuxMachineWithSSHRemoved(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2740,6 +2836,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_primaryNetworkInterfaceId(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2844,6 +2944,10 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_basicLinuxMachine_destroy(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2897,6 +3001,10 @@ resource "azurerm_storage_container" "test" { func testAccAzureRMVirtualMachine_basicLinuxMachine_attach_without_osProfile(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_network_test.go b/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_network_test.go index c906290e019c6..051c7111bd6ad 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_network_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_network_test.go @@ -623,6 +623,10 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" { func testAccAzureRMWindowsVirtualMachineScaleSet_networkApplicationGateway(data acceptance.TestData) string { name := testAccAzureRMWindowsVirtualMachineScaleSet_vmName(data) return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/containers/tests/resource_arm_container_group_test.go b/azurerm/internal/services/containers/tests/resource_arm_container_group_test.go index 45e8ff279ec93..b39ee91dc88ff 100644 --- a/azurerm/internal/services/containers/tests/resource_arm_container_group_test.go +++ b/azurerm/internal/services/containers/tests/resource_arm_container_group_test.go @@ -433,6 +433,10 @@ func TestAccAzureRMContainerGroup_windowsComplete(t *testing.T) { func testAccAzureRMContainerGroup_SystemAssignedIdentity(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -466,6 +470,10 @@ resource "azurerm_container_group" "test" { func testAccAzureRMContainerGroup_UserAssignedIdentity(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -507,6 +515,10 @@ resource "azurerm_container_group" "test" { func testAccAzureRMContainerGroup_MultipleAssignedIdentities(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -548,6 +560,10 @@ resource "azurerm_container_group" "test" { func testAccAzureRMContainerGroup_linuxBasic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -604,6 +620,10 @@ resource "azurerm_container_group" "import" { func testAccAzureRMContainerGroup_imageRegistryCredentials(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -655,6 +675,10 @@ resource "azurerm_container_group" "test" { func testAccAzureRMContainerGroup_imageRegistryCredentialsUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -700,6 +724,10 @@ resource "azurerm_container_group" "test" { func testAccAzureRMContainerGroup_logTypeUnset(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -745,6 +773,10 @@ resource "azurerm_container_group" "test" { func testAccAzureRMContainerGroup_linuxBasicUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -789,6 +821,10 @@ resource "azurerm_container_group" "test" { func testAccAzureRMContainerGroup_virtualNetwork(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -859,6 +895,10 @@ resource "azurerm_container_group" "test" { func testAccAzureRMContainerGroup_windowsBasic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -897,6 +937,10 @@ resource "azurerm_container_group" "test" { func testAccAzureRMContainerGroup_windowsComplete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -999,6 +1043,10 @@ resource "azurerm_container_group" "test" { func testAccAzureRMContainerGroup_linuxComplete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/containers/tests/resource_arm_container_registry_test.go b/azurerm/internal/services/containers/tests/resource_arm_container_registry_test.go index 364fe340a17ec..7c57b1abf2212 100644 --- a/azurerm/internal/services/containers/tests/resource_arm_container_registry_test.go +++ b/azurerm/internal/services/containers/tests/resource_arm_container_registry_test.go @@ -480,6 +480,10 @@ func testCheckAzureRMContainerRegistryGeoreplications(resourceName string, sku s func testAccAzureRMContainerRegistry_basic_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -500,6 +504,10 @@ resource "azurerm_container_registry" "test" { func testAccAzureRMContainerRegistry_basicManaged(data acceptance.TestData, sku string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -530,6 +538,10 @@ resource "azurerm_container_registry" "import" { func testAccAzureRMContainerRegistry_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -551,6 +563,10 @@ resource "azurerm_container_registry" "test" { func testAccAzureRMContainerRegistry_completeUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -572,6 +588,10 @@ resource "azurerm_container_registry" "test" { func testAccAzureRMContainerRegistry_geoReplication(data acceptance.TestData, sku string, georeplicationLocations string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -589,6 +609,10 @@ resource "azurerm_container_registry" "test" { func testAccAzureRMContainerRegistry_geoReplicationUpdateWithNoLocation(data acceptance.TestData, sku string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -605,6 +629,10 @@ resource "azurerm_container_registry" "test" { func testAccAzureRMContainerRegistry_geoReplicationUpdateWithNoLocation_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -625,6 +653,10 @@ resource "azurerm_container_registry" "test" { func testAccAzureRMContainerRegistry_networkAccessProfile_ip(data acceptance.TestData, sku string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -656,6 +688,10 @@ resource "azurerm_container_registry" "test" { func testAccAzureRMContainerRegistry_networkAccessProfile_vnet(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -703,6 +739,10 @@ resource "azurerm_container_registry" "test" { func testAccAzureRMContainerRegistry_networkAccessProfile_both(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" diff --git a/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_addons_test.go b/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_addons_test.go index 7ffd2a9f28443..ad2b7db65f201 100644 --- a/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_addons_test.go +++ b/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_addons_test.go @@ -243,6 +243,10 @@ func testAccAzureRMKubernetesCluster_addonProfileRouting(t *testing.T) { func testAccAzureRMKubernetesCluster_addonProfileAciConnectorLinuxConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -320,6 +324,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_addonProfileAciConnectorLinuxDisabledConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -380,6 +388,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_addonProfileAzurePolicyConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -421,6 +433,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_addonProfileKubeDashboardConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -462,6 +478,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_addonProfileOMSConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -524,6 +544,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_addonProfileOMSDisabledConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -565,6 +589,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_addonProfileOMSScaleWithoutBlockConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -600,6 +628,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_addonProfileRoutingConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_auth_test.go b/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_auth_test.go index 58f1b7aa9dfe5..f46d2f1c7cab9 100644 --- a/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_auth_test.go +++ b/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_auth_test.go @@ -246,6 +246,10 @@ func testAccAzureRMKubernetesCluster_updateRoleBaseAccessControlAAD(t *testing.T func testAccAzureRMKubernetesCluster_apiServerAuthorizedIPRangesConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -299,6 +303,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_enablePodSecurityPolicyConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -331,6 +339,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_managedClusterIdentityServicePrincipalConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -363,6 +375,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_roleBasedAccessControlConfig(data acceptance.TestData, clientId, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_network_test.go b/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_network_test.go index e42a2ed19ecff..6329ebdd9002d 100644 --- a/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_network_test.go +++ b/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_network_test.go @@ -578,6 +578,10 @@ func testAccAzureRMKubernetesCluster_prefixedLoadBalancerProfile(t *testing.T) { func testAccAzureRMKubernetesCluster_advancedNetworkingConfig(data acceptance.TestData, clientId string, clientSecret string, location string, networkPlugin string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -632,6 +636,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_advancedNetworkingCompleteConfig(data acceptance.TestData, clientId string, clientSecret string, location string, networkPlugin string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -707,6 +715,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_advancedNetworkingWithPolicyConfig(data acceptance.TestData, clientId string, clientSecret string, location string, networkPlugin string, networkPolicy string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -762,6 +774,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_advancedNetworkingWithPolicyCompleteConfig(data acceptance.TestData, clientId string, clientSecret string, location string, networkPlugin string, networkPolicy string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -838,6 +854,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_enableNodePublicIPConfig(data acceptance.TestData, clientId, clientSecret, location string, enabled bool) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -866,6 +886,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_internalNetworkConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -917,6 +941,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_privateLinkConfig(data acceptance.TestData, clientId string, clientSecret string, location string, cdir string, enablePrivateLink bool) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -960,6 +988,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_standardLoadBalancerConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1016,6 +1048,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_standardLoadBalancerCompleteConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1093,6 +1129,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_standardLoadBalancerProfileConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1152,6 +1192,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_standardLoadBalancerProfileCompleteConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1219,6 +1263,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_basicLoadBalancerProfileConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1278,6 +1326,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_conflictingLoadBalancerProfileConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1352,6 +1404,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_prefixedLoadBalancerProfileConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_node_pool_test.go b/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_node_pool_test.go index 3bc04511a7733..15e801160f746 100644 --- a/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_node_pool_test.go +++ b/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_node_pool_test.go @@ -693,6 +693,10 @@ resource "azurerm_kubernetes_cluster_node_pool" "test" { func testAccAzureRMKubernetesClusterNodePool_availabilitySetConfig(data acceptance.TestData, clientId, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -728,6 +732,9 @@ resource "azurerm_kubernetes_cluster_node_pool" "test" { func testAccAzureRMKubernetesClusterNodePool_availabilityZonesConfig(data acceptance.TestData, clientId, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} resource "azurerm_resource_group" "test" { name = "acctestRG-%d" @@ -1022,6 +1029,10 @@ resource "azurerm_kubernetes_cluster_node_pool" "windows" { func testAccAzureRMKubernetesClusterNodePool_templateConfig(data acceptance.TestData, clientId, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1049,6 +1060,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesClusterNodePool_templateVirtualNetworkConfig(data acceptance.TestData, clientId, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1109,6 +1124,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesClusterNodePool_templateWindowsConfig(data acceptance.TestData, clientId, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_other_test.go b/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_other_test.go index 50b064cb186b4..f5db975d285f2 100644 --- a/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_other_test.go +++ b/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_other_test.go @@ -312,6 +312,10 @@ func testAccAzureRMKubernetesCluster_windowsProfile(t *testing.T) { func testAccAzureRMKubernetesCluster_basicAvailabilitySetConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -340,6 +344,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_basicVMSSConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -392,6 +400,10 @@ resource "azurerm_kubernetes_cluster" "import" { func testAccAzureRMKubernetesCluster_linuxProfileConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -427,6 +439,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_nodeTaintsConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -457,6 +473,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_nodeResourceGroupConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -485,6 +505,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_tagsConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -516,6 +540,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_tagsUpdatedConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -547,6 +575,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_upgradeConfig(data acceptance.TestData, clientId, clientSecret, version string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -583,6 +615,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_windowsProfileConfig(data acceptance.TestData, clientId, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_scaling_test.go b/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_scaling_test.go index 2d1b1ee5d2abc..3d639aaa0c4df 100644 --- a/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_scaling_test.go +++ b/azurerm/internal/services/containers/tests/resource_arm_kubernetes_cluster_scaling_test.go @@ -169,6 +169,10 @@ func testAccAzureRMKubernetesCluster_autoScalingWithAvailabilityZones(t *testing func testAccAzureRMKubernetesCluster_addAgentConfig(data acceptance.TestData, clientId, clientSecret, location string, numberOfAgents int) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -196,6 +200,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_autoscaleNodeCountUnsetConfig(data acceptance.TestData, clientId, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -225,6 +233,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_autoscaleNoAvailabilityZonesConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -254,6 +266,10 @@ resource "azurerm_kubernetes_cluster" "test" { func testAccAzureRMKubernetesCluster_autoscaleWithAvailabilityZonesConfig(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_failover_test.go b/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_failover_test.go index 790c3f410b851..c079273402a80 100644 --- a/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_failover_test.go +++ b/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_failover_test.go @@ -138,6 +138,10 @@ func TestAccAzureRMCosmosDBAccount_failover_geoReplicated(t *testing.T) { func testAccAzureRMCosmosDBAccount_failover_boundedStaleness(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -163,6 +167,10 @@ resource "azurerm_cosmosdb_account" "test" { func testAccAzureRMCosmosDBAccount_failover_boundedStalenessComplete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -190,6 +198,10 @@ resource "azurerm_cosmosdb_account" "test" { func testAccAzureRMCosmosDBAccount_failover_eventualConsistency(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -215,6 +227,10 @@ resource "azurerm_cosmosdb_account" "test" { func testAccAzureRMCosmosDBAccount_failover_session(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -240,6 +256,10 @@ resource "azurerm_cosmosdb_account" "test" { func testAccAzureRMCosmosDBAccount_failover_mongoDB(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -266,6 +286,10 @@ resource "azurerm_cosmosdb_account" "test" { func testAccAzureRMCosmosDBAccount_failover_strong(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -291,6 +315,10 @@ resource "azurerm_cosmosdb_account" "test" { func testAccAzureRMCosmosDBAccount_failover_geoReplicated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go b/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go index 641a8c3704173..7b83f5c9dfcbe 100644 --- a/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go +++ b/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go @@ -402,6 +402,10 @@ func testCheckAzureRMCosmosDBAccountExists(resourceName string) resource.TestChe func testAccAzureRMCosmosDBAccount_basic(data acceptance.TestData, kind documentdb.DatabaseAccountKind, consistency documentdb.DefaultConsistencyLevel) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-cosmos-%d" location = "%s" @@ -450,6 +454,10 @@ resource "azurerm_cosmosdb_account" "import" { func testAccAzureRMCosmosDBAccount_consistency(data acceptance.TestData, kind documentdb.DatabaseAccountKind, consistency documentdb.DefaultConsistencyLevel, interval, staleness int) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-cosmos-%d" location = "%s" @@ -478,6 +486,10 @@ resource "azurerm_cosmosdb_account" "test" { func testAccAzureRMCosmosDBAccount_completePreReqs(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-cosmos-%[1]d" location = "%[2]s" @@ -608,6 +620,10 @@ func testAccAzureRMCosmosDBAccount_capabilities(data acceptance.TestData, kind d } return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-cosmos-%d" location = "%s" diff --git a/azurerm/internal/services/databricks/tests/resource_arm_databricks_workspace_test.go b/azurerm/internal/services/databricks/tests/resource_arm_databricks_workspace_test.go index c46033a113932..77e40a8f08479 100644 --- a/azurerm/internal/services/databricks/tests/resource_arm_databricks_workspace_test.go +++ b/azurerm/internal/services/databricks/tests/resource_arm_databricks_workspace_test.go @@ -246,6 +246,10 @@ func testCheckAzureRMDatabricksWorkspaceDestroy(s *terraform.State) error { func testAccAzureRMDatabricksWorkspace_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-db-%d" location = "%s" @@ -276,6 +280,10 @@ resource "azurerm_databricks_workspace" "import" { func testAccAzureRMDatabricksWorkspace_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-db-%[1]d" @@ -371,6 +379,10 @@ resource "azurerm_databricks_workspace" "test" { func testAccAzureRMDatabricksWorkspace_completeUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-db-%d" location = "%s" diff --git a/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_dataset_mysql_test.go b/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_dataset_mysql_test.go index 5866fcc83404c..c21a6340f19eb 100644 --- a/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_dataset_mysql_test.go +++ b/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_dataset_mysql_test.go @@ -126,6 +126,10 @@ func testCheckAzureRMDataFactoryDatasetMySQLDestroy(s *terraform.State) error { func testAccAzureRMDataFactoryDatasetMySQL_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -155,6 +159,10 @@ resource "azurerm_data_factory_dataset_mysql" "test" { func testAccAzureRMDataFactoryDatasetMySQL_update1(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -205,6 +213,10 @@ resource "azurerm_data_factory_dataset_mysql" "test" { func testAccAzureRMDataFactoryDatasetMySQL_update2(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_dataset_postgresql_test.go b/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_dataset_postgresql_test.go index 1a6526d28f965..efa4ef87dc1de 100644 --- a/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_dataset_postgresql_test.go +++ b/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_dataset_postgresql_test.go @@ -126,6 +126,10 @@ func testCheckAzureRMDataFactoryDatasetPostgreSQLDestroy(s *terraform.State) err func testAccAzureRMDataFactoryDatasetPostgreSQL_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -155,6 +159,10 @@ resource "azurerm_data_factory_dataset_postgresql" "test" { func testAccAzureRMDataFactoryDatasetPostgreSQL_update1(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -205,6 +213,10 @@ resource "azurerm_data_factory_dataset_postgresql" "test" { func testAccAzureRMDataFactoryDatasetPostgreSQL_update2(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_dataset_sql_server_table_test.go b/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_dataset_sql_server_table_test.go index e0adb17a3eb65..795d6ffcca720 100644 --- a/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_dataset_sql_server_table_test.go +++ b/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_dataset_sql_server_table_test.go @@ -126,6 +126,10 @@ func testCheckAzureRMDataFactoryDatasetSQLServerTableDestroy(s *terraform.State) func testAccAzureRMDataFactoryDatasetSQLServerTable_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -155,6 +159,10 @@ resource "azurerm_data_factory_dataset_sql_server_table" "test" { func testAccAzureRMDataFactoryDatasetSQLServerTable_update1(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -205,6 +213,10 @@ resource "azurerm_data_factory_dataset_sql_server_table" "test" { func testAccAzureRMDataFactoryDatasetSQLServerTable_update2(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_integration_runtime_managed_test.go b/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_integration_runtime_managed_test.go index 97294b8264076..02be30c791af1 100644 --- a/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_integration_runtime_managed_test.go +++ b/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_integration_runtime_managed_test.go @@ -101,6 +101,10 @@ func TestAccAzureRMDataFactoryIntegrationRuntimeManaged_customSetupScript(t *tes func testAccAzureRMDataFactoryIntegrationRuntimeManaged_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -129,6 +133,10 @@ resource "azurerm_data_factory_integration_runtime_managed" "test" { func testAccAzureRMDataFactoryIntegrationRuntimeManaged_vnetIntegration(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -172,6 +180,10 @@ resource "azurerm_data_factory_integration_runtime_managed" "test" { func testAccAzureRMDataFactoryIntegrationRuntimeManaged_catalogInfo(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -212,6 +224,10 @@ resource "azurerm_data_factory_integration_runtime_managed" "test" { func testAccAzureRMDataFactoryIntegrationRuntimeManaged_customSetupScript(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_linked_service_data_lake_storage_gen2_test.go b/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_linked_service_data_lake_storage_gen2_test.go index 55e797a61d9cb..e86b754ddf604 100644 --- a/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_linked_service_data_lake_storage_gen2_test.go +++ b/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_linked_service_data_lake_storage_gen2_test.go @@ -124,6 +124,10 @@ func testCheckAzureRMDataFactoryLinkedServiceDataLakeStorageGen2Destroy(s *terra func testAccAzureRMDataFactoryLinkedServiceDataLakeStorageGen2_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -152,6 +156,10 @@ resource "azurerm_data_factory_linked_service_data_lake_storage_gen2" "test" { func testAccAzureRMDataFactoryLinkedServiceDataLakeStorageGen2_update1(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -192,6 +200,10 @@ resource "azurerm_data_factory_linked_service_data_lake_storage_gen2" "test" { func testAccAzureRMDataFactoryLinkedServiceDataLakeStorageGen2_update2(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_linked_service_mysql_test.go b/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_linked_service_mysql_test.go index 4fefc4945f3ea..20d38d6b806dc 100644 --- a/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_linked_service_mysql_test.go +++ b/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_linked_service_mysql_test.go @@ -124,6 +124,10 @@ func testCheckAzureRMDataFactoryLinkedServiceMySQLDestroy(s *terraform.State) er func testAccAzureRMDataFactoryLinkedServiceMySQL_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -146,6 +150,10 @@ resource "azurerm_data_factory_linked_service_mysql" "test" { func testAccAzureRMDataFactoryLinkedServiceMySQL_update1(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -180,6 +188,10 @@ resource "azurerm_data_factory_linked_service_mysql" "test" { func testAccAzureRMDataFactoryLinkedServiceMySQL_update2(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_linked_service_postgresql_test.go b/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_linked_service_postgresql_test.go index 89d32073830a4..3a132da5576eb 100644 --- a/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_linked_service_postgresql_test.go +++ b/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_linked_service_postgresql_test.go @@ -124,6 +124,10 @@ func testCheckAzureRMDataFactoryLinkedServicePostgreSQLDestroy(s *terraform.Stat func testAccAzureRMDataFactoryLinkedServicePostgreSQL_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -146,6 +150,10 @@ resource "azurerm_data_factory_linked_service_postgresql" "test" { func testAccAzureRMDataFactoryLinkedServicePostgreSQL_update1(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -180,6 +188,10 @@ resource "azurerm_data_factory_linked_service_postgresql" "test" { func testAccAzureRMDataFactoryLinkedServicePostgreSQL_update2(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_linked_service_sql_server_test.go b/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_linked_service_sql_server_test.go index bf71e3ef61ea6..836f3d7f0d6ac 100644 --- a/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_linked_service_sql_server_test.go +++ b/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_linked_service_sql_server_test.go @@ -107,6 +107,10 @@ func testCheckAzureRMDataFactoryLinkedServiceSQLServerDestroy(s *terraform.State func testAccAzureRMDataFactoryLinkedServiceSQLServer_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -141,6 +145,10 @@ resource "azurerm_data_factory_linked_service_sql_server" "test" { func testAccAzureRMDataFactoryLinkedServiceSQLServer_update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_pipeline_test.go b/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_pipeline_test.go index 2a1f96daa2517..e1f5574c534ba 100644 --- a/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_pipeline_test.go +++ b/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_pipeline_test.go @@ -117,6 +117,10 @@ func testCheckAzureRMDataFactoryPipelineExists(resourceName string) resource.Tes func testAccAzureRMDataFactoryPipeline_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -138,6 +142,10 @@ resource "azurerm_data_factory_pipeline" "test" { func testAccAzureRMDataFactoryPipeline_update1(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -170,6 +178,10 @@ resource "azurerm_data_factory_pipeline" "test" { func testAccAzureRMDataFactoryPipeline_update2(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_test.go b/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_test.go index 63cd5008c5fbc..b291d7b93f97d 100644 --- a/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_test.go +++ b/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_test.go @@ -246,6 +246,10 @@ func testCheckAzureRMDataFactoryDestroy(s *terraform.State) error { func testAccAzureRMDataFactory_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -261,6 +265,10 @@ resource "azurerm_data_factory" "test" { func testAccAzureRMDataFactory_tags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -280,6 +288,10 @@ resource "azurerm_data_factory" "test" { func testAccAzureRMDataFactory_tagsUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -300,6 +312,10 @@ resource "azurerm_data_factory" "test" { func testAccAzureRMDataFactory_identity(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -319,6 +335,10 @@ resource "azurerm_data_factory" "test" { func testAccAzureRMDataFactory_github(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -342,6 +362,10 @@ resource "azurerm_data_factory" "test" { func testAccAzureRMDataFactory_githubUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_trigger_schedule_test.go b/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_trigger_schedule_test.go index 007eb6898e6a2..c339052f51e14 100644 --- a/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_trigger_schedule_test.go +++ b/azurerm/internal/services/datafactory/tests/resource_arm_data_factory_trigger_schedule_test.go @@ -120,6 +120,10 @@ func testCheckAzureRMDataFactoryTriggerScheduleDestroy(s *terraform.State) error func testAccAzureRMDataFactoryTriggerSchedule_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -154,6 +158,10 @@ resource "azurerm_data_factory_trigger_schedule" "test" { func testAccAzureRMDataFactoryTriggerSchedule_update(data acceptance.TestData, endTime string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-datafactory-%d" location = "%s" diff --git a/azurerm/internal/services/datalake/tests/data_source_data_lake_store_test.go b/azurerm/internal/services/datalake/tests/data_source_data_lake_store_test.go index 64794cf0d542c..8d54974f1d34c 100644 --- a/azurerm/internal/services/datalake/tests/data_source_data_lake_store_test.go +++ b/azurerm/internal/services/datalake/tests/data_source_data_lake_store_test.go @@ -47,6 +47,10 @@ func TestAccDataSourceAzureRMDataLakeStore_tier(t *testing.T) { func testAccDataSourceDataLakeStore_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -67,6 +71,10 @@ data "azurerm_data_lake_store" "test" { func testAccDataSourceDataLakeStore_tier(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/datalake/tests/resource_arm_data_lake_analytics_firewall_rule_test.go b/azurerm/internal/services/datalake/tests/resource_arm_data_lake_analytics_firewall_rule_test.go index a5eac1af52f8b..6d682e23e6b7b 100644 --- a/azurerm/internal/services/datalake/tests/resource_arm_data_lake_analytics_firewall_rule_test.go +++ b/azurerm/internal/services/datalake/tests/resource_arm_data_lake_analytics_firewall_rule_test.go @@ -179,6 +179,10 @@ func testCheckAzureRMDataLakeAnalyticsFirewallRuleDestroy(s *terraform.State) er func testAccAzureRMDataLakeAnalyticsFirewallRule_basic(data acceptance.TestData, startIP, endIP string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" diff --git a/azurerm/internal/services/datalake/tests/resource_arm_data_lake_store_file_test.go b/azurerm/internal/services/datalake/tests/resource_arm_data_lake_store_file_test.go index 6ac037301f280..6dc5c1722c0e2 100644 --- a/azurerm/internal/services/datalake/tests/resource_arm_data_lake_store_file_test.go +++ b/azurerm/internal/services/datalake/tests/resource_arm_data_lake_store_file_test.go @@ -180,6 +180,10 @@ func testCheckAzureRMDataLakeStoreFileDestroy(s *terraform.State) error { func testAccAzureRMDataLakeStoreFile_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -202,6 +206,10 @@ resource "azurerm_data_lake_store_file" "test" { func testAccAzureRMDataLakeStoreFile_largefiles(data acceptance.TestData, file string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/datalake/tests/resource_arm_data_lake_store_firewall_rule_test.go b/azurerm/internal/services/datalake/tests/resource_arm_data_lake_store_firewall_rule_test.go index ea8818f2a484f..d33ed68a7d921 100644 --- a/azurerm/internal/services/datalake/tests/resource_arm_data_lake_store_firewall_rule_test.go +++ b/azurerm/internal/services/datalake/tests/resource_arm_data_lake_store_firewall_rule_test.go @@ -179,6 +179,10 @@ func testCheckAzureRMDataLakeStoreFirewallRuleDestroy(s *terraform.State) error func testAccAzureRMDataLakeStoreFirewallRule_basic(data acceptance.TestData, startIP, endIP string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/datalake/tests/resource_arm_data_lake_store_test.go b/azurerm/internal/services/datalake/tests/resource_arm_data_lake_store_test.go index c65d15c556c6f..b914a371eae82 100644 --- a/azurerm/internal/services/datalake/tests/resource_arm_data_lake_store_test.go +++ b/azurerm/internal/services/datalake/tests/resource_arm_data_lake_store_test.go @@ -232,6 +232,10 @@ func testCheckAzureRMDataLakeStoreDestroy(s *terraform.State) error { func testAccAzureRMDataLakeStore_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -260,6 +264,10 @@ resource "azurerm_data_lake_store" "import" { func testAccAzureRMDataLakeStore_tier(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -276,6 +284,10 @@ resource "azurerm_data_lake_store" "test" { func testAccAzureRMDataLakeStore_encryptionDisabled(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -292,6 +304,10 @@ resource "azurerm_data_lake_store" "test" { func testAccAzureRMDataLakeStore_firewall(data acceptance.TestData, firewallState string, firewallAllowAzureIPs string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -309,6 +325,10 @@ resource "azurerm_data_lake_store" "test" { func testAccAzureRMDataLakeStore_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -329,6 +349,10 @@ resource "azurerm_data_lake_store" "test" { func testAccAzureRMDataLakeStore_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/devspace/tests/resource_arm_devspace_controller_test.go b/azurerm/internal/services/devspace/tests/resource_arm_devspace_controller_test.go index e968c6bcc18f6..2fdff52451481 100644 --- a/azurerm/internal/services/devspace/tests/resource_arm_devspace_controller_test.go +++ b/azurerm/internal/services/devspace/tests/resource_arm_devspace_controller_test.go @@ -127,6 +127,10 @@ func testCheckAzureRMDevSpaceControllerDestroy(s *terraform.State) error { func testAccAzureRMDevSpaceController_basic(data acceptance.TestData, clientId string, clientSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/devtestlabs/tests/data_source_dev_test_lab_test.go b/azurerm/internal/services/devtestlabs/tests/data_source_dev_test_lab_test.go index 27a2927631bfa..4a37fda3ac5e9 100644 --- a/azurerm/internal/services/devtestlabs/tests/data_source_dev_test_lab_test.go +++ b/azurerm/internal/services/devtestlabs/tests/data_source_dev_test_lab_test.go @@ -47,6 +47,10 @@ func TestAccDataSourceAzureRMDevTestLab_complete(t *testing.T) { func testAccDataSourceDevTestLab_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -67,6 +71,10 @@ data "azurerm_dev_test_lab" "test" { func testAccDataSourceDevTestLab_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/devtestlabs/tests/data_source_dev_test_virtual_network_test.go b/azurerm/internal/services/devtestlabs/tests/data_source_dev_test_virtual_network_test.go index 2a8c387735a47..af8cfb7380a32 100644 --- a/azurerm/internal/services/devtestlabs/tests/data_source_dev_test_virtual_network_test.go +++ b/azurerm/internal/services/devtestlabs/tests/data_source_dev_test_virtual_network_test.go @@ -44,6 +44,10 @@ func TestAccDataSourceArmDevTestVirtualNetwork_basic(t *testing.T) { func testAccDataSourceArmDevTestVirtualNetwork_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_lab_schedule_test.go b/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_lab_schedule_test.go index 6671e52b432b8..870db269ba886 100644 --- a/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_lab_schedule_test.go +++ b/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_lab_schedule_test.go @@ -159,6 +159,10 @@ func testCheckAzureRMDevTestLabScheduleDestroy(s *terraform.State) error { func testAccAzureRMDevTestLabSchedule_autoShutdownBasic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -192,6 +196,10 @@ resource "azurerm_dev_test_schedule" "test" { func testAccAzureRMDevTestLabSchedule_autoShutdownBasicUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -228,6 +236,10 @@ resource "azurerm_dev_test_schedule" "test" { func testAccAzureRMDevTestLabSchedule_autoStartupBasic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -264,6 +276,10 @@ resource "azurerm_dev_test_schedule" "test" { func testAccAzureRMDevTestLabSchedule_autoStartupBasicUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -302,6 +318,10 @@ resource "azurerm_dev_test_schedule" "test" { func testAccAzureRMDevTestLabSchedule_concurrent(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_lab_test.go b/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_lab_test.go index 03bef243f34a3..7af7e260ed3f7 100644 --- a/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_lab_test.go +++ b/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_lab_test.go @@ -142,6 +142,10 @@ func testCheckAzureRMDevTestLabDestroy(s *terraform.State) error { func testAccAzureRMDevTestLab_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -170,6 +174,10 @@ resource "azurerm_dev_test_lab" "import" { func testAccAzureRMDevTestLab_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_linux_virtual_machine_test.go b/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_linux_virtual_machine_test.go index 918d7e8d9404d..86552e185863f 100644 --- a/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_linux_virtual_machine_test.go +++ b/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_linux_virtual_machine_test.go @@ -359,6 +359,10 @@ resource "azurerm_dev_test_linux_virtual_machine" "test" { func testAccAzureRMDevTestLinuxVirtualMachine_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_policy_test.go b/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_policy_test.go index a021437b6fef0..226d6e9adf15a 100644 --- a/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_policy_test.go +++ b/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_policy_test.go @@ -142,6 +142,10 @@ func testCheckAzureRMDevTestPolicyDestroy(s *terraform.State) error { func testAccAzureRMDevTestPolicy_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -182,6 +186,10 @@ resource "azurerm_dev_test_policy" "import" { func testAccAzureRMDevTestPolicy_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_virtual_network_test.go b/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_virtual_network_test.go index 7e91a373a6b20..650b3a94d5fd4 100644 --- a/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_virtual_network_test.go +++ b/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_virtual_network_test.go @@ -171,6 +171,10 @@ func testCheckAzureRMDevTestVirtualNetworkDestroy(s *terraform.State) error { func testAccAzureRMDevTestVirtualNetwork_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -205,6 +209,10 @@ resource "azurerm_dev_test_virtual_network" "import" { func testAccAzureRMDevTestVirtualNetwork_subnets(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_windows_virtual_machine_test.go b/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_windows_virtual_machine_test.go index 8dda8581cba6b..5d18357b9ea84 100644 --- a/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_windows_virtual_machine_test.go +++ b/azurerm/internal/services/devtestlabs/tests/resource_arm_dev_test_windows_virtual_machine_test.go @@ -306,6 +306,10 @@ resource "azurerm_dev_test_windows_virtual_machine" "test" { func testAccAzureRMDevTestWindowsVirtualMachine_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/dns/tests/data_source_dns_zone_test.go b/azurerm/internal/services/dns/tests/data_source_dns_zone_test.go index 9dbe3ff5eb19c..94e5127124b76 100644 --- a/azurerm/internal/services/dns/tests/data_source_dns_zone_test.go +++ b/azurerm/internal/services/dns/tests/data_source_dns_zone_test.go @@ -66,6 +66,10 @@ func TestAccDataSourceAzureRMDNSZone_withoutResourceGroupName(t *testing.T) { func testAccDataSourceDNSZone_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -85,6 +89,10 @@ data "azurerm_dns_zone" "test" { func testAccDataSourceDNSZone_tags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -108,6 +116,10 @@ data "azurerm_dns_zone" "test" { func testAccDataSourceDNSZone_onlyName(data acceptance.TestData, resourceGroupName string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "%s" location = "%s" diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_a_record_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_a_record_test.go index cfb0cfd80f784..9ef2a14927660 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_a_record_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_a_record_test.go @@ -261,6 +261,10 @@ func testCheckAzureRMDnsARecordDestroy(s *terraform.State) error { func testAccAzureRMDnsARecord_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -298,6 +302,10 @@ resource "azurerm_dns_a_record" "import" { func testAccAzureRMDnsARecord_updateRecords(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -320,6 +328,10 @@ resource "azurerm_dns_a_record" "test" { func testAccAzureRMDnsARecord_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -347,6 +359,10 @@ resource "azurerm_dns_a_record" "test" { func testAccAzureRMDnsARecord_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -373,6 +389,10 @@ resource "azurerm_dns_a_record" "test" { func testAccAzureRMDnsARecord_withAlias(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -403,6 +423,10 @@ resource "azurerm_dns_a_record" "test" { func testAccAzureRMDnsARecord_withAliasUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -433,6 +457,10 @@ resource "azurerm_dns_a_record" "test" { func testAccAzureRMDnsARecord_AliasToRecords(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -463,6 +491,10 @@ resource "azurerm_dns_a_record" "test" { func testAccAzureRMDnsARecord_AliasToRecordsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_aaaa_record_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_aaaa_record_test.go index b573672288d5c..24319099ec7b2 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_aaaa_record_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_aaaa_record_test.go @@ -288,6 +288,10 @@ func testCheckAzureRMDnsAaaaRecordDestroy(s *terraform.State) error { func testAccAzureRMDnsAAAARecord_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -325,6 +329,10 @@ resource "azurerm_dns_aaaa_record" "import" { func testAccAzureRMDnsAAAARecord_updateRecords(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -347,6 +355,10 @@ resource "azurerm_dns_aaaa_record" "test" { func testAccAzureRMDnsAAAARecord_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -374,6 +386,10 @@ resource "azurerm_dns_aaaa_record" "test" { func testAccAzureRMDnsAAAARecord_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -400,6 +416,10 @@ resource "azurerm_dns_aaaa_record" "test" { func testAccAzureRMDnsAAAARecord_withAlias(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -430,6 +450,10 @@ resource "azurerm_dns_aaaa_record" "test" { func testAccAzureRMDnsAAAARecord_withAliasUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -460,6 +484,10 @@ resource "azurerm_dns_aaaa_record" "test" { func testAccAzureRMDnsAaaaRecord_AliasToRecords(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -490,6 +518,10 @@ resource "azurerm_dns_aaaa_record" "test" { func testAccAzureRMDnsAaaaRecord_AliasToRecordsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -512,6 +544,10 @@ resource "azurerm_dns_aaaa_record" "test" { func testAccAzureRMDnsAAAARecord_uncompressed(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_caa_record_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_caa_record_test.go index 3da4f6913f8fd..2fd30199c8531 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_caa_record_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_caa_record_test.go @@ -174,6 +174,10 @@ func testCheckAzureRMDnsCaaRecordDestroy(s *terraform.State) error { func testAccAzureRMDnsCaaRecord_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -257,6 +261,10 @@ resource "azurerm_dns_caa_record" "import" { func testAccAzureRMDnsCaaRecord_updateRecords(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -308,6 +316,10 @@ resource "azurerm_dns_caa_record" "test" { func testAccAzureRMDnsCaaRecord_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -346,6 +358,10 @@ resource "azurerm_dns_caa_record" "test" { func testAccAzureRMDnsCaaRecord_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_cname_record_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_cname_record_test.go index a60dce303da6f..2064f9d4dd3b1 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_cname_record_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_cname_record_test.go @@ -278,6 +278,10 @@ func testCheckAzureRMDnsCNameRecordDestroy(s *terraform.State) error { func testAccAzureRMDnsCNameRecord_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -315,6 +319,10 @@ resource "azurerm_dns_cname_record" "import" { func testAccAzureRMDnsCNameRecord_subdomain(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -337,6 +345,10 @@ resource "azurerm_dns_cname_record" "test" { func testAccAzureRMDnsCNameRecord_updateRecords(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -359,6 +371,10 @@ resource "azurerm_dns_cname_record" "test" { func testAccAzureRMDnsCNameRecord_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -386,6 +402,10 @@ resource "azurerm_dns_cname_record" "test" { func testAccAzureRMDnsCNameRecord_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -412,6 +432,10 @@ resource "azurerm_dns_cname_record" "test" { func testAccAzureRMDnsCNameRecord_withAlias(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -442,6 +466,10 @@ resource "azurerm_dns_cname_record" "test" { func testAccAzureRMDnsCNameRecord_withAliasUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -472,6 +500,10 @@ resource "azurerm_dns_cname_record" "test" { func testAccAzureRMDnsCNameRecord_AliasToRecord(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -502,6 +534,10 @@ resource "azurerm_dns_cname_record" "test" { func testAccAzureRMDnsCNameRecord_AliasToRecordUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_mx_record_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_mx_record_test.go index 5b26665d419e3..ed50ae861a36c 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_mx_record_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_mx_record_test.go @@ -195,6 +195,10 @@ func testCheckAzureRMDnsMxRecordDestroy(s *terraform.State) error { func testAccAzureRMDnsMxRecord_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -226,6 +230,10 @@ resource "azurerm_dns_mx_record" "test" { func testAccAzureRMDnsMxRecord_rootrecord(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -280,6 +288,10 @@ resource "azurerm_dns_mx_record" "import" { func testAccAzureRMDnsMxRecord_updateRecords(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -316,6 +328,10 @@ resource "azurerm_dns_mx_record" "test" { func testAccAzureRMDnsMxRecord_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -352,6 +368,10 @@ resource "azurerm_dns_mx_record" "test" { func testAccAzureRMDnsMxRecord_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_ns_record_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_ns_record_test.go index 2212bbd25c1c4..e4c4ae47ad5e6 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_ns_record_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_ns_record_test.go @@ -173,6 +173,10 @@ func testCheckAzureRMDnsNsRecordDestroy(s *terraform.State) error { func testAccAzureRMDnsNsRecord_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -212,6 +216,10 @@ resource "azurerm_dns_ns_record" "import" { func testAccAzureRMDnsNsRecord_updateRecords(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -235,6 +243,10 @@ resource "azurerm_dns_ns_record" "test" { func testAccAzureRMDnsNsRecord_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -263,6 +275,10 @@ resource "azurerm_dns_ns_record" "test" { func testAccAzureRMDnsNsRecord_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_ptr_record_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_ptr_record_test.go index 4b19d2ede00b4..cb0b7abc65e1c 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_ptr_record_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_ptr_record_test.go @@ -177,6 +177,10 @@ func testCheckAzureRMDnsPtrRecordDestroy(s *terraform.State) error { func testAccAzureRMDnsPtrRecord_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -214,6 +218,10 @@ resource "azurerm_dns_ptr_record" "import" { func testAccAzureRMDnsPtrRecord_updateRecords(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -236,6 +244,10 @@ resource "azurerm_dns_ptr_record" "test" { func testAccAzureRMDnsPtrRecord_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -263,6 +275,10 @@ resource "azurerm_dns_ptr_record" "test" { func testAccAzureRMDnsPtrRecord_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_srv_record_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_srv_record_test.go index 9a2521d063a98..cb53fa399f4b7 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_srv_record_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_srv_record_test.go @@ -175,6 +175,10 @@ func testCheckAzureRMDnsSrvRecordDestroy(s *terraform.State) error { func testAccAzureRMDnsSrvRecord_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -238,6 +242,10 @@ resource "azurerm_dns_srv_record" "import" { func testAccAzureRMDnsSrvRecord_updateRecords(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -280,6 +288,10 @@ resource "azurerm_dns_srv_record" "test" { func testAccAzureRMDnsSrvRecord_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -320,6 +332,10 @@ resource "azurerm_dns_srv_record" "test" { func testAccAzureRMDnsSrvRecord_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_txt_record_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_txt_record_test.go index e1f8f53da4f2b..aad8ba2abee7f 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_txt_record_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_txt_record_test.go @@ -175,6 +175,10 @@ func testCheckAzureRMDnsTxtRecordDestroy(s *terraform.State) error { func testAccAzureRMDnsTxtRecord_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -226,6 +230,10 @@ resource "azurerm_dns_txt_record" "import" { func testAccAzureRMDnsTxtRecord_updateRecords(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -259,6 +267,10 @@ resource "azurerm_dns_txt_record" "test" { func testAccAzureRMDnsTxtRecord_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -293,6 +305,10 @@ resource "azurerm_dns_txt_record" "test" { func testAccAzureRMDnsTxtRecord_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_zone_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_zone_test.go index 9fa4ba70afc6b..0fb4bc6081850 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_zone_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_zone_test.go @@ -146,6 +146,10 @@ func testCheckAzureRMDnsZoneDestroy(s *terraform.State) error { func testAccAzureRMDnsZone_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -172,6 +176,10 @@ resource "azurerm_dns_zone" "import" { func testAccAzureRMDnsZone_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -191,6 +199,10 @@ resource "azurerm_dns_zone" "test" { func testAccAzureRMDnsZone_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/eventgrid/tests/resource_arm_eventgrid_domain_test.go b/azurerm/internal/services/eventgrid/tests/resource_arm_eventgrid_domain_test.go index 5f9191772575d..3dd1e68cfccc6 100644 --- a/azurerm/internal/services/eventgrid/tests/resource_arm_eventgrid_domain_test.go +++ b/azurerm/internal/services/eventgrid/tests/resource_arm_eventgrid_domain_test.go @@ -139,6 +139,10 @@ func testCheckAzureRMEventGridDomainExists(resourceName string) resource.TestChe func testAccAzureRMEventGridDomain_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -154,6 +158,10 @@ resource "azurerm_eventgrid_domain" "test" { func testAccAzureRMEventGridDomain_mapping(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -181,6 +189,10 @@ resource "azurerm_eventgrid_domain" "test" { func testAccAzureRMEventGridDomain_basicWithTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/eventgrid/tests/resource_arm_eventgrid_event_subscription_test.go b/azurerm/internal/services/eventgrid/tests/resource_arm_eventgrid_event_subscription_test.go index 7d883fbd42eb2..434804e88195e 100644 --- a/azurerm/internal/services/eventgrid/tests/resource_arm_eventgrid_event_subscription_test.go +++ b/azurerm/internal/services/eventgrid/tests/resource_arm_eventgrid_event_subscription_test.go @@ -177,6 +177,10 @@ func testCheckAzureRMEventGridEventSubscriptionExists(resourceName string) resou func testAccAzureRMEventGridEventSubscription_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -243,6 +247,10 @@ resource "azurerm_eventgrid_event_subscription" "test" { func testAccAzureRMEventGridEventSubscription_update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -313,6 +321,10 @@ resource "azurerm_eventgrid_event_subscription" "test" { func testAccAzureRMEventGridEventSubscription_eventhub(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -347,6 +359,10 @@ resource "azurerm_eventgrid_event_subscription" "test" { func testAccAzureRMEventGridEventSubscription_filter(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/eventgrid/tests/resource_arm_eventgrid_topic_test.go b/azurerm/internal/services/eventgrid/tests/resource_arm_eventgrid_topic_test.go index 4113412bcc0bf..5e33ace9f23d3 100644 --- a/azurerm/internal/services/eventgrid/tests/resource_arm_eventgrid_topic_test.go +++ b/azurerm/internal/services/eventgrid/tests/resource_arm_eventgrid_topic_test.go @@ -150,6 +150,10 @@ func testAccAzureRMEventGridTopic_basic(data acceptance.TestData) string { // currently only supported in "West Central US" & "West US 2" location := "westus2" return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -180,6 +184,10 @@ func testAccAzureRMEventGridTopic_basicWithTags(data acceptance.TestData) string // currently only supported in "West Central US" & "West US 2" location := "westus2" return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/eventhub/tests/data_source_eventhub_consumer_group_test.go b/azurerm/internal/services/eventhub/tests/data_source_eventhub_consumer_group_test.go index 635abe9f7811a..3802cf8da05da 100644 --- a/azurerm/internal/services/eventhub/tests/data_source_eventhub_consumer_group_test.go +++ b/azurerm/internal/services/eventhub/tests/data_source_eventhub_consumer_group_test.go @@ -29,6 +29,10 @@ func TestAccDataSourceAzureRMEventHubConsumerGroup_complete(t *testing.T) { func testAccDataSourceAzureRMEventHubConsumerGroup_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/eventhub/tests/data_source_eventhub_namespace_authorization_rule_test.go b/azurerm/internal/services/eventhub/tests/data_source_eventhub_namespace_authorization_rule_test.go index f65b5a8297fd1..e6737abb76a04 100644 --- a/azurerm/internal/services/eventhub/tests/data_source_eventhub_namespace_authorization_rule_test.go +++ b/azurerm/internal/services/eventhub/tests/data_source_eventhub_namespace_authorization_rule_test.go @@ -25,6 +25,10 @@ func TestAccDataSourceAzureRMEventHubNamespaceAuthorizationRule_basic(t *testing func testAccDataSourceEventHubNamespaceAuthorizationRule_basic(data acceptance.TestData, listen, send, manage bool) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-eventhub-%[1]d" location = "%[2]s" diff --git a/azurerm/internal/services/eventhub/tests/data_source_eventhub_namespace_test.go b/azurerm/internal/services/eventhub/tests/data_source_eventhub_namespace_test.go index 0581c12f65033..97a171726f4a3 100644 --- a/azurerm/internal/services/eventhub/tests/data_source_eventhub_namespace_test.go +++ b/azurerm/internal/services/eventhub/tests/data_source_eventhub_namespace_test.go @@ -47,6 +47,10 @@ func TestAccDataSourceAzureRMEventHubNamespace_complete(t *testing.T) { func testAccDataSourceEventHubNamespace_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -68,6 +72,10 @@ data "azurerm_eventhub_namespace" "test" { func testAccDataSourceEventHubNamespace_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_authorization_rule_test.go b/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_authorization_rule_test.go index 74780bffe49dc..4307ddc42aabf 100644 --- a/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_authorization_rule_test.go +++ b/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_authorization_rule_test.go @@ -181,6 +181,10 @@ func testCheckAzureRMEventHubAuthorizationRuleExists(resourceName string) resour func testAccAzureRMEventHubAuthorizationRule_base(data acceptance.TestData, listen, send, manage bool) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" diff --git a/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_consumer_group_test.go b/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_consumer_group_test.go index ec8c0bc7ecd32..303756af8d15f 100644 --- a/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_consumer_group_test.go +++ b/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_consumer_group_test.go @@ -164,6 +164,10 @@ func testCheckAzureRMEventHubConsumerGroupExists(resourceName string) resource.T func testAccAzureRMEventHubConsumerGroup_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -209,6 +213,10 @@ resource "azurerm_eventhub_consumer_group" "import" { func testAccAzureRMEventHubConsumerGroup_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_namespace_authorization_rule_test.go b/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_namespace_authorization_rule_test.go index b4b8e589ab8ca..08399d6cad933 100644 --- a/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_namespace_authorization_rule_test.go +++ b/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_namespace_authorization_rule_test.go @@ -178,6 +178,10 @@ func testCheckAzureRMEventHubNamespaceAuthorizationRuleExists(resourceName strin func testAccAzureRMEventHubNamespaceAuthorizationRule_base(data acceptance.TestData, listen, send, manage bool) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-eventhub-%[1]d" location = "%[2]s" diff --git a/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_namespace_disaster_recovery_config_test.go b/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_namespace_disaster_recovery_config_test.go index bb6667f5f52ec..0cd015495693b 100644 --- a/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_namespace_disaster_recovery_config_test.go +++ b/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_namespace_disaster_recovery_config_test.go @@ -135,6 +135,10 @@ func testCheckAzureRMEventHubNamespaceDisasterRecoveryConfigExists(resourceName func testAccAzureRMEventHubNamespaceDisasterRecoveryConfig_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-eventhub-%[1]d" location = "%[2]s" @@ -165,6 +169,10 @@ resource "azurerm_eventhub_namespace_disaster_recovery_config" "test" { func testAccAzureRMEventHubNamespaceDisasterRecoveryConfig_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-eventhub-%[1]d" location = "%[2]s" @@ -196,6 +204,10 @@ resource "azurerm_eventhub_namespace_disaster_recovery_config" "test" { func testAccAzureRMEventHubNamespaceDisasterRecoveryConfig_updated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-eventhub-%[1]d" location = "%[2]s" @@ -233,6 +245,10 @@ resource "azurerm_eventhub_namespace_disaster_recovery_config" "test" { func testAccAzureRMEventHubNamespaceDisasterRecoveryConfig_updated_removed(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-eventhub-%[1]d" location = "%[2]s" diff --git a/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_namespace_test.go b/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_namespace_test.go index 3f830588499ad..8d2b11374b134 100644 --- a/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_namespace_test.go +++ b/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_namespace_test.go @@ -402,6 +402,10 @@ func testCheckAzureRMEventHubNamespaceExists(resourceName string) resource.TestC func testAccAzureRMEventHubNamespace_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -432,6 +436,10 @@ resource "azurerm_eventhub_namespace" "import" { func testAccAzureRMEventHubNamespace_standard(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -449,6 +457,10 @@ resource "azurerm_eventhub_namespace" "test" { func testAccAzureRMEventHubNamespace_networkrule_iprule(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -473,6 +485,10 @@ resource "azurerm_eventhub_namespace" "test" { func testAccAzureRMEventHubNamespace_networkrule_vnet(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -513,6 +529,10 @@ resource "azurerm_eventhub_namespace" "test" { func testAccAzureRMEventHubNamespace_networkruleVnetIpRule(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -580,6 +600,10 @@ resource "azurerm_eventhub_namespace" "test" { func testAccAzureRMEventHubNamespaceNonStandardCasing(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -596,6 +620,10 @@ resource "azurerm_eventhub_namespace" "test" { func testAccAzureRMEventHubNamespace_maximumThroughputUnits(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -615,6 +643,10 @@ resource "azurerm_eventhub_namespace" "test" { func testAccAzureRMEventHubNamespace_basicWithTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -635,6 +667,10 @@ resource "azurerm_eventhub_namespace" "test" { func testAccAzureRMEventHubNamespace_capacity(data acceptance.TestData, capacity int) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -652,6 +688,10 @@ resource "azurerm_eventhub_namespace" "test" { func testAccAzureRMEventHubNamespace_maximumThroughputUnitsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -671,6 +711,10 @@ resource "azurerm_eventhub_namespace" "test" { func testAccAzureRMEventHubNamespace_autoInfalteDisabledWithAutoInflateUnits(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_test.go b/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_test.go index 4616d8b37e23d..0e6aa4ff5d1f3 100644 --- a/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_test.go +++ b/azurerm/internal/services/eventhub/tests/resource_arm_eventhub_test.go @@ -415,6 +415,10 @@ func testCheckAzureRMEventHubExists(resourceName string) resource.TestCheckFunc func testAccAzureRMEventHub_basic(data acceptance.TestData, partitionCount int) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-eventhub-%d" location = "%s" @@ -454,6 +458,10 @@ resource "azurerm_eventhub" "import" { func testAccAzureRMEventHub_partitionCountUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-eventhub-%d" location = "%s" @@ -478,6 +486,10 @@ resource "azurerm_eventhub" "test" { func testAccAzureRMEventHub_standard(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-eventhub-%d" location = "%s" @@ -503,6 +515,10 @@ resource "azurerm_eventhub" "test" { func testAccAzureRMEventHub_captureDescription(data acceptance.TestData, enabled bool) string { enabledString := strconv.FormatBool(enabled) return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-eventhub-%d" location = "%s" @@ -556,6 +572,10 @@ resource "azurerm_eventhub" "test" { func testAccAzureRMEventHub_messageRetentionUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-eventhub-%d" location = "%s" diff --git a/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_firewall_policy_test.go b/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_firewall_policy_test.go index 4f87a37e1de42..e20d0d22d77bd 100644 --- a/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_firewall_policy_test.go +++ b/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_firewall_policy_test.go @@ -187,6 +187,10 @@ func testCheckAzureRMFrontDoorFirewallPolicyAttrNotExists(name string, attribute func testAccAzureRMFrontDoorFirewallPolicy_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccRG-%d" location = "%s" @@ -216,6 +220,10 @@ func testAccAzureRMFrontDoorFirewallPolicy_update(data acceptance.TestData, upda return testAccAzureRMFrontDoorFirewallPolicy_updated(data) } return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccRG-%d" location = "%s" @@ -272,6 +280,10 @@ resource "azurerm_frontdoor_firewall_policy" "test" { func testAccAzureRMFrontDoorFirewallPolicy_updated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "testaccRG-%d" location = "%[2]s" diff --git a/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_test.go b/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_test.go index f288ee6a68276..5279eeb0796d5 100644 --- a/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_test.go +++ b/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_test.go @@ -240,6 +240,10 @@ func testCheckAzureRMFrontDoorDestroy(s *terraform.State) error { func testAccAzureRMFrontDoor_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -353,6 +357,10 @@ resource "azurerm_frontdoor" "import" { func testAccAzureRMFrontDoor_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -414,6 +422,11 @@ resource "azurerm_frontdoor" "test" { func testAccAzureRMFrontDoor_waf(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features { +} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -482,6 +495,10 @@ resource "azurerm_frontdoor" "test" { func testAccAzureRMFrontDoor_DisableCache(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -544,6 +561,10 @@ resource "azurerm_frontdoor" "test" { func testAccAzureRMFrontDoor_EnableCache(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -606,6 +627,10 @@ resource "azurerm_frontdoor" "test" { func testAccAzureRMFrontDoor_CustomHttpsEnabled(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -671,6 +696,10 @@ resource "azurerm_frontdoor" "test" { func testAccAzureRMFrontDoor_CustomHttpsDisabled(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_hadoop_cluster_test.go b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_hadoop_cluster_test.go index cf7b4e7012df9..6ed62031cf9cc 100644 --- a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_hadoop_cluster_test.go +++ b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_hadoop_cluster_test.go @@ -905,6 +905,10 @@ resource "azurerm_hdinsight_hadoop_cluster" "test" { func testAccAzureRMHDInsightHadoopCluster_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -928,6 +932,10 @@ resource "azurerm_storage_container" "test" { func testAccAzureRMHDInsightHadoopCluster_gen2template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_hbase_cluster_test.go b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_hbase_cluster_test.go index cd8257c370547..9161a77a692ef 100644 --- a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_hbase_cluster_test.go +++ b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_hbase_cluster_test.go @@ -651,6 +651,10 @@ resource "azurerm_hdinsight_hbase_cluster" "test" { func testAccAzureRMHDInsightHBaseCluster_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -674,6 +678,10 @@ resource "azurerm_storage_container" "test" { func testAccAzureRMHDInsightHBaseCluster_gen2template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_interactive_query_cluster_test.go b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_interactive_query_cluster_test.go index aabf4cebd07c2..2335ceb6f2e71 100644 --- a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_interactive_query_cluster_test.go +++ b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_interactive_query_cluster_test.go @@ -653,6 +653,10 @@ resource "azurerm_hdinsight_interactive_query_cluster" "test" { func testAccAzureRMHDInsightInteractiveQueryCluster_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -676,6 +680,10 @@ resource "azurerm_storage_container" "test" { func testAccAzureRMHDInsightInteractiveQueryCluster_gen2template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_kafka_cluster_test.go b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_kafka_cluster_test.go index 0ceb046df1b28..7ee5536c1aef4 100644 --- a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_kafka_cluster_test.go +++ b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_kafka_cluster_test.go @@ -663,6 +663,10 @@ resource "azurerm_hdinsight_kafka_cluster" "test" { func testAccAzureRMHDInsightKafkaCluster_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -686,6 +690,10 @@ resource "azurerm_storage_container" "test" { func testAccAzureRMHDInsightKafkaCluster_gen2template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_ml_services_cluster_test.go b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_ml_services_cluster_test.go index 773f40a17eb73..6cadca6d29bde 100644 --- a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_ml_services_cluster_test.go +++ b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_ml_services_cluster_test.go @@ -616,6 +616,10 @@ resource "azurerm_hdinsight_ml_services_cluster" "test" { func testAccAzureRMHDInsightMLServicesCluster_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_rserver_cluster_test.go b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_rserver_cluster_test.go index 9865252d16eb3..a1f18f58a2b32 100644 --- a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_rserver_cluster_test.go +++ b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_rserver_cluster_test.go @@ -616,6 +616,10 @@ resource "azurerm_hdinsight_rserver_cluster" "test" { func testAccAzureRMHDInsightRServerCluster_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_spark_cluster_test.go b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_spark_cluster_test.go index 349949a7e60bb..b1d0782f797e5 100644 --- a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_spark_cluster_test.go +++ b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_spark_cluster_test.go @@ -653,6 +653,10 @@ resource "azurerm_hdinsight_spark_cluster" "test" { func testAccAzureRMHDInsightSparkCluster_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -676,6 +680,10 @@ resource "azurerm_storage_container" "test" { func testAccAzureRMHDInsightSparkCluster_gen2template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_storm_cluster_test.go b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_storm_cluster_test.go index d64891cd0c7ac..26adc1d1b5a15 100644 --- a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_storm_cluster_test.go +++ b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_storm_cluster_test.go @@ -573,6 +573,10 @@ resource "azurerm_hdinsight_storm_cluster" "test" { func testAccAzureRMHDInsightStormCluster_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/iothub/tests/data_source_iothub_dps_shared_access_policy_test.go b/azurerm/internal/services/iothub/tests/data_source_iothub_dps_shared_access_policy_test.go index a109edd6e855f..4951963405556 100644 --- a/azurerm/internal/services/iothub/tests/data_source_iothub_dps_shared_access_policy_test.go +++ b/azurerm/internal/services/iothub/tests/data_source_iothub_dps_shared_access_policy_test.go @@ -32,6 +32,10 @@ func TestAccDataSourceAzureRMIotHubDpsSharedAccessPolicy_basic(t *testing.T) { func testAccDataSourceAzureRMIotHubDpsSharedAccessPolicy_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_consumer_group_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_consumer_group_test.go index cbc60621693b5..84dc99dcdb54c 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_consumer_group_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_consumer_group_test.go @@ -136,6 +136,10 @@ func testCheckAzureRMIotHubConsumerGroupExists(resourceName string) resource.Tes func testAccAzureRMIotHubConsumerGroup_basic(data acceptance.TestData, eventName string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_certificate_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_certificate_test.go index f71a6deba7223..a6add1065b437 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_certificate_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_certificate_test.go @@ -142,6 +142,10 @@ func testCheckAzureRMIotHubDPSCertificateExists(resourceName string) resource.Te func testAccAzureRMIotHubDPSCertificate_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -185,6 +189,10 @@ resource "azurerm_iothub_dps_certificate" "import" { func testAccAzureRMIotHubDPSCertificate_update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_shared_access_policy_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_shared_access_policy_test.go index 3a3e89a54b9b0..da169bc8f863b 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_shared_access_policy_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_shared_access_policy_test.go @@ -91,6 +91,10 @@ func TestAccAzureRMIotHubDpsSharedAccessPolicy_enrollmentWriteWithoutOthers(t *t func testAccAzureRMIotHubDpsSharedAccessPolicy_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -118,6 +122,10 @@ resource "azurerm_iothub_dps_shared_access_policy" "test" { func testAccAzureRMIotHubDpsSharedAccessPolicy_writeWithoutRead(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -145,6 +153,10 @@ resource "azurerm_iothub_dps_shared_access_policy" "test" { func testAccAzureRMIotHubDpsSharedAccessPolicy_enrollmentReadWithoutRegistration(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -172,6 +184,10 @@ resource "azurerm_iothub_dps_shared_access_policy" "test" { func testAccAzureRMIotHubDpsSharedAccessPolicy_enrollmentWriteWithoutOthers(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_test.go index 8998ef1fda41c..4a62908950b62 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_test.go @@ -169,6 +169,10 @@ func testCheckAzureRMIotHubDPSExists(resourceName string) resource.TestCheckFunc func testAccAzureRMIotHubDPS_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -207,6 +211,10 @@ resource "azurerm_iothub_dps" "import" { func testAccAzureRMIotHubDPS_update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -231,6 +239,10 @@ resource "azurerm_iothub_dps" "test" { func testAccAzureRMIotHubDPS_linkedHubs(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -263,6 +275,10 @@ resource "azurerm_iothub_dps" "test" { func testAccAzureRMIotHubDPS_linkedHubsUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_eventhub_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_eventhub_test.go index bb86a2bfab0b0..ada67f96d0254 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_eventhub_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_eventhub_test.go @@ -61,6 +61,10 @@ func TestAccAzureRMIotHubEndpointEventHub_requiresImport(t *testing.T) { func testAccAzureRMIotHubEndpointEventHub_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-iothub-%[1]d" location = "%[2]s" diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_servicebus_queue_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_servicebus_queue_test.go index 27dd50eec7b57..78f20c34128ab 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_servicebus_queue_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_servicebus_queue_test.go @@ -61,6 +61,10 @@ func TestAccAzureRMIotHubEndpointServiceBusQueue_requiresImport(t *testing.T) { func testAccAzureRMIotHubEndpointServiceBusQueue_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-iothub-%[1]d" location = "%[2]s" diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_servicebus_topic_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_servicebus_topic_test.go index 35ec00fc614ae..8fd85bf2d0dc7 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_servicebus_topic_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_servicebus_topic_test.go @@ -62,6 +62,10 @@ func TestAccAzureRMIotHubEndpointServiceBusTopic_requiresImport(t *testing.T) { func testAccAzureRMIotHubEndpointServiceBusTopic_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-iothub-%[1]d" location = "%[2]s" diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_storage_container_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_storage_container_test.go index 1a625ebdf86b5..e6c1d0d468b82 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_storage_container_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_endpoint_storage_container_test.go @@ -65,6 +65,10 @@ func TestAccAzureRMIotHubEndpointStorageContainer_requiresImport(t *testing.T) { func testAccAzureRMIotHubEndpointStorageContainer_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-iothub-%[1]d" location = "%[2]s" diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_fallback_route_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_fallback_route_test.go index bd0f5bef206cd..09fd167e5bc84 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_fallback_route_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_fallback_route_test.go @@ -125,6 +125,10 @@ func testCheckAzureRMIotHubFallbackRouteExists(resourceName string) resource.Tes func testAccAzureRMIotHubFallbackRoute_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-iothub-%[1]d" location = "%[2]s" @@ -185,6 +189,10 @@ resource "azurerm_iothub_fallback_route" "test" { func testAccAzureRMIotHubFallbackRoute_update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-iothub-%[1]d" location = "%[2]s" diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_route_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_route_test.go index dd777988f37fa..d5fa90e44b2bd 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_route_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_route_test.go @@ -190,6 +190,10 @@ resource "azurerm_iothub_route" "import" { func testAccAzureRMIotHubRoute_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-iothub-%[1]d" location = "%[2]s" @@ -252,6 +256,10 @@ resource "azurerm_iothub_route" "test" { func testAccAzureRMIotHubRoute_update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-iothub-%[1]d" location = "%[2]s" diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_shared_access_policy_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_shared_access_policy_test.go index 4c4aaa3e27375..157be0e94acf2 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_shared_access_policy_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_shared_access_policy_test.go @@ -84,6 +84,10 @@ func TestAccAzureRMIotHubSharedAccessPolicy_requiresImport(t *testing.T) { func testAccAzureRMIotHubSharedAccessPolicy_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -133,6 +137,10 @@ resource "azurerm_iothub_shared_access_policy" "import" { func testAccAzureRMIotHubSharedAccessPolicy_writeWithoutRead(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_test.go index 428eeee5d4641..654ebc8c769e9 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_test.go @@ -217,6 +217,10 @@ func testCheckAzureRMIotHubExists(resourceName string) resource.TestCheckFunc { func testAccAzureRMIotHub_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -263,6 +267,10 @@ resource "azurerm_iothub" "import" { func testAccAzureRMIotHub_standard(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -287,6 +295,10 @@ resource "azurerm_iothub" "test" { func testAccAzureRMIotHub_ipFilterRules(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -317,6 +329,10 @@ resource "azurerm_iothub" "test" { func testAccAzureRMIotHub_customRoutes(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -414,6 +430,10 @@ resource "azurerm_iothub" "test" { func testAccAzureRMIotHub_fallbackRoute(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -444,6 +464,10 @@ resource "azurerm_iothub" "test" { func testAccAzureRMIotHub_fileUpload(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go b/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go index 03a76a35d7e59..6e022e98d5db7 100644 --- a/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go +++ b/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go @@ -89,6 +89,10 @@ func TestAccAzureRMKustoCluster_sku(t *testing.T) { func testAccAzureRMKustoCluster_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -109,6 +113,10 @@ resource "azurerm_kusto_cluster" "test" { func testAccAzureRMKustoCluster_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -133,6 +141,10 @@ resource "azurerm_kusto_cluster" "test" { func testAccAzureRMKustoCluster_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -158,6 +170,10 @@ resource "azurerm_kusto_cluster" "test" { func testAccAzureRMKustoCluster_skuUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/kusto/tests/resource_arm_kusto_eventhub_data_connection_test.go b/azurerm/internal/services/kusto/tests/resource_arm_kusto_eventhub_data_connection_test.go index 2dedf240289ef..bee728cc7eaf9 100644 --- a/azurerm/internal/services/kusto/tests/resource_arm_kusto_eventhub_data_connection_test.go +++ b/azurerm/internal/services/kusto/tests/resource_arm_kusto_eventhub_data_connection_test.go @@ -32,6 +32,10 @@ func TestAccAzureRMKustoEventHubDataConnection_basic(t *testing.T) { func testAccAzureRMKustoEventHubDataConnection_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_linked_service_test.go b/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_linked_service_test.go index 061c90ad0e713..94f2a45745dc9 100644 --- a/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_linked_service_test.go +++ b/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_linked_service_test.go @@ -188,6 +188,10 @@ resource "azurerm_log_analytics_linked_service" "test" { func testAccAzureRMLogAnalyticsLinkedService_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_solution_test.go b/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_solution_test.go index c0ee4d26fe5b0..3f97ddb70aabb 100644 --- a/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_solution_test.go +++ b/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_solution_test.go @@ -132,6 +132,10 @@ func testCheckAzureRMLogAnalyticsSolutionExists(resourceName string) resource.Te func testAccAzureRMLogAnalyticsSolution_containerMonitoring(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -181,6 +185,10 @@ resource "azurerm_log_analytics_solution" "import" { func testAccAzureRMLogAnalyticsSolution_security(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_workspace_test.go b/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_workspace_test.go index b22d081292e7a..28dd8a6080b73 100644 --- a/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_workspace_test.go +++ b/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_workspace_test.go @@ -177,6 +177,10 @@ func testCheckAzureRMLogAnalyticsWorkspaceExists(resourceName string) resource.T } func testAccAzureRMLogAnalyticsWorkspace_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -207,6 +211,10 @@ resource "azurerm_log_analytics_workspace" "import" { func testAccAzureRMLogAnalyticsWorkspace_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/logic/tests/resource_arm_logic_app_action_custom_test.go b/azurerm/internal/services/logic/tests/resource_arm_logic_app_action_custom_test.go index 864fd4c280522..9e3f8ac7590dc 100644 --- a/azurerm/internal/services/logic/tests/resource_arm_logic_app_action_custom_test.go +++ b/azurerm/internal/services/logic/tests/resource_arm_logic_app_action_custom_test.go @@ -100,6 +100,10 @@ resource "azurerm_logic_app_action_custom" "import" { func testAccAzureRMLogicAppActionCustom_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/logic/tests/resource_arm_logic_app_action_http_test.go b/azurerm/internal/services/logic/tests/resource_arm_logic_app_action_http_test.go index 73a1c0b789746..45241880b4f3e 100644 --- a/azurerm/internal/services/logic/tests/resource_arm_logic_app_action_http_test.go +++ b/azurerm/internal/services/logic/tests/resource_arm_logic_app_action_http_test.go @@ -153,6 +153,10 @@ resource "azurerm_logic_app_action_http" "test" { func testAccAzureRMLogicAppActionHttp_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_custom_test.go b/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_custom_test.go index 924afb3c23909..aa960af30cbfc 100644 --- a/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_custom_test.go +++ b/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_custom_test.go @@ -93,6 +93,10 @@ resource "azurerm_logic_app_trigger_custom" "import" { func testAccAzureRMLogicAppTriggerCustom_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_http_request_test.go b/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_http_request_test.go index 848923abc86a6..e2fe50757badf 100644 --- a/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_http_request_test.go +++ b/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_http_request_test.go @@ -228,6 +228,10 @@ resource "azurerm_logic_app_trigger_http_request" "test" { func testAccAzureRMLogicAppTriggerHttpRequest_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_recurrence_test.go b/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_recurrence_test.go index aaaec34115f1a..39286240a3ac6 100644 --- a/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_recurrence_test.go +++ b/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_recurrence_test.go @@ -214,6 +214,10 @@ func TestAccAzureRMLogicAppTriggerRecurrence_startTime(t *testing.T) { func testAccAzureRMLogicAppTriggerRecurrence_basic(data acceptance.TestData, frequency string, interval int) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -236,6 +240,10 @@ resource "azurerm_logic_app_trigger_recurrence" "test" { func testAccAzureRMLogicAppTriggerRecurrence_startTime(data acceptance.TestData, startTime string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/logic/tests/resource_arm_logic_app_workflow_test.go b/azurerm/internal/services/logic/tests/resource_arm_logic_app_workflow_test.go index f87d5d1b5d0ed..5c18e013e843e 100644 --- a/azurerm/internal/services/logic/tests/resource_arm_logic_app_workflow_test.go +++ b/azurerm/internal/services/logic/tests/resource_arm_logic_app_workflow_test.go @@ -148,6 +148,10 @@ func testCheckAzureRMLogicAppWorkflowDestroy(s *terraform.State) error { func testAccAzureRMLogicAppWorkflow_empty(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -176,6 +180,10 @@ resource "azurerm_logic_app_workflow" "import" { func testAccAzureRMLogicAppWorkflow_tags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/maps/tests/resource_arm_maps_account_test.go b/azurerm/internal/services/maps/tests/resource_arm_maps_account_test.go index 65539021ce7cf..ca695ad2aefee 100644 --- a/azurerm/internal/services/maps/tests/resource_arm_maps_account_test.go +++ b/azurerm/internal/services/maps/tests/resource_arm_maps_account_test.go @@ -146,6 +146,10 @@ func testCheckAzureRMMapsAccountDestroy(s *terraform.State) error { func testAccAzureRMMapsAccount_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -161,6 +165,10 @@ resource "azurerm_maps_account" "test" { func testAccAzureRMMapsAccount_sku(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -176,6 +184,10 @@ resource "azurerm_maps_account" "test" { func testAccAzureRMMapsAccount_tags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/mariadb/tests/data_source_mariadb_server_test.go b/azurerm/internal/services/mariadb/tests/data_source_mariadb_server_test.go index 344b8d66303c5..4708451d199e5 100644 --- a/azurerm/internal/services/mariadb/tests/data_source_mariadb_server_test.go +++ b/azurerm/internal/services/mariadb/tests/data_source_mariadb_server_test.go @@ -31,6 +31,10 @@ func TestAccDataSourceAzureRMMariaDbServer_basic(t *testing.T) { func testAccDataSourceAzureRMMariaDbServer_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-maria-%d" location = "%s" diff --git a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_configuration_test.go b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_configuration_test.go index ce21c45b18811..97c8f83c77fda 100644 --- a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_configuration_test.go +++ b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_configuration_test.go @@ -205,6 +205,10 @@ resource "azurerm_mariadb_configuration" "test" { func testAccAzureRMMariaDbConfiguration_empty(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_database_test.go b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_database_test.go index 3f8010fe47592..0ff784f5b350c 100644 --- a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_database_test.go +++ b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_database_test.go @@ -118,6 +118,10 @@ func testCheckAzureRMMariaDbDatabaseDestroy(s *terraform.State) error { func testAccAzureRMMariaDbDatabase_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = %q diff --git a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_firewall_rule_test.go b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_firewall_rule_test.go index 5d96884668ec8..52e232038744f 100644 --- a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_firewall_rule_test.go +++ b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_firewall_rule_test.go @@ -117,6 +117,10 @@ func testCheckAzureRMMariaDBFirewallRuleDestroy(s *terraform.State) error { func testAccAzureRMMariaDBFirewallRule_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_server_test.go b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_server_test.go index 2e313314d3149..6b8ab7c7a941d 100644 --- a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_server_test.go +++ b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_server_test.go @@ -298,6 +298,10 @@ func testCheckAzureRMMariaDbServerDestroy(s *terraform.State) error { func testAccAzureRMMariaDbServer_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -352,6 +356,10 @@ resource "azurerm_mariadb_server" "import" { func testAccAzureRMMariaDbServer_basicUpdatedPassword(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -380,6 +388,10 @@ resource "azurerm_mariadb_server" "test" { func testAccAzureRMMariaDbServer_basicUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -408,6 +420,10 @@ resource "azurerm_mariadb_server" "test" { func testAccAzureRMMariaDbServer_basicMaxStorage(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -436,6 +452,10 @@ resource "azurerm_mariadb_server" "test" { func testAccAzureRMMariaDbServer_generalPurpose(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -464,6 +484,10 @@ resource "azurerm_mariadb_server" "test" { func testAccAzureRMMariaDbServer_memoryOptimized(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -492,6 +516,10 @@ resource "azurerm_mariadb_server" "test" { func testAccAzureRMMariaDbServer_memoryOptimizedGeoRedundant(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -520,6 +548,10 @@ resource "azurerm_mariadb_server" "test" { func testAccAzureRMMariaDbServer_storageAutogrowUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_virtual_network_rule_test.go b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_virtual_network_rule_test.go index 3a0478b666f20..24a82d3d803aa 100644 --- a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_virtual_network_rule_test.go +++ b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_virtual_network_rule_test.go @@ -227,6 +227,10 @@ func testCheckAzureRMMariaDBVirtualNetworkRuleDisappears(resourceName string) re func testAccAzureRMMariaDBVirtualNetworkRule_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -288,6 +292,10 @@ resource "azurerm_mariadb_virtual_network_rule" "import" { func testAccAzureRMMariaDBVirtualNetworkRule_subnetSwitchPre(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -344,6 +352,10 @@ resource "azurerm_mariadb_virtual_network_rule" "test" { func testAccAzureRMMariaDBVirtualNetworkRule_subnetSwitchPost(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -400,6 +412,10 @@ resource "azurerm_mariadb_virtual_network_rule" "test" { func testAccAzureRMMariaDBVirtualNetworkRule_multipleSubnets(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/media/tests/resource_arm_media_services_account_test.go b/azurerm/internal/services/media/tests/resource_arm_media_services_account_test.go index 503a29ffcb0a4..0ad8c34292a49 100644 --- a/azurerm/internal/services/media/tests/resource_arm_media_services_account_test.go +++ b/azurerm/internal/services/media/tests/resource_arm_media_services_account_test.go @@ -240,6 +240,10 @@ resource "azurerm_media_services_account" "test" { func testAccAzureRMMediaServicesAccount_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-media-%d" location = "%s" diff --git a/azurerm/internal/services/monitor/tests/data_source_monitor_action_group_test.go b/azurerm/internal/services/monitor/tests/data_source_monitor_action_group_test.go index 5ff38cace78f4..7226c34f8781e 100644 --- a/azurerm/internal/services/monitor/tests/data_source_monitor_action_group_test.go +++ b/azurerm/internal/services/monitor/tests/data_source_monitor_action_group_test.go @@ -138,6 +138,10 @@ func TestAccDataSourceArmMonitorActionGroup_complete(t *testing.T) { func testAccDataSourceArmMonitorActionGroup_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -158,6 +162,10 @@ data "azurerm_monitor_action_group" "test" { func testAccDataSourceArmMonitorActionGroup_disabledBasic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -179,6 +187,10 @@ data "azurerm_monitor_action_group" "test" { func testAccDataSourceArmMonitorActionGroup_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/monitor/tests/data_source_monitor_diagnostic_categories_test.go b/azurerm/internal/services/monitor/tests/data_source_monitor_diagnostic_categories_test.go index 3e44a27ddbd1b..8d0245b157cd4 100644 --- a/azurerm/internal/services/monitor/tests/data_source_monitor_diagnostic_categories_test.go +++ b/azurerm/internal/services/monitor/tests/data_source_monitor_diagnostic_categories_test.go @@ -46,6 +46,10 @@ func TestAccDataSourceArmMonitorDiagnosticCategories_storageAccount(t *testing.T func testAccDataSourceArmMonitorDiagnosticCategories_appService(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -77,6 +81,10 @@ data "azurerm_monitor_diagnostic_categories" "test" { func testAccDataSourceArmMonitorDiagnosticCategories_storageAccount(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/monitor/tests/data_source_monitor_log_profile_test.go b/azurerm/internal/services/monitor/tests/data_source_monitor_log_profile_test.go index 14387d18ab232..21e915bf607ad 100644 --- a/azurerm/internal/services/monitor/tests/data_source_monitor_log_profile_test.go +++ b/azurerm/internal/services/monitor/tests/data_source_monitor_log_profile_test.go @@ -64,6 +64,10 @@ func testAccDataSourceAzureRMMonitorLogProfile_eventhub(t *testing.T) { func testAccDataSourceAzureRMMonitorLogProfile_storageaccountConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -104,6 +108,10 @@ data "azurerm_monitor_log_profile" "test" { func testAccDataSourceAzureRMMonitorLogProfile_eventhubConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_action_group_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_action_group_test.go index 62825082bd35a..3662ab54a4204 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_action_group_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_action_group_test.go @@ -420,6 +420,10 @@ func TestAccAzureRMMonitorActionGroup_multipleReceiversUpdate(t *testing.T) { func testAccAzureRMMonitorActionGroup_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -448,6 +452,10 @@ resource "azurerm_monitor_action_group" "import" { func testAccAzureRMMonitorActionGroup_emailReceiver(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -469,6 +477,10 @@ resource "azurerm_monitor_action_group" "test" { func testAccAzureRMMonitorActionGroup_itsmReceiver(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -492,6 +504,10 @@ resource "azurerm_monitor_action_group" "test" { func testAccAzureRMMonitorActionGroup_azureAppPushReceiver(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -512,6 +528,10 @@ resource "azurerm_monitor_action_group" "test" { func testAccAzureRMMonitorActionGroup_smsReceiver(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -533,6 +553,10 @@ resource "azurerm_monitor_action_group" "test" { func testAccAzureRMMonitorActionGroup_webhookReceiver(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -554,6 +578,10 @@ resource "azurerm_monitor_action_group" "test" { func testAccAzureRMMonitorActionGroup_automationRunbookReceiver(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -604,6 +632,10 @@ resource "azurerm_automation_runbook" "test" { func testAccAzureRMMonitorActionGroup_voiceReceiver(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -625,6 +657,10 @@ resource "azurerm_monitor_action_group" "test" { func testAccAzureRMMonitorActionGroup_logicAppReceiver(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -670,6 +706,10 @@ SCHEMA func testAccAzureRMMonitorActionGroup_azureFunctionReceiver(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -720,6 +760,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMMonitorActionGroup_armRoleReceiver(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -741,6 +785,10 @@ resource "azurerm_monitor_action_group" "test" { func testAccAzureRMMonitorActionGroup_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -914,6 +962,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMMonitorActionGroup_disabledBasic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_activity_log_alert_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_activity_log_alert_test.go index 4590096879416..2a59901820546 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_activity_log_alert_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_activity_log_alert_test.go @@ -188,6 +188,10 @@ func TestAccAzureRMMonitorActivityLogAlert_basicAndCompleteUpdate(t *testing.T) func testAccAzureRMMonitorActivityLogAlert_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -224,6 +228,10 @@ resource "azurerm_monitor_activity_log_alert" "import" { func testAccAzureRMMonitorActivityLogAlert_singleResource(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -263,6 +271,10 @@ resource "azurerm_monitor_activity_log_alert" "test" { func testAccAzureRMMonitorActivityLogAlert_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_autoscale_setting_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_autoscale_setting_test.go index 27f953b908ba8..8606ce6649667 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_autoscale_setting_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_autoscale_setting_test.go @@ -851,6 +851,10 @@ resource "azurerm_monitor_autoscale_setting" "test" { func testAccAzureRMMonitorAutoScaleSetting_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_log_profile_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_log_profile_test.go index 9ae982ac50c10..0d57bcc4d040c 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_log_profile_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_log_profile_test.go @@ -218,6 +218,10 @@ func testCheckAzureRMLogProfileDisappears(resourceName string) resource.TestChec func testAccAzureRMMonitorLogProfile_basicConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -273,6 +277,10 @@ resource "azurerm_monitor_log_profile" "import" { func testAccAzureRMMonitorLogProfile_servicebusConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -317,6 +325,10 @@ resource "azurerm_monitor_log_profile" "test" { func testAccAzureRMMonitorLogProfile_completeConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_metric_alert_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_metric_alert_test.go index 49edfb6bcad4c..902081331ac11 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_metric_alert_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_metric_alert_test.go @@ -206,6 +206,10 @@ func TestAccAzureRMMonitorMetricAlert_basicAndCompleteUpdate(t *testing.T) { func testAccAzureRMMonitorMetricAlert_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -258,6 +262,10 @@ resource "azurerm_monitor_metric_alert" "import" { func testAccAzureRMMonitorMetricAlert_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" diff --git a/azurerm/internal/services/msi/tests/data_source_user_assigned_identity_test.go b/azurerm/internal/services/msi/tests/data_source_user_assigned_identity_test.go index c8d0577cca1b1..57735a1f7948e 100644 --- a/azurerm/internal/services/msi/tests/data_source_user_assigned_identity_test.go +++ b/azurerm/internal/services/msi/tests/data_source_user_assigned_identity_test.go @@ -62,6 +62,10 @@ func testEqualResourceAttr(dataSourceName string, resourceName string, attrName func testAccDataSourceAzureRMUserAssignedIdentity_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctest%d-rg" location = "%s" diff --git a/azurerm/internal/services/msi/tests/resource_arm_user_assigned_identity_test.go b/azurerm/internal/services/msi/tests/resource_arm_user_assigned_identity_test.go index b6e462c11c74c..2effea3183df6 100644 --- a/azurerm/internal/services/msi/tests/resource_arm_user_assigned_identity_test.go +++ b/azurerm/internal/services/msi/tests/resource_arm_user_assigned_identity_test.go @@ -123,6 +123,10 @@ func testCheckAzureRMUserAssignedIdentityDestroy(s *terraform.State) error { func testAccAzureRMUserAssignedIdentity_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/mssql/tests/data_source_mssql_elasticpool_test.go b/azurerm/internal/services/mssql/tests/data_source_mssql_elasticpool_test.go index c67e13e554f47..15eafc48f7217 100644 --- a/azurerm/internal/services/mssql/tests/data_source_mssql_elasticpool_test.go +++ b/azurerm/internal/services/mssql/tests/data_source_mssql_elasticpool_test.go @@ -37,6 +37,10 @@ func TestAccDataSourceAzureRMMsSqlElasticPool_basic(t *testing.T) { func testAccDataSourceAzureRMMsSqlElasticPool_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%s" diff --git a/azurerm/internal/services/mssql/tests/resource_arm_mssql_database_vulnerability_assessment_rule_baseline_test.go b/azurerm/internal/services/mssql/tests/resource_arm_mssql_database_vulnerability_assessment_rule_baseline_test.go index 077a98f65ebb4..6222d86de1a28 100644 --- a/azurerm/internal/services/mssql/tests/resource_arm_mssql_database_vulnerability_assessment_rule_baseline_test.go +++ b/azurerm/internal/services/mssql/tests/resource_arm_mssql_database_vulnerability_assessment_rule_baseline_test.go @@ -222,6 +222,10 @@ resource "azurerm_mssql_database_vulnerability_assessment_rule_baseline" "test" func testAccAzureRMMssqlDatabaseVulnerabilityAssessmentRuleBaseline_database(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-mssql-%d" location = "%s" diff --git a/azurerm/internal/services/mssql/tests/resource_arm_mssql_elasticpool_test.go b/azurerm/internal/services/mssql/tests/resource_arm_mssql_elasticpool_test.go index bdde8bcc9cdf2..d968a6c29281e 100644 --- a/azurerm/internal/services/mssql/tests/resource_arm_mssql_elasticpool_test.go +++ b/azurerm/internal/services/mssql/tests/resource_arm_mssql_elasticpool_test.go @@ -380,6 +380,10 @@ func testAccAzureRMMsSqlElasticPool_resize_vCore(data acceptance.TestData) strin func testAccAzureRMMsSqlElasticPool_vCore_Template(data acceptance.TestData, skuName string, skuTier string, skuCapacity int, skuFamily string, databaseSettingsMin float64, databaseSettingsMax float64) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%s" @@ -418,6 +422,10 @@ resource "azurerm_mssql_elasticpool" "test" { func testAccAzureRMMsSqlElasticPool_vCore_MaxSizeBytes_Template(data acceptance.TestData, skuName string, skuTier string, skuCapacity int, skuFamily string, databaseSettingsMin float64, databaseSettingsMax float64) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%s" @@ -456,6 +464,10 @@ resource "azurerm_mssql_elasticpool" "test" { func testAccAzureRMMsSqlElasticPool_DTU_Template(data acceptance.TestData, skuName string, skuTier string, skuCapacity int, maxSizeGB float64, databaseSettingsMin int, databaseSettingsMax int, zoneRedundant bool) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%s" diff --git a/azurerm/internal/services/mssql/tests/resource_arm_mssql_server_security_alert_policy_test.go b/azurerm/internal/services/mssql/tests/resource_arm_mssql_server_security_alert_policy_test.go index 0d7edbd97ec1e..53a8304b71448 100644 --- a/azurerm/internal/services/mssql/tests/resource_arm_mssql_server_security_alert_policy_test.go +++ b/azurerm/internal/services/mssql/tests/resource_arm_mssql_server_security_alert_policy_test.go @@ -163,6 +163,10 @@ resource "azurerm_mssql_server_security_alert_policy" "test" { func testAccAzureRMMssqlServerSecurityAlertPolicy_server(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-mssql-%d" location = "%s" diff --git a/azurerm/internal/services/mssql/tests/resource_arm_mssql_server_vulnerability_assessment_test.go b/azurerm/internal/services/mssql/tests/resource_arm_mssql_server_vulnerability_assessment_test.go index af965843ca749..61c0f702403d9 100644 --- a/azurerm/internal/services/mssql/tests/resource_arm_mssql_server_vulnerability_assessment_test.go +++ b/azurerm/internal/services/mssql/tests/resource_arm_mssql_server_vulnerability_assessment_test.go @@ -162,6 +162,10 @@ resource "azurerm_mssql_server_vulnerability_assessment" "test" { func testAccAzureRMMssqlServerVulnerabilityAssessment_server(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-mssql-%d" location = "%s" diff --git a/azurerm/internal/services/mysql/tests/resource_arm_mysql_configuration_test.go b/azurerm/internal/services/mysql/tests/resource_arm_mysql_configuration_test.go index 9b3593d3b2dc4..0855ebfb58f3b 100644 --- a/azurerm/internal/services/mysql/tests/resource_arm_mysql_configuration_test.go +++ b/azurerm/internal/services/mysql/tests/resource_arm_mysql_configuration_test.go @@ -205,6 +205,10 @@ resource "azurerm_mysql_configuration" "test" { func testAccAzureRMMySQLConfiguration_empty(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/mysql/tests/resource_arm_mysql_database_test.go b/azurerm/internal/services/mysql/tests/resource_arm_mysql_database_test.go index 2f4363c26976c..f22f24f03cb4b 100644 --- a/azurerm/internal/services/mysql/tests/resource_arm_mysql_database_test.go +++ b/azurerm/internal/services/mysql/tests/resource_arm_mysql_database_test.go @@ -156,6 +156,10 @@ func testCheckAzureRMMySQLDatabaseDestroy(s *terraform.State) error { func testAccAzureRMMySQLDatabase_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -206,6 +210,10 @@ resource "azurerm_mysql_database" "import" { func testAccAzureRMMySQLDatabase_charsetUppercase(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -242,6 +250,10 @@ resource "azurerm_mysql_database" "test" { func testAccAzureRMMySQLDatabase_charsetMixedcase(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/mysql/tests/resource_arm_mysql_firewall_rule_test.go b/azurerm/internal/services/mysql/tests/resource_arm_mysql_firewall_rule_test.go index a4dde46da85a5..1e419570634c8 100644 --- a/azurerm/internal/services/mysql/tests/resource_arm_mysql_firewall_rule_test.go +++ b/azurerm/internal/services/mysql/tests/resource_arm_mysql_firewall_rule_test.go @@ -117,6 +117,10 @@ func testCheckAzureRMMySQLFirewallRuleDestroy(s *terraform.State) error { func testAccAzureRMMySQLFirewallRule_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go b/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go index 4e2f0df66982b..d2f84e500487f 100644 --- a/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go +++ b/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go @@ -267,6 +267,10 @@ func testCheckAzureRMMySQLServerDestroy(s *terraform.State) error { func testAccAzureRMMySQLServer_basicFiveSix(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -295,6 +299,10 @@ resource "azurerm_mysql_server" "test" { func testAccAzureRMMySQLServer_basicFiveSeven(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -323,6 +331,10 @@ resource "azurerm_mysql_server" "test" { func testAccAzureRMMySQLServer_basicEightZero(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -376,6 +388,10 @@ resource "azurerm_mysql_server" "import" { func testAccAzureRMMySQLServer_basicFiveSevenUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -404,6 +420,10 @@ resource "azurerm_mysql_server" "test" { func testAccAzureRMMySQLServer_memoryOptimizedGeoRedundant(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -432,6 +452,10 @@ resource "azurerm_mysql_server" "test" { func testAccAzureRMMySQLServer_autogrow(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/mysql/tests/resource_arm_mysql_virtual_network_rule_test.go b/azurerm/internal/services/mysql/tests/resource_arm_mysql_virtual_network_rule_test.go index 41dd3d3819bd3..d2403c3ac2ec5 100644 --- a/azurerm/internal/services/mysql/tests/resource_arm_mysql_virtual_network_rule_test.go +++ b/azurerm/internal/services/mysql/tests/resource_arm_mysql_virtual_network_rule_test.go @@ -247,6 +247,10 @@ func testCheckAzureRMMySqlVirtualNetworkRuleDisappears(resourceName string) reso func testAccAzureRMMySqlVirtualNetworkRule_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -296,6 +300,10 @@ resource "azurerm_mysql_virtual_network_rule" "test" { func testAccAzureRMMySqlVirtualNetworkRule_badsubnet(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -358,6 +366,10 @@ resource "azurerm_mysql_virtual_network_rule" "import" { func testAccAzureRMMySqlVirtualNetworkRule_subnetSwitchPre(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -415,6 +427,10 @@ resource "azurerm_mysql_virtual_network_rule" "test" { func testAccAzureRMMySqlVirtualNetworkRule_subnetSwitchPost(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -472,6 +488,10 @@ resource "azurerm_mysql_virtual_network_rule" "test" { func testAccAzureRMMySqlVirtualNetworkRule_multipleSubnets(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/netapp/tests/resource_arm_netapp_account_test.go b/azurerm/internal/services/netapp/tests/resource_arm_netapp_account_test.go index cd1b90f40993e..fff167f19452d 100644 --- a/azurerm/internal/services/netapp/tests/resource_arm_netapp_account_test.go +++ b/azurerm/internal/services/netapp/tests/resource_arm_netapp_account_test.go @@ -182,6 +182,10 @@ func testCheckAzureRMNetAppAccountDestroy(s *terraform.State) error { func testAccAzureRMNetAppAccount_basicConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-netapp-%d" location = "%s" @@ -208,6 +212,10 @@ resource "azurerm_netapp_account" "import" { func testAccAzureRMNetAppAccount_completeConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-netapp-%d" location = "%s" diff --git a/azurerm/internal/services/netapp/tests/resource_arm_netapp_pool_test.go b/azurerm/internal/services/netapp/tests/resource_arm_netapp_pool_test.go index bdca7001a9830..b2badb749a2f6 100644 --- a/azurerm/internal/services/netapp/tests/resource_arm_netapp_pool_test.go +++ b/azurerm/internal/services/netapp/tests/resource_arm_netapp_pool_test.go @@ -161,6 +161,10 @@ func testCheckAzureRMNetAppPoolDestroy(s *terraform.State) error { func testAccAzureRMNetAppPool_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-netapp-%d" location = "%s" @@ -196,6 +200,10 @@ resource "azurerm_netapp_pool" "import" { func testAccAzureRMNetAppPool_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-netapp-%d" location = "%s" diff --git a/azurerm/internal/services/netapp/tests/resource_arm_netapp_snapshot_test.go b/azurerm/internal/services/netapp/tests/resource_arm_netapp_snapshot_test.go index 83154210b825f..e8d63f8a0965a 100644 --- a/azurerm/internal/services/netapp/tests/resource_arm_netapp_snapshot_test.go +++ b/azurerm/internal/services/netapp/tests/resource_arm_netapp_snapshot_test.go @@ -256,6 +256,10 @@ resource "azurerm_netapp_snapshot" "test" { func testAccAzureRMNetAppSnapshot_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-netapp-%d" location = "%s" diff --git a/azurerm/internal/services/netapp/tests/resource_arm_netapp_volume_test.go b/azurerm/internal/services/netapp/tests/resource_arm_netapp_volume_test.go index b2651f2dba8e4..188e22ae084bc 100644 --- a/azurerm/internal/services/netapp/tests/resource_arm_netapp_volume_test.go +++ b/azurerm/internal/services/netapp/tests/resource_arm_netapp_volume_test.go @@ -381,6 +381,10 @@ resource "azurerm_netapp_volume" "test" { func testAccAzureRMNetAppVolume_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-netapp-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/data_source_application_security_group_test.go b/azurerm/internal/services/network/tests/data_source_application_security_group_test.go index 3f34449d97706..462b22f1a7796 100644 --- a/azurerm/internal/services/network/tests/data_source_application_security_group_test.go +++ b/azurerm/internal/services/network/tests/data_source_application_security_group_test.go @@ -49,6 +49,10 @@ func TestAccDataSourceAzureRMApplicationSecurityGroup_complete(t *testing.T) { func testAccDataSourceApplicationSecurityGroup_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -69,6 +73,10 @@ data "azurerm_application_security_group" "test" { func testAccDataSourceApplicationSecurityGroup_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/data_source_firewall_test.go b/azurerm/internal/services/network/tests/data_source_firewall_test.go index 39dd2caf50fcf..7144d209f6e2b 100644 --- a/azurerm/internal/services/network/tests/data_source_firewall_test.go +++ b/azurerm/internal/services/network/tests/data_source_firewall_test.go @@ -29,6 +29,10 @@ func TestAccDataSourceAzureRMFirewall_basic(t *testing.T) { func testAccDataSourceFirewall_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/data_source_network_security_group_test.go b/azurerm/internal/services/network/tests/data_source_network_security_group_test.go index a22d2b1366e36..f7e0b0996f57a 100644 --- a/azurerm/internal/services/network/tests/data_source_network_security_group_test.go +++ b/azurerm/internal/services/network/tests/data_source_network_security_group_test.go @@ -80,6 +80,10 @@ func TestAccDataSourceAzureRMNetworkSecurityGroup_tags(t *testing.T) { func testAccDataSourceAzureRMNetworkSecurityGroupBasic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -100,6 +104,10 @@ data "azurerm_network_security_group" "test" { func testAccDataSourceAzureRMNetworkSecurityGroupWithRules(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -132,6 +140,10 @@ data "azurerm_network_security_group" "test" { func testAccDataSourceAzureRMNetworkSecurityGroupTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/data_source_network_watcher_test.go b/azurerm/internal/services/network/tests/data_source_network_watcher_test.go index afeb441b64399..ffb426387eda6 100644 --- a/azurerm/internal/services/network/tests/data_source_network_watcher_test.go +++ b/azurerm/internal/services/network/tests/data_source_network_watcher_test.go @@ -35,6 +35,10 @@ func testAccDataSourceAzureRMNetworkWatcher_basic(t *testing.T) { func testAccDataSourceAzureRMNetworkWatcher_basicConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/data_source_public_ip_prefix_test.go b/azurerm/internal/services/network/tests/data_source_public_ip_prefix_test.go index ca697c199dcab..35886a8ef1e32 100644 --- a/azurerm/internal/services/network/tests/data_source_public_ip_prefix_test.go +++ b/azurerm/internal/services/network/tests/data_source_public_ip_prefix_test.go @@ -36,6 +36,10 @@ func TestAccDataSourceAzureRMPublicIPPrefix_basic(t *testing.T) { func testAccDataSourceAzureRMPublicIPPrefixBasic(name string, resourceGroupName string, data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "%s" location = "%s" diff --git a/azurerm/internal/services/network/tests/data_source_public_ip_test.go b/azurerm/internal/services/network/tests/data_source_public_ip_test.go index a146c9e095062..5e4aaaca6d38b 100644 --- a/azurerm/internal/services/network/tests/data_source_public_ip_test.go +++ b/azurerm/internal/services/network/tests/data_source_public_ip_test.go @@ -67,6 +67,10 @@ func TestAccDataSourceAzureRMPublicIP_dynamic(t *testing.T) { func testAccDataSourceAzureRMPublicIP_static(name string, resourceGroupName string, data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "%s" location = "%s" @@ -94,6 +98,10 @@ data "azurerm_public_ip" "test" { func testAccDataSourceAzureRMPublicIP_dynamic(data acceptance.TestData, ipVersion string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/data_source_public_ips_test.go b/azurerm/internal/services/network/tests/data_source_public_ips_test.go index 059eba9334cec..8cd0a13a0cb3c 100644 --- a/azurerm/internal/services/network/tests/data_source_public_ips_test.go +++ b/azurerm/internal/services/network/tests/data_source_public_ips_test.go @@ -89,6 +89,10 @@ func TestAccDataSourceAzureRMPublicIPs_allocationType(t *testing.T) { func testAccDataSourceAzureRMPublicIPs_attached(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -140,6 +144,10 @@ data "azurerm_public_ips" "attached" { func testAccDataSourceAzureRMPublicIPs_prefix(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -187,6 +195,10 @@ data "azurerm_public_ips" "test" { func testAccDataSourceAzureRMPublicIPs_allocationType(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/data_source_subnet_test.go b/azurerm/internal/services/network/tests/data_source_subnet_test.go index c4aab9677713c..a18b1f9309fe7 100644 --- a/azurerm/internal/services/network/tests/data_source_subnet_test.go +++ b/azurerm/internal/services/network/tests/data_source_subnet_test.go @@ -230,6 +230,10 @@ data "azurerm_subnet" "test" { func testAccDataSourceSubnet_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctest%d-rg" location = "%s" diff --git a/azurerm/internal/services/network/tests/data_source_virtual_network_gateway_test.go b/azurerm/internal/services/network/tests/data_source_virtual_network_gateway_test.go index d87c10c19d005..13a2763c319a2 100644 --- a/azurerm/internal/services/network/tests/data_source_virtual_network_gateway_test.go +++ b/azurerm/internal/services/network/tests/data_source_virtual_network_gateway_test.go @@ -28,6 +28,10 @@ func TestAccAzureRMDataSourceVirtualNetworkGateway_basic(t *testing.T) { func testAccAzureRMDataSourceVirtualNetworkGateway_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/data_source_virtual_network_test.go b/azurerm/internal/services/network/tests/data_source_virtual_network_test.go index 6f11e3e228cca..5b4081364f674 100644 --- a/azurerm/internal/services/network/tests/data_source_virtual_network_test.go +++ b/azurerm/internal/services/network/tests/data_source_virtual_network_test.go @@ -58,6 +58,10 @@ func TestAccDataSourceArmVirtualNetwork_peering(t *testing.T) { func testAccDataSourceArmVirtualNetwork_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctest%d-rg" location = "%s" @@ -85,6 +89,10 @@ data "azurerm_virtual_network" "test" { func testAccDataSourceArmVirtualNetwork_peering(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctest%d-rg" location = "%s" @@ -115,6 +123,10 @@ resource "azurerm_virtual_network_peering" "test1" { func testAccDataSourceArmVirtualNetwork_peeringWithDataSource(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctest%d-rg" location = "%s" diff --git a/azurerm/internal/services/network/tests/network_interface_application_security_group_association_resource_test.go b/azurerm/internal/services/network/tests/network_interface_application_security_group_association_resource_test.go index cccea5d034fe8..83743b4ef32d5 100644 --- a/azurerm/internal/services/network/tests/network_interface_application_security_group_association_resource_test.go +++ b/azurerm/internal/services/network/tests/network_interface_application_security_group_association_resource_test.go @@ -323,6 +323,10 @@ resource "azurerm_network_interface_application_security_group_association" "tes func testAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/network_interface_network_security_group_association_resource_test.go b/azurerm/internal/services/network/tests/network_interface_network_security_group_association_resource_test.go index 1ad3e382435be..464b9356fafd6 100644 --- a/azurerm/internal/services/network/tests/network_interface_network_security_group_association_resource_test.go +++ b/azurerm/internal/services/network/tests/network_interface_network_security_group_association_resource_test.go @@ -253,6 +253,10 @@ resource "azurerm_network_interface_security_group_association" "test" { func testAccAzureRMNetworkInterfaceSecurityGroupAssociation_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go index c52e17b325c9f..bd018b99e8c2e 100644 --- a/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go @@ -3878,6 +3878,10 @@ resource "azurerm_application_gateway" "test" { func testAccAzureRMApplicationGateway_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_application_security_group_test.go b/azurerm/internal/services/network/tests/resource_arm_application_security_group_test.go index 0a5b1e57ff1c3..094911c7c36a3 100644 --- a/azurerm/internal/services/network/tests/resource_arm_application_security_group_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_application_security_group_test.go @@ -166,6 +166,10 @@ func testCheckAzureRMApplicationSecurityGroupExists(resourceName string) resourc func testAccAzureRMApplicationSecurityGroup_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -194,6 +198,10 @@ resource "azurerm_application_security_group" "import" { func testAccAzureRMApplicationSecurityGroup_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_bastion_host_test.go b/azurerm/internal/services/network/tests/resource_arm_bastion_host_test.go index defd7e82c1fdf..a3cc414c6962c 100644 --- a/azurerm/internal/services/network/tests/resource_arm_bastion_host_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_bastion_host_test.go @@ -80,6 +80,10 @@ func TestAccAzureRMBastionHost_requiresImport(t *testing.T) { func testAccAzureRMBastionHost_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-bastion-%d" location = "%s" @@ -123,6 +127,10 @@ resource "azurerm_bastion_host" "test" { func testAccAzureRMBastionHost_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-bastion-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_authorization_test.go b/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_authorization_test.go index 7ef8781de7222..ddad0d26b7102 100644 --- a/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_authorization_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_authorization_test.go @@ -142,6 +142,10 @@ func testCheckAzureRMExpressRouteCircuitAuthorizationDestroy(s *terraform.State) func testAccAzureRMExpressRouteCircuitAuthorization_basicConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -191,6 +195,10 @@ resource "azurerm_express_route_circuit_authorization" "import" { func testAccAzureRMExpressRouteCircuitAuthorization_multipleConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_peering_test.go b/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_peering_test.go index 79192bd100b5b..c78e59c373464 100644 --- a/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_peering_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_peering_test.go @@ -167,6 +167,10 @@ func testCheckAzureRMExpressRouteCircuitPeeringDestroy(s *terraform.State) error func testAccAzureRMExpressRouteCircuitPeering_privatePeering(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -224,6 +228,10 @@ resource "azurerm_express_route_circuit_peering" "import" { func testAccAzureRMExpressRouteCircuitPeering_msPeering(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -266,6 +274,10 @@ resource "azurerm_express_route_circuit_peering" "test" { func testAccAzureRMExpressRouteCircuitPeering_privatePeeringWithCircuitUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_test.go b/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_test.go index 60cb5d36e1235..700dc98f6a5a1 100644 --- a/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_test.go @@ -309,6 +309,10 @@ func testCheckAzureRMExpressRouteCircuitDestroy(s *terraform.State) error { func testAccAzureRMExpressRouteCircuit_basicMeteredConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -367,6 +371,10 @@ resource "azurerm_express_route_circuit" "import" { func testAccAzureRMExpressRouteCircuit_basicUnlimitedConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -397,6 +405,10 @@ resource "azurerm_express_route_circuit" "test" { func testAccAzureRMExpressRouteCircuit_sku(data acceptance.TestData, tier string, family string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -427,6 +439,10 @@ resource "azurerm_express_route_circuit" "test" { func testAccAzureRMExpressRouteCircuit_allowClassicOperations(data acceptance.TestData, allowClassicOperations string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go index 0551bd246dc9e..32388509d215a 100644 --- a/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go @@ -191,6 +191,10 @@ resource "azurerm_express_route_gateway" "import" { func testAccAzureRMExpressRouteGateway_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-express-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_firewall_test.go b/azurerm/internal/services/network/tests/resource_arm_firewall_test.go index 037c9ea9d9e94..3e4b5cbd51841 100644 --- a/azurerm/internal/services/network/tests/resource_arm_firewall_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_firewall_test.go @@ -291,6 +291,10 @@ func testCheckAzureRMFirewallDestroy(s *terraform.State) error { func testAccAzureRMFirewall_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -334,6 +338,10 @@ resource "azurerm_firewall" "test" { func testAccAzureRMFirewall_multiplePublicIps(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -409,6 +417,10 @@ resource "azurerm_firewall" "import" { func testAccAzureRMFirewall_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -457,6 +469,10 @@ resource "azurerm_firewall" "test" { func testAccAzureRMFirewall_withUpdatedTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -505,6 +521,10 @@ resource "azurerm_firewall" "test" { func testAccAzureRMFirewall_withZones(data acceptance.TestData, zones []string) string { zoneString := strings.Join(zones, ",") return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_backend_address_pool_test.go b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_backend_address_pool_test.go index 944124bdd08e5..4e7d0da09b52f 100644 --- a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_backend_address_pool_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_backend_address_pool_test.go @@ -188,6 +188,10 @@ func testCheckAzureRMLoadBalancerBackEndAddressPoolDisappears(addressPoolName st func testAccAzureRMLoadBalancerBackEndAddressPool_basic(data acceptance.TestData, addressPoolName string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -234,6 +238,10 @@ resource "azurerm_lb_backend_address_pool" "import" { func testAccAzureRMLoadBalancerBackEndAddressPool_removal(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_pool_test.go b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_pool_test.go index 6beadb4b9deda..a46e74c659474 100644 --- a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_pool_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_pool_test.go @@ -232,6 +232,10 @@ func testCheckAzureRMLoadBalancerNatPoolDisappears(natPoolName string, lb *netwo func testAccAzureRMLoadBalancerNatPool_basic(data acceptance.TestData, natPoolName string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -288,6 +292,10 @@ resource "azurerm_lb_nat_pool" "import" { func testAccAzureRMLoadBalancerNatPool_removal(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -315,6 +323,10 @@ resource "azurerm_lb" "test" { func testAccAzureRMLoadBalancerNatPool_multiplePools(data acceptance.TestData, natPoolName, natPool2Name string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -367,6 +379,10 @@ resource "azurerm_lb_nat_pool" "test2" { func testAccAzureRMLoadBalancerNatPool_multiplePoolsUpdate(data acceptance.TestData, natPoolName, natPool2Name string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_rule_test.go b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_rule_test.go index 5e2a302909984..d94d22f7b8f8a 100644 --- a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_rule_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_rule_test.go @@ -303,6 +303,10 @@ func testCheckAzureRMLoadBalancerNatRuleDisappears(natRuleName string, lb *netwo func testAccAzureRMLoadBalancerNatRule_template(data acceptance.TestData, sku string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-lb-%[1]d" location = "%[2]s" diff --git a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_outbound_rule_test.go b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_outbound_rule_test.go index 6b207442b6ada..c7fe563ff46de 100644 --- a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_outbound_rule_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_outbound_rule_test.go @@ -268,6 +268,10 @@ func testCheckAzureRMLoadBalancerOutboundRuleDisappears(ruleName string, lb *net func testAccAzureRMLoadBalancerOutboundRule_basic(data acceptance.TestData, outboundRuleName string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -334,6 +338,10 @@ resource "azurerm_lb_outbound_rule" "import" { func testAccAzureRMLoadBalancerOutboundRule_removal(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -369,6 +377,10 @@ resource "azurerm_lb" "test" { func testAccAzureRMLoadBalancerOutboundRule_multipleRules(data acceptance.TestData, outboundRuleName, outboundRule2Name string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -441,6 +453,10 @@ resource "azurerm_lb_outbound_rule" "test2" { func testAccAzureRMLoadBalancerOutboundRule_multipleRulesUpdate(data acceptance.TestData, outboundRuleName, outboundRule2Name string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -513,6 +529,10 @@ resource "azurerm_lb_outbound_rule" "test2" { func testAccAzureRMLoadBalancerOutboundRule_withPublicIPPrefix(data acceptance.TestData, outboundRuleName string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_probe_test.go b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_probe_test.go index c2e411f11db52..083a7e869fff0 100644 --- a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_probe_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_probe_test.go @@ -259,6 +259,10 @@ func testCheckAzureRMLoadBalancerProbeDisappears(addressPoolName string, lb *net func testAccAzureRMLoadBalancerProbe_basic(data acceptance.TestData, probeName string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -307,6 +311,10 @@ resource "azurerm_lb_probe" "import" { func testAccAzureRMLoadBalancerProbe_removal(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -334,6 +342,10 @@ resource "azurerm_lb" "test" { func testAccAzureRMLoadBalancerProbe_multipleProbes(data acceptance.TestData, probeName, probe2Name string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -375,6 +387,10 @@ resource "azurerm_lb_probe" "test2" { func testAccAzureRMLoadBalancerProbe_multipleProbesUpdate(data acceptance.TestData, probeName, probe2Name string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -416,6 +432,10 @@ resource "azurerm_lb_probe" "test2" { func testAccAzureRMLoadBalancerProbe_updateProtocolBefore(data acceptance.TestData, probeName string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -452,6 +472,10 @@ resource "azurerm_lb_probe" "test" { func testAccAzureRMLoadBalancerProbe_updateProtocolAfter(data acceptance.TestData, probeName string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_rule_test.go b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_rule_test.go index aeef70ef181a4..4f157c924d681 100644 --- a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_rule_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_rule_test.go @@ -403,6 +403,10 @@ func testCheckAzureRMLoadBalancerRuleDisappears(ruleName string, lb *network.Loa func testAccAzureRMLoadBalancerRule_template(data acceptance.TestData, sku string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-lb-%[1]d" location = "%[2]s" diff --git a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_test.go b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_test.go index 24851d4213830..d1d77189f4340 100644 --- a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_test.go @@ -256,6 +256,10 @@ func testCheckAzureRMLoadBalancerDestroy(s *terraform.State) error { func testAccAzureRMLoadBalancer_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -294,6 +298,10 @@ resource "azurerm_lb" "import" { func testAccAzureRMLoadBalancer_standard(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -315,6 +323,10 @@ resource "azurerm_lb" "test" { func testAccAzureRMLoadBalancer_updatedTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -334,6 +346,10 @@ resource "azurerm_lb" "test" { func testAccAzureRMLoadBalancer_frontEndConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -373,6 +389,10 @@ resource "azurerm_lb" "test" { func testAccAzureRMLoadBalancer_frontEndConfigRemovalWithIP(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -407,6 +427,10 @@ resource "azurerm_lb" "test" { func testAccAzureRMLoadBalancer_frontEndConfigPublicIPPrefix(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -435,6 +459,10 @@ resource "azurerm_lb" "test" { func testAccAzureRMLoadBalancer_frontEndConfigRemoval(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -462,6 +490,10 @@ resource "azurerm_lb" "test" { func testAccAzureRMLoadBalancer_emptyIPAddress(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_local_network_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_local_network_gateway_test.go index 5a10500816831..1798bf6600421 100644 --- a/azurerm/internal/services/network/tests/resource_arm_local_network_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_local_network_gateway_test.go @@ -322,6 +322,10 @@ func testCheckAzureRMLocalNetworkGatewayDestroy(s *terraform.State) error { func testAccAzureRMLocalNetworkGatewayConfig_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctest-%d" location = "%s" @@ -354,6 +358,10 @@ resource "azurerm_local_network_gateway" "import" { func testAccAzureRMLocalNetworkGatewayConfig_tags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctest-%d" location = "%s" @@ -375,6 +383,10 @@ resource "azurerm_local_network_gateway" "test" { func testAccAzureRMLocalNetworkGatewayConfig_bgpSettings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctest-%d" location = "%s" @@ -397,6 +409,10 @@ resource "azurerm_local_network_gateway" "test" { func testAccAzureRMLocalNetworkGatewayConfig_bgpSettingsComplete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctest-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_nat_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_nat_gateway_test.go index d83fa4500c08b..4da55448d34cf 100644 --- a/azurerm/internal/services/network/tests/resource_arm_nat_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_nat_gateway_test.go @@ -135,6 +135,10 @@ func testCheckAzureRMNatGatewayDestroy(s *terraform.State) error { // Using alt location because the resource currently in private preview and is only available in eastus2. func testAccAzureRMNatGateway_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-network-%d" location = "%s" @@ -151,6 +155,10 @@ resource "azurerm_nat_gateway" "test" { // Using alt location because the resource currently in private preview and is only available in eastus2. func testAccAzureRMNatGateway_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-network-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_network_connection_monitor_test.go b/azurerm/internal/services/network/tests/resource_arm_network_connection_monitor_test.go index be4c620a28738..3fb89251ac6ec 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_connection_monitor_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_connection_monitor_test.go @@ -323,6 +323,10 @@ func testCheckAzureRMNetworkConnectionMonitorDestroy(s *terraform.State) error { func testAccAzureRMNetworkConnectionMonitor_baseConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-watcher-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_network_ddos_protection_plan_test.go b/azurerm/internal/services/network/tests/resource_arm_network_ddos_protection_plan_test.go index fdec4f3b58f10..39e15faee6e6b 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_ddos_protection_plan_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_ddos_protection_plan_test.go @@ -224,6 +224,10 @@ func testCheckAzureRMNetworkDDoSProtectionPlanDestroy(s *terraform.State) error func testAccAzureRMNetworkDDoSProtectionPlan_basicConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -252,6 +256,10 @@ resource "azurerm_network_ddos_protection_plan" "import" { func testAccAzureRMNetworkDDoSProtectionPlan_withTagsConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -272,6 +280,10 @@ resource "azurerm_network_ddos_protection_plan" "test" { func testAccAzureRMNetworkDDoSProtectionPlan_withUpdatedTagsConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_application_gateway_association_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_application_gateway_association_test.go index 6e6ef97ac3520..152914c722c7f 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_application_gateway_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_application_gateway_association_test.go @@ -283,6 +283,10 @@ resource "azurerm_network_interface_application_gateway_backend_address_pool_ass func testAccAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssociation_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_backend_address_pool_association_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_backend_address_pool_association_test.go index b14b6ad5517eb..1c5b2058c5808 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_backend_address_pool_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_backend_address_pool_association_test.go @@ -283,6 +283,10 @@ resource "azurerm_network_interface_backend_address_pool_association" "test" { func testAccAzureRMNetworkInterfaceBackendAddressPoolAssociation_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_nat_rule_association_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_nat_rule_association_test.go index a95bcc059456c..f1f9edaa4e74b 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_nat_rule_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_nat_rule_association_test.go @@ -283,6 +283,10 @@ resource "azurerm_network_interface_nat_rule_association" "test" { func testAccAzureRMNetworkInterfaceNATRuleAssociation_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go index 7d2f481a7e325..ca083a43dc299 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go @@ -777,6 +777,10 @@ resource "azurerm_network_interface" "test" { func testAccAzureRMNetworkInterface_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_network_packet_capture_test.go b/azurerm/internal/services/network/tests/resource_arm_network_packet_capture_test.go index b9f4db7adbc9d..3f2a6a32cada5 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_packet_capture_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_packet_capture_test.go @@ -170,6 +170,10 @@ func testCheckAzureRMNetworkPacketCaptureDestroy(s *terraform.State) error { func testAzureRMNetworkPacketCapture_base(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-watcher-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_network_profile_test.go b/azurerm/internal/services/network/tests/resource_arm_network_profile_test.go index 4b1ff3ac0fb89..be3e006446a2f 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_profile_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_profile_test.go @@ -193,6 +193,10 @@ func testCheckAzureRMNetworkProfileDestroy(s *terraform.State) error { func testAccAzureRMNetworkProfile_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -262,6 +266,10 @@ resource "azurerm_network_profile" "import" { func testAccAzureRMNetworkProfile_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -314,6 +322,10 @@ resource "azurerm_network_profile" "test" { func testAccAzureRMNetworkProfile_withUpdatedTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_network_security_group_test.go b/azurerm/internal/services/network/tests/resource_arm_network_security_group_test.go index 1e518afa16d62..3f0674aec5782 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_security_group_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_security_group_test.go @@ -316,6 +316,10 @@ func testCheckAzureRMNetworkSecurityGroupDestroy(s *terraform.State) error { func testAccAzureRMNetworkSecurityGroup_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -344,6 +348,10 @@ resource "azurerm_network_security_group" "test" { func testAccAzureRMNetworkSecurityGroup_rulesExplicitZero(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -361,6 +369,10 @@ resource "azurerm_network_security_group" "test" { func testAccAzureRMNetworkSecurityGroup_singleRule(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -388,6 +400,10 @@ resource "azurerm_network_security_group" "test" { func testAccAzureRMNetworkSecurityGroup_anotherRule(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -427,6 +443,10 @@ resource "azurerm_network_security_group" "test" { func testAccAzureRMNetworkSecurityGroup_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -459,6 +479,10 @@ resource "azurerm_network_security_group" "test" { func testAccAzureRMNetworkSecurityGroup_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -490,6 +514,10 @@ resource "azurerm_network_security_group" "test" { func testAccAzureRMNetworkSecurityGroup_augmented(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -517,6 +545,10 @@ resource "azurerm_network_security_group" "test" { func testAccAzureRMNetworkSecurityGroup_applicationSecurityGroup(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_network_security_rule_test.go b/azurerm/internal/services/network/tests/resource_arm_network_security_rule_test.go index 7a89e8dad9dcf..4436a41344224 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_security_rule_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_security_rule_test.go @@ -226,6 +226,10 @@ func testCheckAzureRMNetworkSecurityRuleDestroy(s *terraform.State) error { func testAccAzureRMNetworkSecurityRule_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -377,6 +381,10 @@ resource "azurerm_network_security_rule" "test1" { func testAccAzureRMNetworkSecurityRule_applicationSecurityGroups(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_network_watcher_test.go b/azurerm/internal/services/network/tests/resource_arm_network_watcher_test.go index 9e22cb9c37a00..4d88fd28255d9 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_watcher_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_watcher_test.go @@ -270,6 +270,10 @@ func testCheckAzureRMNetworkWatcherDestroy(s *terraform.State) error { func testAccAzureRMNetworkWatcher_basicConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-watcher-%d" location = "%s" @@ -298,6 +302,10 @@ resource "azurerm_network_watcher" "import" { func testAccAzureRMNetworkWatcher_completeConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-watcher-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_packet_capture_test.go b/azurerm/internal/services/network/tests/resource_arm_packet_capture_test.go index 0ab3190f6ad76..b7452b739236a 100644 --- a/azurerm/internal/services/network/tests/resource_arm_packet_capture_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_packet_capture_test.go @@ -170,6 +170,10 @@ func testCheckAzureRMPacketCaptureDestroy(s *terraform.State) error { func testAzureRMPacketCapture_base(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_point_to_site_vpn_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_point_to_site_vpn_gateway_test.go index 10ed5cccc6d9f..b5d779365de7f 100644 --- a/azurerm/internal/services/network/tests/resource_arm_point_to_site_vpn_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_point_to_site_vpn_gateway_test.go @@ -250,6 +250,10 @@ resource "azurerm_point_to_site_vpn_gateway" "test" { func testAccAzureRMAzureRMPointToSiteVPNGateway_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_public_ip_prefix_test.go b/azurerm/internal/services/network/tests/resource_arm_public_ip_prefix_test.go index 28481098ea2ce..3a8146ab82ea9 100644 --- a/azurerm/internal/services/network/tests/resource_arm_public_ip_prefix_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_public_ip_prefix_test.go @@ -190,6 +190,10 @@ func TestAccAzureRMPublicIpPrefix_disappears(t *testing.T) { func testAccAzureRMPublicIPPrefix_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -205,6 +209,10 @@ resource "azurerm_public_ip_prefix" "test" { func testAccAzureRMPublicIPPrefix_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -225,6 +233,10 @@ resource "azurerm_public_ip_prefix" "test" { func testAccAzureRMPublicIPPrefix_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -244,6 +256,10 @@ resource "azurerm_public_ip_prefix" "test" { func testAccAzureRMPublicIPPrefix_prefixLength(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_public_ip_test.go b/azurerm/internal/services/network/tests/resource_arm_public_ip_test.go index a270520fd7eed..24ae135fb1190 100644 --- a/azurerm/internal/services/network/tests/resource_arm_public_ip_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_public_ip_test.go @@ -500,6 +500,10 @@ func testCheckAzureRMPublicIpDestroy(s *terraform.State) error { func testAccAzureRMPublicIPStatic_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -529,6 +533,10 @@ resource "azurerm_public_ip" "import" { func testAccAzureRMPublicIPStatic_withZone(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -546,6 +554,10 @@ resource "azurerm_public_ip" "test" { func testAccAzureRMPublicIPStatic_basic_withDNSLabel(data acceptance.TestData, dnsNameLabel string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -563,6 +575,10 @@ resource "azurerm_public_ip" "test" { func testAccAzureRMPublicIPStatic_basic_withIPVersion(data acceptance.TestData, ipVersion string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -580,6 +596,10 @@ resource "azurerm_public_ip" "test" { func testAccAzureRMPublicIPStatic_standard(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -597,6 +617,10 @@ resource "azurerm_public_ip" "test" { func testAccAzureRMPublicIPStatic_standardPrefix(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -621,6 +645,10 @@ resource "azurerm_public_ip" "test" { func testAccAzureRMPublicIPStatic_standardPrefixWithTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -650,6 +678,10 @@ resource "azurerm_public_ip" "test" { func testAccAzureRMPublicIPStatic_standardPrefixWithTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -678,6 +710,10 @@ resource "azurerm_public_ip" "test" { func testAccAzureRMPublicIPStatic_standard_withIPVersion(data acceptance.TestData, ipVersion string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -696,6 +732,10 @@ resource "azurerm_public_ip" "test" { func testAccAzureRMPublicIPStatic_update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -713,6 +753,10 @@ resource "azurerm_public_ip" "test" { func testAccAzureRMPublicIPStatic_idleTimeout(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -730,6 +774,10 @@ resource "azurerm_public_ip" "test" { func testAccAzureRMPublicIPDynamic_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -746,6 +794,10 @@ resource "azurerm_public_ip" "test" { func testAccAzureRMPublicIPDynamic_basic_withIPVersion(data acceptance.TestData, ipVersion string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -764,6 +816,10 @@ resource "azurerm_public_ip" "test" { func testAccAzureRMPublicIPStatic_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -785,6 +841,10 @@ resource "azurerm_public_ip" "test" { func testAccAzureRMPublicIPStatic_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -805,6 +865,10 @@ resource "azurerm_public_ip" "test" { func testAccAzureRMPublicIPStatic_canLabelBe63(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_route_table_test.go b/azurerm/internal/services/network/tests/resource_arm_route_table_test.go index c619eb898d1d0..05f29aef80625 100644 --- a/azurerm/internal/services/network/tests/resource_arm_route_table_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_route_table_test.go @@ -354,6 +354,10 @@ func testCheckAzureRMRouteTableDestroy(s *terraform.State) error { func testAccAzureRMRouteTable_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -381,6 +385,10 @@ resource "azurerm_route_table" "import" { func testAccAzureRMRouteTable_basicAppliance(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -403,6 +411,10 @@ resource "azurerm_route_table" "test" { func testAccAzureRMRouteTable_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -426,6 +438,10 @@ resource "azurerm_route_table" "test" { func testAccAzureRMRouteTable_singleRoute(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -447,6 +463,10 @@ resource "azurerm_route_table" "test" { func testAccAzureRMRouteTable_noRouteBlocks(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -462,6 +482,10 @@ resource "azurerm_route_table" "test" { func testAccAzureRMRouteTable_singleRouteRemoved(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -479,6 +503,10 @@ resource "azurerm_route_table" "test" { func testAccAzureRMRouteTable_multipleRoutes(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -506,6 +534,10 @@ resource "azurerm_route_table" "test" { func testAccAzureRMRouteTable_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -532,6 +564,10 @@ resource "azurerm_route_table" "test" { func testAccAzureRMRouteTable_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_route_test.go b/azurerm/internal/services/network/tests/resource_arm_route_test.go index 6161756e6cf4b..a560ad376c2d9 100644 --- a/azurerm/internal/services/network/tests/resource_arm_route_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_route_test.go @@ -228,6 +228,10 @@ func testCheckAzureRMRouteDestroy(s *terraform.State) error { func testAccAzureRMRoute_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -266,6 +270,10 @@ resource "azurerm_route" "import" { func testAccAzureRMRoute_basicAppliance(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -291,6 +299,10 @@ resource "azurerm_route" "test" { func testAccAzureRMRoute_multipleRoutes(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_subnet_nat_gateway_association_test.go b/azurerm/internal/services/network/tests/resource_arm_subnet_nat_gateway_association_test.go index 2a2f2c12fdc7f..107fa815a441e 100644 --- a/azurerm/internal/services/network/tests/resource_arm_subnet_nat_gateway_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_subnet_nat_gateway_association_test.go @@ -287,6 +287,10 @@ resource "azurerm_subnet_nat_gateway_association" "test" { func testAccAzureRMSubnetNatGatewayAssociation_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-network-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_subnet_network_security_group_association_test.go b/azurerm/internal/services/network/tests/resource_arm_subnet_network_security_group_association_test.go index cc7cba56b9335..48363fa4bee3a 100644 --- a/azurerm/internal/services/network/tests/resource_arm_subnet_network_security_group_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_subnet_network_security_group_association_test.go @@ -292,6 +292,10 @@ resource "azurerm_subnet_network_security_group_association" "test" { func testAccAzureRMSubnetNetworkSecurityGroupAssociation_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_subnet_route_table_association_test.go b/azurerm/internal/services/network/tests/resource_arm_subnet_route_table_association_test.go index 8e539fcc3080a..66f38365b4f88 100644 --- a/azurerm/internal/services/network/tests/resource_arm_subnet_route_table_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_subnet_route_table_association_test.go @@ -291,6 +291,10 @@ resource "azurerm_subnet_route_table_association" "test" { func testAccAzureRMSubnetRouteTableAssociation_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_subnet_test.go b/azurerm/internal/services/network/tests/resource_arm_subnet_test.go index 3e72723ecf97d..527dfa9c0e715 100644 --- a/azurerm/internal/services/network/tests/resource_arm_subnet_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_subnet_test.go @@ -502,6 +502,10 @@ resource "azurerm_subnet" "test" { func testAccAzureRMSubnet_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_virtual_hub_test.go b/azurerm/internal/services/network/tests/resource_arm_virtual_hub_test.go index 7f609ad2adca2..b3254f5340fd3 100644 --- a/azurerm/internal/services/network/tests/resource_arm_virtual_hub_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_virtual_hub_test.go @@ -282,6 +282,10 @@ resource "azurerm_virtual_hub" "test" { func testAccAzureRMVirtualHub_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_virtual_network_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_virtual_network_gateway_test.go index 81c9e68adff22..3a8303fe2fa57 100644 --- a/azurerm/internal/services/network/tests/resource_arm_virtual_network_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_virtual_network_gateway_test.go @@ -324,6 +324,10 @@ func testCheckAzureRMVirtualNetworkGatewayDestroy(s *terraform.State) error { func testAccAzureRMVirtualNetworkGateway_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -392,6 +396,10 @@ resource "azurerm_virtual_network_gateway" "import" { func testAccAzureRMVirtualNetworkGateway_lowerCaseSubnetName(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -438,6 +446,10 @@ resource "azurerm_virtual_network_gateway" "test" { func testAccAzureRMVirtualNetworkGateway_vpnGw1(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -484,6 +496,10 @@ resource "azurerm_virtual_network_gateway" "test" { func testAccAzureRMVirtualNetworkGateway_activeActive(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -558,6 +574,10 @@ resource "azurerm_virtual_network_gateway" "test" { func testAccAzureRMVirtualNetworkGateway_vpnClientConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -613,6 +633,10 @@ resource "azurerm_virtual_network_gateway" "test" { func testAccAzureRMVirtualNetworkGateway_vpnClientConfigOpenVPN(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -665,6 +689,10 @@ resource "azurerm_virtual_network_gateway" "test" { func testAccAzureRMVirtualNetworkGateway_sku(data acceptance.TestData, sku string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -711,6 +739,10 @@ resource "azurerm_virtual_network_gateway" "test" { func testAccAzureRMVirtualNetworkGateway_enableBgp(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -758,6 +790,10 @@ resource "azurerm_virtual_network_gateway" "test" { func testAccAzureRMVirtualNetworkGateway_expressRoute(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -804,6 +840,10 @@ resource "azurerm_virtual_network_gateway" "test" { func testAccAzureRMVirtualNetworkGateway_generation(data acceptance.TestData, generation string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_virtual_network_peering_test.go b/azurerm/internal/services/network/tests/resource_arm_virtual_network_peering_test.go index a42e2de507216..3ec0418b2a07d 100644 --- a/azurerm/internal/services/network/tests/resource_arm_virtual_network_peering_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_virtual_network_peering_test.go @@ -213,6 +213,10 @@ func testCheckAzureRMVirtualNetworkPeeringDestroy(s *terraform.State) error { func testAccAzureRMVirtualNetworkPeering_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -267,6 +271,10 @@ resource "azurerm_virtual_network_peering" "import" { func testAccAzureRMVirtualNetworkPeering_basicUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_virtual_network_test.go b/azurerm/internal/services/network/tests/resource_arm_virtual_network_test.go index bb135bba20b6c..e309026ee7195 100644 --- a/azurerm/internal/services/network/tests/resource_arm_virtual_network_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_virtual_network_test.go @@ -252,6 +252,10 @@ func testCheckAzureRMVirtualNetworkDestroy(s *terraform.State) error { func testAccAzureRMVirtualNetwork_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -273,6 +277,10 @@ resource "azurerm_virtual_network" "test" { func testAccAzureRMVirtualNetwork_basicUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -318,6 +326,10 @@ resource "azurerm_virtual_network" "import" { func testAccAzureRMVirtualNetwork_ddosProtectionPlan(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -350,6 +362,10 @@ resource "azurerm_virtual_network" "test" { func testAccAzureRMVirtualNetwork_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -376,6 +392,10 @@ resource "azurerm_virtual_network" "test" { func testAccAzureRMVirtualNetwork_withTagsUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_virtual_wan_test.go b/azurerm/internal/services/network/tests/resource_arm_virtual_wan_test.go index 5d87f58df093d..29879bae5bc0d 100644 --- a/azurerm/internal/services/network/tests/resource_arm_virtual_wan_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_virtual_wan_test.go @@ -137,6 +137,10 @@ func testCheckAzureRMVirtualWanExists(resourceName string) resource.TestCheckFun func testAccAzureRMVirtualWan_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -165,6 +169,10 @@ resource "azurerm_virtual_wan" "import" { func testAccAzureRMVirtualWan_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_vpn_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_vpn_gateway_test.go index 0fc7c91c9c22d..71b1ed8cbbc48 100644 --- a/azurerm/internal/services/network/tests/resource_arm_vpn_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_vpn_gateway_test.go @@ -289,6 +289,10 @@ resource "azurerm_vpn_gateway" "test" { func testAccAzureRMVPNGateway_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_vpn_server_configuration_test.go b/azurerm/internal/services/network/tests/resource_arm_vpn_server_configuration_test.go index 6c877048add32..eb58bb2536be9 100644 --- a/azurerm/internal/services/network/tests/resource_arm_vpn_server_configuration_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_vpn_server_configuration_test.go @@ -441,6 +441,10 @@ EOF func testAccAzureRMAzureRMVPNServerConfiguration_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_web_application_firewall_policy_test.go b/azurerm/internal/services/network/tests/resource_arm_web_application_firewall_policy_test.go index 4eb7459eafd58..576c91e87635d 100644 --- a/azurerm/internal/services/network/tests/resource_arm_web_application_firewall_policy_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_web_application_firewall_policy_test.go @@ -186,6 +186,10 @@ func testCheckAzureRMWebApplicationFirewallPolicyDestroy(s *terraform.State) err func testAccAzureRMWebApplicationFirewallPolicy_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -201,6 +205,10 @@ resource "azurerm_web_application_firewall_policy" "test" { func testAccAzureRMWebApplicationFirewallPolicy_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_authorization_rule_test.go b/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_authorization_rule_test.go index 56bd65105b364..6777862a3de11 100644 --- a/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_authorization_rule_test.go +++ b/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_authorization_rule_test.go @@ -344,6 +344,10 @@ resource "azurerm_notification_hub_authorization_rule" "test" { func testAzureRMNotificationHubAuthorizationRule_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_namespace_test.go b/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_namespace_test.go index 3efa416740584..e511870cde39e 100644 --- a/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_namespace_test.go +++ b/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_namespace_test.go @@ -106,6 +106,10 @@ func testCheckAzureRMNotificationHubNamespaceDestroy(s *terraform.State) error { func testAccAzureRMNotificationHubNamespace_free(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_test.go b/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_test.go index 63c911c5cf3bb..ab1c71f9f104b 100644 --- a/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_test.go +++ b/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_test.go @@ -113,6 +113,10 @@ func testCheckAzureRMNotificationHubDestroy(s *terraform.State) error { func testAccAzureRMNotificationHub_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRGpol-%d" location = "%s" diff --git a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_configuration_test.go b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_configuration_test.go index dbdb0fa42349d..cfef6c8e4a896 100644 --- a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_configuration_test.go +++ b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_configuration_test.go @@ -202,6 +202,10 @@ resource "azurerm_postgresql_configuration" "test" { func testAccAzureRMPostgreSQLConfiguration_empty(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-psql-%d" location = "%s" diff --git a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_database_test.go b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_database_test.go index 968f4ec5d213e..83462b6ae8e6b 100644 --- a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_database_test.go +++ b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_database_test.go @@ -174,6 +174,10 @@ func testCheckAzureRMPostgreSQLDatabaseDestroy(s *terraform.State) error { func testAccAzureRMPostgreSQLDatabase_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-psql-%d" location = "%s" @@ -225,6 +229,10 @@ resource "azurerm_postgresql_database" "import" { func testAccAzureRMPostgreSQLDatabase_collationWithHyphen(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-psql-%d" location = "%s" @@ -261,6 +269,10 @@ resource "azurerm_postgresql_database" "test" { func testAccAzureRMPostgreSQLDatabase_charsetLowercase(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-psql-%d" location = "%s" @@ -297,6 +309,10 @@ resource "azurerm_postgresql_database" "test" { func testAccAzureRMPostgreSQLDatabase_charsetMixedcase(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-psql-%d" location = "%s" diff --git a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_firewall_rule_test.go b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_firewall_rule_test.go index 91a5933cb68f4..e15c3858b5582 100644 --- a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_firewall_rule_test.go +++ b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_firewall_rule_test.go @@ -119,6 +119,10 @@ func testCheckAzureRMPostgreSQLFirewallRuleDestroy(s *terraform.State) error { func testAccAzureRMPostgreSQLFirewallRule_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-psql-%d" location = "%s" diff --git a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go index 296fac1fc2b90..ce802d23e4335 100644 --- a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go +++ b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go @@ -326,6 +326,10 @@ func testCheckAzureRMPostgreSQLServerDestroy(s *terraform.State) error { func testAccAzureRMPostgreSQLServer_basic(data acceptance.TestData, version string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-psql-%d" location = "%s" @@ -397,6 +401,10 @@ resource "azurerm_postgresql_server" "import" { func testAccAzureRMPostgreSQLServer_basicNinePointSixUpdatedPassword(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-psql-%d" location = "%s" @@ -425,6 +433,10 @@ resource "azurerm_postgresql_server" "test" { func testAccAzureRMPostgreSQLServer_basicNinePointSixUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-psql-%d" location = "%s" @@ -453,6 +465,10 @@ resource "azurerm_postgresql_server" "test" { func testAccAzureRMPostgreSQLServer_basicMaxStorage(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-psql-%d" location = "%s" @@ -482,6 +498,10 @@ resource "azurerm_postgresql_server" "test" { func testAccAzureRMPostgreSQLServer_generalPurpose(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-psql-%d" location = "%s" @@ -510,6 +530,10 @@ resource "azurerm_postgresql_server" "test" { func testAccAzureRMPostgreSQLServer_memoryOptimized(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-psql-%d" location = "%s" @@ -538,6 +562,10 @@ resource "azurerm_postgresql_server" "test" { func testAccAzureRMPostgreSQLServer_memoryOptimizedGeoRedundant(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-psql-%d" location = "%s" diff --git a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_virtual_network_rule_test.go b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_virtual_network_rule_test.go index 4e56f9abd792c..1de7450526fd2 100644 --- a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_virtual_network_rule_test.go +++ b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_virtual_network_rule_test.go @@ -239,6 +239,10 @@ func testCheckAzureRMPostgreSQLVirtualNetworkRuleDisappears(resourceName string) func testAccAzureRMPostgreSQLVirtualNetworkRule_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-psql-%d" location = "%s" @@ -302,6 +306,10 @@ resource "azurerm_postgresql_virtual_network_rule" "import" { func testAccAzureRMPostgreSQLVirtualNetworkRule_subnetSwitchPre(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-psql-%d" location = "%s" @@ -359,6 +367,10 @@ resource "azurerm_postgresql_virtual_network_rule" "test" { func testAccAzureRMPostgreSQLVirtualNetworkRule_subnetSwitchPost(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-psql-%d" location = "%s" @@ -416,6 +428,10 @@ resource "azurerm_postgresql_virtual_network_rule" "test" { func testAccAzureRMPostgreSQLVirtualNetworkRule_multipleSubnets(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-psql-%d" location = "%s" diff --git a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_a_record_test.go b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_a_record_test.go index 94fae11987c77..a2f7ca9d2291d 100644 --- a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_a_record_test.go +++ b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_a_record_test.go @@ -168,6 +168,10 @@ func testCheckAzureRMPrivateDnsARecordDestroy(s *terraform.State) error { func testAccAzureRMPrivateDnsARecord_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -205,6 +209,10 @@ resource "azurerm_private_dns_a_record" "import" { func testAccAzureRMPrivateDnsARecord_updateRecords(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -227,6 +235,10 @@ resource "azurerm_private_dns_a_record" "test" { func testAccAzureRMPrivateDnsARecord_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -254,6 +266,10 @@ resource "azurerm_private_dns_a_record" "test" { func testAccAzureRMPrivateDnsARecord_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_aaaa_record_test.go b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_aaaa_record_test.go index 48847310c86f1..3635c380a2a57 100644 --- a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_aaaa_record_test.go +++ b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_aaaa_record_test.go @@ -168,6 +168,10 @@ func testCheckAzureRMPrivateDnsAaaaRecordDestroy(s *terraform.State) error { func testAccAzureRMPrivateDnsAaaaRecord_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -205,6 +209,10 @@ resource "azurerm_private_dns_aaaa_record" "import" { func testAccAzureRMPrivateDnsAaaaRecord_updateRecords(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -227,6 +235,10 @@ resource "azurerm_private_dns_aaaa_record" "test" { func testAccAzureRMPrivateDnsAaaaRecord_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -254,6 +266,10 @@ resource "azurerm_private_dns_aaaa_record" "test" { func testAccAzureRMPrivateDnsAaaaRecord_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_cname_record_test.go b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_cname_record_test.go index e51e78f274985..3b4367f00b525 100644 --- a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_cname_record_test.go +++ b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_cname_record_test.go @@ -184,6 +184,10 @@ func testCheckAzureRMPrivateDnsCNameRecordDestroy(s *terraform.State) error { func testAccAzureRMPrivateDnsCNameRecord_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -221,6 +225,10 @@ resource "azurerm_private_dns_cname_record" "import" { func testAccAzureRMPrivateDnsCNameRecord_subdomain(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -243,6 +251,10 @@ resource "azurerm_private_dns_cname_record" "test" { func testAccAzureRMPrivateDnsCNameRecord_updateRecords(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -265,6 +277,10 @@ resource "azurerm_private_dns_cname_record" "test" { func testAccAzureRMPrivateDnsCNameRecord_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -292,6 +308,10 @@ resource "azurerm_private_dns_cname_record" "test" { func testAccAzureRMPrivateDnsCNameRecord_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_mx_record_test.go b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_mx_record_test.go index fa2f26c5e5890..dbb673427458d 100644 --- a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_mx_record_test.go +++ b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_mx_record_test.go @@ -185,6 +185,10 @@ func testCheckAzureRMPrivateDnsMxRecordDestroy(s *terraform.State) error { func testAccAzureRMPrivateDnsMxRecord_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-prvdns-%d" location = "%s" @@ -215,6 +219,10 @@ resource "azurerm_private_dns_mx_record" "test" { func testAccAzureRMPrivateDnsMxRecord_emptyName(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-prvdns-%d" location = "%s" @@ -266,6 +274,10 @@ resource "azurerm_private_dns_mx_record" "import" { func testAccAzureRMPrivateDnsMxRecord_updateRecords(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-prvdns-%d" location = "%s" @@ -299,6 +311,10 @@ resource "azurerm_private_dns_mx_record" "test" { func testAccAzureRMPrivateDnsMxRecord_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-prvdns-%d" location = "%s" @@ -333,6 +349,10 @@ resource "azurerm_private_dns_mx_record" "test" { func testAccAzureRMPrivateDnsMxRecord_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-prvdns-%d" location = "%s" diff --git a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_ptr_record_test.go b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_ptr_record_test.go index 73f2d4c10fe45..dee917ff6c387 100644 --- a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_ptr_record_test.go +++ b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_ptr_record_test.go @@ -167,6 +167,10 @@ func testCheckAzureRMPrivateDnsPtrRecordDestroy(s *terraform.State) error { func testAccAzureRMPrivateDnsPtrRecord_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -204,6 +208,10 @@ resource "azurerm_private_dns_ptr_record" "import" { func testAccAzureRMPrivateDnsPtrRecord_updateRecords(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -226,6 +234,10 @@ resource "azurerm_private_dns_ptr_record" "test" { func testAccAzureRMPrivateDnsPtrRecord_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -253,6 +265,10 @@ resource "azurerm_private_dns_ptr_record" "test" { func testAccAzureRMPrivateDnsPtrRecord_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_srv_record_test.go b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_srv_record_test.go index 57360e84f9809..c9a1ea96b0653 100644 --- a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_srv_record_test.go +++ b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_srv_record_test.go @@ -167,6 +167,10 @@ func testCheckAzureRMPrivateDnsSrvRecordDestroy(s *terraform.State) error { func testAccAzureRMPrivateDnsSrvRecord_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-prvdns-%d" location = "%s" @@ -227,6 +231,10 @@ resource "azurerm_private_dns_srv_record" "import" { func testAccAzureRMPrivateDnsSrvRecord_updateRecords(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -266,6 +274,10 @@ resource "azurerm_private_dns_srv_record" "test" { func testAccAzureRMPrivateDnsSrvRecord_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -304,6 +316,10 @@ resource "azurerm_private_dns_srv_record" "test" { func testAccAzureRMPrivateDnsSrvRecord_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_zone_test.go b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_zone_test.go index d76ad189c63bc..dca6e005e30e6 100644 --- a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_zone_test.go +++ b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_zone_test.go @@ -138,6 +138,10 @@ func testCheckAzureRMPrivateDnsZoneDestroy(s *terraform.State) error { func testAccAzureRMPrivateDnsZone_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -164,6 +168,10 @@ resource "azurerm_private_dns_zone" "import" { func testAccAzureRMPrivateDnsZone_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -183,6 +191,10 @@ resource "azurerm_private_dns_zone" "test" { func testAccAzureRMPrivateDnsZone_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_zone_virtual_network_link_test.go b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_zone_virtual_network_link_test.go index cf0a3f23b560a..7e918a835f137 100644 --- a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_zone_virtual_network_link_test.go +++ b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_zone_virtual_network_link_test.go @@ -142,6 +142,10 @@ func testCheckAzureRMPrivateDnsZoneVirtualNetworkLinkDestroy(s *terraform.State) func testAccAzureRMPrivateDnsZoneVirtualNetworkLink_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -190,6 +194,10 @@ resource "azurerm_private_dns_zone_virtual_network_link" "import" { func testAccAzureRMPrivateDnsZoneVirtualNetworkLink_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -228,6 +236,10 @@ resource "azurerm_private_dns_zone_virtual_network_link" "test" { func testAccAzureRMPrivateDnsZoneVirtualNetworkLink_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_container_storage_account_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_container_storage_account_test.go index 7b85fbd16562e..9cb29db4d132b 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_container_storage_account_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_container_storage_account_test.go @@ -33,6 +33,10 @@ func TestAccAzureRMBackupProtectionContainerStorageAccount_basic(t *testing.T) { func testAccAzureRMBackupProtectionContainerStorageAccount_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-backup-%d" location = "%s" diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_vm_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_vm_test.go index ef6c15dca3cf6..9d5213eea2321 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_vm_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_vm_test.go @@ -370,6 +370,10 @@ resource "azurerm_backup_protected_vm" "test" { // For update backup policy id test func testAccAzureRMBackupProtectedVm_basePolicyTest(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-backup-%d-1" location = "%s" diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_vault_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_vault_test.go index 33760ecfed39c..00e17957a59d5 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_vault_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_vault_test.go @@ -171,6 +171,10 @@ func testCheckAzureRMRecoveryServicesVaultExists(resourceName string) resource.T func testAccAzureRMRecoveryServicesVault_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-recovery-%d" location = "%s" @@ -189,6 +193,10 @@ resource "azurerm_recovery_services_vault" "test" { func testAccAzureRMRecoveryServicesVault_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-recovery-%d" location = "%s" diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_fabric_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_fabric_test.go index dca22334bfd8c..fcb195318dd8a 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_fabric_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_fabric_test.go @@ -32,6 +32,10 @@ func TestAccAzureRMSiteRecoveryFabric_basic(t *testing.T) { func testAccAzureRMSiteRecoveryFabric_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-recovery-%d" location = "%s" diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_network_mapping_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_network_mapping_test.go index f6421a9d4dde2..f4d7217121d12 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_network_mapping_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_network_mapping_test.go @@ -33,6 +33,10 @@ func TestAccAzureRMSiteRecoveryNetworkMapping_basic(t *testing.T) { func testAccAzureRMSiteRecoveryNetworkMapping_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-recovery-%d-1" location = "%s" diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_protection_container_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_protection_container_test.go index 28850f56b8e5c..5d98f7a0f1a30 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_protection_container_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_protection_container_test.go @@ -32,6 +32,10 @@ func TestAccAzureRMSiteRecoveryProtectionContainer_basic(t *testing.T) { func testAccAzureRMSiteRecoveryProtectionContainer_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-recovery-%d" location = "%s" diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_replicated_vm_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_replicated_vm_test.go index 47aa698f5d87a..96b952e8474da 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_replicated_vm_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_replicated_vm_test.go @@ -32,6 +32,10 @@ func TestAccAzureRMSiteRecoveryReplicatedVm_basic(t *testing.T) { func testAccAzureRMSiteRecoveryReplicatedVm_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-recovery-%d-1" location = "%s" diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_replication_policy_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_replication_policy_test.go index 2b5c188df8fd4..eb624ad3f3566 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_replication_policy_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_replication_policy_test.go @@ -32,6 +32,10 @@ func TestAccAzureRMSiteRecoveryReplicationPolicy_basic(t *testing.T) { func testAccAzureRMSiteRecoveryReplicationPolicy_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-recovery-%d" location = "%s" 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 f127ec9349f89..8185093c19c0e 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 @@ -478,6 +478,10 @@ func testCheckAzureRMRedisCacheDestroy(s *terraform.State) error { func testAccAzureRMRedisCache_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -521,6 +525,10 @@ resource "azurerm_redis_cache" "import" { func testAccAzureRMRedisCache_standard(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -546,6 +554,10 @@ resource "azurerm_redis_cache" "test" { func testAccAzureRMRedisCache_premium(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -572,6 +584,10 @@ resource "azurerm_redis_cache" "test" { func testAccAzureRMRedisCache_premiumSharded(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -599,6 +615,10 @@ resource "azurerm_redis_cache" "test" { func testAccAzureRMRedisCache_premiumShardedScaled(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -626,6 +646,10 @@ resource "azurerm_redis_cache" "test" { func testAccAzureRMRedisCacheNonStandardCasing(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -647,6 +671,10 @@ resource "azurerm_redis_cache" "test" { func testAccAzureRMRedisCacheBackupDisabled(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -670,6 +698,10 @@ resource "azurerm_redis_cache" "test" { func testAccAzureRMRedisCacheBackupEnabled(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -708,6 +740,10 @@ resource "azurerm_redis_cache" "test" { func testAccAzureRMRedisCacheAOFBackupDisabled(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -731,6 +767,10 @@ resource "azurerm_redis_cache" "test" { func testAccAzureRMRedisCacheAOFBackupEnabled(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -768,6 +808,10 @@ resource "azurerm_redis_cache" "test" { func testAccAzureRMRedisCachePatchSchedule(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -798,6 +842,10 @@ resource "azurerm_redis_cache" "test" { func testAccAzureRMRedisCacheSubscribeAllEvents(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -833,6 +881,10 @@ resource "azurerm_redis_cache" "test" { func testAccAzureRMRedisCache_internalSubnet(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -869,6 +921,10 @@ resource "azurerm_redis_cache" "test" { func testAccAzureRMRedisCache_internalSubnetStaticIP(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -906,6 +962,10 @@ resource "azurerm_redis_cache" "test" { func testAccAzureRMRedisCache_internalSubnet_withZone(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -943,6 +1003,10 @@ resource "azurerm_redis_cache" "test" { func testAccAzureRMRedisCacheWithoutAuth(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/redis/tests/resource_arm_redis_firewall_rule_test.go b/azurerm/internal/services/redis/tests/resource_arm_redis_firewall_rule_test.go index 691e41a0b9c10..10e937c566095 100644 --- a/azurerm/internal/services/redis/tests/resource_arm_redis_firewall_rule_test.go +++ b/azurerm/internal/services/redis/tests/resource_arm_redis_firewall_rule_test.go @@ -158,6 +158,10 @@ func testCheckAzureRMRedisFirewallRuleDestroy(s *terraform.State) error { func testAccAzureRMRedisFirewallRule_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -221,6 +225,10 @@ resource "azurerm_redis_firewall_rule" "import" { func testAccAzureRMRedisFirewallRule_update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/relay/tests/resource_arm_relay_hybrid_connection_test.go b/azurerm/internal/services/relay/tests/resource_arm_relay_hybrid_connection_test.go index da3102893a137..5496e5d7cc4ae 100644 --- a/azurerm/internal/services/relay/tests/resource_arm_relay_hybrid_connection_test.go +++ b/azurerm/internal/services/relay/tests/resource_arm_relay_hybrid_connection_test.go @@ -106,6 +106,10 @@ func TestAccAzureRMRelayHybridConnection_requiresImport(t *testing.T) { func testAccAzureRMRelayHybridConnection_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -129,6 +133,10 @@ resource "azurerm_relay_hybrid_connection" "test" { func testAccAzureRMRelayHybridConnection_full(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -153,6 +161,10 @@ resource "azurerm_relay_hybrid_connection" "test" { func testAccAzureRMRelayHybridConnection_update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/relay/tests/resource_arm_relay_namespace_test.go b/azurerm/internal/services/relay/tests/resource_arm_relay_namespace_test.go index 893fe37624d4c..98fcdd4d74371 100644 --- a/azurerm/internal/services/relay/tests/resource_arm_relay_namespace_test.go +++ b/azurerm/internal/services/relay/tests/resource_arm_relay_namespace_test.go @@ -146,6 +146,10 @@ func testCheckAzureRMRelayNamespaceDestroy(s *terraform.State) error { func testAccAzureRMRelayNamespace_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -178,6 +182,10 @@ resource "azurerm_relay_namespace" "import" { func testAccAzureRMRelayNamespace_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/resource/tests/data_source_resource_group_test.go b/azurerm/internal/services/resource/tests/data_source_resource_group_test.go index e6c06309773ec..34079f7713b60 100644 --- a/azurerm/internal/services/resource/tests/data_source_resource_group_test.go +++ b/azurerm/internal/services/resource/tests/data_source_resource_group_test.go @@ -31,6 +31,10 @@ func TestAccDataSourceAzureRMResourceGroup_basic(t *testing.T) { func testAccDataSourceAzureRMResourceGroupBasic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRg-%d" location = "%s" diff --git a/azurerm/internal/services/resource/tests/data_source_resources_test.go b/azurerm/internal/services/resource/tests/data_source_resources_test.go index 2939262b9464e..2fb126f3b7748 100644 --- a/azurerm/internal/services/resource/tests/data_source_resources_test.go +++ b/azurerm/internal/services/resource/tests/data_source_resources_test.go @@ -140,6 +140,10 @@ data "azurerm_resources" "test" { func testAccDataSourceAzureRMResources_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" 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 0780b94380f06..d32c67b877dde 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 @@ -254,6 +254,10 @@ func testCheckAzureRMManagementLockDestroy(s *terraform.State) error { func testAccAzureRMManagementLock_resourceGroupReadOnlyBasic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -282,6 +286,10 @@ resource "azurerm_management_lock" "import" { func testAccAzureRMManagementLock_resourceGroupReadOnlyComplete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -298,6 +306,10 @@ resource "azurerm_management_lock" "test" { func testAccAzureRMManagementLock_resourceGroupCanNotDeleteBasic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -313,6 +325,10 @@ resource "azurerm_management_lock" "test" { func testAccAzureRMManagementLock_resourceGroupCanNotDeleteComplete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -329,6 +345,10 @@ resource "azurerm_management_lock" "test" { func testAccAzureRMManagementLock_publicIPReadOnlyBasic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -352,6 +372,10 @@ resource "azurerm_management_lock" "test" { func testAccAzureRMManagementLock_publicIPCanNotDeleteBasic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/resource/tests/resource_arm_resource_group_test.go b/azurerm/internal/services/resource/tests/resource_arm_resource_group_test.go index f38cba7b70283..ad03a2fcd2569 100644 --- a/azurerm/internal/services/resource/tests/resource_arm_resource_group_test.go +++ b/azurerm/internal/services/resource/tests/resource_arm_resource_group_test.go @@ -186,6 +186,10 @@ func testCheckAzureRMResourceGroupDestroy(s *terraform.State) error { func testAccAzureRMResourceGroup_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -207,6 +211,10 @@ resource "azurerm_resource_group" "import" { func testAccAzureRMResourceGroup_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -221,6 +229,10 @@ resource "azurerm_resource_group" "test" { func testAccAzureRMResourceGroup_withTagsUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" 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 920318fa9161e..eeeb769b6b72e 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 @@ -288,6 +288,10 @@ func testCheckAzureRMTemplateDeploymentDestroy(s *terraform.State) error { func testAccAzureRMTemplateDeployment_basicSingle(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -332,6 +336,10 @@ DEPLOY func testAccAzureRMTemplateDeployment_basicMultiple(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -416,6 +424,10 @@ resource "azurerm_template_deployment" "import" { func testAccAzureRMTemplateDeployment_nestedTemplate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -476,6 +488,10 @@ DEPLOY func testaccAzureRMTemplateDeployment_withParamsBody(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -626,6 +642,10 @@ DEPLOY func testAccAzureRMTemplateDeployment_withParams(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -725,6 +745,10 @@ DEPLOY func testAccAzureRMTemplateDeployment_withOutputs(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -851,6 +875,10 @@ DEPLOY // StorageAccount name is too long, forces error func testAccAzureRMTemplateDeployment_withError(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/search/tests/resource_arm_search_service_test.go b/azurerm/internal/services/search/tests/resource_arm_search_service_test.go index 656608e860da8..3a75184a64d37 100644 --- a/azurerm/internal/services/search/tests/resource_arm_search_service_test.go +++ b/azurerm/internal/services/search/tests/resource_arm_search_service_test.go @@ -168,6 +168,10 @@ func testCheckAzureRMSearchServiceDestroy(s *terraform.State) error { func testAccAzureRMSearchService_withCustomTagValue(data acceptance.TestData, tagValue string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -209,6 +213,10 @@ resource "azurerm_search_service" "import" { func testAccAzureRMSearchService_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/securitycenter/tests/resource_arm_advanced_threat_protection_test.go b/azurerm/internal/services/securitycenter/tests/resource_arm_advanced_threat_protection_test.go index 695ff4dad1419..2e14ad428e80a 100644 --- a/azurerm/internal/services/securitycenter/tests/resource_arm_advanced_threat_protection_test.go +++ b/azurerm/internal/services/securitycenter/tests/resource_arm_advanced_threat_protection_test.go @@ -215,6 +215,10 @@ resource "azurerm_advanced_threat_protection" "test" { } return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-ATP-%d" location = "%s" @@ -248,6 +252,10 @@ resource "azurerm_advanced_threat_protection" "test" { } return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-ATP-%d" location = "%s" 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 bf4ec4c4f1bcc..f94ad070d8197 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 @@ -180,6 +180,10 @@ func testCheckAzureRMServiceBusNamespaceAuthorizationRuleExists(resourceName str func testAccAzureRMServiceBusNamespaceAuthorizationRule_base(data acceptance.TestData, listen, send, manage bool) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" 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 4afafc2850b78..f051e1e6f2d4f 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 @@ -227,6 +227,10 @@ func testCheckAzureRMServiceBusNamespaceExists(resourceName string) resource.Tes func testAccAzureRMServiceBusNamespace_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -256,6 +260,10 @@ resource "azurerm_servicebus_namespace" "import" { func testAccAzureRMServiceBusNamespaceNonStandardCasing(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -272,6 +280,10 @@ resource "azurerm_servicebus_namespace" "test" { func testAccAzureRMServiceBusNamespace_premium(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -289,6 +301,10 @@ resource "azurerm_servicebus_namespace" "test" { func testAccAzureRMServiceBusNamespace_basicCapacity(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -306,6 +322,10 @@ resource "azurerm_servicebus_namespace" "test" { func testAccAzureRMServiceBusNamespace_premiumCapacity(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -323,6 +343,10 @@ resource "azurerm_servicebus_namespace" "test" { func testAccAzureRMServiceBusNamespace_zoneRedundant(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" 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 ac177882c5b2c..de508d7436ac6 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 @@ -182,6 +182,10 @@ func testCheckAzureRMServiceBusQueueAuthorizationRuleExists(resourceName string) func testAccAzureRMServiceBusQueueAuthorizationRule_base(data acceptance.TestData, listen, send, manage bool) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" 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 9e3d894724342..9eb9e11f10d16 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 @@ -340,6 +340,10 @@ func testCheckAzureRMServiceBusQueueExists(resourceName string) resource.TestChe func testAccAzureRMServiceBusQueue_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -375,6 +379,10 @@ resource "azurerm_servicebus_queue" "import" { func testAccAzureRMServiceBusQueue_Premium(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -400,6 +408,10 @@ resource "azurerm_servicebus_queue" "test" { func testAccAzureRMServiceBusQueue_update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -424,6 +436,10 @@ resource "azurerm_servicebus_queue" "test" { func testAccAzureRMServiceBusQueue_enablePartitioningStandard(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -448,6 +464,10 @@ resource "azurerm_servicebus_queue" "test" { func testAccAzureRMServiceBusQueue_enableDuplicateDetection(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -471,6 +491,10 @@ resource "azurerm_servicebus_queue" "test" { func testAccAzureRMServiceBusQueue_enableRequiresSession(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -495,6 +519,10 @@ resource "azurerm_servicebus_queue" "test" { func testAccAzureRMServiceBusQueue_enableDeadLetteringOnMessageExpiration(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -519,6 +547,10 @@ resource "azurerm_servicebus_queue" "test" { func testAccAzureRMServiceBusQueue_lockDuration(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -542,6 +574,10 @@ resource "azurerm_servicebus_queue" "test" { func testAccAzureRMServiceBusQueue_lockDurationUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -565,6 +601,10 @@ resource "azurerm_servicebus_queue" "test" { func testAccAzureRMServiceBusQueue_isoTimeSpanAttributes(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -591,6 +631,10 @@ resource "azurerm_servicebus_queue" "test" { func testAccAzureRMServiceBusQueue_maxDeliveryCount(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" 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 8397884d4434c..bf450bd16a622 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 @@ -378,6 +378,10 @@ resource "azurerm_servicebus_subscription_rule" "test" { func testAccAzureRMServiceBusSubscriptionRule_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_topic_authorization_rule_test.go b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_topic_authorization_rule_test.go index 4beb9308ea142..b1b13e6b97686 100644 --- a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_topic_authorization_rule_test.go +++ b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_topic_authorization_rule_test.go @@ -182,6 +182,10 @@ func testCheckAzureRMServiceBusTopicAuthorizationRuleExists(resourceName string) func testAccAzureRMServiceBusTopicAuthorizationRule_base(data acceptance.TestData, listen, send, manage bool) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" 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 dbc06c095ba09..5969f9896f74c 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 @@ -294,6 +294,10 @@ func testCheckAzureRMServiceBusTopicExists(resourceName string) resource.TestChe func testAccAzureRMServiceBusTopic_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -328,6 +332,10 @@ resource "azurerm_servicebus_topic" "import" { func testAccAzureRMServiceBusTopic_basicDisabled(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -351,6 +359,10 @@ resource "azurerm_servicebus_topic" "test" { func testAccAzureRMServiceBusTopic_update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -375,6 +387,10 @@ resource "azurerm_servicebus_topic" "test" { func testAccAzureRMServiceBusTopic_basicPremium(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -399,6 +415,10 @@ resource "azurerm_servicebus_topic" "test" { func testAccAzureRMServiceBusTopic_enablePartitioningStandard(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -423,6 +443,10 @@ resource "azurerm_servicebus_topic" "test" { func testAccAzureRMServiceBusTopic_enablePartitioningPremium(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -448,6 +472,10 @@ resource "azurerm_servicebus_topic" "test" { func testAccAzureRMServiceBusTopic_enableDuplicateDetection(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -471,6 +499,10 @@ resource "azurerm_servicebus_topic" "test" { func testAccAzureRMServiceBusTopic_isoTimeSpanAttributes(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" 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 bc7248ed9d99d..59ca7142bd99a 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 @@ -780,6 +780,10 @@ func testCheckAzureRMServiceFabricClusterExists(resourceName string) resource.Te func testAccAzureRMServiceFabricCluster_basic(data acceptance.TestData, count int) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -807,6 +811,10 @@ resource "azurerm_service_fabric_cluster" "test" { func testAccAzureRMServiceFabricCluster_basicNodeTypeUpdate(data acceptance.TestData, count int, secondary_count int) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -866,6 +874,10 @@ resource "azurerm_service_fabric_cluster" "import" { func testAccAzureRMServiceFabricCluster_manualClusterCodeVersion(data acceptance.TestData, clusterCodeVersion string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -894,6 +906,10 @@ resource "azurerm_service_fabric_cluster" "test" { func testAccAzureRMServiceFabricCluster_addOnFeatures(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -922,6 +938,10 @@ resource "azurerm_service_fabric_cluster" "test" { func testAccAzureRMServiceFabricCluster_certificates(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -962,6 +982,10 @@ resource "azurerm_service_fabric_cluster" "test" { func testAccAzureRMServiceFabricCluster_reverseProxyCertificates(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1008,6 +1032,10 @@ resource "azurerm_service_fabric_cluster" "test" { func testAccAzureRMServiceFabricCluster_clientCertificateThumbprint(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1053,6 +1081,10 @@ resource "azurerm_service_fabric_cluster" "test" { func testAccAzureRMServiceFabricCluster_readerAdminClientCertificateThumbprint(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1103,6 +1135,10 @@ resource "azurerm_service_fabric_cluster" "test" { func testAccAzureRMServiceFabricCluster_certificateCommonNames(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1146,6 +1182,10 @@ resource "azurerm_service_fabric_cluster" "test" { func testAccAzureRMServiceFabricCluster_azureActiveDirectory(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1251,6 +1291,10 @@ resource "azurerm_service_fabric_cluster" "test" { func testAccAzureRMServiceFabricCluster_azureActiveDirectoryDelete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1294,6 +1338,10 @@ resource "azurerm_service_fabric_cluster" "test" { func testAccAzureRMServiceFabricCluster_diagnosticsConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1337,6 +1385,10 @@ resource "azurerm_service_fabric_cluster" "test" { func testAccAzureRMServiceFabricCluster_diagnosticsConfigDelete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1372,6 +1424,10 @@ resource "azurerm_service_fabric_cluster" "test" { func testAccAzureRMServiceFabricCluster_fabricSettings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1407,6 +1463,10 @@ resource "azurerm_service_fabric_cluster" "test" { func testAccAzureRMServiceFabricCluster_nodeTypeCustomPorts(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1444,6 +1504,10 @@ resource "azurerm_service_fabric_cluster" "test" { func testAccAzureRMServiceFabricCluster_nodeTypeMultiple(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1479,6 +1543,10 @@ resource "azurerm_service_fabric_cluster" "test" { func testAccAzureRMServiceFabricCluster_nodeTypeProperties(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1520,6 +1588,10 @@ resource "azurerm_service_fabric_cluster" "test" { func testAccAzureRMServiceFabricCluster_tags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/signalr/tests/resource_arm_signalr_service_test.go b/azurerm/internal/services/signalr/tests/resource_arm_signalr_service_test.go index 1f75c1ee0e89d..f1d9da80dd4d7 100644 --- a/azurerm/internal/services/signalr/tests/resource_arm_signalr_service_test.go +++ b/azurerm/internal/services/signalr/tests/resource_arm_signalr_service_test.go @@ -374,6 +374,10 @@ func TestAccAzureRMSignalRService_cors(t *testing.T) { func testAccAzureRMSignalRService_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -411,6 +415,10 @@ resource "azurerm_signalr_service" "import" { func testAccAzureRMSignalRService_standardWithCapacity(data acceptance.TestData, capacity int) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -431,6 +439,10 @@ resource "azurerm_signalr_service" "test" { func testAccAzureRMSignalRService_withCors(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -458,6 +470,10 @@ resource "azurerm_signalr_service" "test" { func testAccAzureRMSignalRService_withServiceMode(data acceptance.TestData, serviceMode string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" 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 afd3bf497c5c1..5c16ff1db5065 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 @@ -420,6 +420,10 @@ func TestAccAzureRMSqlDatabase_bacpac(t *testing.T) { func testAccAzureRMSqlDatabase_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -466,6 +470,10 @@ resource "azurerm_sql_database" "import" { func testAccAzureRMSqlDatabase_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -500,6 +508,10 @@ resource "azurerm_sql_database" "test" { func testAccAzureRMSqlDatabase_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -533,6 +545,10 @@ resource "azurerm_sql_database" "test" { func testAccAzureRMSqlDatabase_dataWarehouse(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctest_rg_%d" location = "%s" @@ -561,6 +577,10 @@ resource "azurerm_sql_database" "test" { func testAccAzureRMSqlDatabase_restorePointInTime(data acceptance.TestData, formattedTime string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -600,6 +620,10 @@ resource "azurerm_sql_database" "test_restore" { func testAccAzureRMSqlDatabase_elasticPool(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -640,6 +664,10 @@ resource "azurerm_sql_database" "test" { func testAccAzureRMSqlDatabase_collationUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -669,6 +697,10 @@ resource "azurerm_sql_database" "test" { func testAccAzureRMSqlDatabase_bacpac(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG_%d" location = "%s" @@ -738,6 +770,10 @@ resource "azurerm_sql_database" "test" { func testAccAzureRMSqlDatabase_requestedServiceObjectiveName(data acceptance.TestData, requestedServiceObjectiveName string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -767,6 +803,10 @@ resource "azurerm_sql_database" "test" { func testAccAzureRMSqlDatabase_threatDetectionPolicy(data acceptance.TestData, state string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -813,6 +853,10 @@ resource "azurerm_sql_database" "test" { func testAccAzureRMSqlDatabase_readScale(data acceptance.TestData, readScale bool) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "readscaletestRG-%d" location = "%s" @@ -842,6 +886,10 @@ resource "azurerm_sql_database" "test" { func testAccAzureRMSqlDatabase_zoneRedundant(data acceptance.TestData, zoneRedundant bool) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" 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 67884f021d724..1c754e9a334a3 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 @@ -180,6 +180,10 @@ func testCheckAzureRMSqlElasticPoolDisappears(resourceName string) resource.Test func testAccAzureRMSqlElasticPool_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctest-%[1]d" location = "%s" @@ -224,6 +228,10 @@ resource "azurerm_sql_elasticpool" "import" { func testAccAzureRMSqlElasticPool_resizedDtu(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctest-%[1]d" location = "%s" diff --git a/azurerm/internal/services/sql/tests/resource_arm_sql_failover_group_test.go b/azurerm/internal/services/sql/tests/resource_arm_sql_failover_group_test.go index 7937a0194f2b8..3a2dfe1a1f9b1 100644 --- a/azurerm/internal/services/sql/tests/resource_arm_sql_failover_group_test.go +++ b/azurerm/internal/services/sql/tests/resource_arm_sql_failover_group_test.go @@ -184,6 +184,10 @@ func testCheckAzureRMSqlFailoverGroupDestroy(s *terraform.State) error { func testAccAzureRMSqlFailoverGroup_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -260,6 +264,10 @@ resource "azurerm_sql_failover_group" "import" { func testAccAzureRMSqlFailoverGroup_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -317,6 +325,10 @@ resource "azurerm_sql_failover_group" "test" { func testAccAzureRMSqlFailoverGroup_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" 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 ff87a17a34b6d..afeb59ede74f4 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 @@ -170,6 +170,10 @@ func testCheckAzureRMSqlFirewallRuleDisappears(resourceName string) resource.Tes func testAccAzureRMSqlFirewallRule_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -210,6 +214,10 @@ resource "azurerm_sql_firewall_rule" "import" { func testAccAzureRMSqlFirewallRule_withUpdates(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" 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 f8e9d40a120c4..0ab1cfd03ae52 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 @@ -253,6 +253,10 @@ func testCheckAzureRMSqlServerDisappears(resourceName string) resource.TestCheck func testAccAzureRMSqlServer_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -286,6 +290,10 @@ resource "azurerm_sql_server" "import" { func testAccAzureRMSqlServer_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -309,6 +317,10 @@ resource "azurerm_sql_server" "test" { func testAccAzureRMSqlServer_withTagsUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -331,6 +343,10 @@ resource "azurerm_sql_server" "test" { func testAccAzureRMSqlServer_withIdentity(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" 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 4d4c2490c862e..853001a4d634a 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 @@ -440,6 +440,10 @@ func testCheckAzureRMSqlVirtualNetworkRuleDisappears(resourceName string) resour */ func testAccAzureRMSqlVirtualNetworkRule_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -499,6 +503,10 @@ resource "azurerm_sql_virtual_network_rule" "import" { */ func testAccAzureRMSqlVirtualNetworkRule_withUpdates(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -545,6 +553,10 @@ resource "azurerm_sql_virtual_network_rule" "test" { */ func testAccAzureRMSqlVirtualNetworkRule_subnetSwitchPre(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -599,6 +611,10 @@ resource "azurerm_sql_virtual_network_rule" "test" { */ func testAccAzureRMSqlVirtualNetworkRule_subnetSwitchPost(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -653,6 +669,10 @@ resource "azurerm_sql_virtual_network_rule" "test" { */ func testAccAzureRMSqlVirtualNetworkRule_ignoreEndpointValid(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -700,6 +720,10 @@ resource "azurerm_sql_virtual_network_rule" "test" { */ func testAccAzureRMSqlVirtualNetworkRule_ignoreEndpointInvalid(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -746,6 +770,10 @@ resource "azurerm_sql_virtual_network_rule" "test" { */ func testAccAzureRMSqlVirtualNetworkRule_multipleSubnets(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/storage/tests/data_source_storage_account_sas_test.go b/azurerm/internal/services/storage/tests/data_source_storage_account_sas_test.go index 34fc8c2876cae..7791bf2906f4b 100644 --- a/azurerm/internal/services/storage/tests/data_source_storage_account_sas_test.go +++ b/azurerm/internal/services/storage/tests/data_source_storage_account_sas_test.go @@ -36,6 +36,10 @@ func TestAccDataSourceArmStorageAccountSas_basic(t *testing.T) { func testAccDataSourceAzureRMStorageAccountSas_basic(data acceptance.TestData, startDate string, endDate string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" diff --git a/azurerm/internal/services/storage/tests/data_source_storage_account_test.go b/azurerm/internal/services/storage/tests/data_source_storage_account_test.go index c8dd289ec5e47..3809b0c75f559 100644 --- a/azurerm/internal/services/storage/tests/data_source_storage_account_test.go +++ b/azurerm/internal/services/storage/tests/data_source_storage_account_test.go @@ -62,6 +62,10 @@ func TestAccDataSourceAzureRMStorageAccount_withWriteLock(t *testing.T) { func testAccDataSourceAzureRMStorageAccount_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" diff --git a/azurerm/internal/services/storage/tests/data_source_storage_container_test.go b/azurerm/internal/services/storage/tests/data_source_storage_container_test.go index 2797f681fb284..4c278bb2bc6c9 100644 --- a/azurerm/internal/services/storage/tests/data_source_storage_container_test.go +++ b/azurerm/internal/services/storage/tests/data_source_storage_container_test.go @@ -31,6 +31,10 @@ func TestAccDataSourceArmStorageContainer_basic(t *testing.T) { func testAccDataSourceAzureRMStorageContainer_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "containerdstest-%s" location = "%s" diff --git a/azurerm/internal/services/storage/tests/data_source_storage_management_policy_test.go b/azurerm/internal/services/storage/tests/data_source_storage_management_policy_test.go index 18b32469dca18..4b2d756c933e0 100644 --- a/azurerm/internal/services/storage/tests/data_source_storage_management_policy_test.go +++ b/azurerm/internal/services/storage/tests/data_source_storage_management_policy_test.go @@ -41,6 +41,10 @@ func TestAccDataSourceAzureRMStorageManagementPolicy_basic(t *testing.T) { func testAccDataSourceAzureRMStorageManagementPolicy_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_network_rules_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_network_rules_test.go index f3633421a22ef..887c5740dadc7 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_account_network_rules_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_account_network_rules_test.go @@ -81,6 +81,10 @@ func TestAccAzureRMStorageAccountNetworkRules_empty(t *testing.T) { func testAccAzureRMStorageAccountNetworkRules_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -126,6 +130,10 @@ resource "azurerm_storage_account_network_rules" "test" { func testAccAzureRMStorageAccountNetworkRules_update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -180,6 +188,10 @@ resource "azurerm_storage_account_network_rules" "test" { func testAccAzureRMStorageAccountNetworkRules_empty(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go index 87f6bf32dc80a..35987cf4d6a4f 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go @@ -651,6 +651,10 @@ func testCheckAzureRMStorageAccountDestroy(s *terraform.State) error { func testAccAzureRMStorageAccount_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -701,6 +705,10 @@ resource "azurerm_management_lock" "test" { func testAccAzureRMStorageAccount_premium(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -723,6 +731,10 @@ resource "azurerm_storage_account" "test" { func testAccAzureRMStorageAccount_update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -745,6 +757,10 @@ resource "azurerm_storage_account" "test" { func testAccAzureRMStorageAccount_enableHttpsTrafficOnly(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -768,6 +784,10 @@ resource "azurerm_storage_account" "test" { func testAccAzureRMStorageAccount_enableHttpsTrafficOnlyDisabled(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -791,6 +811,10 @@ resource "azurerm_storage_account" "test" { func testAccAzureRMStorageAccount_isHnsEnabledTrue(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -811,6 +835,10 @@ resource "azurerm_storage_account" "test" { func testAccAzureRMStorageAccount_isHnsEnabledFalse(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -831,6 +859,10 @@ resource "azurerm_storage_account" "test" { func testAccAzureRMStorageAccount_blobStorage(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -854,6 +886,10 @@ resource "azurerm_storage_account" "test" { func testAccAzureRMStorageAccount_blobStorageUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -878,6 +914,10 @@ resource "azurerm_storage_account" "test" { func testAccAzureRMStorageAccount_blockBlobStorage(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -901,6 +941,10 @@ resource "azurerm_storage_account" "test" { func testAccAzureRMStorageAccount_fileStorage(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -925,6 +969,10 @@ resource "azurerm_storage_account" "test" { func testAccAzureRMStorageAccount_fileStorageUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -949,6 +997,10 @@ resource "azurerm_storage_account" "test" { func testAccAzureRMStorageAccount_storageV2(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -972,6 +1024,10 @@ resource "azurerm_storage_account" "test" { func testAccAzureRMStorageAccount_storageV2Update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -996,6 +1052,10 @@ resource "azurerm_storage_account" "test" { func testAccAzureRMStorageAccount_nonStandardCasing(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -1017,6 +1077,10 @@ resource "azurerm_storage_account" "test" { func testAccAzureRMStorageAccount_identity(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -1043,6 +1107,10 @@ resource "azurerm_storage_account" "test" { func testAccAzureRMStorageAccount_networkRules(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -1085,6 +1153,10 @@ resource "azurerm_storage_account" "test" { func testAccAzureRMStorageAccount_networkRulesUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -1127,6 +1199,10 @@ resource "azurerm_storage_account" "test" { func testAccAzureRMStorageAccount_networkRulesReverted(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -1169,6 +1245,10 @@ resource "azurerm_storage_account" "test" { func testAccAzureRMStorageAccount_blobProperties(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestAzureRMSA-%d" location = "%s" @@ -1201,6 +1281,10 @@ resource "azurerm_storage_account" "test" { func testAccAzureRMStorageAccount_blobPropertiesUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestAzureRMSA-%d" location = "%s" @@ -1240,6 +1324,10 @@ resource "azurerm_storage_account" "test" { func testAccAzureRMStorageAccount_queueProperties(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -1288,6 +1376,10 @@ resource "azurerm_storage_account" "test" { func testAccAzureRMStorageAccount_queuePropertiesUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -1344,6 +1436,10 @@ resource "azurerm_storage_account" "test" { func testAccAzureRMStorageAccount_staticWebsiteProperties(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -1368,6 +1464,10 @@ resource "azurerm_storage_account" "test" { func testAccAzureRMStorageAccount_staticWebsitePropertiesUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go index e70479654e096..c9587ceb60505 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go @@ -1172,6 +1172,10 @@ resource "azurerm_storage_blob" "test" { func testAccAzureRMStorageBlob_template(data acceptance.TestData, accessLevel string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1195,6 +1199,10 @@ resource "azurerm_storage_container" "test" { func testAccAzureRMStorageBlob_templateBlockBlobStorage(data acceptance.TestData, accessLevel string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1219,6 +1227,10 @@ resource "azurerm_storage_container" "test" { func testAccAzureRMStorageBlob_templatePremium(data acceptance.TestData, accessLevel string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_container_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_container_test.go index 906185d6be33a..7fb446d66e911 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_container_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_container_test.go @@ -431,6 +431,10 @@ resource "azurerm_storage_container" "test" { func testAccAzureRMStorageContainer_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_data_lake_gen2_filesystem_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_data_lake_gen2_filesystem_test.go index 6831335561685..71b3f75152c3b 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_data_lake_gen2_filesystem_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_data_lake_gen2_filesystem_test.go @@ -178,6 +178,10 @@ resource "azurerm_storage_data_lake_gen2_filesystem" "test" { func testAccAzureRMStorageDataLakeGen2FileSystem_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_management_policy_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_management_policy_test.go index 65b4cfda92854..072e7cd597bfb 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_management_policy_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_management_policy_test.go @@ -258,6 +258,10 @@ func testCheckAzureRMStorageAccountManagementPolicyExistsInternal(storageAccount func testAccAzureRMStorageManagementPolicy_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -300,6 +304,10 @@ resource "azurerm_storage_management_policy" "test" { func testAccAzureRMStorageManagementPolicy_multipleRule(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" @@ -360,6 +368,10 @@ resource "azurerm_storage_management_policy" "test" { func testAccAzureRMStorageManagementPolicy_multipleRuleUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_queue_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_queue_test.go index 6a2b1b1a5e83d..2a2b60d59ecf0 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_queue_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_queue_test.go @@ -287,6 +287,10 @@ resource "azurerm_storage_queue" "test" { func testAccAzureRMStorageQueue_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" 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 8efaaca4cbab6..6792afb73b814 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 @@ -315,6 +315,10 @@ resource "azurerm_storage_share_directory" "child" { func testAccAzureRMStorageShareDirectory_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" 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 8814d8651c3c9..ac83398c00b49 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 @@ -383,6 +383,10 @@ resource "azurerm_storage_share" "test" { func testAccAzureRMStorageShare_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_table_entity_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_table_entity_test.go index d2442c13da238..7916e19d2bfb8 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_table_entity_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_table_entity_test.go @@ -234,6 +234,10 @@ resource "azurerm_storage_table_entity" "test" { func testAccAzureRMTableEntity_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_table_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_table_test.go index 7ba07bb0977e8..85b7676121f1a 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_table_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_table_test.go @@ -258,6 +258,10 @@ func TestValidateArmStorageTableName(t *testing.T) { func testAccAzureRMStorageTable_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -296,6 +300,10 @@ resource "azurerm_storage_table" "import" { func testAccAzureRMStorageTable_acl(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -331,6 +339,10 @@ resource "azurerm_storage_table" "test" { func testAccAzureRMStorageTable_aclUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_function_javascript_udf_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_function_javascript_udf_test.go index 2f47dba13873c..bdb18a41bcced 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_function_javascript_udf_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_function_javascript_udf_test.go @@ -211,6 +211,10 @@ SCRIPT func testAccAzureRMStreamAnalyticsFunctionJavaScriptUDF_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_job_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_job_test.go index 1525f2ee690be..12b1d652a4752 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_job_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_job_test.go @@ -155,6 +155,10 @@ func testCheckAzureRMStreamAnalyticsJobDestroy(s *terraform.State) error { func testAccAzureRMStreamAnalyticsJob_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -182,6 +186,10 @@ QUERY func testAccAzureRMStreamAnalyticsJob_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -237,6 +245,10 @@ resource "azurerm_stream_analytics_job" "import" { func testAccAzureRMStreamAnalyticsJob_updated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_blob_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_blob_test.go index 35e48066b4770..4c3cf2823256e 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_blob_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_blob_test.go @@ -310,6 +310,10 @@ resource "azurerm_stream_analytics_output_blob" "import" { func testAccAzureRMStreamAnalyticsOutputBlob_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_eventhub_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_eventhub_test.go index 08b376c2746fc..53a99b821caed 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_eventhub_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_eventhub_test.go @@ -344,6 +344,10 @@ resource "azurerm_stream_analytics_output_eventhub" "import" { func testAccAzureRMStreamAnalyticsOutputEventHub_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_mssql_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_mssql_test.go index e0546fd9dffd6..d6aa4cb9fcb91 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_mssql_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_mssql_test.go @@ -194,6 +194,10 @@ resource "azurerm_stream_analytics_output_mssql" "import" { func testAccAzureRMStreamAnalyticsOutputSql_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_servicebus_queue_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_servicebus_queue_test.go index 45183e27701e3..8715f344304ab 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_servicebus_queue_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_servicebus_queue_test.go @@ -301,6 +301,10 @@ resource "azurerm_stream_analytics_output_servicebus_queue" "import" { func testAccAzureRMStreamAnalyticsOutputServiceBusQueue_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_servicebus_topic_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_servicebus_topic_test.go index 7045963a2a22f..0f777bb977f2c 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_servicebus_topic_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_servicebus_topic_test.go @@ -301,6 +301,10 @@ resource "azurerm_stream_analytics_output_servicebus_topic" "import" { func testAccAzureRMStreamAnalyticsOutputServiceBusTopic_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_reference_input_blob_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_reference_input_blob_test.go index 052e0453fd2fc..2293d5309e246 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_reference_input_blob_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_reference_input_blob_test.go @@ -309,6 +309,10 @@ resource "azurerm_stream_analytics_reference_input_blob" "import" { func testAccAzureRMStreamAnalyticsReferenceInputBlob_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_blob_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_blob_test.go index 946f9e9b0b9ba..b42ad7e367a34 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_blob_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_blob_test.go @@ -310,6 +310,10 @@ resource "azurerm_stream_analytics_stream_input_blob" "import" { func testAccAzureRMStreamAnalyticsStreamInputBlob_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_eventhub_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_eventhub_test.go index cc0283f72c86c..2a4333b87fa32 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_eventhub_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_eventhub_test.go @@ -313,6 +313,10 @@ resource "azurerm_stream_analytics_stream_input_eventhub" "import" { func testAccAzureRMStreamAnalyticsStreamInputEventHub_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_iothub_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_iothub_test.go index 59ff272a3cd9d..0b9c4298c480d 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_iothub_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_iothub_test.go @@ -297,6 +297,10 @@ resource "azurerm_stream_analytics_stream_input_eventhub" "import" { func testAccAzureRMStreamAnalyticsStreamInputIoTHub_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" 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 357e0fba968e4..59f5d813b46a8 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 @@ -418,6 +418,10 @@ func testCheckAzureRMTrafficManagerEndpointDestroy(s *terraform.State) error { func testAccAzureRMTrafficManagerEndpoint_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-traffic-%d" location = "%s" @@ -486,6 +490,10 @@ resource "azurerm_traffic_manager_endpoint" "import" { func testAccAzureRMTrafficManagerEndpoint_basicDisableExternal(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-traffic-%d" location = "%s" @@ -539,6 +547,10 @@ resource "azurerm_traffic_manager_endpoint" "testExternal" { func testAccAzureRMTrafficManagerEndpoint_weight(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-traffic-%d" location = "%s" @@ -583,6 +595,10 @@ resource "azurerm_traffic_manager_endpoint" "testExternalNew" { func testAccAzureRMTrafficManagerEndpoint_updateWeight(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-traffic-%d" location = "%s" @@ -626,6 +642,10 @@ resource "azurerm_traffic_manager_endpoint" "testExternalNew" { } func testAccAzureRMTrafficManagerEndpoint_priority(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-traffic-%d" location = "%s" @@ -670,6 +690,10 @@ resource "azurerm_traffic_manager_endpoint" "testExternalNew" { func testAccAzureRMTrafficManagerEndpoint_updatePriority(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-traffic-%d" location = "%s" @@ -714,6 +738,10 @@ resource "azurerm_traffic_manager_endpoint" "testExternalNew" { func testAccAzureRMTrafficManagerEndpoint_subnets(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-traffic-%d" location = "%s" @@ -768,6 +796,10 @@ resource "azurerm_traffic_manager_endpoint" "testExternalNew" { func testAccAzureRMTrafficManagerEndpoint_updateSubnets(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-traffic-%d" location = "%s" @@ -814,6 +846,10 @@ resource "azurerm_traffic_manager_endpoint" "testExternalNew" { func testAccAzureRMTrafficManagerEndpoint_headers(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-traffic-%d" location = "%s" @@ -862,6 +898,10 @@ resource "azurerm_traffic_manager_endpoint" "testExternalNew" { func testAccAzureRMTrafficManagerEndpoint_updateHeaders(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-traffic-%d" location = "%s" @@ -910,6 +950,10 @@ resource "azurerm_traffic_manager_endpoint" "testExternalNew" { func testAccAzureRMTrafficManagerEndpoint_nestedEndpoints(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-traffic-%d" location = "%s" @@ -972,6 +1016,10 @@ resource "azurerm_traffic_manager_endpoint" "externalChild" { func testAccAzureRMTrafficManagerEndpoint_location(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-traffic-%d" location = "%s" @@ -1007,6 +1055,10 @@ resource "azurerm_traffic_manager_endpoint" "test" { func testAccAzureRMTrafficManagerEndpoint_locationUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-traffic-%d" location = "%s" @@ -1042,6 +1094,10 @@ resource "azurerm_traffic_manager_endpoint" "test" { func testAccAzureRMTrafficManagerEndpoint_geoMappings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-traffic-%d" location = "%s" @@ -1081,6 +1137,10 @@ resource "azurerm_traffic_manager_endpoint" "test" { func testAccAzureRMTrafficManagerEndpoint_geoMappingsUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-traffic-%d" location = "%s" diff --git a/azurerm/internal/services/trafficmanager/tests/resource_arm_traffic_manager_profile_test.go b/azurerm/internal/services/trafficmanager/tests/resource_arm_traffic_manager_profile_test.go index d65b0f9ece723..4df235b6aee04 100644 --- a/azurerm/internal/services/trafficmanager/tests/resource_arm_traffic_manager_profile_test.go +++ b/azurerm/internal/services/trafficmanager/tests/resource_arm_traffic_manager_profile_test.go @@ -236,6 +236,10 @@ func testCheckAzureRMTrafficManagerProfileDestroy(s *terraform.State) error { func testAccAzureRMTrafficManagerProfile_basic(data acceptance.TestData, method string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-traffic-%[1]d" location = "%[2]s" @@ -286,6 +290,10 @@ resource "azurerm_traffic_manager_profile" "import" { func testAccAzureRMTrafficManagerProfile_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-traffic-%d" location = "%s" @@ -325,6 +333,10 @@ resource "azurerm_traffic_manager_profile" "test" { func testAccAzureRMTrafficManagerProfile_completeUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-traffic-%d" location = "%s" @@ -363,6 +375,10 @@ resource "azurerm_traffic_manager_profile" "test" { func testAccAzureRMTrafficManagerProfile_failoverError(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-traffic-%d" location = "%s" 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 e70014f111228..dc730a342110b 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 @@ -242,6 +242,10 @@ resource "azurerm_app_service_plan" "test" { func testAccAzureRMAppServiceEnvironment_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" 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 cd00858a16709..4929524792df4 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 @@ -101,6 +101,10 @@ func TestAccDataSourceAzureRMAppServicePlan_basicWindowsContainer(t *testing.T) func testAccDataSourceAppServicePlan_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -126,6 +130,10 @@ data "azurerm_app_service_plan" "test" { func testAccDataSourceAppServicePlan_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -158,6 +166,10 @@ data "azurerm_app_service_plan" "test" { func testAccDataSourceAppServicePlan_premiumSKU(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -191,6 +203,10 @@ data "azurerm_app_service_plan" "test" { func testAccDataSourceAppServicePlan_basicWindowsContainer(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/web/tests/resource_arm_app_service_active_slot_test.go b/azurerm/internal/services/web/tests/resource_arm_app_service_active_slot_test.go index 620ddb811286c..9462d6264fa95 100644 --- a/azurerm/internal/services/web/tests/resource_arm_app_service_active_slot_test.go +++ b/azurerm/internal/services/web/tests/resource_arm_app_service_active_slot_test.go @@ -54,6 +54,10 @@ func TestAccAzureRMAppServiceActiveSlot_update(t *testing.T) { func testAccAzureRMAppServiceActiveSlot_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -95,6 +99,10 @@ resource "azurerm_app_service_active_slot" "test" { func testAccAzureRMAppServiceActiveSlot_update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -144,6 +152,10 @@ resource "azurerm_app_service_active_slot" "test" { func testAccAzureRMAppServiceActiveSlot_updated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" 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 b28ca5754d0f3..ecd4ead2639c4 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 @@ -231,6 +231,10 @@ func testCheckAzureRMAppServiceCertificateOrderExists(resourceName string) resou func testAccAzureRMAppServiceCertificateOrder_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -248,6 +252,10 @@ resource "azurerm_app_service_certificate_order" "test" { func testAccAzureRMAppServiceCertificateOrder_wildcard(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -280,6 +288,10 @@ resource "azurerm_app_service_certificate_order" "import" { func testAccAzureRMAppServiceCertificateOrder_complete(data acceptance.TestData, keySize int) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/web/tests/resource_arm_app_service_certificate_test.go b/azurerm/internal/services/web/tests/resource_arm_app_service_certificate_test.go index e57c0907c6aef..8b631db21f069 100644 --- a/azurerm/internal/services/web/tests/resource_arm_app_service_certificate_test.go +++ b/azurerm/internal/services/web/tests/resource_arm_app_service_certificate_test.go @@ -71,6 +71,10 @@ func TestAccAzureRMAppServiceCertificate_KeyVault(t *testing.T) { func testAccAzureRMAppServiceCertificatePfx(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestwebcert%d" location = "%s" @@ -88,6 +92,10 @@ resource "azurerm_app_service_certificate" "test" { func testAccAzureRMAppServiceCertificatePfxNoPassword(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestwebcert%d" location = "%s" 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 e2c6b6ec6c0a2..dc82b27013525 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 @@ -196,6 +196,10 @@ func testCheckAzureRMAppServiceCustomHostnameBindingExists(resourceName string) func testAccAzureRMAppServiceCustomHostnameBinding_basicConfig(data acceptance.TestData, appServiceName string, domain string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -255,6 +259,10 @@ resource "azurerm_app_service_custom_hostname_binding" "test2" { func testAccAzureRMAppServiceCustomHostnameBinding_sslConfig(data acceptance.TestData, appServiceName, domain string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" 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 e41c6e501d15b..03f43e3f67488 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 @@ -306,6 +306,10 @@ func testCheckAzureRMAppServicePlanExists(resourceName string) resource.TestChec func testAccAzureRMAppServicePlan_basicWindows(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -326,6 +330,10 @@ resource "azurerm_app_service_plan" "test" { func testAccAzureRMAppServicePlan_basicLinux(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -370,6 +378,10 @@ resource "azurerm_app_service_plan" "import" { func testAccAzureRMAppServicePlan_basicLinuxNew(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -393,6 +405,10 @@ resource "azurerm_app_service_plan" "test" { func testAccAzureRMAppServicePlan_standardWindows(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -413,6 +429,10 @@ resource "azurerm_app_service_plan" "test" { func testAccAzureRMAppServicePlan_premiumWindows(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -433,6 +453,10 @@ resource "azurerm_app_service_plan" "test" { func testAccAzureRMAppServicePlan_premiumWindowsUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -454,6 +478,10 @@ resource "azurerm_app_service_plan" "test" { func testAccAzureRMAppServicePlan_completeWindows(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -482,6 +510,10 @@ resource "azurerm_app_service_plan" "test" { func testAccAzureRMAppServicePlan_completeWindowsNew(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -510,6 +542,10 @@ resource "azurerm_app_service_plan" "test" { func testAccAzureRMAppServicePlan_consumptionPlan(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -531,6 +567,10 @@ resource "azurerm_app_service_plan" "test" { func testAccAzureRMAppServicePlan_premiumConsumptionPlan(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -554,6 +594,10 @@ resource "azurerm_app_service_plan" "test" { func testAccAzureRMAppServicePlan_basicWindowsContainer(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" 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 a40790d10da84..cf02ada394e90 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 @@ -1397,6 +1397,10 @@ func testCheckAzureRMAppServiceSlotExists(slot string) resource.TestCheckFunc { func testAccAzureRMAppServiceSlot_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1447,6 +1451,10 @@ resource "azurerm_app_service_slot" "import" { func testAccAzureRMAppServiceSlot_32Bit(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1486,6 +1494,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_alwaysOn(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1525,6 +1537,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_appCommandLine(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1564,6 +1580,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_appSettings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1603,6 +1623,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_clientAffinityEnabled(data acceptance.TestData, clientAffinityEnabled bool) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1639,6 +1663,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_connectionStrings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1686,6 +1714,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_connectionStringsUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1733,6 +1765,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_corsSettings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1779,6 +1815,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_authSettingsAdditionalLoginParams(data acceptance.TestData, tenantID string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1838,6 +1878,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_authSettingsAdditionalAllowedExternalRedirectUrls(data acceptance.TestData, tenantID string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1897,6 +1941,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_authSettingsRuntimeVersion(data acceptance.TestData, tenantID string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1953,6 +2001,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_authSettingsTokenRefreshExtensionHours(data acceptance.TestData, tenantID string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2009,6 +2061,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_authSettingsTokenStoreEnabled(data acceptance.TestData, tenantID string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2065,6 +2121,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_authSettingsUnauthenticatedClientAction(data acceptance.TestData, tenantID string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2121,6 +2181,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_aadAuthSettings(data acceptance.TestData, tenantID string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2175,6 +2239,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_facebookAuthSettings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2228,6 +2296,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_googleAuthSettings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2281,6 +2353,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_microsoftAuthSettings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2334,6 +2410,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_twitterAuthSettings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2383,6 +2463,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_aadMicrosoftAuthSettings(data acceptance.TestData, tenantID string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2448,6 +2532,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_defaultDocuments(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2491,6 +2579,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_enabled(data acceptance.TestData, enabled bool) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2527,6 +2619,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_httpsOnly(data acceptance.TestData, httpsOnly bool) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2563,6 +2659,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_http2Enabled(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2602,6 +2702,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_oneIpRestriction(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2643,6 +2747,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_oneVNetSubnetIpRestriction(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2698,6 +2806,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_zeroedIpRestriction(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2737,6 +2849,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_manyIpRestrictions(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2790,6 +2906,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_localMySql(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2829,6 +2949,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_managedPipelineMode(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2868,6 +2992,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_tags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2907,6 +3035,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_tagsUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2947,6 +3079,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_remoteDebugging(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2991,6 +3127,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_windowsDotNet(data acceptance.TestData, version string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3030,6 +3170,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_windowsJava(data acceptance.TestData, javaVersion, container, containerVersion string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3071,6 +3215,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_windowsPHP(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3110,6 +3258,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_windowsPython(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3149,6 +3301,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_webSockets(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3188,6 +3344,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_enableManageServiceIdentity(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3227,6 +3387,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_userAssignedIdentity(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3273,6 +3437,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_minTls(data acceptance.TestData, tlsVersion string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3312,6 +3480,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_applicationBlobStorageLogs(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3357,6 +3529,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_httpFileSystemLogs(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3401,6 +3577,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_httpBlobStorageLogs(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3445,6 +3625,10 @@ resource "azurerm_app_service_slot" "test" { func testAccAzureRMAppServiceSlot_autoSwap(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" 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 b577b764fd257..b99b41c215bc8 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 @@ -1662,6 +1662,10 @@ func testCheckAzureRMAppServiceExists(resourceName string) resource.TestCheckFun func testAccAzureRMAppService_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1703,6 +1707,10 @@ resource "azurerm_app_service" "import" { func testAccAzureRMAppService_freeTier(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1734,6 +1742,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_moved(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1772,6 +1784,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_sharedTier(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1803,6 +1819,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_alwaysOn(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1834,6 +1854,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_appCommandLine(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1865,6 +1889,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_httpsOnly(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1893,6 +1921,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_clientCertEnabled(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1921,6 +1953,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_clientCertEnabledNotSet(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1948,6 +1984,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_32Bit(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2049,6 +2089,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_backupTemplate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2115,6 +2159,10 @@ resource "azurerm_app_service_plan" "test" { func testAccAzureRMAppService_http2Enabled(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2146,6 +2194,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_appSettings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2185,6 +2237,10 @@ func testAccAzureRMAppService_clientAffinityDisabled(data acceptance.TestData) s func testAccAzureRMAppService_clientAffinity(data acceptance.TestData, clientAffinity bool) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2213,6 +2269,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_mangedServiceIdentity(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2244,6 +2304,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_userAssignedIdentity(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2282,6 +2346,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_connectionStrings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2321,6 +2389,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_connectionStringsUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2360,6 +2432,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_storageAccounts(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2409,6 +2485,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_storageAccountsUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2473,6 +2553,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_oneIpRestriction(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2506,6 +2590,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_oneVNetSubnetIpRestriction(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2553,6 +2641,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_manyIpRestrictions(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2598,6 +2690,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_zeroedIpRestriction(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2629,6 +2725,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_defaultDocuments(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2664,6 +2764,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_enabled(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2692,6 +2796,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_localMySql(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2723,6 +2831,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_applicationBlobStorageLogs(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2759,6 +2871,10 @@ resource "azurerm_app_service" "test" { } func testAccAzureRMAppService_applicationBlobStorageLogsWithAppSettings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2797,6 +2913,10 @@ resource "azurerm_app_service" "test" { } func testAccAzureRMAppService_httpFileSystemLogs(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2885,6 +3005,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_managedPipelineMode(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2916,6 +3040,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_remoteDebugging(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2952,6 +3080,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_tags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2983,6 +3115,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_tagsUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3015,6 +3151,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_windowsDotNet(data acceptance.TestData, version string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3046,6 +3186,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_windowsJava(data acceptance.TestData, javaVersion, container, containerVersion string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3079,6 +3223,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_windowsPHP(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3110,6 +3258,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_windowsPython(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3141,6 +3293,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_webSockets(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3172,6 +3328,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_scmType(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3203,6 +3363,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_ftpsState(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3234,6 +3398,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_linuxFxVersion(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3270,6 +3438,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_minTls(data acceptance.TestData, tlsVersion string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3301,6 +3473,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_corsSettings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3340,6 +3516,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_authSettingsAdditionalLoginParams(data acceptance.TestData, tenantID string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3391,6 +3571,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_authSettingsAdditionalAllowedExternalRedirectUrls(data acceptance.TestData, tenantID string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3442,6 +3626,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_authSettingsRuntimeVersion(data acceptance.TestData, tenantID string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3490,6 +3678,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_authSettingsTokenRefreshExtensionHours(data acceptance.TestData, tenantID string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3538,6 +3730,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_authSettingsTokenStoreEnabled(data acceptance.TestData, tenantID string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3586,6 +3782,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_authSettingsUnauthenticatedClientAction(data acceptance.TestData, tenantID string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3634,6 +3834,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_aadAuthSettings(data acceptance.TestData, tenantID string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3681,6 +3885,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_facebookAuthSettings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3727,6 +3935,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_googleAuthSettings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3773,6 +3985,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_microsoftAuthSettings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3819,6 +4035,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_twitterAuthSettings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3861,6 +4081,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_aadMicrosoftAuthSettings(data acceptance.TestData, tenantID string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -3918,6 +4142,10 @@ resource "azurerm_app_service" "test" { func testAccAzureRMAppService_basicWindowsContainer(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" 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 7df2d90689ebb..3ea415bb12d5a 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 @@ -177,6 +177,10 @@ func testCheckAzureRMAppServiceVirtualNetworkSwiftConnectionDestroy(s *terraform func testAccAzureRMAppServiceVirtualNetworkSwiftConnection_base(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-appservice-%d" location = "%s" 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 fffd97f2398b6..2e6075028744d 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 @@ -859,6 +859,10 @@ func testCheckAzureRMFunctionAppHasNoContentShare(resourceName string) resource. func testAccAzureRMFunctionApp_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -910,6 +914,10 @@ resource "azurerm_function_app" "import" { func testAccAzureRMFunctionApp_tags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -950,6 +958,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_tagsUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -991,6 +1003,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_version(data acceptance.TestData, version string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -1028,6 +1044,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_appSettings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -1068,6 +1088,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_alwaysOn(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -1108,6 +1132,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_linuxFxVersion(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -1152,6 +1180,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_connectionStrings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -1194,6 +1226,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_appSettingsAlwaysOn(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -1238,6 +1274,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_appSettingsAlwaysOnLinuxFxVersion(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -1287,6 +1327,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_appSettingsAlwaysOnLinuxFxVersionConnectionStrings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -1342,6 +1386,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_64bit(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1382,6 +1430,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_httpsOnly(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1419,6 +1471,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_consumptionPlan(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1456,6 +1512,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_consumptionPlanUppercaseName(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1493,6 +1553,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_basicIdentity(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -1533,6 +1597,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_userAssignedIdentity(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -1580,6 +1648,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_userAssignedIdentityUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -1633,6 +1705,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_loggingDisabled(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -1670,6 +1746,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_authSettings(data acceptance.TestData, tenantID string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -1732,6 +1812,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_corsSettings(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%[1]d" location = "%[2]s" @@ -1781,6 +1865,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_enableHttp2(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1821,6 +1909,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_minTlsVersion(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1861,6 +1953,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_ftpsState(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1901,6 +1997,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_oneIpRestriction(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1943,6 +2043,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_oneVNetSubnetIpRestriction(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -1999,6 +2103,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_manyIpRestrictions(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -2053,6 +2161,10 @@ resource "azurerm_function_app" "test" { func testAccAzureRMFunctionApp_ipRestrictionRemoved(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" From 04005451b45fbd7e677dc2a6fd169084aeb30714 Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 27 Feb 2020 15:26:31 -0800 Subject: [PATCH 409/498] add addtional missing provider blocks --- .../tests/resource_arm_api_management_test.go | 4 ++ .../tests/data_source_role_definition_test.go | 8 +++ .../resource_arm_role_assignment_test.go | 32 ++++++++++++ .../resource_arm_role_definition_test.go | 20 +++++++ .../tests/data_source_batch_account_test.go | 4 ++ .../tests/resource_arm_batch_account_test.go | 4 ++ ...urce_arm_bot_channels_registration_test.go | 12 +++++ .../tests/resource_arm_bot_web_app_test.go | 12 +++++ .../tests/data_source_platform_image_test.go | 4 ++ .../tests/data_source_snapshot_test.go | 4 ++ .../resource_arm_disk_encryption_set_test.go | 4 ++ ...irtual_machine_scale_set_disk_data_test.go | 4 ++ ..._virtual_machine_scale_set_disk_os_test.go | 4 ++ .../tests/resource_arm_managed_disk_test.go | 16 ++++++ ...resource_arm_marketplace_agreement_test.go | 4 ++ .../tests/resource_arm_snapshot_test.go | 4 ++ ..._arm_virtual_machine_managed_disks_test.go | 12 ++++- ..._source_kubernetes_service_version_test.go | 12 +++++ ...rce_arm_container_registry_webhook_test.go | 52 +++++++++++++++++++ .../resource_arm_healthcare_service_test.go | 8 +++ ...ata_source_key_vault_access_policy_test.go | 4 ++ .../tests/data_source_key_vault_test.go | 2 +- ...source_arm_key_vault_access_policy_test.go | 8 +++ ...resource_arm_key_vault_certificate_test.go | 24 +++++++++ .../tests/resource_arm_key_vault_key_test.go | 28 ++++++++++ .../resource_arm_key_vault_secret_test.go | 12 +++++ .../tests/resource_arm_key_vault_test.go | 48 +++++++++++++++++ ...ource_arm_kusto_database_principal_test.go | 4 ++ .../tests/resource_arm_kusto_database_test.go | 20 +++++++ .../data_source_management_group_test.go | 4 ++ .../resource_arm_management_group_test.go | 24 +++++++++ ...rce_arm_monitor_diagnostic_setting_test.go | 16 ++++++ ...resource_arm_network_security_rule_test.go | 12 +++++ ...ource_arm_network_watcher_flow_log_test.go | 6 ++- .../resource_arm_private_endpoint_test.go | 12 +++++ .../resource_arm_private_link_service_test.go | 4 ++ .../data_source_policy_definition_test.go | 12 +++++ .../resource_arm_policy_assignment_test.go | 16 ++++++ .../resource_arm_policy_definition_test.go | 12 +++++ ...resource_arm_policy_set_definition_test.go | 12 +++++ .../tests/resource_arm_dashboard_test.go | 6 ++- ...rm_postgresql_virtual_network_rule_test.go | 6 ++- .../data_source_backup_policy_vm_test.go | 2 +- ...ata_source_recovery_services_vault_test.go | 2 +- ...ource_arm_backup_policy_file_share_test.go | 6 ++- .../resource_arm_backup_policy_vm_test.go | 6 ++- ...ce_arm_backup_protected_file_share_test.go | 6 ++- .../resource_arm_backup_protected_vm_test.go | 6 ++- ...overy_protection_container_mapping_test.go | 4 ++ .../resource_arm_management_lock_test.go | 8 +++ ...source_arm_security_center_contact_test.go | 8 +++ ...curity_center_subscription_pricing_test.go | 4 ++ ...urce_arm_security_center_workspace_test.go | 8 +++ .../resource_arm_sql_administrator_test.go | 8 +++ ...storage_account_blob_container_sas_test.go | 4 ++ ...orage_account_customer_managed_key_test.go | 4 ++ .../tests/data_source_subscription_test.go | 4 ++ ...ffic_manager_geographical_location_test.go | 4 ++ ...source_arm_app_service_certificate_test.go | 4 ++ ...m_app_service_source_control_token_test.go | 4 ++ 60 files changed, 596 insertions(+), 12 deletions(-) diff --git a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_test.go b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_test.go index 5cad4077dcdee..25d4a6858dad9 100644 --- a/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_test.go +++ b/azurerm/internal/services/apimanagement/tests/resource_arm_api_management_test.go @@ -418,6 +418,10 @@ resource "azurerm_api_management" "test" { func testAccAzureRMApiManagement_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test1" { name = "acctestRG-api1-%d" location = "%s" diff --git a/azurerm/internal/services/authorization/tests/data_source_role_definition_test.go b/azurerm/internal/services/authorization/tests/data_source_role_definition_test.go index 0bcf02cf8f874..9b0558b5b2790 100644 --- a/azurerm/internal/services/authorization/tests/data_source_role_definition_test.go +++ b/azurerm/internal/services/authorization/tests/data_source_role_definition_test.go @@ -157,6 +157,10 @@ func TestAccDataSourceAzureRMRoleDefinition_builtIn_virtualMachineContributor(t func testAccDataSourceAzureRMRoleDefinition_builtIn(name string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_role_definition" "test" { name = "%s" } @@ -165,6 +169,10 @@ data "azurerm_role_definition" "test" { func testAccDataSourceRoleDefinition_basic(id string, data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_subscription" "primary" { } diff --git a/azurerm/internal/services/authorization/tests/resource_arm_role_assignment_test.go b/azurerm/internal/services/authorization/tests/resource_arm_role_assignment_test.go index 777d7e9b255df..6f14ad186156b 100644 --- a/azurerm/internal/services/authorization/tests/resource_arm_role_assignment_test.go +++ b/azurerm/internal/services/authorization/tests/resource_arm_role_assignment_test.go @@ -356,6 +356,10 @@ resource "azurerm_role_assignment" "test" { func testAccAzureRMRoleAssignment_roleNameConfig(id string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_subscription" "primary" { } @@ -386,6 +390,10 @@ resource "azurerm_role_assignment" "import" { func testAccAzureRMRoleAssignment_dataActionsConfig(id string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_subscription" "primary" { } @@ -403,6 +411,10 @@ resource "azurerm_role_assignment" "test" { func testAccAzureRMRoleAssignment_builtinConfig(id string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_subscription" "primary" { } @@ -424,6 +436,10 @@ resource "azurerm_role_assignment" "test" { func testAccAzureRMRoleAssignment_customConfig(roleDefinitionId string, roleAssignmentId string, rInt int) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_subscription" "primary" { } @@ -457,6 +473,10 @@ resource "azurerm_role_assignment" "test" { func testAccAzureRMRoleAssignment_servicePrincipal(rInt int, roleAssignmentID string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_subscription" "current" { } @@ -479,6 +499,10 @@ resource "azurerm_role_assignment" "test" { func testAccAzureRMRoleAssignment_servicePrincipalWithType(rInt int, roleAssignmentID string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_subscription" "current" { } @@ -502,6 +526,10 @@ resource "azurerm_role_assignment" "test" { func testAccAzureRMRoleAssignment_group(rInt int, roleAssignmentID string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_subscription" "current" { } @@ -520,6 +548,10 @@ resource "azurerm_role_assignment" "test" { func testAccAzureRMRoleAssignment_managementGroupConfig(groupId string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_subscription" "primary" { } diff --git a/azurerm/internal/services/authorization/tests/resource_arm_role_definition_test.go b/azurerm/internal/services/authorization/tests/resource_arm_role_definition_test.go index 83ce447b37671..fe6534b17ae97 100644 --- a/azurerm/internal/services/authorization/tests/resource_arm_role_definition_test.go +++ b/azurerm/internal/services/authorization/tests/resource_arm_role_definition_test.go @@ -224,6 +224,10 @@ func testCheckAzureRMRoleDefinitionDestroy(s *terraform.State) error { func testAccAzureRMRoleDefinition_basic(id string, data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_subscription" "primary" { } @@ -267,6 +271,10 @@ resource "azurerm_role_definition" "import" { func testAccAzureRMRoleDefinition_complete(id string, data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_subscription" "primary" { } @@ -292,6 +300,10 @@ resource "azurerm_role_definition" "test" { func testAccAzureRMRoleDefinition_updated(id string, data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_subscription" "primary" { } @@ -315,6 +327,10 @@ resource "azurerm_role_definition" "test" { func testAccAzureRMRoleDefinition_emptyId(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_subscription" "primary" { } @@ -336,6 +352,10 @@ resource "azurerm_role_definition" "test" { func testAccAzureRMRoleDefinition_updateEmptyId(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_subscription" "primary" { } diff --git a/azurerm/internal/services/batch/tests/data_source_batch_account_test.go b/azurerm/internal/services/batch/tests/data_source_batch_account_test.go index 94be38fbf0cd4..3c8796c37a1bd 100644 --- a/azurerm/internal/services/batch/tests/data_source_batch_account_test.go +++ b/azurerm/internal/services/batch/tests/data_source_batch_account_test.go @@ -138,6 +138,10 @@ data "azurerm_batch_account" "test" { func testAccDataSourceAzureBatchAccount_userSubscription(data acceptance.TestData, tenantID string, subscriptionID string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azuread_service_principal" "test" { display_name = "Microsoft Azure Batch" } diff --git a/azurerm/internal/services/batch/tests/resource_arm_batch_account_test.go b/azurerm/internal/services/batch/tests/resource_arm_batch_account_test.go index 54833a5953320..a7684c3b6b5d7 100644 --- a/azurerm/internal/services/batch/tests/resource_arm_batch_account_test.go +++ b/azurerm/internal/services/batch/tests/resource_arm_batch_account_test.go @@ -299,6 +299,10 @@ resource "azurerm_batch_account" "test" { func testAccAzureRMBatchAccount_userSubscription(data acceptance.TestData, tenantID string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azuread_service_principal" "test" { display_name = "Microsoft Azure Batch" } diff --git a/azurerm/internal/services/bot/tests/resource_arm_bot_channels_registration_test.go b/azurerm/internal/services/bot/tests/resource_arm_bot_channels_registration_test.go index 530b9442d9c39..7181a10d1f734 100644 --- a/azurerm/internal/services/bot/tests/resource_arm_bot_channels_registration_test.go +++ b/azurerm/internal/services/bot/tests/resource_arm_bot_channels_registration_test.go @@ -173,6 +173,10 @@ func testCheckAzureRMBotChannelsRegistrationDestroy(s *terraform.State) error { func testAccAzureRMBotChannelsRegistration_basicConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -197,6 +201,10 @@ resource "azurerm_bot_channels_registration" "test" { func testAccAzureRMBotChannelsRegistration_updateConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -221,6 +229,10 @@ resource "azurerm_bot_channels_registration" "test" { func testAccAzureRMBotChannelsRegistration_completeConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } diff --git a/azurerm/internal/services/bot/tests/resource_arm_bot_web_app_test.go b/azurerm/internal/services/bot/tests/resource_arm_bot_web_app_test.go index e056595c9f8ad..ae3c7df966e0c 100644 --- a/azurerm/internal/services/bot/tests/resource_arm_bot_web_app_test.go +++ b/azurerm/internal/services/bot/tests/resource_arm_bot_web_app_test.go @@ -134,6 +134,10 @@ func testCheckAzureRMBotWebAppDestroy(s *terraform.State) error { func testAccAzureRMBotWebApp_basicConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -158,6 +162,10 @@ resource "azurerm_bot_web_app" "test" { func testAccAzureRMBotWebApp_updateConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -182,6 +190,10 @@ resource "azurerm_bot_web_app" "test" { func testAccAzureRMBotWebApp_completeConfig(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } diff --git a/azurerm/internal/services/compute/tests/data_source_platform_image_test.go b/azurerm/internal/services/compute/tests/data_source_platform_image_test.go index 4985a8ac7563e..e02d81ed85132 100644 --- a/azurerm/internal/services/compute/tests/data_source_platform_image_test.go +++ b/azurerm/internal/services/compute/tests/data_source_platform_image_test.go @@ -30,6 +30,10 @@ func TestAccDataSourceAzureRMPlatformImage_basic(t *testing.T) { func testAccDataSourceAzureRMPlatformImageBasic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_platform_image" "test" { location = "%s" publisher = "Canonical" diff --git a/azurerm/internal/services/compute/tests/data_source_snapshot_test.go b/azurerm/internal/services/compute/tests/data_source_snapshot_test.go index 353279caa86da..b5fba7dd98d79 100644 --- a/azurerm/internal/services/compute/tests/data_source_snapshot_test.go +++ b/azurerm/internal/services/compute/tests/data_source_snapshot_test.go @@ -82,6 +82,10 @@ data "azurerm_snapshot" "snapshot" { func testAccDataSourceAzureRMSnapshot_encryption(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { diff --git a/azurerm/internal/services/compute/tests/resource_arm_disk_encryption_set_test.go b/azurerm/internal/services/compute/tests/resource_arm_disk_encryption_set_test.go index 8f4bae755836c..f0e23216c407d 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_disk_encryption_set_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_disk_encryption_set_test.go @@ -220,6 +220,10 @@ func testAccAzureRMDiskEncryptionSet_dependencies(data acceptance.TestData) stri location := "northeurope" return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { diff --git a/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_disk_data_test.go b/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_disk_data_test.go index 5f21bbda637a9..9510faf3dcbb4 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_disk_data_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_disk_data_test.go @@ -437,6 +437,10 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksDataDisk_diskEncryptionSetDe location := "westus2" return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { diff --git a/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_disk_os_test.go b/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_disk_os_test.go index 54b07d2ee3386..f7610e0a0828a 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_disk_os_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_disk_os_test.go @@ -307,6 +307,10 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksOSDisk_diskEncryptionSetDepe location := "westus2" return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { diff --git a/azurerm/internal/services/compute/tests/resource_arm_managed_disk_test.go b/azurerm/internal/services/compute/tests/resource_arm_managed_disk_test.go index 5a0bf79c83611..0255bd4a670bf 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_managed_disk_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_managed_disk_test.go @@ -645,6 +645,10 @@ resource "azurerm_managed_disk" "test" { func testAccAzureRMManagedDisk_platformImage(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_platform_image" "test" { location = "%s" publisher = "Canonical" @@ -671,6 +675,10 @@ resource "azurerm_managed_disk" "test" { func testAccAzureRMManagedDisk_zeroGbFromPlatformImage(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_platform_image" "test" { location = "%s" publisher = "Canonical" @@ -698,6 +706,10 @@ resource "azurerm_managed_disk" "test" { func testAccAzureRMManagedDisk_encryption(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { @@ -876,6 +888,10 @@ func testAccAzureRMManagedDisk_diskEncryptionSetDependencies(data acceptance.Tes location := "westus2" return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { diff --git a/azurerm/internal/services/compute/tests/resource_arm_marketplace_agreement_test.go b/azurerm/internal/services/compute/tests/resource_arm_marketplace_agreement_test.go index 91319da1535ea..e5cb764796949 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_marketplace_agreement_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_marketplace_agreement_test.go @@ -184,6 +184,10 @@ func testCheckAzureRMMarketplaceAgreementDestroy(s *terraform.State) error { func testAccAzureRMMarketplaceAgreement_basicConfig() string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_marketplace_agreement" "test" { publisher = "barracudanetworks" offer = "waf" diff --git a/azurerm/internal/services/compute/tests/resource_arm_snapshot_test.go b/azurerm/internal/services/compute/tests/resource_arm_snapshot_test.go index 5c3e5d8555970..cd07ca54b318a 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_snapshot_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_snapshot_test.go @@ -339,6 +339,10 @@ resource "azurerm_snapshot" "test" { func testAccAzureRMSnapshot_encryption(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { diff --git a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go index 4f2c3a36f477a..a28186a594719 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go @@ -597,7 +597,11 @@ func testCheckAndStopAzureRMVirtualMachine(vm *compute.VirtualMachine) resource. } func testAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk_withOsWriteAcceleratorEnabled(data acceptance.TestData, enabled string) string { - return fmt.Sprintf(` + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -681,7 +685,11 @@ resource "azurerm_virtual_machine" "test" { } func testAccAzureRMVirtualMachine_basicLinuxMachine_managedDisk_withWriteAcceleratorEnabled(data acceptance.TestData, enabled string) string { - return fmt.Sprintf(` + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/containers/tests/data_source_kubernetes_service_version_test.go b/azurerm/internal/services/containers/tests/data_source_kubernetes_service_version_test.go index 6ea37245bacc3..39cba73f787f3 100644 --- a/azurerm/internal/services/containers/tests/data_source_kubernetes_service_version_test.go +++ b/azurerm/internal/services/containers/tests/data_source_kubernetes_service_version_test.go @@ -76,6 +76,10 @@ func TestAccDataSourceAzureRMKubernetesServiceVersions_nopreview(t *testing.T) { func testAccDataSourceAzureRMKubernetesServiceVersions_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_kubernetes_service_versions" "test" { location = "%s" } @@ -84,6 +88,10 @@ data "azurerm_kubernetes_service_versions" "test" { func testAccDataSourceAzureRMKubernetesServiceVersions_filtered(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_kubernetes_service_versions" "test" { location = "%s" version_prefix = "1." @@ -93,6 +101,10 @@ data "azurerm_kubernetes_service_versions" "test" { func testAccDataSourceAzureRMKubernetesServiceVersions_nopreview(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_kubernetes_service_versions" "test" { location = "%s" include_preview = false diff --git a/azurerm/internal/services/containers/tests/resource_arm_container_registry_webhook_test.go b/azurerm/internal/services/containers/tests/resource_arm_container_registry_webhook_test.go index 2b4899e20d6ed..f1abd7b037603 100644 --- a/azurerm/internal/services/containers/tests/resource_arm_container_registry_webhook_test.go +++ b/azurerm/internal/services/containers/tests/resource_arm_container_registry_webhook_test.go @@ -188,6 +188,10 @@ func TestAccAzureRMContainerRegistryWebhook_customHeaders(t *testing.T) { func testAccAzureRMContainerRegistryWebhook_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "rg" { name = "acctestRG-%d" location = "%s" @@ -217,6 +221,10 @@ resource "azurerm_container_registry_webhook" "test" { func testAccAzureRMContainerRegistryWebhook_withTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "rg" { name = "acctestRG-%d" location = "%s" @@ -250,6 +258,10 @@ resource "azurerm_container_registry_webhook" "test" { func testAccAzureRMContainerRegistryWebhook_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "rg" { name = "acctestRG-%d" location = "%s" @@ -284,6 +296,10 @@ resource "azurerm_container_registry_webhook" "test" { func testAccAzureRMContainerRegistryWebhook_actions(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "rg" { name = "acctestRG-%d" location = "%s" @@ -313,6 +329,10 @@ resource "azurerm_container_registry_webhook" "test" { func testAccAzureRMContainerRegistryWebhook_actionsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "rg" { name = "acctestRG-%d" location = "%s" @@ -343,6 +363,10 @@ resource "azurerm_container_registry_webhook" "test" { func testAccAzureRMContainerRegistryWebhook_status(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "rg" { name = "acctestRG-%d" location = "%s" @@ -374,6 +398,10 @@ resource "azurerm_container_registry_webhook" "test" { func testAccAzureRMContainerRegistryWebhook_statusUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "rg" { name = "acctestRG-%d" location = "%s" @@ -405,6 +433,10 @@ resource "azurerm_container_registry_webhook" "test" { func testAccAzureRMContainerRegistryWebhook_serviceUri(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "rg" { name = "acctestRG-%d" location = "%s" @@ -434,6 +466,10 @@ resource "azurerm_container_registry_webhook" "test" { func testAccAzureRMContainerRegistryWebhook_serviceUriUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "rg" { name = "acctestRG-%d" location = "%s" @@ -465,6 +501,10 @@ resource "azurerm_container_registry_webhook" "test" { func testAccAzureRMContainerRegistryWebhook_scope(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "rg" { name = "acctestRG-%d" location = "%s" @@ -496,6 +536,10 @@ resource "azurerm_container_registry_webhook" "test" { func testAccAzureRMContainerRegistryWebhook_scopeUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "rg" { name = "acctestRG-%d" location = "%s" @@ -527,6 +571,10 @@ resource "azurerm_container_registry_webhook" "test" { func testAccAzureRMContainerRegistryWebhook_customHeaders(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "rg" { name = "acctestRG-%d" location = "%s" @@ -560,6 +608,10 @@ resource "azurerm_container_registry_webhook" "test" { func testAccAzureRMContainerRegistryWebhook_customHeadersUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "rg" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/healthcare/tests/resource_arm_healthcare_service_test.go b/azurerm/internal/services/healthcare/tests/resource_arm_healthcare_service_test.go index 2db59d40c9de8..d3b8d17acbf33 100644 --- a/azurerm/internal/services/healthcare/tests/resource_arm_healthcare_service_test.go +++ b/azurerm/internal/services/healthcare/tests/resource_arm_healthcare_service_test.go @@ -135,6 +135,10 @@ func testAccAzureRMHealthCareService_basic(data acceptance.TestData) string { location := "westus2" return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -177,6 +181,10 @@ func testAccAzureRMHealthCareService_complete(data acceptance.TestData) string { location := "westus2" return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } diff --git a/azurerm/internal/services/keyvault/tests/data_source_key_vault_access_policy_test.go b/azurerm/internal/services/keyvault/tests/data_source_key_vault_access_policy_test.go index 6e55a259b7a6c..3cb57a24ec93d 100644 --- a/azurerm/internal/services/keyvault/tests/data_source_key_vault_access_policy_test.go +++ b/azurerm/internal/services/keyvault/tests/data_source_key_vault_access_policy_test.go @@ -136,6 +136,10 @@ func TestAccDataSourceAzureRMKeyVaultAccessPolicy_keySecretCertificate(t *testin func testAccDataSourceKeyVaultAccessPolicy(name string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_key_vault_access_policy" "test" { name = "%s" } diff --git a/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go b/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go index 58b752bcfeddb..31f75de85424b 100644 --- a/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go @@ -146,7 +146,7 @@ data "azurerm_key_vault" "test" { func testAccDataSourceAzureRMKeyVault_enableSoftDelete(data acceptance.TestData) string { r := testAccAzureRMKeyVault_softDelete(data, true) - return fmt.Sprintf(` + return fmt.Sprintf(` %s data "azurerm_key_vault" "test" { diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_access_policy_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_access_policy_test.go index a474872f16007..c98e88ea6b535 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_access_policy_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_access_policy_test.go @@ -332,6 +332,10 @@ resource "azurerm_key_vault_access_policy" "test" { func testAccAzureRMKeyVaultAccessPolicy_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -357,6 +361,10 @@ resource "azurerm_key_vault" "test" { func testAccAzureRMKeyVaultAccessPolicy_nonExistentVault(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_certificate_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_certificate_test.go index a78b4799fd152..9fd4acf4be8d6 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_certificate_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_certificate_test.go @@ -336,6 +336,10 @@ func testCheckAzureRMKeyVaultCertificateDisappears(resourceName string) resource func testAccAzureRMKeyVaultCertificate_basicImportPFX(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -437,6 +441,10 @@ resource "azurerm_key_vault_certificate" "import" { func testAccAzureRMKeyVaultCertificate_basicGenerate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -528,6 +536,10 @@ resource "azurerm_key_vault_certificate" "test" { func testAccAzureRMKeyVaultCertificate_basicGenerateSans(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -626,6 +638,10 @@ resource "azurerm_key_vault_certificate" "test" { func testAccAzureRMKeyVaultCertificate_basicGenerateTags(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -717,6 +733,10 @@ resource "azurerm_key_vault_certificate" "test" { func testAccAzureRMKeyVaultCertificate_basicExtendedKeyUsage(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -814,6 +834,10 @@ resource "azurerm_key_vault_certificate" "test" { func testAccAzureRMKeyVaultCertificate_emptyExtendedKeyUsage(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go index 484a13dc078e2..d5630b0a5bfa7 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go @@ -352,6 +352,10 @@ func testCheckAzureRMKeyVaultKeyDisappears(resourceName string) resource.TestChe func testAccAzureRMKeyVaultKey_basicEC(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -425,6 +429,10 @@ resource "azurerm_key_vault_key" "import" { func testAccAzureRMKeyVaultKey_basicRSA(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -484,6 +492,10 @@ resource "azurerm_key_vault_key" "test" { func testAccAzureRMKeyVaultKey_basicRSAHSM(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -542,6 +554,10 @@ resource "azurerm_key_vault_key" "test" { func testAccAzureRMKeyVaultKey_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -606,6 +622,10 @@ resource "azurerm_key_vault_key" "test" { func testAccAzureRMKeyVaultKey_basicUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -664,6 +684,10 @@ resource "azurerm_key_vault_key" "test" { func testAccAzureRMKeyVaultKey_curveEC(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -718,6 +742,10 @@ resource "azurerm_key_vault_key" "test" { func testAccAzureRMKeyVaultKey_basicECHSM(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go index 19529f522697d..36f0c8b4947aa 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go @@ -276,6 +276,10 @@ func testCheckAzureRMKeyVaultSecretDisappears(resourceName string) resource.Test func testAccAzureRMKeyVaultSecret_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -335,6 +339,10 @@ resource "azurerm_key_vault_secret" "import" { func testAccAzureRMKeyVaultSecret_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -388,6 +396,10 @@ resource "azurerm_key_vault_secret" "test" { func testAccAzureRMKeyVaultSecret_basicUpdated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go index f0277444ba8d9..2565491f53fe0 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go @@ -563,6 +563,10 @@ func testCheckAzureRMKeyVaultDisappears(resourceName string) resource.TestCheckF func testAccAzureRMKeyVault_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -626,6 +630,10 @@ resource "azurerm_key_vault" "import" { func testAccAzureRMKeyVault_networkAclsTemplate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -766,6 +774,10 @@ resource "azurerm_key_vault" "test" { func testAccAzureRMKeyVault_update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -808,6 +820,10 @@ resource "azurerm_key_vault" "test" { func testAccAzureRMKeyVault_noAccessPolicyBlocks(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -837,6 +853,10 @@ resource "azurerm_key_vault" "test" { func testAccAzureRMKeyVault_accessPolicyExplicitZero(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -868,6 +888,10 @@ resource "azurerm_key_vault" "test" { func testAccAzureRMKeyVault_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -911,6 +935,10 @@ resource "azurerm_key_vault" "test" { func testAccAzureRMKeyVault_justCert(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -949,6 +977,10 @@ func testAccAzureRMKeyVault_accessPolicyUpperLimit(data acceptance.TestData) str } return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -972,6 +1004,10 @@ resource "azurerm_key_vault" "test" { func testAccAzureRMKeyVault_generateStorageAccountConfigs(accountNum int, rs string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_storage_account" "test%d" { name = "testsa%s%d" resource_group_name = azurerm_resource_group.test.name @@ -1013,6 +1049,10 @@ access_policy { func testAccAzureRMKeyVault_purgeProtection(data acceptance.TestData, enabled bool) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { @@ -1033,6 +1073,10 @@ resource "azurerm_key_vault" "test" { func testAccAzureRMKeyVault_softDelete(data acceptance.TestData, enabled bool) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { @@ -1101,6 +1145,10 @@ resource "azurerm_key_vault" "test" { func testAccAzureRMKeyVault_purgeProtectionAndSoftDelete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { diff --git a/azurerm/internal/services/kusto/tests/resource_arm_kusto_database_principal_test.go b/azurerm/internal/services/kusto/tests/resource_arm_kusto_database_principal_test.go index 315c3e02095df..01bf647c1c5e4 100644 --- a/azurerm/internal/services/kusto/tests/resource_arm_kusto_database_principal_test.go +++ b/azurerm/internal/services/kusto/tests/resource_arm_kusto_database_principal_test.go @@ -129,6 +129,10 @@ func testCheckAzureRMKustoDatabasePrincipalExists(resourceName string) resource. func testAccAzureRMKustoDatabasePrincipal_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" {} diff --git a/azurerm/internal/services/kusto/tests/resource_arm_kusto_database_test.go b/azurerm/internal/services/kusto/tests/resource_arm_kusto_database_test.go index b12eeb4d3568b..99768244227e0 100644 --- a/azurerm/internal/services/kusto/tests/resource_arm_kusto_database_test.go +++ b/azurerm/internal/services/kusto/tests/resource_arm_kusto_database_test.go @@ -84,6 +84,10 @@ func TestAccAzureRMKustoDatabase_hotCachePeriod(t *testing.T) { func testAccAzureRMKustoDatabase_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "rg" { name = "acctestRG-%d" location = "%s" @@ -111,6 +115,10 @@ resource "azurerm_kusto_database" "test" { func testAccAzureRMKustoDatabase_softDeletePeriod(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "rg" { name = "acctestRG-%d" location = "%s" @@ -140,6 +148,10 @@ resource "azurerm_kusto_database" "test" { func testAccAzureRMKustoDatabase_softDeletePeriodUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "rg" { name = "acctestRG-%d" location = "%s" @@ -169,6 +181,10 @@ resource "azurerm_kusto_database" "test" { func testAccAzureRMKustoDatabase_hotCachePeriod(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "rg" { name = "acctestRG-%d" location = "%s" @@ -198,6 +214,10 @@ resource "azurerm_kusto_database" "test" { func testAccAzureRMKustoDatabase_hotCachePeriodUpdate(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "rg" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/managementgroup/tests/data_source_management_group_test.go b/azurerm/internal/services/managementgroup/tests/data_source_management_group_test.go index 733eda802dacf..dd27c1c2aa828 100644 --- a/azurerm/internal/services/managementgroup/tests/data_source_management_group_test.go +++ b/azurerm/internal/services/managementgroup/tests/data_source_management_group_test.go @@ -28,6 +28,10 @@ func TestAccDataSourceArmManagementGroup_basic(t *testing.T) { func testAccDataSourceArmManagementGroup_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_management_group" "test" { display_name = "acctestmg-%d" } diff --git a/azurerm/internal/services/managementgroup/tests/resource_arm_management_group_test.go b/azurerm/internal/services/managementgroup/tests/resource_arm_management_group_test.go index ed72c808567e9..67a2821ebcf7a 100644 --- a/azurerm/internal/services/managementgroup/tests/resource_arm_management_group_test.go +++ b/azurerm/internal/services/managementgroup/tests/resource_arm_management_group_test.go @@ -259,6 +259,10 @@ func testCheckAzureRMManagementGroupDestroy(s *terraform.State) error { func testAzureRMManagementGroup_basic() string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_management_group" "test" { } `) @@ -266,6 +270,10 @@ resource "azurerm_management_group" "test" { func testAzureRMManagementGroup_requiresImport() string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_management_group" "test" { } @@ -277,6 +285,10 @@ resource "azurerm_management_group" "import" { func testAzureRMManagementGroup_nested() string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_management_group" "parent" { } @@ -288,6 +300,10 @@ resource "azurerm_management_group" "child" { func testAzureRMManagementGroup_multiLevel() string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_management_group" "grandparent" { } @@ -303,6 +319,10 @@ resource "azurerm_management_group" "child" { func testAzureRMManagementGroup_withName(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_management_group" "test" { display_name = "acctestmg-%d" } @@ -312,6 +332,10 @@ resource "azurerm_management_group" "test" { // TODO: switch this out for dynamically creating a subscription once that's supported in the future func testAzureRMManagementGroup_withSubscriptions(subscriptionID string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_management_group" "test" { subscription_ids = [ "%s", diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_diagnostic_setting_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_diagnostic_setting_test.go index 5d0fa43936adb..0c19456e592d3 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_diagnostic_setting_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_diagnostic_setting_test.go @@ -196,6 +196,10 @@ func testCheckAzureRMMonitorDiagnosticSettingDestroy(s *terraform.State) error { func testAccAzureRMMonitorDiagnosticSetting_eventhub(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -295,6 +299,10 @@ resource "azurerm_monitor_diagnostic_setting" "import" { func testAccAzureRMMonitorDiagnosticSetting_logAnalyticsWorkspace(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -346,6 +354,10 @@ resource "azurerm_monitor_diagnostic_setting" "test" { func testAccAzureRMMonitorDiagnosticSetting_logAnalyticsWorkspaceDedicated(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -415,6 +427,10 @@ resource "azurerm_monitor_diagnostic_setting" "test" { func testAccAzureRMMonitorDiagnosticSetting_storageAccount(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } diff --git a/azurerm/internal/services/network/tests/resource_arm_network_security_rule_test.go b/azurerm/internal/services/network/tests/resource_arm_network_security_rule_test.go index 4436a41344224..f4ccae96b4d85 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_security_rule_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_security_rule_test.go @@ -280,6 +280,10 @@ resource "azurerm_network_security_rule" "import" { func testAccAzureRMNetworkSecurityRule_updateBasic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test1" { name = "acctestRG-%d" location = "%s" @@ -309,6 +313,10 @@ resource "azurerm_network_security_rule" "test1" { func testAccAzureRMNetworkSecurityRule_updateExtraRule(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test1" { name = "acctestRG-%d" location = "%s" @@ -352,6 +360,10 @@ resource "azurerm_network_security_rule" "test2" { func testAccAzureRMNetworkSecurityRule_augmented(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test1" { name = "acctestRG-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_network_watcher_flow_log_test.go b/azurerm/internal/services/network/tests/resource_arm_network_watcher_flow_log_test.go index 47909b423abd8..aeb061e5060bc 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_watcher_flow_log_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_watcher_flow_log_test.go @@ -332,7 +332,11 @@ func testCheckAzureRMNetworkWatcherFlowLogExists(name string) resource.TestCheck } func testAccAzureRMNetworkWatcherFlowLog_prerequisites(data acceptance.TestData) string { - return fmt.Sprintf(` + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-watcher-%d" location = "%s" diff --git a/azurerm/internal/services/network/tests/resource_arm_private_endpoint_test.go b/azurerm/internal/services/network/tests/resource_arm_private_endpoint_test.go index 3548306180a8b..7e47dbbcc38e4 100644 --- a/azurerm/internal/services/network/tests/resource_arm_private_endpoint_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_private_endpoint_test.go @@ -116,6 +116,10 @@ func testCheckAzureRMPrivateEndpointDestroy(s *terraform.State) error { func testAccAzureRMPrivateEndpointTemplate_template(data acceptance.TestData, seviceCfg string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_subscription" "current" {} resource "azurerm_resource_group" "test" { @@ -173,6 +177,10 @@ resource "azurerm_lb" "test" { func testAccAzureRMPrivateEndpoint_serviceAutoApprove(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_private_link_service" "test" { name = "acctestPLS-%d" location = azurerm_resource_group.test.location @@ -195,6 +203,10 @@ resource "azurerm_private_link_service" "test" { func testAccAzureRMPrivateEndpoint_serviceManualApprove(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_private_link_service" "test" { name = "acctestPLS-%d" location = azurerm_resource_group.test.location diff --git a/azurerm/internal/services/network/tests/resource_arm_private_link_service_test.go b/azurerm/internal/services/network/tests/resource_arm_private_link_service_test.go index 68c18f96538b4..dda198ea10da3 100644 --- a/azurerm/internal/services/network/tests/resource_arm_private_link_service_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_private_link_service_test.go @@ -816,6 +816,10 @@ resource "azurerm_private_link_service" "test" { func testAccAzureRMPrivateLinkService_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_subscription" "current" {} resource "azurerm_resource_group" "test" { diff --git a/azurerm/internal/services/policy/tests/data_source_policy_definition_test.go b/azurerm/internal/services/policy/tests/data_source_policy_definition_test.go index 5dfd54030db9d..ca1b76bfcb168 100644 --- a/azurerm/internal/services/policy/tests/data_source_policy_definition_test.go +++ b/azurerm/internal/services/policy/tests/data_source_policy_definition_test.go @@ -68,6 +68,10 @@ func TestAccDataSourceAzureRMPolicyDefinition_custom(t *testing.T) { func testAccDataSourceBuiltInPolicyDefinition(name string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_policy_definition" "test" { display_name = "%s" } @@ -76,6 +80,10 @@ data "azurerm_policy_definition" "test" { func testAccDataSourceBuiltInPolicyDefinitionAtManagementGroup(name string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -88,6 +96,10 @@ data "azurerm_policy_definition" "test" { func testAccDataSourceCustomPolicyDefinition(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_policy_definition" "test_policy" { name = "acctestpol-%d" policy_type = "Custom" diff --git a/azurerm/internal/services/policy/tests/resource_arm_policy_assignment_test.go b/azurerm/internal/services/policy/tests/resource_arm_policy_assignment_test.go index 4f7232236c754..83ab2d9ba8f28 100644 --- a/azurerm/internal/services/policy/tests/resource_arm_policy_assignment_test.go +++ b/azurerm/internal/services/policy/tests/resource_arm_policy_assignment_test.go @@ -157,6 +157,10 @@ func testCheckAzureRMPolicyAssignmentDestroy(s *terraform.State) error { func testAzureRMPolicyAssignment_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_policy_definition" "test" { name = "acctestpol-%d" policy_type = "Custom" @@ -207,6 +211,10 @@ resource "azurerm_policy_assignment" "import" { func testAzureRMPolicyAssignment_deployIfNotExists_policy(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_policy_definition" "test" { name = "acctestpol-%d" policy_type = "Custom" @@ -286,6 +294,10 @@ resource "azurerm_policy_assignment" "test" { func testAzureRMPolicyAssignment_complete(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_policy_definition" "test" { name = "acctestpol-%d" policy_type = "Custom" @@ -348,6 +360,10 @@ PARAMETERS func testAzureRMPolicyAssignment_not_scopes(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_subscription" "current" { } diff --git a/azurerm/internal/services/policy/tests/resource_arm_policy_definition_test.go b/azurerm/internal/services/policy/tests/resource_arm_policy_definition_test.go index e95971d030270..f5ed0125fff35 100644 --- a/azurerm/internal/services/policy/tests/resource_arm_policy_definition_test.go +++ b/azurerm/internal/services/policy/tests/resource_arm_policy_definition_test.go @@ -167,6 +167,10 @@ func testCheckAzureRMPolicyDefinitionDestroy(s *terraform.State) error { func testAzureRMPolicyDefinition_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_policy_definition" "test" { name = "acctestpol-%d" policy_type = "Custom" @@ -223,6 +227,10 @@ resource "azurerm_policy_definition" "import" { func testAzureRMPolicyDefinition_computedMetadata(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_policy_definition" "test" { name = "acctest-%d" policy_type = "Custom" @@ -258,6 +266,10 @@ POLICY_RULE func testAzureRMPolicyDefinition_ManagementGroup(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_management_group" "test" { display_name = "acctestmg-%d" } diff --git a/azurerm/internal/services/policy/tests/resource_arm_policy_set_definition_test.go b/azurerm/internal/services/policy/tests/resource_arm_policy_set_definition_test.go index 2c4c440d94099..d3b31ab3aecf7 100644 --- a/azurerm/internal/services/policy/tests/resource_arm_policy_set_definition_test.go +++ b/azurerm/internal/services/policy/tests/resource_arm_policy_set_definition_test.go @@ -94,6 +94,10 @@ func TestAccAzureRMPolicySetDefinition_ManagementGroup(t *testing.T) { func testAzureRMPolicySetDefinition_builtIn(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_policy_set_definition" "test" { name = "acctestpolset-%d" policy_type = "Custom" @@ -146,6 +150,10 @@ resource "azurerm_policy_set_definition" "import" { func testAzureRMPolicySetDefinition_custom(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_policy_definition" "test" { name = "acctestpol-%d" policy_type = "Custom" @@ -220,6 +228,10 @@ POLICY_DEFINITIONS func testAzureRMPolicySetDefinition_ManagementGroup(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_management_group" "test" { display_name = "acctestmg-%d" } diff --git a/azurerm/internal/services/portal/tests/resource_arm_dashboard_test.go b/azurerm/internal/services/portal/tests/resource_arm_dashboard_test.go index ed8ec2bbf79bb..5f822dbd90d00 100644 --- a/azurerm/internal/services/portal/tests/resource_arm_dashboard_test.go +++ b/azurerm/internal/services/portal/tests/resource_arm_dashboard_test.go @@ -87,7 +87,11 @@ func testCheckAzureRMDashboardDestroy(s *terraform.State) error { func testResourceArmDashboard_basic(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "test-group" { +provider "azurerm" { + features {} +} + +resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_virtual_network_rule_test.go b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_virtual_network_rule_test.go index 1de7450526fd2..829f5692d90ad 100644 --- a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_virtual_network_rule_test.go +++ b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_virtual_network_rule_test.go @@ -520,7 +520,11 @@ resource "azurerm_postgresql_virtual_network_rule" "rule3" { } func testAccAzureRMPostgreSQLVirtualNetworkRule_ignoreEndpointValid(data acceptance.TestData) string { - return fmt.Sprintf(` + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-psql-%d" location = "%s" diff --git a/azurerm/internal/services/recoveryservices/tests/data_source_backup_policy_vm_test.go b/azurerm/internal/services/recoveryservices/tests/data_source_backup_policy_vm_test.go index f2e920c959899..34c33c7f01dd5 100644 --- a/azurerm/internal/services/recoveryservices/tests/data_source_backup_policy_vm_test.go +++ b/azurerm/internal/services/recoveryservices/tests/data_source_backup_policy_vm_test.go @@ -31,7 +31,7 @@ func TestAccDataSourceAzureRMBackupPolicyVm_basic(t *testing.T) { func testAccDataSourceBackupPolicyVm_basic(data acceptance.TestData) string { template := testAccAzureRMBackupProtectionPolicyVM_basicDaily(data) - return fmt.Sprintf(` + return fmt.Sprintf(` %s data "azurerm_backup_policy_vm" "test" { diff --git a/azurerm/internal/services/recoveryservices/tests/data_source_recovery_services_vault_test.go b/azurerm/internal/services/recoveryservices/tests/data_source_recovery_services_vault_test.go index 0a6bae126319c..aaf98ec215ca5 100644 --- a/azurerm/internal/services/recoveryservices/tests/data_source_recovery_services_vault_test.go +++ b/azurerm/internal/services/recoveryservices/tests/data_source_recovery_services_vault_test.go @@ -32,7 +32,7 @@ func TestAccDataSourceAzureRMRecoveryServicesVault_basic(t *testing.T) { func testAccDataSourceRecoveryServicesVault_basic(data acceptance.TestData) string { template := testAccAzureRMRecoveryServicesVault_basic(data) - return fmt.Sprintf(` + return fmt.Sprintf(` %s data "azurerm_recovery_services_vault" "test" { diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_policy_file_share_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_policy_file_share_test.go index d5715cdfa44f7..30d44d3288d36 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_policy_file_share_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_policy_file_share_test.go @@ -133,7 +133,11 @@ func testCheckAzureRMBackupProtectionPolicyFileShareExists(resourceName string) } func testAccAzureRMBackupProtectionPolicyFileShare_base(data acceptance.TestData) string { - return fmt.Sprintf(` + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-backup-%d" location = "%s" diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_policy_vm_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_policy_vm_test.go index e0e3ba1a934ad..754fbe78d7395 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_policy_vm_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_policy_vm_test.go @@ -351,7 +351,11 @@ func testCheckAzureRMBackupProtectionPolicyVmExists(resourceName string) resourc } func testAccAzureRMBackupProtectionPolicyVM_template(data acceptance.TestData) string { - return fmt.Sprintf(` + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-backup-%d" location = "%s" diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_file_share_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_file_share_test.go index dbfbf28102a07..dc949ddbd29ac 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_file_share_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_file_share_test.go @@ -186,7 +186,11 @@ func testCheckAzureRMBackupProtectedFileShareExists(resourceName string) resourc } func testAccAzureRMBackupProtectedFileShare_base(data acceptance.TestData) string { - return fmt.Sprintf(` + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-backup-%[1]d" location = "%[2]s" diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_vm_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_vm_test.go index 9d5213eea2321..8463048e3361b 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_vm_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_vm_test.go @@ -223,7 +223,11 @@ func testCheckAzureRMBackupProtectedVmExists(resourceName string) resource.TestC } func testAccAzureRMBackupProtectedVm_base(data acceptance.TestData) string { - return fmt.Sprintf(` + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-backup-%d" location = "%s" diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_protection_container_mapping_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_protection_container_mapping_test.go index 13ebc66a01b17..ffcbd8315ad0d 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_protection_container_mapping_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_site_recovery_protection_container_mapping_test.go @@ -32,6 +32,10 @@ func TestAccAzureRMSiteRecoveryProtectionContainerMapping_basic(t *testing.T) { func testAccAzureRMSiteRecoveryProtectionContainerMapping_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test1" { name = "acctestRG-recovery-%d-1" location = "%s" 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 d32c67b877dde..f5f447bce3394 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 @@ -399,6 +399,10 @@ resource "azurerm_management_lock" "test" { func testAccAzureRMManagementLock_subscriptionReadOnlyBasic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_subscription" "current" { } @@ -412,6 +416,10 @@ resource "azurerm_management_lock" "test" { func testAccAzureRMManagementLock_subscriptionCanNotDeleteBasic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_subscription" "current" { } diff --git a/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_contact_test.go b/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_contact_test.go index 4c24b3d540b64..d814b97466108 100644 --- a/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_contact_test.go +++ b/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_contact_test.go @@ -190,6 +190,10 @@ func testCheckAzureRMSecurityCenterContactDestroy(s *terraform.State) error { func testAccAzureRMSecurityCenterContact_template(email, phone string, notifications, adminAlerts bool) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_security_center_contact" "test" { email = "%s" phone = "%s" @@ -202,6 +206,10 @@ resource "azurerm_security_center_contact" "test" { func testAccAzureRMSecurityCenterContact_templateWithoutPhone(email string, notifications, adminAlerts bool) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_security_center_contact" "test" { email = "%s" diff --git a/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_subscription_pricing_test.go b/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_subscription_pricing_test.go index 5813985d9657b..d50b3e0108b2b 100644 --- a/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_subscription_pricing_test.go +++ b/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_subscription_pricing_test.go @@ -66,6 +66,10 @@ func testCheckAzureRMSecurityCenterSubscriptionPricingExists(resourceName string func testAccAzureRMSecurityCenterSubscriptionPricing_tier(tier string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_security_center_subscription_pricing" "test" { tier = "%s" } diff --git a/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_workspace_test.go b/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_workspace_test.go index a638c7c2b9bda..f4d043f852bf5 100644 --- a/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_workspace_test.go +++ b/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_workspace_test.go @@ -150,6 +150,10 @@ func testCheckAzureRMSecurityCenterWorkspaceDestroy(s *terraform.State) error { func testAccAzureRMSecurityCenterWorkspace_basicCfg(data acceptance.TestData, scope string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_security_center_subscription_pricing" "test" { tier = "Standard" } @@ -187,6 +191,10 @@ resource "azurerm_security_center_workspace" "import" { func testAccAzureRMSecurityCenterWorkspace_differentWorkspaceCfg(data acceptance.TestData, scope string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_security_center_subscription_pricing" "test" { tier = "Standard" } 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 d0f2a9f25e029..8b699311b6215 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 @@ -153,6 +153,10 @@ func testCheckAzureRMSqlAdministratorDestroy(s *terraform.State) error { func testAccAzureRMSqlAdministrator_basic(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } @@ -196,6 +200,10 @@ resource "azurerm_sql_active_directory_administrator" "import" { func testAccAzureRMSqlAdministrator_withUpdates(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" { } diff --git a/azurerm/internal/services/storage/tests/data_source_storage_account_blob_container_sas_test.go b/azurerm/internal/services/storage/tests/data_source_storage_account_blob_container_sas_test.go index 7a7fe5ac5536a..31795359647ce 100644 --- a/azurerm/internal/services/storage/tests/data_source_storage_account_blob_container_sas_test.go +++ b/azurerm/internal/services/storage/tests/data_source_storage_account_blob_container_sas_test.go @@ -49,6 +49,10 @@ func TestAccDataSourceArmStorageAccountBlobContainerSas_basic(t *testing.T) { func testAccDataSourceAzureRMStorageAccountBlobContainerSas_basic(data acceptance.TestData, startDate string, endDate string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "rg" { name = "acctestRG-storage-%d" location = "%s" diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go index 8d4e45edc18ec..100125b1354d2 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_account_customer_managed_key_test.go @@ -207,6 +207,10 @@ resource "azurerm_storage_account_customer_managed_key" "test" { func testAccAzureRMStorageAccountCustomerManagedKey_template(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "current" {} provider "azurerm" { diff --git a/azurerm/internal/services/subscription/tests/data_source_subscription_test.go b/azurerm/internal/services/subscription/tests/data_source_subscription_test.go index d8591f6c3a4d3..a34ec1f9074e3 100644 --- a/azurerm/internal/services/subscription/tests/data_source_subscription_test.go +++ b/azurerm/internal/services/subscription/tests/data_source_subscription_test.go @@ -80,6 +80,10 @@ data "azurerm_subscription" "current" {} func testAccDataSourceAzureRMSubscription_specificConfig(subscriptionId string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_subscription" "specific" { subscription_id = "%s" } diff --git a/azurerm/internal/services/trafficmanager/tests/data_source_traffic_manager_geographical_location_test.go b/azurerm/internal/services/trafficmanager/tests/data_source_traffic_manager_geographical_location_test.go index 4e50fdd726ca2..900da53b1a9c2 100644 --- a/azurerm/internal/services/trafficmanager/tests/data_source_traffic_manager_geographical_location_test.go +++ b/azurerm/internal/services/trafficmanager/tests/data_source_traffic_manager_geographical_location_test.go @@ -82,6 +82,10 @@ func TestAccAzureRMDataSourceTrafficManagerGeographicalLocation_world(t *testing func testAccAzureRMDataSourceTrafficManagerGeographicalLocation_template(name string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_traffic_manager_geographical_location" "test" { name = "%s" } diff --git a/azurerm/internal/services/web/tests/resource_arm_app_service_certificate_test.go b/azurerm/internal/services/web/tests/resource_arm_app_service_certificate_test.go index 8b631db21f069..c19e4cbaca203 100644 --- a/azurerm/internal/services/web/tests/resource_arm_app_service_certificate_test.go +++ b/azurerm/internal/services/web/tests/resource_arm_app_service_certificate_test.go @@ -112,6 +112,10 @@ resource "azurerm_app_service_certificate" "test" { func testAccAzureRMAppServiceCertificateKeyVault(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + data "azurerm_client_config" "test" {} data "azuread_service_principal" "test" { diff --git a/azurerm/internal/services/web/tests/resource_arm_app_service_source_control_token_test.go b/azurerm/internal/services/web/tests/resource_arm_app_service_source_control_token_test.go index 7879f7d833c0c..92e77ced83a8c 100644 --- a/azurerm/internal/services/web/tests/resource_arm_app_service_source_control_token_test.go +++ b/azurerm/internal/services/web/tests/resource_arm_app_service_source_control_token_test.go @@ -38,6 +38,10 @@ func TestAccAzureRMAppServiceSourceControlToken(t *testing.T) { func testAccAzureRMAppServiceSourceControlToken(token, tokenSecret string) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_app_service_source_control_token" "test" { type = "GitHub" token = "%s" From 47b9db88ffb5eb7ed4fc70c464522fca1c829526 Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 27 Feb 2020 15:45:57 -0800 Subject: [PATCH 410/498] fix travis build --- ..._arm_virtual_machine_managed_disks_test.go | 6 ++-- .../tests/resource_arm_front_door_test.go | 2 +- .../tests/resource_arm_iothub_route_test.go | 4 +-- .../tests/data_source_key_vault_test.go | 10 +++--- .../tests/resource_arm_key_vault_test.go | 12 ++++--- ...rce_arm_monitor_activity_log_alert_test.go | 2 +- .../resource_arm_application_gateway_test.go | 4 +-- ...ource_arm_network_watcher_flow_log_test.go | 32 +++++++++---------- ...rm_postgresql_virtual_network_rule_test.go | 2 +- ...ce_arm_backup_protected_file_share_test.go | 4 +-- .../resource_arm_backup_protected_vm_test.go | 8 ++--- ...rce_arm_advanced_threat_protection_test.go | 6 ++-- .../tests/resource_arm_storage_blob_test.go | 3 +- .../resource_arm_storage_container_test.go | 3 +- .../tests/resource_arm_storage_queue_test.go | 3 +- 15 files changed, 54 insertions(+), 47 deletions(-) diff --git a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go index a28186a594719..e89202a4a4a0e 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go @@ -1220,9 +1220,9 @@ func testAccAzureRMVirtualMachine_requiresImport(data acceptance.TestData) strin %s resource "azurerm_virtual_machine" "import" { - name = azurerm_virtual_machine.test.name - location = azurerm_virtual_machine.test.location - resource_group_name = azurerm_virtual_machine.test.resource_group_name + name = azurerm_virtual_machine.test.name + location = azurerm_virtual_machine.test.location + resource_group_name = azurerm_virtual_machine.test.resource_group_name network_interface_ids = [azurerm_network_interface.test.id] vm_size = "Standard_D1_v2" diff --git a/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_test.go b/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_test.go index 5279eeb0796d5..79137b712825b 100644 --- a/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_test.go +++ b/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_test.go @@ -424,7 +424,7 @@ func testAccAzureRMFrontDoor_waf(data acceptance.TestData) string { return fmt.Sprintf(` provider "azurerm" { features { -} + } } resource "azurerm_resource_group" "test" { diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_route_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_route_test.go index d5fa90e44b2bd..350cd7cd07630 100644 --- a/azurerm/internal/services/iothub/tests/resource_arm_iothub_route_test.go +++ b/azurerm/internal/services/iothub/tests/resource_arm_iothub_route_test.go @@ -180,8 +180,8 @@ resource "azurerm_iothub_route" "import" { iothub_name = azurerm_iothub.test.name name = "acctest" - source = "DeviceMessages" - condition = "true" + source = "DeviceMessages" + condition = "true" endpoint_names = [azurerm_iothub_endpoint_storage_container.test.name] enabled = true } diff --git a/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go b/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go index 31f75de85424b..600e592c86a79 100644 --- a/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/data_source_key_vault_test.go @@ -147,11 +147,11 @@ data "azurerm_key_vault" "test" { func testAccDataSourceAzureRMKeyVault_enableSoftDelete(data acceptance.TestData) string { r := testAccAzureRMKeyVault_softDelete(data, true) return fmt.Sprintf(` -%s +%s -data "azurerm_key_vault" "test" { - name = "${azurerm_key_vault.test.name}" - resource_group_name = "${azurerm_key_vault.test.resource_group_name}" -} +data "azurerm_key_vault" "test" { + name = azurerm_key_vault.test.name + resource_group_name = azurerm_key_vault.test.resource_group_name +} `, r) } diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go index 2565491f53fe0..c201a4a38cc1f 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go @@ -729,9 +729,9 @@ resource "azurerm_key_vault" "test" { } network_acls { - default_action = "Allow" - bypass = "AzureServices" - ip_rules = ["123.0.0.102/32"] + default_action = "Allow" + bypass = "AzureServices" + ip_rules = ["123.0.0.102/32"] virtual_network_subnet_ids = [azurerm_subnet.test_a.id] } } @@ -999,7 +999,8 @@ resource "azurerm_key_vault" "test" { %s } -%s`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, accessPoliciesConfigs, storageAccountConfigs) +%s +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, accessPoliciesConfigs, storageAccountConfigs) } func testAccAzureRMKeyVault_generateStorageAccountConfigs(accountNum int, rs string) string { @@ -1077,7 +1078,8 @@ provider "azurerm" { features {} } -data "azurerm_client_config" "current" {} +data "azurerm_client_config" "current" { +} resource "azurerm_resource_group" "test" { name = "acctestRG-%d" diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_activity_log_alert_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_activity_log_alert_test.go index 2a59901820546..d24be72a43dc4 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_activity_log_alert_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_activity_log_alert_test.go @@ -217,7 +217,7 @@ func testAccAzureRMMonitorActivityLogAlert_requiresImport(data acceptance.TestDa resource "azurerm_monitor_activity_log_alert" "import" { name = azurerm_monitor_activity_log_alert.test.name resource_group_name = azurerm_monitor_activity_log_alert.test.resource_group_name - scopes = [azurerm_resource_group.test.id] + scopes = [azurerm_resource_group.test.id] criteria { category = "Recommendation" diff --git a/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go index bd018b99e8c2e..7714480af3ae9 100644 --- a/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go @@ -1855,7 +1855,7 @@ resource "azurerm_application_gateway" "test" { request_timeout = 1 pick_host_name_from_backend_address = true - trusted_root_certificate_names = [local.auth_cert_name] + trusted_root_certificate_names = [local.auth_cert_name] } trusted_root_certificate { @@ -2024,7 +2024,7 @@ resource "azurerm_application_gateway" "test" { request_timeout = 1 pick_host_name_from_backend_address = true - trusted_root_certificate_names = [local.auth_cert_name] + trusted_root_certificate_names = [local.auth_cert_name] } trusted_root_certificate { diff --git a/azurerm/internal/services/network/tests/resource_arm_network_watcher_flow_log_test.go b/azurerm/internal/services/network/tests/resource_arm_network_watcher_flow_log_test.go index aeb061e5060bc..4259d5c263035 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_watcher_flow_log_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_watcher_flow_log_test.go @@ -338,31 +338,31 @@ provider "azurerm" { } resource "azurerm_resource_group" "test" { - name = "acctestRG-watcher-%d" - location = "%s" + name = "acctestRG-watcher-%d" + location = "%s" } resource "azurerm_network_security_group" "test" { - name = "acctestNSG%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + name = "acctestNSG%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_network_watcher" "test" { - name = "acctest-NW-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + name = "acctest-NW-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_storage_account" "test" { - name = "acctestsa%d" - resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.test.location}" - - account_tier = "Standard" - account_kind = "StorageV2" - account_replication_type = "LRS" - enable_https_traffic_only = true + name = "acctestsa%d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + + account_tier = "Standard" + account_kind = "StorageV2" + account_replication_type = "LRS" + enable_https_traffic_only = true } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger%1000000) } diff --git a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_virtual_network_rule_test.go b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_virtual_network_rule_test.go index 829f5692d90ad..60ec25e07ca55 100644 --- a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_virtual_network_rule_test.go +++ b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_virtual_network_rule_test.go @@ -550,7 +550,7 @@ resource "azurerm_postgresql_server" "test" { location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - sku_name = "GP_Gen5_2" + sku_name = "GP_Gen5_2" storage_profile { storage_mb = 51200 diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_file_share_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_file_share_test.go index dc949ddbd29ac..669170431ce89 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_file_share_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_file_share_test.go @@ -208,9 +208,9 @@ resource "azurerm_storage_share" "test" { name = "acctest-ss-%[1]d" storage_account_name = "${azurerm_storage_account.test.name}" metadata = {} - + lifecycle { - ignore_changes = [metadata] // Ignore changes Azure Backup makes to the metadata + ignore_changes = [metadata] // Ignore changes Azure Backup makes to the metadata } } diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_vm_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_vm_test.go index 8463048e3361b..3153bcee1a0b2 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_vm_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_vm_test.go @@ -507,10 +507,10 @@ func testAccAzureRMBackupProtectedVm_withVM(data acceptance.TestData) string { %s resource "azurerm_virtual_machine" "test" { - name = "acctestvm-%d" - location = azurerm_resource_group.test.location - resource_group_name = azurerm_resource_group.test.name - vm_size = "Standard_A0" + name = "acctestvm-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + vm_size = "Standard_A0" network_interface_ids = [azurerm_network_interface.test.id] delete_os_disk_on_termination = true diff --git a/azurerm/internal/services/securitycenter/tests/resource_arm_advanced_threat_protection_test.go b/azurerm/internal/services/securitycenter/tests/resource_arm_advanced_threat_protection_test.go index 2e14ad428e80a..6843981d208e1 100644 --- a/azurerm/internal/services/securitycenter/tests/resource_arm_advanced_threat_protection_test.go +++ b/azurerm/internal/services/securitycenter/tests/resource_arm_advanced_threat_protection_test.go @@ -237,7 +237,8 @@ resource "azurerm_storage_account" "test" { } } -%s`, data.RandomInteger, data.Locations.Primary, data.RandomString, atp) +%s +`, data.RandomInteger, data.Locations.Primary, data.RandomString, atp) } func testAccAzureRMAdvancedThreatProtection_cosmosAccount(data acceptance.TestData, hasResource, enabled bool) string { @@ -277,5 +278,6 @@ resource "azurerm_cosmosdb_account" "test" { } } -%s`, data.RandomInteger, data.Locations.Primary, data.RandomString, atp) +%s +`, data.RandomInteger, data.Locations.Primary, data.RandomString, atp) } diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go index c9587ceb60505..ac1d91a7dee1d 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go @@ -809,7 +809,8 @@ provider "azurerm" { storage_use_azuread = true } -%s`, template) +%s +`, template) } func testAccAzureRMStorageBlob_blockEmptyMetaData(data acceptance.TestData) string { diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_container_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_container_test.go index 7fb446d66e911..fa0f16071db17 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_container_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_container_test.go @@ -324,7 +324,8 @@ provider "azurerm" { storage_use_azuread = true } -%s`, template) +%s +`, template) } func testAccAzureRMStorageContainer_requiresImport(data acceptance.TestData) string { diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_queue_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_queue_test.go index 2a2b60d59ecf0..349c500329b6f 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_queue_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_queue_test.go @@ -237,7 +237,8 @@ provider "azurerm" { storage_use_azuread = true } -%s`, template) +%s +`, template) } func testAccAzureRMStorageQueue_requiresImport(data acceptance.TestData) string { From 60eecae0a85d1ab32c8aafc2eb9eb7a7a45a6744 Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 27 Feb 2020 16:07:39 -0800 Subject: [PATCH 411/498] azurerm_storage_account - allow up to 50 tags --- .../storage/resource_arm_storage_account.go | 12 +---- .../resource_arm_storage_account_test.go | 50 +++++++++++++++++++ 2 files changed, 52 insertions(+), 10 deletions(-) diff --git a/azurerm/internal/services/storage/resource_arm_storage_account.go b/azurerm/internal/services/storage/resource_arm_storage_account.go index 234ed14b58bd4..731c113cdbf39 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account.go @@ -224,16 +224,6 @@ func resourceArmStorageAccount() *schema.Resource { }, }, - "tags": { - Type: schema.TypeMap, - Optional: true, - Computed: true, - ValidateFunc: validateAzureRMStorageAccountTags, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - "blob_properties": { Type: schema.TypeList, Optional: true, @@ -543,6 +533,8 @@ func resourceArmStorageAccount() *schema.Resource { Computed: true, Sensitive: true, }, + + "tags": tags.Schema(), }, } } diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go index 23811ddb0629f..12877b3aba3c2 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go @@ -95,6 +95,25 @@ func TestAccAzureRMStorageAccount_requiresImport(t *testing.T) { }) } +func TestAccAzureRMStorageAccount_tagCount(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_storage_account", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMStorageAccountDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMStorageAccount_tagCount(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMStorageAccountExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + func TestAccAzureRMStorageAccount_writeLock(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_storage_account", "test") @@ -671,6 +690,37 @@ resource "azurerm_storage_account" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomString) } +func testAccAzureRMStorageAccount_tagCount(data acceptance.TestData) string { + tags := "" + for i := 0; i < 50; i++ { + tags += fmt.Sprintf("t%d = \"v%d\"\n", i, i) + } + + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-storage-%d" + location = "%s" +} + +resource "azurerm_storage_account" "test" { + name = "unlikely23exst2acct%s" + resource_group_name = azurerm_resource_group.test.name + + location = azurerm_resource_group.test.location + account_tier = "Standard" + account_replication_type = "LRS" + + tags = { + %s + } +} +`, data.RandomInteger, data.Locations.Primary, data.RandomString, tags) +} + func testAccAzureRMStorageAccount_requiresImport(data acceptance.TestData) string { template := testAccAzureRMStorageAccount_basic(data) return fmt.Sprintf(` From e7bb49289ce1c7e746587f5564f4d07eee93be6c Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 27 Feb 2020 16:35:12 -0800 Subject: [PATCH 412/498] azurerm_search_service - the properties replica_count & partition_count are no longer force new --- .../search/resource_arm_search_service.go | 9 ++++--- .../tests/resource_arm_search_service_test.go | 24 +++++++++---------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/azurerm/internal/services/search/resource_arm_search_service.go b/azurerm/internal/services/search/resource_arm_search_service.go index 519af73a2de59..a71b7c694bf42 100644 --- a/azurerm/internal/services/search/resource_arm_search_service.go +++ b/azurerm/internal/services/search/resource_arm_search_service.go @@ -66,14 +66,13 @@ func resourceArmSearchService() *schema.Resource { Type: schema.TypeInt, Optional: true, Computed: true, - ForceNew: true, }, "partition_count": { - Type: schema.TypeInt, - Optional: true, - Computed: true, - ForceNew: true, + Type: schema.TypeInt, + Optional: true, + Computed: true, + ValidateFunc: validation.IntAtMost(12), }, "primary_key": { diff --git a/azurerm/internal/services/search/tests/resource_arm_search_service_test.go b/azurerm/internal/services/search/tests/resource_arm_search_service_test.go index 857a0de509fc8..e6801b1ad6502 100644 --- a/azurerm/internal/services/search/tests/resource_arm_search_service_test.go +++ b/azurerm/internal/services/search/tests/resource_arm_search_service_test.go @@ -81,7 +81,7 @@ func TestAccAzureRMSearchService_complete(t *testing.T) { }) } -func TestAccAzureRMSearchService_tagUpdate(t *testing.T) { +func TestAccAzureRMSearchService_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_search_service", "test") resource.ParallelTest(t, resource.TestCase{ @@ -90,7 +90,7 @@ func TestAccAzureRMSearchService_tagUpdate(t *testing.T) { CheckDestroy: testCheckAzureRMSearchServiceDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMSearchService_withCustomTagValue(data, "staging"), + Config: testAccAzureRMSearchService_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMSearchServiceExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"), @@ -98,11 +98,11 @@ func TestAccAzureRMSearchService_tagUpdate(t *testing.T) { ), }, { - Config: testAccAzureRMSearchService_withCustomTagValue(data, "production"), + Config: testAccAzureRMSearchService_complete(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMSearchServiceExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.environment", "production"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "2"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.environment", "Production"), ), }, }, @@ -166,7 +166,7 @@ func testCheckAzureRMSearchServiceDestroy(s *terraform.State) error { return nil } -func testAccAzureRMSearchService_withCustomTagValue(data acceptance.TestData, tagValue string) string { +func testAccAzureRMSearchService_basic(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-%d" @@ -180,14 +180,10 @@ resource "azurerm_search_service" "test" { sku = "standard" tags = { - environment = "%s" + environment = "staging" } } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, tagValue) -} - -func testAccAzureRMSearchService_basic(data acceptance.TestData) string { - return testAccAzureRMSearchService_withCustomTagValue(data, "staging") +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } func testAccAzureRMSearchService_requiresImport(data acceptance.TestData) string { @@ -220,9 +216,11 @@ resource "azurerm_search_service" "test" { location = "${azurerm_resource_group.test.location}" sku = "standard" replica_count = 2 + partition_count = 3 tags = { - environment = "production" + environment = "Production" + residential = "Area" } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) From c5f2d1b6ec7d64553b608c9d009cd3034a9d8570 Mon Sep 17 00:00:00 2001 From: Steve <11830746+jackofallops@users.noreply.github.com> Date: Fri, 28 Feb 2020 10:30:09 +0000 Subject: [PATCH 413/498] updated for 5915 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73110284a5b78..65c0c53e6046e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ IMPROVEMENTS: BUG FIXES: * `azurerm_linux_virtual_machine_scale_set` - correct `source_image_id` validation [GH-5901] +* `azurerm_app_service_plan` - no longer sends an empty `app_service_environment_id` property on update [GH-5915] ## 2.0.0 (February 24, 2020) From f7884f12e76d2c702f0fa8080cb1bbff868ab7ce Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 28 Feb 2020 10:41:03 -0800 Subject: [PATCH 414/498] Update CHANGELOG.md to include #5935 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65c0c53e6046e..a7f2b665b28c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ BUG FIXES: * `azurerm_linux_virtual_machine_scale_set` - correct `source_image_id` validation [GH-5901] * `azurerm_app_service_plan` - no longer sends an empty `app_service_environment_id` property on update [GH-5915] - +* `azurerm_search_service` - changing the properties `replica_count` & `partition_count` properties no longer force a new resource [GH-5935] ## 2.0.0 (February 24, 2020) NOTES: From 29ac33a177d4c00ed6c941ee6284c21d3dbb4d05 Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 28 Feb 2020 10:54:59 -0800 Subject: [PATCH 415/498] allow proper key length --- .../storage/resource_arm_storage_account.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/azurerm/internal/services/storage/resource_arm_storage_account.go b/azurerm/internal/services/storage/resource_arm_storage_account.go index 731c113cdbf39..4df3721c5ddef 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account.go @@ -534,7 +534,14 @@ func resourceArmStorageAccount() *schema.Resource { Sensitive: true, }, - "tags": tags.Schema(), + "tags": { + Type: schema.TypeMap, + Optional: true, + ValidateFunc: validateAzureRMStorageAccountTags, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, }, } } @@ -542,8 +549,8 @@ func resourceArmStorageAccount() *schema.Resource { func validateAzureRMStorageAccountTags(v interface{}, _ string) (warnings []string, errors []error) { tagsMap := v.(map[string]interface{}) - if len(tagsMap) > 15 { - errors = append(errors, fmt.Errorf("a maximum of 15 tags can be applied to storage account ARM resource")) + if len(tagsMap) > 50 { + errors = append(errors, fmt.Errorf("a maximum of 50 tags can be applied to storage account ARM resource")) } for k, v := range tagsMap { From 4447f434f3101f13791955a21cd55aa10081b627 Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 28 Feb 2020 12:04:50 -0800 Subject: [PATCH 416/498] Update CHANGELOG.md to include #5934 --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7f2b665b28c6..9d387f0c8482c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,10 @@ IMPROVEMENTS: * `azurerm_automation_dsc_configuration` - support for the `tags` property [GH-5827] +* `azurerm_function_app` - Added `os_type` field to facilitate support of `linux` function apps [GH-5839] * `azurerm_private_endpoint` - exposed `private_ip_address` as a computed attribute [GH-5838] * `azurerm_virtual_wan` - support for the `type` property [GH-5877] -* `azurerm_function_app` - Added `os_type` field to facilitate support of `linux` function apps [GH-5839] +* `azurerm_storage_account` - support up to 50 tags [GH-5934] BUG FIXES: From 63de9074a10544df55b4ad70ec8bb30ac0150592 Mon Sep 17 00:00:00 2001 From: Jack Batzner Date: Fri, 28 Feb 2020 14:42:37 -0600 Subject: [PATCH 417/498] New Data Source: 'azurerm_kusto_cluster' === RUN TestAccDataSourceAzureRMKustoCluster_basic === PAUSE TestAccDataSourceAzureRMKustoCluster_basic === CONT TestAccDataSourceAzureRMKustoCluster_basic --- PASS: TestAccDataSourceAzureRMKustoCluster_basic (1889.74s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/kusto/tests 1889.859s --- .../kusto/data_source_kusto_cluster.go | 80 +++++++++++++++++++ .../internal/services/kusto/registration.go | 4 +- .../tests/data_source_kusto_cluster_test.go | 41 ++++++++++ website/azurerm.erb | 4 + website/docs/d/kusto_cluster.html.markdown | 44 ++++++++++ 5 files changed, 172 insertions(+), 1 deletion(-) create mode 100644 azurerm/internal/services/kusto/data_source_kusto_cluster.go create mode 100644 azurerm/internal/services/kusto/tests/data_source_kusto_cluster_test.go create mode 100644 website/docs/d/kusto_cluster.html.markdown diff --git a/azurerm/internal/services/kusto/data_source_kusto_cluster.go b/azurerm/internal/services/kusto/data_source_kusto_cluster.go new file mode 100644 index 0000000000000..255b8604c9309 --- /dev/null +++ b/azurerm/internal/services/kusto/data_source_kusto_cluster.go @@ -0,0 +1,80 @@ +package kusto + +import ( + "fmt" + "time" + + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func dataSourceArmKustoCluster() *schema.Resource { + return &schema.Resource{ + Read: dataSourceArmKustoClusterRead, + + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(5 * time.Minute), + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validateAzureRMKustoClusterName, + }, + + "resource_group_name": azure.SchemaResourceGroupNameForDataSource(), + + "location": azure.SchemaLocationForDataSource(), + + "uri": { + Type: schema.TypeString, + Computed: true, + }, + + "data_ingestion_uri": { + Type: schema.TypeString, + Computed: true, + }, + + "tags": tags.Schema(), + }, + } +} + +func dataSourceArmKustoClusterRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Kusto.ClustersClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + name := d.Get("name").(string) + resourceGroup := d.Get("resource_group_name").(string) + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Kusto Cluster %q (Resource Group %q) does not exist", name, resourceGroup) + } + return fmt.Errorf("Error retrieving Kusto Cluster %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + d.SetId(*resp.ID) + + d.Set("name", name) + d.Set("resource_group_name", resourceGroup) + + if location := resp.Location; location != nil { + d.Set("location", azure.NormalizeLocation(*location)) + } + + if clusterProperties := resp.ClusterProperties; clusterProperties != nil { + d.Set("uri", clusterProperties.URI) + d.Set("data_ingestion_uri", clusterProperties.DataIngestionURI) + } + + return tags.FlattenAndSet(d, resp.Tags) +} diff --git a/azurerm/internal/services/kusto/registration.go b/azurerm/internal/services/kusto/registration.go index 41b79e6fd1898..6a0414cffb4ef 100644 --- a/azurerm/internal/services/kusto/registration.go +++ b/azurerm/internal/services/kusto/registration.go @@ -20,7 +20,9 @@ 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{} + return map[string]*schema.Resource{ + "azurerm_kusto_cluster": dataSourceArmKustoCluster(), + } } // SupportedResources returns the supported Resources supported by this Service diff --git a/azurerm/internal/services/kusto/tests/data_source_kusto_cluster_test.go b/azurerm/internal/services/kusto/tests/data_source_kusto_cluster_test.go new file mode 100644 index 0000000000000..cfc84acb348de --- /dev/null +++ b/azurerm/internal/services/kusto/tests/data_source_kusto_cluster_test.go @@ -0,0 +1,41 @@ +package tests + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" +) + +func TestAccDataSourceAzureRMKustoCluster_basic(t *testing.T) { + data := acceptance.BuildTestData(t, "data.azurerm_kusto_cluster", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMKustoClusterDestroy, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAzureRMKustoCluster_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMKustoClusterExists(data.ResourceName), + resource.TestCheckResourceAttrSet(data.ResourceName, "uri"), + resource.TestCheckResourceAttrSet(data.ResourceName, "data_ingestion_uri"), + ), + }, + }, + }) +} + +func testAccDataSourceAzureRMKustoCluster_basic(data acceptance.TestData) string { + template := testAccAzureRMKustoCluster_basic(data) + return fmt.Sprintf(` +%s + +data "azurerm_kusto_cluster" "test" { + name = azurerm_kusto_cluster.test.name + resource_group_name = azurerm_resource_group.test.name +} +`, template) +} diff --git a/website/azurerm.erb b/website/azurerm.erb index 398d86c79bd18..58330f5ec66eb 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -270,6 +270,10 @@ azurerm_kubernetes_service_versions +
        • + azurerm_kusto_cluster +
          • +
        • azurerm_lb
          • diff --git a/website/docs/d/kusto_cluster.html.markdown b/website/docs/d/kusto_cluster.html.markdown new file mode 100644 index 0000000000000..e8f587fe5a59c --- /dev/null +++ b/website/docs/d/kusto_cluster.html.markdown @@ -0,0 +1,44 @@ +--- +subcategory: "Data Explorer" +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_kusto_cluster" +description: |- + Get information about an existing Kusto (also known as Azure Data Explorer) Cluster +--- + +# Data Source: azurerm_kusto_cluster + +Use this data source to access information about an existing Kusto (also known as Azure Data Explorer) Cluster + +## Example Usage + +```hcl +data "azurerm_kusto_cluster" "example" { + name = "kustocluster" + resource_group_name = "test_resource_group" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - Specifies the name of the Kusto Cluster. + +* `resource_group_name` - The name of the Resource Group where the Kusto Cluster exists. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The Kusto Cluster ID. + +* `uri` - The FQDN of the Azure Kusto Cluster. + +* `data_ingestion_uri` - The Kusto Cluster URI to be used for data ingestion. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: + +* `read` - (Defaults to 5 minutes) Used when retrieving the Kusto Cluster. \ No newline at end of file From fabcb5e69a196e9c1e0124fb34559f7853d3da10 Mon Sep 17 00:00:00 2001 From: Jack Batzner Date: Fri, 28 Feb 2020 15:18:03 -0600 Subject: [PATCH 418/498] Schema for data source on "tags" --- azurerm/internal/services/kusto/data_source_kusto_cluster.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/kusto/data_source_kusto_cluster.go b/azurerm/internal/services/kusto/data_source_kusto_cluster.go index 255b8604c9309..1a8d4fd389c48 100644 --- a/azurerm/internal/services/kusto/data_source_kusto_cluster.go +++ b/azurerm/internal/services/kusto/data_source_kusto_cluster.go @@ -41,7 +41,7 @@ func dataSourceArmKustoCluster() *schema.Resource { Computed: true, }, - "tags": tags.Schema(), + "tags": tags.SchemaDataSource(), }, } } From e2519a3100c1e908abd3cac8aff89715ca463958 Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 28 Feb 2020 13:19:34 -0800 Subject: [PATCH 419/498] Update CHANGELOG.md to include #5876 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d387f0c8482c..3d5846a11092a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,9 +10,12 @@ IMPROVEMENTS: BUG FIXES: -* `azurerm_linux_virtual_machine_scale_set` - correct `source_image_id` validation [GH-5901] * `azurerm_app_service_plan` - no longer sends an empty `app_service_environment_id` property on update [GH-5915] +* `azurerm_automation_schedule` - fix time validation [GH-5876] +* `azurerm_linux_virtual_machine_scale_set` - correct `source_image_id` validation [GH-5901] * `azurerm_search_service` - changing the properties `replica_count` & `partition_count` properties no longer force a new resource [GH-5935] + + ## 2.0.0 (February 24, 2020) NOTES: From fb94b8c4d1b8b098acb93886c972f0f22e940225 Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 28 Feb 2020 17:07:02 -0800 Subject: [PATCH 420/498] Update CHANGELOG.md to include #5942 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d5846a11092a..a2f0489fa61ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ## 2.1.0 (Unreleased) +FEATURES: +* **New Data Source:** `azurerm_kusto_cluster` [GH-5942] + IMPROVEMENTS: * `azurerm_automation_dsc_configuration` - support for the `tags` property [GH-5827] From ccd40ae4c4be510f485a8673588b32bd175d675d Mon Sep 17 00:00:00 2001 From: WS <20408400+WodansSon@users.noreply.github.com> Date: Fri, 28 Feb 2020 18:04:27 -0800 Subject: [PATCH 421/498] Bug: `azurerm_frontdoor_firewall_policy` add validation for Frontdoor WAF Name Restrictions (#5943) * Fix for #5932 * Add test cases for ValidateFrontDoorWAFName --- .../resource_arm_frontdoor_firewall_policy.go | 2 +- ...rce_arm_front_door_firewall_policy_test.go | 85 +++++++++++++++++++ .../internal/services/frontdoor/validate.go | 8 ++ 3 files changed, 94 insertions(+), 1 deletion(-) diff --git a/azurerm/internal/services/frontdoor/resource_arm_frontdoor_firewall_policy.go b/azurerm/internal/services/frontdoor/resource_arm_frontdoor_firewall_policy.go index 218d1c1e23b92..2337cf55cee7c 100644 --- a/azurerm/internal/services/frontdoor/resource_arm_frontdoor_firewall_policy.go +++ b/azurerm/internal/services/frontdoor/resource_arm_frontdoor_firewall_policy.go @@ -41,7 +41,7 @@ func resourceArmFrontDoorFirewallPolicy() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: validation.StringIsNotEmpty, + ValidateFunc: ValidateFrontDoorWAFName, }, "location": azure.SchemaLocationForDataSource(), diff --git a/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_firewall_policy_test.go b/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_firewall_policy_test.go index e20d0d22d77bd..fb0cc3e425cac 100644 --- a/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_firewall_policy_test.go +++ b/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_firewall_policy_test.go @@ -9,9 +9,94 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/frontdoor" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) +func TestAccAzureRMFrontDoorFirewallPolicy_validateName(t *testing.T) { + cases := []struct { + Name string + Input string + ExpectError bool + }{ + { + Name: "Empty String", + Input: "", + ExpectError: true, + }, + { + Name: "Starst with Numeric", + Input: "1WellThisIsAllWrong", + ExpectError: true, + }, + { + Name: "Has Spaces", + Input: "What part of no spaces do you not understand", + ExpectError: true, + }, + { + Name: "Has Hyphens", + Input: "What-part-of-no-hyphens-do-you-not-understand", + ExpectError: true, + }, + { + Name: "Special Characters", + Input: "WellArn`tTheseSpecialCharacters?!", + ExpectError: true, + }, + { + Name: "Mixed Case Alpha and Numeric", + Input: "ThisNameIsAPerfectlyFine1", + ExpectError: false, + }, + { + Name: "Too Long", + Input: "OhMyLordyThisNameIsWayToLooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooog", + ExpectError: true, + }, + { + Name: "Max Length", + Input: "NowThisNameIsThePerfectLengthForAFrontdoorFireWallPolicyDontYouThinkAnyLongerWouldBeJustWayToLoooooooooooooooooooongDontYouThink", + ExpectError: false, + }, + { + Name: "Minimum Length Upper", + Input: "A", + ExpectError: false, + }, + { + Name: "Minimum Length Lower", + Input: "a", + ExpectError: false, + }, + { + Name: "Mixed Case Alpha no Numeric", + Input: "LookMomNoNumbers", + ExpectError: false, + }, + { + Name: "All Upper Alpha with Numeric", + Input: "OU812", + ExpectError: false, + }, + { + Name: "All lower no Numeric", + Input: "heythisisalllowercase", + ExpectError: false, + }, + } + + for _, tc := range cases { + _, errors := frontdoor.ValidateFrontDoorWAFName(tc.Input, tc.Name) + + hasError := len(errors) > 0 + + if tc.ExpectError && !hasError { + t.Fatalf("Expected the FrontDoor WAF Name to trigger a validation error for '%s'", tc.Name) + } + } +} + func TestAccAzureRMFrontDoorFirewallPolicy_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_frontdoor_firewall_policy", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/frontdoor/validate.go b/azurerm/internal/services/frontdoor/validate.go index 0a78075a9d85e..872bd54f09ae9 100644 --- a/azurerm/internal/services/frontdoor/validate.go +++ b/azurerm/internal/services/frontdoor/validate.go @@ -15,6 +15,14 @@ func ValidateFrontDoorName(i interface{}, k string) (_ []string, errors []error) return nil, errors } +func ValidateFrontDoorWAFName(i interface{}, k string) (_ []string, errors []error) { + if m, regexErrs := validate.RegExHelper(i, k, `(^[a-zA-Z])([\da-zA-Z]{0,127})$`); !m { + errors = append(regexErrs, fmt.Errorf(`%q must be between 1 and 128 characters in length, must begin with a letter and may only contain letters and numbers.`, k)) + } + + return nil, errors +} + func ValidateBackendPoolRoutingRuleName(i interface{}, k string) (_ []string, errors []error) { if m, regexErrs := validate.RegExHelper(i, k, `(^[\da-zA-Z])([-\da-zA-Z]{1,88})([\da-zA-Z]$)`); !m { errors = append(regexErrs, fmt.Errorf(`%q must be between 1 and 90 characters in length and begin with a letter or number, end with a letter or number and may contain only letters, numbers or hyphens.`, k)) From b83b4225d1b9c62c25b10addb3ace4b24d7c275e Mon Sep 17 00:00:00 2001 From: WS <20408400+WodansSon@users.noreply.github.com> Date: Fri, 28 Feb 2020 18:08:41 -0800 Subject: [PATCH 422/498] Updating to include #5943 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a2f0489fa61ec..0123a4d4fc78c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ BUG FIXES: * `azurerm_app_service_plan` - no longer sends an empty `app_service_environment_id` property on update [GH-5915] * `azurerm_automation_schedule` - fix time validation [GH-5876] +* `azurerm_frontdoor_firewall_policy` - add validation for Frontdoor WAF Name Restrictions [GH-5943] * `azurerm_linux_virtual_machine_scale_set` - correct `source_image_id` validation [GH-5901] * `azurerm_search_service` - changing the properties `replica_count` & `partition_count` properties no longer force a new resource [GH-5935] From b70848bc6b9697c33ce1e8d54bcfede1c0e8f50c Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 28 Feb 2020 18:14:10 -0800 Subject: [PATCH 423/498] Update CHANGELOG.md to include #5837 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0123a4d4fc78c..b8fad73cf3bcb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ BUG FIXES: * `azurerm_app_service_plan` - no longer sends an empty `app_service_environment_id` property on update [GH-5915] * `azurerm_automation_schedule` - fix time validation [GH-5876] +* `azurerm_dns_txt_record` - support records up to `1024` characters in length [GH-5837] * `azurerm_frontdoor_firewall_policy` - add validation for Frontdoor WAF Name Restrictions [GH-5943] * `azurerm_linux_virtual_machine_scale_set` - correct `source_image_id` validation [GH-5901] * `azurerm_search_service` - changing the properties `replica_count` & `partition_count` properties no longer force a new resource [GH-5935] From 5eb58615772e78bc8ad04a4bca8ac6adfddd5f43 Mon Sep 17 00:00:00 2001 From: Tom von Schwerdtner Date: Sat, 29 Feb 2020 15:55:30 -0500 Subject: [PATCH 424/498] Enable syntax highlighting --- website/docs/r/monitor_diagnostic_setting.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/monitor_diagnostic_setting.html.markdown b/website/docs/r/monitor_diagnostic_setting.html.markdown index 4bad42609412a..eb474ca5d3596 100644 --- a/website/docs/r/monitor_diagnostic_setting.html.markdown +++ b/website/docs/r/monitor_diagnostic_setting.html.markdown @@ -13,7 +13,7 @@ Manages a Diagnostic Setting for an existing Resource. ## Example Usage -``` +```hcl resource "azurerm_resource_group" "example" { name = "example-resources" location = "West Europe" From 9e987d57f384e332c772ec6681c9b97a383e833e Mon Sep 17 00:00:00 2001 From: Austin Cheung Date: Sat, 29 Feb 2020 13:12:03 -0800 Subject: [PATCH 425/498] v0.12 changes --- .../kusto/tests/resource_arm_kusto_cluster_test.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go b/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go index cd91d0b0f9a7c..0de371fb47933 100644 --- a/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go +++ b/azurerm/internal/services/kusto/tests/resource_arm_kusto_cluster_test.go @@ -233,6 +233,10 @@ resource "azurerm_kusto_cluster" "test" { func testAccAzureRMKustoCluster_update(data acceptance.TestData) string { return fmt.Sprintf(` +provider "azurerm" { + features {} +} + resource "azurerm_resource_group" "test" { name = "acctestRG-%d" location = "%s" @@ -240,8 +244,8 @@ resource "azurerm_resource_group" "test" { resource "azurerm_kusto_cluster" "test" { name = "acctestkc%s" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name enable_disk_encryption = true enable_streaming_ingest = true From f4e10450696c49ed796f91884888c9133a864973 Mon Sep 17 00:00:00 2001 From: njucz <740360112@qq.com> Date: Mon, 2 Mar 2020 11:11:24 +0800 Subject: [PATCH 426/498] export fqdn attribute in private dns record resource --- .../privatedns/resource_arm_private_dns_a_record.go | 6 ++++++ .../privatedns/resource_arm_private_dns_aaaa_record.go | 6 ++++++ .../privatedns/resource_arm_private_dns_cname_record.go | 6 ++++++ .../privatedns/resource_arm_private_dns_mx_record.go | 6 ++++++ .../privatedns/resource_arm_private_dns_ptr_record.go | 6 ++++++ .../privatedns/resource_arm_private_dns_srv_record.go | 6 ++++++ .../tests/resource_arm_private_dns_a_record_test.go | 1 + .../tests/resource_arm_private_dns_aaaa_record_test.go | 1 + .../tests/resource_arm_private_dns_cname_record_test.go | 1 + .../tests/resource_arm_private_dns_mx_record_test.go | 1 + .../tests/resource_arm_private_dns_ptr_record_test.go | 1 + .../tests/resource_arm_private_dns_srv_record_test.go | 1 + website/docs/r/private_dns_a_record.html.markdown | 2 ++ website/docs/r/private_dns_aaaa_record.html.markdown | 2 ++ website/docs/r/private_dns_cname_record.html.markdown | 2 ++ website/docs/r/private_dns_mx_record.html.markdown | 2 ++ website/docs/r/private_dns_ptr_record.html.markdown | 2 ++ website/docs/r/private_dns_srv_record.html.markdown | 2 ++ 18 files changed, 54 insertions(+) diff --git a/azurerm/internal/services/privatedns/resource_arm_private_dns_a_record.go b/azurerm/internal/services/privatedns/resource_arm_private_dns_a_record.go index b85f444d95108..cc76e796619b8 100644 --- a/azurerm/internal/services/privatedns/resource_arm_private_dns_a_record.go +++ b/azurerm/internal/services/privatedns/resource_arm_private_dns_a_record.go @@ -63,6 +63,11 @@ func resourceArmPrivateDnsARecord() *schema.Resource { Required: true, }, + "fqdn": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tags.Schema(), }, } @@ -149,6 +154,7 @@ func resourceArmPrivateDnsARecordRead(d *schema.ResourceData, meta interface{}) d.Set("resource_group_name", resGroup) d.Set("zone_name", zoneName) d.Set("ttl", resp.TTL) + d.Set("fqdn", resp.Fqdn) if err := d.Set("records", flattenAzureRmPrivateDnsARecords(resp.ARecords)); err != nil { return err diff --git a/azurerm/internal/services/privatedns/resource_arm_private_dns_aaaa_record.go b/azurerm/internal/services/privatedns/resource_arm_private_dns_aaaa_record.go index 932ccee4fdfcc..ab8e0178996b2 100644 --- a/azurerm/internal/services/privatedns/resource_arm_private_dns_aaaa_record.go +++ b/azurerm/internal/services/privatedns/resource_arm_private_dns_aaaa_record.go @@ -60,6 +60,11 @@ func resourceArmPrivateDnsAaaaRecord() *schema.Resource { Required: true, }, + "fqdn": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tags.Schema(), }, } @@ -146,6 +151,7 @@ func resourceArmPrivateDnsAaaaRecordRead(d *schema.ResourceData, meta interface{ d.Set("resource_group_name", resGroup) d.Set("zone_name", zoneName) d.Set("ttl", resp.TTL) + d.Set("fqdn", resp.Fqdn) if err := d.Set("records", flattenAzureRmPrivateDnsAaaaRecords(resp.AaaaRecords)); err != nil { return err diff --git a/azurerm/internal/services/privatedns/resource_arm_private_dns_cname_record.go b/azurerm/internal/services/privatedns/resource_arm_private_dns_cname_record.go index 6eac1023392ba..e67581c1bdd08 100644 --- a/azurerm/internal/services/privatedns/resource_arm_private_dns_cname_record.go +++ b/azurerm/internal/services/privatedns/resource_arm_private_dns_cname_record.go @@ -65,6 +65,11 @@ func resourceArmPrivateDnsCNameRecord() *schema.Resource { ValidateFunc: validation.IntBetween(1, 2147483647), }, + "fqdn": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tags.Schema(), }, } @@ -154,6 +159,7 @@ func resourceArmPrivateDnsCNameRecordRead(d *schema.ResourceData, meta interface d.Set("resource_group_name", resGroup) d.Set("zone_name", zoneName) d.Set("ttl", resp.TTL) + d.Set("fqdn", resp.Fqdn) if props := resp.RecordSetProperties; props != nil { if record := props.CnameRecord; record != nil { diff --git a/azurerm/internal/services/privatedns/resource_arm_private_dns_mx_record.go b/azurerm/internal/services/privatedns/resource_arm_private_dns_mx_record.go index f099109f21bae..4eb08bdbc3304 100644 --- a/azurerm/internal/services/privatedns/resource_arm_private_dns_mx_record.go +++ b/azurerm/internal/services/privatedns/resource_arm_private_dns_mx_record.go @@ -81,6 +81,11 @@ func resourceArmPrivateDnsMxRecord() *schema.Resource { ValidateFunc: validation.IntBetween(1, 2147483647), }, + "fqdn": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tags.Schema(), }, } @@ -165,6 +170,7 @@ func resourceArmPrivateDnsMxRecordRead(d *schema.ResourceData, meta interface{}) d.Set("resource_group_name", resGroup) d.Set("zone_name", zoneName) d.Set("ttl", resp.TTL) + d.Set("fqdn", resp.Fqdn) if err := d.Set("record", flattenAzureRmPrivateDnsMxRecords(resp.MxRecords)); err != nil { return err diff --git a/azurerm/internal/services/privatedns/resource_arm_private_dns_ptr_record.go b/azurerm/internal/services/privatedns/resource_arm_private_dns_ptr_record.go index cec024a9b510c..731e3aa1fc88d 100644 --- a/azurerm/internal/services/privatedns/resource_arm_private_dns_ptr_record.go +++ b/azurerm/internal/services/privatedns/resource_arm_private_dns_ptr_record.go @@ -66,6 +66,11 @@ func resourceArmPrivateDnsPtrRecord() *schema.Resource { ValidateFunc: validation.IntBetween(1, 2147483647), }, + "fqdn": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tags.Schema(), }, } @@ -152,6 +157,7 @@ func resourceArmPrivateDnsPtrRecordRead(d *schema.ResourceData, meta interface{} d.Set("resource_group_name", resGroup) d.Set("zone_name", zoneName) d.Set("ttl", resp.TTL) + d.Set("fqdn", resp.Fqdn) if props := resp.RecordSetProperties; props != nil { if err := d.Set("records", flattenAzureRmPrivateDnsPtrRecords(resp.PtrRecords)); err != nil { diff --git a/azurerm/internal/services/privatedns/resource_arm_private_dns_srv_record.go b/azurerm/internal/services/privatedns/resource_arm_private_dns_srv_record.go index be99dbf21836f..5295f33546153 100644 --- a/azurerm/internal/services/privatedns/resource_arm_private_dns_srv_record.go +++ b/azurerm/internal/services/privatedns/resource_arm_private_dns_srv_record.go @@ -91,6 +91,11 @@ func resourceArmPrivateDnsSrvRecord() *schema.Resource { ValidateFunc: validation.IntBetween(1, 2147483647), }, + "fqdn": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tags.Schema(), }, } @@ -175,6 +180,7 @@ func resourceArmPrivateDnsSrvRecordRead(d *schema.ResourceData, meta interface{} d.Set("resource_group_name", resGroup) d.Set("zone_name", zoneName) d.Set("ttl", resp.TTL) + d.Set("fqdn", resp.Fqdn) if err := d.Set("record", flattenAzureRmPrivateDnsSrvRecords(resp.SrvRecords)); err != nil { return err diff --git a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_a_record_test.go b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_a_record_test.go index c351b83d15923..ea6e3e2f8b3ec 100644 --- a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_a_record_test.go +++ b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_a_record_test.go @@ -25,6 +25,7 @@ func TestAccAzureRMPrivateDnsARecord_basic(t *testing.T) { Config: testAccAzureRMPrivateDnsARecord_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMPrivateDnsARecordExists(data.ResourceName), + resource.TestCheckResourceAttrSet(data.ResourceName, "fqdn"), ), }, data.ImportStep(), diff --git a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_aaaa_record_test.go b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_aaaa_record_test.go index 4c8d3e3ee65a9..241eed8828b78 100644 --- a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_aaaa_record_test.go +++ b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_aaaa_record_test.go @@ -25,6 +25,7 @@ func TestAccAzureRMPrivateDnsAaaaRecord_basic(t *testing.T) { Config: testAccAzureRMPrivateDnsAaaaRecord_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMPrivateDnsAaaaRecordExists(data.ResourceName), + resource.TestCheckResourceAttrSet(data.ResourceName, "fqdn"), ), }, data.ImportStep(), diff --git a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_cname_record_test.go b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_cname_record_test.go index cb9d0ba813d84..faa141257ca32 100644 --- a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_cname_record_test.go +++ b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_cname_record_test.go @@ -24,6 +24,7 @@ func TestAccAzureRMPrivateDnsCNameRecord_basic(t *testing.T) { Config: testAccAzureRMPrivateDnsCNameRecord_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMPrivateDnsCNameRecordExists(data.ResourceName), + resource.TestCheckResourceAttrSet(data.ResourceName, "fqdn"), ), }, data.ImportStep(), diff --git a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_mx_record_test.go b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_mx_record_test.go index 4c176475d0526..74af3bdb923d7 100644 --- a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_mx_record_test.go +++ b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_mx_record_test.go @@ -24,6 +24,7 @@ func TestAccAzureRMPrivateDnsMxRecord_basic(t *testing.T) { Config: testAccAzureRMPrivateDnsMxRecord_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMPrivateDnsMxRecordExists(data.ResourceName), + resource.TestCheckResourceAttrSet(data.ResourceName, "fqdn"), ), }, data.ImportStep(), diff --git a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_ptr_record_test.go b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_ptr_record_test.go index a274708f3da33..08bbd86c5f3bf 100644 --- a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_ptr_record_test.go +++ b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_ptr_record_test.go @@ -24,6 +24,7 @@ func TestAccAzureRMPrivateDnsPtrRecord_basic(t *testing.T) { Config: testAccAzureRMPrivateDnsPtrRecord_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMPrivateDnsPtrRecordExists(data.ResourceName), + resource.TestCheckResourceAttrSet(data.ResourceName, "fqdn"), ), }, data.ImportStep(), diff --git a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_srv_record_test.go b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_srv_record_test.go index 3712f648cacb7..bb37970558141 100644 --- a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_srv_record_test.go +++ b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_srv_record_test.go @@ -24,6 +24,7 @@ func TestAccAzureRMPrivateDnsSrvRecord_basic(t *testing.T) { Config: testAccAzureRMPrivateDnsSrvRecord_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMPrivateDnsSrvRecordExists(data.ResourceName), + resource.TestCheckResourceAttrSet(data.ResourceName, "fqdn"), ), }, data.ImportStep(), diff --git a/website/docs/r/private_dns_a_record.html.markdown b/website/docs/r/private_dns_a_record.html.markdown index 87e34e56775b6..2ee2961c7d40e 100644 --- a/website/docs/r/private_dns_a_record.html.markdown +++ b/website/docs/r/private_dns_a_record.html.markdown @@ -54,6 +54,8 @@ The following attributes are exported: * `id` - The Private DNS A Record ID. +* `fqdn` - The FQDN of the DNS A Record. + ## Timeouts The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: diff --git a/website/docs/r/private_dns_aaaa_record.html.markdown b/website/docs/r/private_dns_aaaa_record.html.markdown index c8d1221fd6745..3ab616e0ec611 100644 --- a/website/docs/r/private_dns_aaaa_record.html.markdown +++ b/website/docs/r/private_dns_aaaa_record.html.markdown @@ -54,6 +54,8 @@ The following attributes are exported: * `id` - The Private DNS AAAA Record ID. +* `fqdn` - The FQDN of the DNS AAAA Record. + ## Timeouts The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: diff --git a/website/docs/r/private_dns_cname_record.html.markdown b/website/docs/r/private_dns_cname_record.html.markdown index 616bd84e3171c..28deb99e3d51f 100644 --- a/website/docs/r/private_dns_cname_record.html.markdown +++ b/website/docs/r/private_dns_cname_record.html.markdown @@ -54,6 +54,8 @@ The following attributes are exported: * `id` - The Private DNS CNAME Record ID. +* `fqdn` - The FQDN of the DNS CNAME Record. + ## Timeouts The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: diff --git a/website/docs/r/private_dns_mx_record.html.markdown b/website/docs/r/private_dns_mx_record.html.markdown index 344e1d22fc716..fde11b900e162 100644 --- a/website/docs/r/private_dns_mx_record.html.markdown +++ b/website/docs/r/private_dns_mx_record.html.markdown @@ -75,6 +75,8 @@ The following attributes are exported: * `id` - The Private DNS MX Record ID. +* `fqdn` - The FQDN of the DNS MX Record. + ## Timeouts The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: diff --git a/website/docs/r/private_dns_ptr_record.html.markdown b/website/docs/r/private_dns_ptr_record.html.markdown index df3e3a81563c9..e39a4219d0c12 100644 --- a/website/docs/r/private_dns_ptr_record.html.markdown +++ b/website/docs/r/private_dns_ptr_record.html.markdown @@ -54,6 +54,8 @@ The following attributes are exported: * `id` - The Private DNS PTR Record ID. +* `fqdn` - The FQDN of the DNS PTR Record. + ## Timeouts The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: diff --git a/website/docs/r/private_dns_srv_record.html.markdown b/website/docs/r/private_dns_srv_record.html.markdown index bac39fc477c7f..31ace43fff3ed 100644 --- a/website/docs/r/private_dns_srv_record.html.markdown +++ b/website/docs/r/private_dns_srv_record.html.markdown @@ -83,6 +83,8 @@ The following attributes are exported: * `id` - The Private DNS SRV Record ID. +* `fqdn` - The FQDN of the DNS SRV Record. + ## Timeouts The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: From d7b0681157c639c2df18122caab26993413c4364 Mon Sep 17 00:00:00 2001 From: kt Date: Sun, 1 Mar 2020 19:36:25 -0800 Subject: [PATCH 427/498] Update CHANGELOG.md to include #5855 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8fad73cf3bcb..3c6728558fa1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ IMPROVEMENTS: * `azurerm_automation_dsc_configuration` - support for the `tags` property [GH-5827] * `azurerm_function_app` - Added `os_type` field to facilitate support of `linux` function apps [GH-5839] +* `azurerm_kusto_cluster` - support for `enable_disk_encryption` and `enable_streaming_ingest` properties [GH-5855] * `azurerm_private_endpoint` - exposed `private_ip_address` as a computed attribute [GH-5838] * `azurerm_virtual_wan` - support for the `type` property [GH-5877] * `azurerm_storage_account` - support up to 50 tags [GH-5934] From 00735a9ce83c7b95e6d7fe4b916139dfd5db968c Mon Sep 17 00:00:00 2001 From: kt Date: Sun, 1 Mar 2020 21:07:15 -0800 Subject: [PATCH 428/498] Update CHANGELOG.md to include #5949 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c6728558fa1a..f0c0f09bb465b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## 2.1.0 (Unreleased) FEATURES: + * **New Data Source:** `azurerm_kusto_cluster` [GH-5942] IMPROVEMENTS: @@ -8,6 +9,12 @@ IMPROVEMENTS: * `azurerm_automation_dsc_configuration` - support for the `tags` property [GH-5827] * `azurerm_function_app` - Added `os_type` field to facilitate support of `linux` function apps [GH-5839] * `azurerm_kusto_cluster` - support for `enable_disk_encryption` and `enable_streaming_ingest` properties [GH-5855] +* `azurerm_private_dns_a_record` - export the `fqdn` property [GH-5949] +* `azurerm_private_dns_aaaa_record` - export the `fqdn` property [GH-5949] +* `azurerm_private_dns_cname_record` - export the `fqdn` property [GH-5949] +* `azurerm_private_dns_mx_record` - export the `fqdn` property [GH-5949] +* `azurerm_private_dns_ptr_record` - export the `fqdn` property [GH-5949] +* `azurerm_private_dns_srv_record` - export the `fqdn` property [GH-5949] * `azurerm_private_endpoint` - exposed `private_ip_address` as a computed attribute [GH-5838] * `azurerm_virtual_wan` - support for the `type` property [GH-5877] * `azurerm_storage_account` - support up to 50 tags [GH-5934] From cb9123c79af691e7148fd4db2ef6d7d9ad22c01a Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 2 Mar 2020 10:01:36 -0800 Subject: [PATCH 429/498] Update CHANGELOG.md to include #5445 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0c0f09bb465b..f6ed044f99ca0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ FEATURES: * **New Data Source:** `azurerm_kusto_cluster` [GH-5942] +* **New Resource:** `azurerm_bot_channel_directline` [GH-5445] IMPROVEMENTS: From 300a9a787d5ae5bfebb14f370973de7b5ef6c427 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Mon, 2 Mar 2020 13:12:59 -0800 Subject: [PATCH 430/498] `azurerm_batch_pool` - `frontend_port_range ` is now set correctly. (#5941) --- azurerm/helpers/azure/batch_pool.go | 2 +- .../services/batch/resource_arm_batch_pool.go | 2 + .../tests/resource_arm_batch_pool_test.go | 84 +++++++++++++++++++ 3 files changed, 87 insertions(+), 1 deletion(-) diff --git a/azurerm/helpers/azure/batch_pool.go b/azurerm/helpers/azure/batch_pool.go index e3d1ee8175785..8d2afe3fbeb82 100644 --- a/azurerm/helpers/azure/batch_pool.go +++ b/azurerm/helpers/azure/batch_pool.go @@ -673,7 +673,7 @@ func FlattenBatchPoolNetworkConfiguration(networkConfig *batch.NetworkConfigurat inboundNatPoolMap["backend_port"] = *inboundNatPool.BackendPort } if inboundNatPool.FrontendPortRangeStart != nil && inboundNatPool.FrontendPortRangeEnd != nil { - inboundNatPoolMap["frontend_port_range"] = fmt.Sprintf("%d-%d", *inboundNatPool.FrontendPortRangeStart, inboundNatPool.FrontendPortRangeEnd) + inboundNatPoolMap["frontend_port_range"] = fmt.Sprintf("%d-%d", *inboundNatPool.FrontendPortRangeStart, *inboundNatPool.FrontendPortRangeEnd) } inboundNatPoolMap["protocol"] = inboundNatPool.Protocol diff --git a/azurerm/internal/services/batch/resource_arm_batch_pool.go b/azurerm/internal/services/batch/resource_arm_batch_pool.go index 8649e40bb66ec..8ea488b72a5cf 100644 --- a/azurerm/internal/services/batch/resource_arm_batch_pool.go +++ b/azurerm/internal/services/batch/resource_arm_batch_pool.go @@ -746,6 +746,8 @@ func resourceArmBatchPoolRead(d *schema.ResourceData, meta interface{}) error { } } + d.Set("max_tasks_per_node", props.MaxTasksPerNode) + if props.DeploymentConfiguration != nil && props.DeploymentConfiguration.VirtualMachineConfiguration != nil && props.DeploymentConfiguration.VirtualMachineConfiguration.ImageReference != nil { diff --git a/azurerm/internal/services/batch/tests/resource_arm_batch_pool_test.go b/azurerm/internal/services/batch/tests/resource_arm_batch_pool_test.go index d8ce7301b5346..e8a8572c94c51 100644 --- a/azurerm/internal/services/batch/tests/resource_arm_batch_pool_test.go +++ b/azurerm/internal/services/batch/tests/resource_arm_batch_pool_test.go @@ -380,6 +380,25 @@ func TestAccAzureRMBatchPool_customImage(t *testing.T) { }) } +func TestAccAzureRMBatchPool_frontEndPortRanges(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_batch_pool", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMBatchPoolDestroy, + Steps: []resource.TestStep{ + { + Config: testaccAzureRMBatchPool_networkConfiguration(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMBatchPoolExists(data.ResourceName), + ), + }, + data.ImportStep("stop_pending_resize_operation"), + }, + }) +} + func testCheckAzureRMBatchPoolExists(name string) resource.TestCheckFunc { return func(s *terraform.State) error { ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext @@ -1201,3 +1220,68 @@ resource "azurerm_batch_pool" "test" { } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomString, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomString, data.RandomString) } + +func testaccAzureRMBatchPool_networkConfiguration(data acceptance.TestData) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "testaccRG-%d-batchpool" + location = "%s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctestvirtnet%d" + address_space = ["10.0.0.0/16"] + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name +} + +resource "azurerm_subnet" "test" { + name = "internal" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name + address_prefix = "10.0.2.0/24" +} + +resource "azurerm_batch_account" "test" { + name = "testaccbatch%s" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" +} + +resource "azurerm_batch_pool" "test" { + name = "testaccpool%s" + resource_group_name = "${azurerm_resource_group.test.name}" + account_name = "${azurerm_batch_account.test.name}" + node_agent_sku_id = "batch.node.ubuntu 16.04" + vm_size = "Standard_A1" + + fixed_scale { + target_dedicated_nodes = 1 + } + + storage_image_reference { + publisher = "Canonical" + offer = "UbuntuServer" + sku = "16.04.0-LTS" + version = "latest" + } + + network_configuration { + subnet_id = "${azurerm_subnet.test.id}" + + endpoint_configuration { + name = "SSH" + protocol = "TCP" + backend_port = 22 + frontend_port_range = "4000-4100" + + network_security_group_rules { + access = "Deny" + priority = 1001 + source_address_prefix = "*" + } + } + } +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomString, data.RandomString) +} From b21103a854ca78bde8e8c177fa1752b5ff2e3d94 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Mon, 2 Mar 2020 13:13:58 -0800 Subject: [PATCH 431/498] Update Changelog for #5941 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6ed044f99ca0..3e3a7ca7440f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ BUG FIXES: * `azurerm_app_service_plan` - no longer sends an empty `app_service_environment_id` property on update [GH-5915] * `azurerm_automation_schedule` - fix time validation [GH-5876] +* `azurerm_batch_pool` - `frontend_port_range ` is now set correctly. [GH-5941] * `azurerm_dns_txt_record` - support records up to `1024` characters in length [GH-5837] * `azurerm_frontdoor_firewall_policy` - add validation for Frontdoor WAF Name Restrictions [GH-5943] * `azurerm_linux_virtual_machine_scale_set` - correct `source_image_id` validation [GH-5901] From aef86be5963c3cde6dc553730f37cbcefdeed261 Mon Sep 17 00:00:00 2001 From: Neil Ye Date: Tue, 3 Mar 2020 07:31:07 +0800 Subject: [PATCH 432/498] azurerm_application_gateway - support 125 for V2 sku capacity (#5906) * Expand sku capacity for azurerm_application_gateway * Update code * Update code * Update code * Update code * Update code * Update code * Removed depricated attribute Co-authored-by: WS <20408400+WodansSon@users.noreply.github.com> --- .../resource_arm_application_gateway.go | 30 ++++- .../resource_arm_application_gateway_test.go | 105 +++++++++++++++++- .../docs/r/application_gateway.html.markdown | 2 +- 3 files changed, 129 insertions(+), 8 deletions(-) diff --git a/azurerm/internal/services/network/resource_arm_application_gateway.go b/azurerm/internal/services/network/resource_arm_application_gateway.go index 8ae7763cfe934..90fa875465e24 100644 --- a/azurerm/internal/services/network/resource_arm_application_gateway.go +++ b/azurerm/internal/services/network/resource_arm_application_gateway.go @@ -3,6 +3,7 @@ package network import ( "fmt" "log" + "strings" "time" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-09-01/network" @@ -660,9 +661,8 @@ func resourceArmApplicationGateway() *schema.Resource { }, "capacity": { - Type: schema.TypeInt, - Optional: true, - ValidateFunc: validation.IntBetween(1, 32), + Type: schema.TypeInt, + Optional: true, }, }, }, @@ -1305,6 +1305,8 @@ func resourceArmApplicationGateway() *schema.Resource { "tags": tags.Schema(), }, + + CustomizeDiff: ApplicationGatewayCustomizeDiff, } } @@ -3724,3 +3726,25 @@ func flattenApplicationGatewayCustomErrorConfigurations(input *[]network.Applica return results } + +func ApplicationGatewayCustomizeDiff(d *schema.ResourceDiff, _ interface{}) error { + _, hasAutoscaleConfig := d.GetOk("autoscale_configuration.0") + capacity, hasCapacity := d.GetOk("sku.0.capacity") + tier := d.Get("sku.0.tier").(string) + + if !hasAutoscaleConfig && !hasCapacity { + return fmt.Errorf("The Application Gateway must specify either `capacity` or `autoscale_configuration` for the selected SKU tier %q", tier) + } + + if hasCapacity { + if (strings.EqualFold(tier, string(network.ApplicationGatewayTierStandard)) || strings.EqualFold(tier, string(network.ApplicationGatewayTierWAF))) && (capacity.(int) < 1 || capacity.(int) > 32) { + return fmt.Errorf("The value '%d' exceeds the maximum capacity allowed for a %q V1 SKU, the %q SKU must have a capacity value between 1 and 32", capacity, tier, tier) + } + + if (strings.EqualFold(tier, string(network.ApplicationGatewayTierStandardV2)) || strings.EqualFold(tier, string(network.ApplicationGatewayTierWAFV2))) && (capacity.(int) < 1 || capacity.(int) > 125) { + return fmt.Errorf("The value '%d' exceeds the maximum capacity allowed for a %q V2 SKU, the %q SKU must have a capacity value between 1 and 125", capacity, tier, tier) + } + } + + return nil +} diff --git a/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go index 7714480af3ae9..9721bb2c227b8 100644 --- a/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go @@ -891,6 +891,28 @@ func TestAccAzureRMApplicationGateway_UserAssignedIdentity(t *testing.T) { }) } +func TestAccAzureRMApplicationGateway_V2SKUCapacity(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_application_gateway", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMApplicationGatewayDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMApplicationGateway_v2SKUCapacity(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMApplicationGatewayExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "sku.0.name", "Standard_v2"), + resource.TestCheckResourceAttr(data.ResourceName, "sku.0.tier", "Standard_v2"), + resource.TestCheckResourceAttr(data.ResourceName, "sku.0.capacity", "124"), + ), + }, + data.ImportStep(), + }, + }) +} + func testCheckAzureRMApplicationGatewayExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).Network.ApplicationGatewaysClient @@ -3080,10 +3102,6 @@ resource "azurerm_application_gateway" "test" { capacity = 1 } - disabled_ssl_protocols = [ - "TLSv1_0", - ] - waf_configuration { enabled = true firewall_mode = "Detection" @@ -4447,3 +4465,82 @@ resource "azurerm_application_gateway" "test" { } `, template, data.RandomInteger, data.RandomInteger) } + +func testAccAzureRMApplicationGateway_v2SKUCapacity(data acceptance.TestData) string { + template := testAccAzureRMApplicationGateway_template(data) + return fmt.Sprintf(` +%s + +# since these variables are re-used - a locals block makes this more maintainable +locals { + backend_address_pool_name = "${azurerm_virtual_network.test.name}-beap" + frontend_port_name = "${azurerm_virtual_network.test.name}-feport" + frontend_ip_configuration_name = "${azurerm_virtual_network.test.name}-feip" + http_setting_name = "${azurerm_virtual_network.test.name}-be-htst" + listener_name = "${azurerm_virtual_network.test.name}-httplstn" + request_routing_rule_name = "${azurerm_virtual_network.test.name}-rqrt" +} + +resource "azurerm_public_ip" "test_standard" { + name = "acctest-pubip-%d-standard" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku = "Standard" + allocation_method = "Static" +} + +resource "azurerm_application_gateway" "test" { + name = "acctestag-%d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + + sku { + name = "Standard_v2" + tier = "Standard_v2" + capacity = 124 + } + + gateway_ip_configuration { + name = "my-gateway-ip-configuration" + subnet_id = "${azurerm_subnet.test.id}" + } + + frontend_port { + name = "${local.frontend_port_name}" + port = 80 + } + + frontend_ip_configuration { + name = "${local.frontend_ip_configuration_name}" + public_ip_address_id = "${azurerm_public_ip.test_standard.id}" + } + + backend_address_pool { + name = "${local.backend_address_pool_name}" + } + + backend_http_settings { + name = "${local.http_setting_name}" + cookie_based_affinity = "Disabled" + port = 80 + protocol = "Http" + request_timeout = 1 + } + + http_listener { + name = "${local.listener_name}" + frontend_ip_configuration_name = "${local.frontend_ip_configuration_name}" + frontend_port_name = "${local.frontend_port_name}" + protocol = "Http" + } + + request_routing_rule { + name = "${local.request_routing_rule_name}" + rule_type = "Basic" + http_listener_name = "${local.listener_name}" + backend_address_pool_name = "${local.backend_address_pool_name}" + backend_http_settings_name = "${local.http_setting_name}" + } +} +`, template, data.RandomInteger, data.RandomInteger) +} diff --git a/website/docs/r/application_gateway.html.markdown b/website/docs/r/application_gateway.html.markdown index 70240d8b3c21c..850ffbef1c4d0 100644 --- a/website/docs/r/application_gateway.html.markdown +++ b/website/docs/r/application_gateway.html.markdown @@ -380,7 +380,7 @@ A `sku` block supports the following: * `tier` - (Required) The Tier of the SKU to use for this Application Gateway. Possible values are `Standard`, `Standard_v2`, `WAF` and `WAF_v2`. -* `capacity` - (Required) The Capacity of the SKU to use for this Application Gateway - which must be between 1 and 10, optional if `autoscale_configuration` is set +* `capacity` - (Required) The Capacity of the SKU to use for this Application Gateway. When using a V1 SKU this value must be between 1 and 32, and 1 to 125 for a V2 SKU. This property is optional if `autoscale_configuration` is set. --- From 34b349a3b8ec997908270003571f9228f406bbad Mon Sep 17 00:00:00 2001 From: WS <20408400+WodansSon@users.noreply.github.com> Date: Mon, 2 Mar 2020 15:33:02 -0800 Subject: [PATCH 433/498] updating to include #5906 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e3a7ca7440f9..edc8a8ae1b087 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ FEATURES: IMPROVEMENTS: +* `azurerm_application_gateway` - add support for 125 capacity with V2 SKU's [GH-5906] * `azurerm_automation_dsc_configuration` - support for the `tags` property [GH-5827] * `azurerm_function_app` - Added `os_type` field to facilitate support of `linux` function apps [GH-5839] * `azurerm_kusto_cluster` - support for `enable_disk_encryption` and `enable_streaming_ingest` properties [GH-5855] From c0234b636327073e6e1ff16753992b1652a8f68f Mon Sep 17 00:00:00 2001 From: WS <20408400+WodansSon@users.noreply.github.com> Date: Mon, 2 Mar 2020 15:41:25 -0800 Subject: [PATCH 434/498] updated text for #5906 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index edc8a8ae1b087..b9e80ffee0140 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ FEATURES: IMPROVEMENTS: -* `azurerm_application_gateway` - add support for 125 capacity with V2 SKU's [GH-5906] +* `azurerm_application_gateway` - support up to `125` for the `capacity` property with V2 SKU's [GH-5906] * `azurerm_automation_dsc_configuration` - support for the `tags` property [GH-5827] * `azurerm_function_app` - Added `os_type` field to facilitate support of `linux` function apps [GH-5839] * `azurerm_kusto_cluster` - support for `enable_disk_encryption` and `enable_streaming_ingest` properties [GH-5855] From 314d9a8bc38526ce3973a8bb1608f653fdd56e49 Mon Sep 17 00:00:00 2001 From: WS <20408400+WodansSon@users.noreply.github.com> Date: Tue, 3 Mar 2020 11:19:52 -0800 Subject: [PATCH 435/498] azurerm_frontdoor fixes #5499 #5903 * fix for #5499 * Add fix for #5924 * Exposed probe_method add tests * Update cacheQueryParameterStripDirective default * terrafmt test case * Fix test case for new cache_enabled default * Update test case for new strip directive default * Update test case * Fixed DisableCache test case * Updates per PR * fix for importstateverify test --- .../frontdoor/resource_arm_frontdoor.go | 70 ++++- .../tests/resource_arm_front_door_test.go | 266 ++++++++++++++++-- website/docs/r/frontdoor.html.markdown | 6 + 3 files changed, 299 insertions(+), 43 deletions(-) diff --git a/azurerm/internal/services/frontdoor/resource_arm_frontdoor.go b/azurerm/internal/services/frontdoor/resource_arm_frontdoor.go index 448f4a58e040a..b8348e880534a 100644 --- a/azurerm/internal/services/frontdoor/resource_arm_frontdoor.go +++ b/azurerm/internal/services/frontdoor/resource_arm_frontdoor.go @@ -3,6 +3,7 @@ package frontdoor import ( "fmt" "log" + "strings" "time" "github.com/Azure/azure-sdk-for-go/services/frontdoor/mgmt/2019-11-01/frontdoor" @@ -261,6 +262,11 @@ func resourceArmFrontDoor() *schema.Resource { Required: true, ValidateFunc: ValidateBackendPoolRoutingRuleName, }, + "enabled": { + Type: schema.TypeBool, + Optional: true, + Default: true, + }, "path": { Type: schema.TypeString, Optional: true, @@ -269,11 +275,20 @@ func resourceArmFrontDoor() *schema.Resource { "protocol": { Type: schema.TypeString, Optional: true, + Default: string(frontdoor.HTTP), ValidateFunc: validation.StringInSlice([]string{ string(frontdoor.HTTP), string(frontdoor.HTTPS), }, false), - Default: string(frontdoor.HTTP), + }, + "probe_method": { + Type: schema.TypeString, + Optional: true, + Default: string(frontdoor.GET), + ValidateFunc: validation.StringInSlice([]string{ + string(frontdoor.GET), + string(frontdoor.HEAD), + }, false), }, "interval_in_seconds": { Type: schema.TypeInt, @@ -318,14 +333,14 @@ func resourceArmFrontDoor() *schema.Resource { "weight": { Type: schema.TypeInt, Optional: true, - ValidateFunc: validation.IntBetween(1, 1000), Default: 50, + ValidateFunc: validation.IntBetween(1, 1000), }, "priority": { Type: schema.TypeInt, Optional: true, - ValidateFunc: validation.IntBetween(1, 5), Default: 1, + ValidateFunc: validation.IntBetween(1, 5), }, "host_header": { Type: schema.TypeString, @@ -401,11 +416,11 @@ func resourceArmFrontDoor() *schema.Resource { "certificate_source": { Type: schema.TypeString, Optional: true, + Default: string(frontdoor.CertificateSourceFrontDoor), ValidateFunc: validation.StringInSlice([]string{ string(frontdoor.CertificateSourceAzureKeyVault), string(frontdoor.CertificateSourceFrontDoor), }, false), - Default: string(frontdoor.CertificateSourceFrontDoor), }, "minimum_tls_version": { Type: schema.TypeString, @@ -484,6 +499,7 @@ func resourceArmFrontDoorCreateUpdate(d *schema.ResourceData, meta interface{}) frontendEndpoints := d.Get("frontend_endpoint").([]interface{}) backendPoolsSettings := d.Get("enforce_backend_pools_certificate_name_check").(bool) enabledState := d.Get("load_balancer_enabled").(bool) + t := d.Get("tags").(map[string]interface{}) frontDoorParameters := frontdoor.FrontDoor{ @@ -862,6 +878,12 @@ func expandArmFrontDoorHealthProbeSettingsModel(input []interface{}, frontDoorPa protocol := v["protocol"].(string) intervalInSeconds := int32(v["interval_in_seconds"].(int)) name := v["name"].(string) + enabled := v["enabled"].(bool) + + healthProbeEnabled := frontdoor.HealthProbeEnabledEnabled + if !enabled { + healthProbeEnabled = frontdoor.HealthProbeEnabledDisabled + } result := frontdoor.HealthProbeSettingsModel{ ID: utils.String(frontDoorPath + "/HealthProbeSettings/" + name), @@ -870,6 +892,8 @@ func expandArmFrontDoorHealthProbeSettingsModel(input []interface{}, frontDoorPa IntervalInSeconds: utils.Int32(intervalInSeconds), Path: utils.String(path), Protocol: frontdoor.Protocol(protocol), + HealthProbeMethod: frontdoor.HealthProbeMethod(v["probe_method"].(string)), + EnabledState: healthProbeEnabled, }, } @@ -1076,7 +1100,7 @@ func expandArmFrontDoorForwardingConfiguration(input []interface{}, frontDoorPat if cacheQueryParameterStripDirective == "" { // Set Default Value for strip directive is not in the key slice and cache is enabled - cacheQueryParameterStripDirective = string(frontdoor.StripNone) + cacheQueryParameterStripDirective = string(frontdoor.StripAll) } forwardingConfiguration.CacheConfiguration = &frontdoor.CacheConfiguration{ @@ -1276,12 +1300,13 @@ func flattenArmFrontDoorFrontendEndpoint(d *schema.ResourceData, input *[]frontd } func flattenArmFrontDoorHealthProbeSettingsModel(input *[]frontdoor.HealthProbeSettingsModel) []interface{} { + results := make([]interface{}, 0) if input == nil { - return make([]interface{}, 0) + return results } - result := make(map[string]interface{}) for _, v := range *input { + result := make(map[string]interface{}) if id := v.ID; id != nil { result["id"] = *id } @@ -1295,21 +1320,31 @@ func flattenArmFrontDoorHealthProbeSettingsModel(input *[]frontdoor.HealthProbeS if path := properties.Path; path != nil { result["path"] = *path } + if healthProbeMethod := properties.HealthProbeMethod; healthProbeMethod != "" { + // I have to upper this as the frontdoor.GET and frondoor.HEAD types are uppercased + // but Azure stores them in the resource as pascal cased (e.g. "Get" and "Head") + result["probe_method"] = strings.ToUpper(string(healthProbeMethod)) + } + if enabled := properties.EnabledState; enabled != "" { + result["enabled"] = (enabled == frontdoor.HealthProbeEnabledEnabled) + } result["protocol"] = string(properties.Protocol) } + + results = append(results, result) } - return []interface{}{result} + return results } func flattenArmFrontDoorLoadBalancingSettingsModel(input *[]frontdoor.LoadBalancingSettingsModel) []interface{} { + results := make([]interface{}, 0) if input == nil { - return make([]interface{}, 0) + return results } - result := make(map[string]interface{}) - for _, v := range *input { + result := make(map[string]interface{}) if id := v.ID; id != nil { result["id"] = *id } @@ -1327,8 +1362,11 @@ func flattenArmFrontDoorLoadBalancingSettingsModel(input *[]frontdoor.LoadBalanc result["successful_samples_required"] = *successfulSamplesRequired } } + + results = append(results, result) } - return []interface{}{result} + + return results } func flattenArmFrontDoorRoutingRule(input *[]frontdoor.RoutingRule, oldBlocks interface{}) []interface{} { @@ -1387,22 +1425,24 @@ func flattenArmFrontDoorRoutingRule(input *[]frontdoor.RoutingRule, oldBlocks in if stripDirective := cacheConfiguration.QueryParameterStripDirective; stripDirective != "" { c["cache_query_parameter_strip_directive"] = string(stripDirective) } else { - c["cache_query_parameter_strip_directive"] = string(frontdoor.StripNone) + // Default value if not set + c["cache_query_parameter_strip_directive"] = string(frontdoor.StripAll) } if dynamicCompression := cacheConfiguration.DynamicCompression; dynamicCompression != "" { c["cache_use_dynamic_compression"] = bool(string(dynamicCompression) == string(frontdoor.DynamicCompressionEnabledEnabled)) } } else { + // if the cache is disabled, set the default values or revert to what they were in the previous plan c["cache_enabled"] = false + c["cache_query_parameter_strip_directive"] = string(frontdoor.StripAll) if name != nil { - //get `forwarding_configuration` + // get `forwarding_configuration` if o, ok := oldByName[*name]; ok { ofcs := o["forwarding_configuration"].([]interface{}) if len(ofcs) > 0 { ofc := ofcs[0].(map[string]interface{}) - c["cache_query_parameter_strip_directive"] = ofc["cache_query_parameter_strip_directive"] c["cache_use_dynamic_compression"] = ofc["cache_use_dynamic_compression"] } diff --git a/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_test.go b/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_test.go index 79137b712825b..dc6d15add6ba5 100644 --- a/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_test.go +++ b/azurerm/internal/services/frontdoor/tests/resource_arm_front_door_test.go @@ -23,6 +23,16 @@ func TestAccAzureRMFrontDoor_basic(t *testing.T) { Config: testAccAzureRMFrontDoor_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMFrontDoorExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "backend_pool_health_probe.0.enabled", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "backend_pool_health_probe.0.probe_method", "GET"), + ), + }, + { + Config: testAccAzureRMFrontDoor_basicDisabled(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMFrontDoorExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "backend_pool_health_probe.0.enabled", "false"), + resource.TestCheckResourceAttr(data.ResourceName, "backend_pool_health_probe.0.probe_method", "HEAD"), ), }, data.ImportStep(), @@ -85,6 +95,28 @@ func TestAccAzureRMFrontDoor_update(t *testing.T) { }) } +func TestAccAzureRMFrontDoor_multiplePools(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_frontdoor", "test") + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMFrontDoorDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMFrontDoor_multiplePools(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMFrontDoorExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "backend_pool.#", "2"), + resource.TestCheckResourceAttr(data.ResourceName, "backend_pool_health_probe.#", "2"), + resource.TestCheckResourceAttr(data.ResourceName, "backend_pool_load_balancing.#", "2"), + resource.TestCheckResourceAttr(data.ResourceName, "routing_rule.#", "2"), + ), + }, + data.ImportStep(), + }, + }) +} + func TestAccAzureRMFrontDoor_complete(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_frontdoor", "test") resource.ParallelTest(t, resource.TestCase{ @@ -134,7 +166,7 @@ func TestAccAzureRMFrontDoor_EnableDisableCache(t *testing.T) { testCheckAzureRMFrontDoorExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "routing_rule.0.forwarding_configuration.0.cache_enabled", "true"), resource.TestCheckResourceAttr(data.ResourceName, "routing_rule.0.forwarding_configuration.0.cache_use_dynamic_compression", "false"), - resource.TestCheckResourceAttr(data.ResourceName, "routing_rule.0.forwarding_configuration.0.cache_query_parameter_strip_directive", "StripNone"), + resource.TestCheckResourceAttr(data.ResourceName, "routing_rule.0.forwarding_configuration.0.cache_query_parameter_strip_directive", "StripAll"), ), }, { @@ -143,7 +175,7 @@ func TestAccAzureRMFrontDoor_EnableDisableCache(t *testing.T) { testCheckAzureRMFrontDoorExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "routing_rule.0.forwarding_configuration.0.cache_enabled", "false"), resource.TestCheckResourceAttr(data.ResourceName, "routing_rule.0.forwarding_configuration.0.cache_use_dynamic_compression", "false"), - resource.TestCheckResourceAttr(data.ResourceName, "routing_rule.0.forwarding_configuration.0.cache_query_parameter_strip_directive", "StripNone"), + resource.TestCheckResourceAttr(data.ResourceName, "routing_rule.0.forwarding_configuration.0.cache_query_parameter_strip_directive", "StripAll"), ), }, { @@ -152,7 +184,7 @@ func TestAccAzureRMFrontDoor_EnableDisableCache(t *testing.T) { testCheckAzureRMFrontDoorExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "routing_rule.0.forwarding_configuration.0.cache_enabled", "true"), resource.TestCheckResourceAttr(data.ResourceName, "routing_rule.0.forwarding_configuration.0.cache_use_dynamic_compression", "false"), - resource.TestCheckResourceAttr(data.ResourceName, "routing_rule.0.forwarding_configuration.0.cache_query_parameter_strip_directive", "StripNone"), + resource.TestCheckResourceAttr(data.ResourceName, "routing_rule.0.forwarding_configuration.0.cache_query_parameter_strip_directive", "StripAll"), ), }, data.ImportStep(), @@ -245,7 +277,7 @@ provider "azurerm" { } resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" + name = "acctestRG-frontdoor-%d" location = "%s" } @@ -257,7 +289,7 @@ locals { } resource "azurerm_frontdoor" "test" { - name = "acctestfd-%d" + name = "acctest-FD-%d" location = azurerm_resource_group.test.location resource_group_name = azurerm_resource_group.test.name enforce_backend_pools_certificate_name_check = false @@ -296,7 +328,74 @@ resource "azurerm_frontdoor" "test" { frontend_endpoint { name = local.endpoint_name - host_name = "acctestfd-%d.azurefd.net" + host_name = "acctest-FD-%d.azurefd.net" + custom_https_provisioning_enabled = false + } +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) +} + +func testAccAzureRMFrontDoor_basicDisabled(data acceptance.TestData) string { + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-frontdoor-%d" + location = "%s" +} + +locals { + backend_name = "backend-bing" + endpoint_name = "frontend-endpoint" + health_probe_name = "health-probe" + load_balancing_name = "load-balancing-setting" +} + +resource "azurerm_frontdoor" "test" { + name = "acctest-FD-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + enforce_backend_pools_certificate_name_check = false + + routing_rule { + name = "routing-rule" + accepted_protocols = ["Http", "Https"] + patterns_to_match = ["/*"] + frontend_endpoints = [local.endpoint_name] + forwarding_configuration { + forwarding_protocol = "MatchRequest" + backend_pool_name = local.backend_name + } + } + + backend_pool_load_balancing { + name = local.load_balancing_name + } + + backend_pool_health_probe { + name = local.health_probe_name + enabled = false + probe_method = "HEAD" + } + + backend_pool { + name = local.backend_name + backend { + host_header = "www.bing.com" + address = "www.bing.com" + http_port = 80 + https_port = 443 + } + + load_balancing_name = local.load_balancing_name + health_probe_name = local.health_probe_name + } + + frontend_endpoint { + name = local.endpoint_name + host_name = "acctest-FD-%d.azurefd.net" custom_https_provisioning_enabled = false } } @@ -348,7 +447,7 @@ resource "azurerm_frontdoor" "import" { frontend_endpoint { name = local.endpoint_name - host_name = "acctestfd-%d.azurefd.net" + host_name = "acctest-FD-%d.azurefd.net" custom_https_provisioning_enabled = false } } @@ -362,7 +461,7 @@ provider "azurerm" { } resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" + name = "acctestRG-frontdoor-%d" location = "%s" } @@ -374,7 +473,7 @@ locals { } resource "azurerm_frontdoor" "test" { - name = "acctestfd-%d" + name = "acctest-FD-%d" location = azurerm_resource_group.test.location resource_group_name = azurerm_resource_group.test.name enforce_backend_pools_certificate_name_check = false @@ -413,7 +512,7 @@ resource "azurerm_frontdoor" "test" { frontend_endpoint { name = local.endpoint_name - host_name = "acctestfd-%d.azurefd.net" + host_name = "acctest-FD-%d.azurefd.net" custom_https_provisioning_enabled = false } } @@ -423,12 +522,11 @@ resource "azurerm_frontdoor" "test" { func testAccAzureRMFrontDoor_waf(data acceptance.TestData) string { return fmt.Sprintf(` provider "azurerm" { - features { - } + features {} } resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" + name = "acctestRG-frontdoor-%d" location = "%s" } @@ -446,7 +544,7 @@ resource "azurerm_frontdoor_firewall_policy" "test" { } resource "azurerm_frontdoor" "test" { - name = "acctestfd-%d" + name = "acctest-FD-%d" location = azurerm_resource_group.test.location resource_group_name = azurerm_resource_group.test.name enforce_backend_pools_certificate_name_check = false @@ -485,7 +583,7 @@ resource "azurerm_frontdoor" "test" { frontend_endpoint { name = local.endpoint_name - host_name = "acctestfd-%d.azurefd.net" + host_name = "acctest-FD-%d.azurefd.net" custom_https_provisioning_enabled = false web_application_firewall_policy_link_id = azurerm_frontdoor_firewall_policy.test.id } @@ -500,7 +598,7 @@ provider "azurerm" { } resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" + name = "acctestRG-frontdoor-%d" location = "%s" } @@ -512,7 +610,7 @@ locals { } resource "azurerm_frontdoor" "test" { - name = "acctestfd-%d" + name = "acctest-FD-%d" location = azurerm_resource_group.test.location resource_group_name = azurerm_resource_group.test.name enforce_backend_pools_certificate_name_check = false @@ -525,7 +623,6 @@ resource "azurerm_frontdoor" "test" { forwarding_configuration { forwarding_protocol = "MatchRequest" backend_pool_name = local.backend_name - cache_enabled = false } } @@ -552,7 +649,7 @@ resource "azurerm_frontdoor" "test" { frontend_endpoint { name = local.endpoint_name - host_name = "acctestfd-%d.azurefd.net" + host_name = "acctest-FD-%d.azurefd.net" custom_https_provisioning_enabled = false } } @@ -566,7 +663,7 @@ provider "azurerm" { } resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" + name = "acctestRG-frontdoor-%d" location = "%s" } @@ -578,7 +675,7 @@ locals { } resource "azurerm_frontdoor" "test" { - name = "acctestfd-%d" + name = "acctest-FD-%d" location = azurerm_resource_group.test.location resource_group_name = azurerm_resource_group.test.name enforce_backend_pools_certificate_name_check = false @@ -592,6 +689,7 @@ resource "azurerm_frontdoor" "test" { forwarding_configuration { forwarding_protocol = "MatchRequest" backend_pool_name = local.backend_name + cache_enabled = true } } @@ -618,7 +716,7 @@ resource "azurerm_frontdoor" "test" { frontend_endpoint { name = local.endpoint_name - host_name = "acctestfd-%d.azurefd.net" + host_name = "acctest-FD-%d.azurefd.net" custom_https_provisioning_enabled = false } } @@ -632,7 +730,7 @@ provider "azurerm" { } resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" + name = "acctestRG-frontdoor-%d" location = "%s" } @@ -644,7 +742,7 @@ locals { } resource "azurerm_frontdoor" "test" { - name = "acctestfd-%d" + name = "acctest-FD-%d" location = azurerm_resource_group.test.location resource_group_name = azurerm_resource_group.test.name enforce_backend_pools_certificate_name_check = false @@ -684,7 +782,7 @@ resource "azurerm_frontdoor" "test" { frontend_endpoint { name = local.endpoint_name - host_name = "acctestfd-%d.azurefd.net" + host_name = "acctest-FD-%d.azurefd.net" custom_https_provisioning_enabled = true custom_https_configuration { certificate_source = "FrontDoor" @@ -701,7 +799,7 @@ provider "azurerm" { } resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" + name = "acctestRG-frontdoor-%d" location = "%s" } @@ -713,7 +811,7 @@ locals { } resource "azurerm_frontdoor" "test" { - name = "acctestfd-%d" + name = "acctest-FD-%d" location = azurerm_resource_group.test.location resource_group_name = azurerm_resource_group.test.name enforce_backend_pools_certificate_name_check = false @@ -753,9 +851,121 @@ resource "azurerm_frontdoor" "test" { frontend_endpoint { name = local.endpoint_name - host_name = "acctestfd-%d.azurefd.net" + host_name = "acctest-FD-%d.azurefd.net" custom_https_provisioning_enabled = false } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) } + +func testAccAzureRMFrontDoor_multiplePools(data acceptance.TestData) string { + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-frontdoor-%[1]d" + location = "%s" +} + +resource "azurerm_frontdoor" "test" { + name = "acctest-FD-%[1]d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + enforce_backend_pools_certificate_name_check = false + + frontend_endpoint { + name = "acctest-FD-%[1]d-default-FE" + host_name = "acctest-FD-%[1]d.azurefd.net" + custom_https_provisioning_enabled = false + } + + # --- Pool 1 + + routing_rule { + name = "acctest-FD-%[1]d-bing-RR" + accepted_protocols = ["Https"] + patterns_to_match = ["/poolBing/*"] + frontend_endpoints = ["acctest-FD-%[1]d-default-FE"] + + forwarding_configuration { + forwarding_protocol = "MatchRequest" + backend_pool_name = "acctest-FD-%[1]d-pool-bing" + cache_enabled = true + } + } + + backend_pool_load_balancing { + name = "acctest-FD-%[1]d-bing-LB" + additional_latency_milliseconds = 0 + sample_size = 4 + successful_samples_required = 2 + } + + backend_pool_health_probe { + name = "acctest-FD-%[1]d-bing-HP" + protocol = "Https" + enabled = true + probe_method = "HEAD" + } + + backend_pool { + name = "acctest-FD-%[1]d-pool-bing" + load_balancing_name = "acctest-FD-%[1]d-bing-LB" + health_probe_name = "acctest-FD-%[1]d-bing-HP" + + backend { + host_header = "bing.com" + address = "bing.com" + http_port = 80 + https_port = 443 + weight = 75 + enabled = true + } + } + + # --- Pool 2 + + routing_rule { + name = "acctest-FD-%[1]d-google-RR" + accepted_protocols = ["Https"] + patterns_to_match = ["/poolGoogle/*"] + frontend_endpoints = ["acctest-FD-%[1]d-default-FE"] + + forwarding_configuration { + forwarding_protocol = "MatchRequest" + backend_pool_name = "acctest-FD-%[1]d-pool-google" + cache_enabled = true + } + } + + backend_pool_load_balancing { + name = "acctest-FD-%[1]d-google-LB" + additional_latency_milliseconds = 0 + sample_size = 4 + successful_samples_required = 2 + } + + backend_pool_health_probe { + name = "acctest-FD-%[1]d-google-HP" + protocol = "Https" + } + + backend_pool { + name = "acctest-FD-%[1]d-pool-google" + load_balancing_name = "acctest-FD-%[1]d-google-LB" + health_probe_name = "acctest-FD-%[1]d-google-HP" + + backend { + host_header = "google.com" + address = "google.com" + http_port = 80 + https_port = 443 + weight = 75 + enabled = true + } + } +} +`, data.RandomInteger, data.Locations.Primary) +} diff --git a/website/docs/r/frontdoor.html.markdown b/website/docs/r/frontdoor.html.markdown index 976aad277ebf1..1ae7b267ac511 100644 --- a/website/docs/r/frontdoor.html.markdown +++ b/website/docs/r/frontdoor.html.markdown @@ -155,10 +155,16 @@ The `backend_pool_health_probe` block supports the following: * `name` - (Required) Specifies the name of the Health Probe. +* `enabled` - (Optional) Is this health probe enabled? Dafaults to `true`. + * `path` - (Optional) The path to use for the Health Probe. Default is `/`. * `protocol` - (Optional) Protocol scheme to use for the Health Probe. Defaults to `Http`. +* `probe_method` - (Optional) Specifies HTTP method the health probe uses when querying the backend pool instances. Possible values include: `Get` and `Head`. Defaults to `Get`. + +-> **NOTE:** Use the `Head` method if you do not need to check the response body of your health probe. + * `interval_in_seconds` - (Optional) The number of seconds between each Health Probe. Defaults to `120`. --- From 804802be20b2e1ed519c5efcf3ddaaec7dddab0c Mon Sep 17 00:00:00 2001 From: WS <20408400+WodansSon@users.noreply.github.com> Date: Tue, 3 Mar 2020 11:23:46 -0800 Subject: [PATCH 436/498] Update to include #5924 (fixes #5499 #5903) --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9e80ffee0140..7a74b2d14c95b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ IMPROVEMENTS: * `azurerm_application_gateway` - support up to `125` for the `capacity` property with V2 SKU's [GH-5906] * `azurerm_automation_dsc_configuration` - support for the `tags` property [GH-5827] +* `azurerm_frontdoor` - exposed new attributes in `backend_pool_health_probe` block `enabled` and `probe_method` [GH-5924] * `azurerm_function_app` - Added `os_type` field to facilitate support of `linux` function apps [GH-5839] * `azurerm_kusto_cluster` - support for `enable_disk_encryption` and `enable_streaming_ingest` properties [GH-5855] * `azurerm_private_dns_a_record` - export the `fqdn` property [GH-5949] @@ -27,6 +28,7 @@ BUG FIXES: * `azurerm_automation_schedule` - fix time validation [GH-5876] * `azurerm_batch_pool` - `frontend_port_range ` is now set correctly. [GH-5941] * `azurerm_dns_txt_record` - support records up to `1024` characters in length [GH-5837] +* `azurerm_frontdoor` - fix the way `backend_pool_load_balancing`/`backend_pool_health_probe` [GH-5924] * `azurerm_frontdoor_firewall_policy` - add validation for Frontdoor WAF Name Restrictions [GH-5943] * `azurerm_linux_virtual_machine_scale_set` - correct `source_image_id` validation [GH-5901] * `azurerm_search_service` - changing the properties `replica_count` & `partition_count` properties no longer force a new resource [GH-5935] From 27ad7aece3dfb873d05e0dd9665ff61ab9c4cec4 Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Tue, 3 Mar 2020 15:15:55 -0600 Subject: [PATCH 437/498] Address review comments - Improve docs - Use heredoc strings in docs and test queries - Move shared functions into monitor package - Add underscores to test function names --- .../services/monitor/common_monitor.go} | 25 +++---- ...rce_monitor_scheduled_query_rules_alert.go | 4 +- ...ource_monitor_scheduled_query_rules_log.go | 2 +- ...arm_monitor_scheduled_query_rules_alert.go | 10 +-- ...e_arm_monitor_scheduled_query_rules_log.go | 4 +- ...onitor_scheduled_query_rules_alert_test.go | 16 ++-- ..._monitor_scheduled_query_rules_log_test.go | 8 +- ...onitor_scheduled_query_rules_alert_test.go | 75 ++++++++++++------- ..._monitor_scheduled_query_rules_log_test.go | 38 +++++----- ..._scheduled_query_rules_alert.html.markdown | 14 ++-- ...or_scheduled_query_rules_log.html.markdown | 14 ++-- ..._scheduled_query_rules_alert.html.markdown | 58 ++++++++------ ...or_scheduled_query_rules_log.html.markdown | 19 +++-- 13 files changed, 156 insertions(+), 131 deletions(-) rename azurerm/{helpers/azure/monitor.go => internal/services/monitor/common_monitor.go} (82%) diff --git a/azurerm/helpers/azure/monitor.go b/azurerm/internal/services/monitor/common_monitor.go similarity index 82% rename from azurerm/helpers/azure/monitor.go rename to azurerm/internal/services/monitor/common_monitor.go index 0560c1f027863..0754ff8aa4112 100644 --- a/azurerm/helpers/azure/monitor.go +++ b/azurerm/internal/services/monitor/common_monitor.go @@ -1,4 +1,4 @@ -package azure +package monitor import ( "fmt" @@ -8,8 +8,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func FlattenAzureRmScheduledQueryRulesAlertAction(input *insights.AzNsActionGroup) []interface{} { - result := make([]interface{}, 0) +func flattenAzureRmScheduledQueryRulesAlertAction(input *insights.AzNsActionGroup) []interface{} { v := make(map[string]interface{}) if input != nil { @@ -19,12 +18,10 @@ func FlattenAzureRmScheduledQueryRulesAlertAction(input *insights.AzNsActionGrou v["email_subject"] = input.EmailSubject v["custom_webhook_payload"] = input.CustomWebhookPayload } - result = append(result, v) - - return result + return []interface{}{v} } -func ExpandMonitorScheduledQueryRulesCommonSource(d *schema.ResourceData) *insights.Source { +func expandMonitorScheduledQueryRulesCommonSource(d *schema.ResourceData) *insights.Source { authorizedResourceIDs := d.Get("authorized_resource_ids").(*schema.Set).List() dataSourceID := d.Get("data_source_id").(string) query, ok := d.GetOk("query") @@ -40,7 +37,7 @@ func ExpandMonitorScheduledQueryRulesCommonSource(d *schema.ResourceData) *insig return &source } -func FlattenAzureRmScheduledQueryRulesAlertMetricTrigger(input *insights.LogMetricTrigger) []interface{} { +func flattenAzureRmScheduledQueryRulesAlertMetricTrigger(input *insights.LogMetricTrigger) []interface{} { result := make(map[string]interface{}) if input == nil { @@ -61,7 +58,7 @@ func FlattenAzureRmScheduledQueryRulesAlertMetricTrigger(input *insights.LogMetr return []interface{}{result} } -func FlattenAzureRmScheduledQueryRulesAlertTrigger(input *insights.TriggerCondition) []interface{} { +func flattenAzureRmScheduledQueryRulesAlertTrigger(input *insights.TriggerCondition) []interface{} { result := make(map[string]interface{}) result["operator"] = string(input.ThresholdOperator) @@ -71,20 +68,20 @@ func FlattenAzureRmScheduledQueryRulesAlertTrigger(input *insights.TriggerCondit } if input.MetricTrigger != nil { - result["metric_trigger"] = FlattenAzureRmScheduledQueryRulesAlertMetricTrigger(input.MetricTrigger) + result["metric_trigger"] = flattenAzureRmScheduledQueryRulesAlertMetricTrigger(input.MetricTrigger) } return []interface{}{result} } -func FlattenAzureRmScheduledQueryRulesLogCriteria(input *[]insights.Criteria) []interface{} { +func flattenAzureRmScheduledQueryRulesLogCriteria(input *[]insights.Criteria) []interface{} { result := make([]interface{}, 0) if input != nil { for _, criteria := range *input { v := make(map[string]interface{}) - v["dimension"] = FlattenAzureRmScheduledQueryRulesLogDimension(criteria.Dimensions) + v["dimension"] = flattenAzureRmScheduledQueryRulesLogDimension(criteria.Dimensions) v["metric_name"] = *criteria.MetricName result = append(result, v) @@ -94,7 +91,7 @@ func FlattenAzureRmScheduledQueryRulesLogCriteria(input *[]insights.Criteria) [] return result } -func FlattenAzureRmScheduledQueryRulesLogDimension(input *[]insights.Dimension) []interface{} { +func flattenAzureRmScheduledQueryRulesLogDimension(input *[]insights.Dimension) []interface{} { result := make([]interface{}, 0) if input != nil { @@ -123,7 +120,7 @@ func FlattenAzureRmScheduledQueryRulesLogDimension(input *[]insights.Dimension) // ValidateThreshold checks that a threshold value is between 0 and 10000 // and is a whole number. The azure-sdk-for-go expects this value to be a float64 // but the user validation rules want an integer. -func ValidateMonitorScheduledQueryRulesAlertThreshold(i interface{}, k string) (warnings []string, errors []error) { +func validateMonitorScheduledQueryRulesAlertThreshold(i interface{}, k string) (warnings []string, errors []error) { v, ok := i.(float64) if !ok { errors = append(errors, fmt.Errorf("expected type of %q to be float64", k)) diff --git a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_alert.go b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_alert.go index c7089ad132da9..44e6634a01d9d 100644 --- a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_alert.go +++ b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_alert.go @@ -179,7 +179,7 @@ func dataSourceArmMonitorScheduledQueryRulesAlertRead(d *schema.ResourceData, me if !ok { return fmt.Errorf("Wrong action type in Scheduled Query Rule %q (resource group %q): %T", name, resourceGroup, resp.Action) } - if err = d.Set("action", azure.FlattenAzureRmScheduledQueryRulesAlertAction(action.AznsAction)); err != nil { + if err = d.Set("action", flattenAzureRmScheduledQueryRulesAlertAction(action.AznsAction)); err != nil { return fmt.Errorf("Error setting `action`: %+v", err) } severity, err := strconv.Atoi(string(action.Severity)) @@ -188,7 +188,7 @@ func dataSourceArmMonitorScheduledQueryRulesAlertRead(d *schema.ResourceData, me } d.Set("severity", severity) d.Set("throttling", action.ThrottlingInMin) - if err = d.Set("trigger", azure.FlattenAzureRmScheduledQueryRulesAlertTrigger(action.Trigger)); err != nil { + if err = d.Set("trigger", flattenAzureRmScheduledQueryRulesAlertTrigger(action.Trigger)); err != nil { return fmt.Errorf("Error setting `trigger`: %+v", err) } diff --git a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go index ce22485f3879f..3710667bcf8d2 100644 --- a/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go +++ b/azurerm/internal/services/monitor/data_source_monitor_scheduled_query_rules_log.go @@ -126,7 +126,7 @@ func dataSourceArmMonitorScheduledQueryRulesLogRead(d *schema.ResourceData, meta if !ok { return fmt.Errorf("Wrong action type in Scheduled Query Rule %q (resource group %q): %T", name, resourceGroup, resp.Action) } - if err = d.Set("criteria", azure.FlattenAzureRmScheduledQueryRulesLogCriteria(action.Criteria)); err != nil { + if err = d.Set("criteria", flattenAzureRmScheduledQueryRulesLogCriteria(action.Criteria)); err != nil { return fmt.Errorf("Error setting `criteria`: %+v", err) } diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go index 4b8b335fafd1f..e8ad5526e7c49 100644 --- a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go +++ b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_alert.go @@ -171,7 +171,7 @@ func resourceArmMonitorScheduledQueryRulesAlert() *schema.Resource { "threshold": { Type: schema.TypeFloat, Required: true, - ValidateFunc: azure.ValidateMonitorScheduledQueryRulesAlertThreshold, + ValidateFunc: validateMonitorScheduledQueryRulesAlertThreshold, }, }, }, @@ -188,7 +188,7 @@ func resourceArmMonitorScheduledQueryRulesAlert() *schema.Resource { "threshold": { Type: schema.TypeFloat, Required: true, - ValidateFunc: azure.ValidateMonitorScheduledQueryRulesAlertThreshold, + ValidateFunc: validateMonitorScheduledQueryRulesAlertThreshold, }, }, }, @@ -248,7 +248,7 @@ func resourceArmMonitorScheduledQueryRulesAlertCreateUpdate(d *schema.ResourceDa location := azure.NormalizeLocation(d.Get("location")) - source := azure.ExpandMonitorScheduledQueryRulesCommonSource(d) + source := expandMonitorScheduledQueryRulesCommonSource(d) t := d.Get("tags").(map[string]interface{}) expandedTags := tags.Expand(t) @@ -320,7 +320,7 @@ func resourceArmMonitorScheduledQueryRulesAlertRead(d *schema.ResourceData, meta if !ok { return fmt.Errorf("Wrong action type in Scheduled Query Rule %q (resource group %q): %T", name, resourceGroup, resp.Action) } - if err = d.Set("action", azure.FlattenAzureRmScheduledQueryRulesAlertAction(action.AznsAction)); err != nil { + if err = d.Set("action", flattenAzureRmScheduledQueryRulesAlertAction(action.AznsAction)); err != nil { return fmt.Errorf("Error setting `action`: %+v", err) } severity, err := strconv.Atoi(string(action.Severity)) @@ -329,7 +329,7 @@ func resourceArmMonitorScheduledQueryRulesAlertRead(d *schema.ResourceData, meta } d.Set("severity", severity) d.Set("throttling", action.ThrottlingInMin) - if err = d.Set("trigger", azure.FlattenAzureRmScheduledQueryRulesAlertTrigger(action.Trigger)); err != nil { + if err = d.Set("trigger", flattenAzureRmScheduledQueryRulesAlertTrigger(action.Trigger)); err != nil { return fmt.Errorf("Error setting `trigger`: %+v", err) } diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go index 3027f48b85513..4efacb839a5af 100644 --- a/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go +++ b/azurerm/internal/services/monitor/resource_arm_monitor_scheduled_query_rules_log.go @@ -153,7 +153,7 @@ func resourceArmMonitorScheduledQueryRulesLogCreateUpdate(d *schema.ResourceData location := azure.NormalizeLocation(d.Get("location")) - source := azure.ExpandMonitorScheduledQueryRulesCommonSource(d) + source := expandMonitorScheduledQueryRulesCommonSource(d) t := d.Get("tags").(map[string]interface{}) expandedTags := tags.Expand(t) @@ -224,7 +224,7 @@ func resourceArmMonitorScheduledQueryRulesLogRead(d *schema.ResourceData, meta i if !ok { return fmt.Errorf("Wrong action type in Scheduled Query Rule %q (resource group %q): %T", name, resourceGroup, resp.Action) } - if err = d.Set("criteria", azure.FlattenAzureRmScheduledQueryRulesLogCriteria(action.Criteria)); err != nil { + if err = d.Set("criteria", flattenAzureRmScheduledQueryRulesLogCriteria(action.Criteria)); err != nil { return fmt.Errorf("Error setting `criteria`: %+v", err) } diff --git a/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_alert_test.go b/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_alert_test.go index e1955393eb102..382002fc4d037 100644 --- a/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_alert_test.go +++ b/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_alert_test.go @@ -9,7 +9,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" ) -func TestAccDataSourceAzureRMMonitorScheduledQueryRulesAlertingAction(t *testing.T) { +func TestAccDataSourceAzureRMMonitorScheduledQueryRules_AlertingAction(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_monitor_scheduled_query_rules_alert", "test") resource.ParallelTest(t, resource.TestCase{ @@ -17,7 +17,7 @@ func TestAccDataSourceAzureRMMonitorScheduledQueryRulesAlertingAction(t *testing Providers: acceptance.SupportedProviders, Steps: []resource.TestStep{ { - Config: testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionConfig(data), + Config: testAccDataSourceAzureRMMonitorScheduledQueryRules_AlertingActionConfig(data), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(data.ResourceName, "id"), ), @@ -26,7 +26,7 @@ func TestAccDataSourceAzureRMMonitorScheduledQueryRulesAlertingAction(t *testing }) } -func TestAccDataSourceAzureRMMonitorScheduledQueryRulesAlertingActionCrossResource(t *testing.T) { +func TestAccDataSourceAzureRMMonitorScheduledQueryRules_AlertingActionCrossResource(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_monitor_scheduled_query_rules_alert", "test") resource.ParallelTest(t, resource.TestCase{ @@ -34,7 +34,7 @@ func TestAccDataSourceAzureRMMonitorScheduledQueryRulesAlertingActionCrossResour Providers: acceptance.SupportedProviders, Steps: []resource.TestStep{ { - Config: testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResourceConfig(data), + Config: testAccDataSourceAzureRMMonitorScheduledQueryRules_AlertingActionCrossResourceConfig(data), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(data.ResourceName, "id"), ), @@ -43,9 +43,9 @@ func TestAccDataSourceAzureRMMonitorScheduledQueryRulesAlertingActionCrossResour }) } -func testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionConfig(data acceptance.TestData) string { +func testAccDataSourceAzureRMMonitorScheduledQueryRules_AlertingActionConfig(data acceptance.TestData) string { ts := time.Now().Format(time.RFC3339) - template := testAccAzureRMMonitorScheduledQueryRulesAlertingActionConfig_basic(data, ts) + template := testAccAzureRMMonitorScheduledQueryRules_AlertingActionConfigBasic(data, ts) return fmt.Sprintf(` %s @@ -57,8 +57,8 @@ data "azurerm_monitor_scheduled_query_rules_alert" "test" { `, template) } -func testAccDataSourceAzureRMMonitorScheduledQueryRules_alertingActionCrossResourceConfig(data acceptance.TestData) string { - template := testAccAzureRMMonitorScheduledQueryRules_alertingActionCrossResourceConfig(data) +func testAccDataSourceAzureRMMonitorScheduledQueryRules_AlertingActionCrossResourceConfig(data acceptance.TestData) string { + template := testAccAzureRMMonitorScheduledQueryRules_AlertingActionCrossResourceConfig(data) return fmt.Sprintf(` %s diff --git a/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_log_test.go b/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_log_test.go index 4d17e1662fb1e..6c23137eb96f5 100644 --- a/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_log_test.go +++ b/azurerm/internal/services/monitor/tests/data_source_monitor_scheduled_query_rules_log_test.go @@ -8,7 +8,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" ) -func TestAccDataSourceAzureRMMonitorScheduledQueryRulesLogToMetricAction(t *testing.T) { +func TestAccDataSourceAzureRMMonitorScheduledQueryRules_LogToMetricAction(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_monitor_scheduled_query_rules_log", "test") resource.ParallelTest(t, resource.TestCase{ @@ -16,7 +16,7 @@ func TestAccDataSourceAzureRMMonitorScheduledQueryRulesLogToMetricAction(t *test Providers: acceptance.SupportedProviders, Steps: []resource.TestStep{ { - Config: testAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricActionConfig(data), + Config: testAccDataSourceAzureRMMonitorScheduledQueryRules_LogToMetricActionConfig(data), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(data.ResourceName, "id"), ), @@ -25,8 +25,8 @@ func TestAccDataSourceAzureRMMonitorScheduledQueryRulesLogToMetricAction(t *test }) } -func testAccDataSourceAzureRMMonitorScheduledQueryRules_logToMetricActionConfig(data acceptance.TestData) string { - template := testAccAzureRMMonitorScheduledQueryRulesLogToMetricActionConfig_basic(data) +func testAccDataSourceAzureRMMonitorScheduledQueryRules_LogToMetricActionConfig(data acceptance.TestData) string { + template := testAccAzureRMMonitorScheduledQueryRules_LogToMetricActionConfigBasic(data) return fmt.Sprintf(` %s diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go index 274c4f0d9636e..65106b7ad9b7a 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_alert_test.go @@ -12,19 +12,19 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" ) -func TestAccAzureRMMonitorScheduledQueryRulesAlertingAction_basic(t *testing.T) { +func TestAccAzureRMMonitorScheduledQueryRules_AlertingActionBasic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules_alert", "test") ts := time.Now().Format(time.RFC3339) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesAlertDestroy, + CheckDestroy: testCheckAzureRMMonitorScheduledQueryRules_AlertDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMMonitorScheduledQueryRulesAlertingActionConfig_basic(data, ts), + Config: testAccAzureRMMonitorScheduledQueryRules_AlertingActionConfigBasic(data, ts), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMonitorScheduledQueryRulesAlertExists(data.ResourceName), + testCheckAzureRMMonitorScheduledQueryRules_AlertExists(data.ResourceName), ), }, data.ImportStep(), @@ -32,26 +32,26 @@ func TestAccAzureRMMonitorScheduledQueryRulesAlertingAction_basic(t *testing.T) }) } -func TestAccAzureRMMonitorScheduledQueryRulesAlertingAction_update(t *testing.T) { +func TestAccAzureRMMonitorScheduledQueryRules_AlertingActionUpdate(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules_alert", "test") ts := time.Now().Format(time.RFC3339) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesAlertDestroy, + CheckDestroy: testCheckAzureRMMonitorScheduledQueryRules_AlertDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMMonitorScheduledQueryRulesAlertingActionConfig_basic(data, ts), + Config: testAccAzureRMMonitorScheduledQueryRules_AlertingActionConfigBasic(data, ts), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMonitorScheduledQueryRulesAlertExists(data.ResourceName), + testCheckAzureRMMonitorScheduledQueryRules_AlertExists(data.ResourceName), ), }, data.ImportStep(), { - Config: testAccAzureRMMonitorScheduledQueryRulesAlertingActionConfig_update(data, ts), + Config: testAccAzureRMMonitorScheduledQueryRules_AlertingActionConfigUpdate(data, ts), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMonitorScheduledQueryRulesAlertExists(data.ResourceName), + testCheckAzureRMMonitorScheduledQueryRules_AlertExists(data.ResourceName), ), }, data.ImportStep(), @@ -59,18 +59,18 @@ func TestAccAzureRMMonitorScheduledQueryRulesAlertingAction_update(t *testing.T) }) } -func TestAccAzureRMMonitorScheduledQueryRulesAlertingAction_complete(t *testing.T) { +func TestAccAzureRMMonitorScheduledQueryRules_AlertingActionComplete(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules_alert", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesAlertDestroy, + CheckDestroy: testCheckAzureRMMonitorScheduledQueryRules_AlertDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMMonitorScheduledQueryRulesAlertingActionConfig_complete(data), + Config: testAccAzureRMMonitorScheduledQueryRules_AlertingActionConfigComplete(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMonitorScheduledQueryRulesAlertExists(data.ResourceName), + testCheckAzureRMMonitorScheduledQueryRules_AlertExists(data.ResourceName), ), }, data.ImportStep(), @@ -84,12 +84,12 @@ func TestAccAzureRMMonitorScheduledQueryRules_AlertingActionCrossResource(t *tes resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesAlertDestroy, + CheckDestroy: testCheckAzureRMMonitorScheduledQueryRules_AlertDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMMonitorScheduledQueryRules_alertingActionCrossResourceConfig(data), + Config: testAccAzureRMMonitorScheduledQueryRules_AlertingActionCrossResourceConfig(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMonitorScheduledQueryRulesAlertExists(data.ResourceName), + testCheckAzureRMMonitorScheduledQueryRules_AlertExists(data.ResourceName), ), }, data.ImportStep(), @@ -97,7 +97,7 @@ func TestAccAzureRMMonitorScheduledQueryRules_AlertingActionCrossResource(t *tes }) } -func testAccAzureRMMonitorScheduledQueryRulesAlertingActionConfig_basic(data acceptance.TestData, ts string) string { +func testAccAzureRMMonitorScheduledQueryRules_AlertingActionConfigBasic(data acceptance.TestData, ts string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-monitor-%d" @@ -123,7 +123,10 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "test" { location = "${azurerm_resource_group.test.location}" data_source_id = "${azurerm_application_insights.test.id}" - query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" + query = <<-QUERY + let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; + d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h) + QUERY frequency = 60 time_window = 60 @@ -140,7 +143,7 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, ts, ts) } -func testAccAzureRMMonitorScheduledQueryRulesAlertingActionConfig_update(data acceptance.TestData, ts string) string { +func testAccAzureRMMonitorScheduledQueryRules_AlertingActionConfigUpdate(data acceptance.TestData, ts string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-monitor-%d" @@ -166,9 +169,13 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "test" { location = "${azurerm_resource_group.test.location}" data_source_id = "${azurerm_application_insights.test.id}" - query = "let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h)" - enabled = false - description = "test description" + query = <<-QUERY + let d=datatable(TimeGenerated: datetime, usage_percent: double) [ '%s', 25.4, '%s', 75.4 ]; + d | summarize AggregatedValue=avg(usage_percent) by bin(TimeGenerated, 1h) + QUERY + + enabled = false + description = "test description" frequency = 30 time_window = 30 @@ -185,7 +192,7 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, ts, ts) } -func testAccAzureRMMonitorScheduledQueryRulesAlertingActionConfig_complete(data acceptance.TestData) string { +func testAccAzureRMMonitorScheduledQueryRules_AlertingActionConfigComplete(data acceptance.TestData) string { ts := time.Now().Format(time.RFC3339) return fmt.Sprintf(` @@ -242,7 +249,7 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, ts, ts) } -func testAccAzureRMMonitorScheduledQueryRules_alertingActionCrossResourceConfig(data acceptance.TestData) string { +func testAccAzureRMMonitorScheduledQueryRules_AlertingActionCrossResourceConfig(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-monitor-%d" @@ -279,7 +286,19 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "test" { authorized_resource_ids = ["${azurerm_application_insights.test.id}", "${azurerm_log_analytics_workspace.test.id}"] data_source_id = "${azurerm_application_insights.test.id}" - query = format("let a=workspace('%%s').Perf | where Computer='dependency' and TimeGenerated > ago(1h) | where ObjectName == 'Processor' and CounterName == '%%%% Processor Time' | summarize cpu=avg(CounterValue) by bin(TimeGenerated, 1m) | extend ts=tostring(TimeGenerated); let b=requests | where resultCode == '200' and timestamp > ago(1h) | summarize reqs=count() by bin(timestamp, 1m) | extend ts = tostring(timestamp); a | join b on $left.ts == $right.ts | where cpu > 50 and reqs > 5", azurerm_log_analytics_workspace.test.id) + query = format(<<-QUERY + let a=workspace('%%s').Perf + | where Computer='dependency' and TimeGenerated > ago(1h) + | where ObjectName == 'Processor' and CounterName == '%%%% Processor Time' + | summarize cpu=avg(CounterValue) by bin(TimeGenerated, 1m) + | extend ts=tostring(TimeGenerated); let b=requests + | where resultCode == '200' and timestamp > ago(1h) + | summarize reqs=count() by bin(timestamp, 1m) + | extend ts = tostring(timestamp); a + | join b on $left.ts == $right.ts + | where cpu > 50 and reqs > 5 +QUERY + , azurerm_log_analytics_workspace.test.id) frequency = 60 time_window = 60 @@ -298,7 +317,7 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) } -func testCheckAzureRMMonitorScheduledQueryRulesAlertDestroy(s *terraform.State) error { +func testCheckAzureRMMonitorScheduledQueryRules_AlertDestroy(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).Monitor.ScheduledQueryRulesClient ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext @@ -324,7 +343,7 @@ func testCheckAzureRMMonitorScheduledQueryRulesAlertDestroy(s *terraform.State) return nil } -func testCheckAzureRMMonitorScheduledQueryRulesAlertExists(resourceName string) resource.TestCheckFunc { +func testCheckAzureRMMonitorScheduledQueryRules_AlertExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { // Ensure we have enough information in state to look up in API rs, ok := s.RootModule().Resources[resourceName] diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go index d1ea512b1dd31..c62f37193cd3b 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_scheduled_query_rules_log_test.go @@ -11,18 +11,18 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" ) -func TestAccAzureRMMonitorScheduledQueryRulesLogToMetricAction_basic(t *testing.T) { +func TestAccAzureRMMonitorScheduledQueryRules_LogToMetricActionBasic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules_log", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesLogDestroy, + CheckDestroy: testCheckAzureRMMonitorScheduledQueryRules_LogDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMMonitorScheduledQueryRulesLogToMetricActionConfig_basic(data), + Config: testAccAzureRMMonitorScheduledQueryRules_LogToMetricActionConfigBasic(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMonitorScheduledQueryRulesLogExists(data.ResourceName), + testCheckAzureRMMonitorScheduledQueryRules_LogExists(data.ResourceName), ), }, data.ImportStep(), @@ -30,25 +30,25 @@ func TestAccAzureRMMonitorScheduledQueryRulesLogToMetricAction_basic(t *testing. }) } -func TestAccAzureRMMonitorScheduledQueryRulesLogToMetricAction_update(t *testing.T) { +func TestAccAzureRMMonitorScheduledQueryRules_LogToMetricActionUpdate(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules_log", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesLogDestroy, + CheckDestroy: testCheckAzureRMMonitorScheduledQueryRules_LogDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMMonitorScheduledQueryRulesLogToMetricActionConfig_basic(data), + Config: testAccAzureRMMonitorScheduledQueryRules_LogToMetricActionConfigBasic(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMonitorScheduledQueryRulesLogExists(data.ResourceName), + testCheckAzureRMMonitorScheduledQueryRules_LogExists(data.ResourceName), ), }, data.ImportStep(), { - Config: testAccAzureRMMonitorScheduledQueryRulesLogToMetricActionConfig_update(data), + Config: testAccAzureRMMonitorScheduledQueryRules_LogToMetricActionConfigUpdate(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMonitorScheduledQueryRulesLogExists(data.ResourceName), + testCheckAzureRMMonitorScheduledQueryRules_LogExists(data.ResourceName), ), }, data.ImportStep(), @@ -56,18 +56,18 @@ func TestAccAzureRMMonitorScheduledQueryRulesLogToMetricAction_update(t *testing }) } -func TestAccAzureRMMonitorScheduledQueryRulesLogToMetricAction_complete(t *testing.T) { +func TestAccAzureRMMonitorScheduledQueryRules_LogToMetricActionComplete(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_monitor_scheduled_query_rules_log", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, - CheckDestroy: testCheckAzureRMMonitorScheduledQueryRulesLogDestroy, + CheckDestroy: testCheckAzureRMMonitorScheduledQueryRules_LogDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMMonitorScheduledQueryRulesLogToMetricActionConfig_complete(data), + Config: testAccAzureRMMonitorScheduledQueryRules_LogToMetricActionConfigComplete(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMMonitorScheduledQueryRulesLogExists(data.ResourceName), + testCheckAzureRMMonitorScheduledQueryRules_LogExists(data.ResourceName), ), }, data.ImportStep(), @@ -75,7 +75,7 @@ func TestAccAzureRMMonitorScheduledQueryRulesLogToMetricAction_complete(t *testi }) } -func testAccAzureRMMonitorScheduledQueryRulesLogToMetricActionConfig_basic(data acceptance.TestData) string { +func testAccAzureRMMonitorScheduledQueryRules_LogToMetricActionConfigBasic(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-monitor-%d" @@ -109,7 +109,7 @@ resource "azurerm_monitor_scheduled_query_rules_log" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) } -func testAccAzureRMMonitorScheduledQueryRulesLogToMetricActionConfig_update(data acceptance.TestData) string { +func testAccAzureRMMonitorScheduledQueryRules_LogToMetricActionConfigUpdate(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-monitor-%d" @@ -145,7 +145,7 @@ resource "azurerm_monitor_scheduled_query_rules_log" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) } -func testAccAzureRMMonitorScheduledQueryRulesLogToMetricActionConfig_complete(data acceptance.TestData) string { +func testAccAzureRMMonitorScheduledQueryRules_LogToMetricActionConfigComplete(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestRG-monitor-%d" @@ -206,7 +206,7 @@ resource "azurerm_monitor_metric_alert" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) } -func testCheckAzureRMMonitorScheduledQueryRulesLogDestroy(s *terraform.State) error { +func testCheckAzureRMMonitorScheduledQueryRules_LogDestroy(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).Monitor.ScheduledQueryRulesClient ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext @@ -232,7 +232,7 @@ func testCheckAzureRMMonitorScheduledQueryRulesLogDestroy(s *terraform.State) er return nil } -func testCheckAzureRMMonitorScheduledQueryRulesLogExists(resourceName string) resource.TestCheckFunc { +func testCheckAzureRMMonitorScheduledQueryRules_LogExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { // Ensure we have enough information in state to look up in API rs, ok := s.RootModule().Resources[resourceName] diff --git a/website/docs/d/monitor_scheduled_query_rules_alert.html.markdown b/website/docs/d/monitor_scheduled_query_rules_alert.html.markdown index a48871a910b7b..abe74d1c19d9f 100644 --- a/website/docs/d/monitor_scheduled_query_rules_alert.html.markdown +++ b/website/docs/d/monitor_scheduled_query_rules_alert.html.markdown @@ -3,12 +3,12 @@ subcategory: "Monitor" layout: "azurerm" page_title: "Azure Resource Manager: azurerm_monitor_scheduled_query_rules_alert" description: |- - Get information about the specified AlertingAction Scheduled Query Rule. + Get information about the specified AlertingAction Scheduled Query Rules resource. --- # Data Source: azurerm_monitor_scheduled_query_rules_alert -Use this data source to access the properties of an AlertingAction Scheduled Query Rule. +Use this data source to access the properties of an AlertingAction scheduled query rule. ## Example Usage @@ -25,17 +25,17 @@ output "query_rule_id" { ## Argument Reference -* `name` - (Required) Specifies the name of the Scheduled Query Rule. -* `resource_group_name` - (Required) Specifies the name of the resource group where the Scheduled Query Rule is located. +* `name` - (Required) Specifies the name of the scheduled query rule. +* `resource_group_name` - (Required) Specifies the name of the resource group where the scheduled query rule is located. ## Attributes Reference -* `id` - The ID of the Scheduled Query Rule. +* `id` - The ID of the scheduled query rule. * `action` - An `action` block as defined below. * `authorized_resource_ids` - List of Resource IDs referred into query. * `data_source_id` - The resource URI over which log search query is to be run. -* `description` - The description of the Scheduled Query Rule. -* `enabled` - Whether this Scheduled Query Rule is enabled. +* `description` - The description of the scheduled query rule. +* `enabled` - Whether this scheduled query rule is enabled. * `frequency` - Frequency at which rule condition should be evaluated. * `query` - Log search query. * `time_window` - Time window for which data needs to be fetched for query. diff --git a/website/docs/d/monitor_scheduled_query_rules_log.html.markdown b/website/docs/d/monitor_scheduled_query_rules_log.html.markdown index 47cb9bdbdd236..9f994b7bcfe48 100644 --- a/website/docs/d/monitor_scheduled_query_rules_log.html.markdown +++ b/website/docs/d/monitor_scheduled_query_rules_log.html.markdown @@ -3,12 +3,12 @@ subcategory: "Monitor" layout: "azurerm" page_title: "Azure Resource Manager: azurerm_monitor_scheduled_query_rules_log" description: |- - Get information about the specified LogToMetricAction Scheduled Query Rule. + Get information about the specified LogToMetricAction Scheduled Query Rules resource. --- # Data Source: azurerm_monitor_scheduled_query_rules_log -Use this data source to access the properties of a LogToMetricAction Scheduled Query Rule. +Use this data source to access the properties of a LogToMetricAction scheduled query rule. ## Example Usage @@ -25,16 +25,16 @@ output "query_rule_id" { ## Argument Reference -* `name` - (Required) Specifies the name of the Scheduled Query Rule. -* `resource_group_name` - (Required) Specifies the name of the resource group where the Scheduled Query Rule is located. +* `name` - (Required) Specifies the name of the scheduled query rule. +* `resource_group_name` - (Required) Specifies the name of the resource group where the scheduled query rule is located. ## Attributes Reference -* `id` - The ID of the Scheduled Query Rule. +* `id` - The ID of the scheduled query rule. * `criteria` - A `criteria` block as defined below. * `data_source_id` - The resource URI over which log search query is to be run. -* `description` - The description of the Scheduled Query Rule. -* `enabled` - Whether this Scheduled Query Rule is enabled. +* `description` - The description of the scheduled query rule. +* `enabled` - Whether this scheduled query rule is enabled. --- diff --git a/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown b/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown index 63b0d54188595..fc8b98559eb54 100644 --- a/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown +++ b/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown @@ -3,12 +3,12 @@ subcategory: "Monitor" layout: "azurerm" page_title: "Azure Resource Manager: azurerm_monitor_scheduled_query_rules_alert" description: |- - Manages an AlertingAction Scheduled Query Rule within Azure Monitor + Manages an AlertingAction Scheduled Query Rules resource within Azure Monitor --- # azurerm_monitor_scheduled_query_rules_alert -Manages an AlertingAction Scheduled Query Rule within Azure Monitor. +Manages an AlertingAction Scheduled Query Rules resource within Azure Monitor. ## Example Usage @@ -33,8 +33,6 @@ resource "azurerm_application_insights" "example2" { } # Example: Alerting Action with result count trigger -# Alert if more than three HTTP requests returned a >= 500 result code -# in the past 30 minutes resource "azurerm_monitor_scheduled_query_rules_alert" "example" { name = format("%s-queryrule", var.prefix) location = azurerm_resource_group.example.location @@ -46,11 +44,16 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "example" { custom_webhook_payload = "{}" } data_source_id = azurerm_application_insights.example.id - description = "Result count trigger example - alert when total results cross threshold" + description = "Alert when total results cross threshold" enabled = true - frequency = 5 - query = "requests | where tolong(resultCode) >= 500 | summarize AggregatedValue = count() by bin(timestamp, 5m)" + # Count all requests with server error result code grouped into 5-minute bins + query = <<-QUERY + requests + | where tolong(resultCode) >= 500 + | summarize count() by bin(timestamp, 5m) + QUERY severity = 1 + frequency = 5 time_window = 30 trigger { operator = "GreaterThan" @@ -59,8 +62,6 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "example" { } # Example: Alerting Action with metric trigger -# Alert if more than three HTTP requests returned a >= 500 result code -# in the past 30 minutes that have the same operation (ie: GET /) resource "azurerm_monitor_scheduled_query_rules_alert" "example" { name = format("%s-queryrule", var.prefix) location = azurerm_resource_group.example.location @@ -72,11 +73,16 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "example" { custom_webhook_payload = "{}" } data_source_id = azurerm_application_insights.example.id - description = "Metric trigger example - query results grouped by metric; alert when results per metric_column cross threshold" + description = "Query results grouped into AggregatedValue; alert when results cross threshold" enabled = true - frequency = 5 - query = "requests | where tolong(resultCode) >= 500 | summarize AggregatedValue = count() by operation_Name, bin(timestamp, 5m)" + # Count all requests with server error result code grouped into 5-minute bins by HTTP operation + query = <<-QUERY + requests + | where tolong(resultCode) >= 500 + | summarize AggregatedValue = count() by operation_Name, bin(timestamp, 5m) +QUERY severity = 1 + frequency = 5 time_window = 30 trigger { operator = "GreaterThan" @@ -91,10 +97,6 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "example" { } # Example: Alerting Action Cross-Resource -# Enables use of cross-resource queries to analyze query results across -# multiple Application Insights or Log Analytics resources. -# Alert if more than three HTTP requests returned a >= 500 result code -# in either of the Insights resources in the past 30 minutes. resource "azurerm_monitor_scheduled_query_rules_alert" "example2" { name = format("%s-queryrule2", var.prefix) location = azurerm_resource_group.example.location @@ -107,11 +109,19 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "example2" { custom_webhook_payload = "{}" } data_source_id = azurerm_application_insights.example.id - description = "Scheduled query rule Alerting Action cross-resource example" + description = "Query may access data within multiple resources" enabled = true - frequency = 5 - query = format("let a=requests | where toint(resultCode) >= 500 | extend fail=1; let b=app('%s').requests | where toint(resultCode) >= 500 | extend fail=1; a | join b on fail", azurerm_application_insights.example2.id) + # Count requests in multiple log resources and group into 5-minute bins by HTTP operation + query = format(<<-QUERY + let a=requests + | where toint(resultCode) >= 500 + | extend fail=1; let b=app('%s').requests + | where toint(resultCode) >= 500 | extend fail=1; a + | join b on fail +QUERY +, azurerm_application_insights.example2.id) severity = 1 + frequency = 5 time_window = 30 trigger { operator = "GreaterThan" @@ -124,8 +134,8 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "example2" { The following arguments are supported: -* `name` - (Required) The name of the Scheduled Query Rule. Changing this forces a new resource to be created. -* `resource_group_name` - (Required) The name of the resource group in which to create the Scheduled Query Rule instance. +* `name` - (Required) The name of the scheduled query rule. Changing this forces a new resource to be created. +* `resource_group_name` - (Required) The name of the resource group in which to create the scheduled query rule instance. * `data_source_id` - (Required) The resource URI over which log search query is to be run. * `frequency` - (Required) Frequency (in minutes) at which rule condition should be evaluated. Values must be between 5 and 1440 (inclusive). * `query` - (Required) Log search query. @@ -133,8 +143,8 @@ The following arguments are supported: * `trigger` - (Required) The condition that results in the alert rule being run. * `action` - (Required) An `action` block as defined below. * `authorized_resource_ids` - (Optional) List of Resource IDs referred into query. -* `description` - (Optional) The description of the Scheduled Query Rule. -* `enabled` - (Optional) Whether this Scheduled Query Rule is enabled. Default is `true`. +* `description` - (Optional) The description of the scheduled query rule. +* `enabled` - (Optional) Whether this scheduled query rule is enabled. Default is `true`. * `severity` - (Optional) Severity of the alert. Possible values include: 0, 1, 2, 3, or 4. * `throttling` - (Optional) Time (in minutes) for which Alerts should be throttled or suppressed. Values must be between 0 and 10000 (inclusive). @@ -167,7 +177,7 @@ The following arguments are supported: The following attributes are exported: -* `id` - The ID of the Scheduled Query Rule. +* `id` - The ID of the scheduled query rule. ## Import diff --git a/website/docs/r/monitor_scheduled_query_rules_log.html.markdown b/website/docs/r/monitor_scheduled_query_rules_log.html.markdown index 20d2db6663e96..b8c14236804a8 100644 --- a/website/docs/r/monitor_scheduled_query_rules_log.html.markdown +++ b/website/docs/r/monitor_scheduled_query_rules_log.html.markdown @@ -3,12 +3,12 @@ subcategory: "Monitor" layout: "azurerm" page_title: "Azure Resource Manager: azurerm_monitor_scheduled_query_rules_log" description: |- - Manages a LogToMetricAction Scheduled Query Rule within Azure Monitor + Manages a LogToMetricAction Scheduled Query Rules resources within Azure Monitor --- # azurerm_monitor_scheduled_query_rules_log -Manages a LogToMetricAction Scheduled Query Rule within Azure Monitor. +Manages a LogToMetricAction Scheduled Query Rules resource within Azure Monitor. ## Example Usage @@ -26,8 +26,7 @@ resource "azurerm_log_analytics_workspace" "example" { retention_in_days = 30 } -# Create Azure Monitor metric from log analytics data for -# the Computer named 'targetVM'. +# Example: LogToMetric Action for the named Computer resource "azurerm_scheduled_query_rule_log" "example" { name = format("%s-queryrule", var.prefix) location = azurerm_resource_group.example.location @@ -57,7 +56,7 @@ resource "azurerm_monitor_action_group" "example" { } } -# Create an alert on the new Scheduled Query Rules metric +# Example: Creates alert using the new Scheduled Query Rules metric resource "azurerm_monitor_metric_alert" "example" { name = "example-metricalert" resource_group_name = azurerm_resource_group.example.name @@ -84,12 +83,12 @@ resource "azurerm_monitor_metric_alert" "example" { The following arguments are supported: -* `name` - (Required) The name of the Scheduled Query Rule. Changing this forces a new resource to be created. -* `resource_group_name` - (Required) The name of the resource group in which to create the Scheduled Query Rule instance. +* `name` - (Required) The name of the scheduled query rule. Changing this forces a new resource to be created. +* `resource_group_name` - (Required) The name of the resource group in which to create the scheduled query rule instance. * `criteria` - (Required) A `criteria` block as defined below. * `data_source_id` - (Required) The resource uri over which log search query is to be run. -* `description` - (Optional) The description of the Scheduled Query Rule. -* `enabled` - (Optional) Whether this Scheduled Query Rule is enabled. Default is `true`. +* `description` - (Optional) The description of the scheduled query rule. +* `enabled` - (Optional) Whether this scheduled query rule is enabled. Default is `true`. --- @@ -110,7 +109,7 @@ The following arguments are supported: The following attributes are exported: -* `id` - The ID of the Scheduled Query Rule. +* `id` - The ID of the scheduled query rule. ## Import From e58ce6a041f0946ebefc3d241c7c072e54a19915 Mon Sep 17 00:00:00 2001 From: mattstobbs Date: Tue, 3 Mar 2020 22:07:38 +0000 Subject: [PATCH 438/498] example: `azurerm_application_insights` - Use location from resource group (#5970) --- website/docs/r/application_insights.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/application_insights.html.markdown b/website/docs/r/application_insights.html.markdown index 8c6a9cd903909..c254d880f8e22 100644 --- a/website/docs/r/application_insights.html.markdown +++ b/website/docs/r/application_insights.html.markdown @@ -20,7 +20,7 @@ resource "azurerm_resource_group" "example" { resource "azurerm_application_insights" "example" { name = "tf-test-appinsights" - location = "West Europe" + location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name application_type = "web" } From 5bb8657fc7ac8eefe10d1f5b9f7370af5e341e53 Mon Sep 17 00:00:00 2001 From: Marcel Sinn Date: Tue, 3 Mar 2020 23:08:52 +0100 Subject: [PATCH 439/498] `azurerm_kubernetes_cluster` - Address documentation typo #5964 --- website/docs/r/kubernetes_cluster.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/kubernetes_cluster.html.markdown b/website/docs/r/kubernetes_cluster.html.markdown index c8b599827b0f8..5a1efedb8dd3b 100644 --- a/website/docs/r/kubernetes_cluster.html.markdown +++ b/website/docs/r/kubernetes_cluster.html.markdown @@ -326,7 +326,7 @@ The following attributes are exported: * `fqdn` - The FQDN of the Azure Kubernetes Managed Cluster. -* `private_fqdn` - The FQDN for the Kubernetes Cluster when private link has been enabled, which is is only resolvable inside the Virtual Network used by the Kubernetes Cluster. +* `private_fqdn` - The FQDN for the Kubernetes Cluster when private link has been enabled, which is only resolvable inside the Virtual Network used by the Kubernetes Cluster. -> **NOTE:** At this time Private Link is in Public Preview. From 0625b05fe27b613f431ab7d6504e874ba0dd1d14 Mon Sep 17 00:00:00 2001 From: David McPike <7037366+mcdafydd@users.noreply.github.com> Date: Tue, 3 Mar 2020 16:57:33 -0600 Subject: [PATCH 440/498] Fix markdown formatting --- ..._scheduled_query_rules_alert.html.markdown | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown b/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown index fc8b98559eb54..ef47304a59406 100644 --- a/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown +++ b/website/docs/r/monitor_scheduled_query_rules_alert.html.markdown @@ -47,14 +47,14 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "example" { description = "Alert when total results cross threshold" enabled = true # Count all requests with server error result code grouped into 5-minute bins - query = <<-QUERY + query = <<-QUERY requests | where tolong(resultCode) >= 500 | summarize count() by bin(timestamp, 5m) QUERY - severity = 1 - frequency = 5 - time_window = 30 + severity = 1 + frequency = 5 + time_window = 30 trigger { operator = "GreaterThan" threshold = 3 @@ -76,14 +76,14 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "example" { description = "Query results grouped into AggregatedValue; alert when results cross threshold" enabled = true # Count all requests with server error result code grouped into 5-minute bins by HTTP operation - query = <<-QUERY + query = <<-QUERY requests | where tolong(resultCode) >= 500 | summarize AggregatedValue = count() by operation_Name, bin(timestamp, 5m) QUERY - severity = 1 - frequency = 5 - time_window = 30 + severity = 1 + frequency = 5 + time_window = 30 trigger { operator = "GreaterThan" threshold = 3 @@ -112,17 +112,17 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "example2" { description = "Query may access data within multiple resources" enabled = true # Count requests in multiple log resources and group into 5-minute bins by HTTP operation - query = format(<<-QUERY + query = format(<<-QUERY let a=requests | where toint(resultCode) >= 500 | extend fail=1; let b=app('%s').requests | where toint(resultCode) >= 500 | extend fail=1; a | join b on fail QUERY -, azurerm_application_insights.example2.id) - severity = 1 - frequency = 5 - time_window = 30 + , azurerm_application_insights.example2.id) + severity = 1 + frequency = 5 + time_window = 30 trigger { operator = "GreaterThan" threshold = 3 From 9aa32daf9a440fa94996d255e056f11edb8415d1 Mon Sep 17 00:00:00 2001 From: Steve <11830746+jackofallops@users.noreply.github.com> Date: Wed, 4 Mar 2020 06:59:39 +0000 Subject: [PATCH 441/498] Update changelog for 5915 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a74b2d14c95b..84e65c4072663 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ BUG FIXES: * `azurerm_frontdoor_firewall_policy` - add validation for Frontdoor WAF Name Restrictions [GH-5943] * `azurerm_linux_virtual_machine_scale_set` - correct `source_image_id` validation [GH-5901] * `azurerm_search_service` - changing the properties `replica_count` & `partition_count` properties no longer force a new resource [GH-5935] +* `azurerm_app_service_plan` - Updates no longer fail if App Service Environment ID is not specified [GH-5915] ## 2.0.0 (February 24, 2020) From 939f0d8f67d6405b77f944f1437011226231e2e5 Mon Sep 17 00:00:00 2001 From: Marcel Sinn Date: Wed, 4 Mar 2020 17:01:06 +0100 Subject: [PATCH 442/498] docs: Fixed Typo in `r/subnet` (#5980) Will fix typo in subnet documentation. --- website/docs/r/subnet.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/subnet.html.markdown b/website/docs/r/subnet.html.markdown index 8b0f2b293da8d..f7558527fe9bd 100644 --- a/website/docs/r/subnet.html.markdown +++ b/website/docs/r/subnet.html.markdown @@ -63,7 +63,7 @@ The following arguments are supported: * `delegation` - (Optional) One or more `delegation` blocks as defined below. -* `enforce_private_link_endpoint_network_policies` - (Optional) Enable or Disable network policies for the private link endpoint on the subnet. Default valule is `false`. Conflicts with enforce_private_link_service_network_policies. +* `enforce_private_link_endpoint_network_policies` - (Optional) Enable or Disable network policies for the private link endpoint on the subnet. Default value is `false`. Conflicts with enforce_private_link_service_network_policies. -> **NOTE:** Network policies, like network security groups (NSG), are not supported for Private Link Endpoints or Private Link Services. In order to deploy a Private Link Endpoint on a given subnet, you must set the `enforce_private_link_endpoint_network_policies` attribute to `true`. This setting is only applicable for the Private Link Endpoint, for all other resources in the subnet access is controlled based via the Network Security Group which can be configured using the `azurerm_subnet_network_security_group_association` resource. From 3063e236c36a6ed7bd8ebd439d745e8e134b358f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20Ku=C5=9Bnierz?= Date: Wed, 4 Mar 2020 18:49:43 +0100 Subject: [PATCH 443/498] =?UTF-8?q?azurerm=5Flinux=5Fvirtual=5Fmachine=20?= =?UTF-8?q?=20-=20Fix=20broken=20link=20in=20documentati=E2=80=A6=20(#5983?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- website/docs/r/linux_virtual_machine.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/linux_virtual_machine.html.markdown b/website/docs/r/linux_virtual_machine.html.markdown index 85f1c6ad4b996..7e3b0b3101267 100644 --- a/website/docs/r/linux_virtual_machine.html.markdown +++ b/website/docs/r/linux_virtual_machine.html.markdown @@ -24,7 +24,7 @@ Manages a Linux Virtual Machine. ## Example Usage -This example provisions a basic Linux Virtual Machine on an internal network. Additional examples of how to use the `azurerm_linux_virtual_machine` resource can be found [in the ./examples/virtual-machine/linux` directory within the Github Repository](https://github.com/terraform-providers/terraform-provider-azurerm/tree/master/examples/virtual-machine/linux). +This example provisions a basic Linux Virtual Machine on an internal network. Additional examples of how to use the `azurerm_linux_virtual_machine` resource can be found [in the ./examples/virtual-machine/linux` directory within the Github Repository](https://github.com/terraform-providers/terraform-provider-azurerm/tree/master/examples/virtual-machines/linux). ```hcl resource "azurerm_resource_group" "example" { From bcd5ad26afbb93226128ff2f607d3b668f3d0b9e Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 4 Mar 2020 09:51:34 -0800 Subject: [PATCH 444/498] =?UTF-8?q?azurerm=5Fwindows=5Fvirtual=5Fmachine?= =?UTF-8?q?=20-=20Add=20WinRM=20protocol=20to=20documen=E2=80=A6=20(#5982)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Protocol argument inside winrm_listener is missing on the azurerm_windows_virtual_machine resource --- website/docs/r/windows_virtual_machine.html.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/docs/r/windows_virtual_machine.html.markdown b/website/docs/r/windows_virtual_machine.html.markdown index c36ba27eff737..54907eeb9499f 100644 --- a/website/docs/r/windows_virtual_machine.html.markdown +++ b/website/docs/r/windows_virtual_machine.html.markdown @@ -255,6 +255,8 @@ A `secret` block supports the following: A `winrm_listener` block supports the following: +* `Protocol` - (Required) Specifies Specifies the protocol of listener. Possible values are `Http` or `Https` + * `certificate_url` - (Optional) The Secret URL of a Key Vault Certificate, which must be specified when `protocol` is set to `Https`. ## Attributes Reference From a50a865a44958965307778c9488e0f011f5803dc Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 4 Mar 2020 09:54:35 -0800 Subject: [PATCH 445/498] =?UTF-8?q?azurerm=5Fapi=5Fmanagement=5Fproduct=5F?= =?UTF-8?q?group:=20fix=20import=20error=20resource=E2=80=A6=20(#5978)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix #5962 --- .../apimanagement/resource_arm_api_management_product_group.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/apimanagement/resource_arm_api_management_product_group.go b/azurerm/internal/services/apimanagement/resource_arm_api_management_product_group.go index 22a1398578b0e..d8ef73d3181fd 100644 --- a/azurerm/internal/services/apimanagement/resource_arm_api_management_product_group.go +++ b/azurerm/internal/services/apimanagement/resource_arm_api_management_product_group.go @@ -62,7 +62,7 @@ func resourceArmApiManagementProductGroupCreate(d *schema.ResourceData, meta int if !utils.ResponseWasNotFound(resp) { subscriptionId := meta.(*clients.Client).Account.SubscriptionId - resourceId := fmt.Sprintf("/subscriptions/%s/resourceGroups/%s/providers/Microsoft.ApiManagement/service/%s/products/%s/groups/%s", subscriptionId, resourceGroup, serviceName, groupName, productId) + resourceId := fmt.Sprintf("/subscriptions/%s/resourceGroups/%s/providers/Microsoft.ApiManagement/service/%s/products/%s/groups/%s", subscriptionId, resourceGroup, serviceName, productId, groupName) return tf.ImportAsExistsError("azurerm_api_management_product_group", resourceId) } } From 4dbfde8dda200d9f9d44196a03a403e7f8b0fa75 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Wed, 4 Mar 2020 09:56:05 -0800 Subject: [PATCH 446/498] Update Changelog for #5053 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84e65c4072663..f2ef7b1046f78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ FEATURES: * **New Data Source:** `azurerm_kusto_cluster` [GH-5942] * **New Resource:** `azurerm_bot_channel_directline` [GH-5445] +* **New Resource:** `azurerm_monitor_scheduled_query_rules_alert` [GH-5053] +* **New Resource:** `azurerm_monitor_scheduled_query_rules_log` [GH-5053] IMPROVEMENTS: From 03259771c7258633799525e72289ce411011fcb4 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 4 Mar 2020 10:07:25 -0800 Subject: [PATCH 447/498] Refine doc of `azurerm_key_vault` (#5968) --- website/docs/r/key_vault.html.markdown | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/website/docs/r/key_vault.html.markdown b/website/docs/r/key_vault.html.markdown index 63353965902b9..c682c021e4af1 100644 --- a/website/docs/r/key_vault.html.markdown +++ b/website/docs/r/key_vault.html.markdown @@ -19,6 +19,16 @@ Manages a Key Vault. ## Example Usage ```hcl +provider "azurerm" { + features { + key_vault { + purge_soft_delete_on_destroy = true + } + } +} + +data "azurerm_client_config" "current" {} + resource "azurerm_resource_group" "example" { name = "resourceGroup1" location = "West US" @@ -29,7 +39,7 @@ resource "azurerm_key_vault" "example" { location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name enabled_for_disk_encryption = true - tenant_id = "d6e396d0-5584-41dc-9fc0-268df99bc610" + tenant_id = data.azurerm_client_config.current.tenant_id soft_delete_enabled = true purge_protection_enabled = false @@ -37,7 +47,7 @@ resource "azurerm_key_vault" "example" { access_policy { tenant_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.service_principal_object_id + object_id = data.azurerm_client_config.current.object_id key_permissions = [ "get", @@ -73,7 +83,7 @@ The following arguments are supported: * `resource_group_name` - (Required) The name of the resource group in which to create the Key Vault. Changing this forces a new resource to be created. -* `sku_name` - (Optional) The Name of the SKU used for this Key Vault. Possible values are `standard` and `premium`. +* `sku_name` - (Required) The Name of the SKU used for this Key Vault. Possible values are `standard` and `premium`. * `tenant_id` - (Required) The Azure Active Directory tenant ID that should be used for authenticating requests to the key vault. From 4b91da15d6ce7c11522c61f7a6382febeffb4715 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 4 Mar 2020 10:30:12 -0800 Subject: [PATCH 448/498] azurerm_managed_disk - DOC: Update disk encryption attribute (#5987) The `encryption_settings`'s `key_encryption_key` block's `source_vault_id` attribute needs to point to the ID of the source vault, rather than the URI. Following such documentation results in an apply failure. --- website/docs/r/managed_disk.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/managed_disk.html.markdown b/website/docs/r/managed_disk.html.markdown index f2d88570d25a6..177b37a5849c5 100644 --- a/website/docs/r/managed_disk.html.markdown +++ b/website/docs/r/managed_disk.html.markdown @@ -149,7 +149,7 @@ The `key_encryption_key` block supports: * `key_url` - (Required) The URL to the Key Vault Key used as the Key Encryption Key. This can be found as `id` on the `azurerm_key_vault_key` resource. -* `source_vault_id` - (Required) The URL of the Key Vault. This can be found as `vault_uri` on the `azurerm_key_vault` resource. +* `source_vault_id` - (Required) The ID of the source Key Vault. ## Attributes Reference From 475300758c1a1314aa16be53c511af8aaf56141a Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 4 Mar 2020 12:06:50 -0800 Subject: [PATCH 449/498] support `public_ips` for resource `azurerm_batch_pool` (#5967) fix #5920 the original sdk version 2018-12-01 does not support fields public_ips, so I upgraded the version to 2019-08-01 --- azurerm/helpers/azure/batch_account.go | 2 +- azurerm/helpers/azure/batch_pool.go | 11 +- .../internal/services/batch/client/client.go | 2 +- .../batch/data_source_batch_account.go | 2 +- .../batch/resource_arm_batch_account.go | 2 +- .../batch/resource_arm_batch_application.go | 2 +- .../batch/resource_arm_batch_certificate.go | 2 +- .../services/batch/resource_arm_batch_pool.go | 11 +- .../tests/resource_arm_batch_pool_test.go | 28 +++- .../batch/account.go | 18 +-- .../batch/application.go | 10 +- .../batch/applicationpackage.go | 17 ++- .../batch/certificate.go | 12 +- .../batch/client.go | 2 +- .../batch/location.go | 4 +- .../batch/models.go | 136 +++++++++++++++--- .../batch/operations.go | 2 +- .../{2018-12-01 => 2019-08-01}/batch/pool.go | 14 +- .../batch/version.go | 2 +- vendor/modules.txt | 2 +- website/docs/r/batch_pool.html.markdown | 2 + 21 files changed, 216 insertions(+), 67 deletions(-) rename vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/{2018-12-01 => 2019-08-01}/batch/account.go (99%) rename vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/{2018-12-01 => 2019-08-01}/batch/application.go (99%) rename vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/{2018-12-01 => 2019-08-01}/batch/applicationpackage.go (97%) rename vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/{2018-12-01 => 2019-08-01}/batch/certificate.go (99%) rename vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/{2018-12-01 => 2019-08-01}/batch/client.go (99%) rename vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/{2018-12-01 => 2019-08-01}/batch/location.go (99%) rename vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/{2018-12-01 => 2019-08-01}/batch/models.go (91%) rename vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/{2018-12-01 => 2019-08-01}/batch/operations.go (99%) rename vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/{2018-12-01 => 2019-08-01}/batch/pool.go (99%) rename vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/{2018-12-01 => 2019-08-01}/batch/version.go (94%) diff --git a/azurerm/helpers/azure/batch_account.go b/azurerm/helpers/azure/batch_account.go index 464792a9ecc21..305b4bac03392 100644 --- a/azurerm/helpers/azure/batch_account.go +++ b/azurerm/helpers/azure/batch_account.go @@ -3,7 +3,7 @@ package azure import ( "fmt" - "github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch" + "github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch" ) // ExpandBatchAccountKeyVaultReference expands Batch account KeyVault reference diff --git a/azurerm/helpers/azure/batch_pool.go b/azurerm/helpers/azure/batch_pool.go index 8d2afe3fbeb82..7659f8037d5b2 100644 --- a/azurerm/helpers/azure/batch_pool.go +++ b/azurerm/helpers/azure/batch_pool.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch" + "github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -571,6 +571,11 @@ func ExpandBatchPoolNetworkConfiguration(list []interface{}) (*batch.NetworkConf } } + if v, ok := networkConfigValue["public_ips"]; ok { + publicIPsRaw := v.(*schema.Set).List() + networkConfiguration.PublicIPs = utils.ExpandStringSlice(publicIPsRaw) + } + if v, ok := networkConfigValue["endpoint_configuration"]; ok { endpoint, err := ExpandBatchPoolEndpointConfiguration(v.([]interface{})) if err != nil { @@ -661,6 +666,10 @@ func FlattenBatchPoolNetworkConfiguration(networkConfig *batch.NetworkConfigurat result["subnet_id"] = *networkConfig.SubnetID } + if networkConfig.PublicIPs != nil { + result["public_ips"] = schema.NewSet(schema.HashString, utils.FlattenStringSlice(networkConfig.PublicIPs)) + } + if cfg := networkConfig.EndpointConfiguration; cfg != nil && cfg.InboundNatPools != nil && len(*cfg.InboundNatPools) != 0 { endpointConfigs := make([]interface{}, len(*cfg.InboundNatPools)) diff --git a/azurerm/internal/services/batch/client/client.go b/azurerm/internal/services/batch/client/client.go index e666035ad4080..b808313522d95 100644 --- a/azurerm/internal/services/batch/client/client.go +++ b/azurerm/internal/services/batch/client/client.go @@ -1,7 +1,7 @@ package client import ( - "github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch" + "github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common" ) diff --git a/azurerm/internal/services/batch/data_source_batch_account.go b/azurerm/internal/services/batch/data_source_batch_account.go index c922f05c048db..b9e2acc7901dc 100644 --- a/azurerm/internal/services/batch/data_source_batch_account.go +++ b/azurerm/internal/services/batch/data_source_batch_account.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch" + "github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" diff --git a/azurerm/internal/services/batch/resource_arm_batch_account.go b/azurerm/internal/services/batch/resource_arm_batch_account.go index 7dabca9217392..9f7499867a90a 100644 --- a/azurerm/internal/services/batch/resource_arm_batch_account.go +++ b/azurerm/internal/services/batch/resource_arm_batch_account.go @@ -6,7 +6,7 @@ import ( "regexp" "time" - "github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch" + "github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch" "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" diff --git a/azurerm/internal/services/batch/resource_arm_batch_application.go b/azurerm/internal/services/batch/resource_arm_batch_application.go index f3ed35ab734be..ca09a25f7ad6a 100644 --- a/azurerm/internal/services/batch/resource_arm_batch_application.go +++ b/azurerm/internal/services/batch/resource_arm_batch_application.go @@ -6,7 +6,7 @@ import ( "regexp" "time" - "github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch" + "github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" diff --git a/azurerm/internal/services/batch/resource_arm_batch_certificate.go b/azurerm/internal/services/batch/resource_arm_batch_certificate.go index 0851ad1a0ca2f..b7bc8433f4f7d 100644 --- a/azurerm/internal/services/batch/resource_arm_batch_certificate.go +++ b/azurerm/internal/services/batch/resource_arm_batch_certificate.go @@ -5,7 +5,7 @@ import ( "log" "time" - "github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch" + "github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch" "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" diff --git a/azurerm/internal/services/batch/resource_arm_batch_pool.go b/azurerm/internal/services/batch/resource_arm_batch_pool.go index 8ea488b72a5cf..00eff49e470ae 100644 --- a/azurerm/internal/services/batch/resource_arm_batch_pool.go +++ b/azurerm/internal/services/batch/resource_arm_batch_pool.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch" + "github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch" "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" @@ -397,6 +397,15 @@ func resourceArmBatchPool() *schema.Resource { ForceNew: true, ValidateFunc: validation.StringIsNotEmpty, }, + "public_ips": { + Type: schema.TypeSet, + Optional: true, + ForceNew: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + Set: schema.HashString, + }, "endpoint_configuration": { Type: schema.TypeList, Optional: true, diff --git a/azurerm/internal/services/batch/tests/resource_arm_batch_pool_test.go b/azurerm/internal/services/batch/tests/resource_arm_batch_pool_test.go index e8a8572c94c51..69e93639185aa 100644 --- a/azurerm/internal/services/batch/tests/resource_arm_batch_pool_test.go +++ b/azurerm/internal/services/batch/tests/resource_arm_batch_pool_test.go @@ -392,6 +392,20 @@ func TestAccAzureRMBatchPool_frontEndPortRanges(t *testing.T) { Config: testaccAzureRMBatchPool_networkConfiguration(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMBatchPoolExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "vm_size", "STANDARD_A1"), + resource.TestCheckResourceAttr(data.ResourceName, "node_agent_sku_id", "batch.node.ubuntu 16.04"), + resource.TestCheckResourceAttr(data.ResourceName, "account_name", fmt.Sprintf("testaccbatch%s", data.RandomString)), + resource.TestCheckResourceAttr(data.ResourceName, "storage_image_reference.#", "1"), + resource.TestCheckResourceAttr(data.ResourceName, "storage_image_reference.0.publisher", "Canonical"), + resource.TestCheckResourceAttr(data.ResourceName, "storage_image_reference.0.sku", "16.04.0-LTS"), + resource.TestCheckResourceAttr(data.ResourceName, "storage_image_reference.0.offer", "UbuntuServer"), + resource.TestCheckResourceAttr(data.ResourceName, "auto_scale.#", "0"), + resource.TestCheckResourceAttr(data.ResourceName, "fixed_scale.#", "1"), + resource.TestCheckResourceAttr(data.ResourceName, "fixed_scale.0.target_dedicated_nodes", "1"), + resource.TestCheckResourceAttr(data.ResourceName, "start_task.#", "0"), + resource.TestCheckResourceAttr(data.ResourceName, "network_configuration.#", "1"), + resource.TestCheckResourceAttrSet(data.ResourceName, "network_configuration.0.subnet_id"), + resource.TestCheckResourceAttr(data.ResourceName, "network_configuration.0.public_ips.#", "1"), ), }, data.ImportStep("stop_pending_resize_operation"), @@ -1242,6 +1256,15 @@ resource "azurerm_subnet" "test" { address_prefix = "10.0.2.0/24" } +resource "azurerm_public_ip" "test" { + name = "acctestpublicip-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + allocation_method = "Static" + sku = "Standard" + domain_name_label = "acctest-publicip" +} + resource "azurerm_batch_account" "test" { name = "testaccbatch%s" resource_group_name = "${azurerm_resource_group.test.name}" @@ -1267,7 +1290,8 @@ resource "azurerm_batch_pool" "test" { } network_configuration { - subnet_id = "${azurerm_subnet.test.id}" + subnet_id = azurerm_subnet.test.id + public_ips = [azurerm_public_ip.test.id] endpoint_configuration { name = "SSH" @@ -1283,5 +1307,5 @@ resource "azurerm_batch_pool" "test" { } } } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomString, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomString, data.RandomString) } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/account.go b/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/account.go similarity index 99% rename from vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/account.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/account.go index e64ef09217851..f565ba8f7ecb1 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/account.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/account.go @@ -102,7 +102,7 @@ func (client AccountClient) CreatePreparer(ctx context.Context, resourceGroupNam "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -189,7 +189,7 @@ func (client AccountClient) DeletePreparer(ctx context.Context, resourceGroupNam "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -279,7 +279,7 @@ func (client AccountClient) GetPreparer(ctx context.Context, resourceGroupName s "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -366,7 +366,7 @@ func (client AccountClient) GetKeysPreparer(ctx context.Context, resourceGroupNa "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -439,7 +439,7 @@ func (client AccountClient) ListPreparer(ctx context.Context) (*http.Request, er "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -552,7 +552,7 @@ func (client AccountClient) ListByResourceGroupPreparer(ctx context.Context, res "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -675,7 +675,7 @@ func (client AccountClient) RegenerateKeyPreparer(ctx context.Context, resourceG "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -763,7 +763,7 @@ func (client AccountClient) SynchronizeAutoStorageKeysPreparer(ctx context.Conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -848,7 +848,7 @@ func (client AccountClient) UpdatePreparer(ctx context.Context, resourceGroupNam "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/application.go b/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/application.go similarity index 99% rename from vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/application.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/application.go index 6273fbf6e5fc9..7f1d2bf3e27be 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/application.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/application.go @@ -100,7 +100,7 @@ func (client ApplicationClient) CreatePreparer(ctx context.Context, resourceGrou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -196,7 +196,7 @@ func (client ApplicationClient) DeletePreparer(ctx context.Context, resourceGrou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -286,7 +286,7 @@ func (client ApplicationClient) GetPreparer(ctx context.Context, resourceGroupNa "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -373,7 +373,7 @@ func (client ApplicationClient) ListPreparer(ctx context.Context, resourceGroupN "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -505,7 +505,7 @@ func (client ApplicationClient) UpdatePreparer(ctx context.Context, resourceGrou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/applicationpackage.go b/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/applicationpackage.go similarity index 97% rename from vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/applicationpackage.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/applicationpackage.go index c793f7002c1c5..b4611bcdad584 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/applicationpackage.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/applicationpackage.go @@ -41,7 +41,8 @@ func NewApplicationPackageClientWithBaseURI(baseURI string, subscriptionID strin return ApplicationPackageClient{NewWithBaseURI(baseURI, subscriptionID)} } -// Activate activates the specified application package. +// Activate activates the specified application package. This should be done after the `ApplicationPackage` was created +// and uploaded. This needs to be done before an `ApplicationPackage` can be used on Pools or Tasks // Parameters: // resourceGroupName - the name of the resource group that contains the Batch account. // accountName - the name of the Batch account. @@ -108,7 +109,7 @@ func (client ApplicationPackageClient) ActivatePreparer(ctx context.Context, res "versionName": autorest.Encode("path", versionName), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -143,7 +144,9 @@ func (client ApplicationPackageClient) ActivateResponder(resp *http.Response) (r return } -// Create creates an application package record. +// Create creates an application package record. The record contains the SAS where the package should be uploaded to. +// Once it is uploaded the `ApplicationPackage` needs to be activated using `ApplicationPackageActive` before it can be +// used. // Parameters: // resourceGroupName - the name of the resource group that contains the Batch account. // accountName - the name of the Batch account. @@ -208,7 +211,7 @@ func (client ApplicationPackageClient) CreatePreparer(ctx context.Context, resou "versionName": autorest.Encode("path", versionName), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -310,7 +313,7 @@ func (client ApplicationPackageClient) DeletePreparer(ctx context.Context, resou "versionName": autorest.Encode("path", versionName), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -406,7 +409,7 @@ func (client ApplicationPackageClient) GetPreparer(ctx context.Context, resource "versionName": autorest.Encode("path", versionName), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -499,7 +502,7 @@ func (client ApplicationPackageClient) ListPreparer(ctx context.Context, resourc "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/certificate.go b/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/certificate.go similarity index 99% rename from vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/certificate.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/certificate.go index 73a8a1489c7a2..c3ae0c6998760 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/certificate.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/certificate.go @@ -104,7 +104,7 @@ func (client CertificateClient) CancelDeletionPreparer(ctx context.Context, reso "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -198,7 +198,7 @@ func (client CertificateClient) CreatePreparer(ctx context.Context, resourceGrou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -300,7 +300,7 @@ func (client CertificateClient) DeletePreparer(ctx context.Context, resourceGrou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -397,7 +397,7 @@ func (client CertificateClient) GetPreparer(ctx context.Context, resourceGroupNa "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -488,7 +488,7 @@ func (client CertificateClient) ListByBatchAccountPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -629,7 +629,7 @@ func (client CertificateClient) UpdatePreparer(ctx context.Context, resourceGrou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/client.go similarity index 99% rename from vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/client.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/client.go index 90fd26ca233d2..ce20ef8148f41 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/client.go @@ -1,4 +1,4 @@ -// Package batch implements the Azure ARM Batch service API version 2018-12-01. +// Package batch implements the Azure ARM Batch service API version 2019-08-01. // // package batch diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/location.go b/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/location.go similarity index 99% rename from vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/location.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/location.go index 25f3a0d546ff9..16a584ad4fd02 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/location.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/location.go @@ -91,7 +91,7 @@ func (client LocationClient) CheckNameAvailabilityPreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -168,7 +168,7 @@ func (client LocationClient) GetQuotasPreparer(ctx context.Context, locationName "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/models.go similarity index 91% rename from vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/models.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/models.go index 325a7bf441fc2..d89a2826763c1 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/models.go @@ -29,7 +29,7 @@ import ( ) // The package's fully qualified name. -const fqdn = "github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch" +const fqdn = "github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch" // AccountKeyType enumerates the values for account key type. type AccountKeyType string @@ -159,7 +159,8 @@ const ( // remotely access the node. CertificateVisibilityRemoteUser CertificateVisibility = "RemoteUser" // CertificateVisibilityStartTask The certificate should be visible to the user account under which the - // start task is run. + // start task is run. Note that if AutoUser Scope is Pool for both the StartTask and a Task, this + // certificate will be visible to the Task as well. CertificateVisibilityStartTask CertificateVisibility = "StartTask" // CertificateVisibilityTask The certificate should be visible to the user accounts under which job tasks // are run. @@ -210,6 +211,23 @@ func PossibleComputeNodeFillTypeValues() []ComputeNodeFillType { return []ComputeNodeFillType{Pack, Spread} } +// ContainerWorkingDirectory enumerates the values for container working directory. +type ContainerWorkingDirectory string + +const ( + // ContainerImageDefault Using container image defined working directory. Beware that this directory will + // not contain the resource files downloaded by Batch. + ContainerImageDefault ContainerWorkingDirectory = "ContainerImageDefault" + // TaskWorkingDirectory Use the standard Batch service task working directory, which will contain the Task + // resource files populated by Batch. + TaskWorkingDirectory ContainerWorkingDirectory = "TaskWorkingDirectory" +) + +// PossibleContainerWorkingDirectoryValues returns an array of possible values for the ContainerWorkingDirectory const type. +func PossibleContainerWorkingDirectoryValues() []ContainerWorkingDirectory { + return []ContainerWorkingDirectory{ContainerImageDefault, TaskWorkingDirectory} +} + // ElevationLevel enumerates the values for elevation level. type ElevationLevel string @@ -781,10 +799,14 @@ type AccountProperties struct { KeyVaultReference *KeyVaultReference `json:"keyVaultReference,omitempty"` // AutoStorage - READ-ONLY AutoStorage *AutoStorageProperties `json:"autoStorage,omitempty"` - // DedicatedCoreQuota - READ-ONLY + // DedicatedCoreQuota - READ-ONLY; For accounts with PoolAllocationMode set to UserSubscription, quota is managed on the subscription so this value is not returned. DedicatedCoreQuota *int32 `json:"dedicatedCoreQuota,omitempty"` - // LowPriorityCoreQuota - READ-ONLY + // LowPriorityCoreQuota - READ-ONLY; For accounts with PoolAllocationMode set to UserSubscription, quota is managed on the subscription so this value is not returned. LowPriorityCoreQuota *int32 `json:"lowPriorityCoreQuota,omitempty"` + // DedicatedCoreQuotaPerVMFamily - READ-ONLY; A list of the dedicated core quota per Virtual Machine family for the Batch account. For accounts with PoolAllocationMode set to UserSubscription, quota is managed on the subscription so this value is not returned. + DedicatedCoreQuotaPerVMFamily *[]VirtualMachineFamilyCoreQuota `json:"dedicatedCoreQuotaPerVMFamily,omitempty"` + // DedicatedCoreQuotaPerVMFamilyEnforced - READ-ONLY; Batch is transitioning its core quota system for dedicated cores to be enforced per Virtual Machine family. During this transitional phase, the dedicated core quota per Virtual Machine family may not yet be enforced. If this flag is false, dedicated core quota is enforced via the old dedicatedCoreQuota property on the account and does not consider Virtual Machine family. If this flag is true, dedicated core quota is enforced via the dedicatedCoreQuotaPerVMFamily property on the account, and the old dedicatedCoreQuota does not apply. + DedicatedCoreQuotaPerVMFamilyEnforced *bool `json:"dedicatedCoreQuotaPerVMFamilyEnforced,omitempty"` // PoolQuota - READ-ONLY PoolQuota *int32 `json:"poolQuota,omitempty"` // ActiveJobAndJobScheduleQuota - READ-ONLY @@ -1102,12 +1124,38 @@ type AutoStorageProperties struct { // AutoUserSpecification ... type AutoUserSpecification struct { - // Scope - The default value is task. Possible values include: 'AutoUserScopeTask', 'AutoUserScopePool' + // Scope - The default value is Pool. If the pool is running Windows a value of Task should be specified if stricter isolation between tasks is required. For example, if the task mutates the registry in a way which could impact other tasks, or if certificates have been specified on the pool which should not be accessible by normal tasks but should be accessible by start tasks. Possible values include: 'AutoUserScopeTask', 'AutoUserScopePool' Scope AutoUserScope `json:"scope,omitempty"` - // ElevationLevel - nonAdmin - The auto user is a standard user without elevated access. admin - The auto user is a user with elevated access and operates with full Administrator permissions. The default value is nonAdmin. Possible values include: 'NonAdmin', 'Admin' + // ElevationLevel - The default value is nonAdmin. Possible values include: 'NonAdmin', 'Admin' ElevationLevel ElevationLevel `json:"elevationLevel,omitempty"` } +// AzureBlobFileSystemConfiguration ... +type AzureBlobFileSystemConfiguration struct { + AccountName *string `json:"accountName,omitempty"` + ContainerName *string `json:"containerName,omitempty"` + // AccountKey - This property is mutually exclusive with sasKey and one must be specified. + AccountKey *string `json:"accountKey,omitempty"` + // SasKey - This property is mutually exclusive with accountKey and one must be specified. + SasKey *string `json:"sasKey,omitempty"` + // BlobfuseOptions - These are 'net use' options in Windows and 'mount' options in Linux. + BlobfuseOptions *string `json:"blobfuseOptions,omitempty"` + // RelativeMountPath - All file systems are mounted relative to the Batch mounts directory, accessible via the AZ_BATCH_NODE_MOUNTS_DIR environment variable. + RelativeMountPath *string `json:"relativeMountPath,omitempty"` +} + +// AzureFileShareConfiguration ... +type AzureFileShareConfiguration struct { + AccountName *string `json:"accountName,omitempty"` + // AzureFileURL - This is of the form 'https://{account}.file.core.windows.net/'. + AzureFileURL *string `json:"azureFileUrl,omitempty"` + AccountKey *string `json:"accountKey,omitempty"` + // RelativeMountPath - All file systems are mounted relative to the Batch mounts directory, accessible via the AZ_BATCH_NODE_MOUNTS_DIR environment variable. + RelativeMountPath *string `json:"relativeMountPath,omitempty"` + // MountOptions - These are 'net use' options in Windows and 'mount' options in Linux. + MountOptions *string `json:"mountOptions,omitempty"` +} + // Certificate contains information about a certificate. type Certificate struct { autorest.Response `json:"-"` @@ -1402,6 +1450,17 @@ type CheckNameAvailabilityResult struct { Message *string `json:"message,omitempty"` } +// CIFSMountConfiguration ... +type CIFSMountConfiguration struct { + Username *string `json:"username,omitempty"` + Source *string `json:"source,omitempty"` + // RelativeMountPath - All file systems are mounted relative to the Batch mounts directory, accessible via the AZ_BATCH_NODE_MOUNTS_DIR environment variable. + RelativeMountPath *string `json:"relativeMountPath,omitempty"` + // MountOptions - These are 'net use' options in Windows and 'mount' options in Linux. + MountOptions *string `json:"mountOptions,omitempty"` + Password *string `json:"password,omitempty"` +} + // CloudError an error response from the Batch service. type CloudError struct { Error *CloudErrorBody `json:"error,omitempty"` @@ -1421,7 +1480,7 @@ type CloudErrorBody struct { // CloudServiceConfiguration ... type CloudServiceConfiguration struct { - // OsFamily - Possible values are: 2 - OS Family 2, equivalent to Windows Server 2008 R2 SP1. 3 - OS Family 3, equivalent to Windows Server 2012. 4 - OS Family 4, equivalent to Windows Server 2012 R2. 5 - OS Family 5, equivalent to Windows Server 2016. For more information, see Azure Guest OS Releases (https://azure.microsoft.com/documentation/articles/cloud-services-guestos-update-matrix/#releases). + // OsFamily - Possible values are: 2 - OS Family 2, equivalent to Windows Server 2008 R2 SP1. 3 - OS Family 3, equivalent to Windows Server 2012. 4 - OS Family 4, equivalent to Windows Server 2012 R2. 5 - OS Family 5, equivalent to Windows Server 2016. 6 - OS Family 6, equivalent to Windows Server 2019. For more information, see Azure Guest OS Releases (https://azure.microsoft.com/documentation/articles/cloud-services-guestos-update-matrix/#releases). OsFamily *string `json:"osFamily,omitempty"` // OsVersion - The default value is * which specifies the latest operating system version for the specified OS family. OsVersion *string `json:"osVersion,omitempty"` @@ -1444,8 +1503,8 @@ type ContainerRegistry struct { Password *string `json:"password,omitempty"` } -// DataDisk data Disk settings which will be used by the data disks associated to Compute Nodes in the -// pool. +// DataDisk settings which will be used by the data disks associated to Compute Nodes in the Pool. When +// using attached data disks, you need to mount and format the disks from within a VM to use them. type DataDisk struct { // Lun - The lun is used to uniquely identify each data disk. If attaching multiple disks, each should have a distinct lun. Lun *int32 `json:"lun,omitempty"` @@ -1506,11 +1565,11 @@ type ImageReference struct { Publisher *string `json:"publisher,omitempty"` // Offer - For example, UbuntuServer or WindowsServer. Offer *string `json:"offer,omitempty"` - // Sku - For example, 14.04.0-LTS or 2012-R2-Datacenter. + // Sku - For example, 18.04-LTS or 2019-Datacenter. Sku *string `json:"sku,omitempty"` // Version - A value of 'latest' can be specified to select the latest version of an image. If omitted, the default is 'latest'. Version *string `json:"version,omitempty"` - // ID - This property is mutually exclusive with other properties. The virtual machine image must be in the same region and subscription as the Azure Batch account. For information about the firewall settings for Batch node agent to communicate with Batch service see https://docs.microsoft.com/en-us/azure/batch/batch-api-basics#virtual-network-vnet-and-firewall-configuration . + // ID - This property is mutually exclusive with other properties. For Virtual Machine Image it must be in the same region and subscription as the Azure Batch account. For SIG image it must have replicas in the same region as the Azure Batch account. For information about the firewall settings for the Batch node agent to communicate with the Batch service see https://docs.microsoft.com/en-us/azure/batch/batch-api-basics#virtual-network-vnet-and-firewall-configuration. ID *string `json:"id,omitempty"` } @@ -2147,12 +2206,26 @@ type MetadataItem struct { Value *string `json:"value,omitempty"` } +// MountConfiguration ... +type MountConfiguration struct { + // AzureBlobFileSystemConfiguration - This property is mutually exclusive with all other properties. + AzureBlobFileSystemConfiguration *AzureBlobFileSystemConfiguration `json:"azureBlobFileSystemConfiguration,omitempty"` + // NfsMountConfiguration - This property is mutually exclusive with all other properties. + NfsMountConfiguration *NFSMountConfiguration `json:"nfsMountConfiguration,omitempty"` + // CifsMountConfiguration - This property is mutually exclusive with all other properties. + CifsMountConfiguration *CIFSMountConfiguration `json:"cifsMountConfiguration,omitempty"` + // AzureFileShareConfiguration - This property is mutually exclusive with all other properties. + AzureFileShareConfiguration *AzureFileShareConfiguration `json:"azureFileShareConfiguration,omitempty"` +} + // NetworkConfiguration the network configuration for a pool. type NetworkConfiguration struct { // SubnetID - The virtual network must be in the same region and subscription as the Azure Batch account. The specified subnet should have enough free IP addresses to accommodate the number of nodes in the pool. If the subnet doesn't have enough free IP addresses, the pool will partially allocate compute nodes, and a resize error will occur. The 'MicrosoftAzureBatch' service principal must have the 'Classic Virtual Machine Contributor' Role-Based Access Control (RBAC) role for the specified VNet. The specified subnet must allow communication from the Azure Batch service to be able to schedule tasks on the compute nodes. This can be verified by checking if the specified VNet has any associated Network Security Groups (NSG). If communication to the compute nodes in the specified subnet is denied by an NSG, then the Batch service will set the state of the compute nodes to unusable. For pools created via virtualMachineConfiguration the Batch account must have poolAllocationMode userSubscription in order to use a VNet. If the specified VNet has any associated Network Security Groups (NSG), then a few reserved system ports must be enabled for inbound communication. For pools created with a virtual machine configuration, enable ports 29876 and 29877, as well as port 22 for Linux and port 3389 for Windows. For pools created with a cloud service configuration, enable ports 10100, 20100, and 30100. Also enable outbound connections to Azure Storage on port 443. For more details see: https://docs.microsoft.com/en-us/azure/batch/batch-api-basics#virtual-network-vnet-and-firewall-configuration SubnetID *string `json:"subnetId,omitempty"` // EndpointConfiguration - Pool endpoint configuration is only supported on pools with the virtualMachineConfiguration property. EndpointConfiguration *PoolEndpointConfiguration `json:"endpointConfiguration,omitempty"` + // PublicIPs - The number of IPs specified here limits the maximum size of the Pool - 50 dedicated nodes or 20 low-priority nodes can be allocated for each public IP. For example, a pool needing 150 dedicated VMs would need at least 3 public IPs specified. Each element of this collection is of the form: /subscriptions/{subscription}/resourceGroups/{group}/providers/Microsoft.Network/publicIPAddresses/{ip}. + PublicIPs *[]string `json:"publicIPs,omitempty"` } // NetworkSecurityGroupRule ... @@ -2163,6 +2236,17 @@ type NetworkSecurityGroupRule struct { Access NetworkSecurityGroupRuleAccess `json:"access,omitempty"` // SourceAddressPrefix - Valid values are a single IP address (i.e. 10.10.10.10), IP subnet (i.e. 192.168.1.0/24), default tag, or * (for all addresses). If any other values are provided the request fails with HTTP status code 400. SourceAddressPrefix *string `json:"sourceAddressPrefix,omitempty"` + // SourcePortRanges - Valid values are '*' (for all ports 0 - 65535) or arrays of ports or port ranges (i.e. 100-200). The ports should in the range of 0 to 65535 and the port ranges or ports can't overlap. If any other values are provided the request fails with HTTP status code 400. Default value will be *. + SourcePortRanges *[]string `json:"sourcePortRanges,omitempty"` +} + +// NFSMountConfiguration ... +type NFSMountConfiguration struct { + Source *string `json:"source,omitempty"` + // RelativeMountPath - All file systems are mounted relative to the Batch mounts directory, accessible via the AZ_BATCH_NODE_MOUNTS_DIR environment variable. + RelativeMountPath *string `json:"relativeMountPath,omitempty"` + // MountOptions - These are 'net use' options in Windows and 'mount' options in Linux. + MountOptions *string `json:"mountOptions,omitempty"` } // Operation ... @@ -2497,21 +2581,25 @@ type PoolProperties struct { // InterNodeCommunication - This imposes restrictions on which nodes can be assigned to the pool. Enabling this value can reduce the chance of the requested number of nodes to be allocated in the pool. If not specified, this value defaults to 'Disabled'. Possible values include: 'Enabled', 'Disabled' InterNodeCommunication InterNodeCommunicationState `json:"interNodeCommunication,omitempty"` NetworkConfiguration *NetworkConfiguration `json:"networkConfiguration,omitempty"` - MaxTasksPerNode *int32 `json:"maxTasksPerNode,omitempty"` - TaskSchedulingPolicy *TaskSchedulingPolicy `json:"taskSchedulingPolicy,omitempty"` - UserAccounts *[]UserAccount `json:"userAccounts,omitempty"` + // MaxTasksPerNode - The default value is 1. The maximum value is the smaller of 4 times the number of cores of the vmSize of the pool or 256. + MaxTasksPerNode *int32 `json:"maxTasksPerNode,omitempty"` + // TaskSchedulingPolicy - If not specified, the default is spread. + TaskSchedulingPolicy *TaskSchedulingPolicy `json:"taskSchedulingPolicy,omitempty"` + UserAccounts *[]UserAccount `json:"userAccounts,omitempty"` // Metadata - The Batch service does not assign any meaning to metadata; it is solely for the use of user code. Metadata *[]MetadataItem `json:"metadata,omitempty"` // StartTask - In an PATCH (update) operation, this property can be set to an empty object to remove the start task from the pool. StartTask *StartTask `json:"startTask,omitempty"` // Certificates - For Windows compute nodes, the Batch service installs the certificates to the specified certificate store and location. For Linux compute nodes, the certificates are stored in a directory inside the task working directory and an environment variable AZ_BATCH_CERTIFICATES_DIR is supplied to the task to query for this location. For certificates with visibility of 'remoteUser', a 'certs' directory is created in the user's home directory (e.g., /home/{user-name}/certs) and certificates are placed in that directory. Certificates *[]CertificateReference `json:"certificates,omitempty"` - // ApplicationPackages - Changes to application packages affect all new compute nodes joining the pool, but do not affect compute nodes that are already in the pool until they are rebooted or reimaged. + // ApplicationPackages - Changes to application package references affect all new compute nodes joining the pool, but do not affect compute nodes that are already in the pool until they are rebooted or reimaged. There is a maximum of 10 application package references on any given pool. ApplicationPackages *[]ApplicationPackageReference `json:"applicationPackages,omitempty"` // ApplicationLicenses - The list of application licenses must be a subset of available Batch service application licenses. If a license is requested which is not supported, pool creation will fail. ApplicationLicenses *[]string `json:"applicationLicenses,omitempty"` // ResizeOperationStatus - READ-ONLY ResizeOperationStatus *ResizeOperationStatus `json:"resizeOperationStatus,omitempty"` + // MountConfiguration - This supports Azure Files, NFS, CIFS/SMB, and Blobfuse. + MountConfiguration *[]MountConfiguration `json:"mountConfiguration,omitempty"` } // ProxyResource a definition of an Azure resource. @@ -2596,7 +2684,11 @@ type ScaleSettings struct { AutoScale *AutoScaleSettings `json:"autoScale,omitempty"` } -// StartTask ... +// StartTask in some cases the start task may be re-run even though the node was not rebooted. Due to this, +// start tasks should be idempotent and exit gracefully if the setup they're performing has already been +// done. Special care should be taken to avoid start tasks which create breakaway process or install/launch +// services from the start task working directory, as this will block Batch from being able to re-run the +// start task. type StartTask struct { // CommandLine - The command line does not run under a shell, and therefore cannot take advantage of shell features such as environment variable expansion. If you want to take advantage of such features, you should invoke the shell in the command line, for example using "cmd /c MyCommand" in Windows or "/bin/sh -c MyCommand" in Linux. Required if any other properties of the startTask are specified. CommandLine *string `json:"commandLine,omitempty"` @@ -2606,7 +2698,7 @@ type StartTask struct { UserIdentity *UserIdentity `json:"userIdentity,omitempty"` // MaxTaskRetryCount - The Batch service retries a task if its exit code is nonzero. Note that this value specifically controls the number of retries. The Batch service will try the task once, and may then retry up to this limit. For example, if the maximum retry count is 3, Batch tries the task up to 4 times (one initial try and 3 retries). If the maximum retry count is 0, the Batch service does not retry the task. If the maximum retry count is -1, the Batch service retries the task without limit. MaxTaskRetryCount *int32 `json:"maxTaskRetryCount,omitempty"` - // WaitForSuccess - If true and the start task fails on a compute node, the Batch service retries the start task up to its maximum retry count (maxTaskRetryCount). If the task has still not completed successfully after all retries, then the Batch service marks the compute node unusable, and will not schedule tasks to it. This condition can be detected via the node state and scheduling error detail. If false, the Batch service will not wait for the start task to complete. In this case, other tasks can start executing on the compute node while the start task is still running; and even if the start task fails, new tasks will continue to be scheduled on the node. The default is false. + // WaitForSuccess - If true and the start task fails on a compute node, the Batch service retries the start task up to its maximum retry count (maxTaskRetryCount). If the task has still not completed successfully after all retries, then the Batch service marks the compute node unusable, and will not schedule tasks to it. This condition can be detected via the node state and scheduling error detail. If false, the Batch service will not wait for the start task to complete. In this case, other tasks can start executing on the compute node while the start task is still running; and even if the start task fails, new tasks will continue to be scheduled on the node. The default is true. WaitForSuccess *bool `json:"waitForSuccess,omitempty"` // ContainerSettings - When this is specified, all directories recursively below the AZ_BATCH_NODE_ROOT_DIR (the root of Azure Batch directories on the node) are mapped into the container, all task environment variables are mapped into the container, and the task command line is executed in the container. ContainerSettings *TaskContainerSettings `json:"containerSettings,omitempty"` @@ -2620,6 +2712,8 @@ type TaskContainerSettings struct { ImageName *string `json:"imageName,omitempty"` // Registry - This setting can be omitted if was already provided at pool creation. Registry *ContainerRegistry `json:"registry,omitempty"` + // WorkingDirectory - Possible values include: 'TaskWorkingDirectory', 'ContainerImageDefault' + WorkingDirectory ContainerWorkingDirectory `json:"workingDirectory,omitempty"` } // TaskSchedulingPolicy ... @@ -2665,6 +2759,14 @@ type VirtualMachineConfiguration struct { ContainerConfiguration *ContainerConfiguration `json:"containerConfiguration,omitempty"` } +// VirtualMachineFamilyCoreQuota a VM Family and its associated core quota for the Batch account. +type VirtualMachineFamilyCoreQuota struct { + // Name - READ-ONLY; The Virtual Machine family name. + Name *string `json:"name,omitempty"` + // CoreQuota - READ-ONLY; The core quota for the VM family for the Batch account. + CoreQuota *int32 `json:"coreQuota,omitempty"` +} + // WindowsConfiguration ... type WindowsConfiguration struct { // EnableAutomaticUpdates - If omitted, the default value is true. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/operations.go similarity index 99% rename from vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/operations.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/operations.go index ba0cc0f1e6660..ba276f32e2d2e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/operations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/operations.go @@ -76,7 +76,7 @@ func (client OperationsClient) List(ctx context.Context) (result OperationListRe // ListPreparer prepares the List request. func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/pool.go b/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/pool.go similarity index 99% rename from vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/pool.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/pool.go index 4344f2d77d055..9e960d28c8580 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/pool.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/pool.go @@ -135,7 +135,7 @@ func (client PoolClient) CreatePreparer(ctx context.Context, resourceGroupName s "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -236,7 +236,7 @@ func (client PoolClient) DeletePreparer(ctx context.Context, resourceGroupName s "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -332,7 +332,7 @@ func (client PoolClient) DisableAutoScalePreparer(ctx context.Context, resourceG "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -423,7 +423,7 @@ func (client PoolClient) GetPreparer(ctx context.Context, resourceGroupName stri "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -525,7 +525,7 @@ func (client PoolClient) ListByBatchAccountPreparer(ctx context.Context, resourc "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -666,7 +666,7 @@ func (client PoolClient) StopResizePreparer(ctx context.Context, resourceGroupNa "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -761,7 +761,7 @@ func (client PoolClient) UpdatePreparer(ctx context.Context, resourceGroupName s "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2018-12-01" + const APIVersion = "2019-08-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/version.go similarity index 94% rename from vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/version.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/version.go index 5c5c5f9133e7c..38e5c092b1421 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch/version.go @@ -21,7 +21,7 @@ import "github.com/Azure/azure-sdk-for-go/version" // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/" + version.Number + " batch/2018-12-01" + return "Azure-SDK-For-Go/" + version.Number + " batch/2019-08-01" } // Version returns the semantic version (see http://semver.org) of the client. diff --git a/vendor/modules.txt b/vendor/modules.txt index ef8827c62e164..a39b36a92b584 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -13,7 +13,7 @@ github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2018-01-01/apimana github.com/Azure/azure-sdk-for-go/services/appconfiguration/mgmt/2019-10-01/appconfiguration github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation -github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch +github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-10-12/cdn github.com/Azure/azure-sdk-for-go/services/cognitiveservices/mgmt/2017-04-18/cognitiveservices github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute diff --git a/website/docs/r/batch_pool.html.markdown b/website/docs/r/batch_pool.html.markdown index 795c68f5a0d60..3a3258162e926 100644 --- a/website/docs/r/batch_pool.html.markdown +++ b/website/docs/r/batch_pool.html.markdown @@ -275,6 +275,8 @@ A `network_configuration` block supports the following: * `subnet_id` - (Optional) The ARM resource identifier of the virtual network subnet which the compute nodes of the pool will join. Changing this forces a new resource to be created. +* `public_ips` - (Optional) A list of public ip ids that will be allocated to nodes. Changing this forces a new resource to be created. + * `endpoint_configuration` - (Optional) A list of inbound NAT pools that can be used to address specific ports on an individual compute node externally. Set as documented in the inbound_nat_pools block below. Changing this forces a new resource to be created. --- From e03c1bc4520c0ef3033fea96f5a4ee326c318f92 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 4 Mar 2020 12:07:52 -0800 Subject: [PATCH 450/498] Update CHANGELOG.md to include #5967 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2ef7b1046f78..3f2f9b2293ceb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ IMPROVEMENTS: * `azurerm_application_gateway` - support up to `125` for the `capacity` property with V2 SKU's [GH-5906] * `azurerm_automation_dsc_configuration` - support for the `tags` property [GH-5827] +* `azurerm_batch_pool` - support for the `public_ips` property [GH-5967] * `azurerm_frontdoor` - exposed new attributes in `backend_pool_health_probe` block `enabled` and `probe_method` [GH-5924] * `azurerm_function_app` - Added `os_type` field to facilitate support of `linux` function apps [GH-5839] * `azurerm_kusto_cluster` - support for `enable_disk_encryption` and `enable_streaming_ingest` properties [GH-5855] From 45857ef2f1f2135b80e94cb36962ab9b96803125 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 4 Mar 2020 13:34:49 -0800 Subject: [PATCH 451/498] =?UTF-8?q?'azurerm=5Fredis=5Fcache'=20-=20Support?= =?UTF-8?q?=20for=20'primary=5Fconnection=5Fstring'=E2=80=A6=20(#5958)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * #5856 - Add 'primary_connection_string' and 'secondary_connection_string' to 'resource_arm_redis_cache' resource and data source Resource Acceptance Tests: === RUN TestAccDataSourceAzureRMRedisCache_standard === PAUSE TestAccDataSourceAzureRMRedisCache_standard === CONT TestAccDataSourceAzureRMRedisCache_standard --- PASS: TestAccDataSourceAzureRMRedisCache_standard (2127.56s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/redis/tests 2127.824s * Fix linting issue --- .../services/redis/data_source_redis_cache.go | 20 +++++++++++++++- .../redis/resource_arm_redis_cache.go | 24 ++++++++++++++++++- .../tests/data_source_redis_cache_test.go | 2 ++ .../tests/resource_arm_redis_cache_test.go | 2 ++ website/docs/d/redis_cache.html.markdown | 4 ++++ website/docs/r/redis_cache.html.markdown | 4 ++++ 6 files changed, 54 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/redis/data_source_redis_cache.go b/azurerm/internal/services/redis/data_source_redis_cache.go index 13acf329f525a..1125b61068bb7 100644 --- a/azurerm/internal/services/redis/data_source_redis_cache.go +++ b/azurerm/internal/services/redis/data_source_redis_cache.go @@ -196,6 +196,18 @@ func dataSourceArmRedisCache() *schema.Resource { Sensitive: true, }, + "primary_connection_string": { + Type: schema.TypeString, + Computed: true, + Sensitive: true, + }, + + "secondary_connection_string": { + Type: schema.TypeString, + Computed: true, + Sensitive: true, + }, + "tags": tags.SchemaDataSource(), }, } @@ -233,7 +245,8 @@ func dataSourceArmRedisCacheRead(d *schema.ResourceData, meta interface{}) error d.Set("sku_name", sku.Name) } - if props := resp.Properties; props != nil { + props := resp.Properties + if props != nil { d.Set("ssl_port", props.SslPort) d.Set("hostname", props.HostName) d.Set("minimum_tls_version", string(props.MinimumTLSVersion)) @@ -275,5 +288,10 @@ func dataSourceArmRedisCacheRead(d *schema.ResourceData, meta interface{}) error d.Set("primary_access_key", keys.PrimaryKey) d.Set("secondary_access_key", keys.SecondaryKey) + if props != nil { + d.Set("primary_connection_string", getRedisConnectionString(*props.HostName, *props.SslPort, *keys.PrimaryKey, *props.EnableNonSslPort)) + d.Set("secondary_connection_string", getRedisConnectionString(*props.HostName, *props.SslPort, *keys.SecondaryKey, *props.EnableNonSslPort)) + } + return tags.FlattenAndSet(d, resp.Tags) } diff --git a/azurerm/internal/services/redis/resource_arm_redis_cache.go b/azurerm/internal/services/redis/resource_arm_redis_cache.go index 6c98387f405e1..dc31c2a065080 100644 --- a/azurerm/internal/services/redis/resource_arm_redis_cache.go +++ b/azurerm/internal/services/redis/resource_arm_redis_cache.go @@ -257,6 +257,18 @@ func resourceArmRedisCache() *schema.Resource { Sensitive: true, }, + "primary_connection_string": { + Type: schema.TypeString, + Computed: true, + Sensitive: true, + }, + + "secondary_connection_string": { + Type: schema.TypeString, + Computed: true, + Sensitive: true, + }, + "tags": tags.Schema(), }, } @@ -540,7 +552,8 @@ func resourceArmRedisCacheRead(d *schema.ResourceData, meta interface{}) error { d.Set("sku_name", sku.Name) } - if props := resp.Properties; props != nil { + props := resp.Properties + if props != nil { d.Set("ssl_port", props.SslPort) d.Set("hostname", props.HostName) d.Set("minimum_tls_version", string(props.MinimumTLSVersion)) @@ -564,6 +577,11 @@ func resourceArmRedisCacheRead(d *schema.ResourceData, meta interface{}) error { d.Set("primary_access_key", keysResp.PrimaryKey) d.Set("secondary_access_key", keysResp.SecondaryKey) + if props != nil { + d.Set("primary_connection_string", getRedisConnectionString(*props.HostName, *props.SslPort, *keysResp.PrimaryKey, *props.EnableNonSslPort)) + d.Set("secondary_connection_string", getRedisConnectionString(*props.HostName, *props.SslPort, *keysResp.SecondaryKey, *props.EnableNonSslPort)) + } + return tags.FlattenAndSet(d, resp.Tags) } @@ -910,3 +928,7 @@ func validateRedisBackupFrequency(v interface{}, _ string) (warnings []string, e return warnings, errors } + +func getRedisConnectionString(redisHostName string, sslPort int32, accessKey string, enableSslPort bool) string { + return fmt.Sprintf("%s:%d,password=%s,ssl=%t,abortConnect=False", redisHostName, sslPort, accessKey, enableSslPort) +} 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 5e2b42617de63..b2d763652a323 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 @@ -27,6 +27,8 @@ func TestAccDataSourceAzureRMRedisCache_standard(t *testing.T) { resource.TestCheckResourceAttr(data.ResourceName, "resource_group_name", resourceGroupName), resource.TestCheckResourceAttr(data.ResourceName, "ssl_port", "6380"), resource.TestCheckResourceAttr(data.ResourceName, "tags.environment", "production"), + resource.TestCheckResourceAttrSet(data.ResourceName, "primary_connection_string"), + resource.TestCheckResourceAttrSet(data.ResourceName, "secondary_connection_string"), ), }, }, 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 8185093c19c0e..f9b62fe5633b8 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 @@ -25,6 +25,8 @@ func TestAccAzureRMRedisCache_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMRedisCacheExists(data.ResourceName), resource.TestCheckResourceAttrSet(data.ResourceName, "minimum_tls_version"), + resource.TestCheckResourceAttrSet(data.ResourceName, "primary_connection_string"), + resource.TestCheckResourceAttrSet(data.ResourceName, "secondary_connection_string"), ), }, data.ImportStep(), diff --git a/website/docs/d/redis_cache.html.markdown b/website/docs/d/redis_cache.html.markdown index 320f2bd8776f9..b120bc52c52d7 100644 --- a/website/docs/d/redis_cache.html.markdown +++ b/website/docs/d/redis_cache.html.markdown @@ -63,6 +63,10 @@ output "hostname" { * `secondary_access_key` - The Secondary Access Key for the Redis Instance +* `primary_connection_string` - The primary connection string of the Redis Instance. + +* `secondary_connection_string` - The secondary connection string of the Redis Instance. + * `redis_configuration` - A `redis_configuration` block as defined below. --- diff --git a/website/docs/r/redis_cache.html.markdown b/website/docs/r/redis_cache.html.markdown index 241e6db30d733..8b8f4ab4be7a2 100644 --- a/website/docs/r/redis_cache.html.markdown +++ b/website/docs/r/redis_cache.html.markdown @@ -153,6 +153,10 @@ The following attributes are exported: * `secondary_access_key` - The Secondary Access Key for the Redis Instance +* `primary_connection_string` - The primary connection string of the Redis Instance. + +* `secondary_connection_string` - The secondary connection string of the Redis Instance. + * `redis_configuration` - A `redis_configuration` block as defined below: --- From 78a3185e9f81db9eb476e14071d99938bd1db18c Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 4 Mar 2020 13:36:00 -0800 Subject: [PATCH 452/498] Update CHANGELOG.md to include #5958 --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f2f9b2293ceb..ed8244ab61cec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,8 +22,10 @@ IMPROVEMENTS: * `azurerm_private_dns_ptr_record` - export the `fqdn` property [GH-5949] * `azurerm_private_dns_srv_record` - export the `fqdn` property [GH-5949] * `azurerm_private_endpoint` - exposed `private_ip_address` as a computed attribute [GH-5838] -* `azurerm_virtual_wan` - support for the `type` property [GH-5877] +* `azurerm_redis_cache` - support for the `primary_connection_string` and `secondary_connection_string` properties [GH-5958] * `azurerm_storage_account` - support up to 50 tags [GH-5934] +* `azurerm_virtual_wan` - support for the `type` property [GH-5877] + BUG FIXES: From d499e325cabcb86d355cef7d0beeb4451c697ece Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 4 Mar 2020 14:56:02 -0800 Subject: [PATCH 453/498] Update resource name for ASE in data docs (#5989) --- website/docs/d/app_service_environment.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/d/app_service_environment.html.markdown b/website/docs/d/app_service_environment.html.markdown index 7b6b1b89a1ead..28621ec196267 100644 --- a/website/docs/d/app_service_environment.html.markdown +++ b/website/docs/d/app_service_environment.html.markdown @@ -13,7 +13,7 @@ Use this data source to access information about an existing App Service Environ ## Example Usage ```hcl -data "azure_app_service_plan" "example" { +data "azurerm_app_service_environment" "example" { name = "example-ase" resource_group_name = "example-rg" } From a5267ddffafed9a26b3ecb10747e1e9091292808 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 4 Mar 2020 15:08:22 -0800 Subject: [PATCH 454/498] New Resource & Data Source: azurerm_data_migration_service (#5258) Add new resource: data migration service. This is the first resource under DataMigration resource provider. There are more resources to come (which are not included in this PR): data migration project data migration task I will implement those two resources after this PR is merged since they depends on data migration service. Check feature request #5257 for more details. --- azurerm/internal/clients/client.go | 121 +- .../provider/required_resource_providers.go | 1 + azurerm/internal/provider/services.go | 2 + .../databasemigration/client/client.go | 18 + .../data_source_database_migration_service.go | 84 + .../parse/datamigration_service.go | 33 + .../parse/datamigration_service_test.go | 74 + .../databasemigration/registration.go | 35 + ...resource_arm_database_migration_service.go | 231 + ..._source_database_migration_service_test.go | 39 + ...rce_arm_database_migration_service_test.go | 244 + .../services/databasemigration/validation.go | 18 + .../mgmt/2018-04-19/datamigration/client.go | 51 + .../mgmt/2018-04-19/datamigration/models.go | 12885 ++++++++++++++++ .../2018-04-19/datamigration/operations.go | 147 + .../mgmt/2018-04-19/datamigration/projects.go | 486 + .../2018-04-19/datamigration/resourceskus.go | 151 + .../mgmt/2018-04-19/datamigration/services.go | 1108 ++ .../mgmt/2018-04-19/datamigration/tasks.go | 588 + .../mgmt/2018-04-19/datamigration/usages.go | 154 + .../mgmt/2018-04-19/datamigration/version.go | 30 + vendor/modules.txt | 1 + website/allowed-subcategories | 1 + website/azurerm.erb | 13 + .../database_migration_service.html.markdown | 58 + .../database_migration_service.html.markdown | 87 + 26 files changed, 16601 insertions(+), 59 deletions(-) create mode 100644 azurerm/internal/services/databasemigration/client/client.go create mode 100644 azurerm/internal/services/databasemigration/data_source_database_migration_service.go create mode 100644 azurerm/internal/services/databasemigration/parse/datamigration_service.go create mode 100644 azurerm/internal/services/databasemigration/parse/datamigration_service_test.go create mode 100644 azurerm/internal/services/databasemigration/registration.go create mode 100644 azurerm/internal/services/databasemigration/resource_arm_database_migration_service.go create mode 100644 azurerm/internal/services/databasemigration/tests/data_source_database_migration_service_test.go create mode 100644 azurerm/internal/services/databasemigration/tests/resource_arm_database_migration_service_test.go create mode 100644 azurerm/internal/services/databasemigration/validation.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/client.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/models.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/operations.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/projects.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/resourceskus.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/services.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/tasks.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/usages.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/version.go create mode 100644 website/docs/d/database_migration_service.html.markdown create mode 100644 website/docs/r/database_migration_service.html.markdown diff --git a/azurerm/internal/clients/client.go b/azurerm/internal/clients/client.go index 00a9e5a180a76..1f4f1f0369cdb 100644 --- a/azurerm/internal/clients/client.go +++ b/azurerm/internal/clients/client.go @@ -18,6 +18,7 @@ import ( compute "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/compute/client" containerServices "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/containers/client" cosmosdb "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/cosmos/client" + datamigration "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/databasemigration/client" databricks "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/databricks/client" datafactory "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/datafactory/client" datalake "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/datalake/client" @@ -73,65 +74,66 @@ type Client struct { Account *ResourceManagerAccount Features features.UserFeatures - AnalysisServices *analysisServices.Client - ApiManagement *apiManagement.Client - AppConfiguration *appConfiguration.Client - AppInsights *applicationInsights.Client - Authorization *authorization.Client - Automation *automation.Client - Batch *batch.Client - Bot *bot.Client - Cdn *cdn.Client - Cognitive *cognitiveServices.Client - Compute *compute.Client - Containers *containerServices.Client - Cosmos *cosmosdb.Client - DataBricks *databricks.Client - DataFactory *datafactory.Client - Datalake *datalake.Client - DevSpace *devspace.Client - DevTestLabs *devtestlabs.Client - Dns *dns.Client - EventGrid *eventgrid.Client - Eventhub *eventhub.Client - Frontdoor *frontdoor.Client - HDInsight *hdinsight.Client - HealthCare *healthcare.Client - IoTHub *iothub.Client - KeyVault *keyvault.Client - Kusto *kusto.Client - LogAnalytics *loganalytics.Client - Logic *logic.Client - ManagementGroups *managementgroup.Client - Maps *maps.Client - MariaDB *mariadb.Client - Media *media.Client - Monitor *monitor.Client - MSI *msi.Client - MSSQL *mssql.Client - MySQL *mysql.Client - NetApp *netapp.Client - Network *network.Client - NotificationHubs *notificationhub.Client - Policy *policy.Client - Portal *portal.Client - Postgres *postgres.Client - PrivateDns *privatedns.Client - RecoveryServices *recoveryServices.Client - Redis *redis.Client - Relay *relay.Client - Resource *resource.Client - Search *search.Client - SecurityCenter *securityCenter.Client - ServiceBus *serviceBus.Client - ServiceFabric *serviceFabric.Client - SignalR *signalr.Client - Storage *storage.Client - StreamAnalytics *streamAnalytics.Client - Subscription *subscription.Client - Sql *sql.Client - TrafficManager *trafficManager.Client - Web *web.Client + AnalysisServices *analysisServices.Client + ApiManagement *apiManagement.Client + AppConfiguration *appConfiguration.Client + AppInsights *applicationInsights.Client + Authorization *authorization.Client + Automation *automation.Client + Batch *batch.Client + Bot *bot.Client + Cdn *cdn.Client + Cognitive *cognitiveServices.Client + Compute *compute.Client + Containers *containerServices.Client + Cosmos *cosmosdb.Client + DatabaseMigration *datamigration.Client + DataBricks *databricks.Client + DataFactory *datafactory.Client + Datalake *datalake.Client + DevSpace *devspace.Client + DevTestLabs *devtestlabs.Client + Dns *dns.Client + EventGrid *eventgrid.Client + Eventhub *eventhub.Client + Frontdoor *frontdoor.Client + HDInsight *hdinsight.Client + HealthCare *healthcare.Client + IoTHub *iothub.Client + KeyVault *keyvault.Client + Kusto *kusto.Client + LogAnalytics *loganalytics.Client + Logic *logic.Client + ManagementGroups *managementgroup.Client + Maps *maps.Client + MariaDB *mariadb.Client + Media *media.Client + Monitor *monitor.Client + MSI *msi.Client + MSSQL *mssql.Client + MySQL *mysql.Client + NetApp *netapp.Client + Network *network.Client + NotificationHubs *notificationhub.Client + Policy *policy.Client + Portal *portal.Client + Postgres *postgres.Client + PrivateDns *privatedns.Client + RecoveryServices *recoveryServices.Client + Redis *redis.Client + Relay *relay.Client + Resource *resource.Client + Search *search.Client + SecurityCenter *securityCenter.Client + ServiceBus *serviceBus.Client + ServiceFabric *serviceFabric.Client + SignalR *signalr.Client + Storage *storage.Client + StreamAnalytics *streamAnalytics.Client + Subscription *subscription.Client + Sql *sql.Client + TrafficManager *trafficManager.Client + Web *web.Client } // NOTE: it should be possible for this method to become Private once the top level Client's removed @@ -153,6 +155,7 @@ func (client *Client) Build(ctx context.Context, o *common.ClientOptions) error client.Compute = compute.NewClient(o) client.Containers = containerServices.NewClient(o) client.Cosmos = cosmosdb.NewClient(o) + client.DatabaseMigration = datamigration.NewClient(o) client.DataBricks = databricks.NewClient(o) client.DataFactory = datafactory.NewClient(o) client.Datalake = datalake.NewClient(o) diff --git a/azurerm/internal/provider/required_resource_providers.go b/azurerm/internal/provider/required_resource_providers.go index 652dcb2dbd383..7f67adf3cdd30 100644 --- a/azurerm/internal/provider/required_resource_providers.go +++ b/azurerm/internal/provider/required_resource_providers.go @@ -30,6 +30,7 @@ func RequiredResourceProviders() map[string]struct{} { "Microsoft.Databricks": {}, "Microsoft.DataLakeAnalytics": {}, "Microsoft.DataLakeStore": {}, + "Microsoft.DataMigration": {}, "Microsoft.DBforMySQL": {}, "Microsoft.DBforPostgreSQL": {}, "Microsoft.Devices": {}, diff --git a/azurerm/internal/provider/services.go b/azurerm/internal/provider/services.go index 2b284eb41e51c..a7411f635e155 100644 --- a/azurerm/internal/provider/services.go +++ b/azurerm/internal/provider/services.go @@ -15,6 +15,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/compute" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/containers" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/cosmos" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/databasemigration" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/databricks" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/datafactory" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/datalake" @@ -83,6 +84,7 @@ func SupportedServices() []common.ServiceRegistration { databricks.Registration{}, datafactory.Registration{}, datalake.Registration{}, + databasemigration.Registration{}, devspace.Registration{}, devtestlabs.Registration{}, dns.Registration{}, diff --git a/azurerm/internal/services/databasemigration/client/client.go b/azurerm/internal/services/databasemigration/client/client.go new file mode 100644 index 0000000000000..e15f08de5b57b --- /dev/null +++ b/azurerm/internal/services/databasemigration/client/client.go @@ -0,0 +1,18 @@ +package client + +import ( + "github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common" +) + +type Client struct { + ServicesClient *datamigration.ServicesClient +} + +func NewClient(o *common.ClientOptions) *Client { + servicesClient := datamigration.NewServicesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) + o.ConfigureClient(&servicesClient.Client, o.ResourceManagerAuthorizer) + return &Client{ + ServicesClient: &servicesClient, + } +} diff --git a/azurerm/internal/services/databasemigration/data_source_database_migration_service.go b/azurerm/internal/services/databasemigration/data_source_database_migration_service.go new file mode 100644 index 0000000000000..076c12d923697 --- /dev/null +++ b/azurerm/internal/services/databasemigration/data_source_database_migration_service.go @@ -0,0 +1,84 @@ +package databasemigration + +import ( + "fmt" + "time" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func dataSourceArmDatabaseMigrationService() *schema.Resource { + return &schema.Resource{ + Read: dataSourceArmDatabaseMigrationServiceRead, + + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(5 * time.Minute), + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validateDatabasesMigrationServiceName, + }, + + "resource_group_name": azure.SchemaResourceGroupNameForDataSource(), + + "location": azure.SchemaLocationForDataSource(), + + "subnet_id": { + Type: schema.TypeString, + Computed: true, + }, + + "sku_name": { + Type: schema.TypeString, + Computed: true, + }, + + "tags": tags.SchemaDataSource(), + }, + } +} + +func dataSourceArmDatabaseMigrationServiceRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).DatabaseMigration.ServicesClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + resourceGroup := d.Get("resource_group_name").(string) + name := d.Get("name").(string) + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Error: Data Migration Service (Service Name %q / Group Name %q) was not found", name, resourceGroup) + } + return fmt.Errorf("Error reading Data Migration Service (Service Name %q / Group Name %q): %+v", name, resourceGroup, err) + } + + if resp.ID == nil || *resp.ID == "" { + return fmt.Errorf("unexpected empty ID retrieved for Data Migration Service (Service Name %q / Group Name %q)", name, resourceGroup) + } + d.SetId(*resp.ID) + + if location := resp.Location; location != nil { + d.Set("location", azure.NormalizeLocation(*location)) + } + d.Set("resource_group_name", resourceGroup) + d.Set("name", resp.Name) + if serviceProperties := resp.ServiceProperties; serviceProperties != nil { + d.Set("subnet_id", serviceProperties.VirtualSubnetID) + } + if resp.Sku != nil { + d.Set("sku_name", resp.Sku.Name) + } + + return tags.FlattenAndSet(d, resp.Tags) +} diff --git a/azurerm/internal/services/databasemigration/parse/datamigration_service.go b/azurerm/internal/services/databasemigration/parse/datamigration_service.go new file mode 100644 index 0000000000000..afb7961865cdd --- /dev/null +++ b/azurerm/internal/services/databasemigration/parse/datamigration_service.go @@ -0,0 +1,33 @@ +package parse + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type DatabaseMigrationServiceId struct { + ResourceGroup string + Name string +} + +func DatabaseMigrationServiceID(input string) (*DatabaseMigrationServiceId, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("[ERROR] Unable to parse Database Migration Service ID %q: %+v", input, err) + } + + server := DatabaseMigrationServiceId{ + ResourceGroup: id.ResourceGroup, + } + + if server.Name, err = id.PopSegment("services"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &server, nil +} diff --git a/azurerm/internal/services/databasemigration/parse/datamigration_service_test.go b/azurerm/internal/services/databasemigration/parse/datamigration_service_test.go new file mode 100644 index 0000000000000..08b84daea08aa --- /dev/null +++ b/azurerm/internal/services/databasemigration/parse/datamigration_service_test.go @@ -0,0 +1,74 @@ +package parse + +import ( + "testing" +) + +func TestDatabaseMigrationServiceID(t *testing.T) { + testData := []struct { + Name string + Input string + Error bool + Expect *DatabaseMigrationServiceId + }{ + { + Name: "Empty", + Input: "", + Error: true, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Error: true, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Error: true, + }, + { + Name: "No Resource Group ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", + Error: true, + }, + { + Name: "Missing service name", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/services", + Error: true, + }, + { + Name: "Service name", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Datamigration/services/service1", + Expect: &DatabaseMigrationServiceId{ + ResourceGroup: "resGroup1", + Name: "service1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Datamigration/Services/service1", + Error: true, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Name) + + actual, err := DatabaseMigrationServiceID(v.Input) + if err != nil { + if v.Error { + continue + } + + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.ResourceGroup != v.Expect.ResourceGroup { + t.Fatalf("Expected %q but got %q for Resource Group", v.Expect.ResourceGroup, actual.ResourceGroup) + } + + if actual.Name != v.Expect.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expect.Name, actual.Name) + } + } +} diff --git a/azurerm/internal/services/databasemigration/registration.go b/azurerm/internal/services/databasemigration/registration.go new file mode 100644 index 0000000000000..9a41c8047e650 --- /dev/null +++ b/azurerm/internal/services/databasemigration/registration.go @@ -0,0 +1,35 @@ +package databasemigration + +import ( + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" +) + +type Registration struct{} + +// Name is the name of this Service +func (r Registration) Name() string { + return "Database Migration" +} + +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Database Migration", + } +} + +// SupportedDataSources returns the supported Data Sources supported by this Service +func (r Registration) SupportedDataSources() map[string]*schema.Resource { + return map[string]*schema.Resource{ + "azurerm_database_migration_service": dataSourceArmDatabaseMigrationService(), + } +} + +// SupportedResources returns the supported Resources supported by this Service +func (r Registration) SupportedResources() map[string]*schema.Resource { + resources := map[string]*schema.Resource{ + "azurerm_database_migration_service": resourceArmDatabaseMigrationService(), + } + + return resources +} diff --git a/azurerm/internal/services/databasemigration/resource_arm_database_migration_service.go b/azurerm/internal/services/databasemigration/resource_arm_database_migration_service.go new file mode 100644 index 0000000000000..2f5457d74e02e --- /dev/null +++ b/azurerm/internal/services/databasemigration/resource_arm_database_migration_service.go @@ -0,0 +1,231 @@ +package databasemigration + +import ( + "fmt" + "log" + "time" + + "github.com/hashicorp/go-azure-helpers/response" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + + "github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/databasemigration/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmDatabaseMigrationService() *schema.Resource { + return &schema.Resource{ + Create: resourceArmDatabaseMigrationServiceCreate, + Read: resourceArmDatabaseMigrationServiceRead, + Update: resourceArmDatabaseMigrationServiceUpdate, + Delete: resourceArmDatabaseMigrationServiceDelete, + + Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { + _, err := parse.DatabaseMigrationServiceID(id) + return err + }), + + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(30 * time.Minute), + Read: schema.DefaultTimeout(5 * time.Minute), + Update: schema.DefaultTimeout(30 * time.Minute), + Delete: schema.DefaultTimeout(30 * time.Minute), + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validateDatabasesMigrationServiceName, + }, + + "location": azure.SchemaLocation(), + + "resource_group_name": azure.SchemaResourceGroupName(), + + "subnet_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: azure.ValidateResourceID, + }, + + "sku_name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + // No const defined in go sdk, the literal listed below is derived from the response of listskus endpoint. + // See: https://docs.microsoft.com/en-us/rest/api/datamigration/resourceskus/listskus + "Premium_4vCores", + "Standard_1vCores", + "Standard_2vCores", + "Standard_4vCores", + }, false), + }, + + "tags": tags.Schema(), + }, + } +} + +func resourceArmDatabaseMigrationServiceCreate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).DatabaseMigration.ServicesClient + ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) + defer cancel() + + resourceGroup := d.Get("resource_group_name").(string) + name := d.Get("name").(string) + + if features.ShouldResourcesBeImported() && d.IsNewResource() { + existing, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if !utils.ResponseWasNotFound(existing.Response) { + return fmt.Errorf("Error checking for present of existing Data Migration Service (Service Name %q / Group Name %q): %+v", name, resourceGroup, err) + } + } + if existing.ID != nil && *existing.ID != "" { + return tf.ImportAsExistsError("azurerm_database_migration_service", *existing.ID) + } + } + + skuName := d.Get("sku_name").(string) + subnetID := d.Get("subnet_id").(string) + location := azure.NormalizeLocation(d.Get("location").(string)) + + parameters := datamigration.Service{ + Location: utils.String(location), + ServiceProperties: &datamigration.ServiceProperties{ + VirtualSubnetID: utils.String(subnetID), + }, + Sku: &datamigration.ServiceSku{ + Name: utils.String(skuName), + }, + Kind: utils.String("Cloud"), // currently only "Cloud" is supported, hence hardcode here + } + if t, ok := d.GetOk("tags"); ok { + parameters.Tags = tags.Expand(t.(map[string]interface{})) + } + + future, err := client.CreateOrUpdate(ctx, parameters, resourceGroup, name) + if err != nil { + return fmt.Errorf("Error creating Data Migration Service (Service Name %q / Group Name %q): %+v", name, resourceGroup, err) + } + if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { + return fmt.Errorf("Error waiting for creation of Data Migration Service (Service Name %q / Group Name %q): %+v", name, resourceGroup, err) + } + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + return fmt.Errorf("Error retrieving Data Migration Service (Service Name %q / Group Name %q): %+v", name, resourceGroup, err) + } + if resp.ID == nil { + return fmt.Errorf("Cannot read Data Migration Service (Service Name %q / Group Name %q) ID", name, resourceGroup) + } + d.SetId(*resp.ID) + + return resourceArmDatabaseMigrationServiceRead(d, meta) +} + +func resourceArmDatabaseMigrationServiceRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).DatabaseMigration.ServicesClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := parse.DatabaseMigrationServiceID(d.Id()) + if err != nil { + return err + } + + resp, err := client.Get(ctx, id.ResourceGroup, id.Name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + log.Printf("[INFO] Data Migration Service %q does not exist - removing from state", d.Id()) + d.SetId("") + return nil + } + return fmt.Errorf("Error reading Data Migration Service (Service Name %q / Group Name %q): %+v", id.Name, id.ResourceGroup, err) + } + + if resp.ID == nil || *resp.ID == "" { + return fmt.Errorf("unexpected empty ID retrieved for Data Migration Service (Service Name %q / Group Name %q)", id.Name, id.ResourceGroup) + } + d.SetId(*resp.ID) + + if location := resp.Location; location != nil { + d.Set("location", azure.NormalizeLocation(*location)) + } + d.Set("resource_group_name", id.ResourceGroup) + d.Set("name", id.Name) + if serviceProperties := resp.ServiceProperties; serviceProperties != nil { + d.Set("subnet_id", serviceProperties.VirtualSubnetID) + } + if resp.Sku != nil { + d.Set("sku_name", resp.Sku.Name) + } + + return tags.FlattenAndSet(d, resp.Tags) +} + +func resourceArmDatabaseMigrationServiceUpdate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).DatabaseMigration.ServicesClient + ctx, cancel := timeouts.ForUpdate(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := parse.DatabaseMigrationServiceID(d.Id()) + if err != nil { + return err + } + + parameters := datamigration.Service{ + Tags: tags.Expand(d.Get("tags").(map[string]interface{})), + } + + future, err := client.Update(ctx, parameters, id.ResourceGroup, id.Name) + if err != nil { + return fmt.Errorf("Error updating Data Migration Service (Service Name %q / Group Name %q): %+v", id.Name, id.ResourceGroup, err) + } + if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { + return fmt.Errorf("Error waiting for update of Data Migration Service (Service Name %q / Group Name %q): %+v", id.Name, id.ResourceGroup, err) + } + + return resourceArmDatabaseMigrationServiceRead(d, meta) +} + +func resourceArmDatabaseMigrationServiceDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).DatabaseMigration.ServicesClient + ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := parse.DatabaseMigrationServiceID(d.Id()) + if err != nil { + return err + } + + // Always leave outstanding migration tasks untouched when deleting DMS. This is to avoid unexpectedly delete any tasks managed out of terraform. + toDeleteRunningTasks := false + future, err := client.Delete(ctx, id.ResourceGroup, id.Name, &toDeleteRunningTasks) + if err != nil { + if response.WasNotFound(future.Response()) { + return nil + } + return fmt.Errorf("Error deleting Data Migration Service (Service Name %q / Group Name %q): %+v", id.Name, id.ResourceGroup, err) + } + + if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { + if !response.WasNotFound(future.Response()) { + return fmt.Errorf("Error waiting for deleting Data Migration Service (Service Name %q / Group Name %q): %+v", id.Name, id.ResourceGroup, err) + } + } + + return nil +} diff --git a/azurerm/internal/services/databasemigration/tests/data_source_database_migration_service_test.go b/azurerm/internal/services/databasemigration/tests/data_source_database_migration_service_test.go new file mode 100644 index 0000000000000..c40a4d2b7b2a7 --- /dev/null +++ b/azurerm/internal/services/databasemigration/tests/data_source_database_migration_service_test.go @@ -0,0 +1,39 @@ +package azurerm + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" +) + +func TestAccDataSourceAzureRMDatabaseMigrationService_basic(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_database_migration_service", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceDatabaseMigrationService_basic(data), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrSet(data.ResourceName, "resource_group_name"), + resource.TestCheckResourceAttr(data.ResourceName, "sku_name", "Standard_1vCores"), + ), + }, + }, + }) +} + +func testAccDataSourceDatabaseMigrationService_basic(data acceptance.TestData) string { + config := testAccAzureRMDatabaseMigrationService_basic(data) + return fmt.Sprintf(` +%s + +data "azurerm_database_migration_service" "test" { + resource_group_name = "${azurerm_database_migration_service.test.resource_group_name}" + name = "${azurerm_database_migration_service.test.name}" +} +`, config) +} diff --git a/azurerm/internal/services/databasemigration/tests/resource_arm_database_migration_service_test.go b/azurerm/internal/services/databasemigration/tests/resource_arm_database_migration_service_test.go new file mode 100644 index 0000000000000..565b6767d8919 --- /dev/null +++ b/azurerm/internal/services/databasemigration/tests/resource_arm_database_migration_service_test.go @@ -0,0 +1,244 @@ +package azurerm + +import ( + "fmt" + "testing" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/databasemigration/parse" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func TestAccAzureRMDatabaseMigrationService_basic(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_database_migration_service", "test") + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMDatabaseMigrationServiceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMDatabaseMigrationService_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMDatabaseMigrationServiceExists(data.ResourceName), + resource.TestCheckResourceAttrSet(data.ResourceName, "subnet_id"), + resource.TestCheckResourceAttr(data.ResourceName, "sku_name", "Standard_1vCores"), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMDatabaseMigrationService_complete(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_database_migration_service", "test") + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMDatabaseMigrationServiceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMDatabaseMigrationService_complete(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMDatabaseMigrationServiceExists(data.ResourceName), + resource.TestCheckResourceAttrSet(data.ResourceName, "subnet_id"), + resource.TestCheckResourceAttr(data.ResourceName, "sku_name", "Standard_1vCores"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.name", "test"), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMDatabaseMigrationService_requiresImport(t *testing.T) { + if !features.ShouldResourcesBeImported() { + t.Skip("Skipping since resources aren't required to be imported") + return + } + + data := acceptance.BuildTestData(t, "azurerm_database_migration_service", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMDatabaseMigrationServiceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMDatabaseMigrationService_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMDatabaseMigrationServiceExists(data.ResourceName), + ), + }, + data.RequiresImportErrorStep(testAccAzureRMDatabaseMigrationService_requiresImport), + }, + }) +} + +func TestAccAzureRMDatabaseMigrationService_update(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_database_migration_service", "test") + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMDatabaseMigrationServiceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMDatabaseMigrationService_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMDatabaseMigrationServiceExists(data.ResourceName), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMDatabaseMigrationService_complete(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMDatabaseMigrationServiceExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "tags.name", "test"), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMDatabaseMigrationService_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMDatabaseMigrationServiceExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + +func testCheckAzureRMDatabaseMigrationServiceExists(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("Data Migration Service not found: %s", resourceName) + } + + id, err := parse.DatabaseMigrationServiceID(rs.Primary.ID) + if err != nil { + return err + } + + client := acceptance.AzureProvider.Meta().(*clients.Client).DatabaseMigration.ServicesClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + if resp, err := client.Get(ctx, id.ResourceGroup, id.Name); err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Bad: Data Migration Service (Service Name %q / Group Name %q) does not exist", id.Name, id.ResourceGroup) + } + return fmt.Errorf("Bad: Get on ServicesClient: %+v", err) + } + + return nil + } +} + +func testCheckAzureRMDatabaseMigrationServiceDestroy(s *terraform.State) error { + client := acceptance.AzureProvider.Meta().(*clients.Client).DatabaseMigration.ServicesClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_database_migration_service" { + continue + } + + id, err := parse.DatabaseMigrationServiceID(rs.Primary.ID) + if err != nil { + return err + } + + if resp, err := client.Get(ctx, id.ResourceGroup, id.Name); err != nil { + if !utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Bad: Get on ServicesClient: %+v", err) + } + } + + return nil + } + + return nil +} + +func testAccAzureRMDatabaseMigrationService_base(data acceptance.TestData) string { + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-dbms-%d" + location = "%s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctestVnet-dbms-%d" + address_space = ["10.0.0.0/16"] + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name +} + +resource "azurerm_subnet" "test" { + name = "acctestSubnet-dbms-%d" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name + address_prefix = "10.0.1.0/24" +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) +} + +func testAccAzureRMDatabaseMigrationService_basic(data acceptance.TestData) string { + template := testAccAzureRMDatabaseMigrationService_base(data) + + return fmt.Sprintf(` +%s + +resource "azurerm_database_migration_service" "test" { + name = "acctestDbms-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + subnet_id = azurerm_subnet.test.id + sku_name = "Standard_1vCores" +} +`, template, data.RandomInteger) +} + +func testAccAzureRMDatabaseMigrationService_complete(data acceptance.TestData) string { + template := testAccAzureRMDatabaseMigrationService_base(data) + + return fmt.Sprintf(` +%s + +resource "azurerm_database_migration_service" "test" { + name = "acctestDbms-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + subnet_id = azurerm_subnet.test.id + sku_name = "Standard_1vCores" + tags = { + name = "test" + } +} +`, template, data.RandomInteger) +} + +func testAccAzureRMDatabaseMigrationService_requiresImport(data acceptance.TestData) string { + template := testAccAzureRMDatabaseMigrationService_basic(data) + return fmt.Sprintf(` +%s + +resource "azurerm_database_migration_service" "import" { + name = azurerm_database_migration_service.test.name + location = azurerm_database_migration_service.test.location + resource_group_name = azurerm_database_migration_service.test.resource_group_name + subnet_id = azurerm_database_migration_service.test.subnet_id + sku_name = azurerm_database_migration_service.test.sku_name +} +`, template) +} diff --git a/azurerm/internal/services/databasemigration/validation.go b/azurerm/internal/services/databasemigration/validation.go new file mode 100644 index 0000000000000..0e325b3e67ab0 --- /dev/null +++ b/azurerm/internal/services/databasemigration/validation.go @@ -0,0 +1,18 @@ +package databasemigration + +import ( + "fmt" + "regexp" +) + +func validateDatabasesMigrationServiceName(i interface{}, k string) ([]string, []error) { + v, ok := i.(string) + if !ok { + return nil, []error{fmt.Errorf("expected type of %q to be string", k)} + } + validName := regexp.MustCompile(`^[\d\w]+[\d\w\-_.]*$`) + if !validName.MatchString(v) { + return nil, []error{fmt.Errorf("invalid format of %q", k)} + } + return nil, nil +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/client.go new file mode 100644 index 0000000000000..898cc1ada8336 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/client.go @@ -0,0 +1,51 @@ +// Package datamigration implements the Azure ARM Datamigration service API version 2018-04-19. +// +// Data Migration Client +package datamigration + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "github.com/Azure/go-autorest/autorest" +) + +const ( + // DefaultBaseURI is the default URI used for the service Datamigration + DefaultBaseURI = "https://management.azure.com" +) + +// BaseClient is the base client for Datamigration. +type BaseClient struct { + autorest.Client + BaseURI string + SubscriptionID string +} + +// New creates an instance of the BaseClient client. +func New(subscriptionID string) BaseClient { + return NewWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewWithBaseURI creates an instance of the BaseClient client. +func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { + return BaseClient{ + Client: autorest.NewClientWithUserAgent(UserAgent()), + BaseURI: baseURI, + SubscriptionID: subscriptionID, + } +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/models.go new file mode 100644 index 0000000000000..3becb4a760246 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/models.go @@ -0,0 +1,12885 @@ +package datamigration + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "encoding/json" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/date" + "github.com/Azure/go-autorest/autorest/to" + "github.com/Azure/go-autorest/tracing" + "net/http" +) + +// The package's fully qualified name. +const fqdn = "github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration" + +// AuthenticationType enumerates the values for authentication type. +type AuthenticationType string + +const ( + // ActiveDirectoryIntegrated ... + ActiveDirectoryIntegrated AuthenticationType = "ActiveDirectoryIntegrated" + // ActiveDirectoryPassword ... + ActiveDirectoryPassword AuthenticationType = "ActiveDirectoryPassword" + // None ... + None AuthenticationType = "None" + // SQLAuthentication ... + SQLAuthentication AuthenticationType = "SqlAuthentication" + // WindowsAuthentication ... + WindowsAuthentication AuthenticationType = "WindowsAuthentication" +) + +// PossibleAuthenticationTypeValues returns an array of possible values for the AuthenticationType const type. +func PossibleAuthenticationTypeValues() []AuthenticationType { + return []AuthenticationType{ActiveDirectoryIntegrated, ActiveDirectoryPassword, None, SQLAuthentication, WindowsAuthentication} +} + +// BackupFileStatus enumerates the values for backup file status. +type BackupFileStatus string + +const ( + // Arrived ... + Arrived BackupFileStatus = "Arrived" + // Cancelled ... + Cancelled BackupFileStatus = "Cancelled" + // Queued ... + Queued BackupFileStatus = "Queued" + // Restored ... + Restored BackupFileStatus = "Restored" + // Restoring ... + Restoring BackupFileStatus = "Restoring" + // Uploaded ... + Uploaded BackupFileStatus = "Uploaded" + // Uploading ... + Uploading BackupFileStatus = "Uploading" +) + +// PossibleBackupFileStatusValues returns an array of possible values for the BackupFileStatus const type. +func PossibleBackupFileStatusValues() []BackupFileStatus { + return []BackupFileStatus{Arrived, Cancelled, Queued, Restored, Restoring, Uploaded, Uploading} +} + +// BackupMode enumerates the values for backup mode. +type BackupMode string + +const ( + // CreateBackup ... + CreateBackup BackupMode = "CreateBackup" + // ExistingBackup ... + ExistingBackup BackupMode = "ExistingBackup" +) + +// PossibleBackupModeValues returns an array of possible values for the BackupMode const type. +func PossibleBackupModeValues() []BackupMode { + return []BackupMode{CreateBackup, ExistingBackup} +} + +// BackupType enumerates the values for backup type. +type BackupType string + +const ( + // BackupTypeDatabase ... + BackupTypeDatabase BackupType = "Database" + // BackupTypeDifferentialDatabase ... + BackupTypeDifferentialDatabase BackupType = "DifferentialDatabase" + // BackupTypeDifferentialFile ... + BackupTypeDifferentialFile BackupType = "DifferentialFile" + // BackupTypeDifferentialPartial ... + BackupTypeDifferentialPartial BackupType = "DifferentialPartial" + // BackupTypeFile ... + BackupTypeFile BackupType = "File" + // BackupTypePartial ... + BackupTypePartial BackupType = "Partial" + // BackupTypeTransactionLog ... + BackupTypeTransactionLog BackupType = "TransactionLog" +) + +// PossibleBackupTypeValues returns an array of possible values for the BackupType const type. +func PossibleBackupTypeValues() []BackupType { + return []BackupType{BackupTypeDatabase, BackupTypeDifferentialDatabase, BackupTypeDifferentialFile, BackupTypeDifferentialPartial, BackupTypeFile, BackupTypePartial, BackupTypeTransactionLog} +} + +// CommandState enumerates the values for command state. +type CommandState string + +const ( + // Accepted ... + Accepted CommandState = "Accepted" + // Failed ... + Failed CommandState = "Failed" + // Running ... + Running CommandState = "Running" + // Succeeded ... + Succeeded CommandState = "Succeeded" + // Unknown ... + Unknown CommandState = "Unknown" +) + +// PossibleCommandStateValues returns an array of possible values for the CommandState const type. +func PossibleCommandStateValues() []CommandState { + return []CommandState{Accepted, Failed, Running, Succeeded, Unknown} +} + +// CommandType enumerates the values for command type. +type CommandType string + +const ( + // CommandTypeCommandProperties ... + CommandTypeCommandProperties CommandType = "CommandProperties" + // CommandTypeMigrateSQLServerAzureDbSQLMiComplete ... + CommandTypeMigrateSQLServerAzureDbSQLMiComplete CommandType = "Migrate.SqlServer.AzureDbSqlMi.Complete" + // CommandTypeMigrateSyncCompleteDatabase ... + CommandTypeMigrateSyncCompleteDatabase CommandType = "Migrate.Sync.Complete.Database" +) + +// PossibleCommandTypeValues returns an array of possible values for the CommandType const type. +func PossibleCommandTypeValues() []CommandType { + return []CommandType{CommandTypeCommandProperties, CommandTypeMigrateSQLServerAzureDbSQLMiComplete, CommandTypeMigrateSyncCompleteDatabase} +} + +// DatabaseCompatLevel enumerates the values for database compat level. +type DatabaseCompatLevel string + +const ( + // CompatLevel100 ... + CompatLevel100 DatabaseCompatLevel = "CompatLevel100" + // CompatLevel110 ... + CompatLevel110 DatabaseCompatLevel = "CompatLevel110" + // CompatLevel120 ... + CompatLevel120 DatabaseCompatLevel = "CompatLevel120" + // CompatLevel130 ... + CompatLevel130 DatabaseCompatLevel = "CompatLevel130" + // CompatLevel140 ... + CompatLevel140 DatabaseCompatLevel = "CompatLevel140" + // CompatLevel80 ... + CompatLevel80 DatabaseCompatLevel = "CompatLevel80" + // CompatLevel90 ... + CompatLevel90 DatabaseCompatLevel = "CompatLevel90" +) + +// PossibleDatabaseCompatLevelValues returns an array of possible values for the DatabaseCompatLevel const type. +func PossibleDatabaseCompatLevelValues() []DatabaseCompatLevel { + return []DatabaseCompatLevel{CompatLevel100, CompatLevel110, CompatLevel120, CompatLevel130, CompatLevel140, CompatLevel80, CompatLevel90} +} + +// DatabaseFileType enumerates the values for database file type. +type DatabaseFileType string + +const ( + // Filestream ... + Filestream DatabaseFileType = "Filestream" + // Fulltext ... + Fulltext DatabaseFileType = "Fulltext" + // Log ... + Log DatabaseFileType = "Log" + // NotSupported ... + NotSupported DatabaseFileType = "NotSupported" + // Rows ... + Rows DatabaseFileType = "Rows" +) + +// PossibleDatabaseFileTypeValues returns an array of possible values for the DatabaseFileType const type. +func PossibleDatabaseFileTypeValues() []DatabaseFileType { + return []DatabaseFileType{Filestream, Fulltext, Log, NotSupported, Rows} +} + +// DatabaseMigrationStage enumerates the values for database migration stage. +type DatabaseMigrationStage string + +const ( + // DatabaseMigrationStageBackup ... + DatabaseMigrationStageBackup DatabaseMigrationStage = "Backup" + // DatabaseMigrationStageCompleted ... + DatabaseMigrationStageCompleted DatabaseMigrationStage = "Completed" + // DatabaseMigrationStageFileCopy ... + DatabaseMigrationStageFileCopy DatabaseMigrationStage = "FileCopy" + // DatabaseMigrationStageInitialize ... + DatabaseMigrationStageInitialize DatabaseMigrationStage = "Initialize" + // DatabaseMigrationStageNone ... + DatabaseMigrationStageNone DatabaseMigrationStage = "None" + // DatabaseMigrationStageRestore ... + DatabaseMigrationStageRestore DatabaseMigrationStage = "Restore" +) + +// PossibleDatabaseMigrationStageValues returns an array of possible values for the DatabaseMigrationStage const type. +func PossibleDatabaseMigrationStageValues() []DatabaseMigrationStage { + return []DatabaseMigrationStage{DatabaseMigrationStageBackup, DatabaseMigrationStageCompleted, DatabaseMigrationStageFileCopy, DatabaseMigrationStageInitialize, DatabaseMigrationStageNone, DatabaseMigrationStageRestore} +} + +// DatabaseMigrationState enumerates the values for database migration state. +type DatabaseMigrationState string + +const ( + // CANCELLED ... + CANCELLED DatabaseMigrationState = "CANCELLED" + // COMPLETED ... + COMPLETED DatabaseMigrationState = "COMPLETED" + // CUTOVERSTART ... + CUTOVERSTART DatabaseMigrationState = "CUTOVER_START" + // FAILED ... + FAILED DatabaseMigrationState = "FAILED" + // FULLBACKUPUPLOADSTART ... + FULLBACKUPUPLOADSTART DatabaseMigrationState = "FULL_BACKUP_UPLOAD_START" + // INITIAL ... + INITIAL DatabaseMigrationState = "INITIAL" + // LOGSHIPPINGSTART ... + LOGSHIPPINGSTART DatabaseMigrationState = "LOG_SHIPPING_START" + // POSTCUTOVERCOMPLETE ... + POSTCUTOVERCOMPLETE DatabaseMigrationState = "POST_CUTOVER_COMPLETE" + // UNDEFINED ... + UNDEFINED DatabaseMigrationState = "UNDEFINED" + // UPLOADLOGFILESSTART ... + UPLOADLOGFILESSTART DatabaseMigrationState = "UPLOAD_LOG_FILES_START" +) + +// PossibleDatabaseMigrationStateValues returns an array of possible values for the DatabaseMigrationState const type. +func PossibleDatabaseMigrationStateValues() []DatabaseMigrationState { + return []DatabaseMigrationState{CANCELLED, COMPLETED, CUTOVERSTART, FAILED, FULLBACKUPUPLOADSTART, INITIAL, LOGSHIPPINGSTART, POSTCUTOVERCOMPLETE, UNDEFINED, UPLOADLOGFILESSTART} +} + +// DatabaseState enumerates the values for database state. +type DatabaseState string + +const ( + // DatabaseStateCopying ... + DatabaseStateCopying DatabaseState = "Copying" + // DatabaseStateEmergency ... + DatabaseStateEmergency DatabaseState = "Emergency" + // DatabaseStateOffline ... + DatabaseStateOffline DatabaseState = "Offline" + // DatabaseStateOfflineSecondary ... + DatabaseStateOfflineSecondary DatabaseState = "OfflineSecondary" + // DatabaseStateOnline ... + DatabaseStateOnline DatabaseState = "Online" + // DatabaseStateRecovering ... + DatabaseStateRecovering DatabaseState = "Recovering" + // DatabaseStateRecoveryPending ... + DatabaseStateRecoveryPending DatabaseState = "RecoveryPending" + // DatabaseStateRestoring ... + DatabaseStateRestoring DatabaseState = "Restoring" + // DatabaseStateSuspect ... + DatabaseStateSuspect DatabaseState = "Suspect" +) + +// PossibleDatabaseStateValues returns an array of possible values for the DatabaseState const type. +func PossibleDatabaseStateValues() []DatabaseState { + return []DatabaseState{DatabaseStateCopying, DatabaseStateEmergency, DatabaseStateOffline, DatabaseStateOfflineSecondary, DatabaseStateOnline, DatabaseStateRecovering, DatabaseStateRecoveryPending, DatabaseStateRestoring, DatabaseStateSuspect} +} + +// ErrorType enumerates the values for error type. +type ErrorType string + +const ( + // ErrorTypeDefault ... + ErrorTypeDefault ErrorType = "Default" + // ErrorTypeError ... + ErrorTypeError ErrorType = "Error" + // ErrorTypeWarning ... + ErrorTypeWarning ErrorType = "Warning" +) + +// PossibleErrorTypeValues returns an array of possible values for the ErrorType const type. +func PossibleErrorTypeValues() []ErrorType { + return []ErrorType{ErrorTypeDefault, ErrorTypeError, ErrorTypeWarning} +} + +// LoginMigrationStage enumerates the values for login migration stage. +type LoginMigrationStage string + +const ( + // LoginMigrationStageAssignRoleMembership ... + LoginMigrationStageAssignRoleMembership LoginMigrationStage = "AssignRoleMembership" + // LoginMigrationStageAssignRoleOwnership ... + LoginMigrationStageAssignRoleOwnership LoginMigrationStage = "AssignRoleOwnership" + // LoginMigrationStageCompleted ... + LoginMigrationStageCompleted LoginMigrationStage = "Completed" + // LoginMigrationStageEstablishObjectPermissions ... + LoginMigrationStageEstablishObjectPermissions LoginMigrationStage = "EstablishObjectPermissions" + // LoginMigrationStageEstablishServerPermissions ... + LoginMigrationStageEstablishServerPermissions LoginMigrationStage = "EstablishServerPermissions" + // LoginMigrationStageEstablishUserMapping ... + LoginMigrationStageEstablishUserMapping LoginMigrationStage = "EstablishUserMapping" + // LoginMigrationStageInitialize ... + LoginMigrationStageInitialize LoginMigrationStage = "Initialize" + // LoginMigrationStageLoginMigration ... + LoginMigrationStageLoginMigration LoginMigrationStage = "LoginMigration" + // LoginMigrationStageNone ... + LoginMigrationStageNone LoginMigrationStage = "None" +) + +// PossibleLoginMigrationStageValues returns an array of possible values for the LoginMigrationStage const type. +func PossibleLoginMigrationStageValues() []LoginMigrationStage { + return []LoginMigrationStage{LoginMigrationStageAssignRoleMembership, LoginMigrationStageAssignRoleOwnership, LoginMigrationStageCompleted, LoginMigrationStageEstablishObjectPermissions, LoginMigrationStageEstablishServerPermissions, LoginMigrationStageEstablishUserMapping, LoginMigrationStageInitialize, LoginMigrationStageLoginMigration, LoginMigrationStageNone} +} + +// LoginType enumerates the values for login type. +type LoginType string + +const ( + // AsymmetricKey ... + AsymmetricKey LoginType = "AsymmetricKey" + // Certificate ... + Certificate LoginType = "Certificate" + // ExternalGroup ... + ExternalGroup LoginType = "ExternalGroup" + // ExternalUser ... + ExternalUser LoginType = "ExternalUser" + // SQLLogin ... + SQLLogin LoginType = "SqlLogin" + // WindowsGroup ... + WindowsGroup LoginType = "WindowsGroup" + // WindowsUser ... + WindowsUser LoginType = "WindowsUser" +) + +// PossibleLoginTypeValues returns an array of possible values for the LoginType const type. +func PossibleLoginTypeValues() []LoginType { + return []LoginType{AsymmetricKey, Certificate, ExternalGroup, ExternalUser, SQLLogin, WindowsGroup, WindowsUser} +} + +// MigrationState enumerates the values for migration state. +type MigrationState string + +const ( + // MigrationStateCompleted ... + MigrationStateCompleted MigrationState = "Completed" + // MigrationStateFailed ... + MigrationStateFailed MigrationState = "Failed" + // MigrationStateInProgress ... + MigrationStateInProgress MigrationState = "InProgress" + // MigrationStateNone ... + MigrationStateNone MigrationState = "None" + // MigrationStateSkipped ... + MigrationStateSkipped MigrationState = "Skipped" + // MigrationStateStopped ... + MigrationStateStopped MigrationState = "Stopped" + // MigrationStateWarning ... + MigrationStateWarning MigrationState = "Warning" +) + +// PossibleMigrationStateValues returns an array of possible values for the MigrationState const type. +func PossibleMigrationStateValues() []MigrationState { + return []MigrationState{MigrationStateCompleted, MigrationStateFailed, MigrationStateInProgress, MigrationStateNone, MigrationStateSkipped, MigrationStateStopped, MigrationStateWarning} +} + +// MigrationStatus enumerates the values for migration status. +type MigrationStatus string + +const ( + // MigrationStatusCompleted ... + MigrationStatusCompleted MigrationStatus = "Completed" + // MigrationStatusCompletedWithWarnings ... + MigrationStatusCompletedWithWarnings MigrationStatus = "CompletedWithWarnings" + // MigrationStatusConfigured ... + MigrationStatusConfigured MigrationStatus = "Configured" + // MigrationStatusConnecting ... + MigrationStatusConnecting MigrationStatus = "Connecting" + // MigrationStatusDefault ... + MigrationStatusDefault MigrationStatus = "Default" + // MigrationStatusError ... + MigrationStatusError MigrationStatus = "Error" + // MigrationStatusRunning ... + MigrationStatusRunning MigrationStatus = "Running" + // MigrationStatusSelectLogins ... + MigrationStatusSelectLogins MigrationStatus = "SelectLogins" + // MigrationStatusSourceAndTargetSelected ... + MigrationStatusSourceAndTargetSelected MigrationStatus = "SourceAndTargetSelected" + // MigrationStatusStopped ... + MigrationStatusStopped MigrationStatus = "Stopped" +) + +// PossibleMigrationStatusValues returns an array of possible values for the MigrationStatus const type. +func PossibleMigrationStatusValues() []MigrationStatus { + return []MigrationStatus{MigrationStatusCompleted, MigrationStatusCompletedWithWarnings, MigrationStatusConfigured, MigrationStatusConnecting, MigrationStatusDefault, MigrationStatusError, MigrationStatusRunning, MigrationStatusSelectLogins, MigrationStatusSourceAndTargetSelected, MigrationStatusStopped} +} + +// MySQLTargetPlatformType enumerates the values for my sql target platform type. +type MySQLTargetPlatformType string + +const ( + // AzureDbForMySQL ... + AzureDbForMySQL MySQLTargetPlatformType = "AzureDbForMySQL" + // SQLServer ... + SQLServer MySQLTargetPlatformType = "SqlServer" +) + +// PossibleMySQLTargetPlatformTypeValues returns an array of possible values for the MySQLTargetPlatformType const type. +func PossibleMySQLTargetPlatformTypeValues() []MySQLTargetPlatformType { + return []MySQLTargetPlatformType{AzureDbForMySQL, SQLServer} +} + +// NameCheckFailureReason enumerates the values for name check failure reason. +type NameCheckFailureReason string + +const ( + // AlreadyExists ... + AlreadyExists NameCheckFailureReason = "AlreadyExists" + // Invalid ... + Invalid NameCheckFailureReason = "Invalid" +) + +// PossibleNameCheckFailureReasonValues returns an array of possible values for the NameCheckFailureReason const type. +func PossibleNameCheckFailureReasonValues() []NameCheckFailureReason { + return []NameCheckFailureReason{AlreadyExists, Invalid} +} + +// ObjectType enumerates the values for object type. +type ObjectType string + +const ( + // Function ... + Function ObjectType = "Function" + // StoredProcedures ... + StoredProcedures ObjectType = "StoredProcedures" + // Table ... + Table ObjectType = "Table" + // User ... + User ObjectType = "User" + // View ... + View ObjectType = "View" +) + +// PossibleObjectTypeValues returns an array of possible values for the ObjectType const type. +func PossibleObjectTypeValues() []ObjectType { + return []ObjectType{Function, StoredProcedures, Table, User, View} +} + +// ProjectProvisioningState enumerates the values for project provisioning state. +type ProjectProvisioningState string + +const ( + // ProjectProvisioningStateDeleting ... + ProjectProvisioningStateDeleting ProjectProvisioningState = "Deleting" + // ProjectProvisioningStateSucceeded ... + ProjectProvisioningStateSucceeded ProjectProvisioningState = "Succeeded" +) + +// PossibleProjectProvisioningStateValues returns an array of possible values for the ProjectProvisioningState const type. +func PossibleProjectProvisioningStateValues() []ProjectProvisioningState { + return []ProjectProvisioningState{ProjectProvisioningStateDeleting, ProjectProvisioningStateSucceeded} +} + +// ProjectSourcePlatform enumerates the values for project source platform. +type ProjectSourcePlatform string + +const ( + // ProjectSourcePlatformSQL ... + ProjectSourcePlatformSQL ProjectSourcePlatform = "SQL" + // ProjectSourcePlatformUnknown ... + ProjectSourcePlatformUnknown ProjectSourcePlatform = "Unknown" +) + +// PossibleProjectSourcePlatformValues returns an array of possible values for the ProjectSourcePlatform const type. +func PossibleProjectSourcePlatformValues() []ProjectSourcePlatform { + return []ProjectSourcePlatform{ProjectSourcePlatformSQL, ProjectSourcePlatformUnknown} +} + +// ProjectTargetPlatform enumerates the values for project target platform. +type ProjectTargetPlatform string + +const ( + // ProjectTargetPlatformSQLDB ... + ProjectTargetPlatformSQLDB ProjectTargetPlatform = "SQLDB" + // ProjectTargetPlatformUnknown ... + ProjectTargetPlatformUnknown ProjectTargetPlatform = "Unknown" +) + +// PossibleProjectTargetPlatformValues returns an array of possible values for the ProjectTargetPlatform const type. +func PossibleProjectTargetPlatformValues() []ProjectTargetPlatform { + return []ProjectTargetPlatform{ProjectTargetPlatformSQLDB, ProjectTargetPlatformUnknown} +} + +// ResourceSkuCapacityScaleType enumerates the values for resource sku capacity scale type. +type ResourceSkuCapacityScaleType string + +const ( + // ResourceSkuCapacityScaleTypeAutomatic ... + ResourceSkuCapacityScaleTypeAutomatic ResourceSkuCapacityScaleType = "Automatic" + // ResourceSkuCapacityScaleTypeManual ... + ResourceSkuCapacityScaleTypeManual ResourceSkuCapacityScaleType = "Manual" + // ResourceSkuCapacityScaleTypeNone ... + ResourceSkuCapacityScaleTypeNone ResourceSkuCapacityScaleType = "None" +) + +// PossibleResourceSkuCapacityScaleTypeValues returns an array of possible values for the ResourceSkuCapacityScaleType const type. +func PossibleResourceSkuCapacityScaleTypeValues() []ResourceSkuCapacityScaleType { + return []ResourceSkuCapacityScaleType{ResourceSkuCapacityScaleTypeAutomatic, ResourceSkuCapacityScaleTypeManual, ResourceSkuCapacityScaleTypeNone} +} + +// ResourceSkuRestrictionsReasonCode enumerates the values for resource sku restrictions reason code. +type ResourceSkuRestrictionsReasonCode string + +const ( + // NotAvailableForSubscription ... + NotAvailableForSubscription ResourceSkuRestrictionsReasonCode = "NotAvailableForSubscription" + // QuotaID ... + QuotaID ResourceSkuRestrictionsReasonCode = "QuotaId" +) + +// PossibleResourceSkuRestrictionsReasonCodeValues returns an array of possible values for the ResourceSkuRestrictionsReasonCode const type. +func PossibleResourceSkuRestrictionsReasonCodeValues() []ResourceSkuRestrictionsReasonCode { + return []ResourceSkuRestrictionsReasonCode{NotAvailableForSubscription, QuotaID} +} + +// ResourceSkuRestrictionsType enumerates the values for resource sku restrictions type. +type ResourceSkuRestrictionsType string + +const ( + // Location ... + Location ResourceSkuRestrictionsType = "location" +) + +// PossibleResourceSkuRestrictionsTypeValues returns an array of possible values for the ResourceSkuRestrictionsType const type. +func PossibleResourceSkuRestrictionsTypeValues() []ResourceSkuRestrictionsType { + return []ResourceSkuRestrictionsType{Location} +} + +// ResultCode enumerates the values for result code. +type ResultCode string + +const ( + // Completed ... + Completed ResultCode = "Completed" + // FatalError ... + FatalError ResultCode = "FatalError" + // Initial ... + Initial ResultCode = "Initial" + // ObjectNotExistsInSource ... + ObjectNotExistsInSource ResultCode = "ObjectNotExistsInSource" + // ObjectNotExistsInTarget ... + ObjectNotExistsInTarget ResultCode = "ObjectNotExistsInTarget" + // TargetObjectIsInaccessible ... + TargetObjectIsInaccessible ResultCode = "TargetObjectIsInaccessible" +) + +// PossibleResultCodeValues returns an array of possible values for the ResultCode const type. +func PossibleResultCodeValues() []ResultCode { + return []ResultCode{Completed, FatalError, Initial, ObjectNotExistsInSource, ObjectNotExistsInTarget, TargetObjectIsInaccessible} +} + +// ResultType enumerates the values for result type. +type ResultType string + +const ( + // ResultTypeDatabaseLevelErrorOutput ... + ResultTypeDatabaseLevelErrorOutput ResultType = "DatabaseLevelErrorOutput" + // ResultTypeDatabaseLevelOutput ... + ResultTypeDatabaseLevelOutput ResultType = "DatabaseLevelOutput" + // ResultTypeErrorOutput ... + ResultTypeErrorOutput ResultType = "ErrorOutput" + // ResultTypeMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput ... + ResultTypeMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput ResultType = "MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutput" + // ResultTypeMigrationLevelOutput ... + ResultTypeMigrationLevelOutput ResultType = "MigrationLevelOutput" + // ResultTypeTableLevelOutput ... + ResultTypeTableLevelOutput ResultType = "TableLevelOutput" +) + +// PossibleResultTypeValues returns an array of possible values for the ResultType const type. +func PossibleResultTypeValues() []ResultType { + return []ResultType{ResultTypeDatabaseLevelErrorOutput, ResultTypeDatabaseLevelOutput, ResultTypeErrorOutput, ResultTypeMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput, ResultTypeMigrationLevelOutput, ResultTypeTableLevelOutput} +} + +// ResultTypeBasicConnectToSourceSQLServerTaskOutput enumerates the values for result type basic connect to +// source sql server task output. +type ResultTypeBasicConnectToSourceSQLServerTaskOutput string + +const ( + // ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeAgentJobLevelOutput ... + ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeAgentJobLevelOutput ResultTypeBasicConnectToSourceSQLServerTaskOutput = "AgentJobLevelOutput" + // ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeConnectToSourceSQLServerTaskOutput ... + ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeConnectToSourceSQLServerTaskOutput ResultTypeBasicConnectToSourceSQLServerTaskOutput = "ConnectToSourceSqlServerTaskOutput" + // ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeDatabaseLevelOutput ... + ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeDatabaseLevelOutput ResultTypeBasicConnectToSourceSQLServerTaskOutput = "DatabaseLevelOutput" + // ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeLoginLevelOutput ... + ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeLoginLevelOutput ResultTypeBasicConnectToSourceSQLServerTaskOutput = "LoginLevelOutput" + // ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeTaskLevelOutput ... + ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeTaskLevelOutput ResultTypeBasicConnectToSourceSQLServerTaskOutput = "TaskLevelOutput" +) + +// PossibleResultTypeBasicConnectToSourceSQLServerTaskOutputValues returns an array of possible values for the ResultTypeBasicConnectToSourceSQLServerTaskOutput const type. +func PossibleResultTypeBasicConnectToSourceSQLServerTaskOutputValues() []ResultTypeBasicConnectToSourceSQLServerTaskOutput { + return []ResultTypeBasicConnectToSourceSQLServerTaskOutput{ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeAgentJobLevelOutput, ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeConnectToSourceSQLServerTaskOutput, ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeDatabaseLevelOutput, ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeLoginLevelOutput, ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeTaskLevelOutput} +} + +// ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput enumerates the values for result type basic migrate +// my sql azure db for my sql sync task output. +type ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput string + +const ( + // ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeDatabaseLevelErrorOutput ... + ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeDatabaseLevelErrorOutput ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput = "DatabaseLevelErrorOutput" + // ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeDatabaseLevelOutput ... + ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeDatabaseLevelOutput ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput = "DatabaseLevelOutput" + // ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeErrorOutput ... + ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeErrorOutput ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput = "ErrorOutput" + // ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeMigrateMySQLAzureDbForMySQLSyncTaskOutput ... + ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeMigrateMySQLAzureDbForMySQLSyncTaskOutput ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput = "MigrateMySqlAzureDbForMySqlSyncTaskOutput" + // ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeMigrationLevelOutput ... + ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeMigrationLevelOutput ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput = "MigrationLevelOutput" + // ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeTableLevelOutput ... + ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeTableLevelOutput ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput = "TableLevelOutput" +) + +// PossibleResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputValues returns an array of possible values for the ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput const type. +func PossibleResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputValues() []ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput { + return []ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput{ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeDatabaseLevelErrorOutput, ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeDatabaseLevelOutput, ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeErrorOutput, ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeMigrateMySQLAzureDbForMySQLSyncTaskOutput, ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeMigrationLevelOutput, ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeTableLevelOutput} +} + +// ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutput enumerates the values for result type basic migrate sql +// server sql db sync task output. +type ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutput string + +const ( + // ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeDatabaseLevelErrorOutput ... + ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeDatabaseLevelErrorOutput ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutput = "DatabaseLevelErrorOutput" + // ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeDatabaseLevelOutput ... + ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeDatabaseLevelOutput ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutput = "DatabaseLevelOutput" + // ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeErrorOutput ... + ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeErrorOutput ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutput = "ErrorOutput" + // ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeMigrateSQLServerSQLDbSyncTaskOutput ... + ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeMigrateSQLServerSQLDbSyncTaskOutput ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutput = "MigrateSqlServerSqlDbSyncTaskOutput" + // ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeMigrationLevelOutput ... + ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeMigrationLevelOutput ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutput = "MigrationLevelOutput" + // ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeTableLevelOutput ... + ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeTableLevelOutput ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutput = "TableLevelOutput" +) + +// PossibleResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputValues returns an array of possible values for the ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutput const type. +func PossibleResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputValues() []ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutput { + return []ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutput{ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeDatabaseLevelErrorOutput, ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeDatabaseLevelOutput, ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeErrorOutput, ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeMigrateSQLServerSQLDbSyncTaskOutput, ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeMigrationLevelOutput, ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeTableLevelOutput} +} + +// ResultTypeBasicMigrateSQLServerSQLDbTaskOutput enumerates the values for result type basic migrate sql +// server sql db task output. +type ResultTypeBasicMigrateSQLServerSQLDbTaskOutput string + +const ( + // ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeDatabaseLevelOutput ... + ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeDatabaseLevelOutput ResultTypeBasicMigrateSQLServerSQLDbTaskOutput = "DatabaseLevelOutput" + // ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeErrorOutput ... + ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeErrorOutput ResultTypeBasicMigrateSQLServerSQLDbTaskOutput = "ErrorOutput" + // ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrateSQLServerSQLDbTaskOutput ... + ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrateSQLServerSQLDbTaskOutput ResultTypeBasicMigrateSQLServerSQLDbTaskOutput = "MigrateSqlServerSqlDbTaskOutput" + // ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationDatabaseLevelValidationOutput ... + ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationDatabaseLevelValidationOutput ResultTypeBasicMigrateSQLServerSQLDbTaskOutput = "MigrationDatabaseLevelValidationOutput" + // ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationLevelOutput ... + ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationLevelOutput ResultTypeBasicMigrateSQLServerSQLDbTaskOutput = "MigrationLevelOutput" + // ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationValidationOutput ... + ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationValidationOutput ResultTypeBasicMigrateSQLServerSQLDbTaskOutput = "MigrationValidationOutput" + // ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeTableLevelOutput ... + ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeTableLevelOutput ResultTypeBasicMigrateSQLServerSQLDbTaskOutput = "TableLevelOutput" +) + +// PossibleResultTypeBasicMigrateSQLServerSQLDbTaskOutputValues returns an array of possible values for the ResultTypeBasicMigrateSQLServerSQLDbTaskOutput const type. +func PossibleResultTypeBasicMigrateSQLServerSQLDbTaskOutputValues() []ResultTypeBasicMigrateSQLServerSQLDbTaskOutput { + return []ResultTypeBasicMigrateSQLServerSQLDbTaskOutput{ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeDatabaseLevelOutput, ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeErrorOutput, ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrateSQLServerSQLDbTaskOutput, ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationDatabaseLevelValidationOutput, ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationLevelOutput, ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationValidationOutput, ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeTableLevelOutput} +} + +// ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutput enumerates the values for result type basic migrate sql +// server sqlmi sync task output. +type ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutput string + +const ( + // ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeDatabaseLevelOutput ... + ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeDatabaseLevelOutput ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutput = "DatabaseLevelOutput" + // ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeErrorOutput ... + ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeErrorOutput ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutput = "ErrorOutput" + // ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeMigrateSQLServerSQLMISyncTaskOutput ... + ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeMigrateSQLServerSQLMISyncTaskOutput ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutput = "MigrateSqlServerSqlMISyncTaskOutput" + // ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeMigrationLevelOutput ... + ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeMigrationLevelOutput ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutput = "MigrationLevelOutput" +) + +// PossibleResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputValues returns an array of possible values for the ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutput const type. +func PossibleResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputValues() []ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutput { + return []ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutput{ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeDatabaseLevelOutput, ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeErrorOutput, ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeMigrateSQLServerSQLMISyncTaskOutput, ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeMigrationLevelOutput} +} + +// ResultTypeBasicMigrateSQLServerSQLMITaskOutput enumerates the values for result type basic migrate sql +// server sqlmi task output. +type ResultTypeBasicMigrateSQLServerSQLMITaskOutput string + +const ( + // ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeAgentJobLevelOutput ... + ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeAgentJobLevelOutput ResultTypeBasicMigrateSQLServerSQLMITaskOutput = "AgentJobLevelOutput" + // ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeDatabaseLevelOutput ... + ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeDatabaseLevelOutput ResultTypeBasicMigrateSQLServerSQLMITaskOutput = "DatabaseLevelOutput" + // ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeErrorOutput ... + ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeErrorOutput ResultTypeBasicMigrateSQLServerSQLMITaskOutput = "ErrorOutput" + // ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeLoginLevelOutput ... + ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeLoginLevelOutput ResultTypeBasicMigrateSQLServerSQLMITaskOutput = "LoginLevelOutput" + // ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeMigrateSQLServerSQLMITaskOutput ... + ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeMigrateSQLServerSQLMITaskOutput ResultTypeBasicMigrateSQLServerSQLMITaskOutput = "MigrateSqlServerSqlMITaskOutput" + // ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeMigrationLevelOutput ... + ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeMigrationLevelOutput ResultTypeBasicMigrateSQLServerSQLMITaskOutput = "MigrationLevelOutput" +) + +// PossibleResultTypeBasicMigrateSQLServerSQLMITaskOutputValues returns an array of possible values for the ResultTypeBasicMigrateSQLServerSQLMITaskOutput const type. +func PossibleResultTypeBasicMigrateSQLServerSQLMITaskOutputValues() []ResultTypeBasicMigrateSQLServerSQLMITaskOutput { + return []ResultTypeBasicMigrateSQLServerSQLMITaskOutput{ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeAgentJobLevelOutput, ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeDatabaseLevelOutput, ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeErrorOutput, ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeLoginLevelOutput, ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeMigrateSQLServerSQLMITaskOutput, ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeMigrationLevelOutput} +} + +// SchemaMigrationStage enumerates the values for schema migration stage. +type SchemaMigrationStage string + +const ( + // SchemaMigrationStageCollectingObjects ... + SchemaMigrationStageCollectingObjects SchemaMigrationStage = "CollectingObjects" + // SchemaMigrationStageCompleted ... + SchemaMigrationStageCompleted SchemaMigrationStage = "Completed" + // SchemaMigrationStageCompletedWithWarnings ... + SchemaMigrationStageCompletedWithWarnings SchemaMigrationStage = "CompletedWithWarnings" + // SchemaMigrationStageDeployingSchema ... + SchemaMigrationStageDeployingSchema SchemaMigrationStage = "DeployingSchema" + // SchemaMigrationStageDownloadingScript ... + SchemaMigrationStageDownloadingScript SchemaMigrationStage = "DownloadingScript" + // SchemaMigrationStageFailed ... + SchemaMigrationStageFailed SchemaMigrationStage = "Failed" + // SchemaMigrationStageGeneratingScript ... + SchemaMigrationStageGeneratingScript SchemaMigrationStage = "GeneratingScript" + // SchemaMigrationStageNotStarted ... + SchemaMigrationStageNotStarted SchemaMigrationStage = "NotStarted" + // SchemaMigrationStageUploadingScript ... + SchemaMigrationStageUploadingScript SchemaMigrationStage = "UploadingScript" + // SchemaMigrationStageValidatingInputs ... + SchemaMigrationStageValidatingInputs SchemaMigrationStage = "ValidatingInputs" +) + +// PossibleSchemaMigrationStageValues returns an array of possible values for the SchemaMigrationStage const type. +func PossibleSchemaMigrationStageValues() []SchemaMigrationStage { + return []SchemaMigrationStage{SchemaMigrationStageCollectingObjects, SchemaMigrationStageCompleted, SchemaMigrationStageCompletedWithWarnings, SchemaMigrationStageDeployingSchema, SchemaMigrationStageDownloadingScript, SchemaMigrationStageFailed, SchemaMigrationStageGeneratingScript, SchemaMigrationStageNotStarted, SchemaMigrationStageUploadingScript, SchemaMigrationStageValidatingInputs} +} + +// ServerLevelPermissionsGroup enumerates the values for server level permissions group. +type ServerLevelPermissionsGroup string + +const ( + // Default ... + Default ServerLevelPermissionsGroup = "Default" + // MigrationFromMySQLToAzureDBForMySQL ... + MigrationFromMySQLToAzureDBForMySQL ServerLevelPermissionsGroup = "MigrationFromMySQLToAzureDBForMySQL" + // MigrationFromSQLServerToAzureDB ... + MigrationFromSQLServerToAzureDB ServerLevelPermissionsGroup = "MigrationFromSqlServerToAzureDB" + // MigrationFromSQLServerToAzureMI ... + MigrationFromSQLServerToAzureMI ServerLevelPermissionsGroup = "MigrationFromSqlServerToAzureMI" +) + +// PossibleServerLevelPermissionsGroupValues returns an array of possible values for the ServerLevelPermissionsGroup const type. +func PossibleServerLevelPermissionsGroupValues() []ServerLevelPermissionsGroup { + return []ServerLevelPermissionsGroup{Default, MigrationFromMySQLToAzureDBForMySQL, MigrationFromSQLServerToAzureDB, MigrationFromSQLServerToAzureMI} +} + +// ServiceProvisioningState enumerates the values for service provisioning state. +type ServiceProvisioningState string + +const ( + // ServiceProvisioningStateAccepted ... + ServiceProvisioningStateAccepted ServiceProvisioningState = "Accepted" + // ServiceProvisioningStateDeleting ... + ServiceProvisioningStateDeleting ServiceProvisioningState = "Deleting" + // ServiceProvisioningStateDeploying ... + ServiceProvisioningStateDeploying ServiceProvisioningState = "Deploying" + // ServiceProvisioningStateFailed ... + ServiceProvisioningStateFailed ServiceProvisioningState = "Failed" + // ServiceProvisioningStateFailedToStart ... + ServiceProvisioningStateFailedToStart ServiceProvisioningState = "FailedToStart" + // ServiceProvisioningStateFailedToStop ... + ServiceProvisioningStateFailedToStop ServiceProvisioningState = "FailedToStop" + // ServiceProvisioningStateStarting ... + ServiceProvisioningStateStarting ServiceProvisioningState = "Starting" + // ServiceProvisioningStateStopped ... + ServiceProvisioningStateStopped ServiceProvisioningState = "Stopped" + // ServiceProvisioningStateStopping ... + ServiceProvisioningStateStopping ServiceProvisioningState = "Stopping" + // ServiceProvisioningStateSucceeded ... + ServiceProvisioningStateSucceeded ServiceProvisioningState = "Succeeded" +) + +// PossibleServiceProvisioningStateValues returns an array of possible values for the ServiceProvisioningState const type. +func PossibleServiceProvisioningStateValues() []ServiceProvisioningState { + return []ServiceProvisioningState{ServiceProvisioningStateAccepted, ServiceProvisioningStateDeleting, ServiceProvisioningStateDeploying, ServiceProvisioningStateFailed, ServiceProvisioningStateFailedToStart, ServiceProvisioningStateFailedToStop, ServiceProvisioningStateStarting, ServiceProvisioningStateStopped, ServiceProvisioningStateStopping, ServiceProvisioningStateSucceeded} +} + +// ServiceScalability enumerates the values for service scalability. +type ServiceScalability string + +const ( + // ServiceScalabilityAutomatic ... + ServiceScalabilityAutomatic ServiceScalability = "automatic" + // ServiceScalabilityManual ... + ServiceScalabilityManual ServiceScalability = "manual" + // ServiceScalabilityNone ... + ServiceScalabilityNone ServiceScalability = "none" +) + +// PossibleServiceScalabilityValues returns an array of possible values for the ServiceScalability const type. +func PossibleServiceScalabilityValues() []ServiceScalability { + return []ServiceScalability{ServiceScalabilityAutomatic, ServiceScalabilityManual, ServiceScalabilityNone} +} + +// Severity enumerates the values for severity. +type Severity string + +const ( + // SeverityError ... + SeverityError Severity = "Error" + // SeverityMessage ... + SeverityMessage Severity = "Message" + // SeverityWarning ... + SeverityWarning Severity = "Warning" +) + +// PossibleSeverityValues returns an array of possible values for the Severity const type. +func PossibleSeverityValues() []Severity { + return []Severity{SeverityError, SeverityMessage, SeverityWarning} +} + +// SQLSourcePlatform enumerates the values for sql source platform. +type SQLSourcePlatform string + +const ( + // SQLOnPrem ... + SQLOnPrem SQLSourcePlatform = "SqlOnPrem" +) + +// PossibleSQLSourcePlatformValues returns an array of possible values for the SQLSourcePlatform const type. +func PossibleSQLSourcePlatformValues() []SQLSourcePlatform { + return []SQLSourcePlatform{SQLOnPrem} +} + +// SyncDatabaseMigrationReportingState enumerates the values for sync database migration reporting state. +type SyncDatabaseMigrationReportingState string + +const ( + // SyncDatabaseMigrationReportingStateCANCELLED ... + SyncDatabaseMigrationReportingStateCANCELLED SyncDatabaseMigrationReportingState = "CANCELLED" + // SyncDatabaseMigrationReportingStateCANCELLING ... + SyncDatabaseMigrationReportingStateCANCELLING SyncDatabaseMigrationReportingState = "CANCELLING" + // SyncDatabaseMigrationReportingStateCOMPLETE ... + SyncDatabaseMigrationReportingStateCOMPLETE SyncDatabaseMigrationReportingState = "COMPLETE" + // SyncDatabaseMigrationReportingStateCOMPLETING ... + SyncDatabaseMigrationReportingStateCOMPLETING SyncDatabaseMigrationReportingState = "COMPLETING" + // SyncDatabaseMigrationReportingStateCONFIGURING ... + SyncDatabaseMigrationReportingStateCONFIGURING SyncDatabaseMigrationReportingState = "CONFIGURING" + // SyncDatabaseMigrationReportingStateFAILED ... + SyncDatabaseMigrationReportingStateFAILED SyncDatabaseMigrationReportingState = "FAILED" + // SyncDatabaseMigrationReportingStateINITIALIAZING ... + SyncDatabaseMigrationReportingStateINITIALIAZING SyncDatabaseMigrationReportingState = "INITIALIAZING" + // SyncDatabaseMigrationReportingStateREADYTOCOMPLETE ... + SyncDatabaseMigrationReportingStateREADYTOCOMPLETE SyncDatabaseMigrationReportingState = "READY_TO_COMPLETE" + // SyncDatabaseMigrationReportingStateRUNNING ... + SyncDatabaseMigrationReportingStateRUNNING SyncDatabaseMigrationReportingState = "RUNNING" + // SyncDatabaseMigrationReportingStateSTARTING ... + SyncDatabaseMigrationReportingStateSTARTING SyncDatabaseMigrationReportingState = "STARTING" + // SyncDatabaseMigrationReportingStateUNDEFINED ... + SyncDatabaseMigrationReportingStateUNDEFINED SyncDatabaseMigrationReportingState = "UNDEFINED" +) + +// PossibleSyncDatabaseMigrationReportingStateValues returns an array of possible values for the SyncDatabaseMigrationReportingState const type. +func PossibleSyncDatabaseMigrationReportingStateValues() []SyncDatabaseMigrationReportingState { + return []SyncDatabaseMigrationReportingState{SyncDatabaseMigrationReportingStateCANCELLED, SyncDatabaseMigrationReportingStateCANCELLING, SyncDatabaseMigrationReportingStateCOMPLETE, SyncDatabaseMigrationReportingStateCOMPLETING, SyncDatabaseMigrationReportingStateCONFIGURING, SyncDatabaseMigrationReportingStateFAILED, SyncDatabaseMigrationReportingStateINITIALIAZING, SyncDatabaseMigrationReportingStateREADYTOCOMPLETE, SyncDatabaseMigrationReportingStateRUNNING, SyncDatabaseMigrationReportingStateSTARTING, SyncDatabaseMigrationReportingStateUNDEFINED} +} + +// SyncTableMigrationState enumerates the values for sync table migration state. +type SyncTableMigrationState string + +const ( + // SyncTableMigrationStateBEFORELOAD ... + SyncTableMigrationStateBEFORELOAD SyncTableMigrationState = "BEFORE_LOAD" + // SyncTableMigrationStateCANCELED ... + SyncTableMigrationStateCANCELED SyncTableMigrationState = "CANCELED" + // SyncTableMigrationStateCOMPLETED ... + SyncTableMigrationStateCOMPLETED SyncTableMigrationState = "COMPLETED" + // SyncTableMigrationStateERROR ... + SyncTableMigrationStateERROR SyncTableMigrationState = "ERROR" + // SyncTableMigrationStateFAILED ... + SyncTableMigrationStateFAILED SyncTableMigrationState = "FAILED" + // SyncTableMigrationStateFULLLOAD ... + SyncTableMigrationStateFULLLOAD SyncTableMigrationState = "FULL_LOAD" +) + +// PossibleSyncTableMigrationStateValues returns an array of possible values for the SyncTableMigrationState const type. +func PossibleSyncTableMigrationStateValues() []SyncTableMigrationState { + return []SyncTableMigrationState{SyncTableMigrationStateBEFORELOAD, SyncTableMigrationStateCANCELED, SyncTableMigrationStateCOMPLETED, SyncTableMigrationStateERROR, SyncTableMigrationStateFAILED, SyncTableMigrationStateFULLLOAD} +} + +// TaskState enumerates the values for task state. +type TaskState string + +const ( + // TaskStateCanceled ... + TaskStateCanceled TaskState = "Canceled" + // TaskStateFailed ... + TaskStateFailed TaskState = "Failed" + // TaskStateFailedInputValidation ... + TaskStateFailedInputValidation TaskState = "FailedInputValidation" + // TaskStateFaulted ... + TaskStateFaulted TaskState = "Faulted" + // TaskStateQueued ... + TaskStateQueued TaskState = "Queued" + // TaskStateRunning ... + TaskStateRunning TaskState = "Running" + // TaskStateSucceeded ... + TaskStateSucceeded TaskState = "Succeeded" + // TaskStateUnknown ... + TaskStateUnknown TaskState = "Unknown" +) + +// PossibleTaskStateValues returns an array of possible values for the TaskState const type. +func PossibleTaskStateValues() []TaskState { + return []TaskState{TaskStateCanceled, TaskStateFailed, TaskStateFailedInputValidation, TaskStateFaulted, TaskStateQueued, TaskStateRunning, TaskStateSucceeded, TaskStateUnknown} +} + +// TaskType enumerates the values for task type. +type TaskType string + +const ( + // TaskTypeConnectToSourceMySQL ... + TaskTypeConnectToSourceMySQL TaskType = "ConnectToSource.MySql" + // TaskTypeConnectToSourcePostgreSQLSync ... + TaskTypeConnectToSourcePostgreSQLSync TaskType = "ConnectToSource.PostgreSql.Sync" + // TaskTypeConnectToSourceSQLServer ... + TaskTypeConnectToSourceSQLServer TaskType = "ConnectToSource.SqlServer" + // TaskTypeConnectToSourceSQLServerSync ... + TaskTypeConnectToSourceSQLServerSync TaskType = "ConnectToSource.SqlServer.Sync" + // TaskTypeConnectToTargetAzureDbForMySQL ... + TaskTypeConnectToTargetAzureDbForMySQL TaskType = "ConnectToTarget.AzureDbForMySql" + // TaskTypeConnectToTargetAzureDbForPostgreSQLSync ... + TaskTypeConnectToTargetAzureDbForPostgreSQLSync TaskType = "ConnectToTarget.AzureDbForPostgreSql.Sync" + // TaskTypeConnectToTargetAzureSQLDbMI ... + TaskTypeConnectToTargetAzureSQLDbMI TaskType = "ConnectToTarget.AzureSqlDbMI" + // TaskTypeConnectToTargetAzureSQLDbMISyncLRS ... + TaskTypeConnectToTargetAzureSQLDbMISyncLRS TaskType = "ConnectToTarget.AzureSqlDbMI.Sync.LRS" + // TaskTypeConnectToTargetSQLDb ... + TaskTypeConnectToTargetSQLDb TaskType = "ConnectToTarget.SqlDb" + // TaskTypeConnectToTargetSQLDbSync ... + TaskTypeConnectToTargetSQLDbSync TaskType = "ConnectToTarget.SqlDb.Sync" + // TaskTypeGetTDECertificatesSQL ... + TaskTypeGetTDECertificatesSQL TaskType = "GetTDECertificates.Sql" + // TaskTypeGetUserTablesAzureSQLDbSync ... + TaskTypeGetUserTablesAzureSQLDbSync TaskType = "GetUserTables.AzureSqlDb.Sync" + // TaskTypeGetUserTablesSQL ... + TaskTypeGetUserTablesSQL TaskType = "GetUserTables.Sql" + // TaskTypeMigrateMySQLAzureDbForMySQLSync ... + TaskTypeMigrateMySQLAzureDbForMySQLSync TaskType = "Migrate.MySql.AzureDbForMySql.Sync" + // TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync ... + TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync TaskType = "Migrate.PostgreSql.AzureDbForPostgreSql.Sync" + // TaskTypeMigrateSQLServerAzureSQLDbMI ... + TaskTypeMigrateSQLServerAzureSQLDbMI TaskType = "Migrate.SqlServer.AzureSqlDbMI" + // TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS ... + TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS TaskType = "Migrate.SqlServer.AzureSqlDbMI.Sync.LRS" + // TaskTypeMigrateSQLServerAzureSQLDbSync ... + TaskTypeMigrateSQLServerAzureSQLDbSync TaskType = "Migrate.SqlServer.AzureSqlDb.Sync" + // TaskTypeMigrateSQLServerSQLDb ... + TaskTypeMigrateSQLServerSQLDb TaskType = "Migrate.SqlServer.SqlDb" + // TaskTypeProjectTaskProperties ... + TaskTypeProjectTaskProperties TaskType = "ProjectTaskProperties" + // TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI ... + TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI TaskType = "ValidateMigrationInput.SqlServer.AzureSqlDbMI" + // TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS ... + TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS TaskType = "ValidateMigrationInput.SqlServer.AzureSqlDbMI.Sync.LRS" + // TaskTypeValidateMigrationInputSQLServerSQLDbSync ... + TaskTypeValidateMigrationInputSQLServerSQLDbSync TaskType = "ValidateMigrationInput.SqlServer.SqlDb.Sync" +) + +// PossibleTaskTypeValues returns an array of possible values for the TaskType const type. +func PossibleTaskTypeValues() []TaskType { + return []TaskType{TaskTypeConnectToSourceMySQL, TaskTypeConnectToSourcePostgreSQLSync, TaskTypeConnectToSourceSQLServer, TaskTypeConnectToSourceSQLServerSync, TaskTypeConnectToTargetAzureDbForMySQL, TaskTypeConnectToTargetAzureDbForPostgreSQLSync, TaskTypeConnectToTargetAzureSQLDbMI, TaskTypeConnectToTargetAzureSQLDbMISyncLRS, TaskTypeConnectToTargetSQLDb, TaskTypeConnectToTargetSQLDbSync, TaskTypeGetTDECertificatesSQL, TaskTypeGetUserTablesAzureSQLDbSync, TaskTypeGetUserTablesSQL, TaskTypeMigrateMySQLAzureDbForMySQLSync, TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync, TaskTypeMigrateSQLServerAzureSQLDbMI, TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS, TaskTypeMigrateSQLServerAzureSQLDbSync, TaskTypeMigrateSQLServerSQLDb, TaskTypeProjectTaskProperties, TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI, TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS, TaskTypeValidateMigrationInputSQLServerSQLDbSync} +} + +// Type enumerates the values for type. +type Type string + +const ( + // TypeConnectionInfo ... + TypeConnectionInfo Type = "ConnectionInfo" + // TypeMiSQLConnectionInfo ... + TypeMiSQLConnectionInfo Type = "MiSqlConnectionInfo" + // TypeMySQLConnectionInfo ... + TypeMySQLConnectionInfo Type = "MySqlConnectionInfo" + // TypePostgreSQLConnectionInfo ... + TypePostgreSQLConnectionInfo Type = "PostgreSqlConnectionInfo" + // TypeSQLConnectionInfo ... + TypeSQLConnectionInfo Type = "SqlConnectionInfo" +) + +// PossibleTypeValues returns an array of possible values for the Type const type. +func PossibleTypeValues() []Type { + return []Type{TypeConnectionInfo, TypeMiSQLConnectionInfo, TypeMySQLConnectionInfo, TypePostgreSQLConnectionInfo, TypeSQLConnectionInfo} +} + +// UpdateActionType enumerates the values for update action type. +type UpdateActionType string + +const ( + // AddedOnTarget ... + AddedOnTarget UpdateActionType = "AddedOnTarget" + // ChangedOnTarget ... + ChangedOnTarget UpdateActionType = "ChangedOnTarget" + // DeletedOnTarget ... + DeletedOnTarget UpdateActionType = "DeletedOnTarget" +) + +// PossibleUpdateActionTypeValues returns an array of possible values for the UpdateActionType const type. +func PossibleUpdateActionTypeValues() []UpdateActionType { + return []UpdateActionType{AddedOnTarget, ChangedOnTarget, DeletedOnTarget} +} + +// ValidationStatus enumerates the values for validation status. +type ValidationStatus string + +const ( + // ValidationStatusCompleted ... + ValidationStatusCompleted ValidationStatus = "Completed" + // ValidationStatusCompletedWithIssues ... + ValidationStatusCompletedWithIssues ValidationStatus = "CompletedWithIssues" + // ValidationStatusDefault ... + ValidationStatusDefault ValidationStatus = "Default" + // ValidationStatusFailed ... + ValidationStatusFailed ValidationStatus = "Failed" + // ValidationStatusInitialized ... + ValidationStatusInitialized ValidationStatus = "Initialized" + // ValidationStatusInProgress ... + ValidationStatusInProgress ValidationStatus = "InProgress" + // ValidationStatusNotStarted ... + ValidationStatusNotStarted ValidationStatus = "NotStarted" + // ValidationStatusStopped ... + ValidationStatusStopped ValidationStatus = "Stopped" +) + +// PossibleValidationStatusValues returns an array of possible values for the ValidationStatus const type. +func PossibleValidationStatusValues() []ValidationStatus { + return []ValidationStatus{ValidationStatusCompleted, ValidationStatusCompletedWithIssues, ValidationStatusDefault, ValidationStatusFailed, ValidationStatusInitialized, ValidationStatusInProgress, ValidationStatusNotStarted, ValidationStatusStopped} +} + +// APIError error information. +type APIError struct { + // Error - Error information in OData format + Error *ODataError `json:"error,omitempty"` +} + +// AvailableServiceSku describes the available service SKU. +type AvailableServiceSku struct { + // ResourceType - The resource type, including the provider namespace + ResourceType *string `json:"resourceType,omitempty"` + // Sku - SKU name, tier, etc. + Sku *AvailableServiceSkuSku `json:"sku,omitempty"` + // Capacity - A description of the scaling capacities of the SKU + Capacity *AvailableServiceSkuCapacity `json:"capacity,omitempty"` +} + +// AvailableServiceSkuCapacity a description of the scaling capacities of the SKU +type AvailableServiceSkuCapacity struct { + // Minimum - The minimum capacity, usually 0 or 1. + Minimum *int32 `json:"minimum,omitempty"` + // Maximum - The maximum capacity + Maximum *int32 `json:"maximum,omitempty"` + // Default - The default capacity + Default *int32 `json:"default,omitempty"` + // ScaleType - The scalability approach. Possible values include: 'ServiceScalabilityNone', 'ServiceScalabilityManual', 'ServiceScalabilityAutomatic' + ScaleType ServiceScalability `json:"scaleType,omitempty"` +} + +// AvailableServiceSkuSku SKU name, tier, etc. +type AvailableServiceSkuSku struct { + // Name - The name of the SKU + Name *string `json:"name,omitempty"` + // Family - SKU family + Family *string `json:"family,omitempty"` + // Size - SKU size + Size *string `json:"size,omitempty"` + // Tier - The tier of the SKU, such as "Free", "Basic", "Standard", or "Premium" + Tier *string `json:"tier,omitempty"` +} + +// AzureActiveDirectoryApp azure Active Directory Application +type AzureActiveDirectoryApp struct { + // ApplicationID - Application ID of the Azure Active Directory Application + ApplicationID *string `json:"applicationId,omitempty"` + // AppKey - Key used to authenticate to the Azure Active Directory Application + AppKey *string `json:"appKey,omitempty"` + // TenantID - Tenant id of the customer + TenantID *string `json:"tenantId,omitempty"` +} + +// BackupFileInfo information of the backup file +type BackupFileInfo struct { + // FileLocation - Location of the backup file in shared folder + FileLocation *string `json:"fileLocation,omitempty"` + // FamilySequenceNumber - Sequence number of the backup file in the backup set + FamilySequenceNumber *int32 `json:"familySequenceNumber,omitempty"` + // Status - Status of the backup file during migration. Possible values include: 'Arrived', 'Queued', 'Uploading', 'Uploaded', 'Restoring', 'Restored', 'Cancelled' + Status BackupFileStatus `json:"status,omitempty"` +} + +// BackupSetInfo information of backup set +type BackupSetInfo struct { + // BackupSetID - Id for the set of backup files + BackupSetID *string `json:"backupSetId,omitempty"` + // FirstLsn - First log sequence number of the backup file + FirstLsn *string `json:"firstLsn,omitempty"` + // LastLsn - Last log sequence number of the backup file + LastLsn *string `json:"lastLsn,omitempty"` + // LastModifiedTime - Last modified time of the backup file in share location + LastModifiedTime *date.Time `json:"lastModifiedTime,omitempty"` + // BackupType - Enum of the different backup types. Possible values include: 'BackupTypeDatabase', 'BackupTypeTransactionLog', 'BackupTypeFile', 'BackupTypeDifferentialDatabase', 'BackupTypeDifferentialFile', 'BackupTypePartial', 'BackupTypeDifferentialPartial' + BackupType BackupType `json:"backupType,omitempty"` + // ListOfBackupFiles - List of files in the backup set + ListOfBackupFiles *[]BackupFileInfo `json:"listOfBackupFiles,omitempty"` + // DatabaseName - Name of the database to which the backup set belongs + DatabaseName *string `json:"databaseName,omitempty"` + // BackupStartDate - Date and time that the backup operation began + BackupStartDate *date.Time `json:"backupStartDate,omitempty"` + // BackupFinishedDate - Date and time that the backup operation finished + BackupFinishedDate *date.Time `json:"backupFinishedDate,omitempty"` + // IsBackupRestored - Whether the backup set is restored or not + IsBackupRestored *bool `json:"isBackupRestored,omitempty"` +} + +// BlobShare blob container storage information. +type BlobShare struct { + // SasURI - SAS URI of Azure Storage Account Container. + SasURI *string `json:"sasUri,omitempty"` +} + +// BasicCommandProperties base class for all types of DMS command properties. If command is not supported by current +// client, this object is returned. +type BasicCommandProperties interface { + AsMigrateMISyncCompleteCommandProperties() (*MigrateMISyncCompleteCommandProperties, bool) + AsMigrateSyncCompleteCommandProperties() (*MigrateSyncCompleteCommandProperties, bool) + AsCommandProperties() (*CommandProperties, bool) +} + +// CommandProperties base class for all types of DMS command properties. If command is not supported by current +// client, this object is returned. +type CommandProperties struct { + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the command. This is ignored if submitted. Possible values include: 'Unknown', 'Accepted', 'Running', 'Succeeded', 'Failed' + State CommandState `json:"state,omitempty"` + // CommandType - Possible values include: 'CommandTypeCommandProperties', 'CommandTypeMigrateSQLServerAzureDbSQLMiComplete', 'CommandTypeMigrateSyncCompleteDatabase' + CommandType CommandType `json:"commandType,omitempty"` +} + +func unmarshalBasicCommandProperties(body []byte) (BasicCommandProperties, error) { + var m map[string]interface{} + err := json.Unmarshal(body, &m) + if err != nil { + return nil, err + } + + switch m["commandType"] { + case string(CommandTypeMigrateSQLServerAzureDbSQLMiComplete): + var mmsccp MigrateMISyncCompleteCommandProperties + err := json.Unmarshal(body, &mmsccp) + return mmsccp, err + case string(CommandTypeMigrateSyncCompleteDatabase): + var msccp MigrateSyncCompleteCommandProperties + err := json.Unmarshal(body, &msccp) + return msccp, err + default: + var cp CommandProperties + err := json.Unmarshal(body, &cp) + return cp, err + } +} +func unmarshalBasicCommandPropertiesArray(body []byte) ([]BasicCommandProperties, error) { + var rawMessages []*json.RawMessage + err := json.Unmarshal(body, &rawMessages) + if err != nil { + return nil, err + } + + cpArray := make([]BasicCommandProperties, len(rawMessages)) + + for index, rawMessage := range rawMessages { + cp, err := unmarshalBasicCommandProperties(*rawMessage) + if err != nil { + return nil, err + } + cpArray[index] = cp + } + return cpArray, nil +} + +// MarshalJSON is the custom marshaler for CommandProperties. +func (cp CommandProperties) MarshalJSON() ([]byte, error) { + cp.CommandType = CommandTypeCommandProperties + objectMap := make(map[string]interface{}) + if cp.CommandType != "" { + objectMap["commandType"] = cp.CommandType + } + return json.Marshal(objectMap) +} + +// AsMigrateMISyncCompleteCommandProperties is the BasicCommandProperties implementation for CommandProperties. +func (cp CommandProperties) AsMigrateMISyncCompleteCommandProperties() (*MigrateMISyncCompleteCommandProperties, bool) { + return nil, false +} + +// AsMigrateSyncCompleteCommandProperties is the BasicCommandProperties implementation for CommandProperties. +func (cp CommandProperties) AsMigrateSyncCompleteCommandProperties() (*MigrateSyncCompleteCommandProperties, bool) { + return nil, false +} + +// AsCommandProperties is the BasicCommandProperties implementation for CommandProperties. +func (cp CommandProperties) AsCommandProperties() (*CommandProperties, bool) { + return &cp, true +} + +// AsBasicCommandProperties is the BasicCommandProperties implementation for CommandProperties. +func (cp CommandProperties) AsBasicCommandProperties() (BasicCommandProperties, bool) { + return &cp, true +} + +// BasicConnectionInfo defines the connection properties of a server +type BasicConnectionInfo interface { + AsMiSQLConnectionInfo() (*MiSQLConnectionInfo, bool) + AsPostgreSQLConnectionInfo() (*PostgreSQLConnectionInfo, bool) + AsMySQLConnectionInfo() (*MySQLConnectionInfo, bool) + AsSQLConnectionInfo() (*SQLConnectionInfo, bool) + AsConnectionInfo() (*ConnectionInfo, bool) +} + +// ConnectionInfo defines the connection properties of a server +type ConnectionInfo struct { + // UserName - User name + UserName *string `json:"userName,omitempty"` + // Password - Password credential. + Password *string `json:"password,omitempty"` + // Type - Possible values include: 'TypeConnectionInfo', 'TypeMiSQLConnectionInfo', 'TypePostgreSQLConnectionInfo', 'TypeMySQLConnectionInfo', 'TypeSQLConnectionInfo' + Type Type `json:"type,omitempty"` +} + +func unmarshalBasicConnectionInfo(body []byte) (BasicConnectionInfo, error) { + var m map[string]interface{} + err := json.Unmarshal(body, &m) + if err != nil { + return nil, err + } + + switch m["type"] { + case string(TypeMiSQLConnectionInfo): + var msci MiSQLConnectionInfo + err := json.Unmarshal(body, &msci) + return msci, err + case string(TypePostgreSQLConnectionInfo): + var psci PostgreSQLConnectionInfo + err := json.Unmarshal(body, &psci) + return psci, err + case string(TypeMySQLConnectionInfo): + var msci MySQLConnectionInfo + err := json.Unmarshal(body, &msci) + return msci, err + case string(TypeSQLConnectionInfo): + var sci SQLConnectionInfo + err := json.Unmarshal(body, &sci) + return sci, err + default: + var ci ConnectionInfo + err := json.Unmarshal(body, &ci) + return ci, err + } +} +func unmarshalBasicConnectionInfoArray(body []byte) ([]BasicConnectionInfo, error) { + var rawMessages []*json.RawMessage + err := json.Unmarshal(body, &rawMessages) + if err != nil { + return nil, err + } + + ciArray := make([]BasicConnectionInfo, len(rawMessages)) + + for index, rawMessage := range rawMessages { + ci, err := unmarshalBasicConnectionInfo(*rawMessage) + if err != nil { + return nil, err + } + ciArray[index] = ci + } + return ciArray, nil +} + +// MarshalJSON is the custom marshaler for ConnectionInfo. +func (ci ConnectionInfo) MarshalJSON() ([]byte, error) { + ci.Type = TypeConnectionInfo + objectMap := make(map[string]interface{}) + if ci.UserName != nil { + objectMap["userName"] = ci.UserName + } + if ci.Password != nil { + objectMap["password"] = ci.Password + } + if ci.Type != "" { + objectMap["type"] = ci.Type + } + return json.Marshal(objectMap) +} + +// AsMiSQLConnectionInfo is the BasicConnectionInfo implementation for ConnectionInfo. +func (ci ConnectionInfo) AsMiSQLConnectionInfo() (*MiSQLConnectionInfo, bool) { + return nil, false +} + +// AsPostgreSQLConnectionInfo is the BasicConnectionInfo implementation for ConnectionInfo. +func (ci ConnectionInfo) AsPostgreSQLConnectionInfo() (*PostgreSQLConnectionInfo, bool) { + return nil, false +} + +// AsMySQLConnectionInfo is the BasicConnectionInfo implementation for ConnectionInfo. +func (ci ConnectionInfo) AsMySQLConnectionInfo() (*MySQLConnectionInfo, bool) { + return nil, false +} + +// AsSQLConnectionInfo is the BasicConnectionInfo implementation for ConnectionInfo. +func (ci ConnectionInfo) AsSQLConnectionInfo() (*SQLConnectionInfo, bool) { + return nil, false +} + +// AsConnectionInfo is the BasicConnectionInfo implementation for ConnectionInfo. +func (ci ConnectionInfo) AsConnectionInfo() (*ConnectionInfo, bool) { + return &ci, true +} + +// AsBasicConnectionInfo is the BasicConnectionInfo implementation for ConnectionInfo. +func (ci ConnectionInfo) AsBasicConnectionInfo() (BasicConnectionInfo, bool) { + return &ci, true +} + +// ConnectToSourceMySQLTaskInput input for the task that validates MySQL database connection +type ConnectToSourceMySQLTaskInput struct { + // SourceConnectionInfo - Information for connecting to MySQL source + SourceConnectionInfo *MySQLConnectionInfo `json:"sourceConnectionInfo,omitempty"` + // TargetPlatform - Target Platform for the migration. Possible values include: 'SQLServer', 'AzureDbForMySQL' + TargetPlatform MySQLTargetPlatformType `json:"targetPlatform,omitempty"` + // CheckPermissionsGroup - Permission group for validations. Possible values include: 'Default', 'MigrationFromSQLServerToAzureDB', 'MigrationFromSQLServerToAzureMI', 'MigrationFromMySQLToAzureDBForMySQL' + CheckPermissionsGroup ServerLevelPermissionsGroup `json:"checkPermissionsGroup,omitempty"` +} + +// ConnectToSourceMySQLTaskProperties properties for the task that validates MySQL database connection +type ConnectToSourceMySQLTaskProperties struct { + // Input - Task input + Input *ConnectToSourceMySQLTaskInput `json:"input,omitempty"` + // Output - READ-ONLY; Task output. This is ignored if submitted. + Output *[]ConnectToSourceNonSQLTaskOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the task. This is ignored if submitted. Possible values include: 'TaskStateUnknown', 'TaskStateQueued', 'TaskStateRunning', 'TaskStateCanceled', 'TaskStateSucceeded', 'TaskStateFailed', 'TaskStateFailedInputValidation', 'TaskStateFaulted' + State TaskState `json:"state,omitempty"` + // Commands - READ-ONLY; Array of command properties. + Commands *[]BasicCommandProperties `json:"commands,omitempty"` + // TaskType - Possible values include: 'TaskTypeProjectTaskProperties', 'TaskTypeGetTDECertificatesSQL', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI', 'TaskTypeValidateMigrationInputSQLServerSQLDbSync', 'TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync', 'TaskTypeMigrateMySQLAzureDbForMySQLSync', 'TaskTypeMigrateSQLServerAzureSQLDbSync', 'TaskTypeMigrateSQLServerSQLDb', 'TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS', 'TaskTypeMigrateSQLServerAzureSQLDbMI', 'TaskTypeConnectToTargetAzureDbForMySQL', 'TaskTypeConnectToTargetAzureSQLDbMISyncLRS', 'TaskTypeConnectToTargetAzureSQLDbMI', 'TaskTypeGetUserTablesAzureSQLDbSync', 'TaskTypeGetUserTablesSQL', 'TaskTypeConnectToTargetAzureDbForPostgreSQLSync', 'TaskTypeConnectToTargetSQLDbSync', 'TaskTypeConnectToTargetSQLDb', 'TaskTypeConnectToSourcePostgreSQLSync', 'TaskTypeConnectToSourceSQLServerSync', 'TaskTypeConnectToSourceSQLServer', 'TaskTypeConnectToSourceMySQL' + TaskType TaskType `json:"taskType,omitempty"` +} + +// MarshalJSON is the custom marshaler for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) MarshalJSON() ([]byte, error) { + ctsmstp.TaskType = TaskTypeConnectToSourceMySQL + objectMap := make(map[string]interface{}) + if ctsmstp.Input != nil { + objectMap["input"] = ctsmstp.Input + } + if ctsmstp.TaskType != "" { + objectMap["taskType"] = ctsmstp.TaskType + } + return json.Marshal(objectMap) +} + +// AsGetTdeCertificatesSQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForMySQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourcePostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceMySQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) { + return &ctsmstp, true +} + +// AsProjectTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsProjectTaskProperties() (*ProjectTaskProperties, bool) { + return nil, false +} + +// AsBasicProjectTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceMySQLTaskProperties. +func (ctsmstp ConnectToSourceMySQLTaskProperties) AsBasicProjectTaskProperties() (BasicProjectTaskProperties, bool) { + return &ctsmstp, true +} + +// UnmarshalJSON is the custom unmarshaler for ConnectToSourceMySQLTaskProperties struct. +func (ctsmstp *ConnectToSourceMySQLTaskProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "input": + if v != nil { + var input ConnectToSourceMySQLTaskInput + err = json.Unmarshal(*v, &input) + if err != nil { + return err + } + ctsmstp.Input = &input + } + case "output": + if v != nil { + var output []ConnectToSourceNonSQLTaskOutput + err = json.Unmarshal(*v, &output) + if err != nil { + return err + } + ctsmstp.Output = &output + } + case "errors": + if v != nil { + var errorsVar []ODataError + err = json.Unmarshal(*v, &errorsVar) + if err != nil { + return err + } + ctsmstp.Errors = &errorsVar + } + case "state": + if v != nil { + var state TaskState + err = json.Unmarshal(*v, &state) + if err != nil { + return err + } + ctsmstp.State = state + } + case "commands": + if v != nil { + commands, err := unmarshalBasicCommandPropertiesArray(*v) + if err != nil { + return err + } + ctsmstp.Commands = &commands + } + case "taskType": + if v != nil { + var taskType TaskType + err = json.Unmarshal(*v, &taskType) + if err != nil { + return err + } + ctsmstp.TaskType = taskType + } + } + } + + return nil +} + +// ConnectToSourceNonSQLTaskOutput output for connect to Oracle, MySQL type source +type ConnectToSourceNonSQLTaskOutput struct { + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // SourceServerBrandVersion - READ-ONLY; Server brand version + SourceServerBrandVersion *string `json:"sourceServerBrandVersion,omitempty"` + // ServerProperties - READ-ONLY; Server properties + ServerProperties *ServerProperties `json:"serverProperties,omitempty"` + // Databases - READ-ONLY; List of databases on the server + Databases *[]string `json:"databases,omitempty"` + // ValidationErrors - READ-ONLY; Validation errors associated with the task + ValidationErrors *[]ReportableException `json:"validationErrors,omitempty"` +} + +// ConnectToSourcePostgreSQLSyncTaskInput input for the task that validates connection to PostgreSQL and +// source server requirements +type ConnectToSourcePostgreSQLSyncTaskInput struct { + // SourceConnectionInfo - Connection information for source PostgreSQL server + SourceConnectionInfo *PostgreSQLConnectionInfo `json:"sourceConnectionInfo,omitempty"` +} + +// ConnectToSourcePostgreSQLSyncTaskOutput output for the task that validates connection to PostgreSQL and +// source server requirements +type ConnectToSourcePostgreSQLSyncTaskOutput struct { + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // SourceServerVersion - READ-ONLY; Version of the source server + SourceServerVersion *string `json:"sourceServerVersion,omitempty"` + // Databases - READ-ONLY; List of databases on source server + Databases *[]string `json:"databases,omitempty"` + // SourceServerBrandVersion - READ-ONLY; Source server brand version + SourceServerBrandVersion *string `json:"sourceServerBrandVersion,omitempty"` + // ValidationErrors - READ-ONLY; Validation errors associated with the task + ValidationErrors *[]ReportableException `json:"validationErrors,omitempty"` +} + +// ConnectToSourcePostgreSQLSyncTaskProperties properties for the task that validates connection to +// PostgreSQL server and source server requirements for online migration +type ConnectToSourcePostgreSQLSyncTaskProperties struct { + // Input - Task input + Input *ConnectToSourcePostgreSQLSyncTaskInput `json:"input,omitempty"` + // Output - READ-ONLY; Task output. This is ignored if submitted. + Output *[]ConnectToSourcePostgreSQLSyncTaskOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the task. This is ignored if submitted. Possible values include: 'TaskStateUnknown', 'TaskStateQueued', 'TaskStateRunning', 'TaskStateCanceled', 'TaskStateSucceeded', 'TaskStateFailed', 'TaskStateFailedInputValidation', 'TaskStateFaulted' + State TaskState `json:"state,omitempty"` + // Commands - READ-ONLY; Array of command properties. + Commands *[]BasicCommandProperties `json:"commands,omitempty"` + // TaskType - Possible values include: 'TaskTypeProjectTaskProperties', 'TaskTypeGetTDECertificatesSQL', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI', 'TaskTypeValidateMigrationInputSQLServerSQLDbSync', 'TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync', 'TaskTypeMigrateMySQLAzureDbForMySQLSync', 'TaskTypeMigrateSQLServerAzureSQLDbSync', 'TaskTypeMigrateSQLServerSQLDb', 'TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS', 'TaskTypeMigrateSQLServerAzureSQLDbMI', 'TaskTypeConnectToTargetAzureDbForMySQL', 'TaskTypeConnectToTargetAzureSQLDbMISyncLRS', 'TaskTypeConnectToTargetAzureSQLDbMI', 'TaskTypeGetUserTablesAzureSQLDbSync', 'TaskTypeGetUserTablesSQL', 'TaskTypeConnectToTargetAzureDbForPostgreSQLSync', 'TaskTypeConnectToTargetSQLDbSync', 'TaskTypeConnectToTargetSQLDb', 'TaskTypeConnectToSourcePostgreSQLSync', 'TaskTypeConnectToSourceSQLServerSync', 'TaskTypeConnectToSourceSQLServer', 'TaskTypeConnectToSourceMySQL' + TaskType TaskType `json:"taskType,omitempty"` +} + +// MarshalJSON is the custom marshaler for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) MarshalJSON() ([]byte, error) { + ctspsstp.TaskType = TaskTypeConnectToSourcePostgreSQLSync + objectMap := make(map[string]interface{}) + if ctspsstp.Input != nil { + objectMap["input"] = ctspsstp.Input + } + if ctspsstp.TaskType != "" { + objectMap["taskType"] = ctspsstp.TaskType + } + return json.Marshal(objectMap) +} + +// AsGetTdeCertificatesSQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForMySQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourcePostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) { + return &ctspsstp, true +} + +// AsConnectToSourceSQLServerSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceMySQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) { + return nil, false +} + +// AsProjectTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsProjectTaskProperties() (*ProjectTaskProperties, bool) { + return nil, false +} + +// AsBasicProjectTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourcePostgreSQLSyncTaskProperties. +func (ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties) AsBasicProjectTaskProperties() (BasicProjectTaskProperties, bool) { + return &ctspsstp, true +} + +// UnmarshalJSON is the custom unmarshaler for ConnectToSourcePostgreSQLSyncTaskProperties struct. +func (ctspsstp *ConnectToSourcePostgreSQLSyncTaskProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "input": + if v != nil { + var input ConnectToSourcePostgreSQLSyncTaskInput + err = json.Unmarshal(*v, &input) + if err != nil { + return err + } + ctspsstp.Input = &input + } + case "output": + if v != nil { + var output []ConnectToSourcePostgreSQLSyncTaskOutput + err = json.Unmarshal(*v, &output) + if err != nil { + return err + } + ctspsstp.Output = &output + } + case "errors": + if v != nil { + var errorsVar []ODataError + err = json.Unmarshal(*v, &errorsVar) + if err != nil { + return err + } + ctspsstp.Errors = &errorsVar + } + case "state": + if v != nil { + var state TaskState + err = json.Unmarshal(*v, &state) + if err != nil { + return err + } + ctspsstp.State = state + } + case "commands": + if v != nil { + commands, err := unmarshalBasicCommandPropertiesArray(*v) + if err != nil { + return err + } + ctspsstp.Commands = &commands + } + case "taskType": + if v != nil { + var taskType TaskType + err = json.Unmarshal(*v, &taskType) + if err != nil { + return err + } + ctspsstp.TaskType = taskType + } + } + } + + return nil +} + +// ConnectToSourceSQLServerSyncTaskProperties properties for the task that validates connection to SQL +// Server and source server requirements for online migration +type ConnectToSourceSQLServerSyncTaskProperties struct { + // Input - Task input + Input *ConnectToSourceSQLServerTaskInput `json:"input,omitempty"` + // Output - READ-ONLY; Task output. This is ignored if submitted. + Output *[]BasicConnectToSourceSQLServerTaskOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the task. This is ignored if submitted. Possible values include: 'TaskStateUnknown', 'TaskStateQueued', 'TaskStateRunning', 'TaskStateCanceled', 'TaskStateSucceeded', 'TaskStateFailed', 'TaskStateFailedInputValidation', 'TaskStateFaulted' + State TaskState `json:"state,omitempty"` + // Commands - READ-ONLY; Array of command properties. + Commands *[]BasicCommandProperties `json:"commands,omitempty"` + // TaskType - Possible values include: 'TaskTypeProjectTaskProperties', 'TaskTypeGetTDECertificatesSQL', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI', 'TaskTypeValidateMigrationInputSQLServerSQLDbSync', 'TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync', 'TaskTypeMigrateMySQLAzureDbForMySQLSync', 'TaskTypeMigrateSQLServerAzureSQLDbSync', 'TaskTypeMigrateSQLServerSQLDb', 'TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS', 'TaskTypeMigrateSQLServerAzureSQLDbMI', 'TaskTypeConnectToTargetAzureDbForMySQL', 'TaskTypeConnectToTargetAzureSQLDbMISyncLRS', 'TaskTypeConnectToTargetAzureSQLDbMI', 'TaskTypeGetUserTablesAzureSQLDbSync', 'TaskTypeGetUserTablesSQL', 'TaskTypeConnectToTargetAzureDbForPostgreSQLSync', 'TaskTypeConnectToTargetSQLDbSync', 'TaskTypeConnectToTargetSQLDb', 'TaskTypeConnectToSourcePostgreSQLSync', 'TaskTypeConnectToSourceSQLServerSync', 'TaskTypeConnectToSourceSQLServer', 'TaskTypeConnectToSourceMySQL' + TaskType TaskType `json:"taskType,omitempty"` +} + +// MarshalJSON is the custom marshaler for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) MarshalJSON() ([]byte, error) { + ctsssstp.TaskType = TaskTypeConnectToSourceSQLServerSync + objectMap := make(map[string]interface{}) + if ctsssstp.Input != nil { + objectMap["input"] = ctsssstp.Input + } + if ctsssstp.TaskType != "" { + objectMap["taskType"] = ctsssstp.TaskType + } + return json.Marshal(objectMap) +} + +// AsGetTdeCertificatesSQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForMySQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourcePostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) { + return &ctsssstp, true +} + +// AsConnectToSourceSQLServerTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceMySQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) { + return nil, false +} + +// AsProjectTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsProjectTaskProperties() (*ProjectTaskProperties, bool) { + return nil, false +} + +// AsBasicProjectTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerSyncTaskProperties. +func (ctsssstp ConnectToSourceSQLServerSyncTaskProperties) AsBasicProjectTaskProperties() (BasicProjectTaskProperties, bool) { + return &ctsssstp, true +} + +// UnmarshalJSON is the custom unmarshaler for ConnectToSourceSQLServerSyncTaskProperties struct. +func (ctsssstp *ConnectToSourceSQLServerSyncTaskProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "input": + if v != nil { + var input ConnectToSourceSQLServerTaskInput + err = json.Unmarshal(*v, &input) + if err != nil { + return err + } + ctsssstp.Input = &input + } + case "output": + if v != nil { + output, err := unmarshalBasicConnectToSourceSQLServerTaskOutputArray(*v) + if err != nil { + return err + } + ctsssstp.Output = &output + } + case "errors": + if v != nil { + var errorsVar []ODataError + err = json.Unmarshal(*v, &errorsVar) + if err != nil { + return err + } + ctsssstp.Errors = &errorsVar + } + case "state": + if v != nil { + var state TaskState + err = json.Unmarshal(*v, &state) + if err != nil { + return err + } + ctsssstp.State = state + } + case "commands": + if v != nil { + commands, err := unmarshalBasicCommandPropertiesArray(*v) + if err != nil { + return err + } + ctsssstp.Commands = &commands + } + case "taskType": + if v != nil { + var taskType TaskType + err = json.Unmarshal(*v, &taskType) + if err != nil { + return err + } + ctsssstp.TaskType = taskType + } + } + } + + return nil +} + +// ConnectToSourceSQLServerTaskInput input for the task that validates connection to SQL Server and also +// validates source server requirements +type ConnectToSourceSQLServerTaskInput struct { + // SourceConnectionInfo - Connection information for Source SQL Server + SourceConnectionInfo *SQLConnectionInfo `json:"sourceConnectionInfo,omitempty"` + // CheckPermissionsGroup - Permission group for validations. Possible values include: 'Default', 'MigrationFromSQLServerToAzureDB', 'MigrationFromSQLServerToAzureMI', 'MigrationFromMySQLToAzureDBForMySQL' + CheckPermissionsGroup ServerLevelPermissionsGroup `json:"checkPermissionsGroup,omitempty"` + // CollectLogins - Flag for whether to collect logins from source server. + CollectLogins *bool `json:"collectLogins,omitempty"` + // CollectAgentJobs - Flag for whether to collect agent jobs from source server. + CollectAgentJobs *bool `json:"collectAgentJobs,omitempty"` +} + +// BasicConnectToSourceSQLServerTaskOutput output for the task that validates connection to SQL Server and also +// validates source server requirements +type BasicConnectToSourceSQLServerTaskOutput interface { + AsConnectToSourceSQLServerTaskOutputAgentJobLevel() (*ConnectToSourceSQLServerTaskOutputAgentJobLevel, bool) + AsConnectToSourceSQLServerTaskOutputLoginLevel() (*ConnectToSourceSQLServerTaskOutputLoginLevel, bool) + AsConnectToSourceSQLServerTaskOutputDatabaseLevel() (*ConnectToSourceSQLServerTaskOutputDatabaseLevel, bool) + AsConnectToSourceSQLServerTaskOutputTaskLevel() (*ConnectToSourceSQLServerTaskOutputTaskLevel, bool) + AsConnectToSourceSQLServerTaskOutput() (*ConnectToSourceSQLServerTaskOutput, bool) +} + +// ConnectToSourceSQLServerTaskOutput output for the task that validates connection to SQL Server and also +// validates source server requirements +type ConnectToSourceSQLServerTaskOutput struct { + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeConnectToSourceSQLServerTaskOutput', 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeAgentJobLevelOutput', 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeLoginLevelOutput', 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeTaskLevelOutput' + ResultType ResultTypeBasicConnectToSourceSQLServerTaskOutput `json:"resultType,omitempty"` +} + +func unmarshalBasicConnectToSourceSQLServerTaskOutput(body []byte) (BasicConnectToSourceSQLServerTaskOutput, error) { + var m map[string]interface{} + err := json.Unmarshal(body, &m) + if err != nil { + return nil, err + } + + switch m["resultType"] { + case string(ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeAgentJobLevelOutput): + var ctssstoajl ConnectToSourceSQLServerTaskOutputAgentJobLevel + err := json.Unmarshal(body, &ctssstoajl) + return ctssstoajl, err + case string(ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeLoginLevelOutput): + var ctssstoll ConnectToSourceSQLServerTaskOutputLoginLevel + err := json.Unmarshal(body, &ctssstoll) + return ctssstoll, err + case string(ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeDatabaseLevelOutput): + var ctssstodl ConnectToSourceSQLServerTaskOutputDatabaseLevel + err := json.Unmarshal(body, &ctssstodl) + return ctssstodl, err + case string(ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeTaskLevelOutput): + var ctssstotl ConnectToSourceSQLServerTaskOutputTaskLevel + err := json.Unmarshal(body, &ctssstotl) + return ctssstotl, err + default: + var ctsssto ConnectToSourceSQLServerTaskOutput + err := json.Unmarshal(body, &ctsssto) + return ctsssto, err + } +} +func unmarshalBasicConnectToSourceSQLServerTaskOutputArray(body []byte) ([]BasicConnectToSourceSQLServerTaskOutput, error) { + var rawMessages []*json.RawMessage + err := json.Unmarshal(body, &rawMessages) + if err != nil { + return nil, err + } + + ctssstoArray := make([]BasicConnectToSourceSQLServerTaskOutput, len(rawMessages)) + + for index, rawMessage := range rawMessages { + ctsssto, err := unmarshalBasicConnectToSourceSQLServerTaskOutput(*rawMessage) + if err != nil { + return nil, err + } + ctssstoArray[index] = ctsssto + } + return ctssstoArray, nil +} + +// MarshalJSON is the custom marshaler for ConnectToSourceSQLServerTaskOutput. +func (ctsssto ConnectToSourceSQLServerTaskOutput) MarshalJSON() ([]byte, error) { + ctsssto.ResultType = ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeConnectToSourceSQLServerTaskOutput + objectMap := make(map[string]interface{}) + if ctsssto.ResultType != "" { + objectMap["resultType"] = ctsssto.ResultType + } + return json.Marshal(objectMap) +} + +// AsConnectToSourceSQLServerTaskOutputAgentJobLevel is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutput. +func (ctsssto ConnectToSourceSQLServerTaskOutput) AsConnectToSourceSQLServerTaskOutputAgentJobLevel() (*ConnectToSourceSQLServerTaskOutputAgentJobLevel, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskOutputLoginLevel is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutput. +func (ctsssto ConnectToSourceSQLServerTaskOutput) AsConnectToSourceSQLServerTaskOutputLoginLevel() (*ConnectToSourceSQLServerTaskOutputLoginLevel, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskOutputDatabaseLevel is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutput. +func (ctsssto ConnectToSourceSQLServerTaskOutput) AsConnectToSourceSQLServerTaskOutputDatabaseLevel() (*ConnectToSourceSQLServerTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskOutputTaskLevel is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutput. +func (ctsssto ConnectToSourceSQLServerTaskOutput) AsConnectToSourceSQLServerTaskOutputTaskLevel() (*ConnectToSourceSQLServerTaskOutputTaskLevel, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskOutput is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutput. +func (ctsssto ConnectToSourceSQLServerTaskOutput) AsConnectToSourceSQLServerTaskOutput() (*ConnectToSourceSQLServerTaskOutput, bool) { + return &ctsssto, true +} + +// AsBasicConnectToSourceSQLServerTaskOutput is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutput. +func (ctsssto ConnectToSourceSQLServerTaskOutput) AsBasicConnectToSourceSQLServerTaskOutput() (BasicConnectToSourceSQLServerTaskOutput, bool) { + return &ctsssto, true +} + +// ConnectToSourceSQLServerTaskOutputAgentJobLevel agentJob level output for the task that validates +// connection to SQL Server and also validates source server requirements +type ConnectToSourceSQLServerTaskOutputAgentJobLevel struct { + // Name - READ-ONLY; AgentJob name + Name *string `json:"name,omitempty"` + // JobCategory - READ-ONLY; The type of AgentJob. + JobCategory *string `json:"jobCategory,omitempty"` + // IsEnabled - READ-ONLY; The state of the original AgentJob. + IsEnabled *bool `json:"isEnabled,omitempty"` + // JobOwner - READ-ONLY; The owner of the AgentJob + JobOwner *string `json:"jobOwner,omitempty"` + // LastExecutedOn - READ-ONLY; UTC Date and time when the AgentJob was last executed. + LastExecutedOn *date.Time `json:"lastExecutedOn,omitempty"` + // MigrationEligibility - READ-ONLY; Information about eligibility of agent job for migration. + MigrationEligibility *MigrationEligibilityInfo `json:"migrationEligibility,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeConnectToSourceSQLServerTaskOutput', 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeAgentJobLevelOutput', 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeLoginLevelOutput', 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeTaskLevelOutput' + ResultType ResultTypeBasicConnectToSourceSQLServerTaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for ConnectToSourceSQLServerTaskOutputAgentJobLevel. +func (ctssstoajl ConnectToSourceSQLServerTaskOutputAgentJobLevel) MarshalJSON() ([]byte, error) { + ctssstoajl.ResultType = ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeAgentJobLevelOutput + objectMap := make(map[string]interface{}) + if ctssstoajl.ResultType != "" { + objectMap["resultType"] = ctssstoajl.ResultType + } + return json.Marshal(objectMap) +} + +// AsConnectToSourceSQLServerTaskOutputAgentJobLevel is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputAgentJobLevel. +func (ctssstoajl ConnectToSourceSQLServerTaskOutputAgentJobLevel) AsConnectToSourceSQLServerTaskOutputAgentJobLevel() (*ConnectToSourceSQLServerTaskOutputAgentJobLevel, bool) { + return &ctssstoajl, true +} + +// AsConnectToSourceSQLServerTaskOutputLoginLevel is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputAgentJobLevel. +func (ctssstoajl ConnectToSourceSQLServerTaskOutputAgentJobLevel) AsConnectToSourceSQLServerTaskOutputLoginLevel() (*ConnectToSourceSQLServerTaskOutputLoginLevel, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskOutputDatabaseLevel is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputAgentJobLevel. +func (ctssstoajl ConnectToSourceSQLServerTaskOutputAgentJobLevel) AsConnectToSourceSQLServerTaskOutputDatabaseLevel() (*ConnectToSourceSQLServerTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskOutputTaskLevel is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputAgentJobLevel. +func (ctssstoajl ConnectToSourceSQLServerTaskOutputAgentJobLevel) AsConnectToSourceSQLServerTaskOutputTaskLevel() (*ConnectToSourceSQLServerTaskOutputTaskLevel, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskOutput is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputAgentJobLevel. +func (ctssstoajl ConnectToSourceSQLServerTaskOutputAgentJobLevel) AsConnectToSourceSQLServerTaskOutput() (*ConnectToSourceSQLServerTaskOutput, bool) { + return nil, false +} + +// AsBasicConnectToSourceSQLServerTaskOutput is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputAgentJobLevel. +func (ctssstoajl ConnectToSourceSQLServerTaskOutputAgentJobLevel) AsBasicConnectToSourceSQLServerTaskOutput() (BasicConnectToSourceSQLServerTaskOutput, bool) { + return &ctssstoajl, true +} + +// ConnectToSourceSQLServerTaskOutputDatabaseLevel database level output for the task that validates +// connection to SQL Server and also validates source server requirements +type ConnectToSourceSQLServerTaskOutputDatabaseLevel struct { + // Name - READ-ONLY; Database name + Name *string `json:"name,omitempty"` + // SizeMB - READ-ONLY; Size of the file in megabytes + SizeMB *float64 `json:"sizeMB,omitempty"` + // DatabaseFiles - READ-ONLY; The list of database files + DatabaseFiles *[]DatabaseFileInfo `json:"databaseFiles,omitempty"` + // CompatibilityLevel - READ-ONLY; SQL Server compatibility level of database. Possible values include: 'CompatLevel80', 'CompatLevel90', 'CompatLevel100', 'CompatLevel110', 'CompatLevel120', 'CompatLevel130', 'CompatLevel140' + CompatibilityLevel DatabaseCompatLevel `json:"compatibilityLevel,omitempty"` + // DatabaseState - READ-ONLY; State of the database. Possible values include: 'DatabaseStateOnline', 'DatabaseStateRestoring', 'DatabaseStateRecovering', 'DatabaseStateRecoveryPending', 'DatabaseStateSuspect', 'DatabaseStateEmergency', 'DatabaseStateOffline', 'DatabaseStateCopying', 'DatabaseStateOfflineSecondary' + DatabaseState DatabaseState `json:"databaseState,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeConnectToSourceSQLServerTaskOutput', 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeAgentJobLevelOutput', 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeLoginLevelOutput', 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeTaskLevelOutput' + ResultType ResultTypeBasicConnectToSourceSQLServerTaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for ConnectToSourceSQLServerTaskOutputDatabaseLevel. +func (ctssstodl ConnectToSourceSQLServerTaskOutputDatabaseLevel) MarshalJSON() ([]byte, error) { + ctssstodl.ResultType = ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeDatabaseLevelOutput + objectMap := make(map[string]interface{}) + if ctssstodl.ResultType != "" { + objectMap["resultType"] = ctssstodl.ResultType + } + return json.Marshal(objectMap) +} + +// AsConnectToSourceSQLServerTaskOutputAgentJobLevel is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputDatabaseLevel. +func (ctssstodl ConnectToSourceSQLServerTaskOutputDatabaseLevel) AsConnectToSourceSQLServerTaskOutputAgentJobLevel() (*ConnectToSourceSQLServerTaskOutputAgentJobLevel, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskOutputLoginLevel is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputDatabaseLevel. +func (ctssstodl ConnectToSourceSQLServerTaskOutputDatabaseLevel) AsConnectToSourceSQLServerTaskOutputLoginLevel() (*ConnectToSourceSQLServerTaskOutputLoginLevel, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskOutputDatabaseLevel is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputDatabaseLevel. +func (ctssstodl ConnectToSourceSQLServerTaskOutputDatabaseLevel) AsConnectToSourceSQLServerTaskOutputDatabaseLevel() (*ConnectToSourceSQLServerTaskOutputDatabaseLevel, bool) { + return &ctssstodl, true +} + +// AsConnectToSourceSQLServerTaskOutputTaskLevel is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputDatabaseLevel. +func (ctssstodl ConnectToSourceSQLServerTaskOutputDatabaseLevel) AsConnectToSourceSQLServerTaskOutputTaskLevel() (*ConnectToSourceSQLServerTaskOutputTaskLevel, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskOutput is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputDatabaseLevel. +func (ctssstodl ConnectToSourceSQLServerTaskOutputDatabaseLevel) AsConnectToSourceSQLServerTaskOutput() (*ConnectToSourceSQLServerTaskOutput, bool) { + return nil, false +} + +// AsBasicConnectToSourceSQLServerTaskOutput is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputDatabaseLevel. +func (ctssstodl ConnectToSourceSQLServerTaskOutputDatabaseLevel) AsBasicConnectToSourceSQLServerTaskOutput() (BasicConnectToSourceSQLServerTaskOutput, bool) { + return &ctssstodl, true +} + +// ConnectToSourceSQLServerTaskOutputLoginLevel login level output for the task that validates connection +// to SQL Server and also validates source server requirements +type ConnectToSourceSQLServerTaskOutputLoginLevel struct { + // Name - READ-ONLY; Login name. + Name *string `json:"name,omitempty"` + // LoginType - READ-ONLY; The type of login. Possible values include: 'WindowsUser', 'WindowsGroup', 'SQLLogin', 'Certificate', 'AsymmetricKey', 'ExternalUser', 'ExternalGroup' + LoginType LoginType `json:"loginType,omitempty"` + // DefaultDatabase - READ-ONLY; The default database for the login. + DefaultDatabase *string `json:"defaultDatabase,omitempty"` + // IsEnabled - READ-ONLY; The state of the login. + IsEnabled *bool `json:"isEnabled,omitempty"` + // MigrationEligibility - READ-ONLY; Information about eligibility of login for migration. + MigrationEligibility *MigrationEligibilityInfo `json:"migrationEligibility,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeConnectToSourceSQLServerTaskOutput', 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeAgentJobLevelOutput', 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeLoginLevelOutput', 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeTaskLevelOutput' + ResultType ResultTypeBasicConnectToSourceSQLServerTaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for ConnectToSourceSQLServerTaskOutputLoginLevel. +func (ctssstoll ConnectToSourceSQLServerTaskOutputLoginLevel) MarshalJSON() ([]byte, error) { + ctssstoll.ResultType = ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeLoginLevelOutput + objectMap := make(map[string]interface{}) + if ctssstoll.ResultType != "" { + objectMap["resultType"] = ctssstoll.ResultType + } + return json.Marshal(objectMap) +} + +// AsConnectToSourceSQLServerTaskOutputAgentJobLevel is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputLoginLevel. +func (ctssstoll ConnectToSourceSQLServerTaskOutputLoginLevel) AsConnectToSourceSQLServerTaskOutputAgentJobLevel() (*ConnectToSourceSQLServerTaskOutputAgentJobLevel, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskOutputLoginLevel is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputLoginLevel. +func (ctssstoll ConnectToSourceSQLServerTaskOutputLoginLevel) AsConnectToSourceSQLServerTaskOutputLoginLevel() (*ConnectToSourceSQLServerTaskOutputLoginLevel, bool) { + return &ctssstoll, true +} + +// AsConnectToSourceSQLServerTaskOutputDatabaseLevel is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputLoginLevel. +func (ctssstoll ConnectToSourceSQLServerTaskOutputLoginLevel) AsConnectToSourceSQLServerTaskOutputDatabaseLevel() (*ConnectToSourceSQLServerTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskOutputTaskLevel is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputLoginLevel. +func (ctssstoll ConnectToSourceSQLServerTaskOutputLoginLevel) AsConnectToSourceSQLServerTaskOutputTaskLevel() (*ConnectToSourceSQLServerTaskOutputTaskLevel, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskOutput is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputLoginLevel. +func (ctssstoll ConnectToSourceSQLServerTaskOutputLoginLevel) AsConnectToSourceSQLServerTaskOutput() (*ConnectToSourceSQLServerTaskOutput, bool) { + return nil, false +} + +// AsBasicConnectToSourceSQLServerTaskOutput is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputLoginLevel. +func (ctssstoll ConnectToSourceSQLServerTaskOutputLoginLevel) AsBasicConnectToSourceSQLServerTaskOutput() (BasicConnectToSourceSQLServerTaskOutput, bool) { + return &ctssstoll, true +} + +// ConnectToSourceSQLServerTaskOutputTaskLevel task level output for the task that validates connection to +// SQL Server and also validates source server requirements +type ConnectToSourceSQLServerTaskOutputTaskLevel struct { + // Databases - READ-ONLY; Source databases as a map from database name to database id + Databases map[string]*string `json:"databases"` + // Logins - READ-ONLY; Source logins as a map from login name to login id. + Logins map[string]*string `json:"logins"` + // AgentJobs - READ-ONLY; Source agent jobs as a map from agent job name to id. + AgentJobs map[string]*string `json:"agentJobs"` + // SourceServerVersion - READ-ONLY; Source server version + SourceServerVersion *string `json:"sourceServerVersion,omitempty"` + // SourceServerBrandVersion - READ-ONLY; Source server brand version + SourceServerBrandVersion *string `json:"sourceServerBrandVersion,omitempty"` + // ValidationErrors - READ-ONLY; Validation errors + ValidationErrors *[]ReportableException `json:"validationErrors,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeConnectToSourceSQLServerTaskOutput', 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeAgentJobLevelOutput', 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeLoginLevelOutput', 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeTaskLevelOutput' + ResultType ResultTypeBasicConnectToSourceSQLServerTaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for ConnectToSourceSQLServerTaskOutputTaskLevel. +func (ctssstotl ConnectToSourceSQLServerTaskOutputTaskLevel) MarshalJSON() ([]byte, error) { + ctssstotl.ResultType = ResultTypeBasicConnectToSourceSQLServerTaskOutputResultTypeTaskLevelOutput + objectMap := make(map[string]interface{}) + if ctssstotl.ResultType != "" { + objectMap["resultType"] = ctssstotl.ResultType + } + return json.Marshal(objectMap) +} + +// AsConnectToSourceSQLServerTaskOutputAgentJobLevel is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputTaskLevel. +func (ctssstotl ConnectToSourceSQLServerTaskOutputTaskLevel) AsConnectToSourceSQLServerTaskOutputAgentJobLevel() (*ConnectToSourceSQLServerTaskOutputAgentJobLevel, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskOutputLoginLevel is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputTaskLevel. +func (ctssstotl ConnectToSourceSQLServerTaskOutputTaskLevel) AsConnectToSourceSQLServerTaskOutputLoginLevel() (*ConnectToSourceSQLServerTaskOutputLoginLevel, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskOutputDatabaseLevel is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputTaskLevel. +func (ctssstotl ConnectToSourceSQLServerTaskOutputTaskLevel) AsConnectToSourceSQLServerTaskOutputDatabaseLevel() (*ConnectToSourceSQLServerTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskOutputTaskLevel is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputTaskLevel. +func (ctssstotl ConnectToSourceSQLServerTaskOutputTaskLevel) AsConnectToSourceSQLServerTaskOutputTaskLevel() (*ConnectToSourceSQLServerTaskOutputTaskLevel, bool) { + return &ctssstotl, true +} + +// AsConnectToSourceSQLServerTaskOutput is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputTaskLevel. +func (ctssstotl ConnectToSourceSQLServerTaskOutputTaskLevel) AsConnectToSourceSQLServerTaskOutput() (*ConnectToSourceSQLServerTaskOutput, bool) { + return nil, false +} + +// AsBasicConnectToSourceSQLServerTaskOutput is the BasicConnectToSourceSQLServerTaskOutput implementation for ConnectToSourceSQLServerTaskOutputTaskLevel. +func (ctssstotl ConnectToSourceSQLServerTaskOutputTaskLevel) AsBasicConnectToSourceSQLServerTaskOutput() (BasicConnectToSourceSQLServerTaskOutput, bool) { + return &ctssstotl, true +} + +// ConnectToSourceSQLServerTaskProperties properties for the task that validates connection to SQL Server +// and also validates source server requirements +type ConnectToSourceSQLServerTaskProperties struct { + // Input - Task input + Input *ConnectToSourceSQLServerTaskInput `json:"input,omitempty"` + // Output - READ-ONLY; Task output. This is ignored if submitted. + Output *[]BasicConnectToSourceSQLServerTaskOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the task. This is ignored if submitted. Possible values include: 'TaskStateUnknown', 'TaskStateQueued', 'TaskStateRunning', 'TaskStateCanceled', 'TaskStateSucceeded', 'TaskStateFailed', 'TaskStateFailedInputValidation', 'TaskStateFaulted' + State TaskState `json:"state,omitempty"` + // Commands - READ-ONLY; Array of command properties. + Commands *[]BasicCommandProperties `json:"commands,omitempty"` + // TaskType - Possible values include: 'TaskTypeProjectTaskProperties', 'TaskTypeGetTDECertificatesSQL', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI', 'TaskTypeValidateMigrationInputSQLServerSQLDbSync', 'TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync', 'TaskTypeMigrateMySQLAzureDbForMySQLSync', 'TaskTypeMigrateSQLServerAzureSQLDbSync', 'TaskTypeMigrateSQLServerSQLDb', 'TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS', 'TaskTypeMigrateSQLServerAzureSQLDbMI', 'TaskTypeConnectToTargetAzureDbForMySQL', 'TaskTypeConnectToTargetAzureSQLDbMISyncLRS', 'TaskTypeConnectToTargetAzureSQLDbMI', 'TaskTypeGetUserTablesAzureSQLDbSync', 'TaskTypeGetUserTablesSQL', 'TaskTypeConnectToTargetAzureDbForPostgreSQLSync', 'TaskTypeConnectToTargetSQLDbSync', 'TaskTypeConnectToTargetSQLDb', 'TaskTypeConnectToSourcePostgreSQLSync', 'TaskTypeConnectToSourceSQLServerSync', 'TaskTypeConnectToSourceSQLServer', 'TaskTypeConnectToSourceMySQL' + TaskType TaskType `json:"taskType,omitempty"` +} + +// MarshalJSON is the custom marshaler for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) MarshalJSON() ([]byte, error) { + ctssstp.TaskType = TaskTypeConnectToSourceSQLServer + objectMap := make(map[string]interface{}) + if ctssstp.Input != nil { + objectMap["input"] = ctssstp.Input + } + if ctssstp.TaskType != "" { + objectMap["taskType"] = ctssstp.TaskType + } + return json.Marshal(objectMap) +} + +// AsGetTdeCertificatesSQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForMySQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourcePostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) { + return &ctssstp, true +} + +// AsConnectToSourceMySQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) { + return nil, false +} + +// AsProjectTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsProjectTaskProperties() (*ProjectTaskProperties, bool) { + return nil, false +} + +// AsBasicProjectTaskProperties is the BasicProjectTaskProperties implementation for ConnectToSourceSQLServerTaskProperties. +func (ctssstp ConnectToSourceSQLServerTaskProperties) AsBasicProjectTaskProperties() (BasicProjectTaskProperties, bool) { + return &ctssstp, true +} + +// UnmarshalJSON is the custom unmarshaler for ConnectToSourceSQLServerTaskProperties struct. +func (ctssstp *ConnectToSourceSQLServerTaskProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "input": + if v != nil { + var input ConnectToSourceSQLServerTaskInput + err = json.Unmarshal(*v, &input) + if err != nil { + return err + } + ctssstp.Input = &input + } + case "output": + if v != nil { + output, err := unmarshalBasicConnectToSourceSQLServerTaskOutputArray(*v) + if err != nil { + return err + } + ctssstp.Output = &output + } + case "errors": + if v != nil { + var errorsVar []ODataError + err = json.Unmarshal(*v, &errorsVar) + if err != nil { + return err + } + ctssstp.Errors = &errorsVar + } + case "state": + if v != nil { + var state TaskState + err = json.Unmarshal(*v, &state) + if err != nil { + return err + } + ctssstp.State = state + } + case "commands": + if v != nil { + commands, err := unmarshalBasicCommandPropertiesArray(*v) + if err != nil { + return err + } + ctssstp.Commands = &commands + } + case "taskType": + if v != nil { + var taskType TaskType + err = json.Unmarshal(*v, &taskType) + if err != nil { + return err + } + ctssstp.TaskType = taskType + } + } + } + + return nil +} + +// ConnectToTargetAzureDbForMySQLTaskInput input for the task that validates connection to Azure Database +// for MySQL and target server requirements +type ConnectToTargetAzureDbForMySQLTaskInput struct { + // SourceConnectionInfo - Connection information for source MySQL server + SourceConnectionInfo *MySQLConnectionInfo `json:"sourceConnectionInfo,omitempty"` + // TargetConnectionInfo - Connection information for target Azure Database for MySQL server + TargetConnectionInfo *MySQLConnectionInfo `json:"targetConnectionInfo,omitempty"` +} + +// ConnectToTargetAzureDbForMySQLTaskOutput output for the task that validates connection to Azure Database +// for MySQL and target server requirements +type ConnectToTargetAzureDbForMySQLTaskOutput struct { + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ServerVersion - READ-ONLY; Version of the target server + ServerVersion *string `json:"serverVersion,omitempty"` + // Databases - READ-ONLY; List of databases on target server + Databases *[]string `json:"databases,omitempty"` + // TargetServerBrandVersion - READ-ONLY; Target server brand version + TargetServerBrandVersion *string `json:"targetServerBrandVersion,omitempty"` + // ValidationErrors - READ-ONLY; Validation errors associated with the task + ValidationErrors *[]ReportableException `json:"validationErrors,omitempty"` +} + +// ConnectToTargetAzureDbForMySQLTaskProperties properties for the task that validates connection to Azure +// Database for MySQL and target server requirements +type ConnectToTargetAzureDbForMySQLTaskProperties struct { + // Input - Task input + Input *ConnectToTargetAzureDbForMySQLTaskInput `json:"input,omitempty"` + // Output - READ-ONLY; Task output. This is ignored if submitted. + Output *[]ConnectToTargetAzureDbForMySQLTaskOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the task. This is ignored if submitted. Possible values include: 'TaskStateUnknown', 'TaskStateQueued', 'TaskStateRunning', 'TaskStateCanceled', 'TaskStateSucceeded', 'TaskStateFailed', 'TaskStateFailedInputValidation', 'TaskStateFaulted' + State TaskState `json:"state,omitempty"` + // Commands - READ-ONLY; Array of command properties. + Commands *[]BasicCommandProperties `json:"commands,omitempty"` + // TaskType - Possible values include: 'TaskTypeProjectTaskProperties', 'TaskTypeGetTDECertificatesSQL', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI', 'TaskTypeValidateMigrationInputSQLServerSQLDbSync', 'TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync', 'TaskTypeMigrateMySQLAzureDbForMySQLSync', 'TaskTypeMigrateSQLServerAzureSQLDbSync', 'TaskTypeMigrateSQLServerSQLDb', 'TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS', 'TaskTypeMigrateSQLServerAzureSQLDbMI', 'TaskTypeConnectToTargetAzureDbForMySQL', 'TaskTypeConnectToTargetAzureSQLDbMISyncLRS', 'TaskTypeConnectToTargetAzureSQLDbMI', 'TaskTypeGetUserTablesAzureSQLDbSync', 'TaskTypeGetUserTablesSQL', 'TaskTypeConnectToTargetAzureDbForPostgreSQLSync', 'TaskTypeConnectToTargetSQLDbSync', 'TaskTypeConnectToTargetSQLDb', 'TaskTypeConnectToSourcePostgreSQLSync', 'TaskTypeConnectToSourceSQLServerSync', 'TaskTypeConnectToSourceSQLServer', 'TaskTypeConnectToSourceMySQL' + TaskType TaskType `json:"taskType,omitempty"` +} + +// MarshalJSON is the custom marshaler for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) MarshalJSON() ([]byte, error) { + cttadfmstp.TaskType = TaskTypeConnectToTargetAzureDbForMySQL + objectMap := make(map[string]interface{}) + if cttadfmstp.Input != nil { + objectMap["input"] = cttadfmstp.Input + } + if cttadfmstp.TaskType != "" { + objectMap["taskType"] = cttadfmstp.TaskType + } + return json.Marshal(objectMap) +} + +// AsGetTdeCertificatesSQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForMySQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) { + return &cttadfmstp, true +} + +// AsConnectToTargetSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourcePostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceMySQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) { + return nil, false +} + +// AsProjectTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsProjectTaskProperties() (*ProjectTaskProperties, bool) { + return nil, false +} + +// AsBasicProjectTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForMySQLTaskProperties. +func (cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties) AsBasicProjectTaskProperties() (BasicProjectTaskProperties, bool) { + return &cttadfmstp, true +} + +// UnmarshalJSON is the custom unmarshaler for ConnectToTargetAzureDbForMySQLTaskProperties struct. +func (cttadfmstp *ConnectToTargetAzureDbForMySQLTaskProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "input": + if v != nil { + var input ConnectToTargetAzureDbForMySQLTaskInput + err = json.Unmarshal(*v, &input) + if err != nil { + return err + } + cttadfmstp.Input = &input + } + case "output": + if v != nil { + var output []ConnectToTargetAzureDbForMySQLTaskOutput + err = json.Unmarshal(*v, &output) + if err != nil { + return err + } + cttadfmstp.Output = &output + } + case "errors": + if v != nil { + var errorsVar []ODataError + err = json.Unmarshal(*v, &errorsVar) + if err != nil { + return err + } + cttadfmstp.Errors = &errorsVar + } + case "state": + if v != nil { + var state TaskState + err = json.Unmarshal(*v, &state) + if err != nil { + return err + } + cttadfmstp.State = state + } + case "commands": + if v != nil { + commands, err := unmarshalBasicCommandPropertiesArray(*v) + if err != nil { + return err + } + cttadfmstp.Commands = &commands + } + case "taskType": + if v != nil { + var taskType TaskType + err = json.Unmarshal(*v, &taskType) + if err != nil { + return err + } + cttadfmstp.TaskType = taskType + } + } + } + + return nil +} + +// ConnectToTargetAzureDbForPostgreSQLSyncTaskInput input for the task that validates connection to Azure +// Database for PostgreSQL and target server requirements +type ConnectToTargetAzureDbForPostgreSQLSyncTaskInput struct { + // SourceConnectionInfo - Connection information for source PostgreSQL server + SourceConnectionInfo *PostgreSQLConnectionInfo `json:"sourceConnectionInfo,omitempty"` + // TargetConnectionInfo - Connection information for target Azure Database for PostgreSQL server + TargetConnectionInfo *PostgreSQLConnectionInfo `json:"targetConnectionInfo,omitempty"` +} + +// ConnectToTargetAzureDbForPostgreSQLSyncTaskOutput output for the task that validates connection to Azure +// Database for PostgreSQL and target server requirements +type ConnectToTargetAzureDbForPostgreSQLSyncTaskOutput struct { + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // TargetServerVersion - READ-ONLY; Version of the target server + TargetServerVersion *string `json:"targetServerVersion,omitempty"` + // Databases - READ-ONLY; List of databases on target server + Databases *[]string `json:"databases,omitempty"` + // TargetServerBrandVersion - READ-ONLY; Target server brand version + TargetServerBrandVersion *string `json:"targetServerBrandVersion,omitempty"` + // ValidationErrors - READ-ONLY; Validation errors associated with the task + ValidationErrors *[]ReportableException `json:"validationErrors,omitempty"` +} + +// ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties properties for the task that validates connection +// to Azure Database For PostgreSQL server and target server requirements for online migration +type ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties struct { + // Input - Task input + Input *ConnectToTargetAzureDbForPostgreSQLSyncTaskInput `json:"input,omitempty"` + // Output - READ-ONLY; Task output. This is ignored if submitted. + Output *[]ConnectToTargetAzureDbForPostgreSQLSyncTaskOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the task. This is ignored if submitted. Possible values include: 'TaskStateUnknown', 'TaskStateQueued', 'TaskStateRunning', 'TaskStateCanceled', 'TaskStateSucceeded', 'TaskStateFailed', 'TaskStateFailedInputValidation', 'TaskStateFaulted' + State TaskState `json:"state,omitempty"` + // Commands - READ-ONLY; Array of command properties. + Commands *[]BasicCommandProperties `json:"commands,omitempty"` + // TaskType - Possible values include: 'TaskTypeProjectTaskProperties', 'TaskTypeGetTDECertificatesSQL', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI', 'TaskTypeValidateMigrationInputSQLServerSQLDbSync', 'TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync', 'TaskTypeMigrateMySQLAzureDbForMySQLSync', 'TaskTypeMigrateSQLServerAzureSQLDbSync', 'TaskTypeMigrateSQLServerSQLDb', 'TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS', 'TaskTypeMigrateSQLServerAzureSQLDbMI', 'TaskTypeConnectToTargetAzureDbForMySQL', 'TaskTypeConnectToTargetAzureSQLDbMISyncLRS', 'TaskTypeConnectToTargetAzureSQLDbMI', 'TaskTypeGetUserTablesAzureSQLDbSync', 'TaskTypeGetUserTablesSQL', 'TaskTypeConnectToTargetAzureDbForPostgreSQLSync', 'TaskTypeConnectToTargetSQLDbSync', 'TaskTypeConnectToTargetSQLDb', 'TaskTypeConnectToSourcePostgreSQLSync', 'TaskTypeConnectToSourceSQLServerSync', 'TaskTypeConnectToSourceSQLServer', 'TaskTypeConnectToSourceMySQL' + TaskType TaskType `json:"taskType,omitempty"` +} + +// MarshalJSON is the custom marshaler for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) MarshalJSON() ([]byte, error) { + cttadfpsstp.TaskType = TaskTypeConnectToTargetAzureDbForPostgreSQLSync + objectMap := make(map[string]interface{}) + if cttadfpsstp.Input != nil { + objectMap["input"] = cttadfpsstp.Input + } + if cttadfpsstp.TaskType != "" { + objectMap["taskType"] = cttadfpsstp.TaskType + } + return json.Marshal(objectMap) +} + +// AsGetTdeCertificatesSQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForMySQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) { + return &cttadfpsstp, true +} + +// AsConnectToTargetSQLSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourcePostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceMySQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) { + return nil, false +} + +// AsProjectTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsProjectTaskProperties() (*ProjectTaskProperties, bool) { + return nil, false +} + +// AsBasicProjectTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties. +func (cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) AsBasicProjectTaskProperties() (BasicProjectTaskProperties, bool) { + return &cttadfpsstp, true +} + +// UnmarshalJSON is the custom unmarshaler for ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties struct. +func (cttadfpsstp *ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "input": + if v != nil { + var input ConnectToTargetAzureDbForPostgreSQLSyncTaskInput + err = json.Unmarshal(*v, &input) + if err != nil { + return err + } + cttadfpsstp.Input = &input + } + case "output": + if v != nil { + var output []ConnectToTargetAzureDbForPostgreSQLSyncTaskOutput + err = json.Unmarshal(*v, &output) + if err != nil { + return err + } + cttadfpsstp.Output = &output + } + case "errors": + if v != nil { + var errorsVar []ODataError + err = json.Unmarshal(*v, &errorsVar) + if err != nil { + return err + } + cttadfpsstp.Errors = &errorsVar + } + case "state": + if v != nil { + var state TaskState + err = json.Unmarshal(*v, &state) + if err != nil { + return err + } + cttadfpsstp.State = state + } + case "commands": + if v != nil { + commands, err := unmarshalBasicCommandPropertiesArray(*v) + if err != nil { + return err + } + cttadfpsstp.Commands = &commands + } + case "taskType": + if v != nil { + var taskType TaskType + err = json.Unmarshal(*v, &taskType) + if err != nil { + return err + } + cttadfpsstp.TaskType = taskType + } + } + } + + return nil +} + +// ConnectToTargetSQLDbTaskInput input for the task that validates connection to SQL DB and target server +// requirements +type ConnectToTargetSQLDbTaskInput struct { + // TargetConnectionInfo - Connection information for target SQL DB + TargetConnectionInfo *SQLConnectionInfo `json:"targetConnectionInfo,omitempty"` +} + +// ConnectToTargetSQLDbTaskOutput output for the task that validates connection to SQL DB and target server +// requirements +type ConnectToTargetSQLDbTaskOutput struct { + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // Databases - READ-ONLY; Source databases as a map from database name to database id + Databases map[string]*string `json:"databases"` + // TargetServerVersion - READ-ONLY; Version of the target server + TargetServerVersion *string `json:"targetServerVersion,omitempty"` + // TargetServerBrandVersion - READ-ONLY; Target server brand version + TargetServerBrandVersion *string `json:"targetServerBrandVersion,omitempty"` +} + +// MarshalJSON is the custom marshaler for ConnectToTargetSQLDbTaskOutput. +func (cttsdto ConnectToTargetSQLDbTaskOutput) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + return json.Marshal(objectMap) +} + +// ConnectToTargetSQLDbTaskProperties properties for the task that validates connection to SQL DB and +// target server requirements +type ConnectToTargetSQLDbTaskProperties struct { + // Input - Task input + Input *ConnectToTargetSQLDbTaskInput `json:"input,omitempty"` + // Output - READ-ONLY; Task output. This is ignored if submitted. + Output *[]ConnectToTargetSQLDbTaskOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the task. This is ignored if submitted. Possible values include: 'TaskStateUnknown', 'TaskStateQueued', 'TaskStateRunning', 'TaskStateCanceled', 'TaskStateSucceeded', 'TaskStateFailed', 'TaskStateFailedInputValidation', 'TaskStateFaulted' + State TaskState `json:"state,omitempty"` + // Commands - READ-ONLY; Array of command properties. + Commands *[]BasicCommandProperties `json:"commands,omitempty"` + // TaskType - Possible values include: 'TaskTypeProjectTaskProperties', 'TaskTypeGetTDECertificatesSQL', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI', 'TaskTypeValidateMigrationInputSQLServerSQLDbSync', 'TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync', 'TaskTypeMigrateMySQLAzureDbForMySQLSync', 'TaskTypeMigrateSQLServerAzureSQLDbSync', 'TaskTypeMigrateSQLServerSQLDb', 'TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS', 'TaskTypeMigrateSQLServerAzureSQLDbMI', 'TaskTypeConnectToTargetAzureDbForMySQL', 'TaskTypeConnectToTargetAzureSQLDbMISyncLRS', 'TaskTypeConnectToTargetAzureSQLDbMI', 'TaskTypeGetUserTablesAzureSQLDbSync', 'TaskTypeGetUserTablesSQL', 'TaskTypeConnectToTargetAzureDbForPostgreSQLSync', 'TaskTypeConnectToTargetSQLDbSync', 'TaskTypeConnectToTargetSQLDb', 'TaskTypeConnectToSourcePostgreSQLSync', 'TaskTypeConnectToSourceSQLServerSync', 'TaskTypeConnectToSourceSQLServer', 'TaskTypeConnectToSourceMySQL' + TaskType TaskType `json:"taskType,omitempty"` +} + +// MarshalJSON is the custom marshaler for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) MarshalJSON() ([]byte, error) { + cttsdtp.TaskType = TaskTypeConnectToTargetSQLDb + objectMap := make(map[string]interface{}) + if cttsdtp.Input != nil { + objectMap["input"] = cttsdtp.Input + } + if cttsdtp.TaskType != "" { + objectMap["taskType"] = cttsdtp.TaskType + } + return json.Marshal(objectMap) +} + +// AsGetTdeCertificatesSQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForMySQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) { + return &cttsdtp, true +} + +// AsConnectToSourcePostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceMySQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) { + return nil, false +} + +// AsProjectTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsProjectTaskProperties() (*ProjectTaskProperties, bool) { + return nil, false +} + +// AsBasicProjectTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLDbTaskProperties. +func (cttsdtp ConnectToTargetSQLDbTaskProperties) AsBasicProjectTaskProperties() (BasicProjectTaskProperties, bool) { + return &cttsdtp, true +} + +// UnmarshalJSON is the custom unmarshaler for ConnectToTargetSQLDbTaskProperties struct. +func (cttsdtp *ConnectToTargetSQLDbTaskProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "input": + if v != nil { + var input ConnectToTargetSQLDbTaskInput + err = json.Unmarshal(*v, &input) + if err != nil { + return err + } + cttsdtp.Input = &input + } + case "output": + if v != nil { + var output []ConnectToTargetSQLDbTaskOutput + err = json.Unmarshal(*v, &output) + if err != nil { + return err + } + cttsdtp.Output = &output + } + case "errors": + if v != nil { + var errorsVar []ODataError + err = json.Unmarshal(*v, &errorsVar) + if err != nil { + return err + } + cttsdtp.Errors = &errorsVar + } + case "state": + if v != nil { + var state TaskState + err = json.Unmarshal(*v, &state) + if err != nil { + return err + } + cttsdtp.State = state + } + case "commands": + if v != nil { + commands, err := unmarshalBasicCommandPropertiesArray(*v) + if err != nil { + return err + } + cttsdtp.Commands = &commands + } + case "taskType": + if v != nil { + var taskType TaskType + err = json.Unmarshal(*v, &taskType) + if err != nil { + return err + } + cttsdtp.TaskType = taskType + } + } + } + + return nil +} + +// ConnectToTargetSQLMISyncTaskInput input for the task that validates connection to Azure SQL Database +// Managed Instance online scenario. +type ConnectToTargetSQLMISyncTaskInput struct { + // TargetConnectionInfo - Connection information for Azure SQL Database Managed Instance + TargetConnectionInfo *MiSQLConnectionInfo `json:"targetConnectionInfo,omitempty"` + // AzureApp - Azure Active Directory Application the DMS instance will use to connect to the target instance of Azure SQL Database Managed Instance and the Azure Storage Account + AzureApp *AzureActiveDirectoryApp `json:"azureApp,omitempty"` +} + +// ConnectToTargetSQLMISyncTaskOutput output for the task that validates connection to Azure SQL Database +// Managed Instance. +type ConnectToTargetSQLMISyncTaskOutput struct { + // TargetServerVersion - READ-ONLY; Target server version + TargetServerVersion *string `json:"targetServerVersion,omitempty"` + // TargetServerBrandVersion - READ-ONLY; Target server brand version + TargetServerBrandVersion *string `json:"targetServerBrandVersion,omitempty"` + // ValidationErrors - READ-ONLY; Validation errors + ValidationErrors *[]ReportableException `json:"validationErrors,omitempty"` +} + +// ConnectToTargetSQLMISyncTaskProperties properties for the task that validates connection to Azure SQL +// Database Managed Instance +type ConnectToTargetSQLMISyncTaskProperties struct { + // Input - Task input + Input *ConnectToTargetSQLMISyncTaskInput `json:"input,omitempty"` + // Output - READ-ONLY; Task output. This is ignored if submitted. + Output *[]ConnectToTargetSQLMISyncTaskOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the task. This is ignored if submitted. Possible values include: 'TaskStateUnknown', 'TaskStateQueued', 'TaskStateRunning', 'TaskStateCanceled', 'TaskStateSucceeded', 'TaskStateFailed', 'TaskStateFailedInputValidation', 'TaskStateFaulted' + State TaskState `json:"state,omitempty"` + // Commands - READ-ONLY; Array of command properties. + Commands *[]BasicCommandProperties `json:"commands,omitempty"` + // TaskType - Possible values include: 'TaskTypeProjectTaskProperties', 'TaskTypeGetTDECertificatesSQL', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI', 'TaskTypeValidateMigrationInputSQLServerSQLDbSync', 'TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync', 'TaskTypeMigrateMySQLAzureDbForMySQLSync', 'TaskTypeMigrateSQLServerAzureSQLDbSync', 'TaskTypeMigrateSQLServerSQLDb', 'TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS', 'TaskTypeMigrateSQLServerAzureSQLDbMI', 'TaskTypeConnectToTargetAzureDbForMySQL', 'TaskTypeConnectToTargetAzureSQLDbMISyncLRS', 'TaskTypeConnectToTargetAzureSQLDbMI', 'TaskTypeGetUserTablesAzureSQLDbSync', 'TaskTypeGetUserTablesSQL', 'TaskTypeConnectToTargetAzureDbForPostgreSQLSync', 'TaskTypeConnectToTargetSQLDbSync', 'TaskTypeConnectToTargetSQLDb', 'TaskTypeConnectToSourcePostgreSQLSync', 'TaskTypeConnectToSourceSQLServerSync', 'TaskTypeConnectToSourceSQLServer', 'TaskTypeConnectToSourceMySQL' + TaskType TaskType `json:"taskType,omitempty"` +} + +// MarshalJSON is the custom marshaler for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) MarshalJSON() ([]byte, error) { + cttsmstp.TaskType = TaskTypeConnectToTargetAzureSQLDbMISyncLRS + objectMap := make(map[string]interface{}) + if cttsmstp.Input != nil { + objectMap["input"] = cttsmstp.Input + } + if cttsmstp.TaskType != "" { + objectMap["taskType"] = cttsmstp.TaskType + } + return json.Marshal(objectMap) +} + +// AsGetTdeCertificatesSQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForMySQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) { + return &cttsmstp, true +} + +// AsConnectToTargetSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourcePostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceMySQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) { + return nil, false +} + +// AsProjectTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsProjectTaskProperties() (*ProjectTaskProperties, bool) { + return nil, false +} + +// AsBasicProjectTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMISyncTaskProperties. +func (cttsmstp ConnectToTargetSQLMISyncTaskProperties) AsBasicProjectTaskProperties() (BasicProjectTaskProperties, bool) { + return &cttsmstp, true +} + +// UnmarshalJSON is the custom unmarshaler for ConnectToTargetSQLMISyncTaskProperties struct. +func (cttsmstp *ConnectToTargetSQLMISyncTaskProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "input": + if v != nil { + var input ConnectToTargetSQLMISyncTaskInput + err = json.Unmarshal(*v, &input) + if err != nil { + return err + } + cttsmstp.Input = &input + } + case "output": + if v != nil { + var output []ConnectToTargetSQLMISyncTaskOutput + err = json.Unmarshal(*v, &output) + if err != nil { + return err + } + cttsmstp.Output = &output + } + case "errors": + if v != nil { + var errorsVar []ODataError + err = json.Unmarshal(*v, &errorsVar) + if err != nil { + return err + } + cttsmstp.Errors = &errorsVar + } + case "state": + if v != nil { + var state TaskState + err = json.Unmarshal(*v, &state) + if err != nil { + return err + } + cttsmstp.State = state + } + case "commands": + if v != nil { + commands, err := unmarshalBasicCommandPropertiesArray(*v) + if err != nil { + return err + } + cttsmstp.Commands = &commands + } + case "taskType": + if v != nil { + var taskType TaskType + err = json.Unmarshal(*v, &taskType) + if err != nil { + return err + } + cttsmstp.TaskType = taskType + } + } + } + + return nil +} + +// ConnectToTargetSQLMITaskInput input for the task that validates connection to Azure SQL Database Managed +// Instance. +type ConnectToTargetSQLMITaskInput struct { + // TargetConnectionInfo - Connection information for target SQL Server + TargetConnectionInfo *SQLConnectionInfo `json:"targetConnectionInfo,omitempty"` +} + +// ConnectToTargetSQLMITaskOutput output for the task that validates connection to Azure SQL Database +// Managed Instance. +type ConnectToTargetSQLMITaskOutput struct { + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // TargetServerVersion - READ-ONLY; Target server version + TargetServerVersion *string `json:"targetServerVersion,omitempty"` + // TargetServerBrandVersion - READ-ONLY; Target server brand version + TargetServerBrandVersion *string `json:"targetServerBrandVersion,omitempty"` + // Logins - READ-ONLY; List of logins on the target server. + Logins *[]string `json:"logins,omitempty"` + // AgentJobs - READ-ONLY; List of agent jobs on the target server. + AgentJobs *[]string `json:"agentJobs,omitempty"` + // ValidationErrors - READ-ONLY; Validation errors + ValidationErrors *[]ReportableException `json:"validationErrors,omitempty"` +} + +// ConnectToTargetSQLMITaskProperties properties for the task that validates connection to Azure SQL +// Database Managed Instance +type ConnectToTargetSQLMITaskProperties struct { + // Input - Task input + Input *ConnectToTargetSQLMITaskInput `json:"input,omitempty"` + // Output - READ-ONLY; Task output. This is ignored if submitted. + Output *[]ConnectToTargetSQLMITaskOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the task. This is ignored if submitted. Possible values include: 'TaskStateUnknown', 'TaskStateQueued', 'TaskStateRunning', 'TaskStateCanceled', 'TaskStateSucceeded', 'TaskStateFailed', 'TaskStateFailedInputValidation', 'TaskStateFaulted' + State TaskState `json:"state,omitempty"` + // Commands - READ-ONLY; Array of command properties. + Commands *[]BasicCommandProperties `json:"commands,omitempty"` + // TaskType - Possible values include: 'TaskTypeProjectTaskProperties', 'TaskTypeGetTDECertificatesSQL', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI', 'TaskTypeValidateMigrationInputSQLServerSQLDbSync', 'TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync', 'TaskTypeMigrateMySQLAzureDbForMySQLSync', 'TaskTypeMigrateSQLServerAzureSQLDbSync', 'TaskTypeMigrateSQLServerSQLDb', 'TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS', 'TaskTypeMigrateSQLServerAzureSQLDbMI', 'TaskTypeConnectToTargetAzureDbForMySQL', 'TaskTypeConnectToTargetAzureSQLDbMISyncLRS', 'TaskTypeConnectToTargetAzureSQLDbMI', 'TaskTypeGetUserTablesAzureSQLDbSync', 'TaskTypeGetUserTablesSQL', 'TaskTypeConnectToTargetAzureDbForPostgreSQLSync', 'TaskTypeConnectToTargetSQLDbSync', 'TaskTypeConnectToTargetSQLDb', 'TaskTypeConnectToSourcePostgreSQLSync', 'TaskTypeConnectToSourceSQLServerSync', 'TaskTypeConnectToSourceSQLServer', 'TaskTypeConnectToSourceMySQL' + TaskType TaskType `json:"taskType,omitempty"` +} + +// MarshalJSON is the custom marshaler for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) MarshalJSON() ([]byte, error) { + cttsmtp.TaskType = TaskTypeConnectToTargetAzureSQLDbMI + objectMap := make(map[string]interface{}) + if cttsmtp.Input != nil { + objectMap["input"] = cttsmtp.Input + } + if cttsmtp.TaskType != "" { + objectMap["taskType"] = cttsmtp.TaskType + } + return json.Marshal(objectMap) +} + +// AsGetTdeCertificatesSQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForMySQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) { + return &cttsmtp, true +} + +// AsGetUserTablesSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourcePostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceMySQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) { + return nil, false +} + +// AsProjectTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsProjectTaskProperties() (*ProjectTaskProperties, bool) { + return nil, false +} + +// AsBasicProjectTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLMITaskProperties. +func (cttsmtp ConnectToTargetSQLMITaskProperties) AsBasicProjectTaskProperties() (BasicProjectTaskProperties, bool) { + return &cttsmtp, true +} + +// UnmarshalJSON is the custom unmarshaler for ConnectToTargetSQLMITaskProperties struct. +func (cttsmtp *ConnectToTargetSQLMITaskProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "input": + if v != nil { + var input ConnectToTargetSQLMITaskInput + err = json.Unmarshal(*v, &input) + if err != nil { + return err + } + cttsmtp.Input = &input + } + case "output": + if v != nil { + var output []ConnectToTargetSQLMITaskOutput + err = json.Unmarshal(*v, &output) + if err != nil { + return err + } + cttsmtp.Output = &output + } + case "errors": + if v != nil { + var errorsVar []ODataError + err = json.Unmarshal(*v, &errorsVar) + if err != nil { + return err + } + cttsmtp.Errors = &errorsVar + } + case "state": + if v != nil { + var state TaskState + err = json.Unmarshal(*v, &state) + if err != nil { + return err + } + cttsmtp.State = state + } + case "commands": + if v != nil { + commands, err := unmarshalBasicCommandPropertiesArray(*v) + if err != nil { + return err + } + cttsmtp.Commands = &commands + } + case "taskType": + if v != nil { + var taskType TaskType + err = json.Unmarshal(*v, &taskType) + if err != nil { + return err + } + cttsmtp.TaskType = taskType + } + } + } + + return nil +} + +// ConnectToTargetSQLSQLDbSyncTaskInput input for the task that validates connection to Azure SQL DB and +// target server requirements +type ConnectToTargetSQLSQLDbSyncTaskInput struct { + // SourceConnectionInfo - Connection information for source SQL Server + SourceConnectionInfo *SQLConnectionInfo `json:"sourceConnectionInfo,omitempty"` + // TargetConnectionInfo - Connection information for target SQL DB + TargetConnectionInfo *SQLConnectionInfo `json:"targetConnectionInfo,omitempty"` +} + +// ConnectToTargetSQLSQLDbSyncTaskProperties properties for the task that validates connection to SQL DB +// and target server requirements for online migration +type ConnectToTargetSQLSQLDbSyncTaskProperties struct { + // Input - Task input + Input *ConnectToTargetSQLSQLDbSyncTaskInput `json:"input,omitempty"` + // Output - READ-ONLY; Task output. This is ignored if submitted. + Output *[]ConnectToTargetSQLDbTaskOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the task. This is ignored if submitted. Possible values include: 'TaskStateUnknown', 'TaskStateQueued', 'TaskStateRunning', 'TaskStateCanceled', 'TaskStateSucceeded', 'TaskStateFailed', 'TaskStateFailedInputValidation', 'TaskStateFaulted' + State TaskState `json:"state,omitempty"` + // Commands - READ-ONLY; Array of command properties. + Commands *[]BasicCommandProperties `json:"commands,omitempty"` + // TaskType - Possible values include: 'TaskTypeProjectTaskProperties', 'TaskTypeGetTDECertificatesSQL', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI', 'TaskTypeValidateMigrationInputSQLServerSQLDbSync', 'TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync', 'TaskTypeMigrateMySQLAzureDbForMySQLSync', 'TaskTypeMigrateSQLServerAzureSQLDbSync', 'TaskTypeMigrateSQLServerSQLDb', 'TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS', 'TaskTypeMigrateSQLServerAzureSQLDbMI', 'TaskTypeConnectToTargetAzureDbForMySQL', 'TaskTypeConnectToTargetAzureSQLDbMISyncLRS', 'TaskTypeConnectToTargetAzureSQLDbMI', 'TaskTypeGetUserTablesAzureSQLDbSync', 'TaskTypeGetUserTablesSQL', 'TaskTypeConnectToTargetAzureDbForPostgreSQLSync', 'TaskTypeConnectToTargetSQLDbSync', 'TaskTypeConnectToTargetSQLDb', 'TaskTypeConnectToSourcePostgreSQLSync', 'TaskTypeConnectToSourceSQLServerSync', 'TaskTypeConnectToSourceSQLServer', 'TaskTypeConnectToSourceMySQL' + TaskType TaskType `json:"taskType,omitempty"` +} + +// MarshalJSON is the custom marshaler for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) MarshalJSON() ([]byte, error) { + cttssdstp.TaskType = TaskTypeConnectToTargetSQLDbSync + objectMap := make(map[string]interface{}) + if cttssdstp.Input != nil { + objectMap["input"] = cttssdstp.Input + } + if cttssdstp.TaskType != "" { + objectMap["taskType"] = cttssdstp.TaskType + } + return json.Marshal(objectMap) +} + +// AsGetTdeCertificatesSQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForMySQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMITaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) { + return &cttssdstp, true +} + +// AsConnectToTargetSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourcePostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerSyncTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceMySQLTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) { + return nil, false +} + +// AsProjectTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsProjectTaskProperties() (*ProjectTaskProperties, bool) { + return nil, false +} + +// AsBasicProjectTaskProperties is the BasicProjectTaskProperties implementation for ConnectToTargetSQLSQLDbSyncTaskProperties. +func (cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties) AsBasicProjectTaskProperties() (BasicProjectTaskProperties, bool) { + return &cttssdstp, true +} + +// UnmarshalJSON is the custom unmarshaler for ConnectToTargetSQLSQLDbSyncTaskProperties struct. +func (cttssdstp *ConnectToTargetSQLSQLDbSyncTaskProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "input": + if v != nil { + var input ConnectToTargetSQLSQLDbSyncTaskInput + err = json.Unmarshal(*v, &input) + if err != nil { + return err + } + cttssdstp.Input = &input + } + case "output": + if v != nil { + var output []ConnectToTargetSQLDbTaskOutput + err = json.Unmarshal(*v, &output) + if err != nil { + return err + } + cttssdstp.Output = &output + } + case "errors": + if v != nil { + var errorsVar []ODataError + err = json.Unmarshal(*v, &errorsVar) + if err != nil { + return err + } + cttssdstp.Errors = &errorsVar + } + case "state": + if v != nil { + var state TaskState + err = json.Unmarshal(*v, &state) + if err != nil { + return err + } + cttssdstp.State = state + } + case "commands": + if v != nil { + commands, err := unmarshalBasicCommandPropertiesArray(*v) + if err != nil { + return err + } + cttssdstp.Commands = &commands + } + case "taskType": + if v != nil { + var taskType TaskType + err = json.Unmarshal(*v, &taskType) + if err != nil { + return err + } + cttssdstp.TaskType = taskType + } + } + } + + return nil +} + +// Database information about a single database +type Database struct { + // ID - READ-ONLY; Unique identifier for the database + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; Name of the database + Name *string `json:"name,omitempty"` + // CompatibilityLevel - READ-ONLY; SQL Server compatibility level of database. Possible values include: 'CompatLevel80', 'CompatLevel90', 'CompatLevel100', 'CompatLevel110', 'CompatLevel120', 'CompatLevel130', 'CompatLevel140' + CompatibilityLevel DatabaseCompatLevel `json:"compatibilityLevel,omitempty"` + // Collation - READ-ONLY; Collation name of the database + Collation *string `json:"collation,omitempty"` + // ServerName - READ-ONLY; Name of the server + ServerName *string `json:"serverName,omitempty"` + // Fqdn - READ-ONLY; Fully qualified name + Fqdn *string `json:"fqdn,omitempty"` + // InstallID - READ-ONLY; Install id of the database + InstallID *string `json:"installId,omitempty"` + // ServerVersion - READ-ONLY; Version of the server + ServerVersion *string `json:"serverVersion,omitempty"` + // ServerEdition - READ-ONLY; Edition of the server + ServerEdition *string `json:"serverEdition,omitempty"` + // ServerLevel - READ-ONLY; Product level of the server (RTM, SP, CTP). + ServerLevel *string `json:"serverLevel,omitempty"` + // ServerDefaultDataPath - READ-ONLY; Default path of the data files + ServerDefaultDataPath *string `json:"serverDefaultDataPath,omitempty"` + // ServerDefaultLogPath - READ-ONLY; Default path of the log files + ServerDefaultLogPath *string `json:"serverDefaultLogPath,omitempty"` + // ServerDefaultBackupPath - READ-ONLY; Default path of the backup folder + ServerDefaultBackupPath *string `json:"serverDefaultBackupPath,omitempty"` + // ServerCoreCount - READ-ONLY; Number of cores on the server + ServerCoreCount *int32 `json:"serverCoreCount,omitempty"` + // ServerVisibleOnlineCoreCount - READ-ONLY; Number of cores on the server that have VISIBLE ONLINE status + ServerVisibleOnlineCoreCount *int32 `json:"serverVisibleOnlineCoreCount,omitempty"` + // DatabaseState - READ-ONLY; State of the database. Possible values include: 'DatabaseStateOnline', 'DatabaseStateRestoring', 'DatabaseStateRecovering', 'DatabaseStateRecoveryPending', 'DatabaseStateSuspect', 'DatabaseStateEmergency', 'DatabaseStateOffline', 'DatabaseStateCopying', 'DatabaseStateOfflineSecondary' + DatabaseState DatabaseState `json:"databaseState,omitempty"` + // ServerID - READ-ONLY; The unique Server Id + ServerID *string `json:"serverId,omitempty"` +} + +// DatabaseBackupInfo information about backup files when existing backup mode is used. +type DatabaseBackupInfo struct { + // DatabaseName - READ-ONLY; Database name. + DatabaseName *string `json:"databaseName,omitempty"` + // BackupType - READ-ONLY; Backup Type. Possible values include: 'BackupTypeDatabase', 'BackupTypeTransactionLog', 'BackupTypeFile', 'BackupTypeDifferentialDatabase', 'BackupTypeDifferentialFile', 'BackupTypePartial', 'BackupTypeDifferentialPartial' + BackupType BackupType `json:"backupType,omitempty"` + // BackupFiles - READ-ONLY; The list of backup files for the current database. + BackupFiles *[]string `json:"backupFiles,omitempty"` + // Position - READ-ONLY; Position of current database backup in the file. + Position *int32 `json:"position,omitempty"` + // IsDamaged - READ-ONLY; Database was damaged when backed up, but the backup operation was requested to continue despite errors. + IsDamaged *bool `json:"isDamaged,omitempty"` + // IsCompressed - READ-ONLY; Whether the backup set is compressed + IsCompressed *bool `json:"isCompressed,omitempty"` + // FamilyCount - READ-ONLY; Number of files in the backup set. + FamilyCount *int32 `json:"familyCount,omitempty"` + // BackupFinishDate - READ-ONLY; Date and time when the backup operation finished. + BackupFinishDate *date.Time `json:"backupFinishDate,omitempty"` +} + +// DatabaseFileInfo database file specific information +type DatabaseFileInfo struct { + // DatabaseName - Name of the database + DatabaseName *string `json:"databaseName,omitempty"` + // ID - Unique identifier for database file + ID *string `json:"id,omitempty"` + // LogicalName - Logical name of the file + LogicalName *string `json:"logicalName,omitempty"` + // PhysicalFullName - Operating-system full path of the file + PhysicalFullName *string `json:"physicalFullName,omitempty"` + // RestoreFullName - Suggested full path of the file for restoring + RestoreFullName *string `json:"restoreFullName,omitempty"` + // FileType - Database file type. Possible values include: 'Rows', 'Log', 'Filestream', 'NotSupported', 'Fulltext' + FileType DatabaseFileType `json:"fileType,omitempty"` + // SizeMB - Size of the file in megabytes + SizeMB *float64 `json:"sizeMB,omitempty"` +} + +// DatabaseFileInput database file specific information for input +type DatabaseFileInput struct { + // ID - Unique identifier for database file + ID *string `json:"id,omitempty"` + // LogicalName - Logical name of the file + LogicalName *string `json:"logicalName,omitempty"` + // PhysicalFullName - Operating-system full path of the file + PhysicalFullName *string `json:"physicalFullName,omitempty"` + // RestoreFullName - Suggested full path of the file for restoring + RestoreFullName *string `json:"restoreFullName,omitempty"` + // FileType - Database file type. Possible values include: 'Rows', 'Log', 'Filestream', 'NotSupported', 'Fulltext' + FileType DatabaseFileType `json:"fileType,omitempty"` +} + +// DatabaseInfo project Database Details +type DatabaseInfo struct { + // SourceDatabaseName - Name of the database + SourceDatabaseName *string `json:"sourceDatabaseName,omitempty"` +} + +// DatabaseObjectName a representation of the name of an object in a database +type DatabaseObjectName struct { + // DatabaseName - READ-ONLY; The unescaped name of the database containing the object + DatabaseName *string `json:"databaseName,omitempty"` + // ObjectName - READ-ONLY; The unescaped name of the object + ObjectName *string `json:"objectName,omitempty"` + // SchemaName - READ-ONLY; The unescaped name of the schema containing the object + SchemaName *string `json:"schemaName,omitempty"` + // ObjectType - Type of the object in the database. Possible values include: 'StoredProcedures', 'Table', 'User', 'View', 'Function' + ObjectType ObjectType `json:"objectType,omitempty"` +} + +// DatabaseSummaryResult summary of database results in the migration +type DatabaseSummaryResult struct { + // SizeMB - READ-ONLY; Size of the database in megabytes + SizeMB *float64 `json:"sizeMB,omitempty"` + // Name - READ-ONLY; Name of the item + Name *string `json:"name,omitempty"` + // StartedOn - READ-ONLY; Migration start time + StartedOn *date.Time `json:"startedOn,omitempty"` + // EndedOn - READ-ONLY; Migration end time + EndedOn *date.Time `json:"endedOn,omitempty"` + // State - READ-ONLY; Current state of migration. Possible values include: 'MigrationStateNone', 'MigrationStateInProgress', 'MigrationStateFailed', 'MigrationStateWarning', 'MigrationStateCompleted', 'MigrationStateSkipped', 'MigrationStateStopped' + State MigrationState `json:"state,omitempty"` + // StatusMessage - READ-ONLY; Status message + StatusMessage *string `json:"statusMessage,omitempty"` + // ItemsCount - READ-ONLY; Number of items + ItemsCount *int64 `json:"itemsCount,omitempty"` + // ItemsCompletedCount - READ-ONLY; Number of successfully completed items + ItemsCompletedCount *int64 `json:"itemsCompletedCount,omitempty"` + // ErrorPrefix - READ-ONLY; Wildcard string prefix to use for querying all errors of the item + ErrorPrefix *string `json:"errorPrefix,omitempty"` + // ResultPrefix - READ-ONLY; Wildcard string prefix to use for querying all sub-tem results of the item + ResultPrefix *string `json:"resultPrefix,omitempty"` +} + +// DatabaseTable table properties +type DatabaseTable struct { + // HasRows - READ-ONLY; Indicates whether table is empty or not + HasRows *bool `json:"hasRows,omitempty"` + // Name - READ-ONLY; Schema-qualified name of the table + Name *string `json:"name,omitempty"` +} + +// DataIntegrityValidationResult results for checksum based Data Integrity validation results +type DataIntegrityValidationResult struct { + // FailedObjects - READ-ONLY; List of failed table names of source and target pair + FailedObjects map[string]*string `json:"failedObjects"` + // ValidationErrors - READ-ONLY; List of errors that happened while performing data integrity validation + ValidationErrors *ValidationError `json:"validationErrors,omitempty"` +} + +// MarshalJSON is the custom marshaler for DataIntegrityValidationResult. +func (divr DataIntegrityValidationResult) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + return json.Marshal(objectMap) +} + +// DataItemMigrationSummaryResult basic summary of a data item migration +type DataItemMigrationSummaryResult struct { + // Name - READ-ONLY; Name of the item + Name *string `json:"name,omitempty"` + // StartedOn - READ-ONLY; Migration start time + StartedOn *date.Time `json:"startedOn,omitempty"` + // EndedOn - READ-ONLY; Migration end time + EndedOn *date.Time `json:"endedOn,omitempty"` + // State - READ-ONLY; Current state of migration. Possible values include: 'MigrationStateNone', 'MigrationStateInProgress', 'MigrationStateFailed', 'MigrationStateWarning', 'MigrationStateCompleted', 'MigrationStateSkipped', 'MigrationStateStopped' + State MigrationState `json:"state,omitempty"` + // StatusMessage - READ-ONLY; Status message + StatusMessage *string `json:"statusMessage,omitempty"` + // ItemsCount - READ-ONLY; Number of items + ItemsCount *int64 `json:"itemsCount,omitempty"` + // ItemsCompletedCount - READ-ONLY; Number of successfully completed items + ItemsCompletedCount *int64 `json:"itemsCompletedCount,omitempty"` + // ErrorPrefix - READ-ONLY; Wildcard string prefix to use for querying all errors of the item + ErrorPrefix *string `json:"errorPrefix,omitempty"` + // ResultPrefix - READ-ONLY; Wildcard string prefix to use for querying all sub-tem results of the item + ResultPrefix *string `json:"resultPrefix,omitempty"` +} + +// Error migration Task errors +type Error struct { + // Message - READ-ONLY; Error description + Message *string `json:"message,omitempty"` + // Type - Type of error. Possible values include: 'ErrorTypeDefault', 'ErrorTypeWarning', 'ErrorTypeError' + Type ErrorType `json:"type,omitempty"` +} + +// ExecutionStatistics description about the errors happen while performing migration validation +type ExecutionStatistics struct { + // ExecutionCount - READ-ONLY; No. of query executions + ExecutionCount *int64 `json:"executionCount,omitempty"` + // CPUTimeMs - READ-ONLY; CPU Time in millisecond(s) for the query execution + CPUTimeMs *float64 `json:"cpuTimeMs,omitempty"` + // ElapsedTimeMs - READ-ONLY; Time taken in millisecond(s) for executing the query + ElapsedTimeMs *float64 `json:"elapsedTimeMs,omitempty"` + // WaitStats - Dictionary of sql query execution wait types and the respective statistics + WaitStats map[string]*WaitStatistics `json:"waitStats"` + // HasErrors - READ-ONLY; Indicates whether the query resulted in an error + HasErrors *bool `json:"hasErrors,omitempty"` + // SQLErrors - READ-ONLY; List of sql Errors + SQLErrors *[]string `json:"sqlErrors,omitempty"` +} + +// MarshalJSON is the custom marshaler for ExecutionStatistics. +func (es ExecutionStatistics) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if es.WaitStats != nil { + objectMap["waitStats"] = es.WaitStats + } + return json.Marshal(objectMap) +} + +// FileShare file share information with Path, Username, and Password. +type FileShare struct { + // UserName - User name credential to connect to the share location + UserName *string `json:"userName,omitempty"` + // Password - Password credential used to connect to the share location. + Password *string `json:"password,omitempty"` + // Path - The folder path for this share. + Path *string `json:"path,omitempty"` +} + +// GetProjectDetailsNonSQLTaskInput input for the task that reads configuration from project artifacts +type GetProjectDetailsNonSQLTaskInput struct { + // ProjectName - Name of the migration project + ProjectName *string `json:"projectName,omitempty"` + // ProjectLocation - A URL that points to the location to access project artifacts + ProjectLocation *string `json:"projectLocation,omitempty"` +} + +// GetTdeCertificatesSQLTaskInput input for the task that gets TDE certificates in Base64 encoded format. +type GetTdeCertificatesSQLTaskInput struct { + // ConnectionInfo - Connection information for SQL Server + ConnectionInfo *SQLConnectionInfo `json:"connectionInfo,omitempty"` + // BackupFileShare - Backup file share information for file share to be used for temporarily storing files. + BackupFileShare *FileShare `json:"backupFileShare,omitempty"` + // SelectedCertificates - List containing certificate names and corresponding password to use for encrypting the exported certificate. + SelectedCertificates *[]SelectedCertificateInput `json:"selectedCertificates,omitempty"` +} + +// GetTdeCertificatesSQLTaskOutput output of the task that gets TDE certificates in Base64 encoded format. +type GetTdeCertificatesSQLTaskOutput struct { + // Base64EncodedCertificates - READ-ONLY; Mapping from certificate name to base 64 encoded format. + Base64EncodedCertificates map[string][]string `json:"base64EncodedCertificates"` + // ValidationErrors - READ-ONLY; Validation errors + ValidationErrors *[]ReportableException `json:"validationErrors,omitempty"` +} + +// MarshalJSON is the custom marshaler for GetTdeCertificatesSQLTaskOutput. +func (gtcsto GetTdeCertificatesSQLTaskOutput) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + return json.Marshal(objectMap) +} + +// GetTdeCertificatesSQLTaskProperties properties for the task that gets TDE certificates in Base64 encoded +// format. +type GetTdeCertificatesSQLTaskProperties struct { + // Input - Task input + Input *GetTdeCertificatesSQLTaskInput `json:"input,omitempty"` + // Output - READ-ONLY; Task output. This is ignored if submitted. + Output *[]GetTdeCertificatesSQLTaskOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the task. This is ignored if submitted. Possible values include: 'TaskStateUnknown', 'TaskStateQueued', 'TaskStateRunning', 'TaskStateCanceled', 'TaskStateSucceeded', 'TaskStateFailed', 'TaskStateFailedInputValidation', 'TaskStateFaulted' + State TaskState `json:"state,omitempty"` + // Commands - READ-ONLY; Array of command properties. + Commands *[]BasicCommandProperties `json:"commands,omitempty"` + // TaskType - Possible values include: 'TaskTypeProjectTaskProperties', 'TaskTypeGetTDECertificatesSQL', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI', 'TaskTypeValidateMigrationInputSQLServerSQLDbSync', 'TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync', 'TaskTypeMigrateMySQLAzureDbForMySQLSync', 'TaskTypeMigrateSQLServerAzureSQLDbSync', 'TaskTypeMigrateSQLServerSQLDb', 'TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS', 'TaskTypeMigrateSQLServerAzureSQLDbMI', 'TaskTypeConnectToTargetAzureDbForMySQL', 'TaskTypeConnectToTargetAzureSQLDbMISyncLRS', 'TaskTypeConnectToTargetAzureSQLDbMI', 'TaskTypeGetUserTablesAzureSQLDbSync', 'TaskTypeGetUserTablesSQL', 'TaskTypeConnectToTargetAzureDbForPostgreSQLSync', 'TaskTypeConnectToTargetSQLDbSync', 'TaskTypeConnectToTargetSQLDb', 'TaskTypeConnectToSourcePostgreSQLSync', 'TaskTypeConnectToSourceSQLServerSync', 'TaskTypeConnectToSourceSQLServer', 'TaskTypeConnectToSourceMySQL' + TaskType TaskType `json:"taskType,omitempty"` +} + +// MarshalJSON is the custom marshaler for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) MarshalJSON() ([]byte, error) { + gtcstp.TaskType = TaskTypeGetTDECertificatesSQL + objectMap := make(map[string]interface{}) + if gtcstp.Input != nil { + objectMap["input"] = gtcstp.Input + } + if gtcstp.TaskType != "" { + objectMap["taskType"] = gtcstp.TaskType + } + return json.Marshal(objectMap) +} + +// AsGetTdeCertificatesSQLTaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) { + return >cstp, true +} + +// AsValidateMigrationInputSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForMySQLTaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMITaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLTaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLDbTaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourcePostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerSyncTaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceMySQLTaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) { + return nil, false +} + +// AsProjectTaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsProjectTaskProperties() (*ProjectTaskProperties, bool) { + return nil, false +} + +// AsBasicProjectTaskProperties is the BasicProjectTaskProperties implementation for GetTdeCertificatesSQLTaskProperties. +func (gtcstp GetTdeCertificatesSQLTaskProperties) AsBasicProjectTaskProperties() (BasicProjectTaskProperties, bool) { + return >cstp, true +} + +// UnmarshalJSON is the custom unmarshaler for GetTdeCertificatesSQLTaskProperties struct. +func (gtcstp *GetTdeCertificatesSQLTaskProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "input": + if v != nil { + var input GetTdeCertificatesSQLTaskInput + err = json.Unmarshal(*v, &input) + if err != nil { + return err + } + gtcstp.Input = &input + } + case "output": + if v != nil { + var output []GetTdeCertificatesSQLTaskOutput + err = json.Unmarshal(*v, &output) + if err != nil { + return err + } + gtcstp.Output = &output + } + case "errors": + if v != nil { + var errorsVar []ODataError + err = json.Unmarshal(*v, &errorsVar) + if err != nil { + return err + } + gtcstp.Errors = &errorsVar + } + case "state": + if v != nil { + var state TaskState + err = json.Unmarshal(*v, &state) + if err != nil { + return err + } + gtcstp.State = state + } + case "commands": + if v != nil { + commands, err := unmarshalBasicCommandPropertiesArray(*v) + if err != nil { + return err + } + gtcstp.Commands = &commands + } + case "taskType": + if v != nil { + var taskType TaskType + err = json.Unmarshal(*v, &taskType) + if err != nil { + return err + } + gtcstp.TaskType = taskType + } + } + } + + return nil +} + +// GetUserTablesSQLSyncTaskInput input for the task that collects user tables for the given list of +// databases +type GetUserTablesSQLSyncTaskInput struct { + // SourceConnectionInfo - Connection information for SQL Server + SourceConnectionInfo *SQLConnectionInfo `json:"sourceConnectionInfo,omitempty"` + // TargetConnectionInfo - Connection information for SQL DB + TargetConnectionInfo *SQLConnectionInfo `json:"targetConnectionInfo,omitempty"` + // SelectedSourceDatabases - List of source database names to collect tables for + SelectedSourceDatabases *[]string `json:"selectedSourceDatabases,omitempty"` + // SelectedTargetDatabases - List of target database names to collect tables for + SelectedTargetDatabases *[]string `json:"selectedTargetDatabases,omitempty"` +} + +// GetUserTablesSQLSyncTaskOutput output of the task that collects user tables for the given list of +// databases +type GetUserTablesSQLSyncTaskOutput struct { + // DatabasesToSourceTables - READ-ONLY; Mapping from database name to list of source tables + DatabasesToSourceTables map[string][]DatabaseTable `json:"databasesToSourceTables"` + // DatabasesToTargetTables - READ-ONLY; Mapping from database name to list of target tables + DatabasesToTargetTables map[string][]DatabaseTable `json:"databasesToTargetTables"` + // TableValidationErrors - READ-ONLY; Mapping from database name to list of validation errors + TableValidationErrors map[string][]string `json:"tableValidationErrors"` + // ValidationErrors - READ-ONLY; Validation errors + ValidationErrors *[]ReportableException `json:"validationErrors,omitempty"` +} + +// MarshalJSON is the custom marshaler for GetUserTablesSQLSyncTaskOutput. +func (gutssto GetUserTablesSQLSyncTaskOutput) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + return json.Marshal(objectMap) +} + +// GetUserTablesSQLSyncTaskProperties properties for the task that collects user tables for the given list +// of databases +type GetUserTablesSQLSyncTaskProperties struct { + // Input - Task input + Input *GetUserTablesSQLSyncTaskInput `json:"input,omitempty"` + // Output - READ-ONLY; Task output. This is ignored if submitted. + Output *[]GetUserTablesSQLSyncTaskOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the task. This is ignored if submitted. Possible values include: 'TaskStateUnknown', 'TaskStateQueued', 'TaskStateRunning', 'TaskStateCanceled', 'TaskStateSucceeded', 'TaskStateFailed', 'TaskStateFailedInputValidation', 'TaskStateFaulted' + State TaskState `json:"state,omitempty"` + // Commands - READ-ONLY; Array of command properties. + Commands *[]BasicCommandProperties `json:"commands,omitempty"` + // TaskType - Possible values include: 'TaskTypeProjectTaskProperties', 'TaskTypeGetTDECertificatesSQL', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI', 'TaskTypeValidateMigrationInputSQLServerSQLDbSync', 'TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync', 'TaskTypeMigrateMySQLAzureDbForMySQLSync', 'TaskTypeMigrateSQLServerAzureSQLDbSync', 'TaskTypeMigrateSQLServerSQLDb', 'TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS', 'TaskTypeMigrateSQLServerAzureSQLDbMI', 'TaskTypeConnectToTargetAzureDbForMySQL', 'TaskTypeConnectToTargetAzureSQLDbMISyncLRS', 'TaskTypeConnectToTargetAzureSQLDbMI', 'TaskTypeGetUserTablesAzureSQLDbSync', 'TaskTypeGetUserTablesSQL', 'TaskTypeConnectToTargetAzureDbForPostgreSQLSync', 'TaskTypeConnectToTargetSQLDbSync', 'TaskTypeConnectToTargetSQLDb', 'TaskTypeConnectToSourcePostgreSQLSync', 'TaskTypeConnectToSourceSQLServerSync', 'TaskTypeConnectToSourceSQLServer', 'TaskTypeConnectToSourceMySQL' + TaskType TaskType `json:"taskType,omitempty"` +} + +// MarshalJSON is the custom marshaler for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) MarshalJSON() ([]byte, error) { + gutsstp.TaskType = TaskTypeGetUserTablesAzureSQLDbSync + objectMap := make(map[string]interface{}) + if gutsstp.Input != nil { + objectMap["input"] = gutsstp.Input + } + if gutsstp.TaskType != "" { + objectMap["taskType"] = gutsstp.TaskType + } + return json.Marshal(objectMap) +} + +// AsGetTdeCertificatesSQLTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForMySQLTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMITaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) { + return &gutsstp, true +} + +// AsGetUserTablesSQLTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLDbTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourcePostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerSyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceMySQLTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) { + return nil, false +} + +// AsProjectTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsProjectTaskProperties() (*ProjectTaskProperties, bool) { + return nil, false +} + +// AsBasicProjectTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLSyncTaskProperties. +func (gutsstp GetUserTablesSQLSyncTaskProperties) AsBasicProjectTaskProperties() (BasicProjectTaskProperties, bool) { + return &gutsstp, true +} + +// UnmarshalJSON is the custom unmarshaler for GetUserTablesSQLSyncTaskProperties struct. +func (gutsstp *GetUserTablesSQLSyncTaskProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "input": + if v != nil { + var input GetUserTablesSQLSyncTaskInput + err = json.Unmarshal(*v, &input) + if err != nil { + return err + } + gutsstp.Input = &input + } + case "output": + if v != nil { + var output []GetUserTablesSQLSyncTaskOutput + err = json.Unmarshal(*v, &output) + if err != nil { + return err + } + gutsstp.Output = &output + } + case "errors": + if v != nil { + var errorsVar []ODataError + err = json.Unmarshal(*v, &errorsVar) + if err != nil { + return err + } + gutsstp.Errors = &errorsVar + } + case "state": + if v != nil { + var state TaskState + err = json.Unmarshal(*v, &state) + if err != nil { + return err + } + gutsstp.State = state + } + case "commands": + if v != nil { + commands, err := unmarshalBasicCommandPropertiesArray(*v) + if err != nil { + return err + } + gutsstp.Commands = &commands + } + case "taskType": + if v != nil { + var taskType TaskType + err = json.Unmarshal(*v, &taskType) + if err != nil { + return err + } + gutsstp.TaskType = taskType + } + } + } + + return nil +} + +// GetUserTablesSQLTaskInput input for the task that collects user tables for the given list of databases +type GetUserTablesSQLTaskInput struct { + // ConnectionInfo - Connection information for SQL Server + ConnectionInfo *SQLConnectionInfo `json:"connectionInfo,omitempty"` + // SelectedDatabases - List of database names to collect tables for + SelectedDatabases *[]string `json:"selectedDatabases,omitempty"` +} + +// GetUserTablesSQLTaskOutput output of the task that collects user tables for the given list of databases +type GetUserTablesSQLTaskOutput struct { + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // DatabasesToTables - READ-ONLY; Mapping from database name to list of tables + DatabasesToTables map[string][]DatabaseTable `json:"databasesToTables"` + // ValidationErrors - READ-ONLY; Validation errors + ValidationErrors *[]ReportableException `json:"validationErrors,omitempty"` +} + +// MarshalJSON is the custom marshaler for GetUserTablesSQLTaskOutput. +func (gutsto GetUserTablesSQLTaskOutput) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + return json.Marshal(objectMap) +} + +// GetUserTablesSQLTaskProperties properties for the task that collects user tables for the given list of +// databases +type GetUserTablesSQLTaskProperties struct { + // Input - Task input + Input *GetUserTablesSQLTaskInput `json:"input,omitempty"` + // Output - READ-ONLY; Task output. This is ignored if submitted. + Output *[]GetUserTablesSQLTaskOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the task. This is ignored if submitted. Possible values include: 'TaskStateUnknown', 'TaskStateQueued', 'TaskStateRunning', 'TaskStateCanceled', 'TaskStateSucceeded', 'TaskStateFailed', 'TaskStateFailedInputValidation', 'TaskStateFaulted' + State TaskState `json:"state,omitempty"` + // Commands - READ-ONLY; Array of command properties. + Commands *[]BasicCommandProperties `json:"commands,omitempty"` + // TaskType - Possible values include: 'TaskTypeProjectTaskProperties', 'TaskTypeGetTDECertificatesSQL', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI', 'TaskTypeValidateMigrationInputSQLServerSQLDbSync', 'TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync', 'TaskTypeMigrateMySQLAzureDbForMySQLSync', 'TaskTypeMigrateSQLServerAzureSQLDbSync', 'TaskTypeMigrateSQLServerSQLDb', 'TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS', 'TaskTypeMigrateSQLServerAzureSQLDbMI', 'TaskTypeConnectToTargetAzureDbForMySQL', 'TaskTypeConnectToTargetAzureSQLDbMISyncLRS', 'TaskTypeConnectToTargetAzureSQLDbMI', 'TaskTypeGetUserTablesAzureSQLDbSync', 'TaskTypeGetUserTablesSQL', 'TaskTypeConnectToTargetAzureDbForPostgreSQLSync', 'TaskTypeConnectToTargetSQLDbSync', 'TaskTypeConnectToTargetSQLDb', 'TaskTypeConnectToSourcePostgreSQLSync', 'TaskTypeConnectToSourceSQLServerSync', 'TaskTypeConnectToSourceSQLServer', 'TaskTypeConnectToSourceMySQL' + TaskType TaskType `json:"taskType,omitempty"` +} + +// MarshalJSON is the custom marshaler for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) MarshalJSON() ([]byte, error) { + gutstp.TaskType = TaskTypeGetUserTablesSQL + objectMap := make(map[string]interface{}) + if gutstp.Input != nil { + objectMap["input"] = gutstp.Input + } + if gutstp.TaskType != "" { + objectMap["taskType"] = gutstp.TaskType + } + return json.Marshal(objectMap) +} + +// AsGetTdeCertificatesSQLTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForMySQLTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMITaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) { + return &gutstp, true +} + +// AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLDbTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourcePostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerSyncTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceMySQLTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) { + return nil, false +} + +// AsProjectTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsProjectTaskProperties() (*ProjectTaskProperties, bool) { + return nil, false +} + +// AsBasicProjectTaskProperties is the BasicProjectTaskProperties implementation for GetUserTablesSQLTaskProperties. +func (gutstp GetUserTablesSQLTaskProperties) AsBasicProjectTaskProperties() (BasicProjectTaskProperties, bool) { + return &gutstp, true +} + +// UnmarshalJSON is the custom unmarshaler for GetUserTablesSQLTaskProperties struct. +func (gutstp *GetUserTablesSQLTaskProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "input": + if v != nil { + var input GetUserTablesSQLTaskInput + err = json.Unmarshal(*v, &input) + if err != nil { + return err + } + gutstp.Input = &input + } + case "output": + if v != nil { + var output []GetUserTablesSQLTaskOutput + err = json.Unmarshal(*v, &output) + if err != nil { + return err + } + gutstp.Output = &output + } + case "errors": + if v != nil { + var errorsVar []ODataError + err = json.Unmarshal(*v, &errorsVar) + if err != nil { + return err + } + gutstp.Errors = &errorsVar + } + case "state": + if v != nil { + var state TaskState + err = json.Unmarshal(*v, &state) + if err != nil { + return err + } + gutstp.State = state + } + case "commands": + if v != nil { + commands, err := unmarshalBasicCommandPropertiesArray(*v) + if err != nil { + return err + } + gutstp.Commands = &commands + } + case "taskType": + if v != nil { + var taskType TaskType + err = json.Unmarshal(*v, &taskType) + if err != nil { + return err + } + gutstp.TaskType = taskType + } + } + } + + return nil +} + +// MigrateMISyncCompleteCommandInput input for command that completes online migration for an Azure SQL +// Database Managed Instance. +type MigrateMISyncCompleteCommandInput struct { + // SourceDatabaseName - Name of managed instance database + SourceDatabaseName *string `json:"sourceDatabaseName,omitempty"` +} + +// MigrateMISyncCompleteCommandOutput output for command that completes online migration for an Azure SQL +// Database Managed Instance. +type MigrateMISyncCompleteCommandOutput struct { + // Errors - List of errors that happened during the command execution + Errors *[]ReportableException `json:"errors,omitempty"` +} + +// MigrateMISyncCompleteCommandProperties properties for the command that completes online migration for an +// Azure SQL Database Managed Instance. +type MigrateMISyncCompleteCommandProperties struct { + // Input - Command input + Input *MigrateMISyncCompleteCommandInput `json:"input,omitempty"` + // Output - READ-ONLY; Command output. This is ignored if submitted. + Output *MigrateMISyncCompleteCommandOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the command. This is ignored if submitted. Possible values include: 'Unknown', 'Accepted', 'Running', 'Succeeded', 'Failed' + State CommandState `json:"state,omitempty"` + // CommandType - Possible values include: 'CommandTypeCommandProperties', 'CommandTypeMigrateSQLServerAzureDbSQLMiComplete', 'CommandTypeMigrateSyncCompleteDatabase' + CommandType CommandType `json:"commandType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateMISyncCompleteCommandProperties. +func (mmsccp MigrateMISyncCompleteCommandProperties) MarshalJSON() ([]byte, error) { + mmsccp.CommandType = CommandTypeMigrateSQLServerAzureDbSQLMiComplete + objectMap := make(map[string]interface{}) + if mmsccp.Input != nil { + objectMap["input"] = mmsccp.Input + } + if mmsccp.CommandType != "" { + objectMap["commandType"] = mmsccp.CommandType + } + return json.Marshal(objectMap) +} + +// AsMigrateMISyncCompleteCommandProperties is the BasicCommandProperties implementation for MigrateMISyncCompleteCommandProperties. +func (mmsccp MigrateMISyncCompleteCommandProperties) AsMigrateMISyncCompleteCommandProperties() (*MigrateMISyncCompleteCommandProperties, bool) { + return &mmsccp, true +} + +// AsMigrateSyncCompleteCommandProperties is the BasicCommandProperties implementation for MigrateMISyncCompleteCommandProperties. +func (mmsccp MigrateMISyncCompleteCommandProperties) AsMigrateSyncCompleteCommandProperties() (*MigrateSyncCompleteCommandProperties, bool) { + return nil, false +} + +// AsCommandProperties is the BasicCommandProperties implementation for MigrateMISyncCompleteCommandProperties. +func (mmsccp MigrateMISyncCompleteCommandProperties) AsCommandProperties() (*CommandProperties, bool) { + return nil, false +} + +// AsBasicCommandProperties is the BasicCommandProperties implementation for MigrateMISyncCompleteCommandProperties. +func (mmsccp MigrateMISyncCompleteCommandProperties) AsBasicCommandProperties() (BasicCommandProperties, bool) { + return &mmsccp, true +} + +// MigrateMySQLAzureDbForMySQLSyncDatabaseInput database specific information for MySQL to Azure Database +// for MySQL migration task inputs +type MigrateMySQLAzureDbForMySQLSyncDatabaseInput struct { + // Name - Name of the database + Name *string `json:"name,omitempty"` + // TargetDatabaseName - Name of target database. Note: Target database will be truncated before starting migration. + TargetDatabaseName *string `json:"targetDatabaseName,omitempty"` + // MigrationSetting - Migration settings which tune the migration behavior + MigrationSetting map[string]*string `json:"migrationSetting"` + // SourceSetting - Source settings to tune source endpoint migration behavior + SourceSetting map[string]*string `json:"sourceSetting"` + // TargetSetting - Target settings to tune target endpoint migration behavior + TargetSetting map[string]*string `json:"targetSetting"` +} + +// MarshalJSON is the custom marshaler for MigrateMySQLAzureDbForMySQLSyncDatabaseInput. +func (mmsadfmssdi MigrateMySQLAzureDbForMySQLSyncDatabaseInput) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if mmsadfmssdi.Name != nil { + objectMap["name"] = mmsadfmssdi.Name + } + if mmsadfmssdi.TargetDatabaseName != nil { + objectMap["targetDatabaseName"] = mmsadfmssdi.TargetDatabaseName + } + if mmsadfmssdi.MigrationSetting != nil { + objectMap["migrationSetting"] = mmsadfmssdi.MigrationSetting + } + if mmsadfmssdi.SourceSetting != nil { + objectMap["sourceSetting"] = mmsadfmssdi.SourceSetting + } + if mmsadfmssdi.TargetSetting != nil { + objectMap["targetSetting"] = mmsadfmssdi.TargetSetting + } + return json.Marshal(objectMap) +} + +// MigrateMySQLAzureDbForMySQLSyncTaskInput input for the task that migrates MySQL databases to Azure +// Database for MySQL for online migrations +type MigrateMySQLAzureDbForMySQLSyncTaskInput struct { + // SourceConnectionInfo - Connection information for source MySQL + SourceConnectionInfo *MySQLConnectionInfo `json:"sourceConnectionInfo,omitempty"` + // TargetConnectionInfo - Connection information for target Azure Database for MySQL + TargetConnectionInfo *MySQLConnectionInfo `json:"targetConnectionInfo,omitempty"` + // SelectedDatabases - Databases to migrate + SelectedDatabases *[]MigrateMySQLAzureDbForMySQLSyncDatabaseInput `json:"selectedDatabases,omitempty"` +} + +// BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput output for the task that migrates MySQL databases to Azure Database +// for MySQL for online migrations +type BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput interface { + AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError, bool) + AsMigrateMySQLAzureDbForMySQLSyncTaskOutputError() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputError, bool) + AsMigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel, bool) + AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel, bool) + AsMigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel, bool) + AsMigrateMySQLAzureDbForMySQLSyncTaskOutput() (*MigrateMySQLAzureDbForMySQLSyncTaskOutput, bool) +} + +// MigrateMySQLAzureDbForMySQLSyncTaskOutput output for the task that migrates MySQL databases to Azure +// Database for MySQL for online migrations +type MigrateMySQLAzureDbForMySQLSyncTaskOutput struct { + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeMigrateMySQLAzureDbForMySQLSyncTaskOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeDatabaseLevelErrorOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeTableLevelOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput `json:"resultType,omitempty"` +} + +func unmarshalBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput(body []byte) (BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput, error) { + var m map[string]interface{} + err := json.Unmarshal(body, &m) + if err != nil { + return nil, err + } + + switch m["resultType"] { + case string(ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeDatabaseLevelErrorOutput): + var mmsadfmsstode MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError + err := json.Unmarshal(body, &mmsadfmsstode) + return mmsadfmsstode, err + case string(ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeErrorOutput): + var mmsadfmsstoe MigrateMySQLAzureDbForMySQLSyncTaskOutputError + err := json.Unmarshal(body, &mmsadfmsstoe) + return mmsadfmsstoe, err + case string(ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeTableLevelOutput): + var mmsadfmsstotl MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel + err := json.Unmarshal(body, &mmsadfmsstotl) + return mmsadfmsstotl, err + case string(ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeDatabaseLevelOutput): + var mmsadfmsstodl MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel + err := json.Unmarshal(body, &mmsadfmsstodl) + return mmsadfmsstodl, err + case string(ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeMigrationLevelOutput): + var mmsadfmsstoml MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel + err := json.Unmarshal(body, &mmsadfmsstoml) + return mmsadfmsstoml, err + default: + var mmsadfmssto MigrateMySQLAzureDbForMySQLSyncTaskOutput + err := json.Unmarshal(body, &mmsadfmssto) + return mmsadfmssto, err + } +} +func unmarshalBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputArray(body []byte) ([]BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput, error) { + var rawMessages []*json.RawMessage + err := json.Unmarshal(body, &rawMessages) + if err != nil { + return nil, err + } + + mmsadfmsstoArray := make([]BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput, len(rawMessages)) + + for index, rawMessage := range rawMessages { + mmsadfmssto, err := unmarshalBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput(*rawMessage) + if err != nil { + return nil, err + } + mmsadfmsstoArray[index] = mmsadfmssto + } + return mmsadfmsstoArray, nil +} + +// MarshalJSON is the custom marshaler for MigrateMySQLAzureDbForMySQLSyncTaskOutput. +func (mmsadfmssto MigrateMySQLAzureDbForMySQLSyncTaskOutput) MarshalJSON() ([]byte, error) { + mmsadfmssto.ResultType = ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeMigrateMySQLAzureDbForMySQLSyncTaskOutput + objectMap := make(map[string]interface{}) + if mmsadfmssto.ResultType != "" { + objectMap["resultType"] = mmsadfmssto.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutput. +func (mmsadfmssto MigrateMySQLAzureDbForMySQLSyncTaskOutput) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputError is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutput. +func (mmsadfmssto MigrateMySQLAzureDbForMySQLSyncTaskOutput) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputError() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputError, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutput. +func (mmsadfmssto MigrateMySQLAzureDbForMySQLSyncTaskOutput) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutput. +func (mmsadfmssto MigrateMySQLAzureDbForMySQLSyncTaskOutput) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutput. +func (mmsadfmssto MigrateMySQLAzureDbForMySQLSyncTaskOutput) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutput is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutput. +func (mmsadfmssto MigrateMySQLAzureDbForMySQLSyncTaskOutput) AsMigrateMySQLAzureDbForMySQLSyncTaskOutput() (*MigrateMySQLAzureDbForMySQLSyncTaskOutput, bool) { + return &mmsadfmssto, true +} + +// AsBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutput. +func (mmsadfmssto MigrateMySQLAzureDbForMySQLSyncTaskOutput) AsBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput() (BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput, bool) { + return &mmsadfmssto, true +} + +// MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError ... +type MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError struct { + // ErrorMessage - Error message + ErrorMessage *string `json:"errorMessage,omitempty"` + // Events - List of error events. + Events *[]SyncMigrationDatabaseErrorEvent `json:"events,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeMigrateMySQLAzureDbForMySQLSyncTaskOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeDatabaseLevelErrorOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeTableLevelOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError. +func (mmsadfmsstode MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError) MarshalJSON() ([]byte, error) { + mmsadfmsstode.ResultType = ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeDatabaseLevelErrorOutput + objectMap := make(map[string]interface{}) + if mmsadfmsstode.ErrorMessage != nil { + objectMap["errorMessage"] = mmsadfmsstode.ErrorMessage + } + if mmsadfmsstode.Events != nil { + objectMap["events"] = mmsadfmsstode.Events + } + if mmsadfmsstode.ResultType != "" { + objectMap["resultType"] = mmsadfmsstode.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError. +func (mmsadfmsstode MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError, bool) { + return &mmsadfmsstode, true +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputError is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError. +func (mmsadfmsstode MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputError() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputError, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError. +func (mmsadfmsstode MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError. +func (mmsadfmsstode MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError. +func (mmsadfmsstode MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutput is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError. +func (mmsadfmsstode MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError) AsMigrateMySQLAzureDbForMySQLSyncTaskOutput() (*MigrateMySQLAzureDbForMySQLSyncTaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError. +func (mmsadfmsstode MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError) AsBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput() (BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput, bool) { + return &mmsadfmsstode, true +} + +// MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel ... +type MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel struct { + // DatabaseName - READ-ONLY; Name of the database + DatabaseName *string `json:"databaseName,omitempty"` + // StartedOn - READ-ONLY; Migration start time + StartedOn *date.Time `json:"startedOn,omitempty"` + // EndedOn - READ-ONLY; Migration end time + EndedOn *date.Time `json:"endedOn,omitempty"` + // MigrationState - READ-ONLY; Migration state that this database is in. Possible values include: 'SyncDatabaseMigrationReportingStateUNDEFINED', 'SyncDatabaseMigrationReportingStateCONFIGURING', 'SyncDatabaseMigrationReportingStateINITIALIAZING', 'SyncDatabaseMigrationReportingStateSTARTING', 'SyncDatabaseMigrationReportingStateRUNNING', 'SyncDatabaseMigrationReportingStateREADYTOCOMPLETE', 'SyncDatabaseMigrationReportingStateCOMPLETING', 'SyncDatabaseMigrationReportingStateCOMPLETE', 'SyncDatabaseMigrationReportingStateCANCELLING', 'SyncDatabaseMigrationReportingStateCANCELLED', 'SyncDatabaseMigrationReportingStateFAILED' + MigrationState SyncDatabaseMigrationReportingState `json:"migrationState,omitempty"` + // IncomingChanges - READ-ONLY; Number of incoming changes + IncomingChanges *int64 `json:"incomingChanges,omitempty"` + // AppliedChanges - READ-ONLY; Number of applied changes + AppliedChanges *int64 `json:"appliedChanges,omitempty"` + // CdcInsertCounter - READ-ONLY; Number of cdc inserts + CdcInsertCounter *int64 `json:"cdcInsertCounter,omitempty"` + // CdcDeleteCounter - READ-ONLY; Number of cdc deletes + CdcDeleteCounter *int64 `json:"cdcDeleteCounter,omitempty"` + // CdcUpdateCounter - READ-ONLY; Number of cdc updates + CdcUpdateCounter *int64 `json:"cdcUpdateCounter,omitempty"` + // FullLoadCompletedTables - READ-ONLY; Number of tables completed in full load + FullLoadCompletedTables *int64 `json:"fullLoadCompletedTables,omitempty"` + // FullLoadLoadingTables - READ-ONLY; Number of tables loading in full load + FullLoadLoadingTables *int64 `json:"fullLoadLoadingTables,omitempty"` + // FullLoadQueuedTables - READ-ONLY; Number of tables queued in full load + FullLoadQueuedTables *int64 `json:"fullLoadQueuedTables,omitempty"` + // FullLoadErroredTables - READ-ONLY; Number of tables errored in full load + FullLoadErroredTables *int64 `json:"fullLoadErroredTables,omitempty"` + // InitializationCompleted - READ-ONLY; Indicates if initial load (full load) has been completed + InitializationCompleted *bool `json:"initializationCompleted,omitempty"` + // Latency - READ-ONLY; CDC apply latency + Latency *int64 `json:"latency,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeMigrateMySQLAzureDbForMySQLSyncTaskOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeDatabaseLevelErrorOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeTableLevelOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel. +func (mmsadfmsstodl MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel) MarshalJSON() ([]byte, error) { + mmsadfmsstodl.ResultType = ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeDatabaseLevelOutput + objectMap := make(map[string]interface{}) + if mmsadfmsstodl.ResultType != "" { + objectMap["resultType"] = mmsadfmsstodl.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel. +func (mmsadfmsstodl MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputError is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel. +func (mmsadfmsstodl MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputError() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputError, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel. +func (mmsadfmsstodl MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel. +func (mmsadfmsstodl MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel, bool) { + return &mmsadfmsstodl, true +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel. +func (mmsadfmsstodl MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutput is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel. +func (mmsadfmsstodl MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel) AsMigrateMySQLAzureDbForMySQLSyncTaskOutput() (*MigrateMySQLAzureDbForMySQLSyncTaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel. +func (mmsadfmsstodl MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel) AsBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput() (BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput, bool) { + return &mmsadfmsstodl, true +} + +// MigrateMySQLAzureDbForMySQLSyncTaskOutputError ... +type MigrateMySQLAzureDbForMySQLSyncTaskOutputError struct { + // Error - READ-ONLY; Migration error + Error *ReportableException `json:"error,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeMigrateMySQLAzureDbForMySQLSyncTaskOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeDatabaseLevelErrorOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeTableLevelOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateMySQLAzureDbForMySQLSyncTaskOutputError. +func (mmsadfmsstoe MigrateMySQLAzureDbForMySQLSyncTaskOutputError) MarshalJSON() ([]byte, error) { + mmsadfmsstoe.ResultType = ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeErrorOutput + objectMap := make(map[string]interface{}) + if mmsadfmsstoe.ResultType != "" { + objectMap["resultType"] = mmsadfmsstoe.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputError. +func (mmsadfmsstoe MigrateMySQLAzureDbForMySQLSyncTaskOutputError) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputError is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputError. +func (mmsadfmsstoe MigrateMySQLAzureDbForMySQLSyncTaskOutputError) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputError() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputError, bool) { + return &mmsadfmsstoe, true +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputError. +func (mmsadfmsstoe MigrateMySQLAzureDbForMySQLSyncTaskOutputError) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputError. +func (mmsadfmsstoe MigrateMySQLAzureDbForMySQLSyncTaskOutputError) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputError. +func (mmsadfmsstoe MigrateMySQLAzureDbForMySQLSyncTaskOutputError) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutput is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputError. +func (mmsadfmsstoe MigrateMySQLAzureDbForMySQLSyncTaskOutputError) AsMigrateMySQLAzureDbForMySQLSyncTaskOutput() (*MigrateMySQLAzureDbForMySQLSyncTaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputError. +func (mmsadfmsstoe MigrateMySQLAzureDbForMySQLSyncTaskOutputError) AsBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput() (BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput, bool) { + return &mmsadfmsstoe, true +} + +// MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel ... +type MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel struct { + // StartedOn - READ-ONLY; Migration start time + StartedOn *date.Time `json:"startedOn,omitempty"` + // EndedOn - READ-ONLY; Migration end time + EndedOn *date.Time `json:"endedOn,omitempty"` + // SourceServerVersion - READ-ONLY; Source server version + SourceServerVersion *string `json:"sourceServerVersion,omitempty"` + // SourceServer - READ-ONLY; Source server name + SourceServer *string `json:"sourceServer,omitempty"` + // TargetServerVersion - READ-ONLY; Target server version + TargetServerVersion *string `json:"targetServerVersion,omitempty"` + // TargetServer - READ-ONLY; Target server name + TargetServer *string `json:"targetServer,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeMigrateMySQLAzureDbForMySQLSyncTaskOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeDatabaseLevelErrorOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeTableLevelOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel. +func (mmsadfmsstoml MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel) MarshalJSON() ([]byte, error) { + mmsadfmsstoml.ResultType = ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeMigrationLevelOutput + objectMap := make(map[string]interface{}) + if mmsadfmsstoml.ResultType != "" { + objectMap["resultType"] = mmsadfmsstoml.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel. +func (mmsadfmsstoml MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputError is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel. +func (mmsadfmsstoml MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputError() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputError, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel. +func (mmsadfmsstoml MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel. +func (mmsadfmsstoml MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel. +func (mmsadfmsstoml MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel, bool) { + return &mmsadfmsstoml, true +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutput is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel. +func (mmsadfmsstoml MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel) AsMigrateMySQLAzureDbForMySQLSyncTaskOutput() (*MigrateMySQLAzureDbForMySQLSyncTaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel. +func (mmsadfmsstoml MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel) AsBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput() (BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput, bool) { + return &mmsadfmsstoml, true +} + +// MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel ... +type MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel struct { + // TableName - READ-ONLY; Name of the table + TableName *string `json:"tableName,omitempty"` + // DatabaseName - READ-ONLY; Name of the database + DatabaseName *string `json:"databaseName,omitempty"` + // CdcInsertCounter - READ-ONLY; Number of applied inserts + CdcInsertCounter *string `json:"cdcInsertCounter,omitempty"` + // CdcUpdateCounter - READ-ONLY; Number of applied updates + CdcUpdateCounter *string `json:"cdcUpdateCounter,omitempty"` + // CdcDeleteCounter - READ-ONLY; Number of applied deletes + CdcDeleteCounter *string `json:"cdcDeleteCounter,omitempty"` + // FullLoadEstFinishTime - READ-ONLY; Estimate to finish full load + FullLoadEstFinishTime *date.Time `json:"fullLoadEstFinishTime,omitempty"` + // FullLoadStartedOn - READ-ONLY; Full load start time + FullLoadStartedOn *date.Time `json:"fullLoadStartedOn,omitempty"` + // FullLoadEndedOn - READ-ONLY; Full load end time + FullLoadEndedOn *date.Time `json:"fullLoadEndedOn,omitempty"` + // FullLoadTotalRows - READ-ONLY; Number of rows applied in full load + FullLoadTotalRows *int64 `json:"fullLoadTotalRows,omitempty"` + // State - READ-ONLY; Current state of the table migration. Possible values include: 'SyncTableMigrationStateBEFORELOAD', 'SyncTableMigrationStateFULLLOAD', 'SyncTableMigrationStateCOMPLETED', 'SyncTableMigrationStateCANCELED', 'SyncTableMigrationStateERROR', 'SyncTableMigrationStateFAILED' + State SyncTableMigrationState `json:"state,omitempty"` + // TotalChangesApplied - READ-ONLY; Total number of applied changes + TotalChangesApplied *int64 `json:"totalChangesApplied,omitempty"` + // DataErrorsCounter - READ-ONLY; Number of data errors occurred + DataErrorsCounter *int64 `json:"dataErrorsCounter,omitempty"` + // LastModifiedTime - READ-ONLY; Last modified time on target + LastModifiedTime *date.Time `json:"lastModifiedTime,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeMigrateMySQLAzureDbForMySQLSyncTaskOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeDatabaseLevelErrorOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeTableLevelOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel. +func (mmsadfmsstotl MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel) MarshalJSON() ([]byte, error) { + mmsadfmsstotl.ResultType = ResultTypeBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputResultTypeTableLevelOutput + objectMap := make(map[string]interface{}) + if mmsadfmsstotl.ResultType != "" { + objectMap["resultType"] = mmsadfmsstotl.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel. +func (mmsadfmsstotl MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseError, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputError is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel. +func (mmsadfmsstotl MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputError() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputError, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel. +func (mmsadfmsstotl MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel, bool) { + return &mmsadfmsstotl, true +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel. +func (mmsadfmsstotl MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel. +func (mmsadfmsstotl MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel) AsMigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel() (*MigrateMySQLAzureDbForMySQLSyncTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskOutput is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel. +func (mmsadfmsstotl MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel) AsMigrateMySQLAzureDbForMySQLSyncTaskOutput() (*MigrateMySQLAzureDbForMySQLSyncTaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput is the BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput implementation for MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel. +func (mmsadfmsstotl MigrateMySQLAzureDbForMySQLSyncTaskOutputTableLevel) AsBasicMigrateMySQLAzureDbForMySQLSyncTaskOutput() (BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput, bool) { + return &mmsadfmsstotl, true +} + +// MigrateMySQLAzureDbForMySQLSyncTaskProperties properties for the task that migrates MySQL databases to +// Azure Database for MySQL for online migrations +type MigrateMySQLAzureDbForMySQLSyncTaskProperties struct { + // Input - Task input + Input *MigrateMySQLAzureDbForMySQLSyncTaskInput `json:"input,omitempty"` + // Output - READ-ONLY; Task output. This is ignored if submitted. + Output *[]BasicMigrateMySQLAzureDbForMySQLSyncTaskOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the task. This is ignored if submitted. Possible values include: 'TaskStateUnknown', 'TaskStateQueued', 'TaskStateRunning', 'TaskStateCanceled', 'TaskStateSucceeded', 'TaskStateFailed', 'TaskStateFailedInputValidation', 'TaskStateFaulted' + State TaskState `json:"state,omitempty"` + // Commands - READ-ONLY; Array of command properties. + Commands *[]BasicCommandProperties `json:"commands,omitempty"` + // TaskType - Possible values include: 'TaskTypeProjectTaskProperties', 'TaskTypeGetTDECertificatesSQL', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI', 'TaskTypeValidateMigrationInputSQLServerSQLDbSync', 'TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync', 'TaskTypeMigrateMySQLAzureDbForMySQLSync', 'TaskTypeMigrateSQLServerAzureSQLDbSync', 'TaskTypeMigrateSQLServerSQLDb', 'TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS', 'TaskTypeMigrateSQLServerAzureSQLDbMI', 'TaskTypeConnectToTargetAzureDbForMySQL', 'TaskTypeConnectToTargetAzureSQLDbMISyncLRS', 'TaskTypeConnectToTargetAzureSQLDbMI', 'TaskTypeGetUserTablesAzureSQLDbSync', 'TaskTypeGetUserTablesSQL', 'TaskTypeConnectToTargetAzureDbForPostgreSQLSync', 'TaskTypeConnectToTargetSQLDbSync', 'TaskTypeConnectToTargetSQLDb', 'TaskTypeConnectToSourcePostgreSQLSync', 'TaskTypeConnectToSourceSQLServerSync', 'TaskTypeConnectToSourceSQLServer', 'TaskTypeConnectToSourceMySQL' + TaskType TaskType `json:"taskType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) MarshalJSON() ([]byte, error) { + mmsadfmsstp.TaskType = TaskTypeMigrateMySQLAzureDbForMySQLSync + objectMap := make(map[string]interface{}) + if mmsadfmsstp.Input != nil { + objectMap["input"] = mmsadfmsstp.Input + } + if mmsadfmsstp.TaskType != "" { + objectMap["taskType"] = mmsadfmsstp.TaskType + } + return json.Marshal(objectMap) +} + +// AsGetTdeCertificatesSQLTaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) { + return &mmsadfmsstp, true +} + +// AsMigrateSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForMySQLTaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMITaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLTaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLDbTaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourcePostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceMySQLTaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) { + return nil, false +} + +// AsProjectTaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsProjectTaskProperties() (*ProjectTaskProperties, bool) { + return nil, false +} + +// AsBasicProjectTaskProperties is the BasicProjectTaskProperties implementation for MigrateMySQLAzureDbForMySQLSyncTaskProperties. +func (mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties) AsBasicProjectTaskProperties() (BasicProjectTaskProperties, bool) { + return &mmsadfmsstp, true +} + +// UnmarshalJSON is the custom unmarshaler for MigrateMySQLAzureDbForMySQLSyncTaskProperties struct. +func (mmsadfmsstp *MigrateMySQLAzureDbForMySQLSyncTaskProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "input": + if v != nil { + var input MigrateMySQLAzureDbForMySQLSyncTaskInput + err = json.Unmarshal(*v, &input) + if err != nil { + return err + } + mmsadfmsstp.Input = &input + } + case "output": + if v != nil { + output, err := unmarshalBasicMigrateMySQLAzureDbForMySQLSyncTaskOutputArray(*v) + if err != nil { + return err + } + mmsadfmsstp.Output = &output + } + case "errors": + if v != nil { + var errorsVar []ODataError + err = json.Unmarshal(*v, &errorsVar) + if err != nil { + return err + } + mmsadfmsstp.Errors = &errorsVar + } + case "state": + if v != nil { + var state TaskState + err = json.Unmarshal(*v, &state) + if err != nil { + return err + } + mmsadfmsstp.State = state + } + case "commands": + if v != nil { + commands, err := unmarshalBasicCommandPropertiesArray(*v) + if err != nil { + return err + } + mmsadfmsstp.Commands = &commands + } + case "taskType": + if v != nil { + var taskType TaskType + err = json.Unmarshal(*v, &taskType) + if err != nil { + return err + } + mmsadfmsstp.TaskType = taskType + } + } + } + + return nil +} + +// MigratePostgreSQLAzureDbForPostgreSQLSyncDatabaseInput database specific information for PostgreSQL to +// Azure Database for PostgreSQL migration task inputs +type MigratePostgreSQLAzureDbForPostgreSQLSyncDatabaseInput struct { + // Name - Name of the database + Name *string `json:"name,omitempty"` + // TargetDatabaseName - Name of target database. Note: Target database will be truncated before starting migration. + TargetDatabaseName *string `json:"targetDatabaseName,omitempty"` + // MigrationSetting - Migration settings which tune the migration behavior + MigrationSetting map[string]*string `json:"migrationSetting"` + // SourceSetting - Source settings to tune source endpoint migration behavior + SourceSetting map[string]*string `json:"sourceSetting"` + // TargetSetting - Target settings to tune target endpoint migration behavior + TargetSetting map[string]*string `json:"targetSetting"` +} + +// MarshalJSON is the custom marshaler for MigratePostgreSQLAzureDbForPostgreSQLSyncDatabaseInput. +func (mpsadfpssdi MigratePostgreSQLAzureDbForPostgreSQLSyncDatabaseInput) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if mpsadfpssdi.Name != nil { + objectMap["name"] = mpsadfpssdi.Name + } + if mpsadfpssdi.TargetDatabaseName != nil { + objectMap["targetDatabaseName"] = mpsadfpssdi.TargetDatabaseName + } + if mpsadfpssdi.MigrationSetting != nil { + objectMap["migrationSetting"] = mpsadfpssdi.MigrationSetting + } + if mpsadfpssdi.SourceSetting != nil { + objectMap["sourceSetting"] = mpsadfpssdi.SourceSetting + } + if mpsadfpssdi.TargetSetting != nil { + objectMap["targetSetting"] = mpsadfpssdi.TargetSetting + } + return json.Marshal(objectMap) +} + +// MigratePostgreSQLAzureDbForPostgreSQLSyncTaskInput input for the task that migrates PostgreSQL databases +// to Azure Database for PostgreSQL for online migrations +type MigratePostgreSQLAzureDbForPostgreSQLSyncTaskInput struct { + // SelectedDatabases - Databases to migrate + SelectedDatabases *[]MigratePostgreSQLAzureDbForPostgreSQLSyncDatabaseInput `json:"selectedDatabases,omitempty"` + // TargetConnectionInfo - Connection information for target Azure Database for PostgreSQL + TargetConnectionInfo *PostgreSQLConnectionInfo `json:"targetConnectionInfo,omitempty"` + // SourceConnectionInfo - Connection information for source PostgreSQL + SourceConnectionInfo *PostgreSQLConnectionInfo `json:"sourceConnectionInfo,omitempty"` +} + +// BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput output for the task that migrates PostgreSQL databases to +// Azure Database for PostgreSQL for online migrations +type BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput interface { + AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError, bool) + AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError, bool) + AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel, bool) + AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel, bool) + AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel, bool) + AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput, bool) +} + +// MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput output for the task that migrates PostgreSQL databases +// to Azure Database for PostgreSQL for online migrations +type MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput struct { + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput', 'ResultTypeDatabaseLevelErrorOutput', 'ResultTypeErrorOutput', 'ResultTypeTableLevelOutput', 'ResultTypeDatabaseLevelOutput', 'ResultTypeMigrationLevelOutput' + ResultType ResultType `json:"resultType,omitempty"` +} + +func unmarshalBasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput(body []byte) (BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput, error) { + var m map[string]interface{} + err := json.Unmarshal(body, &m) + if err != nil { + return nil, err + } + + switch m["resultType"] { + case string(ResultTypeDatabaseLevelErrorOutput): + var mpsadfpsstode MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError + err := json.Unmarshal(body, &mpsadfpsstode) + return mpsadfpsstode, err + case string(ResultTypeErrorOutput): + var mpsadfpsstoe MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError + err := json.Unmarshal(body, &mpsadfpsstoe) + return mpsadfpsstoe, err + case string(ResultTypeTableLevelOutput): + var mpsadfpsstotl MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel + err := json.Unmarshal(body, &mpsadfpsstotl) + return mpsadfpsstotl, err + case string(ResultTypeDatabaseLevelOutput): + var mpsadfpsstodl MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel + err := json.Unmarshal(body, &mpsadfpsstodl) + return mpsadfpsstodl, err + case string(ResultTypeMigrationLevelOutput): + var mpsadfpsstoml MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel + err := json.Unmarshal(body, &mpsadfpsstoml) + return mpsadfpsstoml, err + default: + var mpsadfpssto MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput + err := json.Unmarshal(body, &mpsadfpssto) + return mpsadfpssto, err + } +} +func unmarshalBasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputArray(body []byte) ([]BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput, error) { + var rawMessages []*json.RawMessage + err := json.Unmarshal(body, &rawMessages) + if err != nil { + return nil, err + } + + mpsadfpsstoArray := make([]BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput, len(rawMessages)) + + for index, rawMessage := range rawMessages { + mpsadfpssto, err := unmarshalBasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput(*rawMessage) + if err != nil { + return nil, err + } + mpsadfpsstoArray[index] = mpsadfpssto + } + return mpsadfpsstoArray, nil +} + +// MarshalJSON is the custom marshaler for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput. +func (mpsadfpssto MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput) MarshalJSON() ([]byte, error) { + mpsadfpssto.ResultType = ResultTypeMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput + objectMap := make(map[string]interface{}) + if mpsadfpssto.ResultType != "" { + objectMap["resultType"] = mpsadfpssto.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput. +func (mpsadfpssto MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput. +func (mpsadfpssto MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput. +func (mpsadfpssto MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput. +func (mpsadfpssto MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput. +func (mpsadfpssto MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput. +func (mpsadfpssto MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput, bool) { + return &mpsadfpssto, true +} + +// AsBasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput. +func (mpsadfpssto MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput) AsBasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput() (BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput, bool) { + return &mpsadfpssto, true +} + +// MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError ... +type MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError struct { + // ErrorMessage - Error message + ErrorMessage *string `json:"errorMessage,omitempty"` + // Events - List of error events. + Events *[]SyncMigrationDatabaseErrorEvent `json:"events,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput', 'ResultTypeDatabaseLevelErrorOutput', 'ResultTypeErrorOutput', 'ResultTypeTableLevelOutput', 'ResultTypeDatabaseLevelOutput', 'ResultTypeMigrationLevelOutput' + ResultType ResultType `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError. +func (mpsadfpsstode MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError) MarshalJSON() ([]byte, error) { + mpsadfpsstode.ResultType = ResultTypeDatabaseLevelErrorOutput + objectMap := make(map[string]interface{}) + if mpsadfpsstode.ErrorMessage != nil { + objectMap["errorMessage"] = mpsadfpsstode.ErrorMessage + } + if mpsadfpsstode.Events != nil { + objectMap["events"] = mpsadfpsstode.Events + } + if mpsadfpsstode.ResultType != "" { + objectMap["resultType"] = mpsadfpsstode.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError. +func (mpsadfpsstode MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError, bool) { + return &mpsadfpsstode, true +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError. +func (mpsadfpsstode MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError. +func (mpsadfpsstode MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError. +func (mpsadfpsstode MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError. +func (mpsadfpsstode MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError. +func (mpsadfpsstode MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput, bool) { + return nil, false +} + +// AsBasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError. +func (mpsadfpsstode MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError) AsBasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput() (BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput, bool) { + return &mpsadfpsstode, true +} + +// MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel ... +type MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel struct { + // DatabaseName - READ-ONLY; Name of the database + DatabaseName *string `json:"databaseName,omitempty"` + // StartedOn - READ-ONLY; Migration start time + StartedOn *date.Time `json:"startedOn,omitempty"` + // EndedOn - READ-ONLY; Migration end time + EndedOn *date.Time `json:"endedOn,omitempty"` + // MigrationState - READ-ONLY; Migration state that this database is in. Possible values include: 'SyncDatabaseMigrationReportingStateUNDEFINED', 'SyncDatabaseMigrationReportingStateCONFIGURING', 'SyncDatabaseMigrationReportingStateINITIALIAZING', 'SyncDatabaseMigrationReportingStateSTARTING', 'SyncDatabaseMigrationReportingStateRUNNING', 'SyncDatabaseMigrationReportingStateREADYTOCOMPLETE', 'SyncDatabaseMigrationReportingStateCOMPLETING', 'SyncDatabaseMigrationReportingStateCOMPLETE', 'SyncDatabaseMigrationReportingStateCANCELLING', 'SyncDatabaseMigrationReportingStateCANCELLED', 'SyncDatabaseMigrationReportingStateFAILED' + MigrationState SyncDatabaseMigrationReportingState `json:"migrationState,omitempty"` + // IncomingChanges - READ-ONLY; Number of incoming changes + IncomingChanges *int64 `json:"incomingChanges,omitempty"` + // AppliedChanges - READ-ONLY; Number of applied changes + AppliedChanges *int64 `json:"appliedChanges,omitempty"` + // CdcInsertCounter - READ-ONLY; Number of cdc inserts + CdcInsertCounter *int64 `json:"cdcInsertCounter,omitempty"` + // CdcDeleteCounter - READ-ONLY; Number of cdc deletes + CdcDeleteCounter *int64 `json:"cdcDeleteCounter,omitempty"` + // CdcUpdateCounter - READ-ONLY; Number of cdc updates + CdcUpdateCounter *int64 `json:"cdcUpdateCounter,omitempty"` + // FullLoadCompletedTables - READ-ONLY; Number of tables completed in full load + FullLoadCompletedTables *int64 `json:"fullLoadCompletedTables,omitempty"` + // FullLoadLoadingTables - READ-ONLY; Number of tables loading in full load + FullLoadLoadingTables *int64 `json:"fullLoadLoadingTables,omitempty"` + // FullLoadQueuedTables - READ-ONLY; Number of tables queued in full load + FullLoadQueuedTables *int64 `json:"fullLoadQueuedTables,omitempty"` + // FullLoadErroredTables - READ-ONLY; Number of tables errored in full load + FullLoadErroredTables *int64 `json:"fullLoadErroredTables,omitempty"` + // InitializationCompleted - READ-ONLY; Indicates if initial load (full load) has been completed + InitializationCompleted *bool `json:"initializationCompleted,omitempty"` + // Latency - READ-ONLY; CDC apply latency + Latency *int64 `json:"latency,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput', 'ResultTypeDatabaseLevelErrorOutput', 'ResultTypeErrorOutput', 'ResultTypeTableLevelOutput', 'ResultTypeDatabaseLevelOutput', 'ResultTypeMigrationLevelOutput' + ResultType ResultType `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel. +func (mpsadfpsstodl MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel) MarshalJSON() ([]byte, error) { + mpsadfpsstodl.ResultType = ResultTypeDatabaseLevelOutput + objectMap := make(map[string]interface{}) + if mpsadfpsstodl.ResultType != "" { + objectMap["resultType"] = mpsadfpsstodl.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel. +func (mpsadfpsstodl MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel. +func (mpsadfpsstodl MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel. +func (mpsadfpsstodl MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel. +func (mpsadfpsstodl MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel, bool) { + return &mpsadfpsstodl, true +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel. +func (mpsadfpsstodl MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel. +func (mpsadfpsstodl MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput, bool) { + return nil, false +} + +// AsBasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel. +func (mpsadfpsstodl MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel) AsBasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput() (BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput, bool) { + return &mpsadfpsstodl, true +} + +// MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError ... +type MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError struct { + // Error - READ-ONLY; Migration error + Error *ReportableException `json:"error,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput', 'ResultTypeDatabaseLevelErrorOutput', 'ResultTypeErrorOutput', 'ResultTypeTableLevelOutput', 'ResultTypeDatabaseLevelOutput', 'ResultTypeMigrationLevelOutput' + ResultType ResultType `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError. +func (mpsadfpsstoe MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError) MarshalJSON() ([]byte, error) { + mpsadfpsstoe.ResultType = ResultTypeErrorOutput + objectMap := make(map[string]interface{}) + if mpsadfpsstoe.ResultType != "" { + objectMap["resultType"] = mpsadfpsstoe.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError. +func (mpsadfpsstoe MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError. +func (mpsadfpsstoe MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError, bool) { + return &mpsadfpsstoe, true +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError. +func (mpsadfpsstoe MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError. +func (mpsadfpsstoe MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError. +func (mpsadfpsstoe MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError. +func (mpsadfpsstoe MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput, bool) { + return nil, false +} + +// AsBasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError. +func (mpsadfpsstoe MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError) AsBasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput() (BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput, bool) { + return &mpsadfpsstoe, true +} + +// MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel ... +type MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel struct { + // StartedOn - READ-ONLY; Migration start time + StartedOn *date.Time `json:"startedOn,omitempty"` + // EndedOn - READ-ONLY; Migration end time + EndedOn *date.Time `json:"endedOn,omitempty"` + // SourceServerVersion - READ-ONLY; Source server version + SourceServerVersion *string `json:"sourceServerVersion,omitempty"` + // SourceServer - READ-ONLY; Source server name + SourceServer *string `json:"sourceServer,omitempty"` + // TargetServerVersion - READ-ONLY; Target server version + TargetServerVersion *string `json:"targetServerVersion,omitempty"` + // TargetServer - READ-ONLY; Target server name + TargetServer *string `json:"targetServer,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput', 'ResultTypeDatabaseLevelErrorOutput', 'ResultTypeErrorOutput', 'ResultTypeTableLevelOutput', 'ResultTypeDatabaseLevelOutput', 'ResultTypeMigrationLevelOutput' + ResultType ResultType `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel. +func (mpsadfpsstoml MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel) MarshalJSON() ([]byte, error) { + mpsadfpsstoml.ResultType = ResultTypeMigrationLevelOutput + objectMap := make(map[string]interface{}) + if mpsadfpsstoml.ResultType != "" { + objectMap["resultType"] = mpsadfpsstoml.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel. +func (mpsadfpsstoml MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel. +func (mpsadfpsstoml MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel. +func (mpsadfpsstoml MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel. +func (mpsadfpsstoml MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel. +func (mpsadfpsstoml MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel, bool) { + return &mpsadfpsstoml, true +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel. +func (mpsadfpsstoml MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput, bool) { + return nil, false +} + +// AsBasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel. +func (mpsadfpsstoml MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel) AsBasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput() (BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput, bool) { + return &mpsadfpsstoml, true +} + +// MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel ... +type MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel struct { + // TableName - READ-ONLY; Name of the table + TableName *string `json:"tableName,omitempty"` + // DatabaseName - READ-ONLY; Name of the database + DatabaseName *string `json:"databaseName,omitempty"` + // CdcInsertCounter - READ-ONLY; Number of applied inserts + CdcInsertCounter *int64 `json:"cdcInsertCounter,omitempty"` + // CdcUpdateCounter - READ-ONLY; Number of applied updates + CdcUpdateCounter *int64 `json:"cdcUpdateCounter,omitempty"` + // CdcDeleteCounter - READ-ONLY; Number of applied deletes + CdcDeleteCounter *int64 `json:"cdcDeleteCounter,omitempty"` + // FullLoadEstFinishTime - READ-ONLY; Estimate to finish full load + FullLoadEstFinishTime *date.Time `json:"fullLoadEstFinishTime,omitempty"` + // FullLoadStartedOn - READ-ONLY; Full load start time + FullLoadStartedOn *date.Time `json:"fullLoadStartedOn,omitempty"` + // FullLoadEndedOn - READ-ONLY; Full load end time + FullLoadEndedOn *date.Time `json:"fullLoadEndedOn,omitempty"` + // FullLoadTotalRows - READ-ONLY; Number of rows applied in full load + FullLoadTotalRows *int64 `json:"fullLoadTotalRows,omitempty"` + // State - READ-ONLY; Current state of the table migration. Possible values include: 'SyncTableMigrationStateBEFORELOAD', 'SyncTableMigrationStateFULLLOAD', 'SyncTableMigrationStateCOMPLETED', 'SyncTableMigrationStateCANCELED', 'SyncTableMigrationStateERROR', 'SyncTableMigrationStateFAILED' + State SyncTableMigrationState `json:"state,omitempty"` + // TotalChangesApplied - READ-ONLY; Total number of applied changes + TotalChangesApplied *int64 `json:"totalChangesApplied,omitempty"` + // DataErrorsCounter - READ-ONLY; Number of data errors occurred + DataErrorsCounter *int64 `json:"dataErrorsCounter,omitempty"` + // LastModifiedTime - READ-ONLY; Last modified time on target + LastModifiedTime *date.Time `json:"lastModifiedTime,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput', 'ResultTypeDatabaseLevelErrorOutput', 'ResultTypeErrorOutput', 'ResultTypeTableLevelOutput', 'ResultTypeDatabaseLevelOutput', 'ResultTypeMigrationLevelOutput' + ResultType ResultType `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel. +func (mpsadfpsstotl MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel) MarshalJSON() ([]byte, error) { + mpsadfpsstotl.ResultType = ResultTypeTableLevelOutput + objectMap := make(map[string]interface{}) + if mpsadfpsstotl.ResultType != "" { + objectMap["resultType"] = mpsadfpsstotl.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel. +func (mpsadfpsstotl MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseError, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel. +func (mpsadfpsstotl MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputError, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel. +func (mpsadfpsstotl MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel, bool) { + return &mpsadfpsstotl, true +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel. +func (mpsadfpsstotl MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel. +func (mpsadfpsstotl MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel. +func (mpsadfpsstotl MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput, bool) { + return nil, false +} + +// AsBasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput is the BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel. +func (mpsadfpsstotl MigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputTableLevel) AsBasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput() (BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput, bool) { + return &mpsadfpsstotl, true +} + +// MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties properties for the task that migrates PostgreSQL +// databases to Azure Database for PostgreSQL for online migrations +type MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties struct { + // Input - Task input + Input *MigratePostgreSQLAzureDbForPostgreSQLSyncTaskInput `json:"input,omitempty"` + // Output - READ-ONLY; Task output. This is ignored if submitted. + Output *[]BasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the task. This is ignored if submitted. Possible values include: 'TaskStateUnknown', 'TaskStateQueued', 'TaskStateRunning', 'TaskStateCanceled', 'TaskStateSucceeded', 'TaskStateFailed', 'TaskStateFailedInputValidation', 'TaskStateFaulted' + State TaskState `json:"state,omitempty"` + // Commands - READ-ONLY; Array of command properties. + Commands *[]BasicCommandProperties `json:"commands,omitempty"` + // TaskType - Possible values include: 'TaskTypeProjectTaskProperties', 'TaskTypeGetTDECertificatesSQL', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI', 'TaskTypeValidateMigrationInputSQLServerSQLDbSync', 'TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync', 'TaskTypeMigrateMySQLAzureDbForMySQLSync', 'TaskTypeMigrateSQLServerAzureSQLDbSync', 'TaskTypeMigrateSQLServerSQLDb', 'TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS', 'TaskTypeMigrateSQLServerAzureSQLDbMI', 'TaskTypeConnectToTargetAzureDbForMySQL', 'TaskTypeConnectToTargetAzureSQLDbMISyncLRS', 'TaskTypeConnectToTargetAzureSQLDbMI', 'TaskTypeGetUserTablesAzureSQLDbSync', 'TaskTypeGetUserTablesSQL', 'TaskTypeConnectToTargetAzureDbForPostgreSQLSync', 'TaskTypeConnectToTargetSQLDbSync', 'TaskTypeConnectToTargetSQLDb', 'TaskTypeConnectToSourcePostgreSQLSync', 'TaskTypeConnectToSourceSQLServerSync', 'TaskTypeConnectToSourceSQLServer', 'TaskTypeConnectToSourceMySQL' + TaskType TaskType `json:"taskType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) MarshalJSON() ([]byte, error) { + mpsadfpsstp.TaskType = TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync + objectMap := make(map[string]interface{}) + if mpsadfpsstp.Input != nil { + objectMap["input"] = mpsadfpsstp.Input + } + if mpsadfpsstp.TaskType != "" { + objectMap["taskType"] = mpsadfpsstp.TaskType + } + return json.Marshal(objectMap) +} + +// AsGetTdeCertificatesSQLTaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) { + return &mpsadfpsstp, true +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForMySQLTaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMITaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLTaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLDbTaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourcePostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerSyncTaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceMySQLTaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) { + return nil, false +} + +// AsProjectTaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsProjectTaskProperties() (*ProjectTaskProperties, bool) { + return nil, false +} + +// AsBasicProjectTaskProperties is the BasicProjectTaskProperties implementation for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties. +func (mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) AsBasicProjectTaskProperties() (BasicProjectTaskProperties, bool) { + return &mpsadfpsstp, true +} + +// UnmarshalJSON is the custom unmarshaler for MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties struct. +func (mpsadfpsstp *MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "input": + if v != nil { + var input MigratePostgreSQLAzureDbForPostgreSQLSyncTaskInput + err = json.Unmarshal(*v, &input) + if err != nil { + return err + } + mpsadfpsstp.Input = &input + } + case "output": + if v != nil { + output, err := unmarshalBasicMigratePostgreSQLAzureDbForPostgreSQLSyncTaskOutputArray(*v) + if err != nil { + return err + } + mpsadfpsstp.Output = &output + } + case "errors": + if v != nil { + var errorsVar []ODataError + err = json.Unmarshal(*v, &errorsVar) + if err != nil { + return err + } + mpsadfpsstp.Errors = &errorsVar + } + case "state": + if v != nil { + var state TaskState + err = json.Unmarshal(*v, &state) + if err != nil { + return err + } + mpsadfpsstp.State = state + } + case "commands": + if v != nil { + commands, err := unmarshalBasicCommandPropertiesArray(*v) + if err != nil { + return err + } + mpsadfpsstp.Commands = &commands + } + case "taskType": + if v != nil { + var taskType TaskType + err = json.Unmarshal(*v, &taskType) + if err != nil { + return err + } + mpsadfpsstp.TaskType = taskType + } + } + } + + return nil +} + +// MigrateSQLServerSQLDbDatabaseInput database specific information for SQL to Azure SQL DB migration task +// inputs +type MigrateSQLServerSQLDbDatabaseInput struct { + // Name - Name of the database + Name *string `json:"name,omitempty"` + // TargetDatabaseName - Name of target database. Note: Target database will be truncated before starting migration. + TargetDatabaseName *string `json:"targetDatabaseName,omitempty"` + // MakeSourceDbReadOnly - Whether to set database read only before migration + MakeSourceDbReadOnly *bool `json:"makeSourceDbReadOnly,omitempty"` + // TableMap - Mapping of source to target tables + TableMap map[string]*string `json:"tableMap"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLDbDatabaseInput. +func (msssddi MigrateSQLServerSQLDbDatabaseInput) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if msssddi.Name != nil { + objectMap["name"] = msssddi.Name + } + if msssddi.TargetDatabaseName != nil { + objectMap["targetDatabaseName"] = msssddi.TargetDatabaseName + } + if msssddi.MakeSourceDbReadOnly != nil { + objectMap["makeSourceDbReadOnly"] = msssddi.MakeSourceDbReadOnly + } + if msssddi.TableMap != nil { + objectMap["tableMap"] = msssddi.TableMap + } + return json.Marshal(objectMap) +} + +// MigrateSQLServerSQLDbSyncDatabaseInput database specific information for SQL to Azure SQL DB sync +// migration task inputs +type MigrateSQLServerSQLDbSyncDatabaseInput struct { + // ID - Unique identifier for database + ID *string `json:"id,omitempty"` + // Name - Name of database + Name *string `json:"name,omitempty"` + // TargetDatabaseName - Target database name + TargetDatabaseName *string `json:"targetDatabaseName,omitempty"` + // SchemaName - Schema name to be migrated + SchemaName *string `json:"schemaName,omitempty"` + // TableMap - Mapping of source to target tables + TableMap map[string]*string `json:"tableMap"` + // MigrationSetting - Migration settings which tune the migration behavior + MigrationSetting map[string]*string `json:"migrationSetting"` + // SourceSetting - Source settings to tune source endpoint migration behavior + SourceSetting map[string]*string `json:"sourceSetting"` + // TargetSetting - Target settings to tune target endpoint migration behavior + TargetSetting map[string]*string `json:"targetSetting"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLDbSyncDatabaseInput. +func (msssdsdi MigrateSQLServerSQLDbSyncDatabaseInput) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if msssdsdi.ID != nil { + objectMap["id"] = msssdsdi.ID + } + if msssdsdi.Name != nil { + objectMap["name"] = msssdsdi.Name + } + if msssdsdi.TargetDatabaseName != nil { + objectMap["targetDatabaseName"] = msssdsdi.TargetDatabaseName + } + if msssdsdi.SchemaName != nil { + objectMap["schemaName"] = msssdsdi.SchemaName + } + if msssdsdi.TableMap != nil { + objectMap["tableMap"] = msssdsdi.TableMap + } + if msssdsdi.MigrationSetting != nil { + objectMap["migrationSetting"] = msssdsdi.MigrationSetting + } + if msssdsdi.SourceSetting != nil { + objectMap["sourceSetting"] = msssdsdi.SourceSetting + } + if msssdsdi.TargetSetting != nil { + objectMap["targetSetting"] = msssdsdi.TargetSetting + } + return json.Marshal(objectMap) +} + +// MigrateSQLServerSQLDbSyncTaskInput input for the task that migrates on-prem SQL Server databases to +// Azure SQL Database for online migrations +type MigrateSQLServerSQLDbSyncTaskInput struct { + // SelectedDatabases - Databases to migrate + SelectedDatabases *[]MigrateSQLServerSQLDbSyncDatabaseInput `json:"selectedDatabases,omitempty"` + // ValidationOptions - Validation options + ValidationOptions *MigrationValidationOptions `json:"validationOptions,omitempty"` + // SourceConnectionInfo - Information for connecting to source + SourceConnectionInfo *SQLConnectionInfo `json:"sourceConnectionInfo,omitempty"` + // TargetConnectionInfo - Information for connecting to target + TargetConnectionInfo *SQLConnectionInfo `json:"targetConnectionInfo,omitempty"` +} + +// BasicMigrateSQLServerSQLDbSyncTaskOutput output for the task that migrates on-prem SQL Server databases to Azure SQL +// Database for online migrations +type BasicMigrateSQLServerSQLDbSyncTaskOutput interface { + AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseError() (*MigrateSQLServerSQLDbSyncTaskOutputDatabaseError, bool) + AsMigrateSQLServerSQLDbSyncTaskOutputError() (*MigrateSQLServerSQLDbSyncTaskOutputError, bool) + AsMigrateSQLServerSQLDbSyncTaskOutputTableLevel() (*MigrateSQLServerSQLDbSyncTaskOutputTableLevel, bool) + AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel() (*MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel, bool) + AsMigrateSQLServerSQLDbSyncTaskOutputMigrationLevel() (*MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel, bool) + AsMigrateSQLServerSQLDbSyncTaskOutput() (*MigrateSQLServerSQLDbSyncTaskOutput, bool) +} + +// MigrateSQLServerSQLDbSyncTaskOutput output for the task that migrates on-prem SQL Server databases to Azure +// SQL Database for online migrations +type MigrateSQLServerSQLDbSyncTaskOutput struct { + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeMigrateSQLServerSQLDbSyncTaskOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeDatabaseLevelErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeTableLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutput `json:"resultType,omitempty"` +} + +func unmarshalBasicMigrateSQLServerSQLDbSyncTaskOutput(body []byte) (BasicMigrateSQLServerSQLDbSyncTaskOutput, error) { + var m map[string]interface{} + err := json.Unmarshal(body, &m) + if err != nil { + return nil, err + } + + switch m["resultType"] { + case string(ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeDatabaseLevelErrorOutput): + var msssdstode MigrateSQLServerSQLDbSyncTaskOutputDatabaseError + err := json.Unmarshal(body, &msssdstode) + return msssdstode, err + case string(ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeErrorOutput): + var msssdstoe MigrateSQLServerSQLDbSyncTaskOutputError + err := json.Unmarshal(body, &msssdstoe) + return msssdstoe, err + case string(ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeTableLevelOutput): + var msssdstotl MigrateSQLServerSQLDbSyncTaskOutputTableLevel + err := json.Unmarshal(body, &msssdstotl) + return msssdstotl, err + case string(ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeDatabaseLevelOutput): + var msssdstodl MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel + err := json.Unmarshal(body, &msssdstodl) + return msssdstodl, err + case string(ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeMigrationLevelOutput): + var msssdstoml MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel + err := json.Unmarshal(body, &msssdstoml) + return msssdstoml, err + default: + var msssdsto MigrateSQLServerSQLDbSyncTaskOutput + err := json.Unmarshal(body, &msssdsto) + return msssdsto, err + } +} +func unmarshalBasicMigrateSQLServerSQLDbSyncTaskOutputArray(body []byte) ([]BasicMigrateSQLServerSQLDbSyncTaskOutput, error) { + var rawMessages []*json.RawMessage + err := json.Unmarshal(body, &rawMessages) + if err != nil { + return nil, err + } + + msssdstoArray := make([]BasicMigrateSQLServerSQLDbSyncTaskOutput, len(rawMessages)) + + for index, rawMessage := range rawMessages { + msssdsto, err := unmarshalBasicMigrateSQLServerSQLDbSyncTaskOutput(*rawMessage) + if err != nil { + return nil, err + } + msssdstoArray[index] = msssdsto + } + return msssdstoArray, nil +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLDbSyncTaskOutput. +func (msssdsto MigrateSQLServerSQLDbSyncTaskOutput) MarshalJSON() ([]byte, error) { + msssdsto.ResultType = ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeMigrateSQLServerSQLDbSyncTaskOutput + objectMap := make(map[string]interface{}) + if msssdsto.ResultType != "" { + objectMap["resultType"] = msssdsto.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseError is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutput. +func (msssdsto MigrateSQLServerSQLDbSyncTaskOutput) AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseError() (*MigrateSQLServerSQLDbSyncTaskOutputDatabaseError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputError is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutput. +func (msssdsto MigrateSQLServerSQLDbSyncTaskOutput) AsMigrateSQLServerSQLDbSyncTaskOutputError() (*MigrateSQLServerSQLDbSyncTaskOutputError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputTableLevel is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutput. +func (msssdsto MigrateSQLServerSQLDbSyncTaskOutput) AsMigrateSQLServerSQLDbSyncTaskOutputTableLevel() (*MigrateSQLServerSQLDbSyncTaskOutputTableLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutput. +func (msssdsto MigrateSQLServerSQLDbSyncTaskOutput) AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel() (*MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputMigrationLevel is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutput. +func (msssdsto MigrateSQLServerSQLDbSyncTaskOutput) AsMigrateSQLServerSQLDbSyncTaskOutputMigrationLevel() (*MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutput is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutput. +func (msssdsto MigrateSQLServerSQLDbSyncTaskOutput) AsMigrateSQLServerSQLDbSyncTaskOutput() (*MigrateSQLServerSQLDbSyncTaskOutput, bool) { + return &msssdsto, true +} + +// AsBasicMigrateSQLServerSQLDbSyncTaskOutput is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutput. +func (msssdsto MigrateSQLServerSQLDbSyncTaskOutput) AsBasicMigrateSQLServerSQLDbSyncTaskOutput() (BasicMigrateSQLServerSQLDbSyncTaskOutput, bool) { + return &msssdsto, true +} + +// MigrateSQLServerSQLDbSyncTaskOutputDatabaseError ... +type MigrateSQLServerSQLDbSyncTaskOutputDatabaseError struct { + // ErrorMessage - Error message + ErrorMessage *string `json:"errorMessage,omitempty"` + // Events - List of error events. + Events *[]SyncMigrationDatabaseErrorEvent `json:"events,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeMigrateSQLServerSQLDbSyncTaskOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeDatabaseLevelErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeTableLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLDbSyncTaskOutputDatabaseError. +func (msssdstode MigrateSQLServerSQLDbSyncTaskOutputDatabaseError) MarshalJSON() ([]byte, error) { + msssdstode.ResultType = ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeDatabaseLevelErrorOutput + objectMap := make(map[string]interface{}) + if msssdstode.ErrorMessage != nil { + objectMap["errorMessage"] = msssdstode.ErrorMessage + } + if msssdstode.Events != nil { + objectMap["events"] = msssdstode.Events + } + if msssdstode.ResultType != "" { + objectMap["resultType"] = msssdstode.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseError is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputDatabaseError. +func (msssdstode MigrateSQLServerSQLDbSyncTaskOutputDatabaseError) AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseError() (*MigrateSQLServerSQLDbSyncTaskOutputDatabaseError, bool) { + return &msssdstode, true +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputError is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputDatabaseError. +func (msssdstode MigrateSQLServerSQLDbSyncTaskOutputDatabaseError) AsMigrateSQLServerSQLDbSyncTaskOutputError() (*MigrateSQLServerSQLDbSyncTaskOutputError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputTableLevel is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputDatabaseError. +func (msssdstode MigrateSQLServerSQLDbSyncTaskOutputDatabaseError) AsMigrateSQLServerSQLDbSyncTaskOutputTableLevel() (*MigrateSQLServerSQLDbSyncTaskOutputTableLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputDatabaseError. +func (msssdstode MigrateSQLServerSQLDbSyncTaskOutputDatabaseError) AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel() (*MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputMigrationLevel is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputDatabaseError. +func (msssdstode MigrateSQLServerSQLDbSyncTaskOutputDatabaseError) AsMigrateSQLServerSQLDbSyncTaskOutputMigrationLevel() (*MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutput is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputDatabaseError. +func (msssdstode MigrateSQLServerSQLDbSyncTaskOutputDatabaseError) AsMigrateSQLServerSQLDbSyncTaskOutput() (*MigrateSQLServerSQLDbSyncTaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateSQLServerSQLDbSyncTaskOutput is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputDatabaseError. +func (msssdstode MigrateSQLServerSQLDbSyncTaskOutputDatabaseError) AsBasicMigrateSQLServerSQLDbSyncTaskOutput() (BasicMigrateSQLServerSQLDbSyncTaskOutput, bool) { + return &msssdstode, true +} + +// MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel ... +type MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel struct { + // DatabaseName - READ-ONLY; Name of the database + DatabaseName *string `json:"databaseName,omitempty"` + // StartedOn - READ-ONLY; Migration start time + StartedOn *date.Time `json:"startedOn,omitempty"` + // EndedOn - READ-ONLY; Migration end time + EndedOn *date.Time `json:"endedOn,omitempty"` + // MigrationState - READ-ONLY; Migration state that this database is in. Possible values include: 'SyncDatabaseMigrationReportingStateUNDEFINED', 'SyncDatabaseMigrationReportingStateCONFIGURING', 'SyncDatabaseMigrationReportingStateINITIALIAZING', 'SyncDatabaseMigrationReportingStateSTARTING', 'SyncDatabaseMigrationReportingStateRUNNING', 'SyncDatabaseMigrationReportingStateREADYTOCOMPLETE', 'SyncDatabaseMigrationReportingStateCOMPLETING', 'SyncDatabaseMigrationReportingStateCOMPLETE', 'SyncDatabaseMigrationReportingStateCANCELLING', 'SyncDatabaseMigrationReportingStateCANCELLED', 'SyncDatabaseMigrationReportingStateFAILED' + MigrationState SyncDatabaseMigrationReportingState `json:"migrationState,omitempty"` + // IncomingChanges - READ-ONLY; Number of incoming changes + IncomingChanges *int64 `json:"incomingChanges,omitempty"` + // AppliedChanges - READ-ONLY; Number of applied changes + AppliedChanges *int64 `json:"appliedChanges,omitempty"` + // CdcInsertCounter - READ-ONLY; Number of cdc inserts + CdcInsertCounter *int64 `json:"cdcInsertCounter,omitempty"` + // CdcDeleteCounter - READ-ONLY; Number of cdc deletes + CdcDeleteCounter *int64 `json:"cdcDeleteCounter,omitempty"` + // CdcUpdateCounter - READ-ONLY; Number of cdc updates + CdcUpdateCounter *int64 `json:"cdcUpdateCounter,omitempty"` + // FullLoadCompletedTables - READ-ONLY; Number of tables completed in full load + FullLoadCompletedTables *int64 `json:"fullLoadCompletedTables,omitempty"` + // FullLoadLoadingTables - READ-ONLY; Number of tables loading in full load + FullLoadLoadingTables *int64 `json:"fullLoadLoadingTables,omitempty"` + // FullLoadQueuedTables - READ-ONLY; Number of tables queued in full load + FullLoadQueuedTables *int64 `json:"fullLoadQueuedTables,omitempty"` + // FullLoadErroredTables - READ-ONLY; Number of tables errored in full load + FullLoadErroredTables *int64 `json:"fullLoadErroredTables,omitempty"` + // InitializationCompleted - READ-ONLY; Indicates if initial load (full load) has been completed + InitializationCompleted *bool `json:"initializationCompleted,omitempty"` + // Latency - READ-ONLY; CDC apply latency + Latency *int64 `json:"latency,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeMigrateSQLServerSQLDbSyncTaskOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeDatabaseLevelErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeTableLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel. +func (msssdstodl MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel) MarshalJSON() ([]byte, error) { + msssdstodl.ResultType = ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeDatabaseLevelOutput + objectMap := make(map[string]interface{}) + if msssdstodl.ResultType != "" { + objectMap["resultType"] = msssdstodl.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseError is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel. +func (msssdstodl MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel) AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseError() (*MigrateSQLServerSQLDbSyncTaskOutputDatabaseError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputError is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel. +func (msssdstodl MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel) AsMigrateSQLServerSQLDbSyncTaskOutputError() (*MigrateSQLServerSQLDbSyncTaskOutputError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputTableLevel is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel. +func (msssdstodl MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel) AsMigrateSQLServerSQLDbSyncTaskOutputTableLevel() (*MigrateSQLServerSQLDbSyncTaskOutputTableLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel. +func (msssdstodl MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel) AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel() (*MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel, bool) { + return &msssdstodl, true +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputMigrationLevel is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel. +func (msssdstodl MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel) AsMigrateSQLServerSQLDbSyncTaskOutputMigrationLevel() (*MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutput is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel. +func (msssdstodl MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel) AsMigrateSQLServerSQLDbSyncTaskOutput() (*MigrateSQLServerSQLDbSyncTaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateSQLServerSQLDbSyncTaskOutput is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel. +func (msssdstodl MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel) AsBasicMigrateSQLServerSQLDbSyncTaskOutput() (BasicMigrateSQLServerSQLDbSyncTaskOutput, bool) { + return &msssdstodl, true +} + +// MigrateSQLServerSQLDbSyncTaskOutputError ... +type MigrateSQLServerSQLDbSyncTaskOutputError struct { + // Error - READ-ONLY; Migration error + Error *ReportableException `json:"error,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeMigrateSQLServerSQLDbSyncTaskOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeDatabaseLevelErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeTableLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLDbSyncTaskOutputError. +func (msssdstoe MigrateSQLServerSQLDbSyncTaskOutputError) MarshalJSON() ([]byte, error) { + msssdstoe.ResultType = ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeErrorOutput + objectMap := make(map[string]interface{}) + if msssdstoe.ResultType != "" { + objectMap["resultType"] = msssdstoe.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseError is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputError. +func (msssdstoe MigrateSQLServerSQLDbSyncTaskOutputError) AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseError() (*MigrateSQLServerSQLDbSyncTaskOutputDatabaseError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputError is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputError. +func (msssdstoe MigrateSQLServerSQLDbSyncTaskOutputError) AsMigrateSQLServerSQLDbSyncTaskOutputError() (*MigrateSQLServerSQLDbSyncTaskOutputError, bool) { + return &msssdstoe, true +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputTableLevel is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputError. +func (msssdstoe MigrateSQLServerSQLDbSyncTaskOutputError) AsMigrateSQLServerSQLDbSyncTaskOutputTableLevel() (*MigrateSQLServerSQLDbSyncTaskOutputTableLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputError. +func (msssdstoe MigrateSQLServerSQLDbSyncTaskOutputError) AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel() (*MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputMigrationLevel is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputError. +func (msssdstoe MigrateSQLServerSQLDbSyncTaskOutputError) AsMigrateSQLServerSQLDbSyncTaskOutputMigrationLevel() (*MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutput is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputError. +func (msssdstoe MigrateSQLServerSQLDbSyncTaskOutputError) AsMigrateSQLServerSQLDbSyncTaskOutput() (*MigrateSQLServerSQLDbSyncTaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateSQLServerSQLDbSyncTaskOutput is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputError. +func (msssdstoe MigrateSQLServerSQLDbSyncTaskOutputError) AsBasicMigrateSQLServerSQLDbSyncTaskOutput() (BasicMigrateSQLServerSQLDbSyncTaskOutput, bool) { + return &msssdstoe, true +} + +// MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel ... +type MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel struct { + // StartedOn - READ-ONLY; Migration start time + StartedOn *date.Time `json:"startedOn,omitempty"` + // EndedOn - READ-ONLY; Migration end time + EndedOn *date.Time `json:"endedOn,omitempty"` + // SourceServerVersion - READ-ONLY; Source server version + SourceServerVersion *string `json:"sourceServerVersion,omitempty"` + // SourceServer - READ-ONLY; Source server name + SourceServer *string `json:"sourceServer,omitempty"` + // TargetServerVersion - READ-ONLY; Target server version + TargetServerVersion *string `json:"targetServerVersion,omitempty"` + // TargetServer - READ-ONLY; Target server name + TargetServer *string `json:"targetServer,omitempty"` + // DatabaseCount - READ-ONLY; Count of databases + DatabaseCount *int32 `json:"databaseCount,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeMigrateSQLServerSQLDbSyncTaskOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeDatabaseLevelErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeTableLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel. +func (msssdstoml MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel) MarshalJSON() ([]byte, error) { + msssdstoml.ResultType = ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeMigrationLevelOutput + objectMap := make(map[string]interface{}) + if msssdstoml.ResultType != "" { + objectMap["resultType"] = msssdstoml.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseError is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel. +func (msssdstoml MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel) AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseError() (*MigrateSQLServerSQLDbSyncTaskOutputDatabaseError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputError is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel. +func (msssdstoml MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel) AsMigrateSQLServerSQLDbSyncTaskOutputError() (*MigrateSQLServerSQLDbSyncTaskOutputError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputTableLevel is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel. +func (msssdstoml MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel) AsMigrateSQLServerSQLDbSyncTaskOutputTableLevel() (*MigrateSQLServerSQLDbSyncTaskOutputTableLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel. +func (msssdstoml MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel) AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel() (*MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputMigrationLevel is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel. +func (msssdstoml MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel) AsMigrateSQLServerSQLDbSyncTaskOutputMigrationLevel() (*MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel, bool) { + return &msssdstoml, true +} + +// AsMigrateSQLServerSQLDbSyncTaskOutput is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel. +func (msssdstoml MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel) AsMigrateSQLServerSQLDbSyncTaskOutput() (*MigrateSQLServerSQLDbSyncTaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateSQLServerSQLDbSyncTaskOutput is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel. +func (msssdstoml MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel) AsBasicMigrateSQLServerSQLDbSyncTaskOutput() (BasicMigrateSQLServerSQLDbSyncTaskOutput, bool) { + return &msssdstoml, true +} + +// MigrateSQLServerSQLDbSyncTaskOutputTableLevel ... +type MigrateSQLServerSQLDbSyncTaskOutputTableLevel struct { + // TableName - READ-ONLY; Name of the table + TableName *string `json:"tableName,omitempty"` + // DatabaseName - READ-ONLY; Name of the database + DatabaseName *string `json:"databaseName,omitempty"` + // CdcInsertCounter - READ-ONLY; Number of applied inserts + CdcInsertCounter *int64 `json:"cdcInsertCounter,omitempty"` + // CdcUpdateCounter - READ-ONLY; Number of applied updates + CdcUpdateCounter *int64 `json:"cdcUpdateCounter,omitempty"` + // CdcDeleteCounter - READ-ONLY; Number of applied deletes + CdcDeleteCounter *int64 `json:"cdcDeleteCounter,omitempty"` + // FullLoadEstFinishTime - READ-ONLY; Estimate to finish full load + FullLoadEstFinishTime *date.Time `json:"fullLoadEstFinishTime,omitempty"` + // FullLoadStartedOn - READ-ONLY; Full load start time + FullLoadStartedOn *date.Time `json:"fullLoadStartedOn,omitempty"` + // FullLoadEndedOn - READ-ONLY; Full load end time + FullLoadEndedOn *date.Time `json:"fullLoadEndedOn,omitempty"` + // FullLoadTotalRows - READ-ONLY; Number of rows applied in full load + FullLoadTotalRows *int64 `json:"fullLoadTotalRows,omitempty"` + // State - READ-ONLY; Current state of the table migration. Possible values include: 'SyncTableMigrationStateBEFORELOAD', 'SyncTableMigrationStateFULLLOAD', 'SyncTableMigrationStateCOMPLETED', 'SyncTableMigrationStateCANCELED', 'SyncTableMigrationStateERROR', 'SyncTableMigrationStateFAILED' + State SyncTableMigrationState `json:"state,omitempty"` + // TotalChangesApplied - READ-ONLY; Total number of applied changes + TotalChangesApplied *int64 `json:"totalChangesApplied,omitempty"` + // DataErrorsCounter - READ-ONLY; Number of data errors occurred + DataErrorsCounter *int64 `json:"dataErrorsCounter,omitempty"` + // LastModifiedTime - READ-ONLY; Last modified time on target + LastModifiedTime *date.Time `json:"lastModifiedTime,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeMigrateSQLServerSQLDbSyncTaskOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeDatabaseLevelErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeTableLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLDbSyncTaskOutputTableLevel. +func (msssdstotl MigrateSQLServerSQLDbSyncTaskOutputTableLevel) MarshalJSON() ([]byte, error) { + msssdstotl.ResultType = ResultTypeBasicMigrateSQLServerSQLDbSyncTaskOutputResultTypeTableLevelOutput + objectMap := make(map[string]interface{}) + if msssdstotl.ResultType != "" { + objectMap["resultType"] = msssdstotl.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseError is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputTableLevel. +func (msssdstotl MigrateSQLServerSQLDbSyncTaskOutputTableLevel) AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseError() (*MigrateSQLServerSQLDbSyncTaskOutputDatabaseError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputError is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputTableLevel. +func (msssdstotl MigrateSQLServerSQLDbSyncTaskOutputTableLevel) AsMigrateSQLServerSQLDbSyncTaskOutputError() (*MigrateSQLServerSQLDbSyncTaskOutputError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputTableLevel is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputTableLevel. +func (msssdstotl MigrateSQLServerSQLDbSyncTaskOutputTableLevel) AsMigrateSQLServerSQLDbSyncTaskOutputTableLevel() (*MigrateSQLServerSQLDbSyncTaskOutputTableLevel, bool) { + return &msssdstotl, true +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputTableLevel. +func (msssdstotl MigrateSQLServerSQLDbSyncTaskOutputTableLevel) AsMigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel() (*MigrateSQLServerSQLDbSyncTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutputMigrationLevel is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputTableLevel. +func (msssdstotl MigrateSQLServerSQLDbSyncTaskOutputTableLevel) AsMigrateSQLServerSQLDbSyncTaskOutputMigrationLevel() (*MigrateSQLServerSQLDbSyncTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskOutput is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputTableLevel. +func (msssdstotl MigrateSQLServerSQLDbSyncTaskOutputTableLevel) AsMigrateSQLServerSQLDbSyncTaskOutput() (*MigrateSQLServerSQLDbSyncTaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateSQLServerSQLDbSyncTaskOutput is the BasicMigrateSQLServerSQLDbSyncTaskOutput implementation for MigrateSQLServerSQLDbSyncTaskOutputTableLevel. +func (msssdstotl MigrateSQLServerSQLDbSyncTaskOutputTableLevel) AsBasicMigrateSQLServerSQLDbSyncTaskOutput() (BasicMigrateSQLServerSQLDbSyncTaskOutput, bool) { + return &msssdstotl, true +} + +// MigrateSQLServerSQLDbSyncTaskProperties properties for the task that migrates on-prem SQL Server +// databases to Azure SQL Database for online migrations +type MigrateSQLServerSQLDbSyncTaskProperties struct { + // Input - Task input + Input *MigrateSQLServerSQLDbSyncTaskInput `json:"input,omitempty"` + // Output - READ-ONLY; Task output. This is ignored if submitted. + Output *[]BasicMigrateSQLServerSQLDbSyncTaskOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the task. This is ignored if submitted. Possible values include: 'TaskStateUnknown', 'TaskStateQueued', 'TaskStateRunning', 'TaskStateCanceled', 'TaskStateSucceeded', 'TaskStateFailed', 'TaskStateFailedInputValidation', 'TaskStateFaulted' + State TaskState `json:"state,omitempty"` + // Commands - READ-ONLY; Array of command properties. + Commands *[]BasicCommandProperties `json:"commands,omitempty"` + // TaskType - Possible values include: 'TaskTypeProjectTaskProperties', 'TaskTypeGetTDECertificatesSQL', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI', 'TaskTypeValidateMigrationInputSQLServerSQLDbSync', 'TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync', 'TaskTypeMigrateMySQLAzureDbForMySQLSync', 'TaskTypeMigrateSQLServerAzureSQLDbSync', 'TaskTypeMigrateSQLServerSQLDb', 'TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS', 'TaskTypeMigrateSQLServerAzureSQLDbMI', 'TaskTypeConnectToTargetAzureDbForMySQL', 'TaskTypeConnectToTargetAzureSQLDbMISyncLRS', 'TaskTypeConnectToTargetAzureSQLDbMI', 'TaskTypeGetUserTablesAzureSQLDbSync', 'TaskTypeGetUserTablesSQL', 'TaskTypeConnectToTargetAzureDbForPostgreSQLSync', 'TaskTypeConnectToTargetSQLDbSync', 'TaskTypeConnectToTargetSQLDb', 'TaskTypeConnectToSourcePostgreSQLSync', 'TaskTypeConnectToSourceSQLServerSync', 'TaskTypeConnectToSourceSQLServer', 'TaskTypeConnectToSourceMySQL' + TaskType TaskType `json:"taskType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) MarshalJSON() ([]byte, error) { + msssdstp.TaskType = TaskTypeMigrateSQLServerAzureSQLDbSync + objectMap := make(map[string]interface{}) + if msssdstp.Input != nil { + objectMap["input"] = msssdstp.Input + } + if msssdstp.TaskType != "" { + objectMap["taskType"] = msssdstp.TaskType + } + return json.Marshal(objectMap) +} + +// AsGetTdeCertificatesSQLTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) { + return &msssdstp, true +} + +// AsMigrateSQLServerSQLDbTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForMySQLTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMITaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLDbTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourcePostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceMySQLTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) { + return nil, false +} + +// AsProjectTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsProjectTaskProperties() (*ProjectTaskProperties, bool) { + return nil, false +} + +// AsBasicProjectTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbSyncTaskProperties. +func (msssdstp MigrateSQLServerSQLDbSyncTaskProperties) AsBasicProjectTaskProperties() (BasicProjectTaskProperties, bool) { + return &msssdstp, true +} + +// UnmarshalJSON is the custom unmarshaler for MigrateSQLServerSQLDbSyncTaskProperties struct. +func (msssdstp *MigrateSQLServerSQLDbSyncTaskProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "input": + if v != nil { + var input MigrateSQLServerSQLDbSyncTaskInput + err = json.Unmarshal(*v, &input) + if err != nil { + return err + } + msssdstp.Input = &input + } + case "output": + if v != nil { + output, err := unmarshalBasicMigrateSQLServerSQLDbSyncTaskOutputArray(*v) + if err != nil { + return err + } + msssdstp.Output = &output + } + case "errors": + if v != nil { + var errorsVar []ODataError + err = json.Unmarshal(*v, &errorsVar) + if err != nil { + return err + } + msssdstp.Errors = &errorsVar + } + case "state": + if v != nil { + var state TaskState + err = json.Unmarshal(*v, &state) + if err != nil { + return err + } + msssdstp.State = state + } + case "commands": + if v != nil { + commands, err := unmarshalBasicCommandPropertiesArray(*v) + if err != nil { + return err + } + msssdstp.Commands = &commands + } + case "taskType": + if v != nil { + var taskType TaskType + err = json.Unmarshal(*v, &taskType) + if err != nil { + return err + } + msssdstp.TaskType = taskType + } + } + } + + return nil +} + +// MigrateSQLServerSQLDbTaskInput input for the task that migrates on-prem SQL Server databases to Azure +// SQL Database +type MigrateSQLServerSQLDbTaskInput struct { + // SelectedDatabases - Databases to migrate + SelectedDatabases *[]MigrateSQLServerSQLDbDatabaseInput `json:"selectedDatabases,omitempty"` + // ValidationOptions - Options for enabling various post migration validations. Available options, + // 1.) Data Integrity Check: Performs a checksum based comparison on source and target tables after the migration to ensure the correctness of the data. + // 2.) Schema Validation: Performs a thorough schema comparison between the source and target tables and provides a list of differences between the source and target database, 3.) Query Analysis: Executes a set of queries picked up automatically either from the Query Plan Cache or Query Store and execute them and compares the execution time between the source and target database. + ValidationOptions *MigrationValidationOptions `json:"validationOptions,omitempty"` + // SourceConnectionInfo - Information for connecting to source + SourceConnectionInfo *SQLConnectionInfo `json:"sourceConnectionInfo,omitempty"` + // TargetConnectionInfo - Information for connecting to target + TargetConnectionInfo *SQLConnectionInfo `json:"targetConnectionInfo,omitempty"` +} + +// BasicMigrateSQLServerSQLDbTaskOutput output for the task that migrates on-prem SQL Server databases to Azure SQL +// Database +type BasicMigrateSQLServerSQLDbTaskOutput interface { + AsMigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult() (*MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult, bool) + AsMigrateSQLServerSQLDbTaskOutputValidationResult() (*MigrateSQLServerSQLDbTaskOutputValidationResult, bool) + AsMigrateSQLServerSQLDbTaskOutputError() (*MigrateSQLServerSQLDbTaskOutputError, bool) + AsMigrateSQLServerSQLDbTaskOutputTableLevel() (*MigrateSQLServerSQLDbTaskOutputTableLevel, bool) + AsMigrateSQLServerSQLDbTaskOutputDatabaseLevel() (*MigrateSQLServerSQLDbTaskOutputDatabaseLevel, bool) + AsMigrateSQLServerSQLDbTaskOutputMigrationLevel() (*MigrateSQLServerSQLDbTaskOutputMigrationLevel, bool) + AsMigrateSQLServerSQLDbTaskOutput() (*MigrateSQLServerSQLDbTaskOutput, bool) +} + +// MigrateSQLServerSQLDbTaskOutput output for the task that migrates on-prem SQL Server databases to Azure SQL +// Database +type MigrateSQLServerSQLDbTaskOutput struct { + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrateSQLServerSQLDbTaskOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationDatabaseLevelValidationOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationValidationOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeTableLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateSQLServerSQLDbTaskOutput `json:"resultType,omitempty"` +} + +func unmarshalBasicMigrateSQLServerSQLDbTaskOutput(body []byte) (BasicMigrateSQLServerSQLDbTaskOutput, error) { + var m map[string]interface{} + err := json.Unmarshal(body, &m) + if err != nil { + return nil, err + } + + switch m["resultType"] { + case string(ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationDatabaseLevelValidationOutput): + var msssdtodlvr MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult + err := json.Unmarshal(body, &msssdtodlvr) + return msssdtodlvr, err + case string(ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationValidationOutput): + var msssdtovr MigrateSQLServerSQLDbTaskOutputValidationResult + err := json.Unmarshal(body, &msssdtovr) + return msssdtovr, err + case string(ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeErrorOutput): + var msssdtoe MigrateSQLServerSQLDbTaskOutputError + err := json.Unmarshal(body, &msssdtoe) + return msssdtoe, err + case string(ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeTableLevelOutput): + var msssdtotl MigrateSQLServerSQLDbTaskOutputTableLevel + err := json.Unmarshal(body, &msssdtotl) + return msssdtotl, err + case string(ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeDatabaseLevelOutput): + var msssdtodl MigrateSQLServerSQLDbTaskOutputDatabaseLevel + err := json.Unmarshal(body, &msssdtodl) + return msssdtodl, err + case string(ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationLevelOutput): + var msssdtoml MigrateSQLServerSQLDbTaskOutputMigrationLevel + err := json.Unmarshal(body, &msssdtoml) + return msssdtoml, err + default: + var msssdto MigrateSQLServerSQLDbTaskOutput + err := json.Unmarshal(body, &msssdto) + return msssdto, err + } +} +func unmarshalBasicMigrateSQLServerSQLDbTaskOutputArray(body []byte) ([]BasicMigrateSQLServerSQLDbTaskOutput, error) { + var rawMessages []*json.RawMessage + err := json.Unmarshal(body, &rawMessages) + if err != nil { + return nil, err + } + + msssdtoArray := make([]BasicMigrateSQLServerSQLDbTaskOutput, len(rawMessages)) + + for index, rawMessage := range rawMessages { + msssdto, err := unmarshalBasicMigrateSQLServerSQLDbTaskOutput(*rawMessage) + if err != nil { + return nil, err + } + msssdtoArray[index] = msssdto + } + return msssdtoArray, nil +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLDbTaskOutput. +func (msssdto MigrateSQLServerSQLDbTaskOutput) MarshalJSON() ([]byte, error) { + msssdto.ResultType = ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrateSQLServerSQLDbTaskOutput + objectMap := make(map[string]interface{}) + if msssdto.ResultType != "" { + objectMap["resultType"] = msssdto.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutput. +func (msssdto MigrateSQLServerSQLDbTaskOutput) AsMigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult() (*MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputValidationResult is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutput. +func (msssdto MigrateSQLServerSQLDbTaskOutput) AsMigrateSQLServerSQLDbTaskOutputValidationResult() (*MigrateSQLServerSQLDbTaskOutputValidationResult, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputError is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutput. +func (msssdto MigrateSQLServerSQLDbTaskOutput) AsMigrateSQLServerSQLDbTaskOutputError() (*MigrateSQLServerSQLDbTaskOutputError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputTableLevel is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutput. +func (msssdto MigrateSQLServerSQLDbTaskOutput) AsMigrateSQLServerSQLDbTaskOutputTableLevel() (*MigrateSQLServerSQLDbTaskOutputTableLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputDatabaseLevel is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutput. +func (msssdto MigrateSQLServerSQLDbTaskOutput) AsMigrateSQLServerSQLDbTaskOutputDatabaseLevel() (*MigrateSQLServerSQLDbTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputMigrationLevel is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutput. +func (msssdto MigrateSQLServerSQLDbTaskOutput) AsMigrateSQLServerSQLDbTaskOutputMigrationLevel() (*MigrateSQLServerSQLDbTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutput is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutput. +func (msssdto MigrateSQLServerSQLDbTaskOutput) AsMigrateSQLServerSQLDbTaskOutput() (*MigrateSQLServerSQLDbTaskOutput, bool) { + return &msssdto, true +} + +// AsBasicMigrateSQLServerSQLDbTaskOutput is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutput. +func (msssdto MigrateSQLServerSQLDbTaskOutput) AsBasicMigrateSQLServerSQLDbTaskOutput() (BasicMigrateSQLServerSQLDbTaskOutput, bool) { + return &msssdto, true +} + +// MigrateSQLServerSQLDbTaskOutputDatabaseLevel database level result for Sql Server to Azure Sql DB +// migration. +type MigrateSQLServerSQLDbTaskOutputDatabaseLevel struct { + // DatabaseName - READ-ONLY; Name of the item + DatabaseName *string `json:"databaseName,omitempty"` + // StartedOn - READ-ONLY; Migration start time + StartedOn *date.Time `json:"startedOn,omitempty"` + // EndedOn - READ-ONLY; Migration end time + EndedOn *date.Time `json:"endedOn,omitempty"` + // State - READ-ONLY; Current state of migration. Possible values include: 'MigrationStateNone', 'MigrationStateInProgress', 'MigrationStateFailed', 'MigrationStateWarning', 'MigrationStateCompleted', 'MigrationStateSkipped', 'MigrationStateStopped' + State MigrationState `json:"state,omitempty"` + // Stage - READ-ONLY; Migration stage that this database is in. Possible values include: 'DatabaseMigrationStageNone', 'DatabaseMigrationStageInitialize', 'DatabaseMigrationStageBackup', 'DatabaseMigrationStageFileCopy', 'DatabaseMigrationStageRestore', 'DatabaseMigrationStageCompleted' + Stage DatabaseMigrationStage `json:"stage,omitempty"` + // StatusMessage - READ-ONLY; Status message + StatusMessage *string `json:"statusMessage,omitempty"` + // Message - READ-ONLY; Migration progress message + Message *string `json:"message,omitempty"` + // NumberOfObjects - READ-ONLY; Number of objects + NumberOfObjects *int64 `json:"numberOfObjects,omitempty"` + // NumberOfObjectsCompleted - READ-ONLY; Number of successfully completed objects + NumberOfObjectsCompleted *int64 `json:"numberOfObjectsCompleted,omitempty"` + // ErrorCount - READ-ONLY; Number of database/object errors. + ErrorCount *int64 `json:"errorCount,omitempty"` + // ErrorPrefix - READ-ONLY; Wildcard string prefix to use for querying all errors of the item + ErrorPrefix *string `json:"errorPrefix,omitempty"` + // ResultPrefix - READ-ONLY; Wildcard string prefix to use for querying all sub-tem results of the item + ResultPrefix *string `json:"resultPrefix,omitempty"` + // ExceptionsAndWarnings - READ-ONLY; Migration exceptions and warnings. + ExceptionsAndWarnings *[]ReportableException `json:"exceptionsAndWarnings,omitempty"` + // ObjectSummary - READ-ONLY; Summary of object results in the migration + ObjectSummary map[string]*DataItemMigrationSummaryResult `json:"objectSummary"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrateSQLServerSQLDbTaskOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationDatabaseLevelValidationOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationValidationOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeTableLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateSQLServerSQLDbTaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLDbTaskOutputDatabaseLevel. +func (msssdtodl MigrateSQLServerSQLDbTaskOutputDatabaseLevel) MarshalJSON() ([]byte, error) { + msssdtodl.ResultType = ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeDatabaseLevelOutput + objectMap := make(map[string]interface{}) + if msssdtodl.ResultType != "" { + objectMap["resultType"] = msssdtodl.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputDatabaseLevel. +func (msssdtodl MigrateSQLServerSQLDbTaskOutputDatabaseLevel) AsMigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult() (*MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputValidationResult is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputDatabaseLevel. +func (msssdtodl MigrateSQLServerSQLDbTaskOutputDatabaseLevel) AsMigrateSQLServerSQLDbTaskOutputValidationResult() (*MigrateSQLServerSQLDbTaskOutputValidationResult, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputError is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputDatabaseLevel. +func (msssdtodl MigrateSQLServerSQLDbTaskOutputDatabaseLevel) AsMigrateSQLServerSQLDbTaskOutputError() (*MigrateSQLServerSQLDbTaskOutputError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputTableLevel is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputDatabaseLevel. +func (msssdtodl MigrateSQLServerSQLDbTaskOutputDatabaseLevel) AsMigrateSQLServerSQLDbTaskOutputTableLevel() (*MigrateSQLServerSQLDbTaskOutputTableLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputDatabaseLevel is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputDatabaseLevel. +func (msssdtodl MigrateSQLServerSQLDbTaskOutputDatabaseLevel) AsMigrateSQLServerSQLDbTaskOutputDatabaseLevel() (*MigrateSQLServerSQLDbTaskOutputDatabaseLevel, bool) { + return &msssdtodl, true +} + +// AsMigrateSQLServerSQLDbTaskOutputMigrationLevel is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputDatabaseLevel. +func (msssdtodl MigrateSQLServerSQLDbTaskOutputDatabaseLevel) AsMigrateSQLServerSQLDbTaskOutputMigrationLevel() (*MigrateSQLServerSQLDbTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutput is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputDatabaseLevel. +func (msssdtodl MigrateSQLServerSQLDbTaskOutputDatabaseLevel) AsMigrateSQLServerSQLDbTaskOutput() (*MigrateSQLServerSQLDbTaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateSQLServerSQLDbTaskOutput is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputDatabaseLevel. +func (msssdtodl MigrateSQLServerSQLDbTaskOutputDatabaseLevel) AsBasicMigrateSQLServerSQLDbTaskOutput() (BasicMigrateSQLServerSQLDbTaskOutput, bool) { + return &msssdtodl, true +} + +// MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult database validation result for Sql Server +// to Azure Sql DB migration. +type MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult struct { + // MigrationID - READ-ONLY; Migration Identifier + MigrationID *string `json:"migrationId,omitempty"` + // SourceDatabaseName - READ-ONLY; Name of the source database + SourceDatabaseName *string `json:"sourceDatabaseName,omitempty"` + // TargetDatabaseName - READ-ONLY; Name of the target database + TargetDatabaseName *string `json:"targetDatabaseName,omitempty"` + // StartedOn - READ-ONLY; Validation start time + StartedOn *date.Time `json:"startedOn,omitempty"` + // EndedOn - READ-ONLY; Validation end time + EndedOn *date.Time `json:"endedOn,omitempty"` + // DataIntegrityValidationResult - READ-ONLY; Provides data integrity validation result between the source and target tables that are migrated. + DataIntegrityValidationResult *DataIntegrityValidationResult `json:"dataIntegrityValidationResult,omitempty"` + // SchemaValidationResult - READ-ONLY; Provides schema comparison result between source and target database + SchemaValidationResult *SchemaComparisonValidationResult `json:"schemaValidationResult,omitempty"` + // QueryAnalysisValidationResult - READ-ONLY; Results of some of the query execution result between source and target database + QueryAnalysisValidationResult *QueryAnalysisValidationResult `json:"queryAnalysisValidationResult,omitempty"` + // Status - READ-ONLY; Current status of validation at the database level. Possible values include: 'ValidationStatusDefault', 'ValidationStatusNotStarted', 'ValidationStatusInitialized', 'ValidationStatusInProgress', 'ValidationStatusCompleted', 'ValidationStatusCompletedWithIssues', 'ValidationStatusFailed', 'ValidationStatusStopped' + Status ValidationStatus `json:"status,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrateSQLServerSQLDbTaskOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationDatabaseLevelValidationOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationValidationOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeTableLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateSQLServerSQLDbTaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult. +func (msssdtodlvr MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult) MarshalJSON() ([]byte, error) { + msssdtodlvr.ResultType = ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationDatabaseLevelValidationOutput + objectMap := make(map[string]interface{}) + if msssdtodlvr.ResultType != "" { + objectMap["resultType"] = msssdtodlvr.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult. +func (msssdtodlvr MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult) AsMigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult() (*MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult, bool) { + return &msssdtodlvr, true +} + +// AsMigrateSQLServerSQLDbTaskOutputValidationResult is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult. +func (msssdtodlvr MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult) AsMigrateSQLServerSQLDbTaskOutputValidationResult() (*MigrateSQLServerSQLDbTaskOutputValidationResult, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputError is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult. +func (msssdtodlvr MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult) AsMigrateSQLServerSQLDbTaskOutputError() (*MigrateSQLServerSQLDbTaskOutputError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputTableLevel is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult. +func (msssdtodlvr MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult) AsMigrateSQLServerSQLDbTaskOutputTableLevel() (*MigrateSQLServerSQLDbTaskOutputTableLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputDatabaseLevel is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult. +func (msssdtodlvr MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult) AsMigrateSQLServerSQLDbTaskOutputDatabaseLevel() (*MigrateSQLServerSQLDbTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputMigrationLevel is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult. +func (msssdtodlvr MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult) AsMigrateSQLServerSQLDbTaskOutputMigrationLevel() (*MigrateSQLServerSQLDbTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutput is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult. +func (msssdtodlvr MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult) AsMigrateSQLServerSQLDbTaskOutput() (*MigrateSQLServerSQLDbTaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateSQLServerSQLDbTaskOutput is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult. +func (msssdtodlvr MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult) AsBasicMigrateSQLServerSQLDbTaskOutput() (BasicMigrateSQLServerSQLDbTaskOutput, bool) { + return &msssdtodlvr, true +} + +// MigrateSQLServerSQLDbTaskOutputError task errors for Sql Server to Azure Sql DB migration. +type MigrateSQLServerSQLDbTaskOutputError struct { + // Error - READ-ONLY; Migration error + Error *ReportableException `json:"error,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrateSQLServerSQLDbTaskOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationDatabaseLevelValidationOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationValidationOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeTableLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateSQLServerSQLDbTaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLDbTaskOutputError. +func (msssdtoe MigrateSQLServerSQLDbTaskOutputError) MarshalJSON() ([]byte, error) { + msssdtoe.ResultType = ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeErrorOutput + objectMap := make(map[string]interface{}) + if msssdtoe.ResultType != "" { + objectMap["resultType"] = msssdtoe.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputError. +func (msssdtoe MigrateSQLServerSQLDbTaskOutputError) AsMigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult() (*MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputValidationResult is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputError. +func (msssdtoe MigrateSQLServerSQLDbTaskOutputError) AsMigrateSQLServerSQLDbTaskOutputValidationResult() (*MigrateSQLServerSQLDbTaskOutputValidationResult, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputError is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputError. +func (msssdtoe MigrateSQLServerSQLDbTaskOutputError) AsMigrateSQLServerSQLDbTaskOutputError() (*MigrateSQLServerSQLDbTaskOutputError, bool) { + return &msssdtoe, true +} + +// AsMigrateSQLServerSQLDbTaskOutputTableLevel is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputError. +func (msssdtoe MigrateSQLServerSQLDbTaskOutputError) AsMigrateSQLServerSQLDbTaskOutputTableLevel() (*MigrateSQLServerSQLDbTaskOutputTableLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputDatabaseLevel is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputError. +func (msssdtoe MigrateSQLServerSQLDbTaskOutputError) AsMigrateSQLServerSQLDbTaskOutputDatabaseLevel() (*MigrateSQLServerSQLDbTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputMigrationLevel is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputError. +func (msssdtoe MigrateSQLServerSQLDbTaskOutputError) AsMigrateSQLServerSQLDbTaskOutputMigrationLevel() (*MigrateSQLServerSQLDbTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutput is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputError. +func (msssdtoe MigrateSQLServerSQLDbTaskOutputError) AsMigrateSQLServerSQLDbTaskOutput() (*MigrateSQLServerSQLDbTaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateSQLServerSQLDbTaskOutput is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputError. +func (msssdtoe MigrateSQLServerSQLDbTaskOutputError) AsBasicMigrateSQLServerSQLDbTaskOutput() (BasicMigrateSQLServerSQLDbTaskOutput, bool) { + return &msssdtoe, true +} + +// MigrateSQLServerSQLDbTaskOutputMigrationLevel migration level result for Sql server to Azure Sql DB +// migration. +type MigrateSQLServerSQLDbTaskOutputMigrationLevel struct { + // StartedOn - READ-ONLY; Migration start time + StartedOn *date.Time `json:"startedOn,omitempty"` + // EndedOn - READ-ONLY; Migration end time + EndedOn *date.Time `json:"endedOn,omitempty"` + // DurationInSeconds - READ-ONLY; Duration of task execution in seconds. + DurationInSeconds *int64 `json:"durationInSeconds,omitempty"` + // Status - READ-ONLY; Current status of migration. Possible values include: 'MigrationStatusDefault', 'MigrationStatusConnecting', 'MigrationStatusSourceAndTargetSelected', 'MigrationStatusSelectLogins', 'MigrationStatusConfigured', 'MigrationStatusRunning', 'MigrationStatusError', 'MigrationStatusStopped', 'MigrationStatusCompleted', 'MigrationStatusCompletedWithWarnings' + Status MigrationStatus `json:"status,omitempty"` + // StatusMessage - READ-ONLY; Migration status message + StatusMessage *string `json:"statusMessage,omitempty"` + // Message - READ-ONLY; Migration progress message + Message *string `json:"message,omitempty"` + // Databases - READ-ONLY; Selected databases as a map from database name to database id + Databases map[string]*string `json:"databases"` + // DatabaseSummary - READ-ONLY; Summary of database results in the migration + DatabaseSummary map[string]*DatabaseSummaryResult `json:"databaseSummary"` + // MigrationReport - READ-ONLY; Migration Report Result, provides unique url for downloading your migration report. + MigrationReport *MigrationReportResult `json:"migrationReport,omitempty"` + // SourceServerVersion - READ-ONLY; Source server version + SourceServerVersion *string `json:"sourceServerVersion,omitempty"` + // SourceServerBrandVersion - READ-ONLY; Source server brand version + SourceServerBrandVersion *string `json:"sourceServerBrandVersion,omitempty"` + // TargetServerVersion - READ-ONLY; Target server version + TargetServerVersion *string `json:"targetServerVersion,omitempty"` + // TargetServerBrandVersion - READ-ONLY; Target server brand version + TargetServerBrandVersion *string `json:"targetServerBrandVersion,omitempty"` + // ExceptionsAndWarnings - READ-ONLY; Migration exceptions and warnings. + ExceptionsAndWarnings *[]ReportableException `json:"exceptionsAndWarnings,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrateSQLServerSQLDbTaskOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationDatabaseLevelValidationOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationValidationOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeTableLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateSQLServerSQLDbTaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLDbTaskOutputMigrationLevel. +func (msssdtoml MigrateSQLServerSQLDbTaskOutputMigrationLevel) MarshalJSON() ([]byte, error) { + msssdtoml.ResultType = ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationLevelOutput + objectMap := make(map[string]interface{}) + if msssdtoml.ResultType != "" { + objectMap["resultType"] = msssdtoml.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputMigrationLevel. +func (msssdtoml MigrateSQLServerSQLDbTaskOutputMigrationLevel) AsMigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult() (*MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputValidationResult is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputMigrationLevel. +func (msssdtoml MigrateSQLServerSQLDbTaskOutputMigrationLevel) AsMigrateSQLServerSQLDbTaskOutputValidationResult() (*MigrateSQLServerSQLDbTaskOutputValidationResult, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputError is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputMigrationLevel. +func (msssdtoml MigrateSQLServerSQLDbTaskOutputMigrationLevel) AsMigrateSQLServerSQLDbTaskOutputError() (*MigrateSQLServerSQLDbTaskOutputError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputTableLevel is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputMigrationLevel. +func (msssdtoml MigrateSQLServerSQLDbTaskOutputMigrationLevel) AsMigrateSQLServerSQLDbTaskOutputTableLevel() (*MigrateSQLServerSQLDbTaskOutputTableLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputDatabaseLevel is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputMigrationLevel. +func (msssdtoml MigrateSQLServerSQLDbTaskOutputMigrationLevel) AsMigrateSQLServerSQLDbTaskOutputDatabaseLevel() (*MigrateSQLServerSQLDbTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputMigrationLevel is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputMigrationLevel. +func (msssdtoml MigrateSQLServerSQLDbTaskOutputMigrationLevel) AsMigrateSQLServerSQLDbTaskOutputMigrationLevel() (*MigrateSQLServerSQLDbTaskOutputMigrationLevel, bool) { + return &msssdtoml, true +} + +// AsMigrateSQLServerSQLDbTaskOutput is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputMigrationLevel. +func (msssdtoml MigrateSQLServerSQLDbTaskOutputMigrationLevel) AsMigrateSQLServerSQLDbTaskOutput() (*MigrateSQLServerSQLDbTaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateSQLServerSQLDbTaskOutput is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputMigrationLevel. +func (msssdtoml MigrateSQLServerSQLDbTaskOutputMigrationLevel) AsBasicMigrateSQLServerSQLDbTaskOutput() (BasicMigrateSQLServerSQLDbTaskOutput, bool) { + return &msssdtoml, true +} + +// MigrateSQLServerSQLDbTaskOutputTableLevel table level result for Sql Server to Azure Sql DB migration. +type MigrateSQLServerSQLDbTaskOutputTableLevel struct { + // ObjectName - READ-ONLY; Name of the item + ObjectName *string `json:"objectName,omitempty"` + // StartedOn - READ-ONLY; Migration start time + StartedOn *date.Time `json:"startedOn,omitempty"` + // EndedOn - READ-ONLY; Migration end time + EndedOn *date.Time `json:"endedOn,omitempty"` + // State - READ-ONLY; Current state of migration. Possible values include: 'MigrationStateNone', 'MigrationStateInProgress', 'MigrationStateFailed', 'MigrationStateWarning', 'MigrationStateCompleted', 'MigrationStateSkipped', 'MigrationStateStopped' + State MigrationState `json:"state,omitempty"` + // StatusMessage - READ-ONLY; Status message + StatusMessage *string `json:"statusMessage,omitempty"` + // ItemsCount - READ-ONLY; Number of items + ItemsCount *int64 `json:"itemsCount,omitempty"` + // ItemsCompletedCount - READ-ONLY; Number of successfully completed items + ItemsCompletedCount *int64 `json:"itemsCompletedCount,omitempty"` + // ErrorPrefix - READ-ONLY; Wildcard string prefix to use for querying all errors of the item + ErrorPrefix *string `json:"errorPrefix,omitempty"` + // ResultPrefix - READ-ONLY; Wildcard string prefix to use for querying all sub-tem results of the item + ResultPrefix *string `json:"resultPrefix,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrateSQLServerSQLDbTaskOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationDatabaseLevelValidationOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationValidationOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeTableLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateSQLServerSQLDbTaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLDbTaskOutputTableLevel. +func (msssdtotl MigrateSQLServerSQLDbTaskOutputTableLevel) MarshalJSON() ([]byte, error) { + msssdtotl.ResultType = ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeTableLevelOutput + objectMap := make(map[string]interface{}) + if msssdtotl.ResultType != "" { + objectMap["resultType"] = msssdtotl.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputTableLevel. +func (msssdtotl MigrateSQLServerSQLDbTaskOutputTableLevel) AsMigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult() (*MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputValidationResult is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputTableLevel. +func (msssdtotl MigrateSQLServerSQLDbTaskOutputTableLevel) AsMigrateSQLServerSQLDbTaskOutputValidationResult() (*MigrateSQLServerSQLDbTaskOutputValidationResult, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputError is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputTableLevel. +func (msssdtotl MigrateSQLServerSQLDbTaskOutputTableLevel) AsMigrateSQLServerSQLDbTaskOutputError() (*MigrateSQLServerSQLDbTaskOutputError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputTableLevel is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputTableLevel. +func (msssdtotl MigrateSQLServerSQLDbTaskOutputTableLevel) AsMigrateSQLServerSQLDbTaskOutputTableLevel() (*MigrateSQLServerSQLDbTaskOutputTableLevel, bool) { + return &msssdtotl, true +} + +// AsMigrateSQLServerSQLDbTaskOutputDatabaseLevel is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputTableLevel. +func (msssdtotl MigrateSQLServerSQLDbTaskOutputTableLevel) AsMigrateSQLServerSQLDbTaskOutputDatabaseLevel() (*MigrateSQLServerSQLDbTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputMigrationLevel is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputTableLevel. +func (msssdtotl MigrateSQLServerSQLDbTaskOutputTableLevel) AsMigrateSQLServerSQLDbTaskOutputMigrationLevel() (*MigrateSQLServerSQLDbTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutput is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputTableLevel. +func (msssdtotl MigrateSQLServerSQLDbTaskOutputTableLevel) AsMigrateSQLServerSQLDbTaskOutput() (*MigrateSQLServerSQLDbTaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateSQLServerSQLDbTaskOutput is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputTableLevel. +func (msssdtotl MigrateSQLServerSQLDbTaskOutputTableLevel) AsBasicMigrateSQLServerSQLDbTaskOutput() (BasicMigrateSQLServerSQLDbTaskOutput, bool) { + return &msssdtotl, true +} + +// MigrateSQLServerSQLDbTaskOutputValidationResult validation result for Sql Server to Azure Sql DB +// migration. +type MigrateSQLServerSQLDbTaskOutputValidationResult struct { + // MigrationID - READ-ONLY; Migration Identifier + MigrationID *string `json:"migrationId,omitempty"` + // SummaryResults - Validation summary results for each database + SummaryResults map[string]*MigrationValidationDatabaseSummaryResult `json:"summaryResults"` + // Status - READ-ONLY; Current status of validation at the migration level. Status from the database validation result status will be aggregated here. Possible values include: 'ValidationStatusDefault', 'ValidationStatusNotStarted', 'ValidationStatusInitialized', 'ValidationStatusInProgress', 'ValidationStatusCompleted', 'ValidationStatusCompletedWithIssues', 'ValidationStatusFailed', 'ValidationStatusStopped' + Status ValidationStatus `json:"status,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrateSQLServerSQLDbTaskOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationDatabaseLevelValidationOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationValidationOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeTableLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateSQLServerSQLDbTaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLDbTaskOutputValidationResult. +func (msssdtovr MigrateSQLServerSQLDbTaskOutputValidationResult) MarshalJSON() ([]byte, error) { + msssdtovr.ResultType = ResultTypeBasicMigrateSQLServerSQLDbTaskOutputResultTypeMigrationValidationOutput + objectMap := make(map[string]interface{}) + if msssdtovr.SummaryResults != nil { + objectMap["summaryResults"] = msssdtovr.SummaryResults + } + if msssdtovr.ResultType != "" { + objectMap["resultType"] = msssdtovr.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputValidationResult. +func (msssdtovr MigrateSQLServerSQLDbTaskOutputValidationResult) AsMigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult() (*MigrateSQLServerSQLDbTaskOutputDatabaseLevelValidationResult, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputValidationResult is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputValidationResult. +func (msssdtovr MigrateSQLServerSQLDbTaskOutputValidationResult) AsMigrateSQLServerSQLDbTaskOutputValidationResult() (*MigrateSQLServerSQLDbTaskOutputValidationResult, bool) { + return &msssdtovr, true +} + +// AsMigrateSQLServerSQLDbTaskOutputError is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputValidationResult. +func (msssdtovr MigrateSQLServerSQLDbTaskOutputValidationResult) AsMigrateSQLServerSQLDbTaskOutputError() (*MigrateSQLServerSQLDbTaskOutputError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputTableLevel is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputValidationResult. +func (msssdtovr MigrateSQLServerSQLDbTaskOutputValidationResult) AsMigrateSQLServerSQLDbTaskOutputTableLevel() (*MigrateSQLServerSQLDbTaskOutputTableLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputDatabaseLevel is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputValidationResult. +func (msssdtovr MigrateSQLServerSQLDbTaskOutputValidationResult) AsMigrateSQLServerSQLDbTaskOutputDatabaseLevel() (*MigrateSQLServerSQLDbTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutputMigrationLevel is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputValidationResult. +func (msssdtovr MigrateSQLServerSQLDbTaskOutputValidationResult) AsMigrateSQLServerSQLDbTaskOutputMigrationLevel() (*MigrateSQLServerSQLDbTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskOutput is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputValidationResult. +func (msssdtovr MigrateSQLServerSQLDbTaskOutputValidationResult) AsMigrateSQLServerSQLDbTaskOutput() (*MigrateSQLServerSQLDbTaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateSQLServerSQLDbTaskOutput is the BasicMigrateSQLServerSQLDbTaskOutput implementation for MigrateSQLServerSQLDbTaskOutputValidationResult. +func (msssdtovr MigrateSQLServerSQLDbTaskOutputValidationResult) AsBasicMigrateSQLServerSQLDbTaskOutput() (BasicMigrateSQLServerSQLDbTaskOutput, bool) { + return &msssdtovr, true +} + +// MigrateSQLServerSQLDbTaskProperties properties for the task that migrates on-prem SQL Server databases +// to Azure SQL Database +type MigrateSQLServerSQLDbTaskProperties struct { + // Input - Task input + Input *MigrateSQLServerSQLDbTaskInput `json:"input,omitempty"` + // Output - READ-ONLY; Task output. This is ignored if submitted. + Output *[]BasicMigrateSQLServerSQLDbTaskOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the task. This is ignored if submitted. Possible values include: 'TaskStateUnknown', 'TaskStateQueued', 'TaskStateRunning', 'TaskStateCanceled', 'TaskStateSucceeded', 'TaskStateFailed', 'TaskStateFailedInputValidation', 'TaskStateFaulted' + State TaskState `json:"state,omitempty"` + // Commands - READ-ONLY; Array of command properties. + Commands *[]BasicCommandProperties `json:"commands,omitempty"` + // TaskType - Possible values include: 'TaskTypeProjectTaskProperties', 'TaskTypeGetTDECertificatesSQL', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI', 'TaskTypeValidateMigrationInputSQLServerSQLDbSync', 'TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync', 'TaskTypeMigrateMySQLAzureDbForMySQLSync', 'TaskTypeMigrateSQLServerAzureSQLDbSync', 'TaskTypeMigrateSQLServerSQLDb', 'TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS', 'TaskTypeMigrateSQLServerAzureSQLDbMI', 'TaskTypeConnectToTargetAzureDbForMySQL', 'TaskTypeConnectToTargetAzureSQLDbMISyncLRS', 'TaskTypeConnectToTargetAzureSQLDbMI', 'TaskTypeGetUserTablesAzureSQLDbSync', 'TaskTypeGetUserTablesSQL', 'TaskTypeConnectToTargetAzureDbForPostgreSQLSync', 'TaskTypeConnectToTargetSQLDbSync', 'TaskTypeConnectToTargetSQLDb', 'TaskTypeConnectToSourcePostgreSQLSync', 'TaskTypeConnectToSourceSQLServerSync', 'TaskTypeConnectToSourceSQLServer', 'TaskTypeConnectToSourceMySQL' + TaskType TaskType `json:"taskType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) MarshalJSON() ([]byte, error) { + msssdtp.TaskType = TaskTypeMigrateSQLServerSQLDb + objectMap := make(map[string]interface{}) + if msssdtp.Input != nil { + objectMap["input"] = msssdtp.Input + } + if msssdtp.TaskType != "" { + objectMap["taskType"] = msssdtp.TaskType + } + return json.Marshal(objectMap) +} + +// AsGetTdeCertificatesSQLTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) { + return &msssdtp, true +} + +// AsMigrateSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForMySQLTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMITaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLDbTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourcePostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceMySQLTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) { + return nil, false +} + +// AsProjectTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsProjectTaskProperties() (*ProjectTaskProperties, bool) { + return nil, false +} + +// AsBasicProjectTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLDbTaskProperties. +func (msssdtp MigrateSQLServerSQLDbTaskProperties) AsBasicProjectTaskProperties() (BasicProjectTaskProperties, bool) { + return &msssdtp, true +} + +// UnmarshalJSON is the custom unmarshaler for MigrateSQLServerSQLDbTaskProperties struct. +func (msssdtp *MigrateSQLServerSQLDbTaskProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "input": + if v != nil { + var input MigrateSQLServerSQLDbTaskInput + err = json.Unmarshal(*v, &input) + if err != nil { + return err + } + msssdtp.Input = &input + } + case "output": + if v != nil { + output, err := unmarshalBasicMigrateSQLServerSQLDbTaskOutputArray(*v) + if err != nil { + return err + } + msssdtp.Output = &output + } + case "errors": + if v != nil { + var errorsVar []ODataError + err = json.Unmarshal(*v, &errorsVar) + if err != nil { + return err + } + msssdtp.Errors = &errorsVar + } + case "state": + if v != nil { + var state TaskState + err = json.Unmarshal(*v, &state) + if err != nil { + return err + } + msssdtp.State = state + } + case "commands": + if v != nil { + commands, err := unmarshalBasicCommandPropertiesArray(*v) + if err != nil { + return err + } + msssdtp.Commands = &commands + } + case "taskType": + if v != nil { + var taskType TaskType + err = json.Unmarshal(*v, &taskType) + if err != nil { + return err + } + msssdtp.TaskType = taskType + } + } + } + + return nil +} + +// MigrateSQLServerSQLMIDatabaseInput database specific information for SQL to Azure SQL DB Managed +// Instance migration task inputs +type MigrateSQLServerSQLMIDatabaseInput struct { + // Name - Name of the database + Name *string `json:"name,omitempty"` + // RestoreDatabaseName - Name of the database at destination + RestoreDatabaseName *string `json:"restoreDatabaseName,omitempty"` + // BackupFileShare - Backup file share information for backing up this database. + BackupFileShare *FileShare `json:"backupFileShare,omitempty"` + // BackupFilePaths - The list of backup files to be used in case of existing backups. + BackupFilePaths *[]string `json:"backupFilePaths,omitempty"` +} + +// MigrateSQLServerSQLMISyncTaskInput input for task that migrates SQL Server databases to Azure SQL +// Database Managed Instance online scenario. +type MigrateSQLServerSQLMISyncTaskInput struct { + // SelectedDatabases - Databases to migrate + SelectedDatabases *[]MigrateSQLServerSQLMIDatabaseInput `json:"selectedDatabases,omitempty"` + // BackupFileShare - Backup file share information for all selected databases. + BackupFileShare *FileShare `json:"backupFileShare,omitempty"` + // StorageResourceID - Fully qualified resourceId of storage + StorageResourceID *string `json:"storageResourceId,omitempty"` + // SourceConnectionInfo - Connection information for source SQL Server + SourceConnectionInfo *SQLConnectionInfo `json:"sourceConnectionInfo,omitempty"` + // TargetConnectionInfo - Connection information for Azure SQL Database Managed Instance + TargetConnectionInfo *MiSQLConnectionInfo `json:"targetConnectionInfo,omitempty"` + // AzureApp - Azure Active Directory Application the DMS instance will use to connect to the target instance of Azure SQL Database Managed Instance and the Azure Storage Account + AzureApp *AzureActiveDirectoryApp `json:"azureApp,omitempty"` +} + +// BasicMigrateSQLServerSQLMISyncTaskOutput output for task that migrates SQL Server databases to Azure SQL Database +// Managed Instance using Log Replay Service. +type BasicMigrateSQLServerSQLMISyncTaskOutput interface { + AsMigrateSQLServerSQLMISyncTaskOutputError() (*MigrateSQLServerSQLMISyncTaskOutputError, bool) + AsMigrateSQLServerSQLMISyncTaskOutputDatabaseLevel() (*MigrateSQLServerSQLMISyncTaskOutputDatabaseLevel, bool) + AsMigrateSQLServerSQLMISyncTaskOutputMigrationLevel() (*MigrateSQLServerSQLMISyncTaskOutputMigrationLevel, bool) + AsMigrateSQLServerSQLMISyncTaskOutput() (*MigrateSQLServerSQLMISyncTaskOutput, bool) +} + +// MigrateSQLServerSQLMISyncTaskOutput output for task that migrates SQL Server databases to Azure SQL Database +// Managed Instance using Log Replay Service. +type MigrateSQLServerSQLMISyncTaskOutput struct { + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeMigrateSQLServerSQLMISyncTaskOutput', 'ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutput `json:"resultType,omitempty"` +} + +func unmarshalBasicMigrateSQLServerSQLMISyncTaskOutput(body []byte) (BasicMigrateSQLServerSQLMISyncTaskOutput, error) { + var m map[string]interface{} + err := json.Unmarshal(body, &m) + if err != nil { + return nil, err + } + + switch m["resultType"] { + case string(ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeErrorOutput): + var msssmstoe MigrateSQLServerSQLMISyncTaskOutputError + err := json.Unmarshal(body, &msssmstoe) + return msssmstoe, err + case string(ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeDatabaseLevelOutput): + var msssmstodl MigrateSQLServerSQLMISyncTaskOutputDatabaseLevel + err := json.Unmarshal(body, &msssmstodl) + return msssmstodl, err + case string(ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeMigrationLevelOutput): + var msssmstoml MigrateSQLServerSQLMISyncTaskOutputMigrationLevel + err := json.Unmarshal(body, &msssmstoml) + return msssmstoml, err + default: + var msssmsto MigrateSQLServerSQLMISyncTaskOutput + err := json.Unmarshal(body, &msssmsto) + return msssmsto, err + } +} +func unmarshalBasicMigrateSQLServerSQLMISyncTaskOutputArray(body []byte) ([]BasicMigrateSQLServerSQLMISyncTaskOutput, error) { + var rawMessages []*json.RawMessage + err := json.Unmarshal(body, &rawMessages) + if err != nil { + return nil, err + } + + msssmstoArray := make([]BasicMigrateSQLServerSQLMISyncTaskOutput, len(rawMessages)) + + for index, rawMessage := range rawMessages { + msssmsto, err := unmarshalBasicMigrateSQLServerSQLMISyncTaskOutput(*rawMessage) + if err != nil { + return nil, err + } + msssmstoArray[index] = msssmsto + } + return msssmstoArray, nil +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLMISyncTaskOutput. +func (msssmsto MigrateSQLServerSQLMISyncTaskOutput) MarshalJSON() ([]byte, error) { + msssmsto.ResultType = ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeMigrateSQLServerSQLMISyncTaskOutput + objectMap := make(map[string]interface{}) + if msssmsto.ResultType != "" { + objectMap["resultType"] = msssmsto.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateSQLServerSQLMISyncTaskOutputError is the BasicMigrateSQLServerSQLMISyncTaskOutput implementation for MigrateSQLServerSQLMISyncTaskOutput. +func (msssmsto MigrateSQLServerSQLMISyncTaskOutput) AsMigrateSQLServerSQLMISyncTaskOutputError() (*MigrateSQLServerSQLMISyncTaskOutputError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskOutputDatabaseLevel is the BasicMigrateSQLServerSQLMISyncTaskOutput implementation for MigrateSQLServerSQLMISyncTaskOutput. +func (msssmsto MigrateSQLServerSQLMISyncTaskOutput) AsMigrateSQLServerSQLMISyncTaskOutputDatabaseLevel() (*MigrateSQLServerSQLMISyncTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskOutputMigrationLevel is the BasicMigrateSQLServerSQLMISyncTaskOutput implementation for MigrateSQLServerSQLMISyncTaskOutput. +func (msssmsto MigrateSQLServerSQLMISyncTaskOutput) AsMigrateSQLServerSQLMISyncTaskOutputMigrationLevel() (*MigrateSQLServerSQLMISyncTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskOutput is the BasicMigrateSQLServerSQLMISyncTaskOutput implementation for MigrateSQLServerSQLMISyncTaskOutput. +func (msssmsto MigrateSQLServerSQLMISyncTaskOutput) AsMigrateSQLServerSQLMISyncTaskOutput() (*MigrateSQLServerSQLMISyncTaskOutput, bool) { + return &msssmsto, true +} + +// AsBasicMigrateSQLServerSQLMISyncTaskOutput is the BasicMigrateSQLServerSQLMISyncTaskOutput implementation for MigrateSQLServerSQLMISyncTaskOutput. +func (msssmsto MigrateSQLServerSQLMISyncTaskOutput) AsBasicMigrateSQLServerSQLMISyncTaskOutput() (BasicMigrateSQLServerSQLMISyncTaskOutput, bool) { + return &msssmsto, true +} + +// MigrateSQLServerSQLMISyncTaskOutputDatabaseLevel ... +type MigrateSQLServerSQLMISyncTaskOutputDatabaseLevel struct { + // SourceDatabaseName - READ-ONLY; Name of the database + SourceDatabaseName *string `json:"sourceDatabaseName,omitempty"` + // MigrationState - READ-ONLY; Current state of database. Possible values include: 'UNDEFINED', 'INITIAL', 'FULLBACKUPUPLOADSTART', 'LOGSHIPPINGSTART', 'UPLOADLOGFILESSTART', 'CUTOVERSTART', 'POSTCUTOVERCOMPLETE', 'COMPLETED', 'CANCELLED', 'FAILED' + MigrationState DatabaseMigrationState `json:"migrationState,omitempty"` + // StartedOn - READ-ONLY; Database migration start time + StartedOn *date.Time `json:"startedOn,omitempty"` + // EndedOn - READ-ONLY; Database migration end time + EndedOn *date.Time `json:"endedOn,omitempty"` + // FullBackupSetInfo - READ-ONLY; Details of full backup set + FullBackupSetInfo *BackupSetInfo `json:"fullBackupSetInfo,omitempty"` + // LastRestoredBackupSetInfo - READ-ONLY; Last applied backup set information + LastRestoredBackupSetInfo *BackupSetInfo `json:"lastRestoredBackupSetInfo,omitempty"` + // ActiveBackupSets - READ-ONLY; Backup sets that are currently active (Either being uploaded or getting restored) + ActiveBackupSets *[]BackupSetInfo `json:"activeBackupSets,omitempty"` + // ContainerName - READ-ONLY; Name of container created in the Azure Storage account where backups are copied to + ContainerName *string `json:"containerName,omitempty"` + // ErrorPrefix - READ-ONLY; prefix string to use for querying errors for this database + ErrorPrefix *string `json:"errorPrefix,omitempty"` + // IsFullBackupRestored - READ-ONLY; Whether full backup has been applied to the target database or not + IsFullBackupRestored *bool `json:"isFullBackupRestored,omitempty"` + // ExceptionsAndWarnings - READ-ONLY; Migration exceptions and warnings + ExceptionsAndWarnings *[]ReportableException `json:"exceptionsAndWarnings,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeMigrateSQLServerSQLMISyncTaskOutput', 'ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLMISyncTaskOutputDatabaseLevel. +func (msssmstodl MigrateSQLServerSQLMISyncTaskOutputDatabaseLevel) MarshalJSON() ([]byte, error) { + msssmstodl.ResultType = ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeDatabaseLevelOutput + objectMap := make(map[string]interface{}) + if msssmstodl.ResultType != "" { + objectMap["resultType"] = msssmstodl.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateSQLServerSQLMISyncTaskOutputError is the BasicMigrateSQLServerSQLMISyncTaskOutput implementation for MigrateSQLServerSQLMISyncTaskOutputDatabaseLevel. +func (msssmstodl MigrateSQLServerSQLMISyncTaskOutputDatabaseLevel) AsMigrateSQLServerSQLMISyncTaskOutputError() (*MigrateSQLServerSQLMISyncTaskOutputError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskOutputDatabaseLevel is the BasicMigrateSQLServerSQLMISyncTaskOutput implementation for MigrateSQLServerSQLMISyncTaskOutputDatabaseLevel. +func (msssmstodl MigrateSQLServerSQLMISyncTaskOutputDatabaseLevel) AsMigrateSQLServerSQLMISyncTaskOutputDatabaseLevel() (*MigrateSQLServerSQLMISyncTaskOutputDatabaseLevel, bool) { + return &msssmstodl, true +} + +// AsMigrateSQLServerSQLMISyncTaskOutputMigrationLevel is the BasicMigrateSQLServerSQLMISyncTaskOutput implementation for MigrateSQLServerSQLMISyncTaskOutputDatabaseLevel. +func (msssmstodl MigrateSQLServerSQLMISyncTaskOutputDatabaseLevel) AsMigrateSQLServerSQLMISyncTaskOutputMigrationLevel() (*MigrateSQLServerSQLMISyncTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskOutput is the BasicMigrateSQLServerSQLMISyncTaskOutput implementation for MigrateSQLServerSQLMISyncTaskOutputDatabaseLevel. +func (msssmstodl MigrateSQLServerSQLMISyncTaskOutputDatabaseLevel) AsMigrateSQLServerSQLMISyncTaskOutput() (*MigrateSQLServerSQLMISyncTaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateSQLServerSQLMISyncTaskOutput is the BasicMigrateSQLServerSQLMISyncTaskOutput implementation for MigrateSQLServerSQLMISyncTaskOutputDatabaseLevel. +func (msssmstodl MigrateSQLServerSQLMISyncTaskOutputDatabaseLevel) AsBasicMigrateSQLServerSQLMISyncTaskOutput() (BasicMigrateSQLServerSQLMISyncTaskOutput, bool) { + return &msssmstodl, true +} + +// MigrateSQLServerSQLMISyncTaskOutputError ... +type MigrateSQLServerSQLMISyncTaskOutputError struct { + // Error - READ-ONLY; Migration error + Error *ReportableException `json:"error,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeMigrateSQLServerSQLMISyncTaskOutput', 'ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLMISyncTaskOutputError. +func (msssmstoe MigrateSQLServerSQLMISyncTaskOutputError) MarshalJSON() ([]byte, error) { + msssmstoe.ResultType = ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeErrorOutput + objectMap := make(map[string]interface{}) + if msssmstoe.ResultType != "" { + objectMap["resultType"] = msssmstoe.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateSQLServerSQLMISyncTaskOutputError is the BasicMigrateSQLServerSQLMISyncTaskOutput implementation for MigrateSQLServerSQLMISyncTaskOutputError. +func (msssmstoe MigrateSQLServerSQLMISyncTaskOutputError) AsMigrateSQLServerSQLMISyncTaskOutputError() (*MigrateSQLServerSQLMISyncTaskOutputError, bool) { + return &msssmstoe, true +} + +// AsMigrateSQLServerSQLMISyncTaskOutputDatabaseLevel is the BasicMigrateSQLServerSQLMISyncTaskOutput implementation for MigrateSQLServerSQLMISyncTaskOutputError. +func (msssmstoe MigrateSQLServerSQLMISyncTaskOutputError) AsMigrateSQLServerSQLMISyncTaskOutputDatabaseLevel() (*MigrateSQLServerSQLMISyncTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskOutputMigrationLevel is the BasicMigrateSQLServerSQLMISyncTaskOutput implementation for MigrateSQLServerSQLMISyncTaskOutputError. +func (msssmstoe MigrateSQLServerSQLMISyncTaskOutputError) AsMigrateSQLServerSQLMISyncTaskOutputMigrationLevel() (*MigrateSQLServerSQLMISyncTaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskOutput is the BasicMigrateSQLServerSQLMISyncTaskOutput implementation for MigrateSQLServerSQLMISyncTaskOutputError. +func (msssmstoe MigrateSQLServerSQLMISyncTaskOutputError) AsMigrateSQLServerSQLMISyncTaskOutput() (*MigrateSQLServerSQLMISyncTaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateSQLServerSQLMISyncTaskOutput is the BasicMigrateSQLServerSQLMISyncTaskOutput implementation for MigrateSQLServerSQLMISyncTaskOutputError. +func (msssmstoe MigrateSQLServerSQLMISyncTaskOutputError) AsBasicMigrateSQLServerSQLMISyncTaskOutput() (BasicMigrateSQLServerSQLMISyncTaskOutput, bool) { + return &msssmstoe, true +} + +// MigrateSQLServerSQLMISyncTaskOutputMigrationLevel ... +type MigrateSQLServerSQLMISyncTaskOutputMigrationLevel struct { + // DatabaseCount - READ-ONLY; Count of databases + DatabaseCount *int32 `json:"databaseCount,omitempty"` + // State - READ-ONLY; Current state of migration. Possible values include: 'MigrationStateNone', 'MigrationStateInProgress', 'MigrationStateFailed', 'MigrationStateWarning', 'MigrationStateCompleted', 'MigrationStateSkipped', 'MigrationStateStopped' + State MigrationState `json:"state,omitempty"` + // StartedOn - READ-ONLY; Migration start time + StartedOn *date.Time `json:"startedOn,omitempty"` + // EndedOn - READ-ONLY; Migration end time + EndedOn *date.Time `json:"endedOn,omitempty"` + // SourceServerName - READ-ONLY; Source server name + SourceServerName *string `json:"sourceServerName,omitempty"` + // SourceServerVersion - READ-ONLY; Source server version + SourceServerVersion *string `json:"sourceServerVersion,omitempty"` + // SourceServerBrandVersion - READ-ONLY; Source server brand version + SourceServerBrandVersion *string `json:"sourceServerBrandVersion,omitempty"` + // TargetServerName - READ-ONLY; Target server name + TargetServerName *string `json:"targetServerName,omitempty"` + // TargetServerVersion - READ-ONLY; Target server version + TargetServerVersion *string `json:"targetServerVersion,omitempty"` + // TargetServerBrandVersion - READ-ONLY; Target server brand version + TargetServerBrandVersion *string `json:"targetServerBrandVersion,omitempty"` + // DatabaseErrorCount - READ-ONLY; Number of database level errors + DatabaseErrorCount *int32 `json:"databaseErrorCount,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeMigrateSQLServerSQLMISyncTaskOutput', 'ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLMISyncTaskOutputMigrationLevel. +func (msssmstoml MigrateSQLServerSQLMISyncTaskOutputMigrationLevel) MarshalJSON() ([]byte, error) { + msssmstoml.ResultType = ResultTypeBasicMigrateSQLServerSQLMISyncTaskOutputResultTypeMigrationLevelOutput + objectMap := make(map[string]interface{}) + if msssmstoml.ResultType != "" { + objectMap["resultType"] = msssmstoml.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateSQLServerSQLMISyncTaskOutputError is the BasicMigrateSQLServerSQLMISyncTaskOutput implementation for MigrateSQLServerSQLMISyncTaskOutputMigrationLevel. +func (msssmstoml MigrateSQLServerSQLMISyncTaskOutputMigrationLevel) AsMigrateSQLServerSQLMISyncTaskOutputError() (*MigrateSQLServerSQLMISyncTaskOutputError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskOutputDatabaseLevel is the BasicMigrateSQLServerSQLMISyncTaskOutput implementation for MigrateSQLServerSQLMISyncTaskOutputMigrationLevel. +func (msssmstoml MigrateSQLServerSQLMISyncTaskOutputMigrationLevel) AsMigrateSQLServerSQLMISyncTaskOutputDatabaseLevel() (*MigrateSQLServerSQLMISyncTaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskOutputMigrationLevel is the BasicMigrateSQLServerSQLMISyncTaskOutput implementation for MigrateSQLServerSQLMISyncTaskOutputMigrationLevel. +func (msssmstoml MigrateSQLServerSQLMISyncTaskOutputMigrationLevel) AsMigrateSQLServerSQLMISyncTaskOutputMigrationLevel() (*MigrateSQLServerSQLMISyncTaskOutputMigrationLevel, bool) { + return &msssmstoml, true +} + +// AsMigrateSQLServerSQLMISyncTaskOutput is the BasicMigrateSQLServerSQLMISyncTaskOutput implementation for MigrateSQLServerSQLMISyncTaskOutputMigrationLevel. +func (msssmstoml MigrateSQLServerSQLMISyncTaskOutputMigrationLevel) AsMigrateSQLServerSQLMISyncTaskOutput() (*MigrateSQLServerSQLMISyncTaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateSQLServerSQLMISyncTaskOutput is the BasicMigrateSQLServerSQLMISyncTaskOutput implementation for MigrateSQLServerSQLMISyncTaskOutputMigrationLevel. +func (msssmstoml MigrateSQLServerSQLMISyncTaskOutputMigrationLevel) AsBasicMigrateSQLServerSQLMISyncTaskOutput() (BasicMigrateSQLServerSQLMISyncTaskOutput, bool) { + return &msssmstoml, true +} + +// MigrateSQLServerSQLMISyncTaskProperties properties for task that migrates SQL Server databases to Azure +// SQL Database Managed Instance sync scenario +type MigrateSQLServerSQLMISyncTaskProperties struct { + // Input - Task input + Input *MigrateSQLServerSQLMISyncTaskInput `json:"input,omitempty"` + // Output - READ-ONLY; Task output. This is ignored if submitted. + Output *[]BasicMigrateSQLServerSQLMISyncTaskOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the task. This is ignored if submitted. Possible values include: 'TaskStateUnknown', 'TaskStateQueued', 'TaskStateRunning', 'TaskStateCanceled', 'TaskStateSucceeded', 'TaskStateFailed', 'TaskStateFailedInputValidation', 'TaskStateFaulted' + State TaskState `json:"state,omitempty"` + // Commands - READ-ONLY; Array of command properties. + Commands *[]BasicCommandProperties `json:"commands,omitempty"` + // TaskType - Possible values include: 'TaskTypeProjectTaskProperties', 'TaskTypeGetTDECertificatesSQL', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI', 'TaskTypeValidateMigrationInputSQLServerSQLDbSync', 'TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync', 'TaskTypeMigrateMySQLAzureDbForMySQLSync', 'TaskTypeMigrateSQLServerAzureSQLDbSync', 'TaskTypeMigrateSQLServerSQLDb', 'TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS', 'TaskTypeMigrateSQLServerAzureSQLDbMI', 'TaskTypeConnectToTargetAzureDbForMySQL', 'TaskTypeConnectToTargetAzureSQLDbMISyncLRS', 'TaskTypeConnectToTargetAzureSQLDbMI', 'TaskTypeGetUserTablesAzureSQLDbSync', 'TaskTypeGetUserTablesSQL', 'TaskTypeConnectToTargetAzureDbForPostgreSQLSync', 'TaskTypeConnectToTargetSQLDbSync', 'TaskTypeConnectToTargetSQLDb', 'TaskTypeConnectToSourcePostgreSQLSync', 'TaskTypeConnectToSourceSQLServerSync', 'TaskTypeConnectToSourceSQLServer', 'TaskTypeConnectToSourceMySQL' + TaskType TaskType `json:"taskType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) MarshalJSON() ([]byte, error) { + msssmstp.TaskType = TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS + objectMap := make(map[string]interface{}) + if msssmstp.Input != nil { + objectMap["input"] = msssmstp.Input + } + if msssmstp.TaskType != "" { + objectMap["taskType"] = msssmstp.TaskType + } + return json.Marshal(objectMap) +} + +// AsGetTdeCertificatesSQLTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) { + return &msssmstp, true +} + +// AsMigrateSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForMySQLTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMITaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLDbTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourcePostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceMySQLTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) { + return nil, false +} + +// AsProjectTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsProjectTaskProperties() (*ProjectTaskProperties, bool) { + return nil, false +} + +// AsBasicProjectTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMISyncTaskProperties. +func (msssmstp MigrateSQLServerSQLMISyncTaskProperties) AsBasicProjectTaskProperties() (BasicProjectTaskProperties, bool) { + return &msssmstp, true +} + +// UnmarshalJSON is the custom unmarshaler for MigrateSQLServerSQLMISyncTaskProperties struct. +func (msssmstp *MigrateSQLServerSQLMISyncTaskProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "input": + if v != nil { + var input MigrateSQLServerSQLMISyncTaskInput + err = json.Unmarshal(*v, &input) + if err != nil { + return err + } + msssmstp.Input = &input + } + case "output": + if v != nil { + output, err := unmarshalBasicMigrateSQLServerSQLMISyncTaskOutputArray(*v) + if err != nil { + return err + } + msssmstp.Output = &output + } + case "errors": + if v != nil { + var errorsVar []ODataError + err = json.Unmarshal(*v, &errorsVar) + if err != nil { + return err + } + msssmstp.Errors = &errorsVar + } + case "state": + if v != nil { + var state TaskState + err = json.Unmarshal(*v, &state) + if err != nil { + return err + } + msssmstp.State = state + } + case "commands": + if v != nil { + commands, err := unmarshalBasicCommandPropertiesArray(*v) + if err != nil { + return err + } + msssmstp.Commands = &commands + } + case "taskType": + if v != nil { + var taskType TaskType + err = json.Unmarshal(*v, &taskType) + if err != nil { + return err + } + msssmstp.TaskType = taskType + } + } + } + + return nil +} + +// MigrateSQLServerSQLMITaskInput input for task that migrates SQL Server databases to Azure SQL Database +// Managed Instance. +type MigrateSQLServerSQLMITaskInput struct { + // SelectedDatabases - Databases to migrate + SelectedDatabases *[]MigrateSQLServerSQLMIDatabaseInput `json:"selectedDatabases,omitempty"` + // SelectedLogins - Logins to migrate. + SelectedLogins *[]string `json:"selectedLogins,omitempty"` + // SelectedAgentJobs - Agent Jobs to migrate. + SelectedAgentJobs *[]string `json:"selectedAgentJobs,omitempty"` + // BackupFileShare - Backup file share information for all selected databases. + BackupFileShare *FileShare `json:"backupFileShare,omitempty"` + // BackupBlobShare - SAS URI of Azure Storage Account Container to be used for storing backup files. + BackupBlobShare *BlobShare `json:"backupBlobShare,omitempty"` + // BackupMode - Backup Mode to specify whether to use existing backup or create new backup. If using existing backups, backup file paths are required to be provided in selectedDatabases. Possible values include: 'CreateBackup', 'ExistingBackup' + BackupMode BackupMode `json:"backupMode,omitempty"` + // SourceConnectionInfo - Information for connecting to source + SourceConnectionInfo *SQLConnectionInfo `json:"sourceConnectionInfo,omitempty"` + // TargetConnectionInfo - Information for connecting to target + TargetConnectionInfo *SQLConnectionInfo `json:"targetConnectionInfo,omitempty"` +} + +// BasicMigrateSQLServerSQLMITaskOutput output for task that migrates SQL Server databases to Azure SQL Database +// Managed Instance. +type BasicMigrateSQLServerSQLMITaskOutput interface { + AsMigrateSQLServerSQLMITaskOutputError() (*MigrateSQLServerSQLMITaskOutputError, bool) + AsMigrateSQLServerSQLMITaskOutputLoginLevel() (*MigrateSQLServerSQLMITaskOutputLoginLevel, bool) + AsMigrateSQLServerSQLMITaskOutputAgentJobLevel() (*MigrateSQLServerSQLMITaskOutputAgentJobLevel, bool) + AsMigrateSQLServerSQLMITaskOutputDatabaseLevel() (*MigrateSQLServerSQLMITaskOutputDatabaseLevel, bool) + AsMigrateSQLServerSQLMITaskOutputMigrationLevel() (*MigrateSQLServerSQLMITaskOutputMigrationLevel, bool) + AsMigrateSQLServerSQLMITaskOutput() (*MigrateSQLServerSQLMITaskOutput, bool) +} + +// MigrateSQLServerSQLMITaskOutput output for task that migrates SQL Server databases to Azure SQL Database +// Managed Instance. +type MigrateSQLServerSQLMITaskOutput struct { + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeMigrateSQLServerSQLMITaskOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeLoginLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeAgentJobLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateSQLServerSQLMITaskOutput `json:"resultType,omitempty"` +} + +func unmarshalBasicMigrateSQLServerSQLMITaskOutput(body []byte) (BasicMigrateSQLServerSQLMITaskOutput, error) { + var m map[string]interface{} + err := json.Unmarshal(body, &m) + if err != nil { + return nil, err + } + + switch m["resultType"] { + case string(ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeErrorOutput): + var msssmtoe MigrateSQLServerSQLMITaskOutputError + err := json.Unmarshal(body, &msssmtoe) + return msssmtoe, err + case string(ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeLoginLevelOutput): + var msssmtoll MigrateSQLServerSQLMITaskOutputLoginLevel + err := json.Unmarshal(body, &msssmtoll) + return msssmtoll, err + case string(ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeAgentJobLevelOutput): + var msssmtoajl MigrateSQLServerSQLMITaskOutputAgentJobLevel + err := json.Unmarshal(body, &msssmtoajl) + return msssmtoajl, err + case string(ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeDatabaseLevelOutput): + var msssmtodl MigrateSQLServerSQLMITaskOutputDatabaseLevel + err := json.Unmarshal(body, &msssmtodl) + return msssmtodl, err + case string(ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeMigrationLevelOutput): + var msssmtoml MigrateSQLServerSQLMITaskOutputMigrationLevel + err := json.Unmarshal(body, &msssmtoml) + return msssmtoml, err + default: + var msssmto MigrateSQLServerSQLMITaskOutput + err := json.Unmarshal(body, &msssmto) + return msssmto, err + } +} +func unmarshalBasicMigrateSQLServerSQLMITaskOutputArray(body []byte) ([]BasicMigrateSQLServerSQLMITaskOutput, error) { + var rawMessages []*json.RawMessage + err := json.Unmarshal(body, &rawMessages) + if err != nil { + return nil, err + } + + msssmtoArray := make([]BasicMigrateSQLServerSQLMITaskOutput, len(rawMessages)) + + for index, rawMessage := range rawMessages { + msssmto, err := unmarshalBasicMigrateSQLServerSQLMITaskOutput(*rawMessage) + if err != nil { + return nil, err + } + msssmtoArray[index] = msssmto + } + return msssmtoArray, nil +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLMITaskOutput. +func (msssmto MigrateSQLServerSQLMITaskOutput) MarshalJSON() ([]byte, error) { + msssmto.ResultType = ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeMigrateSQLServerSQLMITaskOutput + objectMap := make(map[string]interface{}) + if msssmto.ResultType != "" { + objectMap["resultType"] = msssmto.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateSQLServerSQLMITaskOutputError is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutput. +func (msssmto MigrateSQLServerSQLMITaskOutput) AsMigrateSQLServerSQLMITaskOutputError() (*MigrateSQLServerSQLMITaskOutputError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutputLoginLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutput. +func (msssmto MigrateSQLServerSQLMITaskOutput) AsMigrateSQLServerSQLMITaskOutputLoginLevel() (*MigrateSQLServerSQLMITaskOutputLoginLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutputAgentJobLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutput. +func (msssmto MigrateSQLServerSQLMITaskOutput) AsMigrateSQLServerSQLMITaskOutputAgentJobLevel() (*MigrateSQLServerSQLMITaskOutputAgentJobLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutputDatabaseLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutput. +func (msssmto MigrateSQLServerSQLMITaskOutput) AsMigrateSQLServerSQLMITaskOutputDatabaseLevel() (*MigrateSQLServerSQLMITaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutputMigrationLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutput. +func (msssmto MigrateSQLServerSQLMITaskOutput) AsMigrateSQLServerSQLMITaskOutputMigrationLevel() (*MigrateSQLServerSQLMITaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutput is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutput. +func (msssmto MigrateSQLServerSQLMITaskOutput) AsMigrateSQLServerSQLMITaskOutput() (*MigrateSQLServerSQLMITaskOutput, bool) { + return &msssmto, true +} + +// AsBasicMigrateSQLServerSQLMITaskOutput is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutput. +func (msssmto MigrateSQLServerSQLMITaskOutput) AsBasicMigrateSQLServerSQLMITaskOutput() (BasicMigrateSQLServerSQLMITaskOutput, bool) { + return &msssmto, true +} + +// MigrateSQLServerSQLMITaskOutputAgentJobLevel ... +type MigrateSQLServerSQLMITaskOutputAgentJobLevel struct { + // Name - READ-ONLY; Agent Job name. + Name *string `json:"name,omitempty"` + // IsEnabled - READ-ONLY; The state of the original Agent Job. + IsEnabled *bool `json:"isEnabled,omitempty"` + // State - READ-ONLY; Current state of migration. Possible values include: 'MigrationStateNone', 'MigrationStateInProgress', 'MigrationStateFailed', 'MigrationStateWarning', 'MigrationStateCompleted', 'MigrationStateSkipped', 'MigrationStateStopped' + State MigrationState `json:"state,omitempty"` + // StartedOn - READ-ONLY; Migration start time + StartedOn *date.Time `json:"startedOn,omitempty"` + // EndedOn - READ-ONLY; Migration end time + EndedOn *date.Time `json:"endedOn,omitempty"` + // Message - READ-ONLY; Migration progress message + Message *string `json:"message,omitempty"` + // ExceptionsAndWarnings - READ-ONLY; Migration errors and warnings per job + ExceptionsAndWarnings *[]ReportableException `json:"exceptionsAndWarnings,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeMigrateSQLServerSQLMITaskOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeLoginLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeAgentJobLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateSQLServerSQLMITaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLMITaskOutputAgentJobLevel. +func (msssmtoajl MigrateSQLServerSQLMITaskOutputAgentJobLevel) MarshalJSON() ([]byte, error) { + msssmtoajl.ResultType = ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeAgentJobLevelOutput + objectMap := make(map[string]interface{}) + if msssmtoajl.ResultType != "" { + objectMap["resultType"] = msssmtoajl.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateSQLServerSQLMITaskOutputError is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputAgentJobLevel. +func (msssmtoajl MigrateSQLServerSQLMITaskOutputAgentJobLevel) AsMigrateSQLServerSQLMITaskOutputError() (*MigrateSQLServerSQLMITaskOutputError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutputLoginLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputAgentJobLevel. +func (msssmtoajl MigrateSQLServerSQLMITaskOutputAgentJobLevel) AsMigrateSQLServerSQLMITaskOutputLoginLevel() (*MigrateSQLServerSQLMITaskOutputLoginLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutputAgentJobLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputAgentJobLevel. +func (msssmtoajl MigrateSQLServerSQLMITaskOutputAgentJobLevel) AsMigrateSQLServerSQLMITaskOutputAgentJobLevel() (*MigrateSQLServerSQLMITaskOutputAgentJobLevel, bool) { + return &msssmtoajl, true +} + +// AsMigrateSQLServerSQLMITaskOutputDatabaseLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputAgentJobLevel. +func (msssmtoajl MigrateSQLServerSQLMITaskOutputAgentJobLevel) AsMigrateSQLServerSQLMITaskOutputDatabaseLevel() (*MigrateSQLServerSQLMITaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutputMigrationLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputAgentJobLevel. +func (msssmtoajl MigrateSQLServerSQLMITaskOutputAgentJobLevel) AsMigrateSQLServerSQLMITaskOutputMigrationLevel() (*MigrateSQLServerSQLMITaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutput is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputAgentJobLevel. +func (msssmtoajl MigrateSQLServerSQLMITaskOutputAgentJobLevel) AsMigrateSQLServerSQLMITaskOutput() (*MigrateSQLServerSQLMITaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateSQLServerSQLMITaskOutput is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputAgentJobLevel. +func (msssmtoajl MigrateSQLServerSQLMITaskOutputAgentJobLevel) AsBasicMigrateSQLServerSQLMITaskOutput() (BasicMigrateSQLServerSQLMITaskOutput, bool) { + return &msssmtoajl, true +} + +// MigrateSQLServerSQLMITaskOutputDatabaseLevel ... +type MigrateSQLServerSQLMITaskOutputDatabaseLevel struct { + // DatabaseName - READ-ONLY; Name of the database + DatabaseName *string `json:"databaseName,omitempty"` + // SizeMB - READ-ONLY; Size of the database in megabytes + SizeMB *float64 `json:"sizeMB,omitempty"` + // State - READ-ONLY; Current state of migration. Possible values include: 'MigrationStateNone', 'MigrationStateInProgress', 'MigrationStateFailed', 'MigrationStateWarning', 'MigrationStateCompleted', 'MigrationStateSkipped', 'MigrationStateStopped' + State MigrationState `json:"state,omitempty"` + // Stage - READ-ONLY; Current stage of migration. Possible values include: 'DatabaseMigrationStageNone', 'DatabaseMigrationStageInitialize', 'DatabaseMigrationStageBackup', 'DatabaseMigrationStageFileCopy', 'DatabaseMigrationStageRestore', 'DatabaseMigrationStageCompleted' + Stage DatabaseMigrationStage `json:"stage,omitempty"` + // StartedOn - READ-ONLY; Migration start time + StartedOn *date.Time `json:"startedOn,omitempty"` + // EndedOn - READ-ONLY; Migration end time + EndedOn *date.Time `json:"endedOn,omitempty"` + // Message - READ-ONLY; Migration progress message + Message *string `json:"message,omitempty"` + // ExceptionsAndWarnings - READ-ONLY; Migration exceptions and warnings + ExceptionsAndWarnings *[]ReportableException `json:"exceptionsAndWarnings,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeMigrateSQLServerSQLMITaskOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeLoginLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeAgentJobLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateSQLServerSQLMITaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLMITaskOutputDatabaseLevel. +func (msssmtodl MigrateSQLServerSQLMITaskOutputDatabaseLevel) MarshalJSON() ([]byte, error) { + msssmtodl.ResultType = ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeDatabaseLevelOutput + objectMap := make(map[string]interface{}) + if msssmtodl.ResultType != "" { + objectMap["resultType"] = msssmtodl.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateSQLServerSQLMITaskOutputError is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputDatabaseLevel. +func (msssmtodl MigrateSQLServerSQLMITaskOutputDatabaseLevel) AsMigrateSQLServerSQLMITaskOutputError() (*MigrateSQLServerSQLMITaskOutputError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutputLoginLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputDatabaseLevel. +func (msssmtodl MigrateSQLServerSQLMITaskOutputDatabaseLevel) AsMigrateSQLServerSQLMITaskOutputLoginLevel() (*MigrateSQLServerSQLMITaskOutputLoginLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutputAgentJobLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputDatabaseLevel. +func (msssmtodl MigrateSQLServerSQLMITaskOutputDatabaseLevel) AsMigrateSQLServerSQLMITaskOutputAgentJobLevel() (*MigrateSQLServerSQLMITaskOutputAgentJobLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutputDatabaseLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputDatabaseLevel. +func (msssmtodl MigrateSQLServerSQLMITaskOutputDatabaseLevel) AsMigrateSQLServerSQLMITaskOutputDatabaseLevel() (*MigrateSQLServerSQLMITaskOutputDatabaseLevel, bool) { + return &msssmtodl, true +} + +// AsMigrateSQLServerSQLMITaskOutputMigrationLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputDatabaseLevel. +func (msssmtodl MigrateSQLServerSQLMITaskOutputDatabaseLevel) AsMigrateSQLServerSQLMITaskOutputMigrationLevel() (*MigrateSQLServerSQLMITaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutput is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputDatabaseLevel. +func (msssmtodl MigrateSQLServerSQLMITaskOutputDatabaseLevel) AsMigrateSQLServerSQLMITaskOutput() (*MigrateSQLServerSQLMITaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateSQLServerSQLMITaskOutput is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputDatabaseLevel. +func (msssmtodl MigrateSQLServerSQLMITaskOutputDatabaseLevel) AsBasicMigrateSQLServerSQLMITaskOutput() (BasicMigrateSQLServerSQLMITaskOutput, bool) { + return &msssmtodl, true +} + +// MigrateSQLServerSQLMITaskOutputError ... +type MigrateSQLServerSQLMITaskOutputError struct { + // Error - READ-ONLY; Migration error + Error *ReportableException `json:"error,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeMigrateSQLServerSQLMITaskOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeLoginLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeAgentJobLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateSQLServerSQLMITaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLMITaskOutputError. +func (msssmtoe MigrateSQLServerSQLMITaskOutputError) MarshalJSON() ([]byte, error) { + msssmtoe.ResultType = ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeErrorOutput + objectMap := make(map[string]interface{}) + if msssmtoe.ResultType != "" { + objectMap["resultType"] = msssmtoe.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateSQLServerSQLMITaskOutputError is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputError. +func (msssmtoe MigrateSQLServerSQLMITaskOutputError) AsMigrateSQLServerSQLMITaskOutputError() (*MigrateSQLServerSQLMITaskOutputError, bool) { + return &msssmtoe, true +} + +// AsMigrateSQLServerSQLMITaskOutputLoginLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputError. +func (msssmtoe MigrateSQLServerSQLMITaskOutputError) AsMigrateSQLServerSQLMITaskOutputLoginLevel() (*MigrateSQLServerSQLMITaskOutputLoginLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutputAgentJobLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputError. +func (msssmtoe MigrateSQLServerSQLMITaskOutputError) AsMigrateSQLServerSQLMITaskOutputAgentJobLevel() (*MigrateSQLServerSQLMITaskOutputAgentJobLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutputDatabaseLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputError. +func (msssmtoe MigrateSQLServerSQLMITaskOutputError) AsMigrateSQLServerSQLMITaskOutputDatabaseLevel() (*MigrateSQLServerSQLMITaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutputMigrationLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputError. +func (msssmtoe MigrateSQLServerSQLMITaskOutputError) AsMigrateSQLServerSQLMITaskOutputMigrationLevel() (*MigrateSQLServerSQLMITaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutput is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputError. +func (msssmtoe MigrateSQLServerSQLMITaskOutputError) AsMigrateSQLServerSQLMITaskOutput() (*MigrateSQLServerSQLMITaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateSQLServerSQLMITaskOutput is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputError. +func (msssmtoe MigrateSQLServerSQLMITaskOutputError) AsBasicMigrateSQLServerSQLMITaskOutput() (BasicMigrateSQLServerSQLMITaskOutput, bool) { + return &msssmtoe, true +} + +// MigrateSQLServerSQLMITaskOutputLoginLevel ... +type MigrateSQLServerSQLMITaskOutputLoginLevel struct { + // LoginName - READ-ONLY; Login name. + LoginName *string `json:"loginName,omitempty"` + // State - READ-ONLY; Current state of login. Possible values include: 'MigrationStateNone', 'MigrationStateInProgress', 'MigrationStateFailed', 'MigrationStateWarning', 'MigrationStateCompleted', 'MigrationStateSkipped', 'MigrationStateStopped' + State MigrationState `json:"state,omitempty"` + // Stage - READ-ONLY; Current stage of login. Possible values include: 'LoginMigrationStageNone', 'LoginMigrationStageInitialize', 'LoginMigrationStageLoginMigration', 'LoginMigrationStageEstablishUserMapping', 'LoginMigrationStageAssignRoleMembership', 'LoginMigrationStageAssignRoleOwnership', 'LoginMigrationStageEstablishServerPermissions', 'LoginMigrationStageEstablishObjectPermissions', 'LoginMigrationStageCompleted' + Stage LoginMigrationStage `json:"stage,omitempty"` + // StartedOn - READ-ONLY; Login migration start time + StartedOn *date.Time `json:"startedOn,omitempty"` + // EndedOn - READ-ONLY; Login migration end time + EndedOn *date.Time `json:"endedOn,omitempty"` + // Message - READ-ONLY; Login migration progress message + Message *string `json:"message,omitempty"` + // ExceptionsAndWarnings - READ-ONLY; Login migration errors and warnings per login + ExceptionsAndWarnings *[]ReportableException `json:"exceptionsAndWarnings,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeMigrateSQLServerSQLMITaskOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeLoginLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeAgentJobLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateSQLServerSQLMITaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLMITaskOutputLoginLevel. +func (msssmtoll MigrateSQLServerSQLMITaskOutputLoginLevel) MarshalJSON() ([]byte, error) { + msssmtoll.ResultType = ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeLoginLevelOutput + objectMap := make(map[string]interface{}) + if msssmtoll.ResultType != "" { + objectMap["resultType"] = msssmtoll.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateSQLServerSQLMITaskOutputError is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputLoginLevel. +func (msssmtoll MigrateSQLServerSQLMITaskOutputLoginLevel) AsMigrateSQLServerSQLMITaskOutputError() (*MigrateSQLServerSQLMITaskOutputError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutputLoginLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputLoginLevel. +func (msssmtoll MigrateSQLServerSQLMITaskOutputLoginLevel) AsMigrateSQLServerSQLMITaskOutputLoginLevel() (*MigrateSQLServerSQLMITaskOutputLoginLevel, bool) { + return &msssmtoll, true +} + +// AsMigrateSQLServerSQLMITaskOutputAgentJobLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputLoginLevel. +func (msssmtoll MigrateSQLServerSQLMITaskOutputLoginLevel) AsMigrateSQLServerSQLMITaskOutputAgentJobLevel() (*MigrateSQLServerSQLMITaskOutputAgentJobLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutputDatabaseLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputLoginLevel. +func (msssmtoll MigrateSQLServerSQLMITaskOutputLoginLevel) AsMigrateSQLServerSQLMITaskOutputDatabaseLevel() (*MigrateSQLServerSQLMITaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutputMigrationLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputLoginLevel. +func (msssmtoll MigrateSQLServerSQLMITaskOutputLoginLevel) AsMigrateSQLServerSQLMITaskOutputMigrationLevel() (*MigrateSQLServerSQLMITaskOutputMigrationLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutput is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputLoginLevel. +func (msssmtoll MigrateSQLServerSQLMITaskOutputLoginLevel) AsMigrateSQLServerSQLMITaskOutput() (*MigrateSQLServerSQLMITaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateSQLServerSQLMITaskOutput is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputLoginLevel. +func (msssmtoll MigrateSQLServerSQLMITaskOutputLoginLevel) AsBasicMigrateSQLServerSQLMITaskOutput() (BasicMigrateSQLServerSQLMITaskOutput, bool) { + return &msssmtoll, true +} + +// MigrateSQLServerSQLMITaskOutputMigrationLevel ... +type MigrateSQLServerSQLMITaskOutputMigrationLevel struct { + // StartedOn - READ-ONLY; Migration start time + StartedOn *date.Time `json:"startedOn,omitempty"` + // EndedOn - READ-ONLY; Migration end time + EndedOn *date.Time `json:"endedOn,omitempty"` + // Status - READ-ONLY; Current status of migration. Possible values include: 'MigrationStatusDefault', 'MigrationStatusConnecting', 'MigrationStatusSourceAndTargetSelected', 'MigrationStatusSelectLogins', 'MigrationStatusConfigured', 'MigrationStatusRunning', 'MigrationStatusError', 'MigrationStatusStopped', 'MigrationStatusCompleted', 'MigrationStatusCompletedWithWarnings' + Status MigrationStatus `json:"status,omitempty"` + // State - READ-ONLY; Current state of migration. Possible values include: 'MigrationStateNone', 'MigrationStateInProgress', 'MigrationStateFailed', 'MigrationStateWarning', 'MigrationStateCompleted', 'MigrationStateSkipped', 'MigrationStateStopped' + State MigrationState `json:"state,omitempty"` + // AgentJobs - READ-ONLY; Selected agent jobs as a map from name to id + AgentJobs map[string]*string `json:"agentJobs"` + // Logins - READ-ONLY; Selected logins as a map from name to id + Logins map[string]*string `json:"logins"` + // Message - READ-ONLY; Migration progress message + Message *string `json:"message,omitempty"` + // ServerRoleResults - READ-ONLY; Map of server role migration results. + ServerRoleResults map[string]*StartMigrationScenarioServerRoleResult `json:"serverRoleResults"` + // OrphanedUsersInfo - READ-ONLY; List of orphaned users. + OrphanedUsersInfo *[]OrphanedUserInfo `json:"orphanedUsersInfo,omitempty"` + // Databases - READ-ONLY; Selected databases as a map from database name to database id + Databases map[string]*string `json:"databases"` + // SourceServerVersion - READ-ONLY; Source server version + SourceServerVersion *string `json:"sourceServerVersion,omitempty"` + // SourceServerBrandVersion - READ-ONLY; Source server brand version + SourceServerBrandVersion *string `json:"sourceServerBrandVersion,omitempty"` + // TargetServerVersion - READ-ONLY; Target server version + TargetServerVersion *string `json:"targetServerVersion,omitempty"` + // TargetServerBrandVersion - READ-ONLY; Target server brand version + TargetServerBrandVersion *string `json:"targetServerBrandVersion,omitempty"` + // ExceptionsAndWarnings - READ-ONLY; Migration exceptions and warnings. + ExceptionsAndWarnings *[]ReportableException `json:"exceptionsAndWarnings,omitempty"` + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // ResultType - Possible values include: 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeMigrateSQLServerSQLMITaskOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeErrorOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeLoginLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeAgentJobLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeDatabaseLevelOutput', 'ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeMigrationLevelOutput' + ResultType ResultTypeBasicMigrateSQLServerSQLMITaskOutput `json:"resultType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLMITaskOutputMigrationLevel. +func (msssmtoml MigrateSQLServerSQLMITaskOutputMigrationLevel) MarshalJSON() ([]byte, error) { + msssmtoml.ResultType = ResultTypeBasicMigrateSQLServerSQLMITaskOutputResultTypeMigrationLevelOutput + objectMap := make(map[string]interface{}) + if msssmtoml.ResultType != "" { + objectMap["resultType"] = msssmtoml.ResultType + } + return json.Marshal(objectMap) +} + +// AsMigrateSQLServerSQLMITaskOutputError is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputMigrationLevel. +func (msssmtoml MigrateSQLServerSQLMITaskOutputMigrationLevel) AsMigrateSQLServerSQLMITaskOutputError() (*MigrateSQLServerSQLMITaskOutputError, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutputLoginLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputMigrationLevel. +func (msssmtoml MigrateSQLServerSQLMITaskOutputMigrationLevel) AsMigrateSQLServerSQLMITaskOutputLoginLevel() (*MigrateSQLServerSQLMITaskOutputLoginLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutputAgentJobLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputMigrationLevel. +func (msssmtoml MigrateSQLServerSQLMITaskOutputMigrationLevel) AsMigrateSQLServerSQLMITaskOutputAgentJobLevel() (*MigrateSQLServerSQLMITaskOutputAgentJobLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutputDatabaseLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputMigrationLevel. +func (msssmtoml MigrateSQLServerSQLMITaskOutputMigrationLevel) AsMigrateSQLServerSQLMITaskOutputDatabaseLevel() (*MigrateSQLServerSQLMITaskOutputDatabaseLevel, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskOutputMigrationLevel is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputMigrationLevel. +func (msssmtoml MigrateSQLServerSQLMITaskOutputMigrationLevel) AsMigrateSQLServerSQLMITaskOutputMigrationLevel() (*MigrateSQLServerSQLMITaskOutputMigrationLevel, bool) { + return &msssmtoml, true +} + +// AsMigrateSQLServerSQLMITaskOutput is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputMigrationLevel. +func (msssmtoml MigrateSQLServerSQLMITaskOutputMigrationLevel) AsMigrateSQLServerSQLMITaskOutput() (*MigrateSQLServerSQLMITaskOutput, bool) { + return nil, false +} + +// AsBasicMigrateSQLServerSQLMITaskOutput is the BasicMigrateSQLServerSQLMITaskOutput implementation for MigrateSQLServerSQLMITaskOutputMigrationLevel. +func (msssmtoml MigrateSQLServerSQLMITaskOutputMigrationLevel) AsBasicMigrateSQLServerSQLMITaskOutput() (BasicMigrateSQLServerSQLMITaskOutput, bool) { + return &msssmtoml, true +} + +// MigrateSQLServerSQLMITaskProperties properties for task that migrates SQL Server databases to Azure SQL +// Database Managed Instance +type MigrateSQLServerSQLMITaskProperties struct { + // Input - Task input + Input *MigrateSQLServerSQLMITaskInput `json:"input,omitempty"` + // Output - READ-ONLY; Task output. This is ignored if submitted. + Output *[]BasicMigrateSQLServerSQLMITaskOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the task. This is ignored if submitted. Possible values include: 'TaskStateUnknown', 'TaskStateQueued', 'TaskStateRunning', 'TaskStateCanceled', 'TaskStateSucceeded', 'TaskStateFailed', 'TaskStateFailedInputValidation', 'TaskStateFaulted' + State TaskState `json:"state,omitempty"` + // Commands - READ-ONLY; Array of command properties. + Commands *[]BasicCommandProperties `json:"commands,omitempty"` + // TaskType - Possible values include: 'TaskTypeProjectTaskProperties', 'TaskTypeGetTDECertificatesSQL', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI', 'TaskTypeValidateMigrationInputSQLServerSQLDbSync', 'TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync', 'TaskTypeMigrateMySQLAzureDbForMySQLSync', 'TaskTypeMigrateSQLServerAzureSQLDbSync', 'TaskTypeMigrateSQLServerSQLDb', 'TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS', 'TaskTypeMigrateSQLServerAzureSQLDbMI', 'TaskTypeConnectToTargetAzureDbForMySQL', 'TaskTypeConnectToTargetAzureSQLDbMISyncLRS', 'TaskTypeConnectToTargetAzureSQLDbMI', 'TaskTypeGetUserTablesAzureSQLDbSync', 'TaskTypeGetUserTablesSQL', 'TaskTypeConnectToTargetAzureDbForPostgreSQLSync', 'TaskTypeConnectToTargetSQLDbSync', 'TaskTypeConnectToTargetSQLDb', 'TaskTypeConnectToSourcePostgreSQLSync', 'TaskTypeConnectToSourceSQLServerSync', 'TaskTypeConnectToSourceSQLServer', 'TaskTypeConnectToSourceMySQL' + TaskType TaskType `json:"taskType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) MarshalJSON() ([]byte, error) { + msssmtp.TaskType = TaskTypeMigrateSQLServerAzureSQLDbMI + objectMap := make(map[string]interface{}) + if msssmtp.Input != nil { + objectMap["input"] = msssmtp.Input + } + if msssmtp.TaskType != "" { + objectMap["taskType"] = msssmtp.TaskType + } + return json.Marshal(objectMap) +} + +// AsGetTdeCertificatesSQLTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) { + return &msssmtp, true +} + +// AsConnectToTargetAzureDbForMySQLTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMITaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLDbTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourcePostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerSyncTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceMySQLTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) { + return nil, false +} + +// AsProjectTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsProjectTaskProperties() (*ProjectTaskProperties, bool) { + return nil, false +} + +// AsBasicProjectTaskProperties is the BasicProjectTaskProperties implementation for MigrateSQLServerSQLMITaskProperties. +func (msssmtp MigrateSQLServerSQLMITaskProperties) AsBasicProjectTaskProperties() (BasicProjectTaskProperties, bool) { + return &msssmtp, true +} + +// UnmarshalJSON is the custom unmarshaler for MigrateSQLServerSQLMITaskProperties struct. +func (msssmtp *MigrateSQLServerSQLMITaskProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "input": + if v != nil { + var input MigrateSQLServerSQLMITaskInput + err = json.Unmarshal(*v, &input) + if err != nil { + return err + } + msssmtp.Input = &input + } + case "output": + if v != nil { + output, err := unmarshalBasicMigrateSQLServerSQLMITaskOutputArray(*v) + if err != nil { + return err + } + msssmtp.Output = &output + } + case "errors": + if v != nil { + var errorsVar []ODataError + err = json.Unmarshal(*v, &errorsVar) + if err != nil { + return err + } + msssmtp.Errors = &errorsVar + } + case "state": + if v != nil { + var state TaskState + err = json.Unmarshal(*v, &state) + if err != nil { + return err + } + msssmtp.State = state + } + case "commands": + if v != nil { + commands, err := unmarshalBasicCommandPropertiesArray(*v) + if err != nil { + return err + } + msssmtp.Commands = &commands + } + case "taskType": + if v != nil { + var taskType TaskType + err = json.Unmarshal(*v, &taskType) + if err != nil { + return err + } + msssmtp.TaskType = taskType + } + } + } + + return nil +} + +// MigrateSQLServerSQLServerDatabaseInput database specific information for SQL to SQL migration task +// inputs +type MigrateSQLServerSQLServerDatabaseInput struct { + // Name - Name of the database + Name *string `json:"name,omitempty"` + // RestoreDatabaseName - Name of the database at destination + RestoreDatabaseName *string `json:"restoreDatabaseName,omitempty"` + // BackupAndRestoreFolder - The backup and restore folder + BackupAndRestoreFolder *string `json:"backupAndRestoreFolder,omitempty"` + // DatabaseFiles - The list of database files + DatabaseFiles *[]DatabaseFileInput `json:"databaseFiles,omitempty"` +} + +// MigrateSyncCompleteCommandInput input for command that completes sync migration for a database. +type MigrateSyncCompleteCommandInput struct { + // DatabaseName - Name of database + DatabaseName *string `json:"databaseName,omitempty"` + // CommitTimeStamp - Time stamp to complete + CommitTimeStamp *date.Time `json:"commitTimeStamp,omitempty"` +} + +// MigrateSyncCompleteCommandOutput output for command that completes sync migration for a database. +type MigrateSyncCompleteCommandOutput struct { + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // Errors - READ-ONLY; List of errors that happened during the command execution + Errors *[]ReportableException `json:"errors,omitempty"` +} + +// MigrateSyncCompleteCommandProperties properties for the command that completes sync migration for a +// database. +type MigrateSyncCompleteCommandProperties struct { + // Input - Command input + Input *MigrateSyncCompleteCommandInput `json:"input,omitempty"` + // Output - READ-ONLY; Command output. This is ignored if submitted. + Output *MigrateSyncCompleteCommandOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the command. This is ignored if submitted. Possible values include: 'Unknown', 'Accepted', 'Running', 'Succeeded', 'Failed' + State CommandState `json:"state,omitempty"` + // CommandType - Possible values include: 'CommandTypeCommandProperties', 'CommandTypeMigrateSQLServerAzureDbSQLMiComplete', 'CommandTypeMigrateSyncCompleteDatabase' + CommandType CommandType `json:"commandType,omitempty"` +} + +// MarshalJSON is the custom marshaler for MigrateSyncCompleteCommandProperties. +func (msccp MigrateSyncCompleteCommandProperties) MarshalJSON() ([]byte, error) { + msccp.CommandType = CommandTypeMigrateSyncCompleteDatabase + objectMap := make(map[string]interface{}) + if msccp.Input != nil { + objectMap["input"] = msccp.Input + } + if msccp.CommandType != "" { + objectMap["commandType"] = msccp.CommandType + } + return json.Marshal(objectMap) +} + +// AsMigrateMISyncCompleteCommandProperties is the BasicCommandProperties implementation for MigrateSyncCompleteCommandProperties. +func (msccp MigrateSyncCompleteCommandProperties) AsMigrateMISyncCompleteCommandProperties() (*MigrateMISyncCompleteCommandProperties, bool) { + return nil, false +} + +// AsMigrateSyncCompleteCommandProperties is the BasicCommandProperties implementation for MigrateSyncCompleteCommandProperties. +func (msccp MigrateSyncCompleteCommandProperties) AsMigrateSyncCompleteCommandProperties() (*MigrateSyncCompleteCommandProperties, bool) { + return &msccp, true +} + +// AsCommandProperties is the BasicCommandProperties implementation for MigrateSyncCompleteCommandProperties. +func (msccp MigrateSyncCompleteCommandProperties) AsCommandProperties() (*CommandProperties, bool) { + return nil, false +} + +// AsBasicCommandProperties is the BasicCommandProperties implementation for MigrateSyncCompleteCommandProperties. +func (msccp MigrateSyncCompleteCommandProperties) AsBasicCommandProperties() (BasicCommandProperties, bool) { + return &msccp, true +} + +// MigrationEligibilityInfo information about migration eligibility of a server object +type MigrationEligibilityInfo struct { + // IsEligibleForMigration - READ-ONLY; Whether object is eligible for migration or not. + IsEligibleForMigration *bool `json:"isEligibleForMigration,omitempty"` + // ValidationMessages - READ-ONLY; Information about eligibility failure for the server object. + ValidationMessages *[]string `json:"validationMessages,omitempty"` +} + +// MigrationReportResult migration validation report result, contains the url for downloading the generated +// report. +type MigrationReportResult struct { + // ID - READ-ONLY; Migration validation result identifier + ID *string `json:"id,omitempty"` + // ReportURL - READ-ONLY; The url of the report. + ReportURL *string `json:"reportUrl,omitempty"` +} + +// MigrationTableMetadata metadata for tables selected in migration project +type MigrationTableMetadata struct { + // SourceTableName - READ-ONLY; Source table name + SourceTableName *string `json:"sourceTableName,omitempty"` + // TargetTableName - READ-ONLY; Target table name + TargetTableName *string `json:"targetTableName,omitempty"` +} + +// MigrationValidationDatabaseSummaryResult migration Validation Database level summary result +type MigrationValidationDatabaseSummaryResult struct { + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // MigrationID - READ-ONLY; Migration Identifier + MigrationID *string `json:"migrationId,omitempty"` + // SourceDatabaseName - READ-ONLY; Name of the source database + SourceDatabaseName *string `json:"sourceDatabaseName,omitempty"` + // TargetDatabaseName - READ-ONLY; Name of the target database + TargetDatabaseName *string `json:"targetDatabaseName,omitempty"` + // StartedOn - READ-ONLY; Validation start time + StartedOn *date.Time `json:"startedOn,omitempty"` + // EndedOn - READ-ONLY; Validation end time + EndedOn *date.Time `json:"endedOn,omitempty"` + // Status - READ-ONLY; Current status of validation at the database level. Possible values include: 'ValidationStatusDefault', 'ValidationStatusNotStarted', 'ValidationStatusInitialized', 'ValidationStatusInProgress', 'ValidationStatusCompleted', 'ValidationStatusCompletedWithIssues', 'ValidationStatusFailed', 'ValidationStatusStopped' + Status ValidationStatus `json:"status,omitempty"` +} + +// MigrationValidationOptions types of validations to run after the migration +type MigrationValidationOptions struct { + // EnableSchemaValidation - Allows to compare the schema information between source and target. + EnableSchemaValidation *bool `json:"enableSchemaValidation,omitempty"` + // EnableDataIntegrityValidation - Allows to perform a checksum based data integrity validation between source and target for the selected database / tables . + EnableDataIntegrityValidation *bool `json:"enableDataIntegrityValidation,omitempty"` + // EnableQueryAnalysisValidation - Allows to perform a quick and intelligent query analysis by retrieving queries from the source database and executes them in the target. The result will have execution statistics for executions in source and target databases for the extracted queries. + EnableQueryAnalysisValidation *bool `json:"enableQueryAnalysisValidation,omitempty"` +} + +// MiSQLConnectionInfo properties required to create a connection to Azure SQL database Managed instance +type MiSQLConnectionInfo struct { + // ManagedInstanceResourceID - Resource id for Azure SQL database Managed instance + ManagedInstanceResourceID *string `json:"managedInstanceResourceId,omitempty"` + // UserName - User name + UserName *string `json:"userName,omitempty"` + // Password - Password credential. + Password *string `json:"password,omitempty"` + // Type - Possible values include: 'TypeConnectionInfo', 'TypeMiSQLConnectionInfo', 'TypePostgreSQLConnectionInfo', 'TypeMySQLConnectionInfo', 'TypeSQLConnectionInfo' + Type Type `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for MiSQLConnectionInfo. +func (msci MiSQLConnectionInfo) MarshalJSON() ([]byte, error) { + msci.Type = TypeMiSQLConnectionInfo + objectMap := make(map[string]interface{}) + if msci.ManagedInstanceResourceID != nil { + objectMap["managedInstanceResourceId"] = msci.ManagedInstanceResourceID + } + if msci.UserName != nil { + objectMap["userName"] = msci.UserName + } + if msci.Password != nil { + objectMap["password"] = msci.Password + } + if msci.Type != "" { + objectMap["type"] = msci.Type + } + return json.Marshal(objectMap) +} + +// AsMiSQLConnectionInfo is the BasicConnectionInfo implementation for MiSQLConnectionInfo. +func (msci MiSQLConnectionInfo) AsMiSQLConnectionInfo() (*MiSQLConnectionInfo, bool) { + return &msci, true +} + +// AsPostgreSQLConnectionInfo is the BasicConnectionInfo implementation for MiSQLConnectionInfo. +func (msci MiSQLConnectionInfo) AsPostgreSQLConnectionInfo() (*PostgreSQLConnectionInfo, bool) { + return nil, false +} + +// AsMySQLConnectionInfo is the BasicConnectionInfo implementation for MiSQLConnectionInfo. +func (msci MiSQLConnectionInfo) AsMySQLConnectionInfo() (*MySQLConnectionInfo, bool) { + return nil, false +} + +// AsSQLConnectionInfo is the BasicConnectionInfo implementation for MiSQLConnectionInfo. +func (msci MiSQLConnectionInfo) AsSQLConnectionInfo() (*SQLConnectionInfo, bool) { + return nil, false +} + +// AsConnectionInfo is the BasicConnectionInfo implementation for MiSQLConnectionInfo. +func (msci MiSQLConnectionInfo) AsConnectionInfo() (*ConnectionInfo, bool) { + return nil, false +} + +// AsBasicConnectionInfo is the BasicConnectionInfo implementation for MiSQLConnectionInfo. +func (msci MiSQLConnectionInfo) AsBasicConnectionInfo() (BasicConnectionInfo, bool) { + return &msci, true +} + +// MySQLConnectionInfo information for connecting to MySQL server +type MySQLConnectionInfo struct { + // ServerName - Name of the server + ServerName *string `json:"serverName,omitempty"` + // Port - Port for Server + Port *int32 `json:"port,omitempty"` + // UserName - User name + UserName *string `json:"userName,omitempty"` + // Password - Password credential. + Password *string `json:"password,omitempty"` + // Type - Possible values include: 'TypeConnectionInfo', 'TypeMiSQLConnectionInfo', 'TypePostgreSQLConnectionInfo', 'TypeMySQLConnectionInfo', 'TypeSQLConnectionInfo' + Type Type `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for MySQLConnectionInfo. +func (msci MySQLConnectionInfo) MarshalJSON() ([]byte, error) { + msci.Type = TypeMySQLConnectionInfo + objectMap := make(map[string]interface{}) + if msci.ServerName != nil { + objectMap["serverName"] = msci.ServerName + } + if msci.Port != nil { + objectMap["port"] = msci.Port + } + if msci.UserName != nil { + objectMap["userName"] = msci.UserName + } + if msci.Password != nil { + objectMap["password"] = msci.Password + } + if msci.Type != "" { + objectMap["type"] = msci.Type + } + return json.Marshal(objectMap) +} + +// AsMiSQLConnectionInfo is the BasicConnectionInfo implementation for MySQLConnectionInfo. +func (msci MySQLConnectionInfo) AsMiSQLConnectionInfo() (*MiSQLConnectionInfo, bool) { + return nil, false +} + +// AsPostgreSQLConnectionInfo is the BasicConnectionInfo implementation for MySQLConnectionInfo. +func (msci MySQLConnectionInfo) AsPostgreSQLConnectionInfo() (*PostgreSQLConnectionInfo, bool) { + return nil, false +} + +// AsMySQLConnectionInfo is the BasicConnectionInfo implementation for MySQLConnectionInfo. +func (msci MySQLConnectionInfo) AsMySQLConnectionInfo() (*MySQLConnectionInfo, bool) { + return &msci, true +} + +// AsSQLConnectionInfo is the BasicConnectionInfo implementation for MySQLConnectionInfo. +func (msci MySQLConnectionInfo) AsSQLConnectionInfo() (*SQLConnectionInfo, bool) { + return nil, false +} + +// AsConnectionInfo is the BasicConnectionInfo implementation for MySQLConnectionInfo. +func (msci MySQLConnectionInfo) AsConnectionInfo() (*ConnectionInfo, bool) { + return nil, false +} + +// AsBasicConnectionInfo is the BasicConnectionInfo implementation for MySQLConnectionInfo. +func (msci MySQLConnectionInfo) AsBasicConnectionInfo() (BasicConnectionInfo, bool) { + return &msci, true +} + +// NameAvailabilityRequest a resource type and proposed name +type NameAvailabilityRequest struct { + // Name - The proposed resource name + Name *string `json:"name,omitempty"` + // Type - The resource type chain (e.g. virtualMachines/extensions) + Type *string `json:"type,omitempty"` +} + +// NameAvailabilityResponse indicates whether a proposed resource name is available +type NameAvailabilityResponse struct { + autorest.Response `json:"-"` + // NameAvailable - READ-ONLY; If true, the name is valid and available. If false, 'reason' describes why not. + NameAvailable *bool `json:"nameAvailable,omitempty"` + // Reason - READ-ONLY; The reason why the name is not available, if nameAvailable is false. Possible values include: 'AlreadyExists', 'Invalid' + Reason NameCheckFailureReason `json:"reason,omitempty"` + // Message - READ-ONLY; The localized reason why the name is not available, if nameAvailable is false + Message *string `json:"message,omitempty"` +} + +// NonSQLDataMigrationTable defines metadata for table to be migrated +type NonSQLDataMigrationTable struct { + // SourceName - Source table name + SourceName *string `json:"sourceName,omitempty"` +} + +// NonSQLDataMigrationTableResult object used to report the data migration results of a table +type NonSQLDataMigrationTableResult struct { + // ResultCode - READ-ONLY; Result code of the data migration. Possible values include: 'Initial', 'Completed', 'ObjectNotExistsInSource', 'ObjectNotExistsInTarget', 'TargetObjectIsInaccessible', 'FatalError' + ResultCode ResultCode `json:"resultCode,omitempty"` + // SourceName - READ-ONLY; Name of the source table + SourceName *string `json:"sourceName,omitempty"` + // TargetName - READ-ONLY; Name of the target table + TargetName *string `json:"targetName,omitempty"` + // SourceRowCount - READ-ONLY; Number of rows in the source table + SourceRowCount *int64 `json:"sourceRowCount,omitempty"` + // TargetRowCount - READ-ONLY; Number of rows in the target table + TargetRowCount *int64 `json:"targetRowCount,omitempty"` + // ElapsedTimeInMiliseconds - READ-ONLY; Time taken to migrate the data + ElapsedTimeInMiliseconds *float64 `json:"elapsedTimeInMiliseconds,omitempty"` + // Errors - READ-ONLY; List of errors, if any, during migration + Errors *[]Error `json:"errors,omitempty"` +} + +// NonSQLMigrationTaskInput base class for non sql migration task input +type NonSQLMigrationTaskInput struct { + // TargetConnectionInfo - Information for connecting to target + TargetConnectionInfo *SQLConnectionInfo `json:"targetConnectionInfo,omitempty"` + // TargetDatabaseName - Target database name + TargetDatabaseName *string `json:"targetDatabaseName,omitempty"` + // ProjectName - Name of the migration project + ProjectName *string `json:"projectName,omitempty"` + // ProjectLocation - A URL that points to the drop location to access project artifacts + ProjectLocation *string `json:"projectLocation,omitempty"` + // SelectedTables - Metadata of the tables selected for migration + SelectedTables *[]NonSQLDataMigrationTable `json:"selectedTables,omitempty"` +} + +// NonSQLMigrationTaskOutput base class for non sql migration task output +type NonSQLMigrationTaskOutput struct { + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // StartedOn - READ-ONLY; Migration start time + StartedOn *date.Time `json:"startedOn,omitempty"` + // EndedOn - READ-ONLY; Migration end time + EndedOn *date.Time `json:"endedOn,omitempty"` + // Status - READ-ONLY; Current state of migration. Possible values include: 'MigrationStatusDefault', 'MigrationStatusConnecting', 'MigrationStatusSourceAndTargetSelected', 'MigrationStatusSelectLogins', 'MigrationStatusConfigured', 'MigrationStatusRunning', 'MigrationStatusError', 'MigrationStatusStopped', 'MigrationStatusCompleted', 'MigrationStatusCompletedWithWarnings' + Status MigrationStatus `json:"status,omitempty"` + // DataMigrationTableResults - READ-ONLY; Results of the migration. The key contains the table name and the value the table result object + DataMigrationTableResults map[string]*NonSQLDataMigrationTableResult `json:"dataMigrationTableResults"` + // ProgressMessage - READ-ONLY; Message about the progress of the migration + ProgressMessage *string `json:"progressMessage,omitempty"` + // SourceServerName - READ-ONLY; Name of source server + SourceServerName *string `json:"sourceServerName,omitempty"` + // TargetServerName - READ-ONLY; Name of target server + TargetServerName *string `json:"targetServerName,omitempty"` +} + +// MarshalJSON is the custom marshaler for NonSQLMigrationTaskOutput. +func (nsmto NonSQLMigrationTaskOutput) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + return json.Marshal(objectMap) +} + +// ODataError error information in OData format. +type ODataError struct { + // Code - READ-ONLY; The machine-readable description of the error, such as 'InvalidRequest' or 'InternalServerError' + Code *string `json:"code,omitempty"` + // Message - READ-ONLY; The human-readable description of the error + Message *string `json:"message,omitempty"` + // Details - READ-ONLY; Inner errors that caused this error + Details *[]ODataError `json:"details,omitempty"` +} + +// OrphanedUserInfo information of orphaned users on the SQL server database. +type OrphanedUserInfo struct { + // Name - Name of the orphaned user + Name *string `json:"name,omitempty"` + // DatabaseName - Parent database of the user + DatabaseName *string `json:"databaseName,omitempty"` +} + +// PostgreSQLConnectionInfo information for connecting to PostgreSQL server +type PostgreSQLConnectionInfo struct { + // ServerName - Name of the server + ServerName *string `json:"serverName,omitempty"` + // DatabaseName - Name of the database + DatabaseName *string `json:"databaseName,omitempty"` + // Port - Port for Server + Port *int32 `json:"port,omitempty"` + // UserName - User name + UserName *string `json:"userName,omitempty"` + // Password - Password credential. + Password *string `json:"password,omitempty"` + // Type - Possible values include: 'TypeConnectionInfo', 'TypeMiSQLConnectionInfo', 'TypePostgreSQLConnectionInfo', 'TypeMySQLConnectionInfo', 'TypeSQLConnectionInfo' + Type Type `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for PostgreSQLConnectionInfo. +func (psci PostgreSQLConnectionInfo) MarshalJSON() ([]byte, error) { + psci.Type = TypePostgreSQLConnectionInfo + objectMap := make(map[string]interface{}) + if psci.ServerName != nil { + objectMap["serverName"] = psci.ServerName + } + if psci.DatabaseName != nil { + objectMap["databaseName"] = psci.DatabaseName + } + if psci.Port != nil { + objectMap["port"] = psci.Port + } + if psci.UserName != nil { + objectMap["userName"] = psci.UserName + } + if psci.Password != nil { + objectMap["password"] = psci.Password + } + if psci.Type != "" { + objectMap["type"] = psci.Type + } + return json.Marshal(objectMap) +} + +// AsMiSQLConnectionInfo is the BasicConnectionInfo implementation for PostgreSQLConnectionInfo. +func (psci PostgreSQLConnectionInfo) AsMiSQLConnectionInfo() (*MiSQLConnectionInfo, bool) { + return nil, false +} + +// AsPostgreSQLConnectionInfo is the BasicConnectionInfo implementation for PostgreSQLConnectionInfo. +func (psci PostgreSQLConnectionInfo) AsPostgreSQLConnectionInfo() (*PostgreSQLConnectionInfo, bool) { + return &psci, true +} + +// AsMySQLConnectionInfo is the BasicConnectionInfo implementation for PostgreSQLConnectionInfo. +func (psci PostgreSQLConnectionInfo) AsMySQLConnectionInfo() (*MySQLConnectionInfo, bool) { + return nil, false +} + +// AsSQLConnectionInfo is the BasicConnectionInfo implementation for PostgreSQLConnectionInfo. +func (psci PostgreSQLConnectionInfo) AsSQLConnectionInfo() (*SQLConnectionInfo, bool) { + return nil, false +} + +// AsConnectionInfo is the BasicConnectionInfo implementation for PostgreSQLConnectionInfo. +func (psci PostgreSQLConnectionInfo) AsConnectionInfo() (*ConnectionInfo, bool) { + return nil, false +} + +// AsBasicConnectionInfo is the BasicConnectionInfo implementation for PostgreSQLConnectionInfo. +func (psci PostgreSQLConnectionInfo) AsBasicConnectionInfo() (BasicConnectionInfo, bool) { + return &psci, true +} + +// Project a project resource +type Project struct { + autorest.Response `json:"-"` + // ProjectProperties - Project properties + *ProjectProperties `json:"properties,omitempty"` + // Tags - Resource tags. + Tags map[string]*string `json:"tags"` + // Location - Resource location. + Location *string `json:"location,omitempty"` + // ID - READ-ONLY; Resource ID. + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; Resource name. + Name *string `json:"name,omitempty"` + // Type - READ-ONLY; Resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for Project. +func (p Project) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if p.ProjectProperties != nil { + objectMap["properties"] = p.ProjectProperties + } + if p.Tags != nil { + objectMap["tags"] = p.Tags + } + if p.Location != nil { + objectMap["location"] = p.Location + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for Project struct. +func (p *Project) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var projectProperties ProjectProperties + err = json.Unmarshal(*v, &projectProperties) + if err != nil { + return err + } + p.ProjectProperties = &projectProperties + } + case "tags": + if v != nil { + var tags map[string]*string + err = json.Unmarshal(*v, &tags) + if err != nil { + return err + } + p.Tags = tags + } + case "location": + if v != nil { + var location string + err = json.Unmarshal(*v, &location) + if err != nil { + return err + } + p.Location = &location + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + p.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + p.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + p.Type = &typeVar + } + } + } + + return nil +} + +// ProjectList oData page of project resources +type ProjectList struct { + autorest.Response `json:"-"` + // Value - List of projects + Value *[]Project `json:"value,omitempty"` + // NextLink - URL to load the next page of projects + NextLink *string `json:"nextLink,omitempty"` +} + +// ProjectListIterator provides access to a complete listing of Project values. +type ProjectListIterator struct { + i int + page ProjectListPage +} + +// NextWithContext advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *ProjectListIterator) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ProjectListIterator.NextWithContext") + defer func() { + sc := -1 + if iter.Response().Response.Response != nil { + sc = iter.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err = iter.page.NextWithContext(ctx) + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (iter *ProjectListIterator) Next() error { + return iter.NextWithContext(context.Background()) +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter ProjectListIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter ProjectListIterator) Response() ProjectList { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter ProjectListIterator) Value() Project { + if !iter.page.NotDone() { + return Project{} + } + return iter.page.Values()[iter.i] +} + +// Creates a new instance of the ProjectListIterator type. +func NewProjectListIterator(page ProjectListPage) ProjectListIterator { + return ProjectListIterator{page: page} +} + +// IsEmpty returns true if the ListResult contains no values. +func (pl ProjectList) IsEmpty() bool { + return pl.Value == nil || len(*pl.Value) == 0 +} + +// projectListPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (pl ProjectList) projectListPreparer(ctx context.Context) (*http.Request, error) { + if pl.NextLink == nil || len(to.String(pl.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare((&http.Request{}).WithContext(ctx), + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(pl.NextLink))) +} + +// ProjectListPage contains a page of Project values. +type ProjectListPage struct { + fn func(context.Context, ProjectList) (ProjectList, error) + pl ProjectList +} + +// NextWithContext advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *ProjectListPage) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ProjectListPage.NextWithContext") + defer func() { + sc := -1 + if page.Response().Response.Response != nil { + sc = page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + next, err := page.fn(ctx, page.pl) + if err != nil { + return err + } + page.pl = next + return nil +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (page *ProjectListPage) Next() error { + return page.NextWithContext(context.Background()) +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page ProjectListPage) NotDone() bool { + return !page.pl.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page ProjectListPage) Response() ProjectList { + return page.pl +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page ProjectListPage) Values() []Project { + if page.pl.IsEmpty() { + return nil + } + return *page.pl.Value +} + +// Creates a new instance of the ProjectListPage type. +func NewProjectListPage(getNextPage func(context.Context, ProjectList) (ProjectList, error)) ProjectListPage { + return ProjectListPage{fn: getNextPage} +} + +// ProjectMetadata common metadata for migration projects +type ProjectMetadata struct { + // SourceServerName - READ-ONLY; Source server name + SourceServerName *string `json:"sourceServerName,omitempty"` + // SourceServerPort - READ-ONLY; Source server port number + SourceServerPort *string `json:"sourceServerPort,omitempty"` + // SourceUsername - READ-ONLY; Source username + SourceUsername *string `json:"sourceUsername,omitempty"` + // TargetServerName - READ-ONLY; Target server name + TargetServerName *string `json:"targetServerName,omitempty"` + // TargetUsername - READ-ONLY; Target username + TargetUsername *string `json:"targetUsername,omitempty"` + // TargetDbName - READ-ONLY; Target database name + TargetDbName *string `json:"targetDbName,omitempty"` + // TargetUsingWinAuth - READ-ONLY; Whether target connection is Windows authentication + TargetUsingWinAuth *bool `json:"targetUsingWinAuth,omitempty"` + // SelectedMigrationTables - READ-ONLY; List of tables selected for migration + SelectedMigrationTables *[]MigrationTableMetadata `json:"selectedMigrationTables,omitempty"` +} + +// ProjectProperties project-specific properties +type ProjectProperties struct { + // SourcePlatform - Source platform for the project. Possible values include: 'ProjectSourcePlatformSQL', 'ProjectSourcePlatformUnknown' + SourcePlatform ProjectSourcePlatform `json:"sourcePlatform,omitempty"` + // TargetPlatform - Target platform for the project. Possible values include: 'ProjectTargetPlatformSQLDB', 'ProjectTargetPlatformUnknown' + TargetPlatform ProjectTargetPlatform `json:"targetPlatform,omitempty"` + // CreationTime - READ-ONLY; UTC Date and time when project was created + CreationTime *date.Time `json:"creationTime,omitempty"` + // SourceConnectionInfo - Information for connecting to source + SourceConnectionInfo BasicConnectionInfo `json:"sourceConnectionInfo,omitempty"` + // TargetConnectionInfo - Information for connecting to target + TargetConnectionInfo BasicConnectionInfo `json:"targetConnectionInfo,omitempty"` + // DatabasesInfo - List of DatabaseInfo + DatabasesInfo *[]DatabaseInfo `json:"databasesInfo,omitempty"` + // ProvisioningState - READ-ONLY; The project's provisioning state. Possible values include: 'ProjectProvisioningStateDeleting', 'ProjectProvisioningStateSucceeded' + ProvisioningState ProjectProvisioningState `json:"provisioningState,omitempty"` +} + +// UnmarshalJSON is the custom unmarshaler for ProjectProperties struct. +func (pp *ProjectProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "sourcePlatform": + if v != nil { + var sourcePlatform ProjectSourcePlatform + err = json.Unmarshal(*v, &sourcePlatform) + if err != nil { + return err + } + pp.SourcePlatform = sourcePlatform + } + case "targetPlatform": + if v != nil { + var targetPlatform ProjectTargetPlatform + err = json.Unmarshal(*v, &targetPlatform) + if err != nil { + return err + } + pp.TargetPlatform = targetPlatform + } + case "creationTime": + if v != nil { + var creationTime date.Time + err = json.Unmarshal(*v, &creationTime) + if err != nil { + return err + } + pp.CreationTime = &creationTime + } + case "sourceConnectionInfo": + if v != nil { + sourceConnectionInfo, err := unmarshalBasicConnectionInfo(*v) + if err != nil { + return err + } + pp.SourceConnectionInfo = sourceConnectionInfo + } + case "targetConnectionInfo": + if v != nil { + targetConnectionInfo, err := unmarshalBasicConnectionInfo(*v) + if err != nil { + return err + } + pp.TargetConnectionInfo = targetConnectionInfo + } + case "databasesInfo": + if v != nil { + var databasesInfo []DatabaseInfo + err = json.Unmarshal(*v, &databasesInfo) + if err != nil { + return err + } + pp.DatabasesInfo = &databasesInfo + } + case "provisioningState": + if v != nil { + var provisioningState ProjectProvisioningState + err = json.Unmarshal(*v, &provisioningState) + if err != nil { + return err + } + pp.ProvisioningState = provisioningState + } + } + } + + return nil +} + +// ProjectTask a task resource +type ProjectTask struct { + autorest.Response `json:"-"` + // Etag - HTTP strong entity tag value. This is ignored if submitted. + Etag *string `json:"etag,omitempty"` + // Properties - Custom task properties + Properties BasicProjectTaskProperties `json:"properties,omitempty"` + // ID - READ-ONLY; Resource ID. + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; Resource name. + Name *string `json:"name,omitempty"` + // Type - READ-ONLY; Resource type. + Type *string `json:"type,omitempty"` +} + +// UnmarshalJSON is the custom unmarshaler for ProjectTask struct. +func (pt *ProjectTask) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "etag": + if v != nil { + var etag string + err = json.Unmarshal(*v, &etag) + if err != nil { + return err + } + pt.Etag = &etag + } + case "properties": + if v != nil { + properties, err := unmarshalBasicProjectTaskProperties(*v) + if err != nil { + return err + } + pt.Properties = properties + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + pt.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + pt.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + pt.Type = &typeVar + } + } + } + + return nil +} + +// BasicProjectTaskProperties base class for all types of DMS task properties. If task is not supported by current +// client, this object is returned. +type BasicProjectTaskProperties interface { + AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) + AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) + AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) + AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) + AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) + AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) + AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) + AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) + AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) + AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) + AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) + AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) + AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) + AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) + AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) + AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) + AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) + AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) + AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) + AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) + AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) + AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) + AsProjectTaskProperties() (*ProjectTaskProperties, bool) +} + +// ProjectTaskProperties base class for all types of DMS task properties. If task is not supported by current +// client, this object is returned. +type ProjectTaskProperties struct { + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the task. This is ignored if submitted. Possible values include: 'TaskStateUnknown', 'TaskStateQueued', 'TaskStateRunning', 'TaskStateCanceled', 'TaskStateSucceeded', 'TaskStateFailed', 'TaskStateFailedInputValidation', 'TaskStateFaulted' + State TaskState `json:"state,omitempty"` + // Commands - READ-ONLY; Array of command properties. + Commands *[]BasicCommandProperties `json:"commands,omitempty"` + // TaskType - Possible values include: 'TaskTypeProjectTaskProperties', 'TaskTypeGetTDECertificatesSQL', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI', 'TaskTypeValidateMigrationInputSQLServerSQLDbSync', 'TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync', 'TaskTypeMigrateMySQLAzureDbForMySQLSync', 'TaskTypeMigrateSQLServerAzureSQLDbSync', 'TaskTypeMigrateSQLServerSQLDb', 'TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS', 'TaskTypeMigrateSQLServerAzureSQLDbMI', 'TaskTypeConnectToTargetAzureDbForMySQL', 'TaskTypeConnectToTargetAzureSQLDbMISyncLRS', 'TaskTypeConnectToTargetAzureSQLDbMI', 'TaskTypeGetUserTablesAzureSQLDbSync', 'TaskTypeGetUserTablesSQL', 'TaskTypeConnectToTargetAzureDbForPostgreSQLSync', 'TaskTypeConnectToTargetSQLDbSync', 'TaskTypeConnectToTargetSQLDb', 'TaskTypeConnectToSourcePostgreSQLSync', 'TaskTypeConnectToSourceSQLServerSync', 'TaskTypeConnectToSourceSQLServer', 'TaskTypeConnectToSourceMySQL' + TaskType TaskType `json:"taskType,omitempty"` +} + +func unmarshalBasicProjectTaskProperties(body []byte) (BasicProjectTaskProperties, error) { + var m map[string]interface{} + err := json.Unmarshal(body, &m) + if err != nil { + return nil, err + } + + switch m["taskType"] { + case string(TaskTypeGetTDECertificatesSQL): + var gtcstp GetTdeCertificatesSQLTaskProperties + err := json.Unmarshal(body, >cstp) + return gtcstp, err + case string(TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS): + var vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties + err := json.Unmarshal(body, &vmisssmstp) + return vmisssmstp, err + case string(TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI): + var vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties + err := json.Unmarshal(body, &vmisssmtp) + return vmisssmtp, err + case string(TaskTypeValidateMigrationInputSQLServerSQLDbSync): + var vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties + err := json.Unmarshal(body, &vmisssdstp) + return vmisssdstp, err + case string(TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync): + var mpsadfpsstp MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties + err := json.Unmarshal(body, &mpsadfpsstp) + return mpsadfpsstp, err + case string(TaskTypeMigrateMySQLAzureDbForMySQLSync): + var mmsadfmsstp MigrateMySQLAzureDbForMySQLSyncTaskProperties + err := json.Unmarshal(body, &mmsadfmsstp) + return mmsadfmsstp, err + case string(TaskTypeMigrateSQLServerAzureSQLDbSync): + var msssdstp MigrateSQLServerSQLDbSyncTaskProperties + err := json.Unmarshal(body, &msssdstp) + return msssdstp, err + case string(TaskTypeMigrateSQLServerSQLDb): + var msssdtp MigrateSQLServerSQLDbTaskProperties + err := json.Unmarshal(body, &msssdtp) + return msssdtp, err + case string(TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS): + var msssmstp MigrateSQLServerSQLMISyncTaskProperties + err := json.Unmarshal(body, &msssmstp) + return msssmstp, err + case string(TaskTypeMigrateSQLServerAzureSQLDbMI): + var msssmtp MigrateSQLServerSQLMITaskProperties + err := json.Unmarshal(body, &msssmtp) + return msssmtp, err + case string(TaskTypeConnectToTargetAzureDbForMySQL): + var cttadfmstp ConnectToTargetAzureDbForMySQLTaskProperties + err := json.Unmarshal(body, &cttadfmstp) + return cttadfmstp, err + case string(TaskTypeConnectToTargetAzureSQLDbMISyncLRS): + var cttsmstp ConnectToTargetSQLMISyncTaskProperties + err := json.Unmarshal(body, &cttsmstp) + return cttsmstp, err + case string(TaskTypeConnectToTargetAzureSQLDbMI): + var cttsmtp ConnectToTargetSQLMITaskProperties + err := json.Unmarshal(body, &cttsmtp) + return cttsmtp, err + case string(TaskTypeGetUserTablesAzureSQLDbSync): + var gutsstp GetUserTablesSQLSyncTaskProperties + err := json.Unmarshal(body, &gutsstp) + return gutsstp, err + case string(TaskTypeGetUserTablesSQL): + var gutstp GetUserTablesSQLTaskProperties + err := json.Unmarshal(body, &gutstp) + return gutstp, err + case string(TaskTypeConnectToTargetAzureDbForPostgreSQLSync): + var cttadfpsstp ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties + err := json.Unmarshal(body, &cttadfpsstp) + return cttadfpsstp, err + case string(TaskTypeConnectToTargetSQLDbSync): + var cttssdstp ConnectToTargetSQLSQLDbSyncTaskProperties + err := json.Unmarshal(body, &cttssdstp) + return cttssdstp, err + case string(TaskTypeConnectToTargetSQLDb): + var cttsdtp ConnectToTargetSQLDbTaskProperties + err := json.Unmarshal(body, &cttsdtp) + return cttsdtp, err + case string(TaskTypeConnectToSourcePostgreSQLSync): + var ctspsstp ConnectToSourcePostgreSQLSyncTaskProperties + err := json.Unmarshal(body, &ctspsstp) + return ctspsstp, err + case string(TaskTypeConnectToSourceSQLServerSync): + var ctsssstp ConnectToSourceSQLServerSyncTaskProperties + err := json.Unmarshal(body, &ctsssstp) + return ctsssstp, err + case string(TaskTypeConnectToSourceSQLServer): + var ctssstp ConnectToSourceSQLServerTaskProperties + err := json.Unmarshal(body, &ctssstp) + return ctssstp, err + case string(TaskTypeConnectToSourceMySQL): + var ctsmstp ConnectToSourceMySQLTaskProperties + err := json.Unmarshal(body, &ctsmstp) + return ctsmstp, err + default: + var ptp ProjectTaskProperties + err := json.Unmarshal(body, &ptp) + return ptp, err + } +} +func unmarshalBasicProjectTaskPropertiesArray(body []byte) ([]BasicProjectTaskProperties, error) { + var rawMessages []*json.RawMessage + err := json.Unmarshal(body, &rawMessages) + if err != nil { + return nil, err + } + + ptpArray := make([]BasicProjectTaskProperties, len(rawMessages)) + + for index, rawMessage := range rawMessages { + ptp, err := unmarshalBasicProjectTaskProperties(*rawMessage) + if err != nil { + return nil, err + } + ptpArray[index] = ptp + } + return ptpArray, nil +} + +// MarshalJSON is the custom marshaler for ProjectTaskProperties. +func (ptp ProjectTaskProperties) MarshalJSON() ([]byte, error) { + ptp.TaskType = TaskTypeProjectTaskProperties + objectMap := make(map[string]interface{}) + if ptp.TaskType != "" { + objectMap["taskType"] = ptp.TaskType + } + return json.Marshal(objectMap) +} + +// AsGetTdeCertificatesSQLTaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForMySQLTaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMITaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLTaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourcePostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerSyncTaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceMySQLTaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) { + return nil, false +} + +// AsProjectTaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsProjectTaskProperties() (*ProjectTaskProperties, bool) { + return &ptp, true +} + +// AsBasicProjectTaskProperties is the BasicProjectTaskProperties implementation for ProjectTaskProperties. +func (ptp ProjectTaskProperties) AsBasicProjectTaskProperties() (BasicProjectTaskProperties, bool) { + return &ptp, true +} + +// UnmarshalJSON is the custom unmarshaler for ProjectTaskProperties struct. +func (ptp *ProjectTaskProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "errors": + if v != nil { + var errorsVar []ODataError + err = json.Unmarshal(*v, &errorsVar) + if err != nil { + return err + } + ptp.Errors = &errorsVar + } + case "state": + if v != nil { + var state TaskState + err = json.Unmarshal(*v, &state) + if err != nil { + return err + } + ptp.State = state + } + case "commands": + if v != nil { + commands, err := unmarshalBasicCommandPropertiesArray(*v) + if err != nil { + return err + } + ptp.Commands = &commands + } + case "taskType": + if v != nil { + var taskType TaskType + err = json.Unmarshal(*v, &taskType) + if err != nil { + return err + } + ptp.TaskType = taskType + } + } + } + + return nil +} + +// QueryAnalysisValidationResult results for query analysis comparison between the source and target +type QueryAnalysisValidationResult struct { + // QueryResults - READ-ONLY; List of queries executed and it's execution results in source and target + QueryResults *QueryExecutionResult `json:"queryResults,omitempty"` + // ValidationErrors - READ-ONLY; Errors that are part of the execution + ValidationErrors *ValidationError `json:"validationErrors,omitempty"` +} + +// QueryExecutionResult describes query analysis results for execution in source and target +type QueryExecutionResult struct { + // QueryText - READ-ONLY; Query text retrieved from the source server + QueryText *string `json:"queryText,omitempty"` + // StatementsInBatch - READ-ONLY; Total no. of statements in the batch + StatementsInBatch *int64 `json:"statementsInBatch,omitempty"` + // SourceResult - READ-ONLY; Query analysis result from the source + SourceResult *ExecutionStatistics `json:"sourceResult,omitempty"` + // TargetResult - READ-ONLY; Query analysis result from the target + TargetResult *ExecutionStatistics `json:"targetResult,omitempty"` +} + +// Quota describes a quota for or usage details about a resource +type Quota struct { + // CurrentValue - The current value of the quota. If null or missing, the current value cannot be determined in the context of the request. + CurrentValue *float64 `json:"currentValue,omitempty"` + // ID - The resource ID of the quota object + ID *string `json:"id,omitempty"` + // Limit - The maximum value of the quota. If null or missing, the quota has no maximum, in which case it merely tracks usage. + Limit *float64 `json:"limit,omitempty"` + // Name - The name of the quota + Name *QuotaName `json:"name,omitempty"` + // Unit - The unit for the quota, such as Count, Bytes, BytesPerSecond, etc. + Unit *string `json:"unit,omitempty"` +} + +// QuotaList oData page of quota objects +type QuotaList struct { + autorest.Response `json:"-"` + // Value - List of quotas + Value *[]Quota `json:"value,omitempty"` + // NextLink - URL to load the next page of quotas, or null or missing if this is the last page + NextLink *string `json:"nextLink,omitempty"` +} + +// QuotaListIterator provides access to a complete listing of Quota values. +type QuotaListIterator struct { + i int + page QuotaListPage +} + +// NextWithContext advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *QuotaListIterator) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/QuotaListIterator.NextWithContext") + defer func() { + sc := -1 + if iter.Response().Response.Response != nil { + sc = iter.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err = iter.page.NextWithContext(ctx) + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (iter *QuotaListIterator) Next() error { + return iter.NextWithContext(context.Background()) +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter QuotaListIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter QuotaListIterator) Response() QuotaList { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter QuotaListIterator) Value() Quota { + if !iter.page.NotDone() { + return Quota{} + } + return iter.page.Values()[iter.i] +} + +// Creates a new instance of the QuotaListIterator type. +func NewQuotaListIterator(page QuotaListPage) QuotaListIterator { + return QuotaListIterator{page: page} +} + +// IsEmpty returns true if the ListResult contains no values. +func (ql QuotaList) IsEmpty() bool { + return ql.Value == nil || len(*ql.Value) == 0 +} + +// quotaListPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (ql QuotaList) quotaListPreparer(ctx context.Context) (*http.Request, error) { + if ql.NextLink == nil || len(to.String(ql.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare((&http.Request{}).WithContext(ctx), + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(ql.NextLink))) +} + +// QuotaListPage contains a page of Quota values. +type QuotaListPage struct { + fn func(context.Context, QuotaList) (QuotaList, error) + ql QuotaList +} + +// NextWithContext advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *QuotaListPage) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/QuotaListPage.NextWithContext") + defer func() { + sc := -1 + if page.Response().Response.Response != nil { + sc = page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + next, err := page.fn(ctx, page.ql) + if err != nil { + return err + } + page.ql = next + return nil +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (page *QuotaListPage) Next() error { + return page.NextWithContext(context.Background()) +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page QuotaListPage) NotDone() bool { + return !page.ql.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page QuotaListPage) Response() QuotaList { + return page.ql +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page QuotaListPage) Values() []Quota { + if page.ql.IsEmpty() { + return nil + } + return *page.ql.Value +} + +// Creates a new instance of the QuotaListPage type. +func NewQuotaListPage(getNextPage func(context.Context, QuotaList) (QuotaList, error)) QuotaListPage { + return QuotaListPage{fn: getNextPage} +} + +// QuotaName the name of the quota +type QuotaName struct { + // LocalizedValue - The localized name of the quota + LocalizedValue *string `json:"localizedValue,omitempty"` + // Value - The unlocalized name (or ID) of the quota + Value *string `json:"value,omitempty"` +} + +// ReportableException exception object for all custom exceptions +type ReportableException struct { + // Message - READ-ONLY; Error message + Message *string `json:"message,omitempty"` + // ActionableMessage - Actionable steps for this exception + ActionableMessage *string `json:"actionableMessage,omitempty"` + // FilePath - READ-ONLY; The path to the file where exception occurred + FilePath *string `json:"filePath,omitempty"` + // LineNumber - READ-ONLY; The line number where exception occurred + LineNumber *string `json:"lineNumber,omitempty"` + // HResult - READ-ONLY; Coded numerical value that is assigned to a specific exception + HResult *int32 `json:"hResult,omitempty"` + // StackTrace - READ-ONLY; Stack trace + StackTrace *string `json:"stackTrace,omitempty"` +} + +// Resource ARM resource. +type Resource struct { + // ID - READ-ONLY; Resource ID. + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; Resource name. + Name *string `json:"name,omitempty"` + // Type - READ-ONLY; Resource type. + Type *string `json:"type,omitempty"` +} + +// ResourceSku describes an available DMS SKU. +type ResourceSku struct { + // ResourceType - READ-ONLY; The type of resource the SKU applies to. + ResourceType *string `json:"resourceType,omitempty"` + // Name - READ-ONLY; The name of SKU. + Name *string `json:"name,omitempty"` + // Tier - READ-ONLY; Specifies the tier of DMS in a scale set. + Tier *string `json:"tier,omitempty"` + // Size - READ-ONLY; The Size of the SKU. + Size *string `json:"size,omitempty"` + // Family - READ-ONLY; The Family of this particular SKU. + Family *string `json:"family,omitempty"` + // Kind - READ-ONLY; The Kind of resources that are supported in this SKU. + Kind *string `json:"kind,omitempty"` + // Capacity - READ-ONLY; Not used. + Capacity *ResourceSkuCapacity `json:"capacity,omitempty"` + // Locations - READ-ONLY; The set of locations that the SKU is available. + Locations *[]string `json:"locations,omitempty"` + // APIVersions - READ-ONLY; The api versions that support this SKU. + APIVersions *[]string `json:"apiVersions,omitempty"` + // Costs - READ-ONLY; Metadata for retrieving price info. + Costs *[]ResourceSkuCosts `json:"costs,omitempty"` + // Capabilities - READ-ONLY; A name value pair to describe the capability. + Capabilities *[]ResourceSkuCapabilities `json:"capabilities,omitempty"` + // Restrictions - READ-ONLY; The restrictions because of which SKU cannot be used. This is empty if there are no restrictions. + Restrictions *[]ResourceSkuRestrictions `json:"restrictions,omitempty"` +} + +// ResourceSkuCapabilities describes The SKU capabilities object. +type ResourceSkuCapabilities struct { + // Name - READ-ONLY; An invariant to describe the feature. + Name *string `json:"name,omitempty"` + // Value - READ-ONLY; An invariant if the feature is measured by quantity. + Value *string `json:"value,omitempty"` +} + +// ResourceSkuCapacity describes scaling information of a SKU. +type ResourceSkuCapacity struct { + // Minimum - READ-ONLY; The minimum capacity. + Minimum *int64 `json:"minimum,omitempty"` + // Maximum - READ-ONLY; The maximum capacity. + Maximum *int64 `json:"maximum,omitempty"` + // Default - READ-ONLY; The default capacity. + Default *int64 `json:"default,omitempty"` + // ScaleType - READ-ONLY; The scale type applicable to the SKU. Possible values include: 'ResourceSkuCapacityScaleTypeAutomatic', 'ResourceSkuCapacityScaleTypeManual', 'ResourceSkuCapacityScaleTypeNone' + ScaleType ResourceSkuCapacityScaleType `json:"scaleType,omitempty"` +} + +// ResourceSkuCosts describes metadata for retrieving price info. +type ResourceSkuCosts struct { + // MeterID - READ-ONLY; Used for querying price from commerce. + MeterID *string `json:"meterID,omitempty"` + // Quantity - READ-ONLY; The multiplier is needed to extend the base metered cost. + Quantity *int64 `json:"quantity,omitempty"` + // ExtendedUnit - READ-ONLY; An invariant to show the extended unit. + ExtendedUnit *string `json:"extendedUnit,omitempty"` +} + +// ResourceSkuRestrictions describes scaling information of a SKU. +type ResourceSkuRestrictions struct { + // Type - READ-ONLY; The type of restrictions. Possible values include: 'Location' + Type ResourceSkuRestrictionsType `json:"type,omitempty"` + // Values - READ-ONLY; The value of restrictions. If the restriction type is set to location. This would be different locations where the SKU is restricted. + Values *[]string `json:"values,omitempty"` + // ReasonCode - READ-ONLY; The reason code for restriction. Possible values include: 'QuotaID', 'NotAvailableForSubscription' + ReasonCode ResourceSkuRestrictionsReasonCode `json:"reasonCode,omitempty"` +} + +// ResourceSkusResult the DMS List SKUs operation response. +type ResourceSkusResult struct { + autorest.Response `json:"-"` + // Value - The list of SKUs available for the subscription. + Value *[]ResourceSku `json:"value,omitempty"` + // NextLink - The uri to fetch the next page of DMS SKUs. Call ListNext() with this to fetch the next page of DMS SKUs. + NextLink *string `json:"nextLink,omitempty"` +} + +// ResourceSkusResultIterator provides access to a complete listing of ResourceSku values. +type ResourceSkusResultIterator struct { + i int + page ResourceSkusResultPage +} + +// NextWithContext advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *ResourceSkusResultIterator) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ResourceSkusResultIterator.NextWithContext") + defer func() { + sc := -1 + if iter.Response().Response.Response != nil { + sc = iter.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err = iter.page.NextWithContext(ctx) + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (iter *ResourceSkusResultIterator) Next() error { + return iter.NextWithContext(context.Background()) +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter ResourceSkusResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter ResourceSkusResultIterator) Response() ResourceSkusResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter ResourceSkusResultIterator) Value() ResourceSku { + if !iter.page.NotDone() { + return ResourceSku{} + } + return iter.page.Values()[iter.i] +} + +// Creates a new instance of the ResourceSkusResultIterator type. +func NewResourceSkusResultIterator(page ResourceSkusResultPage) ResourceSkusResultIterator { + return ResourceSkusResultIterator{page: page} +} + +// IsEmpty returns true if the ListResult contains no values. +func (rsr ResourceSkusResult) IsEmpty() bool { + return rsr.Value == nil || len(*rsr.Value) == 0 +} + +// resourceSkusResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (rsr ResourceSkusResult) resourceSkusResultPreparer(ctx context.Context) (*http.Request, error) { + if rsr.NextLink == nil || len(to.String(rsr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare((&http.Request{}).WithContext(ctx), + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(rsr.NextLink))) +} + +// ResourceSkusResultPage contains a page of ResourceSku values. +type ResourceSkusResultPage struct { + fn func(context.Context, ResourceSkusResult) (ResourceSkusResult, error) + rsr ResourceSkusResult +} + +// NextWithContext advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *ResourceSkusResultPage) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ResourceSkusResultPage.NextWithContext") + defer func() { + sc := -1 + if page.Response().Response.Response != nil { + sc = page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + next, err := page.fn(ctx, page.rsr) + if err != nil { + return err + } + page.rsr = next + return nil +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (page *ResourceSkusResultPage) Next() error { + return page.NextWithContext(context.Background()) +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page ResourceSkusResultPage) NotDone() bool { + return !page.rsr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page ResourceSkusResultPage) Response() ResourceSkusResult { + return page.rsr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page ResourceSkusResultPage) Values() []ResourceSku { + if page.rsr.IsEmpty() { + return nil + } + return *page.rsr.Value +} + +// Creates a new instance of the ResourceSkusResultPage type. +func NewResourceSkusResultPage(getNextPage func(context.Context, ResourceSkusResult) (ResourceSkusResult, error)) ResourceSkusResultPage { + return ResourceSkusResultPage{fn: getNextPage} +} + +// SchemaComparisonValidationResult results for schema comparison between the source and target +type SchemaComparisonValidationResult struct { + // SchemaDifferences - READ-ONLY; List of schema differences between the source and target databases + SchemaDifferences *SchemaComparisonValidationResultType `json:"schemaDifferences,omitempty"` + // ValidationErrors - READ-ONLY; List of errors that happened while performing schema compare validation + ValidationErrors *ValidationError `json:"validationErrors,omitempty"` + // SourceDatabaseObjectCount - Count of source database objects + SourceDatabaseObjectCount map[string]*int64 `json:"sourceDatabaseObjectCount"` + // TargetDatabaseObjectCount - Count of target database objects + TargetDatabaseObjectCount map[string]*int64 `json:"targetDatabaseObjectCount"` +} + +// MarshalJSON is the custom marshaler for SchemaComparisonValidationResult. +func (scvr SchemaComparisonValidationResult) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if scvr.SourceDatabaseObjectCount != nil { + objectMap["sourceDatabaseObjectCount"] = scvr.SourceDatabaseObjectCount + } + if scvr.TargetDatabaseObjectCount != nil { + objectMap["targetDatabaseObjectCount"] = scvr.TargetDatabaseObjectCount + } + return json.Marshal(objectMap) +} + +// SchemaComparisonValidationResultType description about the errors happen while performing migration +// validation +type SchemaComparisonValidationResultType struct { + // ObjectName - READ-ONLY; Name of the object that has the difference + ObjectName *string `json:"objectName,omitempty"` + // ObjectType - READ-ONLY; Type of the object that has the difference. e.g (Table/View/StoredProcedure). Possible values include: 'StoredProcedures', 'Table', 'User', 'View', 'Function' + ObjectType ObjectType `json:"objectType,omitempty"` + // UpdateAction - READ-ONLY; Update action type with respect to target. Possible values include: 'DeletedOnTarget', 'ChangedOnTarget', 'AddedOnTarget' + UpdateAction UpdateActionType `json:"updateAction,omitempty"` +} + +// SelectedCertificateInput info for certificate to be exported for TDE enabled databases. +type SelectedCertificateInput struct { + // CertificateName - Name of certificate to be exported. + CertificateName *string `json:"certificateName,omitempty"` + // Password - Password to use for encrypting the exported certificate. + Password *string `json:"password,omitempty"` +} + +// ServerProperties server properties for Oracle, MySQL type source +type ServerProperties struct { + // ServerPlatform - READ-ONLY; Name of the server platform + ServerPlatform *string `json:"serverPlatform,omitempty"` + // ServerName - READ-ONLY; Name of the server + ServerName *string `json:"serverName,omitempty"` + // ServerVersion - READ-ONLY; Version of the database server + ServerVersion *string `json:"serverVersion,omitempty"` + // ServerEdition - READ-ONLY; Edition of the database server + ServerEdition *string `json:"serverEdition,omitempty"` + // ServerOperatingSystemVersion - READ-ONLY; Version of the operating system + ServerOperatingSystemVersion *string `json:"serverOperatingSystemVersion,omitempty"` + // ServerDatabaseCount - READ-ONLY; Number of databases in the server + ServerDatabaseCount *int32 `json:"serverDatabaseCount,omitempty"` +} + +// Service a Database Migration Service resource +type Service struct { + autorest.Response `json:"-"` + // Etag - HTTP strong entity tag value. Ignored if submitted + Etag *string `json:"etag,omitempty"` + // Kind - The resource kind. Only 'vm' (the default) is supported. + Kind *string `json:"kind,omitempty"` + // ServiceProperties - Custom service properties + *ServiceProperties `json:"properties,omitempty"` + // Sku - Service SKU + Sku *ServiceSku `json:"sku,omitempty"` + // Tags - Resource tags. + Tags map[string]*string `json:"tags"` + // Location - Resource location. + Location *string `json:"location,omitempty"` + // ID - READ-ONLY; Resource ID. + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; Resource name. + Name *string `json:"name,omitempty"` + // Type - READ-ONLY; Resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for Service. +func (s Service) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if s.Etag != nil { + objectMap["etag"] = s.Etag + } + if s.Kind != nil { + objectMap["kind"] = s.Kind + } + if s.ServiceProperties != nil { + objectMap["properties"] = s.ServiceProperties + } + if s.Sku != nil { + objectMap["sku"] = s.Sku + } + if s.Tags != nil { + objectMap["tags"] = s.Tags + } + if s.Location != nil { + objectMap["location"] = s.Location + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for Service struct. +func (s *Service) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "etag": + if v != nil { + var etag string + err = json.Unmarshal(*v, &etag) + if err != nil { + return err + } + s.Etag = &etag + } + case "kind": + if v != nil { + var kind string + err = json.Unmarshal(*v, &kind) + if err != nil { + return err + } + s.Kind = &kind + } + case "properties": + if v != nil { + var serviceProperties ServiceProperties + err = json.Unmarshal(*v, &serviceProperties) + if err != nil { + return err + } + s.ServiceProperties = &serviceProperties + } + case "sku": + if v != nil { + var sku ServiceSku + err = json.Unmarshal(*v, &sku) + if err != nil { + return err + } + s.Sku = &sku + } + case "tags": + if v != nil { + var tags map[string]*string + err = json.Unmarshal(*v, &tags) + if err != nil { + return err + } + s.Tags = tags + } + case "location": + if v != nil { + var location string + err = json.Unmarshal(*v, &location) + if err != nil { + return err + } + s.Location = &location + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + s.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + s.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + s.Type = &typeVar + } + } + } + + return nil +} + +// ServiceList oData page of service objects +type ServiceList struct { + autorest.Response `json:"-"` + // Value - List of services + Value *[]Service `json:"value,omitempty"` + // NextLink - URL to load the next page of services + NextLink *string `json:"nextLink,omitempty"` +} + +// ServiceListIterator provides access to a complete listing of Service values. +type ServiceListIterator struct { + i int + page ServiceListPage +} + +// NextWithContext advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *ServiceListIterator) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ServiceListIterator.NextWithContext") + defer func() { + sc := -1 + if iter.Response().Response.Response != nil { + sc = iter.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err = iter.page.NextWithContext(ctx) + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (iter *ServiceListIterator) Next() error { + return iter.NextWithContext(context.Background()) +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter ServiceListIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter ServiceListIterator) Response() ServiceList { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter ServiceListIterator) Value() Service { + if !iter.page.NotDone() { + return Service{} + } + return iter.page.Values()[iter.i] +} + +// Creates a new instance of the ServiceListIterator type. +func NewServiceListIterator(page ServiceListPage) ServiceListIterator { + return ServiceListIterator{page: page} +} + +// IsEmpty returns true if the ListResult contains no values. +func (sl ServiceList) IsEmpty() bool { + return sl.Value == nil || len(*sl.Value) == 0 +} + +// serviceListPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (sl ServiceList) serviceListPreparer(ctx context.Context) (*http.Request, error) { + if sl.NextLink == nil || len(to.String(sl.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare((&http.Request{}).WithContext(ctx), + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(sl.NextLink))) +} + +// ServiceListPage contains a page of Service values. +type ServiceListPage struct { + fn func(context.Context, ServiceList) (ServiceList, error) + sl ServiceList +} + +// NextWithContext advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *ServiceListPage) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ServiceListPage.NextWithContext") + defer func() { + sc := -1 + if page.Response().Response.Response != nil { + sc = page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + next, err := page.fn(ctx, page.sl) + if err != nil { + return err + } + page.sl = next + return nil +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (page *ServiceListPage) Next() error { + return page.NextWithContext(context.Background()) +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page ServiceListPage) NotDone() bool { + return !page.sl.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page ServiceListPage) Response() ServiceList { + return page.sl +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page ServiceListPage) Values() []Service { + if page.sl.IsEmpty() { + return nil + } + return *page.sl.Value +} + +// Creates a new instance of the ServiceListPage type. +func NewServiceListPage(getNextPage func(context.Context, ServiceList) (ServiceList, error)) ServiceListPage { + return ServiceListPage{fn: getNextPage} +} + +// ServiceOperation description of an action supported by the Database Migration Service +type ServiceOperation struct { + // Name - The fully qualified action name, e.g. Microsoft.DataMigration/services/read + Name *string `json:"name,omitempty"` + // Display - Localized display text + Display *ServiceOperationDisplay `json:"display,omitempty"` +} + +// ServiceOperationDisplay localized display text +type ServiceOperationDisplay struct { + // Provider - The localized resource provider name + Provider *string `json:"provider,omitempty"` + // Resource - The localized resource type name + Resource *string `json:"resource,omitempty"` + // Operation - The localized operation name + Operation *string `json:"operation,omitempty"` + // Description - The localized operation description + Description *string `json:"description,omitempty"` +} + +// ServiceOperationList oData page of action (operation) objects +type ServiceOperationList struct { + autorest.Response `json:"-"` + // Value - List of actions + Value *[]ServiceOperation `json:"value,omitempty"` + // NextLink - URL to load the next page of actions + NextLink *string `json:"nextLink,omitempty"` +} + +// ServiceOperationListIterator provides access to a complete listing of ServiceOperation values. +type ServiceOperationListIterator struct { + i int + page ServiceOperationListPage +} + +// NextWithContext advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *ServiceOperationListIterator) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ServiceOperationListIterator.NextWithContext") + defer func() { + sc := -1 + if iter.Response().Response.Response != nil { + sc = iter.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err = iter.page.NextWithContext(ctx) + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (iter *ServiceOperationListIterator) Next() error { + return iter.NextWithContext(context.Background()) +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter ServiceOperationListIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter ServiceOperationListIterator) Response() ServiceOperationList { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter ServiceOperationListIterator) Value() ServiceOperation { + if !iter.page.NotDone() { + return ServiceOperation{} + } + return iter.page.Values()[iter.i] +} + +// Creates a new instance of the ServiceOperationListIterator type. +func NewServiceOperationListIterator(page ServiceOperationListPage) ServiceOperationListIterator { + return ServiceOperationListIterator{page: page} +} + +// IsEmpty returns true if the ListResult contains no values. +func (sol ServiceOperationList) IsEmpty() bool { + return sol.Value == nil || len(*sol.Value) == 0 +} + +// serviceOperationListPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (sol ServiceOperationList) serviceOperationListPreparer(ctx context.Context) (*http.Request, error) { + if sol.NextLink == nil || len(to.String(sol.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare((&http.Request{}).WithContext(ctx), + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(sol.NextLink))) +} + +// ServiceOperationListPage contains a page of ServiceOperation values. +type ServiceOperationListPage struct { + fn func(context.Context, ServiceOperationList) (ServiceOperationList, error) + sol ServiceOperationList +} + +// NextWithContext advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *ServiceOperationListPage) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ServiceOperationListPage.NextWithContext") + defer func() { + sc := -1 + if page.Response().Response.Response != nil { + sc = page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + next, err := page.fn(ctx, page.sol) + if err != nil { + return err + } + page.sol = next + return nil +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (page *ServiceOperationListPage) Next() error { + return page.NextWithContext(context.Background()) +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page ServiceOperationListPage) NotDone() bool { + return !page.sol.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page ServiceOperationListPage) Response() ServiceOperationList { + return page.sol +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page ServiceOperationListPage) Values() []ServiceOperation { + if page.sol.IsEmpty() { + return nil + } + return *page.sol.Value +} + +// Creates a new instance of the ServiceOperationListPage type. +func NewServiceOperationListPage(getNextPage func(context.Context, ServiceOperationList) (ServiceOperationList, error)) ServiceOperationListPage { + return ServiceOperationListPage{fn: getNextPage} +} + +// ServiceProperties properties of the Data Migration service instance +type ServiceProperties struct { + // ProvisioningState - READ-ONLY; The resource's provisioning state. Possible values include: 'ServiceProvisioningStateAccepted', 'ServiceProvisioningStateDeleting', 'ServiceProvisioningStateDeploying', 'ServiceProvisioningStateStopped', 'ServiceProvisioningStateStopping', 'ServiceProvisioningStateStarting', 'ServiceProvisioningStateFailedToStart', 'ServiceProvisioningStateFailedToStop', 'ServiceProvisioningStateSucceeded', 'ServiceProvisioningStateFailed' + ProvisioningState ServiceProvisioningState `json:"provisioningState,omitempty"` + // PublicKey - The public key of the service, used to encrypt secrets sent to the service + PublicKey *string `json:"publicKey,omitempty"` + // VirtualSubnetID - The ID of the Microsoft.Network/virtualNetworks/subnets resource to which the service should be joined + VirtualSubnetID *string `json:"virtualSubnetId,omitempty"` +} + +// ServicesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running +// operation. +type ServicesCreateOrUpdateFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *ServicesCreateOrUpdateFuture) Result(client ServicesClient) (s Service, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("datamigration.ServicesCreateOrUpdateFuture") + return + } + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if s.Response.Response, err = future.GetResult(sender); err == nil && s.Response.Response.StatusCode != http.StatusNoContent { + s, err = client.CreateOrUpdateResponder(s.Response.Response) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesCreateOrUpdateFuture", "Result", s.Response.Response, "Failure responding to request") + } + } + return +} + +// ServicesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running +// operation. +type ServicesDeleteFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *ServicesDeleteFuture) Result(client ServicesClient) (ar autorest.Response, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesDeleteFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("datamigration.ServicesDeleteFuture") + return + } + ar.Response = future.Response() + return +} + +// ServiceSku an Azure SKU instance +type ServiceSku struct { + // Name - The unique name of the SKU, such as 'P3' + Name *string `json:"name,omitempty"` + // Tier - The tier of the SKU, such as 'Free', 'Basic', 'Standard', or 'Premium' + Tier *string `json:"tier,omitempty"` + // Family - The SKU family, used when the service has multiple performance classes within a tier, such as 'A', 'D', etc. for virtual machines + Family *string `json:"family,omitempty"` + // Size - The size of the SKU, used when the name alone does not denote a service size or when a SKU has multiple performance classes within a family, e.g. 'A1' for virtual machines + Size *string `json:"size,omitempty"` + // Capacity - The capacity of the SKU, if it supports scaling + Capacity *int32 `json:"capacity,omitempty"` +} + +// ServiceSkuList oData page of available SKUs +type ServiceSkuList struct { + autorest.Response `json:"-"` + // Value - List of service SKUs + Value *[]AvailableServiceSku `json:"value,omitempty"` + // NextLink - URL to load the next page of service SKUs + NextLink *string `json:"nextLink,omitempty"` +} + +// ServiceSkuListIterator provides access to a complete listing of AvailableServiceSku values. +type ServiceSkuListIterator struct { + i int + page ServiceSkuListPage +} + +// NextWithContext advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *ServiceSkuListIterator) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ServiceSkuListIterator.NextWithContext") + defer func() { + sc := -1 + if iter.Response().Response.Response != nil { + sc = iter.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err = iter.page.NextWithContext(ctx) + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (iter *ServiceSkuListIterator) Next() error { + return iter.NextWithContext(context.Background()) +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter ServiceSkuListIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter ServiceSkuListIterator) Response() ServiceSkuList { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter ServiceSkuListIterator) Value() AvailableServiceSku { + if !iter.page.NotDone() { + return AvailableServiceSku{} + } + return iter.page.Values()[iter.i] +} + +// Creates a new instance of the ServiceSkuListIterator type. +func NewServiceSkuListIterator(page ServiceSkuListPage) ServiceSkuListIterator { + return ServiceSkuListIterator{page: page} +} + +// IsEmpty returns true if the ListResult contains no values. +func (ssl ServiceSkuList) IsEmpty() bool { + return ssl.Value == nil || len(*ssl.Value) == 0 +} + +// serviceSkuListPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (ssl ServiceSkuList) serviceSkuListPreparer(ctx context.Context) (*http.Request, error) { + if ssl.NextLink == nil || len(to.String(ssl.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare((&http.Request{}).WithContext(ctx), + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(ssl.NextLink))) +} + +// ServiceSkuListPage contains a page of AvailableServiceSku values. +type ServiceSkuListPage struct { + fn func(context.Context, ServiceSkuList) (ServiceSkuList, error) + ssl ServiceSkuList +} + +// NextWithContext advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *ServiceSkuListPage) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ServiceSkuListPage.NextWithContext") + defer func() { + sc := -1 + if page.Response().Response.Response != nil { + sc = page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + next, err := page.fn(ctx, page.ssl) + if err != nil { + return err + } + page.ssl = next + return nil +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (page *ServiceSkuListPage) Next() error { + return page.NextWithContext(context.Background()) +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page ServiceSkuListPage) NotDone() bool { + return !page.ssl.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page ServiceSkuListPage) Response() ServiceSkuList { + return page.ssl +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page ServiceSkuListPage) Values() []AvailableServiceSku { + if page.ssl.IsEmpty() { + return nil + } + return *page.ssl.Value +} + +// Creates a new instance of the ServiceSkuListPage type. +func NewServiceSkuListPage(getNextPage func(context.Context, ServiceSkuList) (ServiceSkuList, error)) ServiceSkuListPage { + return ServiceSkuListPage{fn: getNextPage} +} + +// ServicesStartFuture an abstraction for monitoring and retrieving the results of a long-running +// operation. +type ServicesStartFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *ServicesStartFuture) Result(client ServicesClient) (ar autorest.Response, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesStartFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("datamigration.ServicesStartFuture") + return + } + ar.Response = future.Response() + return +} + +// ServicesStopFuture an abstraction for monitoring and retrieving the results of a long-running operation. +type ServicesStopFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *ServicesStopFuture) Result(client ServicesClient) (ar autorest.Response, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesStopFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("datamigration.ServicesStopFuture") + return + } + ar.Response = future.Response() + return +} + +// ServiceStatusResponse service health status +type ServiceStatusResponse struct { + autorest.Response `json:"-"` + // AgentVersion - The DMS instance agent version + AgentVersion *string `json:"agentVersion,omitempty"` + // Status - The machine-readable status, such as 'Initializing', 'Offline', 'Online', 'Deploying', 'Deleting', 'Stopped', 'Stopping', 'Starting', 'FailedToStart', 'FailedToStop' or 'Failed' + Status *string `json:"status,omitempty"` + // VMSize - The services virtual machine size, such as 'Standard_D2_v2' + VMSize *string `json:"vmSize,omitempty"` + // SupportedTaskTypes - The list of supported task types + SupportedTaskTypes *[]string `json:"supportedTaskTypes,omitempty"` +} + +// ServicesUpdateFuture an abstraction for monitoring and retrieving the results of a long-running +// operation. +type ServicesUpdateFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *ServicesUpdateFuture) Result(client ServicesClient) (s Service, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesUpdateFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("datamigration.ServicesUpdateFuture") + return + } + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if s.Response.Response, err = future.GetResult(sender); err == nil && s.Response.Response.StatusCode != http.StatusNoContent { + s, err = client.UpdateResponder(s.Response.Response) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesUpdateFuture", "Result", s.Response.Response, "Failure responding to request") + } + } + return +} + +// SQLConnectionInfo information for connecting to SQL database server +type SQLConnectionInfo struct { + // DataSource - Data source in the format Protocol:MachineName\SQLServerInstanceName,PortNumber + DataSource *string `json:"dataSource,omitempty"` + // Authentication - Authentication type to use for connection. Possible values include: 'None', 'WindowsAuthentication', 'SQLAuthentication', 'ActiveDirectoryIntegrated', 'ActiveDirectoryPassword' + Authentication AuthenticationType `json:"authentication,omitempty"` + // EncryptConnection - Whether to encrypt the connection + EncryptConnection *bool `json:"encryptConnection,omitempty"` + // AdditionalSettings - Additional connection settings + AdditionalSettings *string `json:"additionalSettings,omitempty"` + // TrustServerCertificate - Whether to trust the server certificate + TrustServerCertificate *bool `json:"trustServerCertificate,omitempty"` + // Platform - Server platform type for connection. Possible values include: 'SQLOnPrem' + Platform SQLSourcePlatform `json:"platform,omitempty"` + // UserName - User name + UserName *string `json:"userName,omitempty"` + // Password - Password credential. + Password *string `json:"password,omitempty"` + // Type - Possible values include: 'TypeConnectionInfo', 'TypeMiSQLConnectionInfo', 'TypePostgreSQLConnectionInfo', 'TypeMySQLConnectionInfo', 'TypeSQLConnectionInfo' + Type Type `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for SQLConnectionInfo. +func (sci SQLConnectionInfo) MarshalJSON() ([]byte, error) { + sci.Type = TypeSQLConnectionInfo + objectMap := make(map[string]interface{}) + if sci.DataSource != nil { + objectMap["dataSource"] = sci.DataSource + } + if sci.Authentication != "" { + objectMap["authentication"] = sci.Authentication + } + if sci.EncryptConnection != nil { + objectMap["encryptConnection"] = sci.EncryptConnection + } + if sci.AdditionalSettings != nil { + objectMap["additionalSettings"] = sci.AdditionalSettings + } + if sci.TrustServerCertificate != nil { + objectMap["trustServerCertificate"] = sci.TrustServerCertificate + } + if sci.Platform != "" { + objectMap["platform"] = sci.Platform + } + if sci.UserName != nil { + objectMap["userName"] = sci.UserName + } + if sci.Password != nil { + objectMap["password"] = sci.Password + } + if sci.Type != "" { + objectMap["type"] = sci.Type + } + return json.Marshal(objectMap) +} + +// AsMiSQLConnectionInfo is the BasicConnectionInfo implementation for SQLConnectionInfo. +func (sci SQLConnectionInfo) AsMiSQLConnectionInfo() (*MiSQLConnectionInfo, bool) { + return nil, false +} + +// AsPostgreSQLConnectionInfo is the BasicConnectionInfo implementation for SQLConnectionInfo. +func (sci SQLConnectionInfo) AsPostgreSQLConnectionInfo() (*PostgreSQLConnectionInfo, bool) { + return nil, false +} + +// AsMySQLConnectionInfo is the BasicConnectionInfo implementation for SQLConnectionInfo. +func (sci SQLConnectionInfo) AsMySQLConnectionInfo() (*MySQLConnectionInfo, bool) { + return nil, false +} + +// AsSQLConnectionInfo is the BasicConnectionInfo implementation for SQLConnectionInfo. +func (sci SQLConnectionInfo) AsSQLConnectionInfo() (*SQLConnectionInfo, bool) { + return &sci, true +} + +// AsConnectionInfo is the BasicConnectionInfo implementation for SQLConnectionInfo. +func (sci SQLConnectionInfo) AsConnectionInfo() (*ConnectionInfo, bool) { + return nil, false +} + +// AsBasicConnectionInfo is the BasicConnectionInfo implementation for SQLConnectionInfo. +func (sci SQLConnectionInfo) AsBasicConnectionInfo() (BasicConnectionInfo, bool) { + return &sci, true +} + +// SQLMigrationTaskInput base class for migration task input +type SQLMigrationTaskInput struct { + // SourceConnectionInfo - Information for connecting to source + SourceConnectionInfo *SQLConnectionInfo `json:"sourceConnectionInfo,omitempty"` + // TargetConnectionInfo - Information for connecting to target + TargetConnectionInfo *SQLConnectionInfo `json:"targetConnectionInfo,omitempty"` +} + +// SQLServerSQLMISyncTaskInput input for task that migrates SQL Server databases to Azure SQL Database +// Managed Instance online scenario. +type SQLServerSQLMISyncTaskInput struct { + // SelectedDatabases - Databases to migrate + SelectedDatabases *[]MigrateSQLServerSQLMIDatabaseInput `json:"selectedDatabases,omitempty"` + // BackupFileShare - Backup file share information for all selected databases. + BackupFileShare *FileShare `json:"backupFileShare,omitempty"` + // StorageResourceID - Fully qualified resourceId of storage + StorageResourceID *string `json:"storageResourceId,omitempty"` + // SourceConnectionInfo - Connection information for source SQL Server + SourceConnectionInfo *SQLConnectionInfo `json:"sourceConnectionInfo,omitempty"` + // TargetConnectionInfo - Connection information for Azure SQL Database Managed Instance + TargetConnectionInfo *MiSQLConnectionInfo `json:"targetConnectionInfo,omitempty"` + // AzureApp - Azure Active Directory Application the DMS instance will use to connect to the target instance of Azure SQL Database Managed Instance and the Azure Storage Account + AzureApp *AzureActiveDirectoryApp `json:"azureApp,omitempty"` +} + +// StartMigrationScenarioServerRoleResult server role migration result +type StartMigrationScenarioServerRoleResult struct { + // Name - READ-ONLY; Name of server role. + Name *string `json:"name,omitempty"` + // State - READ-ONLY; Current state of migration. Possible values include: 'MigrationStateNone', 'MigrationStateInProgress', 'MigrationStateFailed', 'MigrationStateWarning', 'MigrationStateCompleted', 'MigrationStateSkipped', 'MigrationStateStopped' + State MigrationState `json:"state,omitempty"` + // ExceptionsAndWarnings - READ-ONLY; Migration exceptions and warnings. + ExceptionsAndWarnings *[]ReportableException `json:"exceptionsAndWarnings,omitempty"` +} + +// SyncMigrationDatabaseErrorEvent database migration errors for online migration +type SyncMigrationDatabaseErrorEvent struct { + // TimestampString - READ-ONLY; String value of timestamp. + TimestampString *string `json:"timestampString,omitempty"` + // EventTypeString - READ-ONLY; Event type. + EventTypeString *string `json:"eventTypeString,omitempty"` + // EventText - READ-ONLY; Event text. + EventText *string `json:"eventText,omitempty"` +} + +// TaskList oData page of tasks +type TaskList struct { + autorest.Response `json:"-"` + // Value - List of tasks + Value *[]ProjectTask `json:"value,omitempty"` + // NextLink - URL to load the next page of tasks + NextLink *string `json:"nextLink,omitempty"` +} + +// TaskListIterator provides access to a complete listing of ProjectTask values. +type TaskListIterator struct { + i int + page TaskListPage +} + +// NextWithContext advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *TaskListIterator) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/TaskListIterator.NextWithContext") + defer func() { + sc := -1 + if iter.Response().Response.Response != nil { + sc = iter.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err = iter.page.NextWithContext(ctx) + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (iter *TaskListIterator) Next() error { + return iter.NextWithContext(context.Background()) +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter TaskListIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter TaskListIterator) Response() TaskList { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter TaskListIterator) Value() ProjectTask { + if !iter.page.NotDone() { + return ProjectTask{} + } + return iter.page.Values()[iter.i] +} + +// Creates a new instance of the TaskListIterator type. +func NewTaskListIterator(page TaskListPage) TaskListIterator { + return TaskListIterator{page: page} +} + +// IsEmpty returns true if the ListResult contains no values. +func (tl TaskList) IsEmpty() bool { + return tl.Value == nil || len(*tl.Value) == 0 +} + +// taskListPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (tl TaskList) taskListPreparer(ctx context.Context) (*http.Request, error) { + if tl.NextLink == nil || len(to.String(tl.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare((&http.Request{}).WithContext(ctx), + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(tl.NextLink))) +} + +// TaskListPage contains a page of ProjectTask values. +type TaskListPage struct { + fn func(context.Context, TaskList) (TaskList, error) + tl TaskList +} + +// NextWithContext advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *TaskListPage) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/TaskListPage.NextWithContext") + defer func() { + sc := -1 + if page.Response().Response.Response != nil { + sc = page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + next, err := page.fn(ctx, page.tl) + if err != nil { + return err + } + page.tl = next + return nil +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (page *TaskListPage) Next() error { + return page.NextWithContext(context.Background()) +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page TaskListPage) NotDone() bool { + return !page.tl.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page TaskListPage) Response() TaskList { + return page.tl +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page TaskListPage) Values() []ProjectTask { + if page.tl.IsEmpty() { + return nil + } + return *page.tl.Value +} + +// Creates a new instance of the TaskListPage type. +func NewTaskListPage(getNextPage func(context.Context, TaskList) (TaskList, error)) TaskListPage { + return TaskListPage{fn: getNextPage} +} + +// TrackedResource ARM tracked top level resource. +type TrackedResource struct { + // Tags - Resource tags. + Tags map[string]*string `json:"tags"` + // Location - Resource location. + Location *string `json:"location,omitempty"` + // ID - READ-ONLY; Resource ID. + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; Resource name. + Name *string `json:"name,omitempty"` + // Type - READ-ONLY; Resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for TrackedResource. +func (tr TrackedResource) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if tr.Tags != nil { + objectMap["tags"] = tr.Tags + } + if tr.Location != nil { + objectMap["location"] = tr.Location + } + return json.Marshal(objectMap) +} + +// ValidateMigrationInputSQLServerSQLDbSyncTaskProperties properties for task that validates migration +// input for SQL to Azure SQL DB sync migrations +type ValidateMigrationInputSQLServerSQLDbSyncTaskProperties struct { + // Input - Task input + Input *ValidateSyncMigrationInputSQLServerTaskInput `json:"input,omitempty"` + // Output - READ-ONLY; Task output. This is ignored if submitted. + Output *[]ValidateSyncMigrationInputSQLServerTaskOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the task. This is ignored if submitted. Possible values include: 'TaskStateUnknown', 'TaskStateQueued', 'TaskStateRunning', 'TaskStateCanceled', 'TaskStateSucceeded', 'TaskStateFailed', 'TaskStateFailedInputValidation', 'TaskStateFaulted' + State TaskState `json:"state,omitempty"` + // Commands - READ-ONLY; Array of command properties. + Commands *[]BasicCommandProperties `json:"commands,omitempty"` + // TaskType - Possible values include: 'TaskTypeProjectTaskProperties', 'TaskTypeGetTDECertificatesSQL', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI', 'TaskTypeValidateMigrationInputSQLServerSQLDbSync', 'TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync', 'TaskTypeMigrateMySQLAzureDbForMySQLSync', 'TaskTypeMigrateSQLServerAzureSQLDbSync', 'TaskTypeMigrateSQLServerSQLDb', 'TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS', 'TaskTypeMigrateSQLServerAzureSQLDbMI', 'TaskTypeConnectToTargetAzureDbForMySQL', 'TaskTypeConnectToTargetAzureSQLDbMISyncLRS', 'TaskTypeConnectToTargetAzureSQLDbMI', 'TaskTypeGetUserTablesAzureSQLDbSync', 'TaskTypeGetUserTablesSQL', 'TaskTypeConnectToTargetAzureDbForPostgreSQLSync', 'TaskTypeConnectToTargetSQLDbSync', 'TaskTypeConnectToTargetSQLDb', 'TaskTypeConnectToSourcePostgreSQLSync', 'TaskTypeConnectToSourceSQLServerSync', 'TaskTypeConnectToSourceSQLServer', 'TaskTypeConnectToSourceMySQL' + TaskType TaskType `json:"taskType,omitempty"` +} + +// MarshalJSON is the custom marshaler for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) MarshalJSON() ([]byte, error) { + vmisssdstp.TaskType = TaskTypeValidateMigrationInputSQLServerSQLDbSync + objectMap := make(map[string]interface{}) + if vmisssdstp.Input != nil { + objectMap["input"] = vmisssdstp.Input + } + if vmisssdstp.TaskType != "" { + objectMap["taskType"] = vmisssdstp.TaskType + } + return json.Marshal(objectMap) +} + +// AsGetTdeCertificatesSQLTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) { + return &vmisssdstp, true +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForMySQLTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMITaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourcePostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceMySQLTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) { + return nil, false +} + +// AsProjectTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsProjectTaskProperties() (*ProjectTaskProperties, bool) { + return nil, false +} + +// AsBasicProjectTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties. +func (vmisssdstp ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) AsBasicProjectTaskProperties() (BasicProjectTaskProperties, bool) { + return &vmisssdstp, true +} + +// UnmarshalJSON is the custom unmarshaler for ValidateMigrationInputSQLServerSQLDbSyncTaskProperties struct. +func (vmisssdstp *ValidateMigrationInputSQLServerSQLDbSyncTaskProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "input": + if v != nil { + var input ValidateSyncMigrationInputSQLServerTaskInput + err = json.Unmarshal(*v, &input) + if err != nil { + return err + } + vmisssdstp.Input = &input + } + case "output": + if v != nil { + var output []ValidateSyncMigrationInputSQLServerTaskOutput + err = json.Unmarshal(*v, &output) + if err != nil { + return err + } + vmisssdstp.Output = &output + } + case "errors": + if v != nil { + var errorsVar []ODataError + err = json.Unmarshal(*v, &errorsVar) + if err != nil { + return err + } + vmisssdstp.Errors = &errorsVar + } + case "state": + if v != nil { + var state TaskState + err = json.Unmarshal(*v, &state) + if err != nil { + return err + } + vmisssdstp.State = state + } + case "commands": + if v != nil { + commands, err := unmarshalBasicCommandPropertiesArray(*v) + if err != nil { + return err + } + vmisssdstp.Commands = &commands + } + case "taskType": + if v != nil { + var taskType TaskType + err = json.Unmarshal(*v, &taskType) + if err != nil { + return err + } + vmisssdstp.TaskType = taskType + } + } + } + + return nil +} + +// ValidateMigrationInputSQLServerSQLMISyncTaskInput input for task that migrates SQL Server databases to +// Azure SQL Database Managed Instance online scenario. +type ValidateMigrationInputSQLServerSQLMISyncTaskInput struct { + // SelectedDatabases - Databases to migrate + SelectedDatabases *[]MigrateSQLServerSQLMIDatabaseInput `json:"selectedDatabases,omitempty"` + // BackupFileShare - Backup file share information for all selected databases. + BackupFileShare *FileShare `json:"backupFileShare,omitempty"` + // StorageResourceID - Fully qualified resourceId of storage + StorageResourceID *string `json:"storageResourceId,omitempty"` + // SourceConnectionInfo - Connection information for source SQL Server + SourceConnectionInfo *SQLConnectionInfo `json:"sourceConnectionInfo,omitempty"` + // TargetConnectionInfo - Connection information for Azure SQL Database Managed Instance + TargetConnectionInfo *MiSQLConnectionInfo `json:"targetConnectionInfo,omitempty"` + // AzureApp - Azure Active Directory Application the DMS instance will use to connect to the target instance of Azure SQL Database Managed Instance and the Azure Storage Account + AzureApp *AzureActiveDirectoryApp `json:"azureApp,omitempty"` +} + +// ValidateMigrationInputSQLServerSQLMISyncTaskOutput output for task that validates migration input for +// Azure SQL Database Managed Instance online migration +type ValidateMigrationInputSQLServerSQLMISyncTaskOutput struct { + // ID - READ-ONLY; Database identifier + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; Name of database + Name *string `json:"name,omitempty"` + // ValidationErrors - READ-ONLY; Errors associated with a selected database object + ValidationErrors *[]ReportableException `json:"validationErrors,omitempty"` +} + +// ValidateMigrationInputSQLServerSQLMISyncTaskProperties properties for task that validates migration +// input for SQL to Azure SQL Database Managed Instance sync scenario +type ValidateMigrationInputSQLServerSQLMISyncTaskProperties struct { + // Input - Task input + Input *ValidateMigrationInputSQLServerSQLMISyncTaskInput `json:"input,omitempty"` + // Output - READ-ONLY; Task output. This is ignored if submitted. + Output *[]ValidateMigrationInputSQLServerSQLMISyncTaskOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the task. This is ignored if submitted. Possible values include: 'TaskStateUnknown', 'TaskStateQueued', 'TaskStateRunning', 'TaskStateCanceled', 'TaskStateSucceeded', 'TaskStateFailed', 'TaskStateFailedInputValidation', 'TaskStateFaulted' + State TaskState `json:"state,omitempty"` + // Commands - READ-ONLY; Array of command properties. + Commands *[]BasicCommandProperties `json:"commands,omitempty"` + // TaskType - Possible values include: 'TaskTypeProjectTaskProperties', 'TaskTypeGetTDECertificatesSQL', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI', 'TaskTypeValidateMigrationInputSQLServerSQLDbSync', 'TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync', 'TaskTypeMigrateMySQLAzureDbForMySQLSync', 'TaskTypeMigrateSQLServerAzureSQLDbSync', 'TaskTypeMigrateSQLServerSQLDb', 'TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS', 'TaskTypeMigrateSQLServerAzureSQLDbMI', 'TaskTypeConnectToTargetAzureDbForMySQL', 'TaskTypeConnectToTargetAzureSQLDbMISyncLRS', 'TaskTypeConnectToTargetAzureSQLDbMI', 'TaskTypeGetUserTablesAzureSQLDbSync', 'TaskTypeGetUserTablesSQL', 'TaskTypeConnectToTargetAzureDbForPostgreSQLSync', 'TaskTypeConnectToTargetSQLDbSync', 'TaskTypeConnectToTargetSQLDb', 'TaskTypeConnectToSourcePostgreSQLSync', 'TaskTypeConnectToSourceSQLServerSync', 'TaskTypeConnectToSourceSQLServer', 'TaskTypeConnectToSourceMySQL' + TaskType TaskType `json:"taskType,omitempty"` +} + +// MarshalJSON is the custom marshaler for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) MarshalJSON() ([]byte, error) { + vmisssmstp.TaskType = TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS + objectMap := make(map[string]interface{}) + if vmisssmstp.Input != nil { + objectMap["input"] = vmisssmstp.Input + } + if vmisssmstp.TaskType != "" { + objectMap["taskType"] = vmisssmstp.TaskType + } + return json.Marshal(objectMap) +} + +// AsGetTdeCertificatesSQLTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) { + return &vmisssmstp, true +} + +// AsValidateMigrationInputSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForMySQLTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMITaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourcePostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceMySQLTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) { + return nil, false +} + +// AsProjectTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsProjectTaskProperties() (*ProjectTaskProperties, bool) { + return nil, false +} + +// AsBasicProjectTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMISyncTaskProperties. +func (vmisssmstp ValidateMigrationInputSQLServerSQLMISyncTaskProperties) AsBasicProjectTaskProperties() (BasicProjectTaskProperties, bool) { + return &vmisssmstp, true +} + +// UnmarshalJSON is the custom unmarshaler for ValidateMigrationInputSQLServerSQLMISyncTaskProperties struct. +func (vmisssmstp *ValidateMigrationInputSQLServerSQLMISyncTaskProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "input": + if v != nil { + var input ValidateMigrationInputSQLServerSQLMISyncTaskInput + err = json.Unmarshal(*v, &input) + if err != nil { + return err + } + vmisssmstp.Input = &input + } + case "output": + if v != nil { + var output []ValidateMigrationInputSQLServerSQLMISyncTaskOutput + err = json.Unmarshal(*v, &output) + if err != nil { + return err + } + vmisssmstp.Output = &output + } + case "errors": + if v != nil { + var errorsVar []ODataError + err = json.Unmarshal(*v, &errorsVar) + if err != nil { + return err + } + vmisssmstp.Errors = &errorsVar + } + case "state": + if v != nil { + var state TaskState + err = json.Unmarshal(*v, &state) + if err != nil { + return err + } + vmisssmstp.State = state + } + case "commands": + if v != nil { + commands, err := unmarshalBasicCommandPropertiesArray(*v) + if err != nil { + return err + } + vmisssmstp.Commands = &commands + } + case "taskType": + if v != nil { + var taskType TaskType + err = json.Unmarshal(*v, &taskType) + if err != nil { + return err + } + vmisssmstp.TaskType = taskType + } + } + } + + return nil +} + +// ValidateMigrationInputSQLServerSQLMITaskInput input for task that validates migration input for SQL to +// Azure SQL Managed Instance +type ValidateMigrationInputSQLServerSQLMITaskInput struct { + // SourceConnectionInfo - Information for connecting to source + SourceConnectionInfo *SQLConnectionInfo `json:"sourceConnectionInfo,omitempty"` + // TargetConnectionInfo - Information for connecting to target + TargetConnectionInfo *SQLConnectionInfo `json:"targetConnectionInfo,omitempty"` + // SelectedDatabases - Databases to migrate + SelectedDatabases *[]MigrateSQLServerSQLMIDatabaseInput `json:"selectedDatabases,omitempty"` + // SelectedLogins - Logins to migrate + SelectedLogins *[]string `json:"selectedLogins,omitempty"` + // BackupFileShare - Backup file share information for all selected databases. + BackupFileShare *FileShare `json:"backupFileShare,omitempty"` + // BackupBlobShare - SAS URI of Azure Storage Account Container to be used for storing backup files. + BackupBlobShare *BlobShare `json:"backupBlobShare,omitempty"` + // BackupMode - Backup Mode to specify whether to use existing backup or create new backup. Possible values include: 'CreateBackup', 'ExistingBackup' + BackupMode BackupMode `json:"backupMode,omitempty"` +} + +// ValidateMigrationInputSQLServerSQLMITaskOutput output for task that validates migration input for SQL to +// Azure SQL Managed Instance migrations +type ValidateMigrationInputSQLServerSQLMITaskOutput struct { + // ID - READ-ONLY; Result identifier + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; Name of database + Name *string `json:"name,omitempty"` + // RestoreDatabaseNameErrors - READ-ONLY; Errors associated with the RestoreDatabaseName + RestoreDatabaseNameErrors *[]ReportableException `json:"restoreDatabaseNameErrors,omitempty"` + // BackupFolderErrors - READ-ONLY; Errors associated with the BackupFolder path + BackupFolderErrors *[]ReportableException `json:"backupFolderErrors,omitempty"` + // BackupShareCredentialsErrors - READ-ONLY; Errors associated with backup share user name and password credentials + BackupShareCredentialsErrors *[]ReportableException `json:"backupShareCredentialsErrors,omitempty"` + // BackupStorageAccountErrors - READ-ONLY; Errors associated with the storage account provided. + BackupStorageAccountErrors *[]ReportableException `json:"backupStorageAccountErrors,omitempty"` + // ExistingBackupErrors - READ-ONLY; Errors associated with existing backup files. + ExistingBackupErrors *[]ReportableException `json:"existingBackupErrors,omitempty"` + // DatabaseBackupInfo - Information about backup files when existing backup mode is used. + DatabaseBackupInfo *DatabaseBackupInfo `json:"databaseBackupInfo,omitempty"` +} + +// ValidateMigrationInputSQLServerSQLMITaskProperties properties for task that validates migration input +// for SQL to Azure SQL Database Managed Instance +type ValidateMigrationInputSQLServerSQLMITaskProperties struct { + // Input - Task input + Input *ValidateMigrationInputSQLServerSQLMITaskInput `json:"input,omitempty"` + // Output - READ-ONLY; Task output. This is ignored if submitted. + Output *[]ValidateMigrationInputSQLServerSQLMITaskOutput `json:"output,omitempty"` + // Errors - READ-ONLY; Array of errors. This is ignored if submitted. + Errors *[]ODataError `json:"errors,omitempty"` + // State - READ-ONLY; The state of the task. This is ignored if submitted. Possible values include: 'TaskStateUnknown', 'TaskStateQueued', 'TaskStateRunning', 'TaskStateCanceled', 'TaskStateSucceeded', 'TaskStateFailed', 'TaskStateFailedInputValidation', 'TaskStateFaulted' + State TaskState `json:"state,omitempty"` + // Commands - READ-ONLY; Array of command properties. + Commands *[]BasicCommandProperties `json:"commands,omitempty"` + // TaskType - Possible values include: 'TaskTypeProjectTaskProperties', 'TaskTypeGetTDECertificatesSQL', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMISyncLRS', 'TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI', 'TaskTypeValidateMigrationInputSQLServerSQLDbSync', 'TaskTypeMigratePostgreSQLAzureDbForPostgreSQLSync', 'TaskTypeMigrateMySQLAzureDbForMySQLSync', 'TaskTypeMigrateSQLServerAzureSQLDbSync', 'TaskTypeMigrateSQLServerSQLDb', 'TaskTypeMigrateSQLServerAzureSQLDbMISyncLRS', 'TaskTypeMigrateSQLServerAzureSQLDbMI', 'TaskTypeConnectToTargetAzureDbForMySQL', 'TaskTypeConnectToTargetAzureSQLDbMISyncLRS', 'TaskTypeConnectToTargetAzureSQLDbMI', 'TaskTypeGetUserTablesAzureSQLDbSync', 'TaskTypeGetUserTablesSQL', 'TaskTypeConnectToTargetAzureDbForPostgreSQLSync', 'TaskTypeConnectToTargetSQLDbSync', 'TaskTypeConnectToTargetSQLDb', 'TaskTypeConnectToSourcePostgreSQLSync', 'TaskTypeConnectToSourceSQLServerSync', 'TaskTypeConnectToSourceSQLServer', 'TaskTypeConnectToSourceMySQL' + TaskType TaskType `json:"taskType,omitempty"` +} + +// MarshalJSON is the custom marshaler for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) MarshalJSON() ([]byte, error) { + vmisssmtp.TaskType = TaskTypeValidateMigrationInputSQLServerAzureSQLDbMI + objectMap := make(map[string]interface{}) + if vmisssmtp.Input != nil { + objectMap["input"] = vmisssmtp.Input + } + if vmisssmtp.TaskType != "" { + objectMap["taskType"] = vmisssmtp.TaskType + } + return json.Marshal(objectMap) +} + +// AsGetTdeCertificatesSQLTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsGetTdeCertificatesSQLTaskProperties() (*GetTdeCertificatesSQLTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsValidateMigrationInputSQLServerSQLMISyncTaskProperties() (*ValidateMigrationInputSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsValidateMigrationInputSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsValidateMigrationInputSQLServerSQLMITaskProperties() (*ValidateMigrationInputSQLServerSQLMITaskProperties, bool) { + return &vmisssmtp, true +} + +// AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsValidateMigrationInputSQLServerSQLDbSyncTaskProperties() (*ValidateMigrationInputSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsMigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties() (*MigratePostgreSQLAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateMySQLAzureDbForMySQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsMigrateMySQLAzureDbForMySQLSyncTaskProperties() (*MigrateMySQLAzureDbForMySQLSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsMigrateSQLServerSQLDbSyncTaskProperties() (*MigrateSQLServerSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsMigrateSQLServerSQLDbTaskProperties() (*MigrateSQLServerSQLDbTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsMigrateSQLServerSQLMISyncTaskProperties() (*MigrateSQLServerSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsMigrateSQLServerSQLMITaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsMigrateSQLServerSQLMITaskProperties() (*MigrateSQLServerSQLMITaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForMySQLTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsConnectToTargetAzureDbForMySQLTaskProperties() (*ConnectToTargetAzureDbForMySQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMISyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsConnectToTargetSQLMISyncTaskProperties() (*ConnectToTargetSQLMISyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLMITaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsConnectToTargetSQLMITaskProperties() (*ConnectToTargetSQLMITaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsGetUserTablesSQLSyncTaskProperties() (*GetUserTablesSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsGetUserTablesSQLTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsGetUserTablesSQLTaskProperties() (*GetUserTablesSQLTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsConnectToTargetAzureDbForPostgreSQLSyncTaskProperties() (*ConnectToTargetAzureDbForPostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLSQLDbSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsConnectToTargetSQLSQLDbSyncTaskProperties() (*ConnectToTargetSQLSQLDbSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToTargetSQLDbTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsConnectToTargetSQLDbTaskProperties() (*ConnectToTargetSQLDbTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourcePostgreSQLSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsConnectToSourcePostgreSQLSyncTaskProperties() (*ConnectToSourcePostgreSQLSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerSyncTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsConnectToSourceSQLServerSyncTaskProperties() (*ConnectToSourceSQLServerSyncTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceSQLServerTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsConnectToSourceSQLServerTaskProperties() (*ConnectToSourceSQLServerTaskProperties, bool) { + return nil, false +} + +// AsConnectToSourceMySQLTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsConnectToSourceMySQLTaskProperties() (*ConnectToSourceMySQLTaskProperties, bool) { + return nil, false +} + +// AsProjectTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsProjectTaskProperties() (*ProjectTaskProperties, bool) { + return nil, false +} + +// AsBasicProjectTaskProperties is the BasicProjectTaskProperties implementation for ValidateMigrationInputSQLServerSQLMITaskProperties. +func (vmisssmtp ValidateMigrationInputSQLServerSQLMITaskProperties) AsBasicProjectTaskProperties() (BasicProjectTaskProperties, bool) { + return &vmisssmtp, true +} + +// UnmarshalJSON is the custom unmarshaler for ValidateMigrationInputSQLServerSQLMITaskProperties struct. +func (vmisssmtp *ValidateMigrationInputSQLServerSQLMITaskProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "input": + if v != nil { + var input ValidateMigrationInputSQLServerSQLMITaskInput + err = json.Unmarshal(*v, &input) + if err != nil { + return err + } + vmisssmtp.Input = &input + } + case "output": + if v != nil { + var output []ValidateMigrationInputSQLServerSQLMITaskOutput + err = json.Unmarshal(*v, &output) + if err != nil { + return err + } + vmisssmtp.Output = &output + } + case "errors": + if v != nil { + var errorsVar []ODataError + err = json.Unmarshal(*v, &errorsVar) + if err != nil { + return err + } + vmisssmtp.Errors = &errorsVar + } + case "state": + if v != nil { + var state TaskState + err = json.Unmarshal(*v, &state) + if err != nil { + return err + } + vmisssmtp.State = state + } + case "commands": + if v != nil { + commands, err := unmarshalBasicCommandPropertiesArray(*v) + if err != nil { + return err + } + vmisssmtp.Commands = &commands + } + case "taskType": + if v != nil { + var taskType TaskType + err = json.Unmarshal(*v, &taskType) + if err != nil { + return err + } + vmisssmtp.TaskType = taskType + } + } + } + + return nil +} + +// ValidateSyncMigrationInputSQLServerTaskInput input for task that validates migration input for SQL sync +// migrations +type ValidateSyncMigrationInputSQLServerTaskInput struct { + // SourceConnectionInfo - Information for connecting to source SQL server + SourceConnectionInfo *SQLConnectionInfo `json:"sourceConnectionInfo,omitempty"` + // TargetConnectionInfo - Information for connecting to target + TargetConnectionInfo *SQLConnectionInfo `json:"targetConnectionInfo,omitempty"` + // SelectedDatabases - Databases to migrate + SelectedDatabases *[]MigrateSQLServerSQLDbSyncDatabaseInput `json:"selectedDatabases,omitempty"` +} + +// ValidateSyncMigrationInputSQLServerTaskOutput output for task that validates migration input for SQL +// sync migrations +type ValidateSyncMigrationInputSQLServerTaskOutput struct { + // ID - READ-ONLY; Database identifier + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; Name of database + Name *string `json:"name,omitempty"` + // ValidationErrors - READ-ONLY; Errors associated with a selected database object + ValidationErrors *[]ReportableException `json:"validationErrors,omitempty"` +} + +// ValidationError description about the errors happen while performing migration validation +type ValidationError struct { + // Text - READ-ONLY; Error Text + Text *string `json:"text,omitempty"` + // Severity - READ-ONLY; Severity of the error. Possible values include: 'SeverityMessage', 'SeverityWarning', 'SeverityError' + Severity Severity `json:"severity,omitempty"` +} + +// WaitStatistics wait statistics gathered during query batch execution +type WaitStatistics struct { + // WaitType - READ-ONLY; Type of the Wait + WaitType *string `json:"waitType,omitempty"` + // WaitTimeMs - READ-ONLY; Total wait time in millisecond(s) + WaitTimeMs *float64 `json:"waitTimeMs,omitempty"` + // WaitCount - READ-ONLY; Total no. of waits + WaitCount *int64 `json:"waitCount,omitempty"` +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/operations.go new file mode 100644 index 0000000000000..b5d295752fcef --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/operations.go @@ -0,0 +1,147 @@ +package datamigration + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/tracing" + "net/http" +) + +// OperationsClient is the data Migration Client +type OperationsClient struct { + BaseClient +} + +// NewOperationsClient creates an instance of the OperationsClient client. +func NewOperationsClient(subscriptionID string) OperationsClient { + return NewOperationsClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewOperationsClientWithBaseURI creates an instance of the OperationsClient client. +func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient { + return OperationsClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// List lists all available actions exposed by the Database Migration Service resource provider. +func (client OperationsClient) List(ctx context.Context) (result ServiceOperationListPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/OperationsClient.List") + defer func() { + sc := -1 + if result.sol.Response.Response != nil { + sc = result.sol.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.fn = client.listNextResults + req, err := client.ListPreparer(ctx) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.OperationsClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.sol.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "datamigration.OperationsClient", "List", resp, "Failure sending request") + return + } + + result.sol, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.OperationsClient", "List", resp, "Failure responding to request") + } + + return +} + +// ListPreparer prepares the List request. +func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPath("/providers/Microsoft.DataMigration/operations"), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client OperationsClient) ListSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + return autorest.SendWithSender(client, req, sd...) +} + +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client OperationsClient) ListResponder(resp *http.Response) (result ServiceOperationList, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listNextResults retrieves the next set of results, if any. +func (client OperationsClient) listNextResults(ctx context.Context, lastResults ServiceOperationList) (result ServiceOperationList, err error) { + req, err := lastResults.serviceOperationListPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "datamigration.OperationsClient", "listNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "datamigration.OperationsClient", "listNextResults", resp, "Failure sending next results request") + } + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.OperationsClient", "listNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListComplete enumerates all values, automatically crossing page boundaries as required. +func (client OperationsClient) ListComplete(ctx context.Context) (result ServiceOperationListIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/OperationsClient.List") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.List(ctx) + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/projects.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/projects.go new file mode 100644 index 0000000000000..c090869790687 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/projects.go @@ -0,0 +1,486 @@ +package datamigration + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/tracing" + "net/http" +) + +// ProjectsClient is the data Migration Client +type ProjectsClient struct { + BaseClient +} + +// NewProjectsClient creates an instance of the ProjectsClient client. +func NewProjectsClient(subscriptionID string) ProjectsClient { + return NewProjectsClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewProjectsClientWithBaseURI creates an instance of the ProjectsClient client. +func NewProjectsClientWithBaseURI(baseURI string, subscriptionID string) ProjectsClient { + return ProjectsClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// CreateOrUpdate the project resource is a nested resource representing a stored migration project. The PUT method +// creates a new project or updates an existing one. +// Parameters: +// parameters - information about the project +// groupName - name of the resource group +// serviceName - name of the service +// projectName - name of the project +func (client ProjectsClient) CreateOrUpdate(ctx context.Context, parameters Project, groupName string, serviceName string, projectName string) (result Project, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ProjectsClient.CreateOrUpdate") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + req, err := client.CreateOrUpdatePreparer(ctx, parameters, groupName, serviceName, projectName) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ProjectsClient", "CreateOrUpdate", nil, "Failure preparing request") + return + } + + resp, err := client.CreateOrUpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "datamigration.ProjectsClient", "CreateOrUpdate", resp, "Failure sending request") + return + } + + result, err = client.CreateOrUpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ProjectsClient", "CreateOrUpdate", resp, "Failure responding to request") + } + + return +} + +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client ProjectsClient) CreateOrUpdatePreparer(ctx context.Context, parameters Project, groupName string, serviceName string, projectName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "groupName": autorest.Encode("path", groupName), + "projectName": autorest.Encode("path", projectName), + "serviceName": autorest.Encode("path", serviceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/projects/{projectName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the +// http.Response Body if it receives an error. +func (client ProjectsClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always +// closes the http.Response Body. +func (client ProjectsClient) CreateOrUpdateResponder(resp *http.Response) (result Project, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Delete the project resource is a nested resource representing a stored migration project. The DELETE method deletes +// a project. +// Parameters: +// groupName - name of the resource group +// serviceName - name of the service +// projectName - name of the project +// deleteRunningTasks - delete the resource even if it contains running tasks +func (client ProjectsClient) Delete(ctx context.Context, groupName string, serviceName string, projectName string, deleteRunningTasks *bool) (result autorest.Response, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ProjectsClient.Delete") + defer func() { + sc := -1 + if result.Response != nil { + sc = result.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + req, err := client.DeletePreparer(ctx, groupName, serviceName, projectName, deleteRunningTasks) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ProjectsClient", "Delete", nil, "Failure preparing request") + return + } + + resp, err := client.DeleteSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "datamigration.ProjectsClient", "Delete", resp, "Failure sending request") + return + } + + result, err = client.DeleteResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ProjectsClient", "Delete", resp, "Failure responding to request") + } + + return +} + +// DeletePreparer prepares the Delete request. +func (client ProjectsClient) DeletePreparer(ctx context.Context, groupName string, serviceName string, projectName string, deleteRunningTasks *bool) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "groupName": autorest.Encode("path", groupName), + "projectName": autorest.Encode("path", projectName), + "serviceName": autorest.Encode("path", serviceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + if deleteRunningTasks != nil { + queryParameters["deleteRunningTasks"] = autorest.Encode("query", *deleteRunningTasks) + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/projects/{projectName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client ProjectsClient) DeleteSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client ProjectsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// Get the project resource is a nested resource representing a stored migration project. The GET method retrieves +// information about a project. +// Parameters: +// groupName - name of the resource group +// serviceName - name of the service +// projectName - name of the project +func (client ProjectsClient) Get(ctx context.Context, groupName string, serviceName string, projectName string) (result Project, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ProjectsClient.Get") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + req, err := client.GetPreparer(ctx, groupName, serviceName, projectName) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ProjectsClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "datamigration.ProjectsClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ProjectsClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client ProjectsClient) GetPreparer(ctx context.Context, groupName string, serviceName string, projectName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "groupName": autorest.Encode("path", groupName), + "projectName": autorest.Encode("path", projectName), + "serviceName": autorest.Encode("path", serviceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/projects/{projectName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client ProjectsClient) GetSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client ProjectsClient) GetResponder(resp *http.Response) (result Project, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// ListByResourceGroup the project resource is a nested resource representing a stored migration project. This method +// returns a list of projects owned by a service resource. +// Parameters: +// groupName - name of the resource group +// serviceName - name of the service +func (client ProjectsClient) ListByResourceGroup(ctx context.Context, groupName string, serviceName string) (result ProjectListPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ProjectsClient.ListByResourceGroup") + defer func() { + sc := -1 + if result.pl.Response.Response != nil { + sc = result.pl.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.fn = client.listByResourceGroupNextResults + req, err := client.ListByResourceGroupPreparer(ctx, groupName, serviceName) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ProjectsClient", "ListByResourceGroup", nil, "Failure preparing request") + return + } + + resp, err := client.ListByResourceGroupSender(req) + if err != nil { + result.pl.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "datamigration.ProjectsClient", "ListByResourceGroup", resp, "Failure sending request") + return + } + + result.pl, err = client.ListByResourceGroupResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ProjectsClient", "ListByResourceGroup", resp, "Failure responding to request") + } + + return +} + +// ListByResourceGroupPreparer prepares the ListByResourceGroup request. +func (client ProjectsClient) ListByResourceGroupPreparer(ctx context.Context, groupName string, serviceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "groupName": autorest.Encode("path", groupName), + "serviceName": autorest.Encode("path", serviceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/projects", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the +// http.Response Body if it receives an error. +func (client ProjectsClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always +// closes the http.Response Body. +func (client ProjectsClient) ListByResourceGroupResponder(resp *http.Response) (result ProjectList, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listByResourceGroupNextResults retrieves the next set of results, if any. +func (client ProjectsClient) listByResourceGroupNextResults(ctx context.Context, lastResults ProjectList) (result ProjectList, err error) { + req, err := lastResults.projectListPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "datamigration.ProjectsClient", "listByResourceGroupNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListByResourceGroupSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "datamigration.ProjectsClient", "listByResourceGroupNextResults", resp, "Failure sending next results request") + } + result, err = client.ListByResourceGroupResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ProjectsClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListByResourceGroupComplete enumerates all values, automatically crossing page boundaries as required. +func (client ProjectsClient) ListByResourceGroupComplete(ctx context.Context, groupName string, serviceName string) (result ProjectListIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ProjectsClient.ListByResourceGroup") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.ListByResourceGroup(ctx, groupName, serviceName) + return +} + +// Update the project resource is a nested resource representing a stored migration project. The PATCH method updates +// an existing project. +// Parameters: +// parameters - information about the project +// groupName - name of the resource group +// serviceName - name of the service +// projectName - name of the project +func (client ProjectsClient) Update(ctx context.Context, parameters Project, groupName string, serviceName string, projectName string) (result Project, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ProjectsClient.Update") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + req, err := client.UpdatePreparer(ctx, parameters, groupName, serviceName, projectName) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ProjectsClient", "Update", nil, "Failure preparing request") + return + } + + resp, err := client.UpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "datamigration.ProjectsClient", "Update", resp, "Failure sending request") + return + } + + result, err = client.UpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ProjectsClient", "Update", resp, "Failure responding to request") + } + + return +} + +// UpdatePreparer prepares the Update request. +func (client ProjectsClient) UpdatePreparer(ctx context.Context, parameters Project, groupName string, serviceName string, projectName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "groupName": autorest.Encode("path", groupName), + "projectName": autorest.Encode("path", projectName), + "serviceName": autorest.Encode("path", serviceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPatch(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/projects/{projectName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// UpdateSender sends the Update request. The method will close the +// http.Response Body if it receives an error. +func (client ProjectsClient) UpdateSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// UpdateResponder handles the response to the Update request. The method always +// closes the http.Response Body. +func (client ProjectsClient) UpdateResponder(resp *http.Response) (result Project, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/resourceskus.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/resourceskus.go new file mode 100644 index 0000000000000..a62fcfd92e968 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/resourceskus.go @@ -0,0 +1,151 @@ +package datamigration + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/tracing" + "net/http" +) + +// ResourceSkusClient is the data Migration Client +type ResourceSkusClient struct { + BaseClient +} + +// NewResourceSkusClient creates an instance of the ResourceSkusClient client. +func NewResourceSkusClient(subscriptionID string) ResourceSkusClient { + return NewResourceSkusClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewResourceSkusClientWithBaseURI creates an instance of the ResourceSkusClient client. +func NewResourceSkusClientWithBaseURI(baseURI string, subscriptionID string) ResourceSkusClient { + return ResourceSkusClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// ListSkus the skus action returns the list of SKUs that DMS supports. +func (client ResourceSkusClient) ListSkus(ctx context.Context) (result ResourceSkusResultPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ResourceSkusClient.ListSkus") + defer func() { + sc := -1 + if result.rsr.Response.Response != nil { + sc = result.rsr.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.fn = client.listSkusNextResults + req, err := client.ListSkusPreparer(ctx) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ResourceSkusClient", "ListSkus", nil, "Failure preparing request") + return + } + + resp, err := client.ListSkusSender(req) + if err != nil { + result.rsr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "datamigration.ResourceSkusClient", "ListSkus", resp, "Failure sending request") + return + } + + result.rsr, err = client.ListSkusResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ResourceSkusClient", "ListSkus", resp, "Failure responding to request") + } + + return +} + +// ListSkusPreparer prepares the ListSkus request. +func (client ResourceSkusClient) ListSkusPreparer(ctx context.Context) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.DataMigration/skus", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSkusSender sends the ListSkus request. The method will close the +// http.Response Body if it receives an error. +func (client ResourceSkusClient) ListSkusSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// ListSkusResponder handles the response to the ListSkus request. The method always +// closes the http.Response Body. +func (client ResourceSkusClient) ListSkusResponder(resp *http.Response) (result ResourceSkusResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listSkusNextResults retrieves the next set of results, if any. +func (client ResourceSkusClient) listSkusNextResults(ctx context.Context, lastResults ResourceSkusResult) (result ResourceSkusResult, err error) { + req, err := lastResults.resourceSkusResultPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "datamigration.ResourceSkusClient", "listSkusNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSkusSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "datamigration.ResourceSkusClient", "listSkusNextResults", resp, "Failure sending next results request") + } + result, err = client.ListSkusResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ResourceSkusClient", "listSkusNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListSkusComplete enumerates all values, automatically crossing page boundaries as required. +func (client ResourceSkusClient) ListSkusComplete(ctx context.Context) (result ResourceSkusResultIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ResourceSkusClient.ListSkus") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.ListSkus(ctx) + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/services.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/services.go new file mode 100644 index 0000000000000..1dac3c0421051 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/services.go @@ -0,0 +1,1108 @@ +package datamigration + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "github.com/Azure/go-autorest/tracing" + "net/http" +) + +// ServicesClient is the data Migration Client +type ServicesClient struct { + BaseClient +} + +// NewServicesClient creates an instance of the ServicesClient client. +func NewServicesClient(subscriptionID string) ServicesClient { + return NewServicesClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewServicesClientWithBaseURI creates an instance of the ServicesClient client. +func NewServicesClientWithBaseURI(baseURI string, subscriptionID string) ServicesClient { + return ServicesClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// CheckNameAvailability this method checks whether a proposed top-level resource name is valid and available. +// Parameters: +// location - the Azure region of the operation +// parameters - requested name to validate +func (client ServicesClient) CheckNameAvailability(ctx context.Context, location string, parameters NameAvailabilityRequest) (result NameAvailabilityResponse, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ServicesClient.CheckNameAvailability") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + req, err := client.CheckNameAvailabilityPreparer(ctx, location, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "CheckNameAvailability", nil, "Failure preparing request") + return + } + + resp, err := client.CheckNameAvailabilitySender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "CheckNameAvailability", resp, "Failure sending request") + return + } + + result, err = client.CheckNameAvailabilityResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "CheckNameAvailability", resp, "Failure responding to request") + } + + return +} + +// CheckNameAvailabilityPreparer prepares the CheckNameAvailability request. +func (client ServicesClient) CheckNameAvailabilityPreparer(ctx context.Context, location string, parameters NameAvailabilityRequest) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "location": autorest.Encode("path", location), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.DataMigration/locations/{location}/checkNameAvailability", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CheckNameAvailabilitySender sends the CheckNameAvailability request. The method will close the +// http.Response Body if it receives an error. +func (client ServicesClient) CheckNameAvailabilitySender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// CheckNameAvailabilityResponder handles the response to the CheckNameAvailability request. The method always +// closes the http.Response Body. +func (client ServicesClient) CheckNameAvailabilityResponder(resp *http.Response) (result NameAvailabilityResponse, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// CheckStatus the services resource is the top-level resource that represents the Database Migration Service. This +// action performs a health check and returns the status of the service and virtual machine size. +// Parameters: +// groupName - name of the resource group +// serviceName - name of the service +func (client ServicesClient) CheckStatus(ctx context.Context, groupName string, serviceName string) (result ServiceStatusResponse, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ServicesClient.CheckStatus") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + req, err := client.CheckStatusPreparer(ctx, groupName, serviceName) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "CheckStatus", nil, "Failure preparing request") + return + } + + resp, err := client.CheckStatusSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "CheckStatus", resp, "Failure sending request") + return + } + + result, err = client.CheckStatusResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "CheckStatus", resp, "Failure responding to request") + } + + return +} + +// CheckStatusPreparer prepares the CheckStatus request. +func (client ServicesClient) CheckStatusPreparer(ctx context.Context, groupName string, serviceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "groupName": autorest.Encode("path", groupName), + "serviceName": autorest.Encode("path", serviceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/checkStatus", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CheckStatusSender sends the CheckStatus request. The method will close the +// http.Response Body if it receives an error. +func (client ServicesClient) CheckStatusSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// CheckStatusResponder handles the response to the CheckStatus request. The method always +// closes the http.Response Body. +func (client ServicesClient) CheckStatusResponder(resp *http.Response) (result ServiceStatusResponse, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// CreateOrUpdate the services resource is the top-level resource that represents the Database Migration Service. The +// PUT method creates a new service or updates an existing one. When a service is updated, existing child resources +// (i.e. tasks) are unaffected. Services currently support a single kind, "vm", which refers to a VM-based service, +// although other kinds may be added in the future. This method can change the kind, SKU, and network of the service, +// but if tasks are currently running (i.e. the service is busy), this will fail with 400 Bad Request +// ("ServiceIsBusy"). The provider will reply when successful with 200 OK or 201 Created. Long-running operations use +// the provisioningState property. +// Parameters: +// parameters - information about the service +// groupName - name of the resource group +// serviceName - name of the service +func (client ServicesClient) CreateOrUpdate(ctx context.Context, parameters Service, groupName string, serviceName string) (result ServicesCreateOrUpdateFuture, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ServicesClient.CreateOrUpdate") + defer func() { + sc := -1 + if result.Response() != nil { + sc = result.Response().StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: parameters, + Constraints: []validation.Constraint{{Target: "parameters.ServiceProperties", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "parameters.ServiceProperties.VirtualSubnetID", Name: validation.Null, Rule: true, Chain: nil}}}}}}); err != nil { + return result, validation.NewError("datamigration.ServicesClient", "CreateOrUpdate", err.Error()) + } + + req, err := client.CreateOrUpdatePreparer(ctx, parameters, groupName, serviceName) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "CreateOrUpdate", nil, "Failure preparing request") + return + } + + result, err = client.CreateOrUpdateSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "CreateOrUpdate", result.Response(), "Failure sending request") + return + } + + return +} + +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client ServicesClient) CreateOrUpdatePreparer(ctx context.Context, parameters Service, groupName string, serviceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "groupName": autorest.Encode("path", groupName), + "serviceName": autorest.Encode("path", serviceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the +// http.Response Body if it receives an error. +func (client ServicesClient) CreateOrUpdateSender(req *http.Request) (future ServicesCreateOrUpdateFuture, err error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, sd...) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always +// closes the http.Response Body. +func (client ServicesClient) CreateOrUpdateResponder(resp *http.Response) (result Service, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Delete the services resource is the top-level resource that represents the Database Migration Service. The DELETE +// method deletes a service. Any running tasks will be canceled. +// Parameters: +// groupName - name of the resource group +// serviceName - name of the service +// deleteRunningTasks - delete the resource even if it contains running tasks +func (client ServicesClient) Delete(ctx context.Context, groupName string, serviceName string, deleteRunningTasks *bool) (result ServicesDeleteFuture, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ServicesClient.Delete") + defer func() { + sc := -1 + if result.Response() != nil { + sc = result.Response().StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + req, err := client.DeletePreparer(ctx, groupName, serviceName, deleteRunningTasks) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "Delete", nil, "Failure preparing request") + return + } + + result, err = client.DeleteSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "Delete", result.Response(), "Failure sending request") + return + } + + return +} + +// DeletePreparer prepares the Delete request. +func (client ServicesClient) DeletePreparer(ctx context.Context, groupName string, serviceName string, deleteRunningTasks *bool) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "groupName": autorest.Encode("path", groupName), + "serviceName": autorest.Encode("path", serviceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + if deleteRunningTasks != nil { + queryParameters["deleteRunningTasks"] = autorest.Encode("query", *deleteRunningTasks) + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client ServicesClient) DeleteSender(req *http.Request) (future ServicesDeleteFuture, err error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, sd...) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client ServicesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// Get the services resource is the top-level resource that represents the Database Migration Service. The GET method +// retrieves information about a service instance. +// Parameters: +// groupName - name of the resource group +// serviceName - name of the service +func (client ServicesClient) Get(ctx context.Context, groupName string, serviceName string) (result Service, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ServicesClient.Get") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + req, err := client.GetPreparer(ctx, groupName, serviceName) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client ServicesClient) GetPreparer(ctx context.Context, groupName string, serviceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "groupName": autorest.Encode("path", groupName), + "serviceName": autorest.Encode("path", serviceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client ServicesClient) GetSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client ServicesClient) GetResponder(resp *http.Response) (result Service, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// List the services resource is the top-level resource that represents the Database Migration Service. This method +// returns a list of service resources in a subscription. +func (client ServicesClient) List(ctx context.Context) (result ServiceListPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ServicesClient.List") + defer func() { + sc := -1 + if result.sl.Response.Response != nil { + sc = result.sl.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.fn = client.listNextResults + req, err := client.ListPreparer(ctx) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.sl.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "List", resp, "Failure sending request") + return + } + + result.sl, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "List", resp, "Failure responding to request") + } + + return +} + +// ListPreparer prepares the List request. +func (client ServicesClient) ListPreparer(ctx context.Context) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.DataMigration/services", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client ServicesClient) ListSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client ServicesClient) ListResponder(resp *http.Response) (result ServiceList, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listNextResults retrieves the next set of results, if any. +func (client ServicesClient) listNextResults(ctx context.Context, lastResults ServiceList) (result ServiceList, err error) { + req, err := lastResults.serviceListPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "datamigration.ServicesClient", "listNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "datamigration.ServicesClient", "listNextResults", resp, "Failure sending next results request") + } + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "listNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListComplete enumerates all values, automatically crossing page boundaries as required. +func (client ServicesClient) ListComplete(ctx context.Context) (result ServiceListIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ServicesClient.List") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.List(ctx) + return +} + +// ListByResourceGroup the Services resource is the top-level resource that represents the Database Migration Service. +// This method returns a list of service resources in a resource group. +// Parameters: +// groupName - name of the resource group +func (client ServicesClient) ListByResourceGroup(ctx context.Context, groupName string) (result ServiceListPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ServicesClient.ListByResourceGroup") + defer func() { + sc := -1 + if result.sl.Response.Response != nil { + sc = result.sl.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.fn = client.listByResourceGroupNextResults + req, err := client.ListByResourceGroupPreparer(ctx, groupName) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "ListByResourceGroup", nil, "Failure preparing request") + return + } + + resp, err := client.ListByResourceGroupSender(req) + if err != nil { + result.sl.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "ListByResourceGroup", resp, "Failure sending request") + return + } + + result.sl, err = client.ListByResourceGroupResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "ListByResourceGroup", resp, "Failure responding to request") + } + + return +} + +// ListByResourceGroupPreparer prepares the ListByResourceGroup request. +func (client ServicesClient) ListByResourceGroupPreparer(ctx context.Context, groupName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "groupName": autorest.Encode("path", groupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the +// http.Response Body if it receives an error. +func (client ServicesClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always +// closes the http.Response Body. +func (client ServicesClient) ListByResourceGroupResponder(resp *http.Response) (result ServiceList, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listByResourceGroupNextResults retrieves the next set of results, if any. +func (client ServicesClient) listByResourceGroupNextResults(ctx context.Context, lastResults ServiceList) (result ServiceList, err error) { + req, err := lastResults.serviceListPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "datamigration.ServicesClient", "listByResourceGroupNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListByResourceGroupSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "datamigration.ServicesClient", "listByResourceGroupNextResults", resp, "Failure sending next results request") + } + result, err = client.ListByResourceGroupResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListByResourceGroupComplete enumerates all values, automatically crossing page boundaries as required. +func (client ServicesClient) ListByResourceGroupComplete(ctx context.Context, groupName string) (result ServiceListIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ServicesClient.ListByResourceGroup") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.ListByResourceGroup(ctx, groupName) + return +} + +// ListSkus the services resource is the top-level resource that represents the Database Migration Service. The skus +// action returns the list of SKUs that a service resource can be updated to. +// Parameters: +// groupName - name of the resource group +// serviceName - name of the service +func (client ServicesClient) ListSkus(ctx context.Context, groupName string, serviceName string) (result ServiceSkuListPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ServicesClient.ListSkus") + defer func() { + sc := -1 + if result.ssl.Response.Response != nil { + sc = result.ssl.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.fn = client.listSkusNextResults + req, err := client.ListSkusPreparer(ctx, groupName, serviceName) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "ListSkus", nil, "Failure preparing request") + return + } + + resp, err := client.ListSkusSender(req) + if err != nil { + result.ssl.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "ListSkus", resp, "Failure sending request") + return + } + + result.ssl, err = client.ListSkusResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "ListSkus", resp, "Failure responding to request") + } + + return +} + +// ListSkusPreparer prepares the ListSkus request. +func (client ServicesClient) ListSkusPreparer(ctx context.Context, groupName string, serviceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "groupName": autorest.Encode("path", groupName), + "serviceName": autorest.Encode("path", serviceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/skus", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSkusSender sends the ListSkus request. The method will close the +// http.Response Body if it receives an error. +func (client ServicesClient) ListSkusSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// ListSkusResponder handles the response to the ListSkus request. The method always +// closes the http.Response Body. +func (client ServicesClient) ListSkusResponder(resp *http.Response) (result ServiceSkuList, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listSkusNextResults retrieves the next set of results, if any. +func (client ServicesClient) listSkusNextResults(ctx context.Context, lastResults ServiceSkuList) (result ServiceSkuList, err error) { + req, err := lastResults.serviceSkuListPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "datamigration.ServicesClient", "listSkusNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSkusSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "datamigration.ServicesClient", "listSkusNextResults", resp, "Failure sending next results request") + } + result, err = client.ListSkusResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "listSkusNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListSkusComplete enumerates all values, automatically crossing page boundaries as required. +func (client ServicesClient) ListSkusComplete(ctx context.Context, groupName string, serviceName string) (result ServiceSkuListIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ServicesClient.ListSkus") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.ListSkus(ctx, groupName, serviceName) + return +} + +// NestedCheckNameAvailability this method checks whether a proposed nested resource name is valid and available. +// Parameters: +// groupName - name of the resource group +// serviceName - name of the service +// parameters - requested name to validate +func (client ServicesClient) NestedCheckNameAvailability(ctx context.Context, groupName string, serviceName string, parameters NameAvailabilityRequest) (result NameAvailabilityResponse, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ServicesClient.NestedCheckNameAvailability") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + req, err := client.NestedCheckNameAvailabilityPreparer(ctx, groupName, serviceName, parameters) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "NestedCheckNameAvailability", nil, "Failure preparing request") + return + } + + resp, err := client.NestedCheckNameAvailabilitySender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "NestedCheckNameAvailability", resp, "Failure sending request") + return + } + + result, err = client.NestedCheckNameAvailabilityResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "NestedCheckNameAvailability", resp, "Failure responding to request") + } + + return +} + +// NestedCheckNameAvailabilityPreparer prepares the NestedCheckNameAvailability request. +func (client ServicesClient) NestedCheckNameAvailabilityPreparer(ctx context.Context, groupName string, serviceName string, parameters NameAvailabilityRequest) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "groupName": autorest.Encode("path", groupName), + "serviceName": autorest.Encode("path", serviceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/checkNameAvailability", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// NestedCheckNameAvailabilitySender sends the NestedCheckNameAvailability request. The method will close the +// http.Response Body if it receives an error. +func (client ServicesClient) NestedCheckNameAvailabilitySender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// NestedCheckNameAvailabilityResponder handles the response to the NestedCheckNameAvailability request. The method always +// closes the http.Response Body. +func (client ServicesClient) NestedCheckNameAvailabilityResponder(resp *http.Response) (result NameAvailabilityResponse, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Start the services resource is the top-level resource that represents the Database Migration Service. This action +// starts the service and the service can be used for data migration. +// Parameters: +// groupName - name of the resource group +// serviceName - name of the service +func (client ServicesClient) Start(ctx context.Context, groupName string, serviceName string) (result ServicesStartFuture, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ServicesClient.Start") + defer func() { + sc := -1 + if result.Response() != nil { + sc = result.Response().StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + req, err := client.StartPreparer(ctx, groupName, serviceName) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "Start", nil, "Failure preparing request") + return + } + + result, err = client.StartSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "Start", result.Response(), "Failure sending request") + return + } + + return +} + +// StartPreparer prepares the Start request. +func (client ServicesClient) StartPreparer(ctx context.Context, groupName string, serviceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "groupName": autorest.Encode("path", groupName), + "serviceName": autorest.Encode("path", serviceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/start", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// StartSender sends the Start request. The method will close the +// http.Response Body if it receives an error. +func (client ServicesClient) StartSender(req *http.Request) (future ServicesStartFuture, err error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, sd...) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// StartResponder handles the response to the Start request. The method always +// closes the http.Response Body. +func (client ServicesClient) StartResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), + autorest.ByClosing()) + result.Response = resp + return +} + +// Stop the services resource is the top-level resource that represents the Database Migration Service. This action +// stops the service and the service cannot be used for data migration. The service owner won't be billed when the +// service is stopped. +// Parameters: +// groupName - name of the resource group +// serviceName - name of the service +func (client ServicesClient) Stop(ctx context.Context, groupName string, serviceName string) (result ServicesStopFuture, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ServicesClient.Stop") + defer func() { + sc := -1 + if result.Response() != nil { + sc = result.Response().StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + req, err := client.StopPreparer(ctx, groupName, serviceName) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "Stop", nil, "Failure preparing request") + return + } + + result, err = client.StopSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "Stop", result.Response(), "Failure sending request") + return + } + + return +} + +// StopPreparer prepares the Stop request. +func (client ServicesClient) StopPreparer(ctx context.Context, groupName string, serviceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "groupName": autorest.Encode("path", groupName), + "serviceName": autorest.Encode("path", serviceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/stop", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// StopSender sends the Stop request. The method will close the +// http.Response Body if it receives an error. +func (client ServicesClient) StopSender(req *http.Request) (future ServicesStopFuture, err error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, sd...) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// StopResponder handles the response to the Stop request. The method always +// closes the http.Response Body. +func (client ServicesClient) StopResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), + autorest.ByClosing()) + result.Response = resp + return +} + +// Update the services resource is the top-level resource that represents the Database Migration Service. The PATCH +// method updates an existing service. This method can change the kind, SKU, and network of the service, but if tasks +// are currently running (i.e. the service is busy), this will fail with 400 Bad Request ("ServiceIsBusy"). +// Parameters: +// parameters - information about the service +// groupName - name of the resource group +// serviceName - name of the service +func (client ServicesClient) Update(ctx context.Context, parameters Service, groupName string, serviceName string) (result ServicesUpdateFuture, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ServicesClient.Update") + defer func() { + sc := -1 + if result.Response() != nil { + sc = result.Response().StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + req, err := client.UpdatePreparer(ctx, parameters, groupName, serviceName) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "Update", nil, "Failure preparing request") + return + } + + result, err = client.UpdateSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.ServicesClient", "Update", result.Response(), "Failure sending request") + return + } + + return +} + +// UpdatePreparer prepares the Update request. +func (client ServicesClient) UpdatePreparer(ctx context.Context, parameters Service, groupName string, serviceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "groupName": autorest.Encode("path", groupName), + "serviceName": autorest.Encode("path", serviceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPatch(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// UpdateSender sends the Update request. The method will close the +// http.Response Body if it receives an error. +func (client ServicesClient) UpdateSender(req *http.Request) (future ServicesUpdateFuture, err error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, sd...) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// UpdateResponder handles the response to the Update request. The method always +// closes the http.Response Body. +func (client ServicesClient) UpdateResponder(resp *http.Response) (result Service, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/tasks.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/tasks.go new file mode 100644 index 0000000000000..a6f881c1a01ae --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/tasks.go @@ -0,0 +1,588 @@ +package datamigration + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/tracing" + "net/http" +) + +// TasksClient is the data Migration Client +type TasksClient struct { + BaseClient +} + +// NewTasksClient creates an instance of the TasksClient client. +func NewTasksClient(subscriptionID string) TasksClient { + return NewTasksClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewTasksClientWithBaseURI creates an instance of the TasksClient client. +func NewTasksClientWithBaseURI(baseURI string, subscriptionID string) TasksClient { + return TasksClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// Cancel the tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. This +// method cancels a task if it's currently queued or running. +// Parameters: +// groupName - name of the resource group +// serviceName - name of the service +// projectName - name of the project +// taskName - name of the Task +func (client TasksClient) Cancel(ctx context.Context, groupName string, serviceName string, projectName string, taskName string) (result ProjectTask, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/TasksClient.Cancel") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + req, err := client.CancelPreparer(ctx, groupName, serviceName, projectName, taskName) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.TasksClient", "Cancel", nil, "Failure preparing request") + return + } + + resp, err := client.CancelSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "datamigration.TasksClient", "Cancel", resp, "Failure sending request") + return + } + + result, err = client.CancelResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.TasksClient", "Cancel", resp, "Failure responding to request") + } + + return +} + +// CancelPreparer prepares the Cancel request. +func (client TasksClient) CancelPreparer(ctx context.Context, groupName string, serviceName string, projectName string, taskName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "groupName": autorest.Encode("path", groupName), + "projectName": autorest.Encode("path", projectName), + "serviceName": autorest.Encode("path", serviceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "taskName": autorest.Encode("path", taskName), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/projects/{projectName}/tasks/{taskName}/cancel", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CancelSender sends the Cancel request. The method will close the +// http.Response Body if it receives an error. +func (client TasksClient) CancelSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// CancelResponder handles the response to the Cancel request. The method always +// closes the http.Response Body. +func (client TasksClient) CancelResponder(resp *http.Response) (result ProjectTask, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// CreateOrUpdate the tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. +// The PUT method creates a new task or updates an existing one, although since tasks have no mutable custom +// properties, there is little reason to update an existing one. +// Parameters: +// parameters - information about the task +// groupName - name of the resource group +// serviceName - name of the service +// projectName - name of the project +// taskName - name of the Task +func (client TasksClient) CreateOrUpdate(ctx context.Context, parameters ProjectTask, groupName string, serviceName string, projectName string, taskName string) (result ProjectTask, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/TasksClient.CreateOrUpdate") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + req, err := client.CreateOrUpdatePreparer(ctx, parameters, groupName, serviceName, projectName, taskName) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.TasksClient", "CreateOrUpdate", nil, "Failure preparing request") + return + } + + resp, err := client.CreateOrUpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "datamigration.TasksClient", "CreateOrUpdate", resp, "Failure sending request") + return + } + + result, err = client.CreateOrUpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.TasksClient", "CreateOrUpdate", resp, "Failure responding to request") + } + + return +} + +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client TasksClient) CreateOrUpdatePreparer(ctx context.Context, parameters ProjectTask, groupName string, serviceName string, projectName string, taskName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "groupName": autorest.Encode("path", groupName), + "projectName": autorest.Encode("path", projectName), + "serviceName": autorest.Encode("path", serviceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "taskName": autorest.Encode("path", taskName), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/projects/{projectName}/tasks/{taskName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the +// http.Response Body if it receives an error. +func (client TasksClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always +// closes the http.Response Body. +func (client TasksClient) CreateOrUpdateResponder(resp *http.Response) (result ProjectTask, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Delete the tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The DELETE +// method deletes a task, canceling it first if it's running. +// Parameters: +// groupName - name of the resource group +// serviceName - name of the service +// projectName - name of the project +// taskName - name of the Task +// deleteRunningTasks - delete the resource even if it contains running tasks +func (client TasksClient) Delete(ctx context.Context, groupName string, serviceName string, projectName string, taskName string, deleteRunningTasks *bool) (result autorest.Response, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/TasksClient.Delete") + defer func() { + sc := -1 + if result.Response != nil { + sc = result.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + req, err := client.DeletePreparer(ctx, groupName, serviceName, projectName, taskName, deleteRunningTasks) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.TasksClient", "Delete", nil, "Failure preparing request") + return + } + + resp, err := client.DeleteSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "datamigration.TasksClient", "Delete", resp, "Failure sending request") + return + } + + result, err = client.DeleteResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.TasksClient", "Delete", resp, "Failure responding to request") + } + + return +} + +// DeletePreparer prepares the Delete request. +func (client TasksClient) DeletePreparer(ctx context.Context, groupName string, serviceName string, projectName string, taskName string, deleteRunningTasks *bool) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "groupName": autorest.Encode("path", groupName), + "projectName": autorest.Encode("path", projectName), + "serviceName": autorest.Encode("path", serviceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "taskName": autorest.Encode("path", taskName), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + if deleteRunningTasks != nil { + queryParameters["deleteRunningTasks"] = autorest.Encode("query", *deleteRunningTasks) + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/projects/{projectName}/tasks/{taskName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client TasksClient) DeleteSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client TasksClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// Get the tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The GET +// method retrieves information about a task. +// Parameters: +// groupName - name of the resource group +// serviceName - name of the service +// projectName - name of the project +// taskName - name of the Task +// expand - expand the response +func (client TasksClient) Get(ctx context.Context, groupName string, serviceName string, projectName string, taskName string, expand string) (result ProjectTask, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/TasksClient.Get") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + req, err := client.GetPreparer(ctx, groupName, serviceName, projectName, taskName, expand) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.TasksClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "datamigration.TasksClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.TasksClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client TasksClient) GetPreparer(ctx context.Context, groupName string, serviceName string, projectName string, taskName string, expand string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "groupName": autorest.Encode("path", groupName), + "projectName": autorest.Encode("path", projectName), + "serviceName": autorest.Encode("path", serviceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "taskName": autorest.Encode("path", taskName), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + if len(expand) > 0 { + queryParameters["$expand"] = autorest.Encode("query", expand) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/projects/{projectName}/tasks/{taskName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client TasksClient) GetSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client TasksClient) GetResponder(resp *http.Response) (result ProjectTask, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// List the services resource is the top-level resource that represents the Database Migration Service. This method +// returns a list of tasks owned by a service resource. Some tasks may have a status of Unknown, which indicates that +// an error occurred while querying the status of that task. +// Parameters: +// groupName - name of the resource group +// serviceName - name of the service +// projectName - name of the project +// taskType - filter tasks by task type +func (client TasksClient) List(ctx context.Context, groupName string, serviceName string, projectName string, taskType string) (result TaskListPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/TasksClient.List") + defer func() { + sc := -1 + if result.tl.Response.Response != nil { + sc = result.tl.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.fn = client.listNextResults + req, err := client.ListPreparer(ctx, groupName, serviceName, projectName, taskType) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.TasksClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.tl.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "datamigration.TasksClient", "List", resp, "Failure sending request") + return + } + + result.tl, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.TasksClient", "List", resp, "Failure responding to request") + } + + return +} + +// ListPreparer prepares the List request. +func (client TasksClient) ListPreparer(ctx context.Context, groupName string, serviceName string, projectName string, taskType string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "groupName": autorest.Encode("path", groupName), + "projectName": autorest.Encode("path", projectName), + "serviceName": autorest.Encode("path", serviceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + if len(taskType) > 0 { + queryParameters["taskType"] = autorest.Encode("query", taskType) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/projects/{projectName}/tasks", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client TasksClient) ListSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client TasksClient) ListResponder(resp *http.Response) (result TaskList, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listNextResults retrieves the next set of results, if any. +func (client TasksClient) listNextResults(ctx context.Context, lastResults TaskList) (result TaskList, err error) { + req, err := lastResults.taskListPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "datamigration.TasksClient", "listNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "datamigration.TasksClient", "listNextResults", resp, "Failure sending next results request") + } + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.TasksClient", "listNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListComplete enumerates all values, automatically crossing page boundaries as required. +func (client TasksClient) ListComplete(ctx context.Context, groupName string, serviceName string, projectName string, taskType string) (result TaskListIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/TasksClient.List") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.List(ctx, groupName, serviceName, projectName, taskType) + return +} + +// Update the tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The PATCH +// method updates an existing task, but since tasks have no mutable custom properties, there is little reason to do so. +// Parameters: +// parameters - information about the task +// groupName - name of the resource group +// serviceName - name of the service +// projectName - name of the project +// taskName - name of the Task +func (client TasksClient) Update(ctx context.Context, parameters ProjectTask, groupName string, serviceName string, projectName string, taskName string) (result ProjectTask, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/TasksClient.Update") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + req, err := client.UpdatePreparer(ctx, parameters, groupName, serviceName, projectName, taskName) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.TasksClient", "Update", nil, "Failure preparing request") + return + } + + resp, err := client.UpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "datamigration.TasksClient", "Update", resp, "Failure sending request") + return + } + + result, err = client.UpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.TasksClient", "Update", resp, "Failure responding to request") + } + + return +} + +// UpdatePreparer prepares the Update request. +func (client TasksClient) UpdatePreparer(ctx context.Context, parameters ProjectTask, groupName string, serviceName string, projectName string, taskName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "groupName": autorest.Encode("path", groupName), + "projectName": autorest.Encode("path", projectName), + "serviceName": autorest.Encode("path", serviceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "taskName": autorest.Encode("path", taskName), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPatch(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/projects/{projectName}/tasks/{taskName}", pathParameters), + autorest.WithJSON(parameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// UpdateSender sends the Update request. The method will close the +// http.Response Body if it receives an error. +func (client TasksClient) UpdateSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// UpdateResponder handles the response to the Update request. The method always +// closes the http.Response Body. +func (client TasksClient) UpdateResponder(resp *http.Response) (result ProjectTask, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/usages.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/usages.go new file mode 100644 index 0000000000000..70bfb53cef389 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/usages.go @@ -0,0 +1,154 @@ +package datamigration + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/tracing" + "net/http" +) + +// UsagesClient is the data Migration Client +type UsagesClient struct { + BaseClient +} + +// NewUsagesClient creates an instance of the UsagesClient client. +func NewUsagesClient(subscriptionID string) UsagesClient { + return NewUsagesClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewUsagesClientWithBaseURI creates an instance of the UsagesClient client. +func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient { + return UsagesClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// List this method returns region-specific quotas and resource usage information for the Database Migration Service. +// Parameters: +// location - the Azure region of the operation +func (client UsagesClient) List(ctx context.Context, location string) (result QuotaListPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/UsagesClient.List") + defer func() { + sc := -1 + if result.ql.Response.Response != nil { + sc = result.ql.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.fn = client.listNextResults + req, err := client.ListPreparer(ctx, location) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.UsagesClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.ql.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "datamigration.UsagesClient", "List", resp, "Failure sending request") + return + } + + result.ql, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.UsagesClient", "List", resp, "Failure responding to request") + } + + return +} + +// ListPreparer prepares the List request. +func (client UsagesClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "location": autorest.Encode("path", location), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-04-19" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.DataMigration/locations/{location}/usages", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client UsagesClient) ListSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client UsagesClient) ListResponder(resp *http.Response) (result QuotaList, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listNextResults retrieves the next set of results, if any. +func (client UsagesClient) listNextResults(ctx context.Context, lastResults QuotaList) (result QuotaList, err error) { + req, err := lastResults.quotaListPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "datamigration.UsagesClient", "listNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "datamigration.UsagesClient", "listNextResults", resp, "Failure sending next results request") + } + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "datamigration.UsagesClient", "listNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListComplete enumerates all values, automatically crossing page boundaries as required. +func (client UsagesClient) ListComplete(ctx context.Context, location string) (result QuotaListIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/UsagesClient.List") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.List(ctx, location) + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/version.go new file mode 100644 index 0000000000000..24275905f00c0 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration/version.go @@ -0,0 +1,30 @@ +package datamigration + +import "github.com/Azure/azure-sdk-for-go/version" + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +// UserAgent returns the UserAgent string to use when sending http.Requests. +func UserAgent() string { + return "Azure-SDK-For-Go/" + version.Number + " datamigration/2018-04-19" +} + +// Version returns the semantic version (see http://semver.org) of the client. +func Version() string { + return version.Number +} diff --git a/vendor/modules.txt b/vendor/modules.txt index a39b36a92b584..a09d4b808bd5c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -26,6 +26,7 @@ github.com/Azure/azure-sdk-for-go/services/datafactory/mgmt/2018-06-01/datafacto github.com/Azure/azure-sdk-for-go/services/datalake/analytics/mgmt/2016-11-01/account github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account +github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration github.com/Azure/azure-sdk-for-go/services/devspaces/mgmt/2019-04-01/devspaces github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2016-05-15/dtl github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2018-05-01/dns diff --git a/website/allowed-subcategories b/website/allowed-subcategories index f47257ee534a8..405f97ba144aa 100644 --- a/website/allowed-subcategories +++ b/website/allowed-subcategories @@ -18,6 +18,7 @@ Data Explorer Data Factory Data Lake Database +Database Migration Databricks Dev Test DevSpace diff --git a/website/azurerm.erb b/website/azurerm.erb index 88f177bed221d..124f703c1f8d6 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -162,6 +162,10 @@ azurerm_dns_zone +
        • + azurerm_database_migration_service +
          • +
        • azurerm_data_factory
          • @@ -1182,6 +1186,15 @@
        • +
      • + Database Migration Resources + +
        • +
      • Databricks Resources
          diff --git a/website/docs/d/database_migration_service.html.markdown b/website/docs/d/database_migration_service.html.markdown new file mode 100644 index 0000000000000..dbd79ece59125 --- /dev/null +++ b/website/docs/d/database_migration_service.html.markdown @@ -0,0 +1,58 @@ +--- +subcategory: "Database Migration" +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_database_migration_service" +description: |- + Gets information about an existing Database Migration Service +--- + +# Data Source: azurerm_database_migration_service + +Use this data source to access information about an existing Database Migration Service. + + +## Example Usage + +```hcl +provider "azurerm" { + features {} +} + +data "azurerm_database_migration_service" "example" { + name = "example-dms" + resource_group_name = "example-rg" +} + +output "azurerm_dms_id" { + value = "${data.azurerm_database_migration_service.example.id}" +} +``` + + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) Specify the name of the database migration service. + +* `resource_group_name` - (Required) Specifies the Name of the Resource Group within which the database migration service exists + +## Attributes Reference + +The following attributes are exported: + +* `id` - The ID of Database Migration Service. + +* `location` - Azure location where the resource exists. + +* `subnet_id` - The ID of the virtual subnet resource to which the database migration service exists. + +* `sku_name` - The sku name of database migration service. + +* `tags` - A mapping of tags to assigned to the resource. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: + +* `read` - (Defaults to 5 minutes) Used when retrieving the API Management API. diff --git a/website/docs/r/database_migration_service.html.markdown b/website/docs/r/database_migration_service.html.markdown new file mode 100644 index 0000000000000..da0ab9bd0bc43 --- /dev/null +++ b/website/docs/r/database_migration_service.html.markdown @@ -0,0 +1,87 @@ +--- +subcategory: "Database Migration" +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_database_migration_service" +description: |- + Manage a Azure Database Migration Service. +--- + +# azurerm_database_migration_service + +Manages a Azure Database Migration Service. + +~> **NOTE:** Destroying a Database Migration Service will leave any outstanding tasks untouched. This is to avoid unexpectedly deleting any tasks managed outside of terraform. + +## Example Usage + +```hcl +provider "azurerm" { + features {} +} + +resource "azurerm_resource_group" "example" { + name = "example-rg" + location = "West Europe" +} + +resource "azurerm_virtual_network" "example" { + name = "example-vnet" + address_space = ["10.0.0.0/16"] + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name +} + +resource "azurerm_subnet" "example" { + name = "example-subnet" + resource_group_name = azurerm_resource_group.example.name + virtual_network_name = azurerm_virtual_network.example.name + address_prefix = "10.0.1.0/24" +} + +resource "azurerm_database_migration_service" "example" { + name = "example-dms" + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name + subnet_id = azurerm_subnet.example.id + sku_name = "Standard_1vCores" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) Specify the name of the database migration service. Changing this forces a new resource to be created. + +* `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. + +* `resource_group_name` - (Required) Name of the resource group in which to create the database migration service. Changing this forces a new resource to be created. + +* `subnet_id` - (Required) The ID of the virtual subnet resource to which the database migration service should be joined. Changing this forces a new resource to be created. + +* `sku_name` - (Required) The sku name of the database migration service. Possible values are `Premium_4vCores`, `Standard_1vCores`, `Standard_2vCores` and `Standard_4vCores`. Changing this forces a new resource to be created. + +* `tags` - (Optional) A mapping of tags to assigned to the resource. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The ID of Database Migration Service. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: + +* `create` - (Defaults to 30 minutes) Used when creating the API Management API. +* `update` - (Defaults to 30 minutes) Used when updating the API Management API. +* `read` - (Defaults to 5 minutes) Used when retrieving the API Management API. +* `delete` - (Defaults to 30 minutes) Used when deleting the API Management API. + +## Import + +Database Migration Services can be imported using the `resource id`, e.g. + +```shell +$ terraform import azurerm_database_migration_service.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/example-rg/providers/Microsoft.DataMigration/services/database_migration_service1 +``` From fa7b9eb4af84d8e308037133294f55426fd1f712 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 4 Mar 2020 15:09:14 -0800 Subject: [PATCH 455/498] Update CHANGELOG.mdto include #5258 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed8244ab61cec..661ad5b1ce481 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,10 @@ FEATURES: +* **New Data Source:** `azurerm_data_migration_service` [GH-5258] * **New Data Source:** `azurerm_kusto_cluster` [GH-5942] * **New Resource:** `azurerm_bot_channel_directline` [GH-5445] +* **New Resource:** `azurerm_data_migration_service` [GH-5258] * **New Resource:** `azurerm_monitor_scheduled_query_rules_alert` [GH-5053] * **New Resource:** `azurerm_monitor_scheduled_query_rules_log` [GH-5053] From 89b04b0da3a8606c8b8a632849d6febf8a2fa2b8 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 4 Mar 2020 18:22:49 -0800 Subject: [PATCH 456/498] Update to reflect batch API version change in #5967 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 661ad5b1ce481..b3690242d0c95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ FEATURES: IMPROVEMENTS: +batch: upgrading to API version `2019-08-01` [GH-5967] * `azurerm_application_gateway` - support up to `125` for the `capacity` property with V2 SKU's [GH-5906] * `azurerm_automation_dsc_configuration` - support for the `tags` property [GH-5827] * `azurerm_batch_pool` - support for the `public_ips` property [GH-5967] @@ -41,7 +42,6 @@ BUG FIXES: * `azurerm_search_service` - changing the properties `replica_count` & `partition_count` properties no longer force a new resource [GH-5935] * `azurerm_app_service_plan` - Updates no longer fail if App Service Environment ID is not specified [GH-5915] - ## 2.0.0 (February 24, 2020) NOTES: From 740af4514cdf74877244e0d5dbe59a8994403b87 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 4 Mar 2020 18:25:03 -0800 Subject: [PATCH 457/498] azurerm_netapp_volume - support NFSv4.1, vol sizing issue (#5485) Hi Terraform team, I'm part of Azure NetApp team at Microsoft and I'm providing this PR that adds support for NFSv4.1 since we have a partner that needs this support to work internally and with their own customers. This is a summary of changes I made: - Bumped up the ANF's Go SDK version to the latest (2019-10-01) - Implemented an attribute name change for the ExportPolicyRule that got renamed to Nfsv41 since api version 2019-07-01 and applied the same renaming concept to Go's own object properties to avoid confusion. - Implemented the property called protocol_types as additional volume property since this is the one that controls what protocol the volume will support (it is defined as a list following our API definition but only one is supported) and included validation. - Implemented some changes on Tests so we can check if a NFSv4.1 volume gets created, plus testing for NFSv3 value on basic volume test - Stepped down the ServiceLevel from Premium to Standard on Tests so developer incur in less costs while working on ANF resource. - Fixed a bug related to volume size that was limiting a volume to 4TB while the correct maximum size is 100TB. --- .../internal/services/netapp/client/client.go | 2 +- .../netapp/data_source_netapp_volume.go | 12 + .../netapp/resource_arm_netapp_account.go | 2 +- .../netapp/resource_arm_netapp_pool.go | 2 +- .../netapp/resource_arm_netapp_snapshot.go | 2 +- .../netapp/resource_arm_netapp_volume.go | 142 ++++-- .../tests/data_source_netapp_volume_test.go | 1 + .../tests/resource_arm_netapp_pool_test.go | 4 +- .../resource_arm_netapp_snapshot_test.go | 2 + .../tests/resource_arm_netapp_volume_test.go | 106 +++- examples/netapp/volume/main.tf | 13 + go.sum | 2 +- .../netapp/accounts.go | 12 +- .../netapp/mgmt/2019-10-01/netapp/client.go | 51 ++ .../netapp/models.go | 182 ++++++- .../netapp/mounttargets.go | 2 +- .../netapp/operations.go | 2 +- .../netapp/pools.go | 10 +- .../netapp/resource.go} | 72 ++- .../netapp/snapshots.go | 10 +- .../netapp/version.go | 2 +- .../netapp/volumes.go | 460 +++++++++++++++++- vendor/modules.txt | 2 +- website/docs/r/netapp_volume.html.markdown | 17 +- 24 files changed, 958 insertions(+), 154 deletions(-) rename vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/{2019-06-01 => 2019-10-01}/netapp/accounts.go (99%) create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/client.go rename vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/{2019-06-01 => 2019-10-01}/netapp/models.go (88%) rename vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/{2019-06-01 => 2019-10-01}/netapp/mounttargets.go (99%) rename vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/{2019-06-01 => 2019-10-01}/netapp/operations.go (99%) rename vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/{2019-06-01 => 2019-10-01}/netapp/pools.go (99%) rename vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/{2019-06-01/netapp/client.go => 2019-10-01/netapp/resource.go} (69%) rename vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/{2019-06-01 => 2019-10-01}/netapp/snapshots.go (99%) rename vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/{2019-06-01 => 2019-10-01}/netapp/version.go (94%) rename vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/{2019-06-01 => 2019-10-01}/netapp/volumes.go (52%) diff --git a/azurerm/internal/services/netapp/client/client.go b/azurerm/internal/services/netapp/client/client.go index cc0127c118bb2..fdffa5a2214d4 100644 --- a/azurerm/internal/services/netapp/client/client.go +++ b/azurerm/internal/services/netapp/client/client.go @@ -1,7 +1,7 @@ package client import ( - "github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp" + "github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common" ) diff --git a/azurerm/internal/services/netapp/data_source_netapp_volume.go b/azurerm/internal/services/netapp/data_source_netapp_volume.go index 5a55474e19bf0..3cb9929de84cd 100644 --- a/azurerm/internal/services/netapp/data_source_netapp_volume.go +++ b/azurerm/internal/services/netapp/data_source_netapp_volume.go @@ -61,6 +61,12 @@ func dataSourceArmNetAppVolume() *schema.Resource { Type: schema.TypeInt, Computed: true, }, + + "protocols": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, }, } } @@ -101,6 +107,12 @@ func dataSourceArmNetAppVolumeRead(d *schema.ResourceData, meta interface{}) err d.Set("service_level", props.ServiceLevel) d.Set("subnet_id", props.SubnetID) + protocolTypes := make([]string, 0) + if prtclTypes := props.ProtocolTypes; prtclTypes != nil { + protocolTypes = append(protocolTypes, *prtclTypes...) + } + d.Set("protocols", protocolTypes) + if props.UsageThreshold != nil { d.Set("storage_quota_in_gb", *props.UsageThreshold/1073741824) } diff --git a/azurerm/internal/services/netapp/resource_arm_netapp_account.go b/azurerm/internal/services/netapp/resource_arm_netapp_account.go index 168d9ff80cbe7..13a5e3bea09f6 100644 --- a/azurerm/internal/services/netapp/resource_arm_netapp_account.go +++ b/azurerm/internal/services/netapp/resource_arm_netapp_account.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp" + "github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp" "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" diff --git a/azurerm/internal/services/netapp/resource_arm_netapp_pool.go b/azurerm/internal/services/netapp/resource_arm_netapp_pool.go index 9c898e8f78d1a..418df5a96d02a 100644 --- a/azurerm/internal/services/netapp/resource_arm_netapp_pool.go +++ b/azurerm/internal/services/netapp/resource_arm_netapp_pool.go @@ -7,7 +7,7 @@ import ( "strconv" "time" - "github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp" + "github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" diff --git a/azurerm/internal/services/netapp/resource_arm_netapp_snapshot.go b/azurerm/internal/services/netapp/resource_arm_netapp_snapshot.go index a8599b9e1e9a9..dc8e0d3152f3f 100644 --- a/azurerm/internal/services/netapp/resource_arm_netapp_snapshot.go +++ b/azurerm/internal/services/netapp/resource_arm_netapp_snapshot.go @@ -5,7 +5,7 @@ import ( "log" "time" - "github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp" + "github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp" "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" diff --git a/azurerm/internal/services/netapp/resource_arm_netapp_volume.go b/azurerm/internal/services/netapp/resource_arm_netapp_volume.go index e795aadd9b646..a1c4fca422f87 100644 --- a/azurerm/internal/services/netapp/resource_arm_netapp_volume.go +++ b/azurerm/internal/services/netapp/resource_arm_netapp_volume.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp" + "github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" @@ -36,7 +36,7 @@ func resourceArmNetAppVolume() *schema.Resource { Create: schema.DefaultTimeout(30 * time.Minute), Read: schema.DefaultTimeout(5 * time.Minute), Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), + Delete: schema.DefaultTimeout(60 * time.Minute), }, Schema: map[string]*schema.Schema{ @@ -75,6 +75,7 @@ func resourceArmNetAppVolume() *schema.Resource { "service_level": { Type: schema.TypeString, Required: true, + ForceNew: true, ValidateFunc: validation.StringInSlice([]string{ string(netapp.Premium), string(netapp.Standard), @@ -89,6 +90,20 @@ func resourceArmNetAppVolume() *schema.Resource { ValidateFunc: azure.ValidateResourceID, }, + "protocols": { + Type: schema.TypeSet, + ForceNew: true, + Optional: true, + Computed: true, + MaxItems: 2, + Elem: &schema.Schema{Type: schema.TypeString, + ValidateFunc: validation.StringInSlice([]string{ + "NFSv3", + "NFSv4.1", + "CIFS", + }, false)}, + }, + "storage_quota_in_gb": { Type: schema.TypeInt, Required: true, @@ -96,7 +111,7 @@ func resourceArmNetAppVolume() *schema.Resource { }, "export_policy_rule": { - Type: schema.TypeSet, + Type: schema.TypeList, Optional: true, MaxItems: 5, Elem: &schema.Resource{ @@ -106,6 +121,7 @@ func resourceArmNetAppVolume() *schema.Resource { Required: true, ValidateFunc: validation.IntBetween(1, 5), }, + "allowed_clients": { Type: schema.TypeSet, Required: true, @@ -114,22 +130,47 @@ func resourceArmNetAppVolume() *schema.Resource { ValidateFunc: validate.CIDR, }, }, + + "protocols_enabled": { + Type: schema.TypeList, + Optional: true, + Computed: true, + MaxItems: 1, + MinItems: 1, + Elem: &schema.Schema{Type: schema.TypeString, + ValidateFunc: validation.StringInSlice([]string{ + "NFSv3", + "NFSv4.1", + "CIFS", + }, false)}, + }, + "cifs_enabled": { - Type: schema.TypeBool, - Required: true, + Type: schema.TypeBool, + Optional: true, + Computed: true, + Deprecated: "Deprecated in favor of `protocols_enabled`", }, + "nfsv3_enabled": { - Type: schema.TypeBool, - Required: true, + Type: schema.TypeBool, + Optional: true, + Computed: true, + Deprecated: "Deprecated in favor of `protocols_enabled`", }, + "nfsv4_enabled": { - Type: schema.TypeBool, - Required: true, + Type: schema.TypeBool, + Optional: true, + Computed: true, + Deprecated: "Deprecated in favor of `protocols_enabled`", }, + "unix_read_only": { Type: schema.TypeBool, Optional: true, }, + "unix_read_write": { Type: schema.TypeBool, Optional: true, @@ -167,8 +208,13 @@ func resourceArmNetAppVolumeCreateUpdate(d *schema.ResourceData, meta interface{ volumePath := d.Get("volume_path").(string) serviceLevel := d.Get("service_level").(string) subnetId := d.Get("subnet_id").(string) + protocols := d.Get("protocols").(*schema.Set).List() + if len(protocols) == 0 { + protocols = append(protocols, "NFSv3") + } + storageQuotaInGB := int64(d.Get("storage_quota_in_gb").(int) * 1073741824) - exportPolicyRule := d.Get("export_policy_rule").(*schema.Set).List() + exportPolicyRule := d.Get("export_policy_rule").([]interface{}) parameters := netapp.Volume{ Location: utils.String(location), @@ -176,6 +222,7 @@ func resourceArmNetAppVolumeCreateUpdate(d *schema.ResourceData, meta interface{ CreationToken: utils.String(volumePath), ServiceLevel: netapp.ServiceLevel(serviceLevel), SubnetID: utils.String(subnetId), + ProtocolTypes: utils.ExpandStringSlice(protocols), UsageThreshold: utils.Int64(storageQuotaInGB), ExportPolicy: expandArmNetAppVolumeExportPolicyRule(exportPolicyRule), }, @@ -236,7 +283,7 @@ func resourceArmNetAppVolumeRead(d *schema.ResourceData, meta interface{}) error d.Set("volume_path", props.CreationToken) d.Set("service_level", props.ServiceLevel) d.Set("subnet_id", props.SubnetID) - + d.Set("protocols", props.ProtocolTypes) if props.UsageThreshold != nil { d.Set("storage_quota_in_gb", *props.UsageThreshold/1073741824) } @@ -310,9 +357,34 @@ func expandArmNetAppVolumeExportPolicyRule(input []interface{}) *netapp.VolumePr v := item.(map[string]interface{}) ruleIndex := int32(v["rule_index"].(int)) allowedClients := strings.Join(*utils.ExpandStringSlice(v["allowed_clients"].(*schema.Set).List()), ",") - cifsEnabled := v["cifs_enabled"].(bool) - nfsv3Enabled := v["nfsv3_enabled"].(bool) - nfsv4Enabled := v["nfsv4_enabled"].(bool) + + cifsEnabled := false + nfsv3Enabled := false + nfsv41Enabled := false + + if vpe := v["protocols_enabled"]; vpe != nil { + protocolsEnabled := vpe.([]interface{}) + if len(protocolsEnabled) != 0 { + for _, protocol := range protocolsEnabled { + if protocol != nil { + switch strings.ToLower(protocol.(string)) { + case "cifs": + cifsEnabled = true + case "nfsv3": + nfsv3Enabled = true + case "nfsv4.1": + nfsv41Enabled = true + } + } + } + } else { + // TODO: Remove in next major version + cifsEnabled = v["cifs_enabled"].(bool) + nfsv3Enabled = v["nfsv3_enabled"].(bool) + nfsv41Enabled = v["nfsv4_enabled"].(bool) + } + } + unixReadOnly := v["unix_read_only"].(bool) unixReadWrite := v["unix_read_write"].(bool) @@ -320,7 +392,7 @@ func expandArmNetAppVolumeExportPolicyRule(input []interface{}) *netapp.VolumePr AllowedClients: utils.String(allowedClients), Cifs: utils.Bool(cifsEnabled), Nfsv3: utils.Bool(nfsv3Enabled), - Nfsv4: utils.Bool(nfsv4Enabled), + Nfsv41: utils.Bool(nfsv41Enabled), RuleIndex: utils.Int32(ruleIndex), UnixReadOnly: utils.Bool(unixReadOnly), UnixReadWrite: utils.Bool(unixReadWrite), @@ -350,17 +422,29 @@ func flattenArmNetAppVolumeExportPolicyRule(input *netapp.VolumePropertiesExport if v := item.AllowedClients; v != nil { allowedClients = strings.Split(*v, ",") } + //TODO: Start - Remove in next major version cifsEnabled := false + nfsv3Enabled := false + nfsv4Enabled := false + // End - Remove in next major version + protocolsEnabled := []string{} if v := item.Cifs; v != nil { - cifsEnabled = *v + if *v { + protocolsEnabled = append(protocolsEnabled, "CIFS") + } + cifsEnabled = *v //TODO: Remove in next major version } - nfsv3Enabled := false if v := item.Nfsv3; v != nil { - nfsv3Enabled = *v + if *v { + protocolsEnabled = append(protocolsEnabled, "NFSv3") + } + nfsv3Enabled = *v //TODO: Remove in next major version } - nfsv4Enabled := false - if v := item.Nfsv4; v != nil { - nfsv4Enabled = *v + if v := item.Nfsv41; v != nil { + if *v { + protocolsEnabled = append(protocolsEnabled, "NFSv4.1") + } + nfsv4Enabled = *v //TODO: Remove in next major version } unixReadOnly := false if v := item.UnixReadOnly; v != nil { @@ -372,13 +456,15 @@ func flattenArmNetAppVolumeExportPolicyRule(input *netapp.VolumePropertiesExport } results = append(results, map[string]interface{}{ - "rule_index": ruleIndex, - "allowed_clients": utils.FlattenStringSlice(&allowedClients), - "cifs_enabled": cifsEnabled, - "nfsv3_enabled": nfsv3Enabled, - "nfsv4_enabled": nfsv4Enabled, - "unix_read_only": unixReadOnly, - "unix_read_write": unixReadWrite, + "rule_index": ruleIndex, + "allowed_clients": utils.FlattenStringSlice(&allowedClients), + "unix_read_only": unixReadOnly, + "unix_read_write": unixReadWrite, + "protocols_enabled": utils.FlattenStringSlice(&protocolsEnabled), + //TODO: Remove in next major version + "cifs_enabled": cifsEnabled, + "nfsv3_enabled": nfsv3Enabled, + "nfsv4_enabled": nfsv4Enabled, }) } diff --git a/azurerm/internal/services/netapp/tests/data_source_netapp_volume_test.go b/azurerm/internal/services/netapp/tests/data_source_netapp_volume_test.go index be51ace2b8762..3429d7fe785eb 100644 --- a/azurerm/internal/services/netapp/tests/data_source_netapp_volume_test.go +++ b/azurerm/internal/services/netapp/tests/data_source_netapp_volume_test.go @@ -22,6 +22,7 @@ func TestAccDataSourceAzureRMNetAppVolume_basic(t *testing.T) { resource.TestCheckResourceAttrSet(data.ResourceName, "service_level"), resource.TestCheckResourceAttrSet(data.ResourceName, "subnet_id"), resource.TestCheckResourceAttrSet(data.ResourceName, "storage_quota_in_gb"), + resource.TestCheckResourceAttrSet(data.ResourceName, "protocols.0"), ), }, }, diff --git a/azurerm/internal/services/netapp/tests/resource_arm_netapp_pool_test.go b/azurerm/internal/services/netapp/tests/resource_arm_netapp_pool_test.go index b2badb749a2f6..a0104f0588a1c 100644 --- a/azurerm/internal/services/netapp/tests/resource_arm_netapp_pool_test.go +++ b/azurerm/internal/services/netapp/tests/resource_arm_netapp_pool_test.go @@ -91,7 +91,7 @@ func TestAccAzureRMNetAppPool_update(t *testing.T) { Config: testAccAzureRMNetAppPool_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetAppPoolExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "service_level", "Premium"), + resource.TestCheckResourceAttr(data.ResourceName, "service_level", "Standard"), resource.TestCheckResourceAttr(data.ResourceName, "size_in_tb", "4"), ), }, @@ -181,7 +181,7 @@ resource "azurerm_netapp_pool" "test" { account_name = azurerm_netapp_account.test.name location = azurerm_resource_group.test.location resource_group_name = azurerm_resource_group.test.name - service_level = "Premium" + service_level = "Standard" size_in_tb = 4 } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) diff --git a/azurerm/internal/services/netapp/tests/resource_arm_netapp_snapshot_test.go b/azurerm/internal/services/netapp/tests/resource_arm_netapp_snapshot_test.go index e8d63f8a0965a..bf598137a7a27 100644 --- a/azurerm/internal/services/netapp/tests/resource_arm_netapp_snapshot_test.go +++ b/azurerm/internal/services/netapp/tests/resource_arm_netapp_snapshot_test.go @@ -222,8 +222,10 @@ resource "azurerm_subnet" "update" { resource_group_name = azurerm_resource_group.test.name virtual_network_name = azurerm_virtual_network.update.name address_prefix = "10.0.2.0/24" + delegation { name = "netapp" + service_delegation { name = "Microsoft.Netapp/volumes" actions = ["Microsoft.Network/networkinterfaces/*", "Microsoft.Network/virtualNetworks/subnets/join/action"] diff --git a/azurerm/internal/services/netapp/tests/resource_arm_netapp_volume_test.go b/azurerm/internal/services/netapp/tests/resource_arm_netapp_volume_test.go index 188e22ae084bc..8c3bae1720e59 100644 --- a/azurerm/internal/services/netapp/tests/resource_arm_netapp_volume_test.go +++ b/azurerm/internal/services/netapp/tests/resource_arm_netapp_volume_test.go @@ -25,6 +25,27 @@ func TestAccAzureRMNetAppVolume_basic(t *testing.T) { Config: testAccAzureRMNetAppVolume_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetAppVolumeExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "protocols.2676449260", "NFSv3"), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMNetAppVolume_nfsv41(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_netapp_volume", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMNetAppVolumeDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMNetAppVolume_nfsv41(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetAppVolumeExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "protocols.3098200649", "NFSv4.1"), ), }, data.ImportStep(), @@ -71,9 +92,9 @@ func TestAccAzureRMNetAppVolume_complete(t *testing.T) { Config: testAccAzureRMNetAppVolume_complete(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetAppVolumeExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "service_level", "Premium"), + resource.TestCheckResourceAttr(data.ResourceName, "service_level", "Standard"), resource.TestCheckResourceAttr(data.ResourceName, "storage_quota_in_gb", "101"), - resource.TestCheckResourceAttr(data.ResourceName, "export_policy_rule.#", "2"), + resource.TestCheckResourceAttr(data.ResourceName, "export_policy_rule.#", "3"), ), }, data.ImportStep(), @@ -103,7 +124,7 @@ func TestAccAzureRMNetAppVolume_update(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetAppVolumeExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "storage_quota_in_gb", "101"), - resource.TestCheckResourceAttr(data.ResourceName, "export_policy_rule.#", "2"), + resource.TestCheckResourceAttr(data.ResourceName, "export_policy_rule.#", "3"), ), }, data.ImportStep(), @@ -170,7 +191,7 @@ func TestAccAzureRMNetAppVolume_updateExportPolicyRule(t *testing.T) { Config: testAccAzureRMNetAppVolume_complete(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetAppVolumeExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "export_policy_rule.#", "2"), + resource.TestCheckResourceAttr(data.ResourceName, "export_policy_rule.#", "3"), ), }, data.ImportStep(), @@ -250,13 +271,41 @@ resource "azurerm_netapp_volume" "test" { account_name = azurerm_netapp_account.test.name pool_name = azurerm_netapp_pool.test.name volume_path = "my-unique-file-path-%d" - service_level = "Premium" + service_level = "Standard" subnet_id = azurerm_subnet.test.id storage_quota_in_gb = 100 } `, template, data.RandomInteger, data.RandomInteger) } +func testAccAzureRMNetAppVolume_nfsv41(data acceptance.TestData) string { + template := testAccAzureRMNetAppVolume_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_netapp_volume" "test" { + name = "acctest-NetAppVolume-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + account_name = "${azurerm_netapp_account.test.name}" + pool_name = "${azurerm_netapp_pool.test.name}" + volume_path = "my-unique-file-path-%d" + service_level = "Standard" + subnet_id = "${azurerm_subnet.test.id}" + protocols = ["NFSv4.1"] + storage_quota_in_gb = 100 + + export_policy_rule { + rule_index = 1 + allowed_clients = ["1.2.3.0/24"] + protocols_enabled = ["NFSv4.1"] + unix_read_only = false + unix_read_write = true + } +} +`, template, data.RandomInteger, data.RandomInteger) +} + func testAccAzureRMNetAppVolume_requiresImport(data acceptance.TestData) string { return fmt.Sprintf(` %s @@ -280,24 +329,31 @@ resource "azurerm_netapp_volume" "test" { resource_group_name = azurerm_resource_group.test.name account_name = azurerm_netapp_account.test.name pool_name = azurerm_netapp_pool.test.name - service_level = "Premium" + service_level = "Standard" volume_path = "my-unique-file-path-%d" subnet_id = azurerm_subnet.test.id + protocols = ["NFSv3"] storage_quota_in_gb = 101 export_policy_rule { - rule_index = 1 - allowed_clients = ["1.2.3.0/24"] - cifs_enabled = false - nfsv3_enabled = true - nfsv4_enabled = false - unix_read_only = false - unix_read_write = true + rule_index = 1 + allowed_clients = ["1.2.3.0/24"] + protocols_enabled = ["NFSv3"] + unix_read_only = false + unix_read_write = true + } + + export_policy_rule { + rule_index = 2 + allowed_clients = ["1.2.5.0"] + protocols_enabled = ["NFSv3"] + unix_read_only = true + unix_read_write = false } export_policy_rule { - rule_index = 2 - allowed_clients = ["1.2.5.0"] + rule_index = 3 + allowed_clients = ["1.2.6.0/24"] cifs_enabled = false nfsv3_enabled = true nfsv4_enabled = false @@ -343,8 +399,9 @@ resource "azurerm_netapp_volume" "test" { account_name = azurerm_netapp_account.test.name pool_name = azurerm_netapp_pool.test.name volume_path = "my-updated-unique-file-path-%d" - service_level = "Premium" + service_level = "Standard" subnet_id = azurerm_subnet.updated.id + protocols = ["NFSv3"] storage_quota_in_gb = 100 } `, template, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) @@ -361,19 +418,18 @@ resource "azurerm_netapp_volume" "test" { resource_group_name = azurerm_resource_group.test.name account_name = azurerm_netapp_account.test.name pool_name = azurerm_netapp_pool.test.name - service_level = "Premium" + service_level = "Standard" volume_path = "my-unique-file-path-%d" subnet_id = azurerm_subnet.test.id + protocols = ["NFSv3"] storage_quota_in_gb = 101 export_policy_rule { - rule_index = 1 - allowed_clients = ["1.2.4.0/24", "1.3.4.0"] - cifs_enabled = false - nfsv3_enabled = true - nfsv4_enabled = false - unix_read_only = false - unix_read_write = true + rule_index = 1 + allowed_clients = ["1.2.4.0/24", "1.3.4.0"] + protocols_enabled = ["NFSv3"] + unix_read_only = false + unix_read_write = true } } `, template, data.RandomInteger, data.RandomInteger) @@ -424,7 +480,7 @@ resource "azurerm_netapp_pool" "test" { location = azurerm_resource_group.test.location resource_group_name = azurerm_resource_group.test.name account_name = azurerm_netapp_account.test.name - service_level = "Premium" + service_level = "Standard" size_in_tb = 4 } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) diff --git a/examples/netapp/volume/main.tf b/examples/netapp/volume/main.tf index dd1883b3aff7d..372255e0ee8bc 100644 --- a/examples/netapp/volume/main.tf +++ b/examples/netapp/volume/main.tf @@ -46,6 +46,10 @@ resource "azurerm_netapp_pool" "example" { } resource "azurerm_netapp_volume" "example" { + lifecycle { + prevent_destroy = true + } + name = "${var.prefix}-netappvolume" location = "${azurerm_resource_group.example.location}" resource_group_name = "${azurerm_resource_group.example.name}" @@ -54,5 +58,14 @@ resource "azurerm_netapp_volume" "example" { volume_path = "my-unique-file-path" service_level = "Premium" subnet_id = "${azurerm_subnet.example.id}" + protocols = ["NFSv4.1"] storage_quota_in_gb = 100 + + export_policy_rule { + rule_index = 1 + allowed_clients = ["0.0.0.0/0"] + protocols_enabled = ["NFSv4.1"] + unix_read_only = false + unix_read_write = true + } } diff --git a/go.sum b/go.sum index e9d9fd7f47e2b..96d963fc8f0ff 100644 --- a/go.sum +++ b/go.sum @@ -463,4 +463,4 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= \ No newline at end of file diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/accounts.go b/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/accounts.go similarity index 99% rename from vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/accounts.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/accounts.go index 982b13e95a8f6..00f10b69d6f54 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/accounts.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/accounts.go @@ -90,7 +90,7 @@ func (client AccountsClient) CreateOrUpdatePreparer(ctx context.Context, body Ac "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -180,7 +180,7 @@ func (client AccountsClient) DeletePreparer(ctx context.Context, resourceGroupNa "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -270,7 +270,7 @@ func (client AccountsClient) GetPreparer(ctx context.Context, resourceGroupName "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -303,7 +303,7 @@ func (client AccountsClient) GetResponder(resp *http.Response) (result Account, return } -// List list and describe all NetApp accounts in the resource group +// List list and describe all NetApp accounts in the resource group. // Parameters: // resourceGroupName - the name of the resource group. func (client AccountsClient) List(ctx context.Context, resourceGroupName string) (result AccountList, err error) { @@ -353,7 +353,7 @@ func (client AccountsClient) ListPreparer(ctx context.Context, resourceGroupName "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -439,7 +439,7 @@ func (client AccountsClient) UpdatePreparer(ctx context.Context, body AccountPat "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/client.go new file mode 100644 index 0000000000000..0dfd8925e16e6 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/client.go @@ -0,0 +1,51 @@ +// Package netapp implements the Azure ARM Netapp service API version 2019-10-01. +// +// Microsoft NetApp Azure Resource Provider specification +package netapp + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "github.com/Azure/go-autorest/autorest" +) + +const ( + // DefaultBaseURI is the default URI used for the service Netapp + DefaultBaseURI = "https://management.azure.com" +) + +// BaseClient is the base client for Netapp. +type BaseClient struct { + autorest.Client + BaseURI string + SubscriptionID string +} + +// New creates an instance of the BaseClient client. +func New(subscriptionID string) BaseClient { + return NewWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewWithBaseURI creates an instance of the BaseClient client. +func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { + return BaseClient{ + Client: autorest.NewClientWithUserAgent(UserAgent()), + BaseURI: baseURI, + SubscriptionID: subscriptionID, + } +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/models.go similarity index 88% rename from vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/models.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/models.go index e9c28731811f6..e7f905978a96f 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/models.go @@ -27,7 +27,7 @@ import ( ) // The package's fully qualified name. -const fqdn = "github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp" +const fqdn = "github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp" // CheckNameResourceTypes enumerates the values for check name resource types. type CheckNameResourceTypes string @@ -48,6 +48,21 @@ func PossibleCheckNameResourceTypesValues() []CheckNameResourceTypes { return []CheckNameResourceTypes{MicrosoftNetAppnetAppAccounts, MicrosoftNetAppnetAppAccountscapacityPools, MicrosoftNetAppnetAppAccountscapacityPoolsvolumes, MicrosoftNetAppnetAppAccountscapacityPoolsvolumessnapshots} } +// EndpointType enumerates the values for endpoint type. +type EndpointType string + +const ( + // Dst ... + Dst EndpointType = "dst" + // Src ... + Src EndpointType = "src" +) + +// PossibleEndpointTypeValues returns an array of possible values for the EndpointType const type. +func PossibleEndpointTypeValues() []EndpointType { + return []EndpointType{Dst, Src} +} + // InAvailabilityReasonType enumerates the values for in availability reason type. type InAvailabilityReasonType string @@ -63,6 +78,59 @@ func PossibleInAvailabilityReasonTypeValues() []InAvailabilityReasonType { return []InAvailabilityReasonType{AlreadyExists, Invalid} } +// MirrorState enumerates the values for mirror state. +type MirrorState string + +const ( + // Broken ... + Broken MirrorState = "Broken" + // Mirrored ... + Mirrored MirrorState = "Mirrored" + // Uninitialized ... + Uninitialized MirrorState = "Uninitialized" +) + +// PossibleMirrorStateValues returns an array of possible values for the MirrorState const type. +func PossibleMirrorStateValues() []MirrorState { + return []MirrorState{Broken, Mirrored, Uninitialized} +} + +// RelationshipStatus enumerates the values for relationship status. +type RelationshipStatus string + +const ( + // Idle ... + Idle RelationshipStatus = "Idle" + // Transferring ... + Transferring RelationshipStatus = "Transferring" +) + +// PossibleRelationshipStatusValues returns an array of possible values for the RelationshipStatus const type. +func PossibleRelationshipStatusValues() []RelationshipStatus { + return []RelationshipStatus{Idle, Transferring} +} + +// ReplicationSchedule enumerates the values for replication schedule. +type ReplicationSchedule string + +const ( + // OneZerominutely ... + OneZerominutely ReplicationSchedule = "_10minutely" + // Daily ... + Daily ReplicationSchedule = "daily" + // Hourly ... + Hourly ReplicationSchedule = "hourly" + // Monthly ... + Monthly ReplicationSchedule = "monthly" + // Weekly ... + Weekly ReplicationSchedule = "weekly" +) + +// PossibleReplicationScheduleValues returns an array of possible values for the ReplicationSchedule const type. +func PossibleReplicationScheduleValues() []ReplicationSchedule { + return []ReplicationSchedule{OneZerominutely, Daily, Hourly, Monthly, Weekly} +} + // ServiceLevel enumerates the values for service level. type ServiceLevel string @@ -92,7 +160,7 @@ type Account struct { // Type - READ-ONLY; Resource type Type *string `json:"type,omitempty"` // Tags - Resource tags - Tags interface{} `json:"tags,omitempty"` + Tags map[string]*string `json:"tags"` // AccountProperties - NetApp Account properties *AccountProperties `json:"properties,omitempty"` } @@ -159,7 +227,7 @@ func (a *Account) UnmarshalJSON(body []byte) error { } case "tags": if v != nil { - var tags interface{} + var tags map[string]*string err = json.Unmarshal(*v, &tags) if err != nil { return err @@ -199,7 +267,7 @@ type AccountPatch struct { // Type - READ-ONLY; Resource type Type *string `json:"type,omitempty"` // Tags - Resource tags - Tags interface{} `json:"tags,omitempty"` + Tags map[string]*string `json:"tags"` // AccountProperties - NetApp Account properties *AccountProperties `json:"properties,omitempty"` } @@ -266,7 +334,7 @@ func (ap *AccountPatch) UnmarshalJSON(body []byte) error { } case "tags": if v != nil { - var tags interface{} + var tags map[string]*string err = json.Unmarshal(*v, &tags) if err != nil { return err @@ -358,7 +426,7 @@ type ActiveDirectory struct { Password *string `json:"password,omitempty"` // Domain - Name of the Active Directory domain Domain *string `json:"domain,omitempty"` - // DNS - Comma separated list of DNS server IP addresses for the Active Directory domain + // DNS - Comma separated list of DNS server IP addresses (IPv4 only) for the Active Directory domain DNS *string `json:"dns,omitempty"` // Status - Status of the Active Directory Status *string `json:"status,omitempty"` @@ -368,6 +436,12 @@ type ActiveDirectory struct { OrganizationalUnit *string `json:"organizationalUnit,omitempty"` } +// AuthorizeRequest authorize request +type AuthorizeRequest struct { + // RemoteVolumeResourceID - Resource id + RemoteVolumeResourceID *string `json:"remoteVolumeResourceId,omitempty"` +} + // CapacityPool capacity pool resource type CapacityPool struct { autorest.Response `json:"-"` @@ -380,7 +454,7 @@ type CapacityPool struct { // Type - READ-ONLY; Resource type Type *string `json:"type,omitempty"` // Tags - Resource tags - Tags interface{} `json:"tags,omitempty"` + Tags map[string]*string `json:"tags"` // PoolProperties - Capacity pool properties *PoolProperties `json:"properties,omitempty"` } @@ -447,7 +521,7 @@ func (cp *CapacityPool) UnmarshalJSON(body []byte) error { } case "tags": if v != nil { - var tags interface{} + var tags map[string]*string err = json.Unmarshal(*v, &tags) if err != nil { return err @@ -487,7 +561,7 @@ type CapacityPoolPatch struct { // Type - READ-ONLY; Resource type Type *string `json:"type,omitempty"` // Tags - Resource tags - Tags interface{} `json:"tags,omitempty"` + Tags map[string]*string `json:"tags"` // PoolPatchProperties - Capacity pool properties *PoolPatchProperties `json:"properties,omitempty"` } @@ -554,7 +628,7 @@ func (cpp *CapacityPoolPatch) UnmarshalJSON(body []byte) error { } case "tags": if v != nil { - var tags interface{} + var tags map[string]*string err = json.Unmarshal(*v, &tags) if err != nil { return err @@ -596,8 +670,8 @@ type ExportPolicyRule struct { Cifs *bool `json:"cifs,omitempty"` // Nfsv3 - Allows NFSv3 protocol Nfsv3 *bool `json:"nfsv3,omitempty"` - // Nfsv4 - Deprecated: Will use the NFSv4.1 protocol, please use swagger version 2019-07-01 or later - Nfsv4 *bool `json:"nfsv4,omitempty"` + // Nfsv41 - Allows NFSv4.1 protocol + Nfsv41 *bool `json:"nfsv41,omitempty"` // AllowedClients - Client ingress specification as comma separated string with IPv4 CIDRs, IPv4 host addresses and host names AllowedClients *string `json:"allowedClients,omitempty"` } @@ -632,8 +706,10 @@ type MountTarget struct { ID *string `json:"id,omitempty"` // Name - READ-ONLY; Resource name Name *string `json:"name,omitempty"` + // Type - READ-ONLY; Resource type + Type *string `json:"type,omitempty"` // Tags - Resource tags - Tags interface{} `json:"tags,omitempty"` + Tags map[string]*string `json:"tags"` // MountTargetProperties - Mount Target Properties *MountTargetProperties `json:"properties,omitempty"` } @@ -689,9 +765,18 @@ func (mt *MountTarget) UnmarshalJSON(body []byte) error { } mt.Name = &name } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + mt.Type = &typeVar + } case "tags": if v != nil { - var tags interface{} + var tags map[string]*string err = json.Unmarshal(*v, &tags) if err != nil { return err @@ -922,6 +1007,35 @@ func (future *PoolsDeleteFuture) Result(client PoolsClient) (ar autorest.Respons return } +// ReplicationObject replication properties +type ReplicationObject struct { + // ReplicationID - Id + ReplicationID *string `json:"replicationId,omitempty"` + // EndpointType - Indicates whether the local volume is the source or destination for the Volume Replication. Possible values include: 'Src', 'Dst' + EndpointType EndpointType `json:"endpointType,omitempty"` + // ReplicationSchedule - Schedule. Possible values include: '10minutely', 'Hourly', 'Daily', 'Weekly', 'Monthly' + ReplicationSchedule ReplicationSchedule `json:"replicationSchedule,omitempty"` + // RemoteVolumeResourceID - The resource ID of the remote volume. + RemoteVolumeResourceID *string `json:"remoteVolumeResourceId,omitempty"` + // RemoteVolumeRegion - The remote region for the other end of the Volume Replication. + RemoteVolumeRegion *string `json:"remoteVolumeRegion,omitempty"` +} + +// ReplicationStatus replication status +type ReplicationStatus struct { + autorest.Response `json:"-"` + // Healthy - Replication health check + Healthy *bool `json:"healthy,omitempty"` + // RelationshipStatus - Status of the mirror relationship. Possible values include: 'Idle', 'Transferring' + RelationshipStatus RelationshipStatus `json:"relationshipStatus,omitempty"` + // MirrorState - The status of the replication. Possible values include: 'Uninitialized', 'Mirrored', 'Broken' + MirrorState MirrorState `json:"mirrorState,omitempty"` + // TotalProgress - The progress of the replication + TotalProgress *string `json:"totalProgress,omitempty"` + // ErrorMessage - Displays error message if the replication is in an error state + ErrorMessage *string `json:"errorMessage,omitempty"` +} + // ResourceNameAvailability information regarding availability of a resource name. type ResourceNameAvailability struct { autorest.Response `json:"-"` @@ -961,7 +1075,7 @@ type Snapshot struct { // Type - READ-ONLY; Resource type Type *string `json:"type,omitempty"` // Tags - Resource tags - Tags interface{} `json:"tags,omitempty"` + Tags map[string]*string `json:"tags"` // SnapshotProperties - Snapshot Properties *SnapshotProperties `json:"properties,omitempty"` } @@ -1028,7 +1142,7 @@ func (s *Snapshot) UnmarshalJSON(body []byte) error { } case "tags": if v != nil { - var tags interface{} + var tags map[string]*string err = json.Unmarshal(*v, &tags) if err != nil { return err @@ -1053,7 +1167,16 @@ func (s *Snapshot) UnmarshalJSON(body []byte) error { // SnapshotPatch snapshot patch type SnapshotPatch struct { // Tags - Resource tags - Tags interface{} `json:"tags,omitempty"` + Tags map[string]*string `json:"tags"` +} + +// MarshalJSON is the custom marshaler for SnapshotPatch. +func (sp SnapshotPatch) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if sp.Tags != nil { + objectMap["tags"] = sp.Tags + } + return json.Marshal(objectMap) } // SnapshotProperties snapshot properties @@ -1062,8 +1185,8 @@ type SnapshotProperties struct { SnapshotID *string `json:"snapshotId,omitempty"` // FileSystemID - UUID v4 used to identify the FileSystem FileSystemID *string `json:"fileSystemId,omitempty"` - // CreationDate - READ-ONLY; The creation date of the snapshot - CreationDate *date.Time `json:"creationDate,omitempty"` + // Created - READ-ONLY; The creation date of the snapshot + Created *date.Time `json:"created,omitempty"` // ProvisioningState - READ-ONLY; Azure lifecycle management ProvisioningState *string `json:"provisioningState,omitempty"` } @@ -1139,7 +1262,7 @@ type Volume struct { // Type - READ-ONLY; Resource type Type *string `json:"type,omitempty"` // Tags - Resource tags - Tags interface{} `json:"tags,omitempty"` + Tags map[string]*string `json:"tags"` // VolumeProperties - Volume properties *VolumeProperties `json:"properties,omitempty"` } @@ -1206,7 +1329,7 @@ func (vVar *Volume) UnmarshalJSON(body []byte) error { } case "tags": if v != nil { - var tags interface{} + var tags map[string]*string err = json.Unmarshal(*v, &tags) if err != nil { return err @@ -1246,7 +1369,7 @@ type VolumePatch struct { // Type - READ-ONLY; Resource type Type *string `json:"type,omitempty"` // Tags - Resource tags - Tags interface{} `json:"tags,omitempty"` + Tags map[string]*string `json:"tags"` // VolumePatchProperties - Patchable volume properties *VolumePatchProperties `json:"properties,omitempty"` } @@ -1313,7 +1436,7 @@ func (vp *VolumePatch) UnmarshalJSON(body []byte) error { } case "tags": if v != nil { - var tags interface{} + var tags map[string]*string err = json.Unmarshal(*v, &tags) if err != nil { return err @@ -1375,6 +1498,19 @@ type VolumeProperties struct { SubnetID *string `json:"subnetId,omitempty"` // MountTargets - List of mount targets MountTargets interface{} `json:"mountTargets,omitempty"` + // VolumeType - What type of volume is this + VolumeType *string `json:"volumeType,omitempty"` + // DataProtection - DataProtection type volumes include an object containing details of the replication + DataProtection *VolumePropertiesDataProtection `json:"dataProtection,omitempty"` + // IsRestoring - Restoring + IsRestoring *bool `json:"isRestoring,omitempty"` +} + +// VolumePropertiesDataProtection dataProtection type volumes include an object containing details of the +// replication +type VolumePropertiesDataProtection struct { + // Replication - Replication properties + Replication *ReplicationObject `json:"replication,omitempty"` } // VolumePropertiesExportPolicy set of export policy rules diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/mounttargets.go b/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/mounttargets.go similarity index 99% rename from vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/mounttargets.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/mounttargets.go index f78422a4acb5d..13e7dcbd3de9f 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/mounttargets.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/mounttargets.go @@ -97,7 +97,7 @@ func (client MountTargetsClient) ListPreparer(ctx context.Context, resourceGroup "volumeName": autorest.Encode("path", volumeName), } - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/operations.go similarity index 99% rename from vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/operations.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/operations.go index 8c07655933275..cd2ea139ad240 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/operations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/operations.go @@ -75,7 +75,7 @@ func (client OperationsClient) List(ctx context.Context) (result OperationListRe // ListPreparer prepares the List request. func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/pools.go b/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/pools.go similarity index 99% rename from vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/pools.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/pools.go index bdd8e5cb14d08..e7b76159b1314 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/pools.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/pools.go @@ -103,7 +103,7 @@ func (client PoolsClient) CreateOrUpdatePreparer(ctx context.Context, body Capac "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -195,7 +195,7 @@ func (client PoolsClient) DeletePreparer(ctx context.Context, resourceGroupName "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -287,7 +287,7 @@ func (client PoolsClient) GetPreparer(ctx context.Context, resourceGroupName str "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -372,7 +372,7 @@ func (client PoolsClient) ListPreparer(ctx context.Context, resourceGroupName st "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -460,7 +460,7 @@ func (client PoolsClient) UpdatePreparer(ctx context.Context, body CapacityPoolP "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/resource.go similarity index 69% rename from vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/client.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/resource.go index 5e190522889cd..98e2f1503c950 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/resource.go @@ -1,6 +1,3 @@ -// Package netapp implements the Azure ARM Netapp service API version 2019-06-01. -// -// Microsoft NetApp Azure Resource Provider specification package netapp // Copyright (c) Microsoft and contributors. All rights reserved. @@ -29,39 +26,28 @@ import ( "net/http" ) -const ( - // DefaultBaseURI is the default URI used for the service Netapp - DefaultBaseURI = "https://management.azure.com" -) - -// BaseClient is the base client for Netapp. -type BaseClient struct { - autorest.Client - BaseURI string - SubscriptionID string +// ResourceClient is the microsoft NetApp Azure Resource Provider specification +type ResourceClient struct { + BaseClient } -// New creates an instance of the BaseClient client. -func New(subscriptionID string) BaseClient { - return NewWithBaseURI(DefaultBaseURI, subscriptionID) +// NewResourceClient creates an instance of the ResourceClient client. +func NewResourceClient(subscriptionID string) ResourceClient { + return NewResourceClientWithBaseURI(DefaultBaseURI, subscriptionID) } -// NewWithBaseURI creates an instance of the BaseClient client. -func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { - return BaseClient{ - Client: autorest.NewClientWithUserAgent(UserAgent()), - BaseURI: baseURI, - SubscriptionID: subscriptionID, - } +// NewResourceClientWithBaseURI creates an instance of the ResourceClient client. +func NewResourceClientWithBaseURI(baseURI string, subscriptionID string) ResourceClient { + return ResourceClient{NewWithBaseURI(baseURI, subscriptionID)} } // CheckFilePathAvailability check if a file path is available. // Parameters: // body - file path availability request. // location - the location -func (client BaseClient) CheckFilePathAvailability(ctx context.Context, body ResourceNameAvailabilityRequest, location string) (result ResourceNameAvailability, err error) { +func (client ResourceClient) CheckFilePathAvailability(ctx context.Context, body ResourceNameAvailabilityRequest, location string) (result ResourceNameAvailability, err error) { if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/BaseClient.CheckFilePathAvailability") + ctx = tracing.StartSpan(ctx, fqdn+"/ResourceClient.CheckFilePathAvailability") defer func() { sc := -1 if result.Response.Response != nil { @@ -74,38 +60,38 @@ func (client BaseClient) CheckFilePathAvailability(ctx context.Context, body Res {TargetValue: body, Constraints: []validation.Constraint{{Target: "body.Name", Name: validation.Null, Rule: true, Chain: nil}, {Target: "body.ResourceGroup", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil { - return result, validation.NewError("netapp.BaseClient", "CheckFilePathAvailability", err.Error()) + return result, validation.NewError("netapp.ResourceClient", "CheckFilePathAvailability", err.Error()) } req, err := client.CheckFilePathAvailabilityPreparer(ctx, body, location) if err != nil { - err = autorest.NewErrorWithError(err, "netapp.BaseClient", "CheckFilePathAvailability", nil, "Failure preparing request") + err = autorest.NewErrorWithError(err, "netapp.ResourceClient", "CheckFilePathAvailability", nil, "Failure preparing request") return } resp, err := client.CheckFilePathAvailabilitySender(req) if err != nil { result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "netapp.BaseClient", "CheckFilePathAvailability", resp, "Failure sending request") + err = autorest.NewErrorWithError(err, "netapp.ResourceClient", "CheckFilePathAvailability", resp, "Failure sending request") return } result, err = client.CheckFilePathAvailabilityResponder(resp) if err != nil { - err = autorest.NewErrorWithError(err, "netapp.BaseClient", "CheckFilePathAvailability", resp, "Failure responding to request") + err = autorest.NewErrorWithError(err, "netapp.ResourceClient", "CheckFilePathAvailability", resp, "Failure responding to request") } return } // CheckFilePathAvailabilityPreparer prepares the CheckFilePathAvailability request. -func (client BaseClient) CheckFilePathAvailabilityPreparer(ctx context.Context, body ResourceNameAvailabilityRequest, location string) (*http.Request, error) { +func (client ResourceClient) CheckFilePathAvailabilityPreparer(ctx context.Context, body ResourceNameAvailabilityRequest, location string) (*http.Request, error) { pathParameters := map[string]interface{}{ "location": autorest.Encode("path", location), "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -122,14 +108,14 @@ func (client BaseClient) CheckFilePathAvailabilityPreparer(ctx context.Context, // CheckFilePathAvailabilitySender sends the CheckFilePathAvailability request. The method will close the // http.Response Body if it receives an error. -func (client BaseClient) CheckFilePathAvailabilitySender(req *http.Request) (*http.Response, error) { +func (client ResourceClient) CheckFilePathAvailabilitySender(req *http.Request) (*http.Response, error) { sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) return autorest.SendWithSender(client, req, sd...) } // CheckFilePathAvailabilityResponder handles the response to the CheckFilePathAvailability request. The method always // closes the http.Response Body. -func (client BaseClient) CheckFilePathAvailabilityResponder(resp *http.Response) (result ResourceNameAvailability, err error) { +func (client ResourceClient) CheckFilePathAvailabilityResponder(resp *http.Response) (result ResourceNameAvailability, err error) { err = autorest.Respond( resp, client.ByInspecting(), @@ -144,9 +130,9 @@ func (client BaseClient) CheckFilePathAvailabilityResponder(resp *http.Response) // Parameters: // body - name availability request. // location - the location -func (client BaseClient) CheckNameAvailability(ctx context.Context, body ResourceNameAvailabilityRequest, location string) (result ResourceNameAvailability, err error) { +func (client ResourceClient) CheckNameAvailability(ctx context.Context, body ResourceNameAvailabilityRequest, location string) (result ResourceNameAvailability, err error) { if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/BaseClient.CheckNameAvailability") + ctx = tracing.StartSpan(ctx, fqdn+"/ResourceClient.CheckNameAvailability") defer func() { sc := -1 if result.Response.Response != nil { @@ -159,38 +145,38 @@ func (client BaseClient) CheckNameAvailability(ctx context.Context, body Resourc {TargetValue: body, Constraints: []validation.Constraint{{Target: "body.Name", Name: validation.Null, Rule: true, Chain: nil}, {Target: "body.ResourceGroup", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil { - return result, validation.NewError("netapp.BaseClient", "CheckNameAvailability", err.Error()) + return result, validation.NewError("netapp.ResourceClient", "CheckNameAvailability", err.Error()) } req, err := client.CheckNameAvailabilityPreparer(ctx, body, location) if err != nil { - err = autorest.NewErrorWithError(err, "netapp.BaseClient", "CheckNameAvailability", nil, "Failure preparing request") + err = autorest.NewErrorWithError(err, "netapp.ResourceClient", "CheckNameAvailability", nil, "Failure preparing request") return } resp, err := client.CheckNameAvailabilitySender(req) if err != nil { result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "netapp.BaseClient", "CheckNameAvailability", resp, "Failure sending request") + err = autorest.NewErrorWithError(err, "netapp.ResourceClient", "CheckNameAvailability", resp, "Failure sending request") return } result, err = client.CheckNameAvailabilityResponder(resp) if err != nil { - err = autorest.NewErrorWithError(err, "netapp.BaseClient", "CheckNameAvailability", resp, "Failure responding to request") + err = autorest.NewErrorWithError(err, "netapp.ResourceClient", "CheckNameAvailability", resp, "Failure responding to request") } return } // CheckNameAvailabilityPreparer prepares the CheckNameAvailability request. -func (client BaseClient) CheckNameAvailabilityPreparer(ctx context.Context, body ResourceNameAvailabilityRequest, location string) (*http.Request, error) { +func (client ResourceClient) CheckNameAvailabilityPreparer(ctx context.Context, body ResourceNameAvailabilityRequest, location string) (*http.Request, error) { pathParameters := map[string]interface{}{ "location": autorest.Encode("path", location), "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -207,14 +193,14 @@ func (client BaseClient) CheckNameAvailabilityPreparer(ctx context.Context, body // CheckNameAvailabilitySender sends the CheckNameAvailability request. The method will close the // http.Response Body if it receives an error. -func (client BaseClient) CheckNameAvailabilitySender(req *http.Request) (*http.Response, error) { +func (client ResourceClient) CheckNameAvailabilitySender(req *http.Request) (*http.Response, error) { sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) return autorest.SendWithSender(client, req, sd...) } // CheckNameAvailabilityResponder handles the response to the CheckNameAvailability request. The method always // closes the http.Response Body. -func (client BaseClient) CheckNameAvailabilityResponder(resp *http.Response) (result ResourceNameAvailability, err error) { +func (client ResourceClient) CheckNameAvailabilityResponder(resp *http.Response) (result ResourceNameAvailability, err error) { err = autorest.Respond( resp, client.ByInspecting(), diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/snapshots.go b/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/snapshots.go similarity index 99% rename from vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/snapshots.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/snapshots.go index e662e6ada9acf..19dbca87d9d32 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/snapshots.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/snapshots.go @@ -108,7 +108,7 @@ func (client SnapshotsClient) CreatePreparer(ctx context.Context, body Snapshot, "volumeName": autorest.Encode("path", volumeName), } - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -204,7 +204,7 @@ func (client SnapshotsClient) DeletePreparer(ctx context.Context, resourceGroupN "volumeName": autorest.Encode("path", volumeName), } - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -300,7 +300,7 @@ func (client SnapshotsClient) GetPreparer(ctx context.Context, resourceGroupName "volumeName": autorest.Encode("path", volumeName), } - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -389,7 +389,7 @@ func (client SnapshotsClient) ListPreparer(ctx context.Context, resourceGroupNam "volumeName": autorest.Encode("path", volumeName), } - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -481,7 +481,7 @@ func (client SnapshotsClient) UpdatePreparer(ctx context.Context, body SnapshotP "volumeName": autorest.Encode("path", volumeName), } - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/version.go similarity index 94% rename from vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/version.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/version.go index 3d6f02d7d19a5..15ae8573f0320 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/version.go @@ -21,7 +21,7 @@ import "github.com/Azure/azure-sdk-for-go/version" // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/" + version.Number + " netapp/2019-06-01" + return "Azure-SDK-For-Go/" + version.Number + " netapp/2019-10-01" } // Version returns the semantic version (see http://semver.org) of the client. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/volumes.go b/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/volumes.go similarity index 52% rename from vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/volumes.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/volumes.go index 91efe92d08c24..718315cc37e2f 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp/volumes.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp/volumes.go @@ -41,6 +41,185 @@ func NewVolumesClientWithBaseURI(baseURI string, subscriptionID string) VolumesC return VolumesClient{NewWithBaseURI(baseURI, subscriptionID)} } +// AuthorizeReplication authorize the replication connection on the source volume +// Parameters: +// resourceGroupName - the name of the resource group. +// accountName - the name of the NetApp account +// poolName - the name of the capacity pool +// volumeName - the name of the volume +// body - authorize request object supplied in the body of the operation. +func (client VolumesClient) AuthorizeReplication(ctx context.Context, resourceGroupName string, accountName string, poolName string, volumeName string, body AuthorizeRequest) (result autorest.Response, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/VolumesClient.AuthorizeReplication") + defer func() { + sc := -1 + if result.Response != nil { + sc = result.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("netapp.VolumesClient", "AuthorizeReplication", err.Error()) + } + + req, err := client.AuthorizeReplicationPreparer(ctx, resourceGroupName, accountName, poolName, volumeName, body) + if err != nil { + err = autorest.NewErrorWithError(err, "netapp.VolumesClient", "AuthorizeReplication", nil, "Failure preparing request") + return + } + + resp, err := client.AuthorizeReplicationSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "netapp.VolumesClient", "AuthorizeReplication", resp, "Failure sending request") + return + } + + result, err = client.AuthorizeReplicationResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "netapp.VolumesClient", "AuthorizeReplication", resp, "Failure responding to request") + } + + return +} + +// AuthorizeReplicationPreparer prepares the AuthorizeReplication request. +func (client VolumesClient) AuthorizeReplicationPreparer(ctx context.Context, resourceGroupName string, accountName string, poolName string, volumeName string, body AuthorizeRequest) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "poolName": autorest.Encode("path", poolName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "volumeName": autorest.Encode("path", volumeName), + } + + const APIVersion = "2019-10-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/authorizeReplication", pathParameters), + autorest.WithJSON(body), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// AuthorizeReplicationSender sends the AuthorizeReplication request. The method will close the +// http.Response Body if it receives an error. +func (client VolumesClient) AuthorizeReplicationSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// AuthorizeReplicationResponder handles the response to the AuthorizeReplication request. The method always +// closes the http.Response Body. +func (client VolumesClient) AuthorizeReplicationResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), + autorest.ByClosing()) + result.Response = resp + return +} + +// BreakReplication break the replication connection on the destination volume +// Parameters: +// resourceGroupName - the name of the resource group. +// accountName - the name of the NetApp account +// poolName - the name of the capacity pool +// volumeName - the name of the volume +func (client VolumesClient) BreakReplication(ctx context.Context, resourceGroupName string, accountName string, poolName string, volumeName string) (result autorest.Response, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/VolumesClient.BreakReplication") + defer func() { + sc := -1 + if result.Response != nil { + sc = result.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("netapp.VolumesClient", "BreakReplication", err.Error()) + } + + req, err := client.BreakReplicationPreparer(ctx, resourceGroupName, accountName, poolName, volumeName) + if err != nil { + err = autorest.NewErrorWithError(err, "netapp.VolumesClient", "BreakReplication", nil, "Failure preparing request") + return + } + + resp, err := client.BreakReplicationSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "netapp.VolumesClient", "BreakReplication", resp, "Failure sending request") + return + } + + result, err = client.BreakReplicationResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "netapp.VolumesClient", "BreakReplication", resp, "Failure responding to request") + } + + return +} + +// BreakReplicationPreparer prepares the BreakReplication request. +func (client VolumesClient) BreakReplicationPreparer(ctx context.Context, resourceGroupName string, accountName string, poolName string, volumeName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "poolName": autorest.Encode("path", poolName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "volumeName": autorest.Encode("path", volumeName), + } + + const APIVersion = "2019-10-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/breakReplication", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// BreakReplicationSender sends the BreakReplication request. The method will close the +// http.Response Body if it receives an error. +func (client VolumesClient) BreakReplicationSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// BreakReplicationResponder handles the response to the BreakReplication request. The method always +// closes the http.Response Body. +func (client VolumesClient) BreakReplicationResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), + autorest.ByClosing()) + result.Response = resp + return +} + // CreateOrUpdate create or update the specified volume within the capacity pool // Parameters: // body - volume object supplied in the body of the operation. @@ -84,6 +263,10 @@ func (client VolumesClient) CreateOrUpdate(ctx context.Context, body Volume, res {Target: "body.VolumeProperties.BaremetalTenantID", Name: validation.Pattern, Rule: `^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$`, Chain: nil}, }}, {Target: "body.VolumeProperties.SubnetID", Name: validation.Null, Rule: true, Chain: nil}, + {Target: "body.VolumeProperties.DataProtection", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "body.VolumeProperties.DataProtection.Replication", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "body.VolumeProperties.DataProtection.Replication.RemoteVolumeResourceID", Name: validation.Null, Rule: true, Chain: nil}}}, + }}, }}}}, {TargetValue: resourceGroupName, Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, @@ -117,7 +300,7 @@ func (client VolumesClient) CreateOrUpdatePreparer(ctx context.Context, body Vol "volumeName": autorest.Encode("path", volumeName), } - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -211,7 +394,7 @@ func (client VolumesClient) DeletePreparer(ctx context.Context, resourceGroupNam "volumeName": autorest.Encode("path", volumeName), } - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -249,6 +432,95 @@ func (client VolumesClient) DeleteResponder(resp *http.Response) (result autores return } +// DeleteReplication delete the replication connection on the destination volume, and send release to the source +// replication +// Parameters: +// resourceGroupName - the name of the resource group. +// accountName - the name of the NetApp account +// poolName - the name of the capacity pool +// volumeName - the name of the volume +func (client VolumesClient) DeleteReplication(ctx context.Context, resourceGroupName string, accountName string, poolName string, volumeName string) (result autorest.Response, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/VolumesClient.DeleteReplication") + defer func() { + sc := -1 + if result.Response != nil { + sc = result.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("netapp.VolumesClient", "DeleteReplication", err.Error()) + } + + req, err := client.DeleteReplicationPreparer(ctx, resourceGroupName, accountName, poolName, volumeName) + if err != nil { + err = autorest.NewErrorWithError(err, "netapp.VolumesClient", "DeleteReplication", nil, "Failure preparing request") + return + } + + resp, err := client.DeleteReplicationSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "netapp.VolumesClient", "DeleteReplication", resp, "Failure sending request") + return + } + + result, err = client.DeleteReplicationResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "netapp.VolumesClient", "DeleteReplication", resp, "Failure responding to request") + } + + return +} + +// DeleteReplicationPreparer prepares the DeleteReplication request. +func (client VolumesClient) DeleteReplicationPreparer(ctx context.Context, resourceGroupName string, accountName string, poolName string, volumeName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "poolName": autorest.Encode("path", poolName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "volumeName": autorest.Encode("path", volumeName), + } + + const APIVersion = "2019-10-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/deleteReplication", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteReplicationSender sends the DeleteReplication request. The method will close the +// http.Response Body if it receives an error. +func (client VolumesClient) DeleteReplicationSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// DeleteReplicationResponder handles the response to the DeleteReplication request. The method always +// closes the http.Response Body. +func (client VolumesClient) DeleteReplicationResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), + autorest.ByClosing()) + result.Response = resp + return +} + // Get get the details of the specified volume // Parameters: // resourceGroupName - the name of the resource group. @@ -305,7 +577,7 @@ func (client VolumesClient) GetPreparer(ctx context.Context, resourceGroupName s "volumeName": autorest.Encode("path", volumeName), } - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -392,7 +664,7 @@ func (client VolumesClient) ListPreparer(ctx context.Context, resourceGroupName "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -425,6 +697,184 @@ func (client VolumesClient) ListResponder(resp *http.Response) (result VolumeLis return } +// ReplicationStatusMethod get the status of the replication +// Parameters: +// resourceGroupName - the name of the resource group. +// accountName - the name of the NetApp account +// poolName - the name of the capacity pool +// volumeName - the name of the volume +func (client VolumesClient) ReplicationStatusMethod(ctx context.Context, resourceGroupName string, accountName string, poolName string, volumeName string) (result ReplicationStatus, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/VolumesClient.ReplicationStatusMethod") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("netapp.VolumesClient", "ReplicationStatusMethod", err.Error()) + } + + req, err := client.ReplicationStatusMethodPreparer(ctx, resourceGroupName, accountName, poolName, volumeName) + if err != nil { + err = autorest.NewErrorWithError(err, "netapp.VolumesClient", "ReplicationStatusMethod", nil, "Failure preparing request") + return + } + + resp, err := client.ReplicationStatusMethodSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "netapp.VolumesClient", "ReplicationStatusMethod", resp, "Failure sending request") + return + } + + result, err = client.ReplicationStatusMethodResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "netapp.VolumesClient", "ReplicationStatusMethod", resp, "Failure responding to request") + } + + return +} + +// ReplicationStatusMethodPreparer prepares the ReplicationStatusMethod request. +func (client VolumesClient) ReplicationStatusMethodPreparer(ctx context.Context, resourceGroupName string, accountName string, poolName string, volumeName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "poolName": autorest.Encode("path", poolName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "volumeName": autorest.Encode("path", volumeName), + } + + const APIVersion = "2019-10-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/replicationStatus", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ReplicationStatusMethodSender sends the ReplicationStatusMethod request. The method will close the +// http.Response Body if it receives an error. +func (client VolumesClient) ReplicationStatusMethodSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// ReplicationStatusMethodResponder handles the response to the ReplicationStatusMethod request. The method always +// closes the http.Response Body. +func (client VolumesClient) ReplicationStatusMethodResponder(resp *http.Response) (result ReplicationStatus, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// ResyncReplication resync the connection on the destination volume. If the operation is ran on the source volume it +// will reverse-resync the connection and sync from source to destination. +// Parameters: +// resourceGroupName - the name of the resource group. +// accountName - the name of the NetApp account +// poolName - the name of the capacity pool +// volumeName - the name of the volume +func (client VolumesClient) ResyncReplication(ctx context.Context, resourceGroupName string, accountName string, poolName string, volumeName string) (result autorest.Response, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/VolumesClient.ResyncReplication") + defer func() { + sc := -1 + if result.Response != nil { + sc = result.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("netapp.VolumesClient", "ResyncReplication", err.Error()) + } + + req, err := client.ResyncReplicationPreparer(ctx, resourceGroupName, accountName, poolName, volumeName) + if err != nil { + err = autorest.NewErrorWithError(err, "netapp.VolumesClient", "ResyncReplication", nil, "Failure preparing request") + return + } + + resp, err := client.ResyncReplicationSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "netapp.VolumesClient", "ResyncReplication", resp, "Failure sending request") + return + } + + result, err = client.ResyncReplicationResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "netapp.VolumesClient", "ResyncReplication", resp, "Failure responding to request") + } + + return +} + +// ResyncReplicationPreparer prepares the ResyncReplication request. +func (client VolumesClient) ResyncReplicationPreparer(ctx context.Context, resourceGroupName string, accountName string, poolName string, volumeName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "accountName": autorest.Encode("path", accountName), + "poolName": autorest.Encode("path", poolName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + "volumeName": autorest.Encode("path", volumeName), + } + + const APIVersion = "2019-10-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/resyncReplication", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ResyncReplicationSender sends the ResyncReplication request. The method will close the +// http.Response Body if it receives an error. +func (client VolumesClient) ResyncReplicationSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// ResyncReplicationResponder handles the response to the ResyncReplication request. The method always +// closes the http.Response Body. +func (client VolumesClient) ResyncReplicationResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), + autorest.ByClosing()) + result.Response = resp + return +} + // Update patch the specified volume // Parameters: // body - volume object supplied in the body of the operation. @@ -482,7 +932,7 @@ func (client VolumesClient) UpdatePreparer(ctx context.Context, body VolumePatch "volumeName": autorest.Encode("path", volumeName), } - const APIVersion = "2019-06-01" + const APIVersion = "2019-10-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/modules.txt b/vendor/modules.txt index a09d4b808bd5c..aa3d0d63c408a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -43,7 +43,7 @@ github.com/Azure/azure-sdk-for-go/services/mariadb/mgmt/2018-06-01/mariadb github.com/Azure/azure-sdk-for-go/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering github.com/Azure/azure-sdk-for-go/services/mediaservices/mgmt/2018-07-01/media github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql -github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp +github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-09-01/network github.com/Azure/azure-sdk-for-go/services/notificationhubs/mgmt/2017-04-01/notificationhubs github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql diff --git a/website/docs/r/netapp_volume.html.markdown b/website/docs/r/netapp_volume.html.markdown index 0e24d8348fc30..891125b5dd5de 100644 --- a/website/docs/r/netapp_volume.html.markdown +++ b/website/docs/r/netapp_volume.html.markdown @@ -57,6 +57,10 @@ resource "azurerm_netapp_pool" "example" { } resource "azurerm_netapp_volume" "example" { + lifecycle { + prevent_destroy = true + } + name = "example-netappvolume" location = azurerm_resource_group.example.location resource_group_name = azurerm_resource_group.example.name @@ -65,6 +69,7 @@ resource "azurerm_netapp_volume" "example" { volume_path = "my-unique-file-path" service_level = "Premium" subnet_id = azurerm_subnet.example.id + protocols = ["NFSv4.1"] storage_quota_in_gb = 100 } ``` @@ -87,12 +92,16 @@ The following arguments are supported: * `service_level` - (Required) The target performance of the file system. Valid values include `Premium`, `Standard`, or `Ultra`. +* `protocols` - (Optional) The target volume protocol expressed as a list. Supported single value include `CIFS`, `NFSv3`, or `NFSv4.1`. If argument is not defined it will default to `NFSv3`. Changing this forces a new resource to be created and data will be lost. + * `subnet_id` - (Required) The ID of the Subnet the NetApp Volume resides in, which must have the `Microsoft.NetApp/volumes` delegation. Changing this forces a new resource to be created. * `storage_quota_in_gb` - (Required) The maximum Storage Quota allowed for a file system in Gigabytes. * `export_policy_rule` - (Optional) One or more `export_policy_rule` block defined below. +-> **Note**: It is highly recommended to use the **lifecycle** property as noted in the example since it will prevent an accidental deletion of the volume if the `protocols` argument changes to a different protocol type. + --- An `export_policy_rule` block supports the following: @@ -101,11 +110,13 @@ An `export_policy_rule` block supports the following: * `allowed_clients` - (Required) A list of allowed clients IPv4 addresses. -* `cifs_enabled` - (Required) Is the CIFS protocol allowed? +* `protocols_enabled` - (Optional) A list of allowed protocols. Valid values include `CIFS`, `NFSv3`, or `NFSv4.1`. Only one value is supported at this time. This replaces the previous arguments: `cifs_enabled`, `nfsv3_enabled` and `nfsv4_enabled`. + +* `cifs_enabled` - (Optional / **Deprecated in favour of `protocols_enabled`**) Is the CIFS protocol allowed? -* `nfsv3_enabled` - (Required) Is the NFSv3 protocol allowed? +* `nfsv3_enabled` - (Optional / **Deprecated in favour of `protocols_enabled`**) Is the NFSv3 protocol allowed? -* `nfsv4_enabled` - (Required) Is the NFSv4 protocol allowed? +* `nfsv4_enabled` - (Optional / **Deprecated in favour of `protocols_enabled`**) Is the NFSv4 protocol allowed? * `unix_read_only` - (Optional) Is the file system on unix read only? From 41862777affabc801494b4dd4186e2a2f33ea56a Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 4 Mar 2020 18:29:07 -0800 Subject: [PATCH 458/498] Update CHANGELOG.md to include #5485 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3690242d0c95..a7272119a56d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,12 +12,15 @@ FEATURES: IMPROVEMENTS: batch: upgrading to API version `2019-08-01` [GH-5967] +netapp: upgrading to API version `2019-10-01` [GH-5485] * `azurerm_application_gateway` - support up to `125` for the `capacity` property with V2 SKU's [GH-5906] * `azurerm_automation_dsc_configuration` - support for the `tags` property [GH-5827] * `azurerm_batch_pool` - support for the `public_ips` property [GH-5967] * `azurerm_frontdoor` - exposed new attributes in `backend_pool_health_probe` block `enabled` and `probe_method` [GH-5924] * `azurerm_function_app` - Added `os_type` field to facilitate support of `linux` function apps [GH-5839] * `azurerm_kusto_cluster` - support for `enable_disk_encryption` and `enable_streaming_ingest` properties [GH-5855] +* `azurerm_netapp_volume` - support for the `protocol_types` property [GH-5485] +* `azurerm_netapp_volume` - deprecated the `cifs_enabled`, `nfsv3_enabled`, and `nfsv4_enabled` properties in favour of `protocols_enabled` [GH-5485] * `azurerm_private_dns_a_record` - export the `fqdn` property [GH-5949] * `azurerm_private_dns_aaaa_record` - export the `fqdn` property [GH-5949] * `azurerm_private_dns_cname_record` - export the `fqdn` property [GH-5949] @@ -39,6 +42,7 @@ BUG FIXES: * `azurerm_frontdoor` - fix the way `backend_pool_load_balancing`/`backend_pool_health_probe` [GH-5924] * `azurerm_frontdoor_firewall_policy` - add validation for Frontdoor WAF Name Restrictions [GH-5943] * `azurerm_linux_virtual_machine_scale_set` - correct `source_image_id` validation [GH-5901] +* `azurerm_netapp_volume` - support volmes uoto `100TB` in size [GH-5485] * `azurerm_search_service` - changing the properties `replica_count` & `partition_count` properties no longer force a new resource [GH-5935] * `azurerm_app_service_plan` - Updates no longer fail if App Service Environment ID is not specified [GH-5915] From 1ea57fc3ec25df695fa6fd8fb55c1948ae788dd1 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 4 Mar 2020 18:29:25 -0800 Subject: [PATCH 459/498] azurerm_netapp_[pool|snapshot|volume] - fix import test (#5992) --- .../services/netapp/tests/resource_arm_netapp_pool_test.go | 3 +++ .../netapp/tests/resource_arm_netapp_snapshot_test.go | 3 +++ .../netapp/tests/resource_arm_netapp_volume_test.go | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/azurerm/internal/services/netapp/tests/resource_arm_netapp_pool_test.go b/azurerm/internal/services/netapp/tests/resource_arm_netapp_pool_test.go index a0104f0588a1c..d3a4b4268d0a2 100644 --- a/azurerm/internal/services/netapp/tests/resource_arm_netapp_pool_test.go +++ b/azurerm/internal/services/netapp/tests/resource_arm_netapp_pool_test.go @@ -194,6 +194,9 @@ resource "azurerm_netapp_pool" "import" { name = azurerm_netapp_pool.test.name location = azurerm_netapp_pool.test.location resource_group_name = azurerm_netapp_pool.test.resource_group_name + account_name = azurerm_netapp_pool.test.account_name + service_level = azurerm_netapp_pool.test.service_level + size_in_tb = azurerm_netapp_pool.test.size_in_tb } `, testAccAzureRMNetAppPool_basic(data)) } diff --git a/azurerm/internal/services/netapp/tests/resource_arm_netapp_snapshot_test.go b/azurerm/internal/services/netapp/tests/resource_arm_netapp_snapshot_test.go index bf598137a7a27..fdbdd90f88135 100644 --- a/azurerm/internal/services/netapp/tests/resource_arm_netapp_snapshot_test.go +++ b/azurerm/internal/services/netapp/tests/resource_arm_netapp_snapshot_test.go @@ -185,6 +185,9 @@ resource "azurerm_netapp_snapshot" "import" { name = azurerm_netapp_snapshot.test.name location = azurerm_netapp_snapshot.test.location resource_group_name = azurerm_netapp_snapshot.test.resource_group_name + account_name = azurerm_netapp_snapshot.test.account_name + pool_name = azurerm_netapp_snapshot.test.pool_name + volume_name = azurerm_netapp_snapshot.test.volume_name } `, testAccAzureRMNetAppSnapshot_basic(data)) } diff --git a/azurerm/internal/services/netapp/tests/resource_arm_netapp_volume_test.go b/azurerm/internal/services/netapp/tests/resource_arm_netapp_volume_test.go index 8c3bae1720e59..c6cd35fee4b0a 100644 --- a/azurerm/internal/services/netapp/tests/resource_arm_netapp_volume_test.go +++ b/azurerm/internal/services/netapp/tests/resource_arm_netapp_volume_test.go @@ -314,6 +314,12 @@ resource "azurerm_netapp_volume" "import" { name = azurerm_netapp_volume.test.name location = azurerm_netapp_volume.test.location resource_group_name = azurerm_netapp_volume.test.resource_group_name + account_name = azurerm_netapp_volume.test.account_name + pool_name = azurerm_netapp_volume.test.pool_name + volume_path = azurerm_netapp_volume.test.volume_path + service_level = azurerm_netapp_volume.test.service_level + subnet_id = azurerm_netapp_volume.test.subnet_id + storage_quota_in_gb = azurerm_netapp_volume.test.storage_quota_in_gb } `, testAccAzureRMNetAppVolume_basic(data)) } From dc277a2b598038e7659755ddbe744bd806c9e114 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 4 Mar 2020 19:31:02 -0800 Subject: [PATCH 460/498] Update CHANGELOG.md --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7272119a56d6..59b1ab48345e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,10 @@ FEATURES: -* **New Data Source:** `azurerm_data_migration_service` [GH-5258] +* **New Data Source:** `azurerm_database_migration_service` [GH-5258] * **New Data Source:** `azurerm_kusto_cluster` [GH-5942] * **New Resource:** `azurerm_bot_channel_directline` [GH-5445] -* **New Resource:** `azurerm_data_migration_service` [GH-5258] +* **New Resource:** `azurerm_database_migration_service` [GH-5258] * **New Resource:** `azurerm_monitor_scheduled_query_rules_alert` [GH-5053] * **New Resource:** `azurerm_monitor_scheduled_query_rules_log` [GH-5053] From 04a847ec5545d0418e00332d73414260a2931b58 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 4 Mar 2020 22:09:52 -0800 Subject: [PATCH 461/498] rename "Data Migration" into "Database Migration" (#5994) --- .../data_source_database_migration_service.go | 6 ++--- ...resource_arm_database_migration_service.go | 24 +++++++++---------- ...rce_arm_database_migration_service_test.go | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/azurerm/internal/services/databasemigration/data_source_database_migration_service.go b/azurerm/internal/services/databasemigration/data_source_database_migration_service.go index 076c12d923697..7e5e616f6f56d 100644 --- a/azurerm/internal/services/databasemigration/data_source_database_migration_service.go +++ b/azurerm/internal/services/databasemigration/data_source_database_migration_service.go @@ -58,13 +58,13 @@ func dataSourceArmDatabaseMigrationServiceRead(d *schema.ResourceData, meta inte resp, err := client.Get(ctx, resourceGroup, name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - return fmt.Errorf("Error: Data Migration Service (Service Name %q / Group Name %q) was not found", name, resourceGroup) + return fmt.Errorf("Error: Database Migration Service (Service Name %q / Group Name %q) was not found", name, resourceGroup) } - return fmt.Errorf("Error reading Data Migration Service (Service Name %q / Group Name %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error reading Database Migration Service (Service Name %q / Group Name %q): %+v", name, resourceGroup, err) } if resp.ID == nil || *resp.ID == "" { - return fmt.Errorf("unexpected empty ID retrieved for Data Migration Service (Service Name %q / Group Name %q)", name, resourceGroup) + return fmt.Errorf("unexpected empty ID retrieved for Database Migration Service (Service Name %q / Group Name %q)", name, resourceGroup) } d.SetId(*resp.ID) diff --git a/azurerm/internal/services/databasemigration/resource_arm_database_migration_service.go b/azurerm/internal/services/databasemigration/resource_arm_database_migration_service.go index 2f5457d74e02e..fc5913e302cc8 100644 --- a/azurerm/internal/services/databasemigration/resource_arm_database_migration_service.go +++ b/azurerm/internal/services/databasemigration/resource_arm_database_migration_service.go @@ -90,7 +90,7 @@ func resourceArmDatabaseMigrationServiceCreate(d *schema.ResourceData, meta inte existing, err := client.Get(ctx, resourceGroup, name) if err != nil { if !utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("Error checking for present of existing Data Migration Service (Service Name %q / Group Name %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error checking for present of existing Database Migration Service (Service Name %q / Group Name %q): %+v", name, resourceGroup, err) } } if existing.ID != nil && *existing.ID != "" { @@ -118,18 +118,18 @@ func resourceArmDatabaseMigrationServiceCreate(d *schema.ResourceData, meta inte future, err := client.CreateOrUpdate(ctx, parameters, resourceGroup, name) if err != nil { - return fmt.Errorf("Error creating Data Migration Service (Service Name %q / Group Name %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error creating Database Migration Service (Service Name %q / Group Name %q): %+v", name, resourceGroup, err) } if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for creation of Data Migration Service (Service Name %q / Group Name %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error waiting for creation of Database Migration Service (Service Name %q / Group Name %q): %+v", name, resourceGroup, err) } resp, err := client.Get(ctx, resourceGroup, name) if err != nil { - return fmt.Errorf("Error retrieving Data Migration Service (Service Name %q / Group Name %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error retrieving Database Migration Service (Service Name %q / Group Name %q): %+v", name, resourceGroup, err) } if resp.ID == nil { - return fmt.Errorf("Cannot read Data Migration Service (Service Name %q / Group Name %q) ID", name, resourceGroup) + return fmt.Errorf("Cannot read Database Migration Service (Service Name %q / Group Name %q) ID", name, resourceGroup) } d.SetId(*resp.ID) @@ -149,15 +149,15 @@ func resourceArmDatabaseMigrationServiceRead(d *schema.ResourceData, meta interf resp, err := client.Get(ctx, id.ResourceGroup, id.Name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - log.Printf("[INFO] Data Migration Service %q does not exist - removing from state", d.Id()) + log.Printf("[INFO] Database Migration Service %q does not exist - removing from state", d.Id()) d.SetId("") return nil } - return fmt.Errorf("Error reading Data Migration Service (Service Name %q / Group Name %q): %+v", id.Name, id.ResourceGroup, err) + return fmt.Errorf("Error reading Database Migration Service (Service Name %q / Group Name %q): %+v", id.Name, id.ResourceGroup, err) } if resp.ID == nil || *resp.ID == "" { - return fmt.Errorf("unexpected empty ID retrieved for Data Migration Service (Service Name %q / Group Name %q)", id.Name, id.ResourceGroup) + return fmt.Errorf("unexpected empty ID retrieved for Database Migration Service (Service Name %q / Group Name %q)", id.Name, id.ResourceGroup) } d.SetId(*resp.ID) @@ -192,10 +192,10 @@ func resourceArmDatabaseMigrationServiceUpdate(d *schema.ResourceData, meta inte future, err := client.Update(ctx, parameters, id.ResourceGroup, id.Name) if err != nil { - return fmt.Errorf("Error updating Data Migration Service (Service Name %q / Group Name %q): %+v", id.Name, id.ResourceGroup, err) + return fmt.Errorf("Error updating Database Migration Service (Service Name %q / Group Name %q): %+v", id.Name, id.ResourceGroup, err) } if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for update of Data Migration Service (Service Name %q / Group Name %q): %+v", id.Name, id.ResourceGroup, err) + return fmt.Errorf("Error waiting for update of Database Migration Service (Service Name %q / Group Name %q): %+v", id.Name, id.ResourceGroup, err) } return resourceArmDatabaseMigrationServiceRead(d, meta) @@ -218,12 +218,12 @@ func resourceArmDatabaseMigrationServiceDelete(d *schema.ResourceData, meta inte if response.WasNotFound(future.Response()) { return nil } - return fmt.Errorf("Error deleting Data Migration Service (Service Name %q / Group Name %q): %+v", id.Name, id.ResourceGroup, err) + return fmt.Errorf("Error deleting Database Migration Service (Service Name %q / Group Name %q): %+v", id.Name, id.ResourceGroup, err) } if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { if !response.WasNotFound(future.Response()) { - return fmt.Errorf("Error waiting for deleting Data Migration Service (Service Name %q / Group Name %q): %+v", id.Name, id.ResourceGroup, err) + return fmt.Errorf("Error waiting for deleting Database Migration Service (Service Name %q / Group Name %q): %+v", id.Name, id.ResourceGroup, err) } } diff --git a/azurerm/internal/services/databasemigration/tests/resource_arm_database_migration_service_test.go b/azurerm/internal/services/databasemigration/tests/resource_arm_database_migration_service_test.go index 565b6767d8919..147c556529666 100644 --- a/azurerm/internal/services/databasemigration/tests/resource_arm_database_migration_service_test.go +++ b/azurerm/internal/services/databasemigration/tests/resource_arm_database_migration_service_test.go @@ -118,7 +118,7 @@ func testCheckAzureRMDatabaseMigrationServiceExists(resourceName string) resourc return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[resourceName] if !ok { - return fmt.Errorf("Data Migration Service not found: %s", resourceName) + return fmt.Errorf("Database Migration Service not found: %s", resourceName) } id, err := parse.DatabaseMigrationServiceID(rs.Primary.ID) @@ -131,7 +131,7 @@ func testCheckAzureRMDatabaseMigrationServiceExists(resourceName string) resourc if resp, err := client.Get(ctx, id.ResourceGroup, id.Name); err != nil { if utils.ResponseWasNotFound(resp.Response) { - return fmt.Errorf("Bad: Data Migration Service (Service Name %q / Group Name %q) does not exist", id.Name, id.ResourceGroup) + return fmt.Errorf("Bad: Database Migration Service (Service Name %q / Group Name %q) does not exist", id.Name, id.ResourceGroup) } return fmt.Errorf("Bad: Get on ServicesClient: %+v", err) } From 15031c18659fc363324945d517ba06547bd8cc6e Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 5 Mar 2020 05:13:40 -0800 Subject: [PATCH 462/498] =?UTF-8?q?azurerm=5Fcosmosdb=5Fmongo=5Fcollection?= =?UTF-8?q?:=20Remove=20deprecated=20and=20remove=E2=80=A6=20(#5996)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The indexes block was removed in PR #5853, but the example wasn't updated. --- website/docs/r/cosmosdb_mongo_collection.html.markdown | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/website/docs/r/cosmosdb_mongo_collection.html.markdown b/website/docs/r/cosmosdb_mongo_collection.html.markdown index e9070951ebdb8..a24f69d3c3a64 100644 --- a/website/docs/r/cosmosdb_mongo_collection.html.markdown +++ b/website/docs/r/cosmosdb_mongo_collection.html.markdown @@ -33,16 +33,6 @@ resource "azurerm_cosmosdb_mongo_collection" "example" { default_ttl_seconds = "777" shard_key = "uniqueKey" throughput = 400 - - indexes { - key = "aKey" - unique = false - } - - indexes { - key = "uniqueKey" - unique = true - } } ``` From d6a8b3f73375c0600f464467694e276a8b38e3fe Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 5 Mar 2020 05:54:47 -0800 Subject: [PATCH 463/498] Adds a Missing Whitespace (#5997) --- website/docs/r/application_insights_api_key.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/application_insights_api_key.html.markdown b/website/docs/r/application_insights_api_key.html.markdown index 9977e2b0f1f56..7bb27e2c48f96 100644 --- a/website/docs/r/application_insights_api_key.html.markdown +++ b/website/docs/r/application_insights_api_key.html.markdown @@ -104,7 +104,7 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d Application Insights API keys can be imported using the `resource id`, e.g. ```shell -terraform import azurerm_application_insights_api_key.my_key/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/microsoft.insights/components/instance1/apikeys/00000000-0000-0000-0000-000000000000 +terraform import azurerm_application_insights_api_key.my_key /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/microsoft.insights/components/instance1/apikeys/00000000-0000-0000-0000-000000000000 ``` -> **Note:** The secret `api_key` cannot be retrieved during an import. You will need to edit the state by hand to set the secret value if you happen to have it backed up somewhere. From 7d68a3ac75ed3f0d90e8cd480bccbf07e90c30a6 Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 5 Mar 2020 12:38:21 -0800 Subject: [PATCH 464/498] =?UTF-8?q?azurerm=5Fnetwork=5Finterface=5Fapplica?= =?UTF-8?q?tion=5Fgateway=5Fbackend=5Faddress=5Fp=E2=80=A6=20(#5999)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixing the incorrect CIDR ranges for frontend and backend subnets. --- ...ion_gateway_backend_address_pool_association.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/r/network_interface_application_gateway_backend_address_pool_association.html.markdown b/website/docs/r/network_interface_application_gateway_backend_address_pool_association.html.markdown index d153cf1d1a62e..99b0fc595c9ae 100644 --- a/website/docs/r/network_interface_application_gateway_backend_address_pool_association.html.markdown +++ b/website/docs/r/network_interface_application_gateway_backend_address_pool_association.html.markdown @@ -30,14 +30,14 @@ resource "azurerm_subnet" "frontend" { name = "frontend" resource_group_name = azurerm_resource_group.example.name virtual_network_name = azurerm_virtual_network.example.name - address_prefix = "10.254.0.0/24" + address_prefix = "10.0.1.0/24" } resource "azurerm_subnet" "backend" { name = "backend" resource_group_name = azurerm_resource_group.example.name virtual_network_name = azurerm_virtual_network.example.name - address_prefix = "10.254.2.0/24" + address_prefix = "10.0.2.0/24" } resource "azurerm_public_ip" "example" { From 4858607103076c85e1a8be1022aabf29b44ed313 Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 5 Mar 2020 13:19:39 -0800 Subject: [PATCH 465/498] New Resource: `azurerm_hpc_cache` (#5528) Fixes: #5504 Adds the azurerm_hpc_cache resource. --- .../provider/required_resource_providers.go | 1 + .../services/storage/client/client.go | 6 + .../services/storage/parsers/hpc_cache.go | 31 + .../storage/parsers/hpc_cache_test.go | 73 + .../internal/services/storage/registration.go | 1 + .../storage/resource_arm_hpc_cache.go | 201 +++ .../tests/resource_arm_hpc_cache_test.go | 158 ++ .../mgmt/2019-11-01/storagecache/caches.go | 951 +++++++++++ .../mgmt/2019-11-01/storagecache/client.go | 52 + .../mgmt/2019-11-01/storagecache/models.go | 1481 +++++++++++++++++ .../2019-11-01/storagecache/operations.go | 148 ++ .../mgmt/2019-11-01/storagecache/skus.go | 152 ++ .../2019-11-01/storagecache/storagetargets.go | 448 +++++ .../2019-11-01/storagecache/usagemodels.go | 152 ++ .../mgmt/2019-11-01/storagecache/version.go | 30 + vendor/modules.txt | 1 + website/azurerm.erb | 4 + website/docs/r/hpc_cache.html.markdown | 83 + 18 files changed, 3973 insertions(+) create mode 100644 azurerm/internal/services/storage/parsers/hpc_cache.go create mode 100644 azurerm/internal/services/storage/parsers/hpc_cache_test.go create mode 100644 azurerm/internal/services/storage/resource_arm_hpc_cache.go create mode 100644 azurerm/internal/services/storage/tests/resource_arm_hpc_cache_test.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/caches.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/client.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/models.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/operations.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/skus.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/storagetargets.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/usagemodels.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/version.go create mode 100644 website/docs/r/hpc_cache.html.markdown diff --git a/azurerm/internal/provider/required_resource_providers.go b/azurerm/internal/provider/required_resource_providers.go index 7f67adf3cdd30..71e51fd0aaad3 100644 --- a/azurerm/internal/provider/required_resource_providers.go +++ b/azurerm/internal/provider/required_resource_providers.go @@ -63,6 +63,7 @@ func RequiredResourceProviders() map[string]struct{} { "Microsoft.ServiceFabric": {}, "Microsoft.Sql": {}, "Microsoft.Storage": {}, + "Microsoft.StorageCache": {}, "Microsoft.StreamAnalytics": {}, "Microsoft.Web": {}, } diff --git a/azurerm/internal/services/storage/client/client.go b/azurerm/internal/services/storage/client/client.go index adc2f7eb2c14d..8b781b5d9adea 100644 --- a/azurerm/internal/services/storage/client/client.go +++ b/azurerm/internal/services/storage/client/client.go @@ -8,6 +8,7 @@ import ( "github.com/tombuildsstuff/giovanni/storage/2018-11-09/datalakestore/filesystems" "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-04-01/storage" + "github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache" az "github.com/Azure/go-autorest/autorest/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common" "github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts" @@ -25,6 +26,7 @@ type Client struct { FileSystemsClient *filesystems.Client ManagementPoliciesClient storage.ManagementPoliciesClient BlobServicesClient storage.BlobServicesClient + CachesClient *storagecache.CachesClient BlobAccountsClient *accounts.Client environment az.Environment @@ -44,6 +46,9 @@ func NewClient(options *common.ClientOptions) *Client { blobServicesClient := storage.NewBlobServicesClientWithBaseURI(options.ResourceManagerEndpoint, options.SubscriptionId) options.ConfigureClient(&blobServicesClient.Client, options.ResourceManagerAuthorizer) + cachesClient := storagecache.NewCachesClientWithBaseURI(options.ResourceManagerEndpoint, options.SubscriptionId) + options.ConfigureClient(&cachesClient.Client, options.ResourceManagerAuthorizer) + blobAccountsClient := accounts.NewWithEnvironment(options.Environment) options.ConfigureClient(&blobAccountsClient.Client, options.StorageAuthorizer) @@ -54,6 +59,7 @@ func NewClient(options *common.ClientOptions) *Client { FileSystemsClient: &fileSystemsClient, ManagementPoliciesClient: managementPoliciesClient, BlobServicesClient: blobServicesClient, + CachesClient: &cachesClient, BlobAccountsClient: &blobAccountsClient, environment: options.Environment, } diff --git a/azurerm/internal/services/storage/parsers/hpc_cache.go b/azurerm/internal/services/storage/parsers/hpc_cache.go new file mode 100644 index 0000000000000..88f00af5c9475 --- /dev/null +++ b/azurerm/internal/services/storage/parsers/hpc_cache.go @@ -0,0 +1,31 @@ +package parsers + +import ( + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type HPCCacheID struct { + Name string + ResourceGroup string +} + +func ParseHPCCacheID(input string) (*HPCCacheID, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, err + } + + cache := HPCCacheID{ + ResourceGroup: id.ResourceGroup, + } + + if cache.Name, err = id.PopSegment("caches"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &cache, nil +} diff --git a/azurerm/internal/services/storage/parsers/hpc_cache_test.go b/azurerm/internal/services/storage/parsers/hpc_cache_test.go new file mode 100644 index 0000000000000..955777a5e8691 --- /dev/null +++ b/azurerm/internal/services/storage/parsers/hpc_cache_test.go @@ -0,0 +1,73 @@ +package parsers + +import ( + "testing" +) + +func TestParseHPCCacheID(t *testing.T) { + testData := []struct { + Name string + Input string + Expected *HPCCacheID + }{ + { + Name: "Empty", + Input: "", + Expected: nil, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Expected: nil, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Expected: nil, + }, + { + Name: "Resource Group ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", + Expected: nil, + }, + { + Name: "Missing Cache Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.StorageCache/caches/", + Expected: nil, + }, + { + Name: "Cache ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.StorageCache/caches/mycache1", + Expected: &HPCCacheID{ + ResourceGroup: "resGroup1", + Name: "mycache1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.StorageCache/CACHES/mycache1", + Expected: nil, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Name) + + actual, err := ParseHPCCacheID(v.Input) + if err != nil { + if v.Expected == nil { + continue + } + + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.Name != v.Expected.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expected.Name, actual.Name) + } + + if actual.ResourceGroup != v.Expected.ResourceGroup { + t.Fatalf("Expected %q but got %q for Resource Group", v.Expected.ResourceGroup, actual.ResourceGroup) + } + } +} diff --git a/azurerm/internal/services/storage/registration.go b/azurerm/internal/services/storage/registration.go index 12f7f66b9df35..9f2f8f20de077 100644 --- a/azurerm/internal/services/storage/registration.go +++ b/azurerm/internal/services/storage/registration.go @@ -32,6 +32,7 @@ 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_hpc_cache": resourceArmHPCCache(), "azurerm_storage_account": resourceArmStorageAccount(), "azurerm_storage_account_customer_managed_key": resourceArmStorageAccountCustomerManagedKey(), "azurerm_storage_account_network_rules": resourceArmStorageAccountNetworkRules(), diff --git a/azurerm/internal/services/storage/resource_arm_hpc_cache.go b/azurerm/internal/services/storage/resource_arm_hpc_cache.go new file mode 100644 index 0000000000000..a936aad41711c --- /dev/null +++ b/azurerm/internal/services/storage/resource_arm_hpc_cache.go @@ -0,0 +1,201 @@ +package storage + +import ( + "fmt" + "log" + "time" + + "github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/storage/parsers" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmHPCCache() *schema.Resource { + return &schema.Resource{ + Create: resourceArmHPCCacheCreate, + Read: resourceArmHPCCacheRead, + Delete: resourceArmHPCCacheDelete, + + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(30 * time.Minute), + Read: schema.DefaultTimeout(5 * time.Minute), + Delete: schema.DefaultTimeout(30 * time.Minute), + }, + Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { + _, err := parsers.ParseHPCCacheID(id) + return err + }), + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validate.NoEmptyStrings, + }, + + "resource_group_name": azure.SchemaResourceGroupName(), + + "location": azure.SchemaLocation(), + + "cache_size_in_gb": { + Type: schema.TypeInt, + Required: true, + ForceNew: true, + ValidateFunc: validation.IntInSlice([]int{ + 3072, + 6144, + 12288, + 24576, + 49152, + }), + }, + + "subnet_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: azure.ValidateResourceIDOrEmpty, + }, + + "sku_name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + "Standard_2G", + "Standard_4G", + "Standard_8G", + }, false), + }, + }, + } +} + +func resourceArmHPCCacheCreate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Storage.CachesClient + ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) + defer cancel() + + log.Printf("[INFO] preparing arguments for Azure HPC Cache creation.") + name := d.Get("name").(string) + resourceGroup := d.Get("resource_group_name").(string) + + if features.ShouldResourcesBeImported() && d.IsNewResource() { + existing, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if !utils.ResponseWasNotFound(existing.Response) { + return fmt.Errorf("Error checking for presence of existing HPC Cache %q (Resource Group %q): %s", name, resourceGroup, err) + } + } + + if existing.ID != nil && *existing.ID != "" { + return tf.ImportAsExistsError("azurerm_hpc_cache", *existing.ID) + } + } + + location := d.Get("location").(string) + cacheSize := d.Get("cache_size_in_gb").(int) + subnet := d.Get("subnet_id").(string) + skuName := d.Get("sku_name").(string) + + cache := &storagecache.Cache{ + Name: utils.String(name), + Location: utils.String(location), + CacheProperties: &storagecache.CacheProperties{ + CacheSizeGB: utils.Int32(int32(cacheSize)), + Subnet: utils.String(subnet), + }, + Sku: &storagecache.CacheSku{ + Name: utils.String(skuName), + }, + } + + future, err := client.CreateOrUpdate(ctx, resourceGroup, name, cache) + if err != nil { + return fmt.Errorf("Error creating HPC Cache %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { + return fmt.Errorf("Error waiting for HPC Cache %q (Resource Group %q) to finish provisioning: %+v", name, resourceGroup, err) + } + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + return fmt.Errorf("Error retrieving HPC Cache %q (Resource Group %q): %+v", name, resourceGroup, err) + } + if resp.ID == nil { + return fmt.Errorf("Cannot read ID for HPC Cache %q (Resource Group %q): %+v", name, resourceGroup, err) + } + d.SetId(*resp.ID) + + return resourceArmHPCCacheRead(d, meta) +} + +func resourceArmHPCCacheRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Storage.CachesClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := parsers.ParseHPCCacheID(d.Id()) + if err != nil { + return err + } + + resp, err := client.Get(ctx, id.ResourceGroup, id.Name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + log.Printf("[DEBUG] HPC Cache %q was not found in Resource Group %q - removing from state!", id.Name, id.ResourceGroup) + d.SetId("") + return nil + } + + return fmt.Errorf("Error retrieving HPC Cache %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) + } + + d.Set("name", id.Name) + d.Set("resource_group_name", id.ResourceGroup) + d.Set("location", resp.Location) + + if props := resp.CacheProperties; props != nil { + d.Set("cache_size_in_gb", props.CacheSizeGB) + d.Set("subnet_id", props.Subnet) + } + + if sku := resp.Sku; sku != nil { + d.Set("sku_name", sku.Name) + } + + return nil +} + +func resourceArmHPCCacheDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Storage.CachesClient + ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := parsers.ParseHPCCacheID(d.Id()) + if err != nil { + return err + } + + future, err := client.Delete(ctx, id.ResourceGroup, id.Name) + if err != nil { + return fmt.Errorf("Error deleting HPC Cache %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) + } + + if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { + return fmt.Errorf("Error waiting for deletion of HPC Cache %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) + } + + return nil +} diff --git a/azurerm/internal/services/storage/tests/resource_arm_hpc_cache_test.go b/azurerm/internal/services/storage/tests/resource_arm_hpc_cache_test.go new file mode 100644 index 0000000000000..6374de2c2bd18 --- /dev/null +++ b/azurerm/internal/services/storage/tests/resource_arm_hpc_cache_test.go @@ -0,0 +1,158 @@ +package tests + +import ( + "fmt" + "net/http" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" +) + +func TestAccAzureRMHPCCache_basic(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_hpc_cache", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMHPCCacheDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMHPCCache_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMHPCCacheExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMStreamAnalyticsJob_requiresImport(t *testing.T) { + if !features.ShouldResourcesBeImported() { + t.Skip("Skipping since resources aren't required to be imported") + return + } + + data := acceptance.BuildTestData(t, "azurerm_hpc_cache", "test") + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMHPCCacheDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMHPCCache_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMHPCCacheExists(data.ResourceName), + ), + }, + data.RequiresImportErrorStep(testAccAzureRMHPCCahce_requiresImport), + }, + }) +} + +func testCheckAzureRMHPCCacheExists(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acceptance.AzureProvider.Meta().(*clients.Client).Storage.CachesClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + // Ensure we have enough information in state to look up in API + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("Not found: %s", resourceName) + } + + name := rs.Primary.Attributes["name"] + resourceGroup := rs.Primary.Attributes["resource_group_name"] + + resp, err := conn.Get(ctx, resourceGroup, name) + if err != nil { + return fmt.Errorf("Bad: Get on storageCacheCachesClient: %+v", err) + } + + if resp.StatusCode == http.StatusNotFound { + return fmt.Errorf("Bad: HPC Cache %q (resource group: %q) does not exist", name, resourceGroup) + } + + return nil + } +} + +func testCheckAzureRMHPCCacheDestroy(s *terraform.State) error { + conn := acceptance.AzureProvider.Meta().(*clients.Client).Storage.CachesClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_hpc_cache" { + continue + } + + name := rs.Primary.Attributes["name"] + resourceGroup := rs.Primary.Attributes["resource_group_name"] + resp, err := conn.Get(ctx, resourceGroup, name) + if err != nil { + return nil + } + + if resp.StatusCode != http.StatusNotFound { + return fmt.Errorf("HPC Cache still exists:\n%#v", resp) + } + } + + return nil +} + +func testAccAzureRMHPCCache_basic(data acceptance.TestData) string { + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-storage-%d" + location = "%s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctest-VN-%d" + address_space = ["10.0.0.0/16"] + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name +} + +resource "azurerm_subnet" "test" { + name = "acctestsub-%d" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name + address_prefix = "10.0.2.0/24" +} + +resource "azurerm_hpc_cache" "test" { + name = "acctest-HPCC-%d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + cache_size_in_gb = 3072 + subnet_id = azurerm_subnet.test.id + sku_name = "Standard_2G" +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) +} + +func testAccAzureRMHPCCahce_requiresImport(data acceptance.TestData) string { + template := testAccAzureRMHPCCache_basic(data) + return fmt.Sprintf(` +%s + +resource "azurerm_hpc_cache" "import" { + name = azurerm_hpc_cache.test.name + resource_group_name = azurerm_hpc_cache.test.resource_group_name + location = azurerm_hpc_cache.test.location + cache_size_in_gb = azurerm_hpc_cache.test.cache_size_in_gb + subnet_id = azurerm_hpc_cache.test.subnet_id + sku_name = azurerm_hpc_cache.test.sku_name +} +`, template) +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/caches.go b/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/caches.go new file mode 100644 index 0000000000000..4ace44960ee53 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/caches.go @@ -0,0 +1,951 @@ +package storagecache + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "github.com/Azure/go-autorest/tracing" + "net/http" +) + +// CachesClient is the a Storage Cache provides scalable caching service for NAS clients, serving data from either +// NFSv3 or Blob at-rest storage (referred to as "Storage Targets"). These operations allow you to manage Caches. +type CachesClient struct { + BaseClient +} + +// NewCachesClient creates an instance of the CachesClient client. +func NewCachesClient(subscriptionID string) CachesClient { + return NewCachesClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewCachesClientWithBaseURI creates an instance of the CachesClient client. +func NewCachesClientWithBaseURI(baseURI string, subscriptionID string) CachesClient { + return CachesClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// CreateOrUpdate create or update a Cache. +// Parameters: +// resourceGroupName - target resource group. +// cacheName - name of Cache. +// cache - object containing the user-selectable properties of the new Cache. If read-only properties are +// included, they must match the existing values of those properties. +func (client CachesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, cacheName string, cache *Cache) (result CachesCreateOrUpdateFuture, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/CachesClient.CreateOrUpdate") + defer func() { + sc := -1 + if result.Response() != nil { + sc = result.Response().StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: cacheName, + Constraints: []validation.Constraint{{Target: "cacheName", Name: validation.Pattern, Rule: `^[-0-9a-zA-Z_]{1,31}$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("storagecache.CachesClient", "CreateOrUpdate", err.Error()) + } + + req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, cacheName, cache) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "CreateOrUpdate", nil, "Failure preparing request") + return + } + + result, err = client.CreateOrUpdateSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "CreateOrUpdate", result.Response(), "Failure sending request") + return + } + + return +} + +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client CachesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, cacheName string, cache *Cache) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "cacheName": autorest.Encode("path", cacheName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + cache.ID = nil + cache.Name = nil + cache.Type = nil + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + if cache != nil { + preparer = autorest.DecoratePreparer(preparer, + autorest.WithJSON(cache)) + } + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the +// http.Response Body if it receives an error. +func (client CachesClient) CreateOrUpdateSender(req *http.Request) (future CachesCreateOrUpdateFuture, err error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, sd...) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always +// closes the http.Response Body. +func (client CachesClient) CreateOrUpdateResponder(resp *http.Response) (result Cache, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Delete schedules a Cache for deletion. +// Parameters: +// resourceGroupName - target resource group. +// cacheName - name of Cache. +func (client CachesClient) Delete(ctx context.Context, resourceGroupName string, cacheName string) (result CachesDeleteFuture, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/CachesClient.Delete") + defer func() { + sc := -1 + if result.Response() != nil { + sc = result.Response().StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: cacheName, + Constraints: []validation.Constraint{{Target: "cacheName", Name: validation.Pattern, Rule: `^[-0-9a-zA-Z_]{1,31}$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("storagecache.CachesClient", "Delete", err.Error()) + } + + req, err := client.DeletePreparer(ctx, resourceGroupName, cacheName) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "Delete", nil, "Failure preparing request") + return + } + + result, err = client.DeleteSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "Delete", result.Response(), "Failure sending request") + return + } + + return +} + +// DeletePreparer prepares the Delete request. +func (client CachesClient) DeletePreparer(ctx context.Context, resourceGroupName string, cacheName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "cacheName": autorest.Encode("path", cacheName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client CachesClient) DeleteSender(req *http.Request) (future CachesDeleteFuture, err error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, sd...) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client CachesClient) DeleteResponder(resp *http.Response) (result SetObject, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Flush tells a Cache to write all dirty data to the Storage Target(s). During the flush, clients will see errors +// returned until the flush is complete. +// Parameters: +// resourceGroupName - target resource group. +// cacheName - name of Cache. +func (client CachesClient) Flush(ctx context.Context, resourceGroupName string, cacheName string) (result CachesFlushFuture, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/CachesClient.Flush") + defer func() { + sc := -1 + if result.Response() != nil { + sc = result.Response().StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: cacheName, + Constraints: []validation.Constraint{{Target: "cacheName", Name: validation.Pattern, Rule: `^[-0-9a-zA-Z_]{1,31}$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("storagecache.CachesClient", "Flush", err.Error()) + } + + req, err := client.FlushPreparer(ctx, resourceGroupName, cacheName) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "Flush", nil, "Failure preparing request") + return + } + + result, err = client.FlushSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "Flush", result.Response(), "Failure sending request") + return + } + + return +} + +// FlushPreparer prepares the Flush request. +func (client CachesClient) FlushPreparer(ctx context.Context, resourceGroupName string, cacheName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "cacheName": autorest.Encode("path", cacheName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/flush", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// FlushSender sends the Flush request. The method will close the +// http.Response Body if it receives an error. +func (client CachesClient) FlushSender(req *http.Request) (future CachesFlushFuture, err error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, sd...) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// FlushResponder handles the response to the Flush request. The method always +// closes the http.Response Body. +func (client CachesClient) FlushResponder(resp *http.Response) (result SetObject, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Get returns a Cache. +// Parameters: +// resourceGroupName - target resource group. +// cacheName - name of Cache. +func (client CachesClient) Get(ctx context.Context, resourceGroupName string, cacheName string) (result Cache, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/CachesClient.Get") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: cacheName, + Constraints: []validation.Constraint{{Target: "cacheName", Name: validation.Pattern, Rule: `^[-0-9a-zA-Z_]{1,31}$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("storagecache.CachesClient", "Get", err.Error()) + } + + req, err := client.GetPreparer(ctx, resourceGroupName, cacheName) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client CachesClient) GetPreparer(ctx context.Context, resourceGroupName string, cacheName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "cacheName": autorest.Encode("path", cacheName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client CachesClient) GetSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client CachesClient) GetResponder(resp *http.Response) (result Cache, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// List returns all Caches the user has access to under a subscription. +func (client CachesClient) List(ctx context.Context) (result CachesListResultPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/CachesClient.List") + defer func() { + sc := -1 + if result.clr.Response.Response != nil { + sc = result.clr.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.fn = client.listNextResults + req, err := client.ListPreparer(ctx) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.clr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "List", resp, "Failure sending request") + return + } + + result.clr, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "List", resp, "Failure responding to request") + } + + return +} + +// ListPreparer prepares the List request. +func (client CachesClient) ListPreparer(ctx context.Context) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.StorageCache/caches", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client CachesClient) ListSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client CachesClient) ListResponder(resp *http.Response) (result CachesListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listNextResults retrieves the next set of results, if any. +func (client CachesClient) listNextResults(ctx context.Context, lastResults CachesListResult) (result CachesListResult, err error) { + req, err := lastResults.cachesListResultPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "storagecache.CachesClient", "listNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "storagecache.CachesClient", "listNextResults", resp, "Failure sending next results request") + } + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "listNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListComplete enumerates all values, automatically crossing page boundaries as required. +func (client CachesClient) ListComplete(ctx context.Context) (result CachesListResultIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/CachesClient.List") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.List(ctx) + return +} + +// ListByResourceGroup returns all Caches the user has access to under a resource group. +// Parameters: +// resourceGroupName - target resource group. +func (client CachesClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result CachesListResultPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/CachesClient.ListByResourceGroup") + defer func() { + sc := -1 + if result.clr.Response.Response != nil { + sc = result.clr.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.fn = client.listByResourceGroupNextResults + req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "ListByResourceGroup", nil, "Failure preparing request") + return + } + + resp, err := client.ListByResourceGroupSender(req) + if err != nil { + result.clr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "ListByResourceGroup", resp, "Failure sending request") + return + } + + result.clr, err = client.ListByResourceGroupResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "ListByResourceGroup", resp, "Failure responding to request") + } + + return +} + +// ListByResourceGroupPreparer prepares the ListByResourceGroup request. +func (client CachesClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the +// http.Response Body if it receives an error. +func (client CachesClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always +// closes the http.Response Body. +func (client CachesClient) ListByResourceGroupResponder(resp *http.Response) (result CachesListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listByResourceGroupNextResults retrieves the next set of results, if any. +func (client CachesClient) listByResourceGroupNextResults(ctx context.Context, lastResults CachesListResult) (result CachesListResult, err error) { + req, err := lastResults.cachesListResultPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "storagecache.CachesClient", "listByResourceGroupNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListByResourceGroupSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "storagecache.CachesClient", "listByResourceGroupNextResults", resp, "Failure sending next results request") + } + result, err = client.ListByResourceGroupResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListByResourceGroupComplete enumerates all values, automatically crossing page boundaries as required. +func (client CachesClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result CachesListResultIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/CachesClient.ListByResourceGroup") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.ListByResourceGroup(ctx, resourceGroupName) + return +} + +// Start tells a Stopped state Cache to transition to Active state. +// Parameters: +// resourceGroupName - target resource group. +// cacheName - name of Cache. +func (client CachesClient) Start(ctx context.Context, resourceGroupName string, cacheName string) (result CachesStartFuture, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/CachesClient.Start") + defer func() { + sc := -1 + if result.Response() != nil { + sc = result.Response().StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: cacheName, + Constraints: []validation.Constraint{{Target: "cacheName", Name: validation.Pattern, Rule: `^[-0-9a-zA-Z_]{1,31}$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("storagecache.CachesClient", "Start", err.Error()) + } + + req, err := client.StartPreparer(ctx, resourceGroupName, cacheName) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "Start", nil, "Failure preparing request") + return + } + + result, err = client.StartSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "Start", result.Response(), "Failure sending request") + return + } + + return +} + +// StartPreparer prepares the Start request. +func (client CachesClient) StartPreparer(ctx context.Context, resourceGroupName string, cacheName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "cacheName": autorest.Encode("path", cacheName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/start", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// StartSender sends the Start request. The method will close the +// http.Response Body if it receives an error. +func (client CachesClient) StartSender(req *http.Request) (future CachesStartFuture, err error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, sd...) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// StartResponder handles the response to the Start request. The method always +// closes the http.Response Body. +func (client CachesClient) StartResponder(resp *http.Response) (result SetObject, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Stop tells an Active Cache to transition to Stopped state. +// Parameters: +// resourceGroupName - target resource group. +// cacheName - name of Cache. +func (client CachesClient) Stop(ctx context.Context, resourceGroupName string, cacheName string) (result CachesStopFuture, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/CachesClient.Stop") + defer func() { + sc := -1 + if result.Response() != nil { + sc = result.Response().StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: cacheName, + Constraints: []validation.Constraint{{Target: "cacheName", Name: validation.Pattern, Rule: `^[-0-9a-zA-Z_]{1,31}$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("storagecache.CachesClient", "Stop", err.Error()) + } + + req, err := client.StopPreparer(ctx, resourceGroupName, cacheName) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "Stop", nil, "Failure preparing request") + return + } + + result, err = client.StopSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "Stop", result.Response(), "Failure sending request") + return + } + + return +} + +// StopPreparer prepares the Stop request. +func (client CachesClient) StopPreparer(ctx context.Context, resourceGroupName string, cacheName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "cacheName": autorest.Encode("path", cacheName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/stop", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// StopSender sends the Stop request. The method will close the +// http.Response Body if it receives an error. +func (client CachesClient) StopSender(req *http.Request) (future CachesStopFuture, err error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, sd...) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// StopResponder handles the response to the Stop request. The method always +// closes the http.Response Body. +func (client CachesClient) StopResponder(resp *http.Response) (result SetObject, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Update update a Cache instance. +// Parameters: +// resourceGroupName - target resource group. +// cacheName - name of Cache. +// cache - object containing the user-selectable properties of the Cache. If read-only properties are included, +// they must match the existing values of those properties. +func (client CachesClient) Update(ctx context.Context, resourceGroupName string, cacheName string, cache *Cache) (result Cache, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/CachesClient.Update") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: cacheName, + Constraints: []validation.Constraint{{Target: "cacheName", Name: validation.Pattern, Rule: `^[-0-9a-zA-Z_]{1,31}$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("storagecache.CachesClient", "Update", err.Error()) + } + + req, err := client.UpdatePreparer(ctx, resourceGroupName, cacheName, cache) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "Update", nil, "Failure preparing request") + return + } + + resp, err := client.UpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "Update", resp, "Failure sending request") + return + } + + result, err = client.UpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "Update", resp, "Failure responding to request") + } + + return +} + +// UpdatePreparer prepares the Update request. +func (client CachesClient) UpdatePreparer(ctx context.Context, resourceGroupName string, cacheName string, cache *Cache) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "cacheName": autorest.Encode("path", cacheName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + cache.ID = nil + cache.Name = nil + cache.Type = nil + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPatch(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + if cache != nil { + preparer = autorest.DecoratePreparer(preparer, + autorest.WithJSON(cache)) + } + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// UpdateSender sends the Update request. The method will close the +// http.Response Body if it receives an error. +func (client CachesClient) UpdateSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// UpdateResponder handles the response to the Update request. The method always +// closes the http.Response Body. +func (client CachesClient) UpdateResponder(resp *http.Response) (result Cache, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// UpgradeFirmware upgrade a Cache's firmware if a new version is available. Otherwise, this operation has no effect. +// Parameters: +// resourceGroupName - target resource group. +// cacheName - name of Cache. +func (client CachesClient) UpgradeFirmware(ctx context.Context, resourceGroupName string, cacheName string) (result CachesUpgradeFirmwareFuture, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/CachesClient.UpgradeFirmware") + defer func() { + sc := -1 + if result.Response() != nil { + sc = result.Response().StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: cacheName, + Constraints: []validation.Constraint{{Target: "cacheName", Name: validation.Pattern, Rule: `^[-0-9a-zA-Z_]{1,31}$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("storagecache.CachesClient", "UpgradeFirmware", err.Error()) + } + + req, err := client.UpgradeFirmwarePreparer(ctx, resourceGroupName, cacheName) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "UpgradeFirmware", nil, "Failure preparing request") + return + } + + result, err = client.UpgradeFirmwareSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesClient", "UpgradeFirmware", result.Response(), "Failure sending request") + return + } + + return +} + +// UpgradeFirmwarePreparer prepares the UpgradeFirmware request. +func (client CachesClient) UpgradeFirmwarePreparer(ctx context.Context, resourceGroupName string, cacheName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "cacheName": autorest.Encode("path", cacheName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/upgrade", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// UpgradeFirmwareSender sends the UpgradeFirmware request. The method will close the +// http.Response Body if it receives an error. +func (client CachesClient) UpgradeFirmwareSender(req *http.Request) (future CachesUpgradeFirmwareFuture, err error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, sd...) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// UpgradeFirmwareResponder handles the response to the UpgradeFirmware request. The method always +// closes the http.Response Body. +func (client CachesClient) UpgradeFirmwareResponder(resp *http.Response) (result SetObject, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted, http.StatusNoContent), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/client.go new file mode 100644 index 0000000000000..36b7e67ad288c --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/client.go @@ -0,0 +1,52 @@ +// Package storagecache implements the Azure ARM Storagecache service API version 2019-11-01. +// +// A Storage Cache provides scalable caching service for NAS clients, serving data from either NFSv3 or Blob at-rest +// storage (referred to as "Storage Targets"). These operations allow you to manage Caches. +package storagecache + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "github.com/Azure/go-autorest/autorest" +) + +const ( + // DefaultBaseURI is the default URI used for the service Storagecache + DefaultBaseURI = "https://management.azure.com" +) + +// BaseClient is the base client for Storagecache. +type BaseClient struct { + autorest.Client + BaseURI string + SubscriptionID string +} + +// New creates an instance of the BaseClient client. +func New(subscriptionID string) BaseClient { + return NewWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewWithBaseURI creates an instance of the BaseClient client. +func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { + return BaseClient{ + Client: autorest.NewClientWithUserAgent(UserAgent()), + BaseURI: baseURI, + SubscriptionID: subscriptionID, + } +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/models.go new file mode 100644 index 0000000000000..b02cecd0b3ec4 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/models.go @@ -0,0 +1,1481 @@ +package storagecache + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "encoding/json" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/date" + "github.com/Azure/go-autorest/autorest/to" + "github.com/Azure/go-autorest/tracing" + "net/http" +) + +// The package's fully qualified name. +const fqdn = "github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache" + +// FirmwareStatusType enumerates the values for firmware status type. +type FirmwareStatusType string + +const ( + // Available ... + Available FirmwareStatusType = "available" + // Unavailable ... + Unavailable FirmwareStatusType = "unavailable" +) + +// PossibleFirmwareStatusTypeValues returns an array of possible values for the FirmwareStatusType const type. +func PossibleFirmwareStatusTypeValues() []FirmwareStatusType { + return []FirmwareStatusType{Available, Unavailable} +} + +// HealthStateType enumerates the values for health state type. +type HealthStateType string + +const ( + // Degraded ... + Degraded HealthStateType = "Degraded" + // Down ... + Down HealthStateType = "Down" + // Flushing ... + Flushing HealthStateType = "Flushing" + // Healthy ... + Healthy HealthStateType = "Healthy" + // Stopped ... + Stopped HealthStateType = "Stopped" + // Stopping ... + Stopping HealthStateType = "Stopping" + // Transitioning ... + Transitioning HealthStateType = "Transitioning" + // Unknown ... + Unknown HealthStateType = "Unknown" + // Upgrading ... + Upgrading HealthStateType = "Upgrading" +) + +// PossibleHealthStateTypeValues returns an array of possible values for the HealthStateType const type. +func PossibleHealthStateTypeValues() []HealthStateType { + return []HealthStateType{Degraded, Down, Flushing, Healthy, Stopped, Stopping, Transitioning, Unknown, Upgrading} +} + +// ProvisioningStateType enumerates the values for provisioning state type. +type ProvisioningStateType string + +const ( + // Cancelled ... + Cancelled ProvisioningStateType = "Cancelled" + // Creating ... + Creating ProvisioningStateType = "Creating" + // Deleting ... + Deleting ProvisioningStateType = "Deleting" + // Failed ... + Failed ProvisioningStateType = "Failed" + // Succeeded ... + Succeeded ProvisioningStateType = "Succeeded" + // Updating ... + Updating ProvisioningStateType = "Updating" +) + +// PossibleProvisioningStateTypeValues returns an array of possible values for the ProvisioningStateType const type. +func PossibleProvisioningStateTypeValues() []ProvisioningStateType { + return []ProvisioningStateType{Cancelled, Creating, Deleting, Failed, Succeeded, Updating} +} + +// ReasonCode enumerates the values for reason code. +type ReasonCode string + +const ( + // NotAvailableForSubscription ... + NotAvailableForSubscription ReasonCode = "NotAvailableForSubscription" + // QuotaID ... + QuotaID ReasonCode = "QuotaId" +) + +// PossibleReasonCodeValues returns an array of possible values for the ReasonCode const type. +func PossibleReasonCodeValues() []ReasonCode { + return []ReasonCode{NotAvailableForSubscription, QuotaID} +} + +// StorageTargetType enumerates the values for storage target type. +type StorageTargetType string + +const ( + // StorageTargetTypeClfs ... + StorageTargetTypeClfs StorageTargetType = "clfs" + // StorageTargetTypeNfs3 ... + StorageTargetTypeNfs3 StorageTargetType = "nfs3" + // StorageTargetTypeUnknown ... + StorageTargetTypeUnknown StorageTargetType = "unknown" +) + +// PossibleStorageTargetTypeValues returns an array of possible values for the StorageTargetType const type. +func PossibleStorageTargetTypeValues() []StorageTargetType { + return []StorageTargetType{StorageTargetTypeClfs, StorageTargetTypeNfs3, StorageTargetTypeUnknown} +} + +// APIOperation REST API operation description: see +// https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/openapi-authoring-automated-guidelines.md#r3023-operationsapiimplementation +type APIOperation struct { + // Display - The object that represents the operation. + Display *APIOperationDisplay `json:"display,omitempty"` + // Name - Operation name: {provider}/{resource}/{operation} + Name *string `json:"name,omitempty"` +} + +// APIOperationDisplay the object that represents the operation. +type APIOperationDisplay struct { + // Operation - Operation type: Read, write, delete, etc. + Operation *string `json:"operation,omitempty"` + // Provider - Service provider: Microsoft.StorageCache + Provider *string `json:"provider,omitempty"` + // Resource - Resource on which the operation is performed: Cache, etc. + Resource *string `json:"resource,omitempty"` +} + +// APIOperationListResult result of the request to list Resource Provider operations. It contains a list of +// operations and a URL link to get the next set of results. +type APIOperationListResult struct { + autorest.Response `json:"-"` + // NextLink - URL to get the next set of operation list results if there are any. + NextLink *string `json:"nextLink,omitempty"` + // Value - List of Resource Provider operations supported by the Microsoft.StorageCache resource provider. + Value *[]APIOperation `json:"value,omitempty"` +} + +// APIOperationListResultIterator provides access to a complete listing of APIOperation values. +type APIOperationListResultIterator struct { + i int + page APIOperationListResultPage +} + +// NextWithContext advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *APIOperationListResultIterator) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/APIOperationListResultIterator.NextWithContext") + defer func() { + sc := -1 + if iter.Response().Response.Response != nil { + sc = iter.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err = iter.page.NextWithContext(ctx) + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (iter *APIOperationListResultIterator) Next() error { + return iter.NextWithContext(context.Background()) +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter APIOperationListResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter APIOperationListResultIterator) Response() APIOperationListResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter APIOperationListResultIterator) Value() APIOperation { + if !iter.page.NotDone() { + return APIOperation{} + } + return iter.page.Values()[iter.i] +} + +// Creates a new instance of the APIOperationListResultIterator type. +func NewAPIOperationListResultIterator(page APIOperationListResultPage) APIOperationListResultIterator { + return APIOperationListResultIterator{page: page} +} + +// IsEmpty returns true if the ListResult contains no values. +func (aolr APIOperationListResult) IsEmpty() bool { + return aolr.Value == nil || len(*aolr.Value) == 0 +} + +// aPIOperationListResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (aolr APIOperationListResult) aPIOperationListResultPreparer(ctx context.Context) (*http.Request, error) { + if aolr.NextLink == nil || len(to.String(aolr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare((&http.Request{}).WithContext(ctx), + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(aolr.NextLink))) +} + +// APIOperationListResultPage contains a page of APIOperation values. +type APIOperationListResultPage struct { + fn func(context.Context, APIOperationListResult) (APIOperationListResult, error) + aolr APIOperationListResult +} + +// NextWithContext advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *APIOperationListResultPage) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/APIOperationListResultPage.NextWithContext") + defer func() { + sc := -1 + if page.Response().Response.Response != nil { + sc = page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + next, err := page.fn(ctx, page.aolr) + if err != nil { + return err + } + page.aolr = next + return nil +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (page *APIOperationListResultPage) Next() error { + return page.NextWithContext(context.Background()) +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page APIOperationListResultPage) NotDone() bool { + return !page.aolr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page APIOperationListResultPage) Response() APIOperationListResult { + return page.aolr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page APIOperationListResultPage) Values() []APIOperation { + if page.aolr.IsEmpty() { + return nil + } + return *page.aolr.Value +} + +// Creates a new instance of the APIOperationListResultPage type. +func NewAPIOperationListResultPage(getNextPage func(context.Context, APIOperationListResult) (APIOperationListResult, error)) APIOperationListResultPage { + return APIOperationListResultPage{fn: getNextPage} +} + +// Cache a Cache instance. Follows Azure Resource Manager standards: +// https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/resource-api-reference.md +type Cache struct { + autorest.Response `json:"-"` + // Tags - ARM tags as name/value pairs. + Tags interface{} `json:"tags,omitempty"` + // ID - READ-ONLY; Resource ID of the Cache. + ID *string `json:"id,omitempty"` + // Location - Region name string. + Location *string `json:"location,omitempty"` + // Name - READ-ONLY; Name of Cache. + Name *string `json:"name,omitempty"` + // Type - READ-ONLY; Type of the Cache; Microsoft.StorageCache/Cache + Type *string `json:"type,omitempty"` + // CacheProperties - Properties of the Cache. + *CacheProperties `json:"properties,omitempty"` + // Sku - SKU for the Cache. + Sku *CacheSku `json:"sku,omitempty"` +} + +// MarshalJSON is the custom marshaler for Cache. +func (c Cache) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if c.Tags != nil { + objectMap["tags"] = c.Tags + } + if c.Location != nil { + objectMap["location"] = c.Location + } + if c.CacheProperties != nil { + objectMap["properties"] = c.CacheProperties + } + if c.Sku != nil { + objectMap["sku"] = c.Sku + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for Cache struct. +func (c *Cache) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "tags": + if v != nil { + var tags interface{} + err = json.Unmarshal(*v, &tags) + if err != nil { + return err + } + c.Tags = tags + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + c.ID = &ID + } + case "location": + if v != nil { + var location string + err = json.Unmarshal(*v, &location) + if err != nil { + return err + } + c.Location = &location + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + c.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + c.Type = &typeVar + } + case "properties": + if v != nil { + var cacheProperties CacheProperties + err = json.Unmarshal(*v, &cacheProperties) + if err != nil { + return err + } + c.CacheProperties = &cacheProperties + } + case "sku": + if v != nil { + var sku CacheSku + err = json.Unmarshal(*v, &sku) + if err != nil { + return err + } + c.Sku = &sku + } + } + } + + return nil +} + +// CacheHealth an indication of Cache health. Gives more information about health than just that related to +// provisioning. +type CacheHealth struct { + // State - List of Cache health states. Possible values include: 'Unknown', 'Healthy', 'Degraded', 'Down', 'Transitioning', 'Stopping', 'Stopped', 'Upgrading', 'Flushing' + State HealthStateType `json:"state,omitempty"` + // StatusDescription - Describes explanation of state. + StatusDescription *string `json:"statusDescription,omitempty"` +} + +// CacheProperties properties of the Cache. +type CacheProperties struct { + // CacheSizeGB - The size of this Cache, in GB. + CacheSizeGB *int32 `json:"cacheSizeGB,omitempty"` + // Health - READ-ONLY; Health of the Cache. + Health *CacheHealth `json:"health,omitempty"` + // MountAddresses - READ-ONLY; Array of IP addresses that can be used by clients mounting this Cache. + MountAddresses *[]string `json:"mountAddresses,omitempty"` + // ProvisioningState - ARM provisioning state, see https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/Addendum.md#provisioningstate-property. Possible values include: 'Succeeded', 'Failed', 'Cancelled', 'Creating', 'Deleting', 'Updating' + ProvisioningState ProvisioningStateType `json:"provisioningState,omitempty"` + // Subnet - Subnet used for the Cache. + Subnet *string `json:"subnet,omitempty"` + // UpgradeStatus - Upgrade status of the Cache. + UpgradeStatus *CacheUpgradeStatus `json:"upgradeStatus,omitempty"` +} + +// CachesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running +// operation. +type CachesCreateOrUpdateFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *CachesCreateOrUpdateFuture) Result(client CachesClient) (c Cache, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("storagecache.CachesCreateOrUpdateFuture") + return + } + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if c.Response.Response, err = future.GetResult(sender); err == nil && c.Response.Response.StatusCode != http.StatusNoContent { + c, err = client.CreateOrUpdateResponder(c.Response.Response) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesCreateOrUpdateFuture", "Result", c.Response.Response, "Failure responding to request") + } + } + return +} + +// CachesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. +type CachesDeleteFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *CachesDeleteFuture) Result(client CachesClient) (so SetObject, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesDeleteFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("storagecache.CachesDeleteFuture") + return + } + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if so.Response.Response, err = future.GetResult(sender); err == nil && so.Response.Response.StatusCode != http.StatusNoContent { + so, err = client.DeleteResponder(so.Response.Response) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesDeleteFuture", "Result", so.Response.Response, "Failure responding to request") + } + } + return +} + +// CachesFlushFuture an abstraction for monitoring and retrieving the results of a long-running operation. +type CachesFlushFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *CachesFlushFuture) Result(client CachesClient) (so SetObject, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesFlushFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("storagecache.CachesFlushFuture") + return + } + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if so.Response.Response, err = future.GetResult(sender); err == nil && so.Response.Response.StatusCode != http.StatusNoContent { + so, err = client.FlushResponder(so.Response.Response) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesFlushFuture", "Result", so.Response.Response, "Failure responding to request") + } + } + return +} + +// CacheSku SKU for the Cache. +type CacheSku struct { + // Name - SKU name for this Cache. + Name *string `json:"name,omitempty"` +} + +// CachesListResult result of the request to list Caches. It contains a list of Caches and a URL link to +// get the next set of results. +type CachesListResult struct { + autorest.Response `json:"-"` + // NextLink - URL to get the next set of Cache list results, if there are any. + NextLink *string `json:"nextLink,omitempty"` + // Value - List of Caches. + Value *[]Cache `json:"value,omitempty"` +} + +// CachesListResultIterator provides access to a complete listing of Cache values. +type CachesListResultIterator struct { + i int + page CachesListResultPage +} + +// NextWithContext advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *CachesListResultIterator) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/CachesListResultIterator.NextWithContext") + defer func() { + sc := -1 + if iter.Response().Response.Response != nil { + sc = iter.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err = iter.page.NextWithContext(ctx) + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (iter *CachesListResultIterator) Next() error { + return iter.NextWithContext(context.Background()) +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter CachesListResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter CachesListResultIterator) Response() CachesListResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter CachesListResultIterator) Value() Cache { + if !iter.page.NotDone() { + return Cache{} + } + return iter.page.Values()[iter.i] +} + +// Creates a new instance of the CachesListResultIterator type. +func NewCachesListResultIterator(page CachesListResultPage) CachesListResultIterator { + return CachesListResultIterator{page: page} +} + +// IsEmpty returns true if the ListResult contains no values. +func (clr CachesListResult) IsEmpty() bool { + return clr.Value == nil || len(*clr.Value) == 0 +} + +// cachesListResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (clr CachesListResult) cachesListResultPreparer(ctx context.Context) (*http.Request, error) { + if clr.NextLink == nil || len(to.String(clr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare((&http.Request{}).WithContext(ctx), + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(clr.NextLink))) +} + +// CachesListResultPage contains a page of Cache values. +type CachesListResultPage struct { + fn func(context.Context, CachesListResult) (CachesListResult, error) + clr CachesListResult +} + +// NextWithContext advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *CachesListResultPage) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/CachesListResultPage.NextWithContext") + defer func() { + sc := -1 + if page.Response().Response.Response != nil { + sc = page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + next, err := page.fn(ctx, page.clr) + if err != nil { + return err + } + page.clr = next + return nil +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (page *CachesListResultPage) Next() error { + return page.NextWithContext(context.Background()) +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page CachesListResultPage) NotDone() bool { + return !page.clr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page CachesListResultPage) Response() CachesListResult { + return page.clr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page CachesListResultPage) Values() []Cache { + if page.clr.IsEmpty() { + return nil + } + return *page.clr.Value +} + +// Creates a new instance of the CachesListResultPage type. +func NewCachesListResultPage(getNextPage func(context.Context, CachesListResult) (CachesListResult, error)) CachesListResultPage { + return CachesListResultPage{fn: getNextPage} +} + +// CachesStartFuture an abstraction for monitoring and retrieving the results of a long-running operation. +type CachesStartFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *CachesStartFuture) Result(client CachesClient) (so SetObject, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesStartFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("storagecache.CachesStartFuture") + return + } + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if so.Response.Response, err = future.GetResult(sender); err == nil && so.Response.Response.StatusCode != http.StatusNoContent { + so, err = client.StartResponder(so.Response.Response) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesStartFuture", "Result", so.Response.Response, "Failure responding to request") + } + } + return +} + +// CachesStopFuture an abstraction for monitoring and retrieving the results of a long-running operation. +type CachesStopFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *CachesStopFuture) Result(client CachesClient) (so SetObject, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesStopFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("storagecache.CachesStopFuture") + return + } + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if so.Response.Response, err = future.GetResult(sender); err == nil && so.Response.Response.StatusCode != http.StatusNoContent { + so, err = client.StopResponder(so.Response.Response) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesStopFuture", "Result", so.Response.Response, "Failure responding to request") + } + } + return +} + +// CachesUpgradeFirmwareFuture an abstraction for monitoring and retrieving the results of a long-running +// operation. +type CachesUpgradeFirmwareFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *CachesUpgradeFirmwareFuture) Result(client CachesClient) (so SetObject, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesUpgradeFirmwareFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("storagecache.CachesUpgradeFirmwareFuture") + return + } + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if so.Response.Response, err = future.GetResult(sender); err == nil && so.Response.Response.StatusCode != http.StatusNoContent { + so, err = client.UpgradeFirmwareResponder(so.Response.Response) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.CachesUpgradeFirmwareFuture", "Result", so.Response.Response, "Failure responding to request") + } + } + return +} + +// CacheUpgradeStatus properties describing the software upgrade state of the Cache. +type CacheUpgradeStatus struct { + // CurrentFirmwareVersion - READ-ONLY; Version string of the firmware currently installed on this Cache. + CurrentFirmwareVersion *string `json:"currentFirmwareVersion,omitempty"` + // FirmwareUpdateStatus - READ-ONLY; True if there is a firmware update ready to install on this Cache. The firmware will automatically be installed after firmwareUpdateDeadline if not triggered earlier via the upgrade operation. Possible values include: 'Available', 'Unavailable' + FirmwareUpdateStatus FirmwareStatusType `json:"firmwareUpdateStatus,omitempty"` + // FirmwareUpdateDeadline - READ-ONLY; Time at which the pending firmware update will automatically be installed on the Cache. + FirmwareUpdateDeadline *date.Time `json:"firmwareUpdateDeadline,omitempty"` + // LastFirmwareUpdate - READ-ONLY; Time of the last successful firmware update. + LastFirmwareUpdate *date.Time `json:"lastFirmwareUpdate,omitempty"` + // PendingFirmwareVersion - READ-ONLY; When firmwareUpdateAvailable is true, this field holds the version string for the update. + PendingFirmwareVersion *string `json:"pendingFirmwareVersion,omitempty"` +} + +// ClfsTarget storage container for use as a CLFS Storage Target. +type ClfsTarget struct { + // Target - Resource ID of storage container. + Target *string `json:"target,omitempty"` +} + +// CloudError an error response. +type CloudError struct { + // Error - The body of the error. + Error *CloudErrorBody `json:"error,omitempty"` +} + +// CloudErrorBody an error response. +type CloudErrorBody struct { + // Code - An identifier for the error. Codes are invariant and are intended to be consumed programmatically. + Code *string `json:"code,omitempty"` + // Details - A list of additional details about the error. + Details *[]CloudErrorBody `json:"details,omitempty"` + // Message - A message describing the error, intended to be suitable for display in a user interface. + Message *string `json:"message,omitempty"` + // Target - The target of the particular error. For example, the name of the property in error. + Target *string `json:"target,omitempty"` +} + +// NamespaceJunction a namespace junction. +type NamespaceJunction struct { + // NamespacePath - Namespace path on a Cache for a Storage Target. + NamespacePath *string `json:"namespacePath,omitempty"` + // TargetPath - Path in Storage Target to which namespacePath points. + TargetPath *string `json:"targetPath,omitempty"` + // NfsExport - NFS export where targetPath exists. + NfsExport *string `json:"nfsExport,omitempty"` +} + +// Nfs3Target an NFSv3 mount point for use as a Storage Target. +type Nfs3Target struct { + // Target - IP address or host name of an NFSv3 host (e.g., 10.0.44.44). + Target *string `json:"target,omitempty"` + // UsageModel - Identifies the primary usage model to be used for this Storage Target. Get choices from .../usageModels + UsageModel *string `json:"usageModel,omitempty"` +} + +// ResourceSku a resource SKU. +type ResourceSku struct { + // ResourceType - READ-ONLY; The type of resource the SKU applies to. + ResourceType *string `json:"resourceType,omitempty"` + // Capabilities - A list of capabilities of this SKU, such as throughput or ops/sec. + Capabilities *[]ResourceSkuCapabilities `json:"capabilities,omitempty"` + // Locations - READ-ONLY; The set of locations that the SKU is available. This will be supported and registered Azure Geo Regions (e.g., West US, East US, Southeast Asia, etc.). + Locations *[]string `json:"locations,omitempty"` + // LocationInfo - The set of locations that the SKU is available. + LocationInfo *[]ResourceSkuLocationInfo `json:"locationInfo,omitempty"` + // Name - The name of this SKU. + Name *string `json:"name,omitempty"` + // Restrictions - The restrictions preventing this SKU from being used. This is empty if there are no restrictions. + Restrictions *[]Restriction `json:"restrictions,omitempty"` +} + +// ResourceSkuCapabilities a resource SKU capability. +type ResourceSkuCapabilities struct { + // Name - Name of a capability, such as ops/sec. + Name *string `json:"name,omitempty"` + // Value - Quantity, if the capability is measured by quantity. + Value *string `json:"value,omitempty"` +} + +// ResourceSkuLocationInfo resource SKU location information. +type ResourceSkuLocationInfo struct { + // Location - Location where this SKU is available. + Location *string `json:"location,omitempty"` + // Zones - Zones if any. + Zones *[]string `json:"zones,omitempty"` +} + +// ResourceSkusResult the response from the List Cache SKUs operation. +type ResourceSkusResult struct { + autorest.Response `json:"-"` + // NextLink - The URI to fetch the next page of Cache SKUs. + NextLink *string `json:"nextLink,omitempty"` + // Value - READ-ONLY; The list of SKUs available for the subscription. + Value *[]ResourceSku `json:"value,omitempty"` +} + +// ResourceSkusResultIterator provides access to a complete listing of ResourceSku values. +type ResourceSkusResultIterator struct { + i int + page ResourceSkusResultPage +} + +// NextWithContext advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *ResourceSkusResultIterator) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ResourceSkusResultIterator.NextWithContext") + defer func() { + sc := -1 + if iter.Response().Response.Response != nil { + sc = iter.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err = iter.page.NextWithContext(ctx) + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (iter *ResourceSkusResultIterator) Next() error { + return iter.NextWithContext(context.Background()) +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter ResourceSkusResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter ResourceSkusResultIterator) Response() ResourceSkusResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter ResourceSkusResultIterator) Value() ResourceSku { + if !iter.page.NotDone() { + return ResourceSku{} + } + return iter.page.Values()[iter.i] +} + +// Creates a new instance of the ResourceSkusResultIterator type. +func NewResourceSkusResultIterator(page ResourceSkusResultPage) ResourceSkusResultIterator { + return ResourceSkusResultIterator{page: page} +} + +// IsEmpty returns true if the ListResult contains no values. +func (rsr ResourceSkusResult) IsEmpty() bool { + return rsr.Value == nil || len(*rsr.Value) == 0 +} + +// resourceSkusResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (rsr ResourceSkusResult) resourceSkusResultPreparer(ctx context.Context) (*http.Request, error) { + if rsr.NextLink == nil || len(to.String(rsr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare((&http.Request{}).WithContext(ctx), + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(rsr.NextLink))) +} + +// ResourceSkusResultPage contains a page of ResourceSku values. +type ResourceSkusResultPage struct { + fn func(context.Context, ResourceSkusResult) (ResourceSkusResult, error) + rsr ResourceSkusResult +} + +// NextWithContext advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *ResourceSkusResultPage) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ResourceSkusResultPage.NextWithContext") + defer func() { + sc := -1 + if page.Response().Response.Response != nil { + sc = page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + next, err := page.fn(ctx, page.rsr) + if err != nil { + return err + } + page.rsr = next + return nil +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (page *ResourceSkusResultPage) Next() error { + return page.NextWithContext(context.Background()) +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page ResourceSkusResultPage) NotDone() bool { + return !page.rsr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page ResourceSkusResultPage) Response() ResourceSkusResult { + return page.rsr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page ResourceSkusResultPage) Values() []ResourceSku { + if page.rsr.IsEmpty() { + return nil + } + return *page.rsr.Value +} + +// Creates a new instance of the ResourceSkusResultPage type. +func NewResourceSkusResultPage(getNextPage func(context.Context, ResourceSkusResult) (ResourceSkusResult, error)) ResourceSkusResultPage { + return ResourceSkusResultPage{fn: getNextPage} +} + +// Restriction the restrictions preventing this SKU from being used. +type Restriction struct { + // Type - READ-ONLY; The type of restrictions. In this version, the only possible value for this is location. + Type *string `json:"type,omitempty"` + // Values - READ-ONLY; The value of restrictions. If the restriction type is set to location, then this would be the different locations where the SKU is restricted. + Values *[]string `json:"values,omitempty"` + // ReasonCode - The reason for the restriction. As of now this can be "QuotaId" or "NotAvailableForSubscription". "QuotaId" is set when the SKU has requiredQuotas parameter as the subscription does not belong to that quota. "NotAvailableForSubscription" is related to capacity at the datacenter. Possible values include: 'QuotaID', 'NotAvailableForSubscription' + ReasonCode ReasonCode `json:"reasonCode,omitempty"` +} + +// SetObject ... +type SetObject struct { + autorest.Response `json:"-"` + Value interface{} `json:"value,omitempty"` +} + +// StorageTarget a storage system being cached by a Cache. +type StorageTarget struct { + autorest.Response `json:"-"` + // Name - READ-ONLY; Name of the Storage Target. + Name *string `json:"name,omitempty"` + // ID - READ-ONLY; Resource ID of the Storage Target. + ID *string `json:"id,omitempty"` + // Type - READ-ONLY; Type of the Storage Target; Microsoft.StorageCache/Cache/StorageTarget + Type *string `json:"type,omitempty"` + // StorageTargetProperties - Properties of the Storage Target. + *StorageTargetProperties `json:"properties,omitempty"` +} + +// MarshalJSON is the custom marshaler for StorageTarget. +func (st StorageTarget) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if st.StorageTargetProperties != nil { + objectMap["properties"] = st.StorageTargetProperties + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for StorageTarget struct. +func (st *StorageTarget) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + st.Name = &name + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + st.ID = &ID + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + st.Type = &typeVar + } + case "properties": + if v != nil { + var storageTargetProperties StorageTargetProperties + err = json.Unmarshal(*v, &storageTargetProperties) + if err != nil { + return err + } + st.StorageTargetProperties = &storageTargetProperties + } + } + } + + return nil +} + +// StorageTargetProperties properties of the Storage Target. +type StorageTargetProperties struct { + // Junctions - List of Cache namespace junctions to target for namespace associations. + Junctions *[]NamespaceJunction `json:"junctions,omitempty"` + // TargetType - Type of the Storage Target. Possible values include: 'StorageTargetTypeNfs3', 'StorageTargetTypeClfs', 'StorageTargetTypeUnknown' + TargetType StorageTargetType `json:"targetType,omitempty"` + // ProvisioningState - ARM provisioning state, see https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/Addendum.md#provisioningstate-property. Possible values include: 'Succeeded', 'Failed', 'Cancelled', 'Creating', 'Deleting', 'Updating' + ProvisioningState ProvisioningStateType `json:"provisioningState,omitempty"` + // Nfs3 - Properties when targetType is nfs3. + Nfs3 *Nfs3Target `json:"nfs3,omitempty"` + // Clfs - Properties when targetType is clfs. + Clfs *ClfsTarget `json:"clfs,omitempty"` + // Unknown - Properties when targetType is unknown. + Unknown *UnknownTarget `json:"unknown,omitempty"` +} + +// StorageTargetsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a +// long-running operation. +type StorageTargetsCreateOrUpdateFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *StorageTargetsCreateOrUpdateFuture) Result(client StorageTargetsClient) (st StorageTarget, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.StorageTargetsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("storagecache.StorageTargetsCreateOrUpdateFuture") + return + } + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if st.Response.Response, err = future.GetResult(sender); err == nil && st.Response.Response.StatusCode != http.StatusNoContent { + st, err = client.CreateOrUpdateResponder(st.Response.Response) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.StorageTargetsCreateOrUpdateFuture", "Result", st.Response.Response, "Failure responding to request") + } + } + return +} + +// StorageTargetsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running +// operation. +type StorageTargetsDeleteFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *StorageTargetsDeleteFuture) Result(client StorageTargetsClient) (so SetObject, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.StorageTargetsDeleteFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("storagecache.StorageTargetsDeleteFuture") + return + } + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if so.Response.Response, err = future.GetResult(sender); err == nil && so.Response.Response.StatusCode != http.StatusNoContent { + so, err = client.DeleteResponder(so.Response.Response) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.StorageTargetsDeleteFuture", "Result", so.Response.Response, "Failure responding to request") + } + } + return +} + +// StorageTargetsResult a list of Storage Targets. +type StorageTargetsResult struct { + autorest.Response `json:"-"` + // NextLink - The URI to fetch the next page of Storage Targets. + NextLink *string `json:"nextLink,omitempty"` + // Value - The list of Storage Targets defined for the Cache. + Value *[]StorageTarget `json:"value,omitempty"` +} + +// StorageTargetsResultIterator provides access to a complete listing of StorageTarget values. +type StorageTargetsResultIterator struct { + i int + page StorageTargetsResultPage +} + +// NextWithContext advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *StorageTargetsResultIterator) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/StorageTargetsResultIterator.NextWithContext") + defer func() { + sc := -1 + if iter.Response().Response.Response != nil { + sc = iter.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err = iter.page.NextWithContext(ctx) + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (iter *StorageTargetsResultIterator) Next() error { + return iter.NextWithContext(context.Background()) +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter StorageTargetsResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter StorageTargetsResultIterator) Response() StorageTargetsResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter StorageTargetsResultIterator) Value() StorageTarget { + if !iter.page.NotDone() { + return StorageTarget{} + } + return iter.page.Values()[iter.i] +} + +// Creates a new instance of the StorageTargetsResultIterator type. +func NewStorageTargetsResultIterator(page StorageTargetsResultPage) StorageTargetsResultIterator { + return StorageTargetsResultIterator{page: page} +} + +// IsEmpty returns true if the ListResult contains no values. +func (str StorageTargetsResult) IsEmpty() bool { + return str.Value == nil || len(*str.Value) == 0 +} + +// storageTargetsResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (str StorageTargetsResult) storageTargetsResultPreparer(ctx context.Context) (*http.Request, error) { + if str.NextLink == nil || len(to.String(str.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare((&http.Request{}).WithContext(ctx), + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(str.NextLink))) +} + +// StorageTargetsResultPage contains a page of StorageTarget values. +type StorageTargetsResultPage struct { + fn func(context.Context, StorageTargetsResult) (StorageTargetsResult, error) + str StorageTargetsResult +} + +// NextWithContext advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *StorageTargetsResultPage) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/StorageTargetsResultPage.NextWithContext") + defer func() { + sc := -1 + if page.Response().Response.Response != nil { + sc = page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + next, err := page.fn(ctx, page.str) + if err != nil { + return err + } + page.str = next + return nil +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (page *StorageTargetsResultPage) Next() error { + return page.NextWithContext(context.Background()) +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page StorageTargetsResultPage) NotDone() bool { + return !page.str.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page StorageTargetsResultPage) Response() StorageTargetsResult { + return page.str +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page StorageTargetsResultPage) Values() []StorageTarget { + if page.str.IsEmpty() { + return nil + } + return *page.str.Value +} + +// Creates a new instance of the StorageTargetsResultPage type. +func NewStorageTargetsResultPage(getNextPage func(context.Context, StorageTargetsResult) (StorageTargetsResult, error)) StorageTargetsResultPage { + return StorageTargetsResultPage{fn: getNextPage} +} + +// UnknownTarget storage container for use as an Unknown Storage Target. +type UnknownTarget struct { + // UnknownMap - Dictionary of string->string pairs containing information about the Storage Target. + UnknownMap map[string]*string `json:"unknownMap"` +} + +// MarshalJSON is the custom marshaler for UnknownTarget. +func (ut UnknownTarget) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if ut.UnknownMap != nil { + objectMap["unknownMap"] = ut.UnknownMap + } + return json.Marshal(objectMap) +} + +// UsageModel a usage model. +type UsageModel struct { + // Display - Localized information describing this usage model. + Display *UsageModelDisplay `json:"display,omitempty"` + // ModelName - Non-localized keyword name for this usage model. + ModelName *string `json:"modelName,omitempty"` + // TargetType - The type of Storage Target to which this model is applicable (only nfs3 as of this version). + TargetType *string `json:"targetType,omitempty"` +} + +// UsageModelDisplay localized information describing this usage model. +type UsageModelDisplay struct { + // Description - String to display for this usage model. + Description *string `json:"description,omitempty"` +} + +// UsageModelsResult a list of Cache usage models. +type UsageModelsResult struct { + autorest.Response `json:"-"` + // NextLink - The URI to fetch the next page of Cache usage models. + NextLink *string `json:"nextLink,omitempty"` + // Value - The list of usage models available for the subscription. + Value *[]UsageModel `json:"value,omitempty"` +} + +// UsageModelsResultIterator provides access to a complete listing of UsageModel values. +type UsageModelsResultIterator struct { + i int + page UsageModelsResultPage +} + +// NextWithContext advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *UsageModelsResultIterator) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/UsageModelsResultIterator.NextWithContext") + defer func() { + sc := -1 + if iter.Response().Response.Response != nil { + sc = iter.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err = iter.page.NextWithContext(ctx) + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (iter *UsageModelsResultIterator) Next() error { + return iter.NextWithContext(context.Background()) +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter UsageModelsResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter UsageModelsResultIterator) Response() UsageModelsResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter UsageModelsResultIterator) Value() UsageModel { + if !iter.page.NotDone() { + return UsageModel{} + } + return iter.page.Values()[iter.i] +} + +// Creates a new instance of the UsageModelsResultIterator type. +func NewUsageModelsResultIterator(page UsageModelsResultPage) UsageModelsResultIterator { + return UsageModelsResultIterator{page: page} +} + +// IsEmpty returns true if the ListResult contains no values. +func (umr UsageModelsResult) IsEmpty() bool { + return umr.Value == nil || len(*umr.Value) == 0 +} + +// usageModelsResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (umr UsageModelsResult) usageModelsResultPreparer(ctx context.Context) (*http.Request, error) { + if umr.NextLink == nil || len(to.String(umr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare((&http.Request{}).WithContext(ctx), + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(umr.NextLink))) +} + +// UsageModelsResultPage contains a page of UsageModel values. +type UsageModelsResultPage struct { + fn func(context.Context, UsageModelsResult) (UsageModelsResult, error) + umr UsageModelsResult +} + +// NextWithContext advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *UsageModelsResultPage) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/UsageModelsResultPage.NextWithContext") + defer func() { + sc := -1 + if page.Response().Response.Response != nil { + sc = page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + next, err := page.fn(ctx, page.umr) + if err != nil { + return err + } + page.umr = next + return nil +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (page *UsageModelsResultPage) Next() error { + return page.NextWithContext(context.Background()) +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page UsageModelsResultPage) NotDone() bool { + return !page.umr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page UsageModelsResultPage) Response() UsageModelsResult { + return page.umr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page UsageModelsResultPage) Values() []UsageModel { + if page.umr.IsEmpty() { + return nil + } + return *page.umr.Value +} + +// Creates a new instance of the UsageModelsResultPage type. +func NewUsageModelsResultPage(getNextPage func(context.Context, UsageModelsResult) (UsageModelsResult, error)) UsageModelsResultPage { + return UsageModelsResultPage{fn: getNextPage} +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/operations.go new file mode 100644 index 0000000000000..fa94de5d5e2ea --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/operations.go @@ -0,0 +1,148 @@ +package storagecache + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/tracing" + "net/http" +) + +// OperationsClient is the a Storage Cache provides scalable caching service for NAS clients, serving data from either +// NFSv3 or Blob at-rest storage (referred to as "Storage Targets"). These operations allow you to manage Caches. +type OperationsClient struct { + BaseClient +} + +// NewOperationsClient creates an instance of the OperationsClient client. +func NewOperationsClient(subscriptionID string) OperationsClient { + return NewOperationsClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewOperationsClientWithBaseURI creates an instance of the OperationsClient client. +func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient { + return OperationsClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// List lists all of the available Resource Provider operations. +func (client OperationsClient) List(ctx context.Context) (result APIOperationListResultPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/OperationsClient.List") + defer func() { + sc := -1 + if result.aolr.Response.Response != nil { + sc = result.aolr.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.fn = client.listNextResults + req, err := client.ListPreparer(ctx) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.OperationsClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.aolr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "storagecache.OperationsClient", "List", resp, "Failure sending request") + return + } + + result.aolr, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.OperationsClient", "List", resp, "Failure responding to request") + } + + return +} + +// ListPreparer prepares the List request. +func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { + const APIVersion = "2019-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPath("/providers/Microsoft.StorageCache/operations"), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client OperationsClient) ListSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + return autorest.SendWithSender(client, req, sd...) +} + +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client OperationsClient) ListResponder(resp *http.Response) (result APIOperationListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listNextResults retrieves the next set of results, if any. +func (client OperationsClient) listNextResults(ctx context.Context, lastResults APIOperationListResult) (result APIOperationListResult, err error) { + req, err := lastResults.aPIOperationListResultPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "storagecache.OperationsClient", "listNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "storagecache.OperationsClient", "listNextResults", resp, "Failure sending next results request") + } + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.OperationsClient", "listNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListComplete enumerates all values, automatically crossing page boundaries as required. +func (client OperationsClient) ListComplete(ctx context.Context) (result APIOperationListResultIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/OperationsClient.List") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.List(ctx) + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/skus.go b/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/skus.go new file mode 100644 index 0000000000000..db004443cc76a --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/skus.go @@ -0,0 +1,152 @@ +package storagecache + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/tracing" + "net/http" +) + +// SkusClient is the a Storage Cache provides scalable caching service for NAS clients, serving data from either NFSv3 +// or Blob at-rest storage (referred to as "Storage Targets"). These operations allow you to manage Caches. +type SkusClient struct { + BaseClient +} + +// NewSkusClient creates an instance of the SkusClient client. +func NewSkusClient(subscriptionID string) SkusClient { + return NewSkusClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewSkusClientWithBaseURI creates an instance of the SkusClient client. +func NewSkusClientWithBaseURI(baseURI string, subscriptionID string) SkusClient { + return SkusClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// List get the list of StorageCache.Cache SKUs available to this subscription. +func (client SkusClient) List(ctx context.Context) (result ResourceSkusResultPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/SkusClient.List") + defer func() { + sc := -1 + if result.rsr.Response.Response != nil { + sc = result.rsr.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.fn = client.listNextResults + req, err := client.ListPreparer(ctx) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.SkusClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.rsr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "storagecache.SkusClient", "List", resp, "Failure sending request") + return + } + + result.rsr, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.SkusClient", "List", resp, "Failure responding to request") + } + + return +} + +// ListPreparer prepares the List request. +func (client SkusClient) ListPreparer(ctx context.Context) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.StorageCache/skus", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client SkusClient) ListSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client SkusClient) ListResponder(resp *http.Response) (result ResourceSkusResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listNextResults retrieves the next set of results, if any. +func (client SkusClient) listNextResults(ctx context.Context, lastResults ResourceSkusResult) (result ResourceSkusResult, err error) { + req, err := lastResults.resourceSkusResultPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "storagecache.SkusClient", "listNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "storagecache.SkusClient", "listNextResults", resp, "Failure sending next results request") + } + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.SkusClient", "listNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListComplete enumerates all values, automatically crossing page boundaries as required. +func (client SkusClient) ListComplete(ctx context.Context) (result ResourceSkusResultIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/SkusClient.List") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.List(ctx) + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/storagetargets.go b/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/storagetargets.go new file mode 100644 index 0000000000000..a42b3f26904f8 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/storagetargets.go @@ -0,0 +1,448 @@ +package storagecache + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "github.com/Azure/go-autorest/tracing" + "net/http" +) + +// StorageTargetsClient is the a Storage Cache provides scalable caching service for NAS clients, serving data from +// either NFSv3 or Blob at-rest storage (referred to as "Storage Targets"). These operations allow you to manage +// Caches. +type StorageTargetsClient struct { + BaseClient +} + +// NewStorageTargetsClient creates an instance of the StorageTargetsClient client. +func NewStorageTargetsClient(subscriptionID string) StorageTargetsClient { + return NewStorageTargetsClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewStorageTargetsClientWithBaseURI creates an instance of the StorageTargetsClient client. +func NewStorageTargetsClientWithBaseURI(baseURI string, subscriptionID string) StorageTargetsClient { + return StorageTargetsClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// CreateOrUpdate create or update a Storage Target. This operation is allowed at any time, but if the Cache is down or +// unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again. +// Parameters: +// resourceGroupName - target resource group. +// cacheName - name of Cache. +// storageTargetName - name of the Storage Target. +// storagetarget - object containing the definition of a Storage Target. +func (client StorageTargetsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, cacheName string, storageTargetName string, storagetarget *StorageTarget) (result StorageTargetsCreateOrUpdateFuture, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/StorageTargetsClient.CreateOrUpdate") + defer func() { + sc := -1 + if result.Response() != nil { + sc = result.Response().StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: cacheName, + Constraints: []validation.Constraint{{Target: "cacheName", Name: validation.Pattern, Rule: `^[-0-9a-zA-Z_]{1,31}$`, Chain: nil}}}, + {TargetValue: storageTargetName, + Constraints: []validation.Constraint{{Target: "storageTargetName", Name: validation.Pattern, Rule: `^[-0-9a-zA-Z_]{1,31}$`, Chain: nil}}}, + {TargetValue: storagetarget, + Constraints: []validation.Constraint{{Target: "storagetarget", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "storagetarget.StorageTargetProperties", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "storagetarget.StorageTargetProperties.Nfs3", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "storagetarget.StorageTargetProperties.Nfs3.Target", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "storagetarget.StorageTargetProperties.Nfs3.Target", Name: validation.Pattern, Rule: `^[-.0-9a-zA-Z]+$`, Chain: nil}}}, + }}, + }}, + }}}}}); err != nil { + return result, validation.NewError("storagecache.StorageTargetsClient", "CreateOrUpdate", err.Error()) + } + + req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, cacheName, storageTargetName, storagetarget) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.StorageTargetsClient", "CreateOrUpdate", nil, "Failure preparing request") + return + } + + result, err = client.CreateOrUpdateSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.StorageTargetsClient", "CreateOrUpdate", result.Response(), "Failure sending request") + return + } + + return +} + +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client StorageTargetsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, cacheName string, storageTargetName string, storagetarget *StorageTarget) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "cacheName": autorest.Encode("path", cacheName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "storageTargetName": autorest.Encode("path", storageTargetName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + storagetarget.Name = nil + storagetarget.ID = nil + storagetarget.Type = nil + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/storageTargets/{storageTargetName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + if storagetarget != nil { + preparer = autorest.DecoratePreparer(preparer, + autorest.WithJSON(storagetarget)) + } + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the +// http.Response Body if it receives an error. +func (client StorageTargetsClient) CreateOrUpdateSender(req *http.Request) (future StorageTargetsCreateOrUpdateFuture, err error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, sd...) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always +// closes the http.Response Body. +func (client StorageTargetsClient) CreateOrUpdateResponder(resp *http.Response) (result StorageTarget, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Delete removes a Storage Target from a Cache. This operation is allowed at any time, but if the Cache is down or +// unhealthy, the actual removal of the Storage Target may be delayed until the Cache is healthy again. Note that if +// the Cache has data to flush to the Storage Target, the data will be flushed before the Storage Target will be +// deleted. +// Parameters: +// resourceGroupName - target resource group. +// cacheName - name of Cache. +// storageTargetName - name of Storage Target. +func (client StorageTargetsClient) Delete(ctx context.Context, resourceGroupName string, cacheName string, storageTargetName string) (result StorageTargetsDeleteFuture, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/StorageTargetsClient.Delete") + defer func() { + sc := -1 + if result.Response() != nil { + sc = result.Response().StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: cacheName, + Constraints: []validation.Constraint{{Target: "cacheName", Name: validation.Pattern, Rule: `^[-0-9a-zA-Z_]{1,31}$`, Chain: nil}}}, + {TargetValue: storageTargetName, + Constraints: []validation.Constraint{{Target: "storageTargetName", Name: validation.Pattern, Rule: `^[-0-9a-zA-Z_]{1,31}$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("storagecache.StorageTargetsClient", "Delete", err.Error()) + } + + req, err := client.DeletePreparer(ctx, resourceGroupName, cacheName, storageTargetName) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.StorageTargetsClient", "Delete", nil, "Failure preparing request") + return + } + + result, err = client.DeleteSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.StorageTargetsClient", "Delete", result.Response(), "Failure sending request") + return + } + + return +} + +// DeletePreparer prepares the Delete request. +func (client StorageTargetsClient) DeletePreparer(ctx context.Context, resourceGroupName string, cacheName string, storageTargetName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "cacheName": autorest.Encode("path", cacheName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "storageTargetName": autorest.Encode("path", storageTargetName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/storageTargets/{storageTargetName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client StorageTargetsClient) DeleteSender(req *http.Request) (future StorageTargetsDeleteFuture, err error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, sd...) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client StorageTargetsClient) DeleteResponder(resp *http.Response) (result SetObject, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Get returns a Storage Target from a Cache. +// Parameters: +// resourceGroupName - target resource group. +// cacheName - name of Cache. +// storageTargetName - name of the Storage Target. +func (client StorageTargetsClient) Get(ctx context.Context, resourceGroupName string, cacheName string, storageTargetName string) (result StorageTarget, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/StorageTargetsClient.Get") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: cacheName, + Constraints: []validation.Constraint{{Target: "cacheName", Name: validation.Pattern, Rule: `^[-0-9a-zA-Z_]{1,31}$`, Chain: nil}}}, + {TargetValue: storageTargetName, + Constraints: []validation.Constraint{{Target: "storageTargetName", Name: validation.Pattern, Rule: `^[-0-9a-zA-Z_]{1,31}$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("storagecache.StorageTargetsClient", "Get", err.Error()) + } + + req, err := client.GetPreparer(ctx, resourceGroupName, cacheName, storageTargetName) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.StorageTargetsClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "storagecache.StorageTargetsClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.StorageTargetsClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client StorageTargetsClient) GetPreparer(ctx context.Context, resourceGroupName string, cacheName string, storageTargetName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "cacheName": autorest.Encode("path", cacheName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "storageTargetName": autorest.Encode("path", storageTargetName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/storageTargets/{storageTargetName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client StorageTargetsClient) GetSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client StorageTargetsClient) GetResponder(resp *http.Response) (result StorageTarget, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// ListByCache returns a list of Storage Targets for the specified Cache. +// Parameters: +// resourceGroupName - target resource group. +// cacheName - name of Cache. +func (client StorageTargetsClient) ListByCache(ctx context.Context, resourceGroupName string, cacheName string) (result StorageTargetsResultPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/StorageTargetsClient.ListByCache") + defer func() { + sc := -1 + if result.str.Response.Response != nil { + sc = result.str.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: cacheName, + Constraints: []validation.Constraint{{Target: "cacheName", Name: validation.Pattern, Rule: `^[-0-9a-zA-Z_]{1,31}$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("storagecache.StorageTargetsClient", "ListByCache", err.Error()) + } + + result.fn = client.listByCacheNextResults + req, err := client.ListByCachePreparer(ctx, resourceGroupName, cacheName) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.StorageTargetsClient", "ListByCache", nil, "Failure preparing request") + return + } + + resp, err := client.ListByCacheSender(req) + if err != nil { + result.str.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "storagecache.StorageTargetsClient", "ListByCache", resp, "Failure sending request") + return + } + + result.str, err = client.ListByCacheResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.StorageTargetsClient", "ListByCache", resp, "Failure responding to request") + } + + return +} + +// ListByCachePreparer prepares the ListByCache request. +func (client StorageTargetsClient) ListByCachePreparer(ctx context.Context, resourceGroupName string, cacheName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "cacheName": autorest.Encode("path", cacheName), + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/storageTargets", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListByCacheSender sends the ListByCache request. The method will close the +// http.Response Body if it receives an error. +func (client StorageTargetsClient) ListByCacheSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// ListByCacheResponder handles the response to the ListByCache request. The method always +// closes the http.Response Body. +func (client StorageTargetsClient) ListByCacheResponder(resp *http.Response) (result StorageTargetsResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listByCacheNextResults retrieves the next set of results, if any. +func (client StorageTargetsClient) listByCacheNextResults(ctx context.Context, lastResults StorageTargetsResult) (result StorageTargetsResult, err error) { + req, err := lastResults.storageTargetsResultPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "storagecache.StorageTargetsClient", "listByCacheNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListByCacheSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "storagecache.StorageTargetsClient", "listByCacheNextResults", resp, "Failure sending next results request") + } + result, err = client.ListByCacheResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.StorageTargetsClient", "listByCacheNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListByCacheComplete enumerates all values, automatically crossing page boundaries as required. +func (client StorageTargetsClient) ListByCacheComplete(ctx context.Context, resourceGroupName string, cacheName string) (result StorageTargetsResultIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/StorageTargetsClient.ListByCache") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.ListByCache(ctx, resourceGroupName, cacheName) + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/usagemodels.go b/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/usagemodels.go new file mode 100644 index 0000000000000..ea4c66bcadd14 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/usagemodels.go @@ -0,0 +1,152 @@ +package storagecache + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/tracing" + "net/http" +) + +// UsageModelsClient is the a Storage Cache provides scalable caching service for NAS clients, serving data from either +// NFSv3 or Blob at-rest storage (referred to as "Storage Targets"). These operations allow you to manage Caches. +type UsageModelsClient struct { + BaseClient +} + +// NewUsageModelsClient creates an instance of the UsageModelsClient client. +func NewUsageModelsClient(subscriptionID string) UsageModelsClient { + return NewUsageModelsClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewUsageModelsClientWithBaseURI creates an instance of the UsageModelsClient client. +func NewUsageModelsClientWithBaseURI(baseURI string, subscriptionID string) UsageModelsClient { + return UsageModelsClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// List get the list of Cache Usage Models available to this subscription. +func (client UsageModelsClient) List(ctx context.Context) (result UsageModelsResultPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/UsageModelsClient.List") + defer func() { + sc := -1 + if result.umr.Response.Response != nil { + sc = result.umr.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.fn = client.listNextResults + req, err := client.ListPreparer(ctx) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.UsageModelsClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.umr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "storagecache.UsageModelsClient", "List", resp, "Failure sending request") + return + } + + result.umr, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.UsageModelsClient", "List", resp, "Failure responding to request") + } + + return +} + +// ListPreparer prepares the List request. +func (client UsageModelsClient) ListPreparer(ctx context.Context) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-11-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.StorageCache/usageModels", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client UsageModelsClient) ListSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client UsageModelsClient) ListResponder(resp *http.Response) (result UsageModelsResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listNextResults retrieves the next set of results, if any. +func (client UsageModelsClient) listNextResults(ctx context.Context, lastResults UsageModelsResult) (result UsageModelsResult, err error) { + req, err := lastResults.usageModelsResultPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "storagecache.UsageModelsClient", "listNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "storagecache.UsageModelsClient", "listNextResults", resp, "Failure sending next results request") + } + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "storagecache.UsageModelsClient", "listNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListComplete enumerates all values, automatically crossing page boundaries as required. +func (client UsageModelsClient) ListComplete(ctx context.Context) (result UsageModelsResultIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/UsageModelsClient.List") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.List(ctx) + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/version.go new file mode 100644 index 0000000000000..6fce0a61b77b8 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache/version.go @@ -0,0 +1,30 @@ +package storagecache + +import "github.com/Azure/azure-sdk-for-go/version" + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +// UserAgent returns the UserAgent string to use when sending http.Requests. +func UserAgent() string { + return "Azure-SDK-For-Go/" + version.Number + " storagecache/2019-11-01" +} + +// Version returns the semantic version (see http://semver.org) of the client. +func Version() string { + return version.Number +} diff --git a/vendor/modules.txt b/vendor/modules.txt index aa3d0d63c408a..b5f403bbf7733 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -79,6 +79,7 @@ github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus github.com/Azure/azure-sdk-for-go/services/servicefabric/mgmt/2018-02-01/servicefabric github.com/Azure/azure-sdk-for-go/services/signalr/mgmt/2018-10-01/signalr github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-04-01/storage +github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2019-11-01/storagecache github.com/Azure/azure-sdk-for-go/services/streamanalytics/mgmt/2016-03-01/streamanalytics github.com/Azure/azure-sdk-for-go/services/trafficmanager/mgmt/2018-04-01/trafficmanager github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web diff --git a/website/azurerm.erb b/website/azurerm.erb index 124f703c1f8d6..06c500ce1fc96 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -2158,6 +2158,10 @@ Storage Resources
            +
          • + azurerm_hpc_cache +
            • +
          • azurerm_storage_account
            • diff --git a/website/docs/r/hpc_cache.html.markdown b/website/docs/r/hpc_cache.html.markdown new file mode 100644 index 0000000000000..124963e7dabc2 --- /dev/null +++ b/website/docs/r/hpc_cache.html.markdown @@ -0,0 +1,83 @@ +--- +subcategory: "Storage" +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_hpc_cache" +description: |- + Manages a HPC Cache. +--- + +# azurerm_hpc_cache + +Manages a HPC Cache. + +~> **Note**: During the first several months of the GA release, a request must be made to the Azure HPC Cache team to add your subscription to the access list before it can be used to create a cache instance. Fill out [this form](https://aka.ms/onboard-hpc-cache) to request access. + +## Example Usage + +```hcl +resource "azurerm_resource_group" "example" { + name = "example-resources" + location = "West Europe" +} + +resource "azurerm_virtual_network" "example" { + name = "examplevn" + address_space = ["10.0.0.0/16"] + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name +} + +resource "azurerm_subnet" "example" { + name = "examplesubnet" + resource_group_name = azurerm_resource_group.example.name + virtual_network_name = azurerm_virtual_network.example.name + address_prefix = "10.0.1.0/24" +} + +resource "azurerm_hpc_cache" "example" { + name = "examplehpccache" + resource_group_name = azurerm_resource_group.example.name + location = azurerm_resource_group.example.location + cache_size_in_gb = 3072 + subnet_id = azurerm_subnet.example.id + sku_name = "Standard_2G" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) The name of the HPC Cache. Changing this forces a new resource to be created. + +* `resource_group_name` - (Required) The name of the Resource Group in which to create the HPC Cache. Changing this forces a new resource to be created. + +* `location` - (Required) Specifies the supported Azure Region where the HPC Cache should be created. Changing this forces a new resource to be created. + +* `cache_size_in_gb` - (Required) The size of the HPC Cache, in GB. Possible values are `3072`, `6144`, `12288`, `24576`, and `49152`. Changing this forces a new resource to be created. + +* `subnet_id` - (Required) The ID of the Subnet for the HPC Cache. Changing this forces a new resource to be created. + +* `sku_name` - (Required) The SKU of HPC Cache to use. Possible values are `Standard_2G`, `Standard_4G` and `Standard_8G`. Changing this forces a new resource to be created. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The `id` of the HPC Cache. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: + +* `create` - (Defaults to 30 minutes) Used when creating the HPC Cache. +* `read` - (Defaults to 5 minutes) Used when retrieving the HPC Cache. +* `delete` - (Defaults to 30 minutes) Used when deleting the HPC Cache. + +## Import + +HPC Caches can be imported using the `resource id`, e.g. + +```shell +terraform import azurerm_hpc_cache.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resourceGroupName/providers/Microsoft.StorageCache/caches/cacheName +``` From 3401e09c42a62ff27f9a02158858436d8bf37f8f Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 5 Mar 2020 13:20:22 -0800 Subject: [PATCH 466/498] Update CHANGELOG.md to include #5528 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59b1ab48345e6..367e8f8fae7d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ FEATURES: * **New Data Source:** `azurerm_kusto_cluster` [GH-5942] * **New Resource:** `azurerm_bot_channel_directline` [GH-5445] * **New Resource:** `azurerm_database_migration_service` [GH-5258] +* **New Resource:** `azurerm_hpc_cache` [GH-5528] * **New Resource:** `azurerm_monitor_scheduled_query_rules_alert` [GH-5053] * **New Resource:** `azurerm_monitor_scheduled_query_rules_log` [GH-5053] From 087dedce61c79c299a141baadec164b22492dcb2 Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 5 Mar 2020 14:59:22 -0800 Subject: [PATCH 467/498] provider: remove unnecessary locals (#6008) --- .../resource_arm_virtual_machine_extension.go | 19 +-- .../resource_arm_kubernetes_cluster.go | 53 ++++---- ...source_arm_kubernetes_cluster_node_pool.go | 40 +++--- ...source_arm_eventgrid_event_subscription.go | 38 +++--- .../resource/resource_arm_resource_group.go | 12 +- .../web/app_service_environment_resource.go | 35 ++--- .../services/web/resource_arm_app_service.go | 121 ++++++++---------- .../resource_arm_app_service_active_slot.go | 9 +- .../resource_arm_app_service_certificate.go | 20 +-- ...ource_arm_app_service_certificate_order.go | 20 +-- ...arm_app_service_custom_hostname_binding.go | 30 ++--- .../web/resource_arm_app_service_plan.go | 22 ++-- .../web/resource_arm_app_service_slot.go | 102 +++++++-------- .../services/web/resource_arm_function_app.go | 75 +++++------ 14 files changed, 250 insertions(+), 346 deletions(-) diff --git a/azurerm/internal/services/compute/resource_arm_virtual_machine_extension.go b/azurerm/internal/services/compute/resource_arm_virtual_machine_extension.go index 28fbfc893f1cf..285a95c170104 100644 --- a/azurerm/internal/services/compute/resource_arm_virtual_machine_extension.go +++ b/azurerm/internal/services/compute/resource_arm_virtual_machine_extension.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/structure" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" @@ -192,28 +191,25 @@ func resourceArmVirtualMachineExtensionsRead(d *schema.ResourceData, meta interf if err != nil { return err } - resourceGroup := id.ResourceGroup - vmName := id.VirtualMachine - name := id.Name - virtualMachine, err := vmClient.Get(ctx, resourceGroup, vmName, "") + virtualMachine, err := vmClient.Get(ctx, id.ResourceGroup, id.VirtualMachine, "") if err != nil { if utils.ResponseWasNotFound(virtualMachine.Response) { d.SetId("") return nil } - return fmt.Errorf("Error making Read request on Virtual Machine %s: %s", name, err) + return fmt.Errorf("Error making Read request on Virtual Machine %s: %s", id.Name, err) } d.Set("virtual_machine_id", virtualMachine.ID) - resp, err := vmExtensionClient.Get(ctx, resourceGroup, vmName, name, "") + resp, err := vmExtensionClient.Get(ctx, id.ResourceGroup, id.VirtualMachine, id.Name, "") if err != nil { if utils.ResponseWasNotFound(resp.Response) { d.SetId("") return nil } - return fmt.Errorf("Error making Read request on Virtual Machine Extension %s: %s", name, err) + return fmt.Errorf("Error making Read request on Virtual Machine Extension %s: %s", id.Name, err) } d.Set("name", resp.Name) @@ -242,15 +238,12 @@ func resourceArmVirtualMachineExtensionsDelete(d *schema.ResourceData, meta inte ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := ParseVirtualMachineExtensionID(d.Id()) if err != nil { return err } - resGroup := id.ResourceGroup - name := id.Path["extensions"] - vmName := id.Path["virtualMachines"] - future, err := client.Delete(ctx, resGroup, vmName, name) + future, err := client.Delete(ctx, id.ResourceGroup, id.VirtualMachine, id.Name) if err != nil { return err } diff --git a/azurerm/internal/services/containers/resource_arm_kubernetes_cluster.go b/azurerm/internal/services/containers/resource_arm_kubernetes_cluster.go index 6d75e381af680..32a65ec4e6f7e 100644 --- a/azurerm/internal/services/containers/resource_arm_kubernetes_cluster.go +++ b/azurerm/internal/services/containers/resource_arm_kubernetes_cluster.go @@ -653,13 +653,10 @@ func resourceArmKubernetesClusterUpdate(d *schema.ResourceData, meta interface{} return err } - resourceGroup := id.ResourceGroup - name := id.Name - d.Partial(true) if d.HasChange("service_principal") { - log.Printf("[DEBUG] Updating the Service Principal for Kubernetes Cluster %q (Resource Group %q)..", name, resourceGroup) + log.Printf("[DEBUG] Updating the Service Principal for Kubernetes Cluster %q (Resource Group %q)..", id.Name, id.ResourceGroup) servicePrincipals := d.Get("service_principal").([]interface{}) servicePrincipalRaw := servicePrincipals[0].(map[string]interface{}) @@ -670,24 +667,24 @@ func resourceArmKubernetesClusterUpdate(d *schema.ResourceData, meta interface{} ClientID: utils.String(clientId), Secret: utils.String(clientSecret), } - future, err := clusterClient.ResetServicePrincipalProfile(ctx, resourceGroup, name, params) + future, err := clusterClient.ResetServicePrincipalProfile(ctx, id.ResourceGroup, id.Name, params) if err != nil { - return fmt.Errorf("Error updating Service Principal for Kubernetes Cluster %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error updating Service Principal for Kubernetes Cluster %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } if err = future.WaitForCompletionRef(ctx, clusterClient.Client); err != nil { - return fmt.Errorf("Error waiting for update of Service Principal for Kubernetes Cluster %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error waiting for update of Service Principal for Kubernetes Cluster %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } - log.Printf("[DEBUG] Updated the Service Principal for Kubernetes Cluster %q (Resource Group %q).", name, resourceGroup) + log.Printf("[DEBUG] Updated the Service Principal for Kubernetes Cluster %q (Resource Group %q).", id.Name, id.ResourceGroup) } // we need to conditionally update the cluster - existing, err := clusterClient.Get(ctx, resourceGroup, name) + existing, err := clusterClient.Get(ctx, id.ResourceGroup, id.Name) if err != nil { - return fmt.Errorf("Error retrieving existing Kubernetes Cluster %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error retrieving existing Kubernetes Cluster %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } if existing.ManagedClusterProperties == nil { - return fmt.Errorf("Error retrieving existing Kubernetes Cluster %q (Resource Group %q): `properties` was nil", name, resourceGroup) + return fmt.Errorf("Error retrieving existing Kubernetes Cluster %q (Resource Group %q): `properties` was nil", id.Name, id.ResourceGroup) } // since there's multiple reasons why we could be called into Update, we use this to only update if something's changed that's not SP/Version @@ -708,13 +705,13 @@ func resourceArmKubernetesClusterUpdate(d *schema.ResourceData, meta interface{} props.EnableRBAC = utils.Bool(rbacEnabled) log.Printf("[DEBUG] Updating the RBAC AAD profile") - future, err := clusterClient.ResetAADProfile(ctx, resourceGroup, name, *props.AadProfile) + future, err := clusterClient.ResetAADProfile(ctx, id.ResourceGroup, id.Name, *props.AadProfile) if err != nil { - return fmt.Errorf("Error updating Managed Kubernetes Cluster AAD Profile in cluster %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error updating Managed Kubernetes Cluster AAD Profile in cluster %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } if err = future.WaitForCompletionRef(ctx, clusterClient.Client); err != nil { - return fmt.Errorf("Error waiting for update of RBAC AAD profile of Managed Cluster %q (Resource Group %q):, %+v", name, resourceGroup, err) + return fmt.Errorf("Error waiting for update of RBAC AAD profile of Managed Cluster %q (Resource Group %q):, %+v", id.Name, id.ResourceGroup, err) } } else { updateCluster = true @@ -782,16 +779,16 @@ func resourceArmKubernetesClusterUpdate(d *schema.ResourceData, meta interface{} } if updateCluster { - log.Printf("[DEBUG] Updating the Kubernetes Cluster %q (Resource Group %q)..", name, resourceGroup) - future, err := clusterClient.CreateOrUpdate(ctx, resourceGroup, name, existing) + log.Printf("[DEBUG] Updating the Kubernetes Cluster %q (Resource Group %q)..", id.Name, id.ResourceGroup) + future, err := clusterClient.CreateOrUpdate(ctx, id.ResourceGroup, id.Name, existing) if err != nil { - return fmt.Errorf("Error updating Managed Kubernetes Cluster %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error updating Managed Kubernetes Cluster %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } if err = future.WaitForCompletionRef(ctx, clusterClient.Client); err != nil { - return fmt.Errorf("Error waiting for update of Managed Kubernetes Cluster %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error waiting for update of Managed Kubernetes Cluster %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } - log.Printf("[DEBUG] Updated the Kubernetes Cluster %q (Resource Group %q)..", name, resourceGroup) + log.Printf("[DEBUG] Updated the Kubernetes Cluster %q (Resource Group %q)..", id.Name, id.ResourceGroup) } // update the node pool using the separate API @@ -804,38 +801,38 @@ func resourceArmKubernetesClusterUpdate(d *schema.ResourceData, meta interface{} } agentProfile := ConvertDefaultNodePoolToAgentPool(agentProfiles) - agentPool, err := nodePoolsClient.CreateOrUpdate(ctx, resourceGroup, name, *agentProfile.Name, agentProfile) + agentPool, err := nodePoolsClient.CreateOrUpdate(ctx, id.ResourceGroup, id.Name, *agentProfile.Name, agentProfile) if err != nil { - return fmt.Errorf("Error updating Default Node Pool %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error updating Default Node Pool %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } if err := agentPool.WaitForCompletionRef(ctx, nodePoolsClient.Client); err != nil { - return fmt.Errorf("Error waiting for update of Default Node Pool %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error waiting for update of Default Node Pool %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } log.Printf("[DEBUG] Updated Default Node Pool.") } // then roll the version of Kubernetes if necessary if d.HasChange("kubernetes_version") { - existing, err = clusterClient.Get(ctx, resourceGroup, name) + existing, err = clusterClient.Get(ctx, id.ResourceGroup, id.Name) if err != nil { - return fmt.Errorf("Error retrieving existing Kubernetes Cluster %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error retrieving existing Kubernetes Cluster %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } if existing.ManagedClusterProperties == nil { - return fmt.Errorf("Error retrieving existing Kubernetes Cluster %q (Resource Group %q): `properties` was nil", name, resourceGroup) + return fmt.Errorf("Error retrieving existing Kubernetes Cluster %q (Resource Group %q): `properties` was nil", id.Name, id.ResourceGroup) } kubernetesVersion := d.Get("kubernetes_version").(string) log.Printf("[DEBUG] Upgrading the version of Kubernetes to %q..", kubernetesVersion) existing.ManagedClusterProperties.KubernetesVersion = utils.String(kubernetesVersion) - future, err := clusterClient.CreateOrUpdate(ctx, resourceGroup, name, existing) + future, err := clusterClient.CreateOrUpdate(ctx, id.ResourceGroup, id.Name, existing) if err != nil { - return fmt.Errorf("Error updating Managed Kubernetes Cluster %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error updating Managed Kubernetes Cluster %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } if err = future.WaitForCompletionRef(ctx, clusterClient.Client); err != nil { - return fmt.Errorf("Error waiting for update of Managed Kubernetes Cluster %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error waiting for update of Managed Kubernetes Cluster %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } log.Printf("[DEBUG] Upgraded the version of Kubernetes to %q..", kubernetesVersion) diff --git a/azurerm/internal/services/containers/resource_arm_kubernetes_cluster_node_pool.go b/azurerm/internal/services/containers/resource_arm_kubernetes_cluster_node_pool.go index 805c9abb3c41b..a6b40c397f1c9 100644 --- a/azurerm/internal/services/containers/resource_arm_kubernetes_cluster_node_pool.go +++ b/azurerm/internal/services/containers/resource_arm_kubernetes_cluster_node_pool.go @@ -291,23 +291,20 @@ func resourceArmKubernetesClusterNodePoolUpdate(d *schema.ResourceData, meta int if err != nil { return err } - resourceGroup := id.ResourceGroup - clusterName := id.ClusterName - name := id.Name d.Partial(true) - log.Printf("[DEBUG] Retrieving existing Node Pool %q (Kubernetes Cluster %q / Resource Group %q)..", name, clusterName, resourceGroup) - existing, err := client.Get(ctx, resourceGroup, clusterName, name) + log.Printf("[DEBUG] Retrieving existing Node Pool %q (Kubernetes Cluster %q / Resource Group %q)..", id.Name, id.ClusterName, id.ResourceGroup) + existing, err := client.Get(ctx, id.ResourceGroup, id.ClusterName, id.Name) if err != nil { if utils.ResponseWasNotFound(existing.Response) { - return fmt.Errorf("[DEBUG] Node Pool %q was not found in Managed Kubernetes Cluster %q / Resource Group %q!", name, clusterName, resourceGroup) + return fmt.Errorf("[DEBUG] Node Pool %q was not found in Managed Kubernetes Cluster %q / Resource Group %q!", id.Name, id.ClusterName, id.ResourceGroup) } - return fmt.Errorf("Error retrieving Node Pool %q (Managed Kubernetes Cluster %q / Resource Group %q): %+v", name, clusterName, resourceGroup, err) + return fmt.Errorf("Error retrieving Node Pool %q (Managed Kubernetes Cluster %q / Resource Group %q): %+v", id.Name, id.ClusterName, id.ResourceGroup, err) } if existing.ManagedClusterAgentPoolProfileProperties == nil { - return fmt.Errorf("Error retrieving Node Pool %q (Managed Kubernetes Cluster %q / Resource Group %q): `properties` was nil", name, clusterName, resourceGroup) + return fmt.Errorf("Error retrieving Node Pool %q (Managed Kubernetes Cluster %q / Resource Group %q): `properties` was nil", id.Name, id.ClusterName, id.ResourceGroup) } props := existing.ManagedClusterAgentPoolProfileProperties @@ -318,7 +315,7 @@ func resourceArmKubernetesClusterNodePoolUpdate(d *schema.ResourceData, meta int enableAutoScaling = *props.EnableAutoScaling } - log.Printf("[DEBUG] Determining delta for existing Node Pool %q (Kubernetes Cluster %q / Resource Group %q)..", name, clusterName, resourceGroup) + log.Printf("[DEBUG] Determining delta for existing Node Pool %q (Kubernetes Cluster %q / Resource Group %q)..", id.Name, id.ClusterName, id.ResourceGroup) // delta patching if d.HasChange("availability_zones") { @@ -378,15 +375,15 @@ func resourceArmKubernetesClusterNodePoolUpdate(d *schema.ResourceData, meta int return fmt.Errorf("`max_count` and `min_count` must be set to `0` when enable_auto_scaling is set to `false`") } - log.Printf("[DEBUG] Updating existing Node Pool %q (Kubernetes Cluster %q / Resource Group %q)..", name, clusterName, resourceGroup) + log.Printf("[DEBUG] Updating existing Node Pool %q (Kubernetes Cluster %q / Resource Group %q)..", id.Name, id.ClusterName, id.ResourceGroup) existing.ManagedClusterAgentPoolProfileProperties = props - future, err := client.CreateOrUpdate(ctx, resourceGroup, clusterName, name, existing) + future, err := client.CreateOrUpdate(ctx, id.ResourceGroup, id.ClusterName, id.Name, existing) if err != nil { - return fmt.Errorf("Error updating Node Pool %q (Kubernetes Cluster %q / Resource Group %q): %+v", name, clusterName, resourceGroup, err) + return fmt.Errorf("Error updating Node Pool %q (Kubernetes Cluster %q / Resource Group %q): %+v", id.Name, id.ClusterName, id.ResourceGroup, err) } if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for update of Node Pool %q (Kubernetes Cluster %q / Resource Group %q): %+v", name, clusterName, resourceGroup, err) + return fmt.Errorf("Error waiting for update of Node Pool %q (Kubernetes Cluster %q / Resource Group %q): %+v", id.Name, id.ClusterName, id.ResourceGroup, err) } d.Partial(false) @@ -404,34 +401,31 @@ func resourceArmKubernetesClusterNodePoolRead(d *schema.ResourceData, meta inter if err != nil { return err } - resourceGroup := id.ResourceGroup - clusterName := id.ClusterName - name := id.Name // if the parent cluster doesn't exist then the node pool won't - cluster, err := clustersClient.Get(ctx, resourceGroup, clusterName) + cluster, err := clustersClient.Get(ctx, id.ResourceGroup, id.ClusterName) if err != nil { if utils.ResponseWasNotFound(cluster.Response) { - log.Printf("[DEBUG] Managed Kubernetes Cluster %q was not found in Resource Group %q - removing from state!", clusterName, resourceGroup) + log.Printf("[DEBUG] Managed Kubernetes Cluster %q was not found in Resource Group %q - removing from state!", id.ClusterName, id.ResourceGroup) d.SetId("") return nil } - return fmt.Errorf("Error retrieving Managed Kubernetes Cluster %q (Resource Group %q): %+v", clusterName, resourceGroup, err) + return fmt.Errorf("Error retrieving Managed Kubernetes Cluster %q (Resource Group %q): %+v", id.ClusterName, id.ResourceGroup, err) } - resp, err := poolsClient.Get(ctx, resourceGroup, clusterName, name) + resp, err := poolsClient.Get(ctx, id.ResourceGroup, id.ClusterName, id.Name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - log.Printf("[DEBUG] Node Pool %q was not found in Managed Kubernetes Cluster %q / Resource Group %q - removing from state!", name, clusterName, resourceGroup) + log.Printf("[DEBUG] Node Pool %q was not found in Managed Kubernetes Cluster %q / Resource Group %q - removing from state!", id.Name, id.ClusterName, id.ResourceGroup) d.SetId("") return nil } - return fmt.Errorf("Error retrieving Node Pool %q (Managed Kubernetes Cluster %q / Resource Group %q): %+v", name, clusterName, resourceGroup, err) + return fmt.Errorf("Error retrieving Node Pool %q (Managed Kubernetes Cluster %q / Resource Group %q): %+v", id.Name, id.ClusterName, id.ResourceGroup, err) } - d.Set("name", name) + d.Set("name", id.Name) d.Set("kubernetes_cluster_id", cluster.ID) if props := resp.ManagedClusterAgentPoolProfileProperties; props != nil { diff --git a/azurerm/internal/services/eventgrid/resource_arm_eventgrid_event_subscription.go b/azurerm/internal/services/eventgrid/resource_arm_eventgrid_event_subscription.go index 0babcb0a6644a..e78ec1676ce0c 100644 --- a/azurerm/internal/services/eventgrid/resource_arm_eventgrid_event_subscription.go +++ b/azurerm/internal/services/eventgrid/resource_arm_eventgrid_event_subscription.go @@ -296,22 +296,20 @@ func resourceArmEventGridEventSubscriptionRead(d *schema.ResourceData, meta inte if err != nil { return err } - scope := id.Scope - name := id.Name - resp, err := client.Get(ctx, scope, name) + resp, err := client.Get(ctx, id.Scope, id.Name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - log.Printf("[WARN] EventGrid Event Subscription '%s' was not found (resource group '%s')", name, scope) + log.Printf("[WARN] EventGrid Event Subscription '%s' was not found (resource group '%s')", id.Name, id.Scope) d.SetId("") return nil } - return fmt.Errorf("Error making Read request on EventGrid Event Subscription '%s': %+v", name, err) + return fmt.Errorf("Error making Read request on EventGrid Event Subscription '%s': %+v", id.Name, err) } d.Set("name", resp.Name) - d.Set("scope", scope) + d.Set("scope", id.Scope) if props := resp.EventSubscriptionProperties; props != nil { d.Set("event_delivery_schema", string(props.EventDeliverySchema)) @@ -322,52 +320,52 @@ func resourceArmEventGridEventSubscriptionRead(d *schema.ResourceData, meta inte if storageQueueEndpoint, ok := props.Destination.AsStorageQueueEventSubscriptionDestination(); ok { if err := d.Set("storage_queue_endpoint", flattenEventGridEventSubscriptionStorageQueueEndpoint(storageQueueEndpoint)); err != nil { - return fmt.Errorf("Error setting `storage_queue_endpoint` for EventGrid Event Subscription %q (Scope %q): %s", name, scope, err) + return fmt.Errorf("Error setting `storage_queue_endpoint` for EventGrid Event Subscription %q (Scope %q): %s", id.Name, id.Scope, err) } } if eventHubEndpoint, ok := props.Destination.AsEventHubEventSubscriptionDestination(); ok { if err := d.Set("eventhub_endpoint", flattenEventGridEventSubscriptionEventHubEndpoint(eventHubEndpoint)); err != nil { - return fmt.Errorf("Error setting `eventhub_endpoint` for EventGrid Event Subscription %q (Scope %q): %s", name, scope, err) + return fmt.Errorf("Error setting `eventhub_endpoint` for EventGrid Event Subscription %q (Scope %q): %s", id.Name, id.Scope, err) } } if hybridConnectionEndpoint, ok := props.Destination.AsHybridConnectionEventSubscriptionDestination(); ok { if err := d.Set("hybrid_connection_endpoint", flattenEventGridEventSubscriptionHybridConnectionEndpoint(hybridConnectionEndpoint)); err != nil { - return fmt.Errorf("Error setting `hybrid_connection_endpoint` for EventGrid Event Subscription %q (Scope %q): %s", name, scope, err) + return fmt.Errorf("Error setting `hybrid_connection_endpoint` for EventGrid Event Subscription %q (Scope %q): %s", id.Name, id.Scope, err) } } if _, ok := props.Destination.AsWebHookEventSubscriptionDestination(); ok { - fullURL, err := client.GetFullURL(ctx, scope, name) + fullURL, err := client.GetFullURL(ctx, id.Scope, id.Name) if err != nil { - return fmt.Errorf("Error making Read request on EventGrid Event Subscription full URL '%s': %+v", name, err) + return fmt.Errorf("Error making Read request on EventGrid Event Subscription full URL '%s': %+v", id.Name, err) } if err := d.Set("webhook_endpoint", flattenEventGridEventSubscriptionWebhookEndpoint(&fullURL)); err != nil { - return fmt.Errorf("Error setting `webhook_endpoint` for EventGrid Event Subscription %q (Scope %q): %s", name, scope, err) + return fmt.Errorf("Error setting `webhook_endpoint` for EventGrid Event Subscription %q (Scope %q): %s", id.Name, id.Scope, err) } } if filter := props.Filter; filter != nil { d.Set("included_event_types", filter.IncludedEventTypes) if err := d.Set("subject_filter", flattenEventGridEventSubscriptionSubjectFilter(filter)); err != nil { - return fmt.Errorf("Error setting `subject_filter` for EventGrid Event Subscription %q (Scope %q): %s", name, scope, err) + return fmt.Errorf("Error setting `subject_filter` for EventGrid Event Subscription %q (Scope %q): %s", id.Name, id.Scope, err) } } if props.DeadLetterDestination != nil { if storageBlobDeadLetterDestination, ok := props.DeadLetterDestination.AsStorageBlobDeadLetterDestination(); ok { if err := d.Set("storage_blob_dead_letter_destination", flattenEventGridEventSubscriptionStorageBlobDeadLetterDestination(storageBlobDeadLetterDestination)); err != nil { - return fmt.Errorf("Error setting `storage_blob_dead_letter_destination` for EventGrid Event Subscription %q (Scope %q): %s", name, scope, err) + return fmt.Errorf("Error setting `storage_blob_dead_letter_destination` for EventGrid Event Subscription %q (Scope %q): %s", id.Name, id.Scope, err) } } } if retryPolicy := props.RetryPolicy; retryPolicy != nil { if err := d.Set("retry_policy", flattenEventGridEventSubscriptionRetryPolicy(retryPolicy)); err != nil { - return fmt.Errorf("Error setting `retry_policy` for EventGrid Event Subscription %q (Scope %q): %s", name, scope, err) + return fmt.Errorf("Error setting `retry_policy` for EventGrid Event Subscription %q (Scope %q): %s", id.Name, id.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) + return fmt.Errorf("Error setting `labels` for EventGrid Event Subscription %q (Scope %q): %s", id.Name, id.Scope, err) } } @@ -383,22 +381,20 @@ func resourceArmEventGridEventSubscriptionDelete(d *schema.ResourceData, meta in if err != nil { return err } - scope := id.Scope - name := id.Name - future, err := client.Delete(ctx, scope, name) + future, err := client.Delete(ctx, id.Scope, id.Name) if err != nil { if response.WasNotFound(future.Response()) { return nil } - return fmt.Errorf("Error deleting Event Grid Event Subscription %q: %+v", name, err) + return fmt.Errorf("Error deleting Event Grid Event Subscription %q: %+v", id.Name, err) } if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { if response.WasNotFound(future.Response()) { return nil } - return fmt.Errorf("Error deleting Event Grid Event Subscription %q: %+v", name, err) + return fmt.Errorf("Error deleting Event Grid Event Subscription %q: %+v", id.Name, err) } return nil diff --git a/azurerm/internal/services/resource/resource_arm_resource_group.go b/azurerm/internal/services/resource/resource_arm_resource_group.go index cc80dd516055f..b9fa453d74e93 100644 --- a/azurerm/internal/services/resource/resource_arm_resource_group.go +++ b/azurerm/internal/services/resource/resource_arm_resource_group.go @@ -98,9 +98,7 @@ func resourceArmResourceGroupRead(d *schema.ResourceData, meta interface{}) erro return err } - name := id.Name - - resp, err := client.Get(ctx, name) + resp, err := client.Get(ctx, id.Name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { log.Printf("[INFO] Error reading resource group %q - removing from state", d.Id()) @@ -128,15 +126,13 @@ func resourceArmResourceGroupDelete(d *schema.ResourceData, meta interface{}) er return err } - name := id.Name - - deleteFuture, err := client.Delete(ctx, name) + deleteFuture, err := client.Delete(ctx, id.Name) if err != nil { if response.WasNotFound(deleteFuture.Response()) { return nil } - return fmt.Errorf("Error deleting Resource Group %q: %+v", name, err) + return fmt.Errorf("Error deleting Resource Group %q: %+v", id.Name, err) } err = deleteFuture.WaitForCompletionRef(ctx, client.Client) @@ -145,7 +141,7 @@ func resourceArmResourceGroupDelete(d *schema.ResourceData, meta interface{}) er return nil } - return fmt.Errorf("Error deleting Resource Group %q: %+v", name, err) + return fmt.Errorf("Error deleting Resource Group %q: %+v", id.Name, err) } return nil diff --git a/azurerm/internal/services/web/app_service_environment_resource.go b/azurerm/internal/services/web/app_service_environment_resource.go index bda7acb22fb68..3632b0946cdce 100644 --- a/azurerm/internal/services/web/app_service_environment_resource.go +++ b/azurerm/internal/services/web/app_service_environment_resource.go @@ -197,9 +197,6 @@ func resourceArmAppServiceEnvironmentUpdate(d *schema.ResourceData, meta interfa return err } - resourceGroup := id.ResourceGroup - name := id.Name - environment := web.AppServiceEnvironmentPatchResource{ AppServiceEnvironment: &web.AppServiceEnvironment{}, } @@ -220,12 +217,12 @@ func resourceArmAppServiceEnvironmentUpdate(d *schema.ResourceData, meta interfa environment.AppServiceEnvironment.MultiSize = utils.String(v) } - if _, err := client.Update(ctx, resourceGroup, name, environment); err != nil { - return fmt.Errorf("Error updating App Service Environment %q (Resource Group %q): %+v", name, resourceGroup, err) + if _, err := client.Update(ctx, id.ResourceGroup, id.Name, environment); err != nil { + return fmt.Errorf("Error updating App Service Environment %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } - if err := waitForAppServiceEnvironmentToStabilize(ctx, client, resourceGroup, name); err != nil { - return fmt.Errorf("Error waiting for Update of App Service Environment %q (Resource Group %q): %+v", name, resourceGroup, err) + if err := waitForAppServiceEnvironmentToStabilize(ctx, client, id.ResourceGroup, id.Name); err != nil { + return fmt.Errorf("Error waiting for Update of App Service Environment %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } return resourceArmAppServiceEnvironmentRead(d, meta) @@ -241,21 +238,18 @@ func resourceArmAppServiceEnvironmentRead(d *schema.ResourceData, meta interface return err } - resourceGroup := id.ResourceGroup - name := id.Name - - existing, err := client.Get(ctx, resourceGroup, name) + existing, err := client.Get(ctx, id.ResourceGroup, id.Name) if err != nil { if utils.ResponseWasNotFound(existing.Response) { - log.Printf("[DEBUG] App Service Environmment %q (Resource Group %q) was not found - removing from state!", name, resourceGroup) + log.Printf("[DEBUG] App Service Environmment %q (Resource Group %q) was not found - removing from state!", id.Name, id.ResourceGroup) d.SetId("") return nil } - return fmt.Errorf("Error retrieving App Service Environmment %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error retrieving App Service Environmment %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } - d.Set("name", name) - d.Set("resource_group_name", resourceGroup) + d.Set("name", id.Name) + d.Set("resource_group_name", id.ResourceGroup) if location := existing.Location; location != nil { d.Set("location", azure.NormalizeLocation(*location)) @@ -296,20 +290,17 @@ func resourceArmAppServiceEnvironmentDelete(d *schema.ResourceData, meta interfa return err } - resGroup := id.ResourceGroup - name := id.Name - - log.Printf("[DEBUG] Deleting App Service Environment %q (Resource Group %q)", name, resGroup) + log.Printf("[DEBUG] Deleting App Service Environment %q (Resource Group %q)", id.Name, id.ResourceGroup) // TODO: should this behaviour be added to the `features` block? forceDeleteAllChildren := utils.Bool(false) - future, err := client.Delete(ctx, resGroup, name, forceDeleteAllChildren) + future, err := client.Delete(ctx, id.ResourceGroup, id.Name, forceDeleteAllChildren) if err != nil { if response.WasNotFound(future.Response()) { return nil } - return fmt.Errorf("Error deleting App Service Environment %q (Resource Group %q): %+v", name, resGroup, err) + return fmt.Errorf("Error deleting App Service Environment %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } err = future.WaitForCompletionRef(ctx, client.Client) @@ -318,7 +309,7 @@ func resourceArmAppServiceEnvironmentDelete(d *schema.ResourceData, meta interfa return nil } - return fmt.Errorf("Error waiting for deletion of App Service Environment %q (Resource Group %q): %+v", name, resGroup, err) + return fmt.Errorf("Error waiting for deletion of App Service Environment %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } return nil diff --git a/azurerm/internal/services/web/resource_arm_app_service.go b/azurerm/internal/services/web/resource_arm_app_service.go index aabd8628fd0c7..0902dfc8abdd8 100644 --- a/azurerm/internal/services/web/resource_arm_app_service.go +++ b/azurerm/internal/services/web/resource_arm_app_service.go @@ -326,9 +326,6 @@ func resourceArmAppServiceUpdate(d *schema.ResourceData, meta interface{}) error return err } - resGroup := id.ResourceGroup - name := id.Name - location := azure.NormalizeLocation(d.Get("location").(string)) appServicePlanId := d.Get("app_service_plan_id").(string) @@ -338,7 +335,7 @@ func resourceArmAppServiceUpdate(d *schema.ResourceData, meta interface{}) error siteConfig, err := azure.ExpandAppServiceSiteConfig(d.Get("site_config")) if err != nil { - return fmt.Errorf("Error expanding `site_config` for App Service %q (Resource Group %q): %s", name, resGroup, err) + return fmt.Errorf("Error expanding `site_config` for App Service %q (Resource Group %q): %s", id.Name, id.ResourceGroup, err) } siteEnvelope := web.Site{ @@ -357,7 +354,7 @@ func resourceArmAppServiceUpdate(d *schema.ResourceData, meta interface{}) error siteEnvelope.SiteProperties.ClientCertEnabled = utils.Bool(certEnabled) } - future, err := client.CreateOrUpdate(ctx, resGroup, name, siteEnvelope) + future, err := client.CreateOrUpdate(ctx, id.ResourceGroup, id.Name, siteEnvelope) if err != nil { return err } @@ -370,42 +367,41 @@ func resourceArmAppServiceUpdate(d *schema.ResourceData, meta interface{}) error // update the main configuration siteConfig, err := azure.ExpandAppServiceSiteConfig(d.Get("site_config")) if err != nil { - return fmt.Errorf("Error expanding `site_config` for App Service %q (Resource Group %q): %s", name, resGroup, err) + return fmt.Errorf("Error expanding `site_config` for App Service %q (Resource Group %q): %s", id.Name, id.ResourceGroup, err) } siteConfigResource := web.SiteConfigResource{ SiteConfig: siteConfig, } - if _, err := client.CreateOrUpdateConfiguration(ctx, resGroup, name, siteConfigResource); err != nil { - return fmt.Errorf("Error updating Configuration for App Service %q: %+v", name, err) + if _, err := client.CreateOrUpdateConfiguration(ctx, id.ResourceGroup, id.Name, siteConfigResource); err != nil { + return fmt.Errorf("Error updating Configuration for App Service %q: %+v", id.Name, err) } } if d.HasChange("auth_settings") { authSettingsRaw := d.Get("auth_settings").([]interface{}) authSettingsProperties := azure.ExpandAppServiceAuthSettings(authSettingsRaw) - id := d.Id() authSettings := web.SiteAuthSettings{ - ID: &id, + ID: utils.String(d.Id()), SiteAuthSettingsProperties: &authSettingsProperties, } - if _, err := client.UpdateAuthSettings(ctx, resGroup, name, authSettings); err != nil { - return fmt.Errorf("Error updating Authentication Settings for App Service %q: %+v", name, err) + if _, err := client.UpdateAuthSettings(ctx, id.ResourceGroup, id.Name, authSettings); err != nil { + return fmt.Errorf("Error updating Authentication Settings for App Service %q: %+v", id.Name, err) } } if d.HasChange("backup") { backupRaw := d.Get("backup").([]interface{}) if backup := azure.ExpandAppServiceBackup(backupRaw); backup != nil { - _, err = client.UpdateBackupConfiguration(ctx, resGroup, name, *backup) + _, err = client.UpdateBackupConfiguration(ctx, id.ResourceGroup, id.Name, *backup) if err != nil { - return fmt.Errorf("Error updating Backup Settings for App Service %q (Resource Group %q): %s", name, resGroup, err) + return fmt.Errorf("Error updating Backup Settings for App Service %q (Resource Group %q): %s", id.Name, id.ResourceGroup, err) } } else { - _, err = client.DeleteBackupConfiguration(ctx, resGroup, name) + _, err = client.DeleteBackupConfiguration(ctx, id.ResourceGroup, id.Name) if err != nil { - return fmt.Errorf("Error removing Backup Settings for App Service %q (Resource Group %q): %s", name, resGroup, err) + return fmt.Errorf("Error removing Backup Settings for App Service %q (Resource Group %q): %s", id.Name, id.ResourceGroup, err) } } } @@ -420,8 +416,8 @@ func resourceArmAppServiceUpdate(d *schema.ResourceData, meta interface{}) error }, } - if _, err := client.Update(ctx, resGroup, name, sitePatchResource); err != nil { - return fmt.Errorf("Error updating App Service ARR Affinity setting %q: %+v", name, err) + if _, err := client.Update(ctx, id.ResourceGroup, id.Name, sitePatchResource); err != nil { + return fmt.Errorf("Error updating App Service ARR Affinity setting %q: %+v", id.Name, err) } } @@ -433,8 +429,8 @@ func resourceArmAppServiceUpdate(d *schema.ResourceData, meta interface{}) error Properties: appSettings, } - if _, err := client.UpdateApplicationSettings(ctx, resGroup, name, settings); err != nil { - return fmt.Errorf("Error updating Application Settings for App Service %q: %+v", name, err) + if _, err := client.UpdateApplicationSettings(ctx, id.ResourceGroup, id.Name, settings); err != nil { + return fmt.Errorf("Error updating Application Settings for App Service %q: %+v", id.Name, err) } } @@ -446,14 +442,13 @@ func resourceArmAppServiceUpdate(d *schema.ResourceData, meta interface{}) error _, hasLogs := d.GetOkExists("logs") if d.HasChange("logs") || (hasLogs && d.HasChange("app_settings")) { logs := azure.ExpandAppServiceLogs(d.Get("logs")) - id := d.Id() logsResource := web.SiteLogsConfig{ - ID: &id, + ID: utils.String(d.Id()), SiteLogsConfigProperties: &logs, } - if _, err := client.UpdateDiagnosticLogsConfig(ctx, resGroup, name, logsResource); err != nil { - return fmt.Errorf("Error updating Diagnostics Logs for App Service %q: %+v", name, err) + if _, err := client.UpdateDiagnosticLogsConfig(ctx, id.ResourceGroup, id.Name, logsResource); err != nil { + return fmt.Errorf("Error updating Diagnostics Logs for App Service %q: %+v", id.Name, err) } } @@ -464,8 +459,8 @@ func resourceArmAppServiceUpdate(d *schema.ResourceData, meta interface{}) error Properties: storageAccounts, } - if _, err := client.UpdateAzureStorageAccounts(ctx, resGroup, name, properties); err != nil { - return fmt.Errorf("Error updating Storage Accounts for App Service %q: %+v", name, err) + if _, err := client.UpdateAzureStorageAccounts(ctx, id.ResourceGroup, id.Name, properties); err != nil { + return fmt.Errorf("Error updating Storage Accounts for App Service %q: %+v", id.Name, err) } } @@ -476,29 +471,29 @@ func resourceArmAppServiceUpdate(d *schema.ResourceData, meta interface{}) error Properties: connectionStrings, } - if _, err := client.UpdateConnectionStrings(ctx, resGroup, name, properties); err != nil { - return fmt.Errorf("Error updating Connection Strings for App Service %q: %+v", name, err) + if _, err := client.UpdateConnectionStrings(ctx, id.ResourceGroup, id.Name, properties); err != nil { + return fmt.Errorf("Error updating Connection Strings for App Service %q: %+v", id.Name, err) } } if d.HasChange("identity") { - site, err := client.Get(ctx, resGroup, name) + site, err := client.Get(ctx, id.ResourceGroup, id.Name) if err != nil { - return fmt.Errorf("Error getting configuration for App Service %q: %+v", name, err) + return fmt.Errorf("Error getting configuration for App Service %q: %+v", id.Name, err) } appServiceIdentityRaw := d.Get("identity").([]interface{}) appServiceIdentity := azure.ExpandAppServiceIdentity(appServiceIdentityRaw) site.Identity = appServiceIdentity - future, err := client.CreateOrUpdate(ctx, resGroup, name, site) + 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", name, err) + return fmt.Errorf("Error updating Managed Service Identity for App Service %q: %+v", id.Name, err) } if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error updating Managed Service Identity for App Service %q: %+v", name, err) + return fmt.Errorf("Error updating Managed Service Identity for App Service %q: %+v", id.Name, err) } } @@ -515,72 +510,69 @@ func resourceArmAppServiceRead(d *schema.ResourceData, meta interface{}) error { return err } - resGroup := id.ResourceGroup - name := id.Name - - resp, err := client.Get(ctx, resGroup, name) + resp, err := client.Get(ctx, id.ResourceGroup, id.Name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - log.Printf("[DEBUG] App Service %q (resource group %q) was not found - removing from state", name, resGroup) + log.Printf("[DEBUG] App Service %q (resource group %q) was not found - removing from state", id.Name, id.ResourceGroup) d.SetId("") return nil } - return fmt.Errorf("Error making Read request on AzureRM App Service %q: %+v", name, err) + return fmt.Errorf("Error making Read request on AzureRM App Service %q: %+v", id.Name, err) } - configResp, err := client.GetConfiguration(ctx, resGroup, name) + configResp, err := client.GetConfiguration(ctx, id.ResourceGroup, id.Name) if err != nil { if utils.ResponseWasNotFound(configResp.Response) { - log.Printf("[DEBUG] Configuration of App Service %q (resource group %q) was not found", name, resGroup) + log.Printf("[DEBUG] Configuration of App Service %q (resource group %q) was not found", id.Name, id.ResourceGroup) d.SetId("") return nil } - return fmt.Errorf("Error making Read request on AzureRM App Service Configuration %q: %+v", name, err) + return fmt.Errorf("Error making Read request on AzureRM App Service Configuration %q: %+v", id.Name, err) } - authResp, err := client.GetAuthSettings(ctx, resGroup, name) + authResp, err := client.GetAuthSettings(ctx, id.ResourceGroup, id.Name) if err != nil { - return fmt.Errorf("Error retrieving the AuthSettings for App Service %q (Resource Group %q): %+v", name, resGroup, err) + return fmt.Errorf("Error retrieving the AuthSettings for App Service %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } - backupResp, err := client.GetBackupConfiguration(ctx, resGroup, name) + backupResp, err := client.GetBackupConfiguration(ctx, id.ResourceGroup, id.Name) if err != nil { if !utils.ResponseWasNotFound(backupResp.Response) { - return fmt.Errorf("Error retrieving the BackupConfiguration for App Service %q (Resource Group %q): %+v", name, resGroup, err) + return fmt.Errorf("Error retrieving the BackupConfiguration for App Service %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } } - logsResp, err := client.GetDiagnosticLogsConfiguration(ctx, resGroup, name) + logsResp, err := client.GetDiagnosticLogsConfiguration(ctx, id.ResourceGroup, id.Name) if err != nil { - return fmt.Errorf("Error retrieving the DiagnosticsLogsConfiguration for App Service %q (Resource Group %q): %+v", name, resGroup, err) + return fmt.Errorf("Error retrieving the DiagnosticsLogsConfiguration for App Service %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } - appSettingsResp, err := client.ListApplicationSettings(ctx, resGroup, name) + appSettingsResp, err := client.ListApplicationSettings(ctx, id.ResourceGroup, id.Name) if err != nil { if utils.ResponseWasNotFound(appSettingsResp.Response) { - log.Printf("[DEBUG] Application Settings of App Service %q (resource group %q) were not found", name, resGroup) + log.Printf("[DEBUG] Application Settings of App Service %q (resource group %q) were not found", id.Name, id.ResourceGroup) d.SetId("") return nil } - return fmt.Errorf("Error making Read request on AzureRM App Service AppSettings %q: %+v", name, err) + return fmt.Errorf("Error making Read request on AzureRM App Service AppSettings %q: %+v", id.Name, err) } - storageAccountsResp, err := client.ListAzureStorageAccounts(ctx, resGroup, name) + storageAccountsResp, err := client.ListAzureStorageAccounts(ctx, id.ResourceGroup, id.Name) if err != nil { - return fmt.Errorf("Error making Read request on AzureRM App Service Storage Accounts %q: %+v", name, err) + return fmt.Errorf("Error making Read request on AzureRM App Service Storage Accounts %q: %+v", id.Name, err) } - connectionStringsResp, err := client.ListConnectionStrings(ctx, resGroup, name) + connectionStringsResp, err := client.ListConnectionStrings(ctx, id.ResourceGroup, id.Name) if err != nil { - return fmt.Errorf("Error making Read request on AzureRM App Service ConnectionStrings %q: %+v", name, err) + return fmt.Errorf("Error making Read request on AzureRM App Service ConnectionStrings %q: %+v", id.Name, err) } - scmResp, err := client.GetSourceControl(ctx, resGroup, name) + scmResp, err := client.GetSourceControl(ctx, id.ResourceGroup, id.Name) if err != nil { - return fmt.Errorf("Error making Read request on AzureRM App Service Source Control %q: %+v", name, err) + return fmt.Errorf("Error making Read request on AzureRM App Service Source Control %q: %+v", id.Name, err) } - siteCredFuture, err := client.ListPublishingCredentials(ctx, resGroup, name) + siteCredFuture, err := client.ListPublishingCredentials(ctx, id.ResourceGroup, id.Name) if err != nil { return err } @@ -590,11 +582,11 @@ func resourceArmAppServiceRead(d *schema.ResourceData, meta interface{}) error { } siteCredResp, err := siteCredFuture.Result(*client) if err != nil { - return fmt.Errorf("Error making Read request on AzureRM App Service Site Credential %q: %+v", name, err) + return fmt.Errorf("Error making Read request on AzureRM App Service Site Credential %q: %+v", id.Name, err) } - d.Set("name", name) - d.Set("resource_group_name", resGroup) + d.Set("name", id.Name) + d.Set("resource_group_name", id.ResourceGroup) if location := resp.Location; location != nil { d.Set("location", azure.NormalizeLocation(*location)) } @@ -677,14 +669,11 @@ func resourceArmAppServiceDelete(d *schema.ResourceData, meta interface{}) error return err } - resGroup := id.ResourceGroup - name := id.Name - - log.Printf("[DEBUG] Deleting App Service %q (resource group %q)", name, resGroup) + log.Printf("[DEBUG] Deleting App Service %q (resource group %q)", id.Name, id.ResourceGroup) deleteMetrics := true deleteEmptyServerFarm := false - resp, err := client.Delete(ctx, resGroup, name, &deleteMetrics, &deleteEmptyServerFarm) + resp, err := client.Delete(ctx, id.ResourceGroup, id.Name, &deleteMetrics, &deleteEmptyServerFarm) if err != nil { if !utils.ResponseWasNotFound(resp) { return err diff --git a/azurerm/internal/services/web/resource_arm_app_service_active_slot.go b/azurerm/internal/services/web/resource_arm_app_service_active_slot.go index 75b23f20eac48..cc92aa51ad1bb 100644 --- a/azurerm/internal/services/web/resource_arm_app_service_active_slot.go +++ b/azurerm/internal/services/web/resource_arm_app_service_active_slot.go @@ -102,17 +102,14 @@ func resourceArmAppServiceActiveSlotRead(d *schema.ResourceData, meta interface{ return err } - resGroup := id.ResourceGroup - name := id.Name - - resp, err := client.Get(ctx, resGroup, name) + resp, err := client.Get(ctx, id.ResourceGroup, id.Name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - log.Printf("[DEBUG] App Service %q (resource group %q) was not found - removing from state", name, resGroup) + log.Printf("[DEBUG] App Service %q (resource group %q) was not found - removing from state", id.Name, id.ResourceGroup) d.SetId("") return nil } - return fmt.Errorf("Error making Read request on AzureRM App Service %q: %+v", name, err) + return fmt.Errorf("Error making Read request on AzureRM App Service %q: %+v", id.Name, err) } d.Set("app_service_name", resp.Name) diff --git a/azurerm/internal/services/web/resource_arm_app_service_certificate.go b/azurerm/internal/services/web/resource_arm_app_service_certificate.go index a5f53a00502a5..a48a7905cc2b4 100644 --- a/azurerm/internal/services/web/resource_arm_app_service_certificate.go +++ b/azurerm/internal/services/web/resource_arm_app_service_certificate.go @@ -212,21 +212,18 @@ func resourceArmAppServiceCertificateRead(d *schema.ResourceData, meta interface return err } - resourceGroup := id.ResourceGroup - name := id.Name - - resp, err := client.Get(ctx, resourceGroup, name) + resp, err := client.Get(ctx, id.ResourceGroup, id.Name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - log.Printf("[DEBUG] App Service Certificate %q (Resource Group %q) was not found - removing from state", name, resourceGroup) + log.Printf("[DEBUG] App Service Certificate %q (Resource Group %q) was not found - removing from state", id.Name, id.ResourceGroup) d.SetId("") return nil } - return fmt.Errorf("Error making Read request on App Service Certificate %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error making Read request on App Service Certificate %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } d.Set("name", resp.Name) - d.Set("resource_group_name", resourceGroup) + d.Set("resource_group_name", id.ResourceGroup) if location := resp.Location; location != nil { d.Set("location", azure.NormalizeLocation(*location)) @@ -255,15 +252,12 @@ func resourceArmAppServiceCertificateDelete(d *schema.ResourceData, meta interfa return err } - resourceGroup := id.ResourceGroup - name := id.Name - - log.Printf("[DEBUG] Deleting App Service Certificate %q (Resource Group %q)", name, resourceGroup) + log.Printf("[DEBUG] Deleting App Service Certificate %q (Resource Group %q)", id.Name, id.ResourceGroup) - resp, err := client.Delete(ctx, resourceGroup, name) + resp, err := client.Delete(ctx, id.ResourceGroup, id.Name) if err != nil { if !utils.ResponseWasNotFound(resp) { - return fmt.Errorf("Error deleting App Service Certificate %q (Resource Group %q): %s)", name, resourceGroup, err) + return fmt.Errorf("Error deleting App Service Certificate %q (Resource Group %q): %s)", id.Name, id.ResourceGroup, err) } } diff --git a/azurerm/internal/services/web/resource_arm_app_service_certificate_order.go b/azurerm/internal/services/web/resource_arm_app_service_certificate_order.go index 5141427558b2b..8a53ec9a8658b 100644 --- a/azurerm/internal/services/web/resource_arm_app_service_certificate_order.go +++ b/azurerm/internal/services/web/resource_arm_app_service_certificate_order.go @@ -257,22 +257,19 @@ func resourceArmAppServiceCertificateOrderRead(d *schema.ResourceData, meta inte return err } - resourceGroup := id.ResourceGroup - name := id.Name - - resp, err := client.Get(ctx, resourceGroup, name) + resp, err := client.Get(ctx, id.ResourceGroup, id.Name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - log.Printf("[DEBUG] App Service Certificate Order %q (resource group %q) was not found - removing from state", name, resourceGroup) + log.Printf("[DEBUG] App Service Certificate Order %q (resource group %q) was not found - removing from state", id.Name, id.ResourceGroup) d.SetId("") return nil } - return fmt.Errorf("Error making Read request on AzureRM App Service Certificate Order %q: %+v", name, err) + return fmt.Errorf("Error making Read request on AzureRM App Service Certificate Order %q: %+v", id.Name, err) } d.Set("name", resp.Name) - d.Set("resource_group_name", resourceGroup) + d.Set("resource_group_name", id.ResourceGroup) if location := resp.Location; location != nil { d.Set("location", azure.NormalizeLocation(*location)) @@ -326,15 +323,12 @@ func resourceArmAppServiceCertificateOrderDelete(d *schema.ResourceData, meta in return err } - resourceGroup := id.ResourceGroup - name := id.Name - - log.Printf("[DEBUG] Deleting App Service Certificate Order %q (Resource Group %q)", name, resourceGroup) + log.Printf("[DEBUG] Deleting App Service Certificate Order %q (Resource Group %q)", id.Name, id.ResourceGroup) - resp, err := client.Delete(ctx, resourceGroup, name) + resp, err := client.Delete(ctx, id.ResourceGroup, id.Name) if err != nil { if !utils.ResponseWasNotFound(resp) { - return fmt.Errorf("Error deleting App Service Certificate Order %q (Resource Group %q): %s)", name, resourceGroup, err) + return fmt.Errorf("Error deleting App Service Certificate Order %q (Resource Group %q): %s)", id.Name, id.ResourceGroup, err) } } diff --git a/azurerm/internal/services/web/resource_arm_app_service_custom_hostname_binding.go b/azurerm/internal/services/web/resource_arm_app_service_custom_hostname_binding.go index 9c18cba5c3f19..3d64d2fbc190e 100644 --- a/azurerm/internal/services/web/resource_arm_app_service_custom_hostname_binding.go +++ b/azurerm/internal/services/web/resource_arm_app_service_custom_hostname_binding.go @@ -155,23 +155,19 @@ func resourceArmAppServiceCustomHostnameBindingRead(d *schema.ResourceData, meta return err } - resourceGroup := id.ResourceGroup - appServiceName := id.AppServiceName - hostname := id.Name - - resp, err := client.GetHostNameBinding(ctx, resourceGroup, appServiceName, hostname) + resp, err := client.GetHostNameBinding(ctx, id.ResourceGroup, id.AppServiceName, id.Name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - log.Printf("[DEBUG] App Service Hostname Binding %q (App Service %q / Resource Group %q) was not found - removing from state", hostname, appServiceName, resourceGroup) + log.Printf("[DEBUG] App Service Hostname Binding %q (App Service %q / Resource Group %q) was not found - removing from state", id.Name, id.AppServiceName, id.ResourceGroup) d.SetId("") return nil } - return fmt.Errorf("Error retrieving Custom Hostname Binding %q (App Service %q / Resource Group %q): %+v", hostname, appServiceName, resourceGroup, err) + return fmt.Errorf("Error retrieving Custom Hostname Binding %q (App Service %q / Resource Group %q): %+v", id.Name, id.AppServiceName, id.ResourceGroup, err) } - d.Set("hostname", hostname) - d.Set("app_service_name", appServiceName) - d.Set("resource_group_name", resourceGroup) + d.Set("hostname", id.Name) + d.Set("app_service_name", id.AppServiceName) + d.Set("resource_group_name", id.ResourceGroup) if props := resp.HostNameBindingProperties; props != nil { d.Set("ssl_state", props.SslState) @@ -192,19 +188,15 @@ func resourceArmAppServiceCustomHostnameBindingDelete(d *schema.ResourceData, me return err } - resourceGroup := id.ResourceGroup - appServiceName := id.AppServiceName - hostname := id.Name - - locks.ByName(appServiceName, appServiceCustomHostnameBindingResourceName) - defer locks.UnlockByName(appServiceName, appServiceCustomHostnameBindingResourceName) + locks.ByName(id.AppServiceName, appServiceCustomHostnameBindingResourceName) + defer locks.UnlockByName(id.AppServiceName, appServiceCustomHostnameBindingResourceName) - log.Printf("[DEBUG] Deleting App Service Hostname Binding %q (App Service %q / Resource Group %q)", hostname, appServiceName, resourceGroup) + log.Printf("[DEBUG] Deleting App Service Hostname Binding %q (App Service %q / Resource Group %q)", id.Name, id.AppServiceName, id.ResourceGroup) - resp, err := client.DeleteHostNameBinding(ctx, resourceGroup, appServiceName, hostname) + resp, err := client.DeleteHostNameBinding(ctx, id.ResourceGroup, id.AppServiceName, id.Name) if err != nil { if !utils.ResponseWasNotFound(resp) { - return fmt.Errorf("Error deleting Custom Hostname Binding %q (App Service %q / Resource Group %q): %+v", hostname, appServiceName, resourceGroup, err) + return fmt.Errorf("Error deleting Custom Hostname Binding %q (App Service %q / Resource Group %q): %+v", id.Name, id.AppServiceName, id.ResourceGroup, err) } } diff --git a/azurerm/internal/services/web/resource_arm_app_service_plan.go b/azurerm/internal/services/web/resource_arm_app_service_plan.go index 66e725ade3004..185c4be02d778 100644 --- a/azurerm/internal/services/web/resource_arm_app_service_plan.go +++ b/azurerm/internal/services/web/resource_arm_app_service_plan.go @@ -236,30 +236,28 @@ func resourceArmAppServicePlanRead(d *schema.ResourceData, meta interface{}) err if err != nil { return err } - resourceGroup := id.ResourceGroup - name := id.Name - resp, err := client.Get(ctx, resourceGroup, name) + resp, err := client.Get(ctx, id.ResourceGroup, id.Name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - log.Printf("[DEBUG] App Service Plan %q was not found in Resource Group %q - removnig from state!", name, resourceGroup) + log.Printf("[DEBUG] App Service Plan %q was not found in Resource Group %q - removnig from state!", id.Name, id.ResourceGroup) d.SetId("") return nil } - return fmt.Errorf("Error making Read request on App Service Plan %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error making Read request on App Service Plan %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } // A 404 doesn't error from the app service plan sdk so we'll add this check here to catch resource not found responses // TODO This block can be removed if https://github.com/Azure/azure-sdk-for-go/issues/5407 gets addressed. if utils.ResponseWasNotFound(resp.Response) { - log.Printf("[DEBUG] App Service Plan %q was not found in Resource Group %q - removing from state!", name, resourceGroup) + log.Printf("[DEBUG] App Service Plan %q was not found in Resource Group %q - removing from state!", id.Name, id.ResourceGroup) d.SetId("") return nil } - d.Set("name", name) - d.Set("resource_group_name", resourceGroup) + d.Set("name", id.Name) + d.Set("resource_group_name", id.ResourceGroup) if location := resp.Location; location != nil { d.Set("location", azure.NormalizeLocation(*location)) } @@ -305,15 +303,13 @@ func resourceArmAppServicePlanDelete(d *schema.ResourceData, meta interface{}) e if err != nil { return err } - resourceGroup := id.ResourceGroup - name := id.Name - log.Printf("[DEBUG] Deleting App Service Plan %q (Resource Group %q)", name, resourceGroup) + log.Printf("[DEBUG] Deleting App Service Plan %q (Resource Group %q)", id.Name, id.ResourceGroup) - resp, err := client.Delete(ctx, resourceGroup, name) + resp, err := client.Delete(ctx, id.ResourceGroup, id.Name) if err != nil { if !utils.ResponseWasNotFound(resp) { - return fmt.Errorf("Error deleting App Service Plan %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error deleting App Service Plan %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } } diff --git a/azurerm/internal/services/web/resource_arm_app_service_slot.go b/azurerm/internal/services/web/resource_arm_app_service_slot.go index 6ad4b0559af2c..e134aa8b1ab10 100644 --- a/azurerm/internal/services/web/resource_arm_app_service_slot.go +++ b/azurerm/internal/services/web/resource_arm_app_service_slot.go @@ -246,15 +246,11 @@ func resourceArmAppServiceSlotUpdate(d *schema.ResourceData, meta interface{}) e return err } - resourceGroup := id.ResourceGroup - appServiceName := id.AppServiceName - slot := id.Name - location := azure.NormalizeLocation(d.Get("location").(string)) appServicePlanId := d.Get("app_service_plan_id").(string) siteConfig, err := azure.ExpandAppServiceSiteConfig(d.Get("site_config")) if err != nil { - return fmt.Errorf("Error expanding `site_config` for App Service Slot %q (Resource Group %q): %s", slot, resourceGroup, err) + return fmt.Errorf("Error expanding `site_config` for App Service Slot %q (Resource Group %q): %s", id.Name, id.ResourceGroup, err) } enabled := d.Get("enabled").(bool) httpsOnly := d.Get("https_only").(bool) @@ -274,41 +270,40 @@ func resourceArmAppServiceSlotUpdate(d *schema.ResourceData, meta interface{}) e enabled := v.(bool) siteEnvelope.SiteProperties.ClientAffinityEnabled = utils.Bool(enabled) } - createFuture, err := client.CreateOrUpdateSlot(ctx, resourceGroup, appServiceName, siteEnvelope, slot) + createFuture, err := client.CreateOrUpdateSlot(ctx, id.ResourceGroup, id.AppServiceName, siteEnvelope, id.Name) if err != nil { - return fmt.Errorf("Error updating Slot %q (App Service %q / Resource Group %q): %s", slot, appServiceName, resourceGroup, err) + return fmt.Errorf("Error updating Slot %q (App Service %q / Resource Group %q): %s", id.Name, id.AppServiceName, id.ResourceGroup, err) } err = createFuture.WaitForCompletionRef(ctx, client.Client) if err != nil { - return fmt.Errorf("Error waiting for update of Slot %q (App Service %q / Resource Group %q): %s", slot, appServiceName, resourceGroup, err) + return fmt.Errorf("Error waiting for update of Slot %q (App Service %q / Resource Group %q): %s", id.Name, id.AppServiceName, id.ResourceGroup, err) } if d.HasChange("site_config") { // update the main configuration siteConfig, err := azure.ExpandAppServiceSiteConfig(d.Get("site_config")) if err != nil { - return fmt.Errorf("Error expanding `site_config` for App Service Slot %q (Resource Group %q): %s", slot, resourceGroup, err) + return fmt.Errorf("Error expanding `site_config` for App Service Slot %q (Resource Group %q): %s", id.Name, id.ResourceGroup, err) } siteConfigResource := web.SiteConfigResource{ SiteConfig: siteConfig, } - if _, err := client.CreateOrUpdateConfigurationSlot(ctx, resourceGroup, appServiceName, siteConfigResource, slot); err != nil { - return fmt.Errorf("Error updating Configuration for App Service Slot %q/%q: %+v", appServiceName, slot, err) + if _, err := client.CreateOrUpdateConfigurationSlot(ctx, id.ResourceGroup, id.AppServiceName, siteConfigResource, id.Name); err != nil { + return fmt.Errorf("Error updating Configuration for App Service Slot %q/%q: %+v", id.AppServiceName, id.Name, err) } } if d.HasChange("auth_settings") { authSettingsRaw := d.Get("auth_settings").([]interface{}) authSettingsProperties := azure.ExpandAppServiceAuthSettings(authSettingsRaw) - id := d.Id() authSettings := web.SiteAuthSettings{ - ID: &id, + ID: utils.String(d.Id()), SiteAuthSettingsProperties: &authSettingsProperties, } - if _, err := client.UpdateAuthSettingsSlot(ctx, resourceGroup, appServiceName, authSettings, slot); err != nil { - return fmt.Errorf("Error updating Authentication Settings for App Service %q: %+v", appServiceName, err) + if _, err := client.UpdateAuthSettingsSlot(ctx, id.ResourceGroup, id.AppServiceName, authSettings, id.Name); err != nil { + return fmt.Errorf("Error updating Authentication Settings for App Service %q: %+v", id.AppServiceName, err) } } @@ -319,8 +314,8 @@ func resourceArmAppServiceSlotUpdate(d *schema.ResourceData, meta interface{}) e Properties: appSettings, } - if _, err := client.UpdateApplicationSettingsSlot(ctx, resourceGroup, appServiceName, settings, slot); err != nil { - return fmt.Errorf("Error updating Application Settings for App Service Slot %q/%q: %+v", appServiceName, slot, err) + if _, err := client.UpdateApplicationSettingsSlot(ctx, id.ResourceGroup, id.AppServiceName, settings, id.Name); err != nil { + return fmt.Errorf("Error updating Application Settings for App Service Slot %q/%q: %+v", id.AppServiceName, id.Name, err) } } @@ -332,14 +327,13 @@ func resourceArmAppServiceSlotUpdate(d *schema.ResourceData, meta interface{}) e _, hasLogs := d.GetOkExists("logs") if d.HasChange("logs") || (hasLogs && d.HasChange("app_settings")) { logs := azure.ExpandAppServiceLogs(d.Get("logs")) - id := d.Id() logsResource := web.SiteLogsConfig{ - ID: &id, + ID: utils.String(d.Id()), SiteLogsConfigProperties: &logs, } - if _, err := client.UpdateDiagnosticLogsConfigSlot(ctx, resourceGroup, appServiceName, logsResource, slot); err != nil { - return fmt.Errorf("Error updating Diagnostics Logs for App Service Slot %q/%q: %+v", appServiceName, slot, err) + if _, err := client.UpdateDiagnosticLogsConfigSlot(ctx, id.ResourceGroup, id.AppServiceName, logsResource, id.Name); err != nil { + return fmt.Errorf("Error updating Diagnostics Logs for App Service Slot %q/%q: %+v", id.AppServiceName, id.Name, err) } } @@ -350,8 +344,8 @@ func resourceArmAppServiceSlotUpdate(d *schema.ResourceData, meta interface{}) e Properties: connectionStrings, } - if _, err := client.UpdateConnectionStringsSlot(ctx, resourceGroup, appServiceName, properties, slot); err != nil { - return fmt.Errorf("Error updating Connection Strings for App Service Slot %q/%q: %+v", appServiceName, slot, err) + if _, err := client.UpdateConnectionStringsSlot(ctx, id.ResourceGroup, id.AppServiceName, properties, id.Name); err != nil { + return fmt.Errorf("Error updating Connection Strings for App Service Slot %q/%q: %+v", id.AppServiceName, id.Name, err) } } @@ -362,9 +356,9 @@ func resourceArmAppServiceSlotUpdate(d *schema.ResourceData, meta interface{}) e ID: utils.String(d.Id()), Identity: appServiceIdentity, } - _, err := client.UpdateSlot(ctx, resourceGroup, appServiceName, sitePatchResource, slot) + _, err := client.UpdateSlot(ctx, id.ResourceGroup, id.AppServiceName, sitePatchResource, id.Name) if err != nil { - return fmt.Errorf("Error updating Managed Service Identity for App Service Slot %q/%q: %+v", appServiceName, slot, err) + return fmt.Errorf("Error updating Managed Service Identity for App Service Slot %q/%q: %+v", id.AppServiceName, id.Name, err) } } @@ -381,74 +375,70 @@ func resourceArmAppServiceSlotRead(d *schema.ResourceData, meta interface{}) err return err } - resourceGroup := id.ResourceGroup - appServiceName := id.AppServiceName - slot := id.Name - - resp, err := client.GetSlot(ctx, resourceGroup, appServiceName, slot) + resp, err := client.GetSlot(ctx, id.ResourceGroup, id.AppServiceName, id.Name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - log.Printf("[DEBUG] Slot %q (App Service %q / Resource Group %q) were not found - removing from state!", slot, appServiceName, resourceGroup) + log.Printf("[DEBUG] Slot %q (App Service %q / Resource Group %q) were not found - removing from state!", id.Name, id.AppServiceName, id.ResourceGroup) d.SetId("") return nil } - return fmt.Errorf("Error reading Slot %q (App Service %q / Resource Group %q): %s", slot, appServiceName, resourceGroup, err) + return fmt.Errorf("Error reading Slot %q (App Service %q / Resource Group %q): %s", id.Name, id.AppServiceName, id.ResourceGroup, err) } - configResp, err := client.GetConfigurationSlot(ctx, resourceGroup, appServiceName, slot) + configResp, err := client.GetConfigurationSlot(ctx, id.ResourceGroup, id.AppServiceName, id.Name) if err != nil { if utils.ResponseWasNotFound(configResp.Response) { - log.Printf("[DEBUG] Configuration for Slot %q (App Service %q / Resource Group %q) were not found - removing from state!", slot, appServiceName, resourceGroup) + log.Printf("[DEBUG] Configuration for Slot %q (App Service %q / Resource Group %q) were not found - removing from state!", id.Name, id.AppServiceName, id.ResourceGroup) d.SetId("") return nil } - return fmt.Errorf("Error reading Configuration for Slot %q (App Service %q / Resource Group %q): %s", slot, appServiceName, resourceGroup, err) + return fmt.Errorf("Error reading Configuration for Slot %q (App Service %q / Resource Group %q): %s", id.Name, id.AppServiceName, id.ResourceGroup, err) } - authResp, err := client.GetAuthSettingsSlot(ctx, resourceGroup, appServiceName, slot) + authResp, err := client.GetAuthSettingsSlot(ctx, id.ResourceGroup, id.AppServiceName, id.Name) if err != nil { - return fmt.Errorf("Error reading Auth Settings for Slot %q (App Service %q / Resource Group %q): %s", slot, appServiceName, resourceGroup, err) + return fmt.Errorf("Error reading Auth Settings for Slot %q (App Service %q / Resource Group %q): %s", id.Name, id.AppServiceName, id.ResourceGroup, err) } - logsResp, err := client.GetDiagnosticLogsConfigurationSlot(ctx, resourceGroup, appServiceName, slot) + logsResp, err := client.GetDiagnosticLogsConfigurationSlot(ctx, id.ResourceGroup, id.AppServiceName, id.Name) if err != nil { - return fmt.Errorf("Error retrieving the DiagnosticsLogsConfiguration for Slot %q (App Service %q / Resource Group %q): %s", slot, appServiceName, resourceGroup, err) + return fmt.Errorf("Error retrieving the DiagnosticsLogsConfiguration for Slot %q (App Service %q / Resource Group %q): %s", id.Name, id.AppServiceName, id.ResourceGroup, err) } - appSettingsResp, err := client.ListApplicationSettingsSlot(ctx, resourceGroup, appServiceName, slot) + appSettingsResp, err := client.ListApplicationSettingsSlot(ctx, id.ResourceGroup, id.AppServiceName, id.Name) if err != nil { if utils.ResponseWasNotFound(appSettingsResp.Response) { - log.Printf("[DEBUG] App Settings for Slot %q (App Service %q / Resource Group %q) were not found - removing from state!", slot, appServiceName, resourceGroup) + log.Printf("[DEBUG] App Settings for Slot %q (App Service %q / Resource Group %q) were not found - removing from state!", id.Name, id.AppServiceName, id.ResourceGroup) d.SetId("") return nil } - return fmt.Errorf("Error reading App Settings for Slot %q (App Service %q / Resource Group %q): %s", slot, appServiceName, resourceGroup, err) + return fmt.Errorf("Error reading App Settings for Slot %q (App Service %q / Resource Group %q): %s", id.Name, id.AppServiceName, id.ResourceGroup, err) } - connectionStringsResp, err := client.ListConnectionStringsSlot(ctx, resourceGroup, appServiceName, slot) + connectionStringsResp, err := client.ListConnectionStringsSlot(ctx, id.ResourceGroup, id.AppServiceName, id.Name) if err != nil { - return fmt.Errorf("Error listing Connection Strings for Slot %q (App Service %q / Resource Group %q): %s", slot, appServiceName, resourceGroup, err) + return fmt.Errorf("Error listing Connection Strings for Slot %q (App Service %q / Resource Group %q): %s", id.Name, id.AppServiceName, id.ResourceGroup, err) } - siteCredFuture, err := client.ListPublishingCredentialsSlot(ctx, resourceGroup, appServiceName, slot) + siteCredFuture, err := client.ListPublishingCredentialsSlot(ctx, id.ResourceGroup, id.AppServiceName, id.Name) if err != nil { - return fmt.Errorf("Error retrieving publishing credentials for Slot %q (App Service %q / Resource Group %q): %s", slot, appServiceName, resourceGroup, err) + return fmt.Errorf("Error retrieving publishing credentials for Slot %q (App Service %q / Resource Group %q): %s", id.Name, id.AppServiceName, id.ResourceGroup, err) } err = siteCredFuture.WaitForCompletionRef(ctx, client.Client) if err != nil { - return fmt.Errorf("Error waiting for publishing credentials for Slot %q (App Service %q / Resource Group %q): %s", slot, appServiceName, resourceGroup, err) + return fmt.Errorf("Error waiting for publishing credentials for Slot %q (App Service %q / Resource Group %q): %s", id.Name, id.AppServiceName, id.ResourceGroup, err) } siteCredResp, err := siteCredFuture.Result(*client) if err != nil { - return fmt.Errorf("Error reading publishing credentials for Slot %q (App Service %q / Resource Group %q): %s", slot, appServiceName, resourceGroup, err) + return fmt.Errorf("Error reading publishing credentials for Slot %q (App Service %q / Resource Group %q): %s", id.Name, id.AppServiceName, id.ResourceGroup, err) } - d.Set("name", slot) - d.Set("app_service_name", appServiceName) - d.Set("resource_group_name", resourceGroup) + d.Set("name", id.Name) + d.Set("app_service_name", id.AppServiceName) + d.Set("resource_group_name", id.ResourceGroup) if location := resp.Location; location != nil { d.Set("location", azure.NormalizeLocation(*location)) } @@ -515,18 +505,14 @@ func resourceArmAppServiceSlotDelete(d *schema.ResourceData, meta interface{}) e return err } - resourceGroup := id.ResourceGroup - appServiceName := id.AppServiceName - slot := id.Name - - log.Printf("[DEBUG] Deleting Slot %q (App Service %q / Resource Group %q)", slot, appServiceName, resourceGroup) + log.Printf("[DEBUG] Deleting Slot %q (App Service %q / Resource Group %q)", id.Name, id.AppServiceName, id.ResourceGroup) deleteMetrics := true deleteEmptyServerFarm := false - resp, err := client.DeleteSlot(ctx, resourceGroup, appServiceName, slot, &deleteMetrics, &deleteEmptyServerFarm) + resp, err := client.DeleteSlot(ctx, id.ResourceGroup, id.AppServiceName, id.Name, &deleteMetrics, &deleteEmptyServerFarm) if err != nil { if !utils.ResponseWasNotFound(resp) { - return fmt.Errorf("Error deleting Slot %q (App Service %q / Resource Group %q): %s", slot, appServiceName, resourceGroup, err) + return fmt.Errorf("Error deleting Slot %q (App Service %q / Resource Group %q): %s", id.Name, id.AppServiceName, id.ResourceGroup, err) } } diff --git a/azurerm/internal/services/web/resource_arm_function_app.go b/azurerm/internal/services/web/resource_arm_function_app.go index 4444dcd1ab764..c42e64a1c0ffa 100644 --- a/azurerm/internal/services/web/resource_arm_function_app.go +++ b/azurerm/internal/services/web/resource_arm_function_app.go @@ -401,9 +401,6 @@ func resourceArmFunctionAppUpdate(d *schema.ResourceData, meta interface{}) erro return err } - resGroup := id.ResourceGroup - name := id.Name - location := azure.NormalizeLocation(d.Get("location").(string)) kind := "functionapp" if osTypeRaw, ok := d.GetOk("os_type"); ok { @@ -426,7 +423,7 @@ func resourceArmFunctionAppUpdate(d *schema.ResourceData, meta interface{}) erro basicAppSettings := getBasicFunctionAppAppSettings(d, appServiceTier) siteConfig, err := expandFunctionAppSiteConfig(d) if err != nil { - return fmt.Errorf("Error expanding `site_config` for Function App %q (Resource Group %q): %s", name, resGroup, err) + return fmt.Errorf("Error expanding `site_config` for Function App %q (Resource Group %q): %s", id.Name, id.ResourceGroup, err) } siteConfig.AppSettings = &basicAppSettings @@ -450,13 +447,13 @@ func resourceArmFunctionAppUpdate(d *schema.ResourceData, meta interface{}) erro siteEnvelope.Identity = appServiceIdentity } - future, err := client.CreateOrUpdate(ctx, resGroup, name, siteEnvelope) + future, err := client.CreateOrUpdate(ctx, id.ResourceGroup, id.Name, siteEnvelope) if err != nil { - return fmt.Errorf("Error updating Function App %q (Resource Group %q): %+v", name, resGroup, err) + return fmt.Errorf("Error updating Function App %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for update of Function App %q (Resource Group %q): %+v", name, resGroup, err) + return fmt.Errorf("Error waiting for update of Function App %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } appSettings := expandFunctionAppAppSettings(d, appServiceTier) @@ -464,35 +461,33 @@ func resourceArmFunctionAppUpdate(d *schema.ResourceData, meta interface{}) erro Properties: appSettings, } - _, err = client.UpdateApplicationSettings(ctx, resGroup, name, settings) - if err != nil { - return fmt.Errorf("Error updating Application Settings for Function App %q: %+v", name, err) + if _, err = client.UpdateApplicationSettings(ctx, id.ResourceGroup, id.Name, settings); err != nil { + return fmt.Errorf("Error updating Application Settings for Function App %q: %+v", id.Name, err) } if d.HasChange("site_config") { siteConfig, err := expandFunctionAppSiteConfig(d) if err != nil { - return fmt.Errorf("Error expanding `site_config` for Function App %q (Resource Group %q): %s", name, resGroup, err) + return fmt.Errorf("Error expanding `site_config` for Function App %q (Resource Group %q): %s", id.Name, id.ResourceGroup, err) } siteConfigResource := web.SiteConfigResource{ SiteConfig: &siteConfig, } - if _, err := client.CreateOrUpdateConfiguration(ctx, resGroup, name, siteConfigResource); err != nil { - return fmt.Errorf("Error updating Configuration for Function App %q: %+v", name, err) + if _, err := client.CreateOrUpdateConfiguration(ctx, id.ResourceGroup, id.Name, siteConfigResource); err != nil { + return fmt.Errorf("Error updating Configuration for Function App %q: %+v", id.Name, err) } } if d.HasChange("auth_settings") { authSettingsRaw := d.Get("auth_settings").([]interface{}) authSettingsProperties := azure.ExpandAppServiceAuthSettings(authSettingsRaw) - id := d.Id() authSettings := web.SiteAuthSettings{ - ID: &id, + ID: utils.String(d.Id()), SiteAuthSettingsProperties: &authSettingsProperties, } - if _, err := client.UpdateAuthSettings(ctx, resGroup, name, authSettings); err != nil { - return fmt.Errorf("Error updating Authentication Settings for Function App %q: %+v", name, err) + if _, err := client.UpdateAuthSettings(ctx, id.ResourceGroup, id.Name, authSettings); err != nil { + return fmt.Errorf("Error updating Authentication Settings for Function App %q: %+v", id.Name, err) } } @@ -503,8 +498,8 @@ func resourceArmFunctionAppUpdate(d *schema.ResourceData, meta interface{}) erro Properties: connectionStrings, } - if _, err := client.UpdateConnectionStrings(ctx, resGroup, name, properties); err != nil { - return fmt.Errorf("Error updating Connection Strings for App Service %q: %+v", name, err) + if _, err := client.UpdateConnectionStrings(ctx, id.ResourceGroup, id.Name, properties); err != nil { + return fmt.Errorf("Error updating Connection Strings for App Service %q: %+v", id.Name, err) } } @@ -521,35 +516,32 @@ func resourceArmFunctionAppRead(d *schema.ResourceData, meta interface{}) error return err } - resGroup := id.ResourceGroup - name := id.Name - - resp, err := client.Get(ctx, resGroup, name) + resp, err := client.Get(ctx, id.ResourceGroup, id.Name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { - log.Printf("[DEBUG] Function App %q (resource group %q) was not found - removing from state", name, resGroup) + log.Printf("[DEBUG] Function App %q (resource group %q) was not found - removing from state", id.Name, id.ResourceGroup) d.SetId("") return nil } - return fmt.Errorf("Error making Read request on AzureRM Function App %q: %+v", name, err) + return fmt.Errorf("Error making Read request on AzureRM Function App %q: %+v", id.Name, err) } - appSettingsResp, err := client.ListApplicationSettings(ctx, resGroup, name) + appSettingsResp, err := client.ListApplicationSettings(ctx, id.ResourceGroup, id.Name) if err != nil { if utils.ResponseWasNotFound(appSettingsResp.Response) { - log.Printf("[DEBUG] Application Settings of Function App %q (resource group %q) were not found", name, resGroup) + log.Printf("[DEBUG] Application Settings of Function App %q (resource group %q) were not found", id.Name, id.ResourceGroup) d.SetId("") return nil } - return fmt.Errorf("Error making Read request on AzureRM Function App AppSettings %q: %+v", name, err) + return fmt.Errorf("Error making Read request on AzureRM Function App AppSettings %q: %+v", id.Name, err) } - connectionStringsResp, err := client.ListConnectionStrings(ctx, resGroup, name) + connectionStringsResp, err := client.ListConnectionStrings(ctx, id.ResourceGroup, id.Name) if err != nil { - return fmt.Errorf("Error making Read request on AzureRM Function App ConnectionStrings %q: %+v", name, err) + return fmt.Errorf("Error making Read request on AzureRM Function App ConnectionStrings %q: %+v", id.Name, err) } - siteCredFuture, err := client.ListPublishingCredentials(ctx, resGroup, name) + siteCredFuture, err := client.ListPublishingCredentials(ctx, id.ResourceGroup, id.Name) if err != nil { return err } @@ -559,15 +551,15 @@ func resourceArmFunctionAppRead(d *schema.ResourceData, meta interface{}) error } siteCredResp, err := siteCredFuture.Result(*client) if err != nil { - return fmt.Errorf("Error making Read request on AzureRM App Service Site Credential %q: %+v", name, err) + return fmt.Errorf("Error making Read request on AzureRM App Service Site Credential %q: %+v", id.Name, err) } - authResp, err := client.GetAuthSettings(ctx, resGroup, name) + authResp, err := client.GetAuthSettings(ctx, id.ResourceGroup, id.Name) if err != nil { - return fmt.Errorf("Error retrieving the AuthSettings for Function App %q (Resource Group %q): %+v", name, resGroup, err) + return fmt.Errorf("Error retrieving the AuthSettings for Function App %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } - d.Set("name", name) - d.Set("resource_group_name", resGroup) + d.Set("name", id.Name) + d.Set("resource_group_name", id.ResourceGroup) d.Set("kind", resp.Kind) osType := "" if v := resp.Kind; v != nil && strings.Contains(*v, "linux") { @@ -615,9 +607,9 @@ func resourceArmFunctionAppRead(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("Error setting `identity`: %s", err) } - configResp, err := client.GetConfiguration(ctx, resGroup, name) + configResp, err := client.GetConfiguration(ctx, id.ResourceGroup, id.Name) if err != nil { - return fmt.Errorf("Error making Read request on AzureRM Function App Configuration %q: %+v", name, err) + return fmt.Errorf("Error making Read request on AzureRM Function App Configuration %q: %+v", id.Name, err) } siteConfig := flattenFunctionAppSiteConfig(configResp.SiteConfig) @@ -648,14 +640,11 @@ func resourceArmFunctionAppDelete(d *schema.ResourceData, meta interface{}) erro return err } - resGroup := id.ResourceGroup - name := id.Name - - log.Printf("[DEBUG] Deleting Function App %q (resource group %q)", name, resGroup) + log.Printf("[DEBUG] Deleting Function App %q (resource group %q)", id.Name, id.ResourceGroup) deleteMetrics := true deleteEmptyServerFarm := false - resp, err := client.Delete(ctx, resGroup, name, &deleteMetrics, &deleteEmptyServerFarm) + resp, err := client.Delete(ctx, id.ResourceGroup, id.Name, &deleteMetrics, &deleteEmptyServerFarm) if err != nil { if !utils.ResponseWasNotFound(resp) { return err From 55e456c74da22009e1f5fe52e4c197d738a66151 Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 5 Mar 2020 15:29:47 -0800 Subject: [PATCH 468/498] New Resource & Data Source: azurerm_database_migration_project (#5993) Implement azurerm_database_migration_project. See #5257 for more details. --- .../databasemigration/client/client.go | 6 + .../data_source_database_migration_project.go | 91 ++++++++ .../data_source_database_migration_service.go | 2 +- .../parse/datamigration_project.go | 38 +++ .../parse/datamigration_project_test.go | 89 ++++++++ .../databasemigration/registration.go | 2 + ...resource_arm_database_migration_project.go | 190 +++++++++++++++ ...resource_arm_database_migration_service.go | 2 +- ..._source_database_migration_project_test.go | 40 ++++ ...rce_arm_database_migration_project_test.go | 216 ++++++++++++++++++ .../services/databasemigration/validation.go | 14 +- website/azurerm.erb | 8 + .../database_migration_project.html.markdown | 60 +++++ .../database_migration_project.html.markdown | 94 ++++++++ 14 files changed, 849 insertions(+), 3 deletions(-) create mode 100644 azurerm/internal/services/databasemigration/data_source_database_migration_project.go create mode 100644 azurerm/internal/services/databasemigration/parse/datamigration_project.go create mode 100644 azurerm/internal/services/databasemigration/parse/datamigration_project_test.go create mode 100644 azurerm/internal/services/databasemigration/resource_arm_database_migration_project.go create mode 100644 azurerm/internal/services/databasemigration/tests/data_source_database_migration_project_test.go create mode 100644 azurerm/internal/services/databasemigration/tests/resource_arm_database_migration_project_test.go create mode 100644 website/docs/d/database_migration_project.html.markdown create mode 100644 website/docs/r/database_migration_project.html.markdown diff --git a/azurerm/internal/services/databasemigration/client/client.go b/azurerm/internal/services/databasemigration/client/client.go index e15f08de5b57b..90dba0b7f4943 100644 --- a/azurerm/internal/services/databasemigration/client/client.go +++ b/azurerm/internal/services/databasemigration/client/client.go @@ -7,12 +7,18 @@ import ( type Client struct { ServicesClient *datamigration.ServicesClient + ProjectsClient *datamigration.ProjectsClient } func NewClient(o *common.ClientOptions) *Client { servicesClient := datamigration.NewServicesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&servicesClient.Client, o.ResourceManagerAuthorizer) + + projectsClient := datamigration.NewProjectsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) + o.ConfigureClient(&projectsClient.Client, o.ResourceManagerAuthorizer) + return &Client{ ServicesClient: &servicesClient, + ProjectsClient: &projectsClient, } } diff --git a/azurerm/internal/services/databasemigration/data_source_database_migration_project.go b/azurerm/internal/services/databasemigration/data_source_database_migration_project.go new file mode 100644 index 0000000000000..ad7aed0b92538 --- /dev/null +++ b/azurerm/internal/services/databasemigration/data_source_database_migration_project.go @@ -0,0 +1,91 @@ +package databasemigration + +import ( + "fmt" + "time" + + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func dataSourceArmDatabaseMigrationProject() *schema.Resource { + return &schema.Resource{ + Read: dataSourceArmDatabaseMigrationProjectRead, + + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(5 * time.Minute), + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validateDatabaseMigrationProjectName, + }, + + "service_name": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validateDatabaseMigrationServiceName, + }, + + "resource_group_name": azure.SchemaResourceGroupNameForDataSource(), + + "location": azure.SchemaLocationForDataSource(), + + "source_platform": { + Type: schema.TypeString, + Computed: true, + }, + + "target_platform": { + Type: schema.TypeString, + Computed: true, + }, + + "tags": tags.SchemaDataSource(), + }, + } +} + +func dataSourceArmDatabaseMigrationProjectRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).DatabaseMigration.ProjectsClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + name := d.Get("name").(string) + serviceName := d.Get("service_name").(string) + resourceGroup := d.Get("resource_group_name").(string) + + resp, err := client.Get(ctx, resourceGroup, serviceName, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Error: Database Migration Project (Project Name %q / Service Name %q / Group Name %q) was not found", name, serviceName, resourceGroup) + } + return fmt.Errorf("Error reading Database Migration Project (Project Name %q / Service Name %q / Group Name %q): %+v", name, serviceName, resourceGroup, err) + } + + if resp.ID == nil || *resp.ID == "" { + return fmt.Errorf("Cannot read Database Migration Project (Project Name %q / Service Name %q / Group Name %q) ID", name, serviceName, resourceGroup) + } + d.SetId(*resp.ID) + + d.Set("resource_group_name", resourceGroup) + + location := "" + if resp.Location != nil { + location = azure.NormalizeLocation(*resp.Location) + } + d.Set("location", location) + + if prop := resp.ProjectProperties; prop != nil { + d.Set("source_platform", string(prop.SourcePlatform)) + d.Set("target_platform", string(prop.TargetPlatform)) + } + + return nil +} diff --git a/azurerm/internal/services/databasemigration/data_source_database_migration_service.go b/azurerm/internal/services/databasemigration/data_source_database_migration_service.go index 7e5e616f6f56d..0ea63e668a5b6 100644 --- a/azurerm/internal/services/databasemigration/data_source_database_migration_service.go +++ b/azurerm/internal/services/databasemigration/data_source_database_migration_service.go @@ -25,7 +25,7 @@ func dataSourceArmDatabaseMigrationService() *schema.Resource { "name": { Type: schema.TypeString, Required: true, - ValidateFunc: validateDatabasesMigrationServiceName, + ValidateFunc: validateDatabaseMigrationServiceName, }, "resource_group_name": azure.SchemaResourceGroupNameForDataSource(), diff --git a/azurerm/internal/services/databasemigration/parse/datamigration_project.go b/azurerm/internal/services/databasemigration/parse/datamigration_project.go new file mode 100644 index 0000000000000..d047ab962f44d --- /dev/null +++ b/azurerm/internal/services/databasemigration/parse/datamigration_project.go @@ -0,0 +1,38 @@ +package parse + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type DatabaseMigrationProjectId struct { + ResourceGroup string + Service string + Name string +} + +func DatabaseMigrationProjectID(input string) (*DatabaseMigrationProjectId, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("[ERROR] Unable to parse Database Migration Project ID %q: %+v", input, err) + } + + project := DatabaseMigrationProjectId{ + ResourceGroup: id.ResourceGroup, + } + + if project.Service, err = id.PopSegment("services"); err != nil { + return nil, err + } + + if project.Name, err = id.PopSegment("projects"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &project, nil +} diff --git a/azurerm/internal/services/databasemigration/parse/datamigration_project_test.go b/azurerm/internal/services/databasemigration/parse/datamigration_project_test.go new file mode 100644 index 0000000000000..53b0505fd01c8 --- /dev/null +++ b/azurerm/internal/services/databasemigration/parse/datamigration_project_test.go @@ -0,0 +1,89 @@ +package parse + +import ( + "testing" +) + +func TestDatabaseMigrationProjectID(t *testing.T) { + testData := []struct { + Name string + Input string + Error bool + Expect *DatabaseMigrationProjectId + }{ + { + Name: "Empty", + Input: "", + Error: true, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Error: true, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Error: true, + }, + { + Name: "No Resource Group ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", + Error: true, + }, + { + Name: "Missing service name", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/services", + Error: true, + }, + { + Name: "No Projects Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/services/service1", + Error: true, + }, + { + Name: "Missing project name", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/services/service1/projects", + Error: true, + }, + { + Name: "Service name", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Datamigration/services/service1/projects/project1", + Expect: &DatabaseMigrationProjectId{ + ResourceGroup: "resGroup1", + Service: "service1", + Name: "project1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.Datamigration/Services/service1/projects/project1", + Error: true, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Name) + + actual, err := DatabaseMigrationProjectID(v.Input) + if err != nil { + if v.Error { + continue + } + + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.ResourceGroup != v.Expect.ResourceGroup { + t.Fatalf("Expected %q but got %q for Resource Group", v.Expect.ResourceGroup, actual.ResourceGroup) + } + + if actual.Service != v.Expect.Service { + t.Fatalf("Expected %q but got %q for Service", v.Expect.Service, actual.Service) + } + + if actual.Name != v.Expect.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expect.Name, actual.Name) + } + } +} diff --git a/azurerm/internal/services/databasemigration/registration.go b/azurerm/internal/services/databasemigration/registration.go index 9a41c8047e650..7a2c32aae2a38 100644 --- a/azurerm/internal/services/databasemigration/registration.go +++ b/azurerm/internal/services/databasemigration/registration.go @@ -22,6 +22,7 @@ func (r Registration) WebsiteCategories() []string { func (r Registration) SupportedDataSources() map[string]*schema.Resource { return map[string]*schema.Resource{ "azurerm_database_migration_service": dataSourceArmDatabaseMigrationService(), + "azurerm_database_migration_project": dataSourceArmDatabaseMigrationProject(), } } @@ -29,6 +30,7 @@ func (r Registration) SupportedDataSources() map[string]*schema.Resource { func (r Registration) SupportedResources() map[string]*schema.Resource { resources := map[string]*schema.Resource{ "azurerm_database_migration_service": resourceArmDatabaseMigrationService(), + "azurerm_database_migration_project": resourceArmDatabaseMigrationProject(), } return resources diff --git a/azurerm/internal/services/databasemigration/resource_arm_database_migration_project.go b/azurerm/internal/services/databasemigration/resource_arm_database_migration_project.go new file mode 100644 index 0000000000000..137ce4d6188ac --- /dev/null +++ b/azurerm/internal/services/databasemigration/resource_arm_database_migration_project.go @@ -0,0 +1,190 @@ +package databasemigration + +import ( + "fmt" + "log" + "time" + + "github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2018-04-19/datamigration" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/databasemigration/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmDatabaseMigrationProject() *schema.Resource { + return &schema.Resource{ + Create: resourceArmDatabaseMigrationProjectCreateUpdate, + Read: resourceArmDatabaseMigrationProjectRead, + Update: resourceArmDatabaseMigrationProjectCreateUpdate, + Delete: resourceArmDatabaseMigrationProjectDelete, + + Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { + _, err := parse.DatabaseMigrationProjectID(id) + return err + }), + + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(30 * time.Minute), + Read: schema.DefaultTimeout(5 * time.Minute), + Update: schema.DefaultTimeout(30 * time.Minute), + Delete: schema.DefaultTimeout(30 * time.Minute), + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validateDatabaseMigrationProjectName, + }, + + "service_name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validateDatabaseMigrationServiceName, + }, + + "resource_group_name": azure.SchemaResourceGroupName(), + + "location": azure.SchemaLocation(), + + "source_platform": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + // Now that go sdk only export SQL as source platform type, we only allow it here. + string(datamigration.ProjectSourcePlatformSQL), + }, false), + }, + + "target_platform": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + // Now that go sdk only export SQL as source platform type, we only allow it here. + string(datamigration.ProjectTargetPlatformSQLDB), + }, false), + }, + + "tags": tags.Schema(), + }, + } +} + +func resourceArmDatabaseMigrationProjectCreateUpdate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).DatabaseMigration.ProjectsClient + ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) + defer cancel() + + name := d.Get("name").(string) + resourceGroup := d.Get("resource_group_name").(string) + serviceName := d.Get("service_name").(string) + + if features.ShouldResourcesBeImported() && d.IsNewResource() { + existing, err := client.Get(ctx, resourceGroup, serviceName, name) + if err != nil { + if !utils.ResponseWasNotFound(existing.Response) { + return fmt.Errorf("Error checking for present of existing Database Migration Project (Project Name: %q / Service Name %q / Group Name %q): %+v", name, serviceName, resourceGroup, err) + } + } + if existing.ID != nil && *existing.ID != "" { + return tf.ImportAsExistsError("azurerm_database_migration_project", *existing.ID) + } + } + + location := azure.NormalizeLocation(d.Get("location").(string)) + sourcePlatform := d.Get("source_platform").(string) + targetPlatform := d.Get("target_platform").(string) + t := d.Get("tags").(map[string]interface{}) + + parameters := datamigration.Project{ + Location: utils.String(location), + ProjectProperties: &datamigration.ProjectProperties{ + SourcePlatform: datamigration.ProjectSourcePlatform(sourcePlatform), + TargetPlatform: datamigration.ProjectTargetPlatform(targetPlatform), + }, + Tags: tags.Expand(t), + } + + if _, err := client.CreateOrUpdate(ctx, parameters, resourceGroup, serviceName, name); err != nil { + return fmt.Errorf("Error creating Database Migration Project (Project Name %q / Service Name %q / Group Name %q): %+v", name, serviceName, resourceGroup, err) + } + + resp, err := client.Get(ctx, resourceGroup, serviceName, name) + if err != nil { + return fmt.Errorf("Error retrieving Database Migration Project (Project Name %q / Service Name %q / Group Name %q): %+v", name, serviceName, resourceGroup, err) + } + if resp.ID == nil || *resp.ID == "" { + return fmt.Errorf("Cannot read Database Migration Project (Project Name %q / Service Name %q / Group Name %q) ID", name, serviceName, resourceGroup) + } + d.SetId(*resp.ID) + + return resourceArmDatabaseMigrationProjectRead(d, meta) +} + +func resourceArmDatabaseMigrationProjectRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).DatabaseMigration.ProjectsClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := parse.DatabaseMigrationProjectID(d.Id()) + if err != nil { + return err + } + + resp, err := client.Get(ctx, id.ResourceGroup, id.Service, id.Name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + log.Printf("[INFO] Database Migration Project %q does not exist - removing from state", d.Id()) + d.SetId("") + return nil + } + return fmt.Errorf("Error reading Database Migration Project (Project Name %q / Service Name %q / Group Name %q): %+v", id.Name, id.Service, id.ResourceGroup, err) + } + + d.Set("name", resp.Name) + d.Set("service_name", id.Service) + d.Set("resource_group_name", id.ResourceGroup) + + location := "" + if resp.Location != nil { + location = azure.NormalizeLocation(*resp.Location) + } + d.Set("location", location) + + if prop := resp.ProjectProperties; prop != nil { + d.Set("source_platform", string(prop.SourcePlatform)) + d.Set("target_platform", string(prop.TargetPlatform)) + } + + return tags.FlattenAndSet(d, resp.Tags) +} + +func resourceArmDatabaseMigrationProjectDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).DatabaseMigration.ProjectsClient + ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := parse.DatabaseMigrationProjectID(d.Id()) + if err != nil { + return err + } + + deleteRunningTasks := false + if _, err := client.Delete(ctx, id.ResourceGroup, id.Service, id.Name, &deleteRunningTasks); err != nil { + return fmt.Errorf("Error deleting Database Migration Project (Project Name %q / Service Name %q / Group Name %q): %+v", id.Name, id.Service, id.ResourceGroup, err) + } + + return nil +} diff --git a/azurerm/internal/services/databasemigration/resource_arm_database_migration_service.go b/azurerm/internal/services/databasemigration/resource_arm_database_migration_service.go index fc5913e302cc8..508cd93d0a4a1 100644 --- a/azurerm/internal/services/databasemigration/resource_arm_database_migration_service.go +++ b/azurerm/internal/services/databasemigration/resource_arm_database_migration_service.go @@ -45,7 +45,7 @@ func resourceArmDatabaseMigrationService() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: validateDatabasesMigrationServiceName, + ValidateFunc: validateDatabaseMigrationServiceName, }, "location": azure.SchemaLocation(), diff --git a/azurerm/internal/services/databasemigration/tests/data_source_database_migration_project_test.go b/azurerm/internal/services/databasemigration/tests/data_source_database_migration_project_test.go new file mode 100644 index 0000000000000..cf3f20fcf62dc --- /dev/null +++ b/azurerm/internal/services/databasemigration/tests/data_source_database_migration_project_test.go @@ -0,0 +1,40 @@ +package azurerm + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" +) + +func TestAccDataSourceAzureRMDatabaseMigrationProject_basic(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_database_migration_project", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceDatabaseMigrationProject_basic(data), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(data.ResourceName, "source_platform", "SQL"), + resource.TestCheckResourceAttr(data.ResourceName, "target_platform", "SQLDB"), + ), + }, + }, + }) +} + +func testAccDataSourceDatabaseMigrationProject_basic(data acceptance.TestData) string { + config := testAccAzureRMDatabaseMigrationProject_basic(data) + return fmt.Sprintf(` +%s + +data "azurerm_database_migration_project" "test" { + name = azurerm_database_migration_project.test.name + service_name = azurerm_database_migration_project.test.service_name + resource_group_name = azurerm_database_migration_project.test.resource_group_name +} +`, config) +} diff --git a/azurerm/internal/services/databasemigration/tests/resource_arm_database_migration_project_test.go b/azurerm/internal/services/databasemigration/tests/resource_arm_database_migration_project_test.go new file mode 100644 index 0000000000000..1324a9992fe6c --- /dev/null +++ b/azurerm/internal/services/databasemigration/tests/resource_arm_database_migration_project_test.go @@ -0,0 +1,216 @@ +package azurerm + +import ( + "fmt" + "testing" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/databasemigration/parse" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func TestAccAzureRMDatabaseMigrationProject_basic(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_database_migration_project", "test") + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMDatabaseMigrationProjectDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMDatabaseMigrationProject_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMDatabaseMigrationProjectExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "source_platform", "SQL"), + resource.TestCheckResourceAttr(data.ResourceName, "target_platform", "SQLDB"), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMDatabaseMigrationProject_complete(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_database_migration_project", "test") + resource.Test(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMDatabaseMigrationProjectDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMDatabaseMigrationProject_complete(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMDatabaseMigrationProjectExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "source_platform", "SQL"), + resource.TestCheckResourceAttr(data.ResourceName, "target_platform", "SQLDB"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.name", "Test"), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMDatabaseMigrationProject_requiresImport(t *testing.T) { + if !features.ShouldResourcesBeImported() { + t.Skip("Skipping since resources aren't required to be imported") + return + } + + data := acceptance.BuildTestData(t, "azurerm_database_migration_project", "test") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMDatabaseMigrationProjectDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMDatabaseMigrationProject_basic(data), + }, + data.RequiresImportErrorStep(testAccAzureRMDatabaseMigrationProject_requiresImport), + }, + }) +} + +func TestAccAzureRMDatabaseMigrationProject_update(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_database_migration_project", "test") + resource.Test(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMDatabaseMigrationProjectDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMDatabaseMigrationProject_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMDatabaseMigrationProjectExists(data.ResourceName), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMDatabaseMigrationProject_complete(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMDatabaseMigrationProjectExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "tags.name", "Test"), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMDatabaseMigrationProject_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMDatabaseMigrationProjectExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + +func testCheckAzureRMDatabaseMigrationProjectExists(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("Database Migration Project not found: %s", resourceName) + } + + id, err := parse.DatabaseMigrationProjectID(rs.Primary.ID) + if err != nil { + return err + } + + client := acceptance.AzureProvider.Meta().(*clients.Client).DatabaseMigration.ProjectsClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + if resp, err := client.Get(ctx, id.ResourceGroup, id.Service, id.Name); err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Bad: Database Migration Project (Project Name %q / Service Name %q / Group Name %q) does not exist", id.Name, id.Service, id.ResourceGroup) + } + return fmt.Errorf("Bad: Get on ProjectsClient: %+v", err) + } + + return nil + } +} + +func testCheckAzureRMDatabaseMigrationProjectDestroy(s *terraform.State) error { + client := acceptance.AzureProvider.Meta().(*clients.Client).DatabaseMigration.ProjectsClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_database_migration_project" { + continue + } + + id, err := parse.DatabaseMigrationProjectID(rs.Primary.ID) + if err != nil { + return err + } + + if resp, err := client.Get(ctx, id.ResourceGroup, id.Service, id.Name); err != nil { + if !utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Bad: Get on ProjectsClient: %+v", err) + } + } + + return nil + } + + return nil +} + +func testAccAzureRMDatabaseMigrationProject_basic(data acceptance.TestData) string { + template := testAccAzureRMDatabaseMigrationService_basic(data) + + return fmt.Sprintf(` +%s + +resource "azurerm_database_migration_project" "test" { + name = "acctestDbmsProject-%d" + service_name = azurerm_database_migration_service.test.name + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + source_platform = "SQL" + target_platform = "SQLDB" +} +`, template, data.RandomInteger) +} + +func testAccAzureRMDatabaseMigrationProject_complete(data acceptance.TestData) string { + template := testAccAzureRMDatabaseMigrationService_basic(data) + + return fmt.Sprintf(` +%s + +resource "azurerm_database_migration_project" "test" { + name = "acctestDbmsProject-%d" + service_name = azurerm_database_migration_service.test.name + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + source_platform = "SQL" + target_platform = "SQLDB" + tags = { + name = "Test" + } +} +`, template, data.RandomInteger) +} + +func testAccAzureRMDatabaseMigrationProject_requiresImport(data acceptance.TestData) string { + template := testAccAzureRMDatabaseMigrationProject_basic(data) + return fmt.Sprintf(` +%s + +resource "azurerm_database_migration_project" "import" { + name = azurerm_database_migration_project.test.name + service_name = azurerm_database_migration_project.test.service_name + resource_group_name = azurerm_database_migration_project.test.resource_group_name + location = azurerm_database_migration_project.test.location + source_platform = azurerm_database_migration_project.test.source_platform + target_platform = azurerm_database_migration_project.test.target_platform +} +`, template) +} diff --git a/azurerm/internal/services/databasemigration/validation.go b/azurerm/internal/services/databasemigration/validation.go index 0e325b3e67ab0..025529197cc59 100644 --- a/azurerm/internal/services/databasemigration/validation.go +++ b/azurerm/internal/services/databasemigration/validation.go @@ -5,7 +5,19 @@ import ( "regexp" ) -func validateDatabasesMigrationServiceName(i interface{}, k string) ([]string, []error) { +func validateDatabaseMigrationServiceName(i interface{}, k string) ([]string, []error) { + v, ok := i.(string) + if !ok { + return nil, []error{fmt.Errorf("expected type of %q to be string", k)} + } + validName := regexp.MustCompile(`^[\d\w]+[\d\w\-_.]*$`) + if !validName.MatchString(v) { + return nil, []error{fmt.Errorf("invalid format of %q", k)} + } + return nil, nil +} + +func validateDatabaseMigrationProjectName(i interface{}, k string) ([]string, []error) { v, ok := i.(string) if !ok { return nil, []error{fmt.Errorf("expected type of %q to be string", k)} diff --git a/website/azurerm.erb b/website/azurerm.erb index 06c500ce1fc96..290b01a4ac9ce 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -162,6 +162,10 @@ azurerm_dns_zone +
          • + azurerm_database_migration_project +
            • +
          • azurerm_database_migration_service
            • @@ -1189,6 +1193,10 @@
          • Database Migration Resources
              +
            • + azurerm_database_migration_project +
              • +
            • azurerm_database_migration_service
              • diff --git a/website/docs/d/database_migration_project.html.markdown b/website/docs/d/database_migration_project.html.markdown new file mode 100644 index 0000000000000..723659a9eff0e --- /dev/null +++ b/website/docs/d/database_migration_project.html.markdown @@ -0,0 +1,60 @@ +--- +subcategory: "Database Migration" +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_database_migration_project" +description: |- + Gets information about an existing Database Migration Project +--- + +# Data Source: azurerm_database_migration_project + +Use this data source to access information about an existing Database Migration Project. + +## Example Usage + +```hcl +provider "azurerm" { + features {} +} + +data "azurerm_database_migration_project" "example" { + name = "example-dbms-project" + resource_group_name = "example-rg" + service_name = "example-dbms" +} + +output "name" { + value = "${data.azurerm_database_migration_project.example.name}" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) Name of the database migration project. + +* `resource_group_name` - (Required) Name of the resource group where resource belongs to. + +* `service_name` - (Required) Name of the database migration service where resource belongs to. + + +## Attributes Reference + +The following attributes are exported: + +* `id` - The ID of Database Migration Project. + +* `location` - Azure location where the resource exists. + +* `source_platform` - The platform type of the migration source. + +* `target_platform` - The platform type of the migration target. + +* `tags` - A mapping of tags to assigned to the resource. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: + +* `read` - (Defaults to 5 minutes) Used when retrieving the API Management API. diff --git a/website/docs/r/database_migration_project.html.markdown b/website/docs/r/database_migration_project.html.markdown new file mode 100644 index 0000000000000..b8f2d2d81c712 --- /dev/null +++ b/website/docs/r/database_migration_project.html.markdown @@ -0,0 +1,94 @@ +--- +subcategory: "Database Migration" +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_database_migration_project" +description: |- + Manage Azure Database Migration Project instance. +--- + +# azurerm_database_migration_project + +Manage a Azure Database Migration Project. + +~> **NOTE:** Destroying a Database Migration Project will leave any outstanding tasks untouched. This is to avoid unexpectedly deleting any tasks managed outside of terraform. + +## Example Usage + +```hcl +resource "azurerm_resource_group" "example" { + name = "example-rg" + location = "West Europe" +} + +resource "azurerm_virtual_network" "example" { + name = "example-vnet" + address_space = ["10.0.0.0/16"] + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name +} + +resource "azurerm_subnet" "example" { + name = "example-subnet" + resource_group_name = azurerm_resource_group.example.name + virtual_network_name = azurerm_virtual_network.example.name + address_prefix = "10.0.1.0/24" +} + +resource "azurerm_database_migration_service" "example" { + name = "example-dbms" + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name + virtual_subnet_id = azurerm_subnet.example.id + sku_name = "Standard_1vCores" +} + +resource "azurerm_database_migration_project" "example" { + name = "example-dbms-project" + service_name = azurerm_database_migration_service.example.name + resource_group_name = azurerm_resource_group.example.name + location = zurerm_resource_group.example.location + source_platform = "SQL" + target_platform = "SQLDB" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) Specify the name of the database migration project. Changing this forces a new resource to be created. + +* `service_name` - (Required) Name of the database migration service where resource belongs to. Changing this forces a new resource to be created. + +* `resource_group_name` - (Required) Name of the resource group in which to create the database migration project. Changing this forces a new resource to be created. + +* `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. + +* `source_platform` - (Required) The platform type of the migration source. Currently only support: `SQL`(on-premises SQL Server). Changing this forces a new resource to be created. + +* `target_platform` - (Required) The platform type of the migration target. Currently only support: `SQLDB`(Azure SQL Database). Changing this forces a new resource to be created. + +* `tags` - (Optional) A mapping of tags to assigned to the resource. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The ID of Database Migration Project. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: + +* `create` - (Defaults to 30 minutes) Used when creating the API Management API. +* `update` - (Defaults to 30 minutes) Used when updating the API Management API. +* `read` - (Defaults to 5 minutes) Used when retrieving the API Management API. +* `delete` - (Defaults to 30 minutes) Used when deleting the API Management API. + +## Import + +Database Migration Projects can be imported using the `resource id`, e.g. + +```shell +$ terraform import azurerm_database_migration_project.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/example-rg/providers/Microsoft.DataMigration/services/example-dms/projects/project1 +``` From 5603a5c514e5ad1ec6351112e9d0d5dccdd01f51 Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 5 Mar 2020 15:30:47 -0800 Subject: [PATCH 469/498] Update CHANGELOG.md to include #5993 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 367e8f8fae7d7..8d394b59a0ee0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,11 @@ FEATURES: +* **New Data Source:** `azurerm_database_migration_project` [GH-5993] * **New Data Source:** `azurerm_database_migration_service` [GH-5258] * **New Data Source:** `azurerm_kusto_cluster` [GH-5942] * **New Resource:** `azurerm_bot_channel_directline` [GH-5445] +* **New Resource:** `azurerm_database_migration_project` [GH-5993] * **New Resource:** `azurerm_database_migration_service` [GH-5258] * **New Resource:** `azurerm_hpc_cache` [GH-5528] * **New Resource:** `azurerm_monitor_scheduled_query_rules_alert` [GH-5053] From 2d33ee829c7b5a0bd3a31e2fa6b9bda0abb3db40 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Thu, 5 Mar 2020 16:05:04 -0800 Subject: [PATCH 470/498] Start of spatial anchor accounts --- azurerm/internal/clients/client.go | 3 + .../services/mixedreality/client/client.go | 19 ++ .../parse/spatial_anchors_account.go | 33 ++++ .../parse/spatial_anchors_account_test.go | 73 +++++++ .../services/mixedreality/registration.go | 31 +++ .../resource_arm_spatial_anchors_account.go | 153 +++++++++++++++ ...source_arm_spatial_anchors_account_test.go | 185 ++++++++++++++++++ 7 files changed, 497 insertions(+) create mode 100644 azurerm/internal/services/mixedreality/client/client.go create mode 100644 azurerm/internal/services/mixedreality/parse/spatial_anchors_account.go create mode 100644 azurerm/internal/services/mixedreality/parse/spatial_anchors_account_test.go create mode 100644 azurerm/internal/services/mixedreality/registration.go create mode 100644 azurerm/internal/services/mixedreality/resource_arm_spatial_anchors_account.go create mode 100644 azurerm/internal/services/mixedreality/tests/resource_arm_spatial_anchors_account_test.go diff --git a/azurerm/internal/clients/client.go b/azurerm/internal/clients/client.go index 00a9e5a180a76..9f8398ee0c5b9 100644 --- a/azurerm/internal/clients/client.go +++ b/azurerm/internal/clients/client.go @@ -38,6 +38,7 @@ import ( maps "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/maps/client" mariadb "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/mariadb/client" media "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/media/client" + mixedreality "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/mixedreality/client" monitor "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/monitor/client" msi "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/msi/client" mssql "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/mssql/client" @@ -105,6 +106,7 @@ type Client struct { ManagementGroups *managementgroup.Client Maps *maps.Client MariaDB *mariadb.Client + MixedReality *mixedreality.Client Media *media.Client Monitor *monitor.Client MSI *msi.Client @@ -173,6 +175,7 @@ func (client *Client) Build(ctx context.Context, o *common.ClientOptions) error client.Maps = maps.NewClient(o) client.MariaDB = mariadb.NewClient(o) client.Media = media.NewClient(o) + client.MixedReality = mixedreality.NewClient(o) client.Monitor = monitor.NewClient(o) client.MSI = msi.NewClient(o) client.MSSQL = mssql.NewClient(o) diff --git a/azurerm/internal/services/mixedreality/client/client.go b/azurerm/internal/services/mixedreality/client/client.go new file mode 100644 index 0000000000000..07e3e4ef40559 --- /dev/null +++ b/azurerm/internal/services/mixedreality/client/client.go @@ -0,0 +1,19 @@ +package client + +import ( + "github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common" +) + +type Client struct { + SpatialAnchorsAccountClient *mixedreality.SpatialAnchorsAccountsClient +} + +func NewClient(o *common.ClientOptions) *Client { + SpatialAnchorsAccountClient := mixedreality.NewSpatialAnchorsAccountsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) + o.ConfigureClient(&SpatialAnchorsAccountClient.Client, o.ResourceManagerAuthorizer) + + return &Client{ + SpatialAnchorsAccountClient: &SpatialAnchorsAccountClient, + } +} diff --git a/azurerm/internal/services/mixedreality/parse/spatial_anchors_account.go b/azurerm/internal/services/mixedreality/parse/spatial_anchors_account.go new file mode 100644 index 0000000000000..08c34cf44763e --- /dev/null +++ b/azurerm/internal/services/mixedreality/parse/spatial_anchors_account.go @@ -0,0 +1,33 @@ +package parse + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type SpatialAnchorsAccountId struct { + ResourceGroup string + Name string +} + +func SpatialAnchorsAccountID(input string) (*SpatialAnchorsAccountId, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("[ERROR] Unable to parse Search Service ID %q: %+v", input, err) + } + + service := SpatialAnchorsAccountId{ + ResourceGroup: id.ResourceGroup, + } + + if service.Name, err = id.PopSegment("spatialAnchorsAccounts"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &service, nil +} diff --git a/azurerm/internal/services/mixedreality/parse/spatial_anchors_account_test.go b/azurerm/internal/services/mixedreality/parse/spatial_anchors_account_test.go new file mode 100644 index 0000000000000..c3edd765240ec --- /dev/null +++ b/azurerm/internal/services/mixedreality/parse/spatial_anchors_account_test.go @@ -0,0 +1,73 @@ +package parse + +import ( + "testing" +) + +func TestSearchServiceId(t *testing.T) { + testData := []struct { + Name string + Input string + Expected *SpatialAnchorsAccountId + }{ + { + Name: "Empty", + Input: "", + Expected: nil, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Expected: nil, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Expected: nil, + }, + { + Name: "Resource Group ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", + Expected: nil, + }, + { + Name: "Missing Search Services Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.MixedReality/spatialAnchorsAccounts/", + Expected: nil, + }, + { + Name: "Search Service ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.MixedReality/spatialAnchorsAccounts/Account1", + Expected: &SpatialAnchorsAccountId{ + Name: "Account1", + ResourceGroup: "resGroup1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.MixedReality/SpatialAnchorsAccounts/Service1", + Expected: nil, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Name) + + actual, err := SpatialAnchorsAccountID(v.Input) + if err != nil { + if v.Expected == nil { + continue + } + + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.Name != v.Expected.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expected.Name, actual.Name) + } + + if actual.ResourceGroup != v.Expected.ResourceGroup { + t.Fatalf("Expected %q but got %q for Resource Group", v.Expected.ResourceGroup, actual.ResourceGroup) + } + } +} diff --git a/azurerm/internal/services/mixedreality/registration.go b/azurerm/internal/services/mixedreality/registration.go new file mode 100644 index 0000000000000..c76b0bf1cc07c --- /dev/null +++ b/azurerm/internal/services/mixedreality/registration.go @@ -0,0 +1,31 @@ +package mixedreality + +import ( + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" +) + +type Registration struct{} + +// Name is the name of this Service +func (r Registration) Name() string { + return "Mixed Reality" +} + +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "Mixed Reality", + } +} + +// SupportedDataSources returns the supported Data Sources supported by this Service +func (r Registration) SupportedDataSources() map[string]*schema.Resource { + return 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_spatial_anchors_accoun": resourceArmSpatialAnchorsAccount(), + } +} diff --git a/azurerm/internal/services/mixedreality/resource_arm_spatial_anchors_account.go b/azurerm/internal/services/mixedreality/resource_arm_spatial_anchors_account.go new file mode 100644 index 0000000000000..6009ccdd1b5ea --- /dev/null +++ b/azurerm/internal/services/mixedreality/resource_arm_spatial_anchors_account.go @@ -0,0 +1,153 @@ +package mixedreality + +import ( + "fmt" + "regexp" + "time" + + "github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/mixedreality/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmSpatialAnchorsAccount() *schema.Resource { + return &schema.Resource{ + Create: resourceArmSpatialAnchorsAccountCreateUpdate, + Read: resourceArmSpatialAnchorsAccountRead, + Update: resourceArmSpatialAnchorsAccountCreateUpdate, + Delete: resourceArmSpatialAnchorsAccountDelete, + Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { + _, err := parse.SpatialAnchorsAccountID(id) + return err + }), + + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(30 * time.Minute), + Read: schema.DefaultTimeout(5 * time.Minute), + Update: schema.DefaultTimeout(30 * time.Minute), + Delete: schema.DefaultTimeout(30 * time.Minute), + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringMatch( + regexp.MustCompile(`^[-\w\._\(\)]+$`), + "Spatial Anchors Account name must be 1 - 90 characters long, contain only word characters and underscores.", + ), + }, + + "location": azure.SchemaLocation(), + + "resource_group_name": azure.SchemaResourceGroupName(), + + "tags": tags.Schema(), + }, + } +} + +func resourceArmSpatialAnchorsAccountCreateUpdate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).MixedReality.SpatialAnchorsAccountClient + ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) + defer cancel() + + name := d.Get("name").(string) + location := azure.NormalizeLocation(d.Get("location").(string)) + resourceGroup := d.Get("resource_group_name").(string) + t := d.Get("tags").(map[string]interface{}) + + if features.ShouldResourcesBeImported() && d.IsNewResource() { + existing, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if !utils.ResponseWasNotFound(existing.Response) { + return fmt.Errorf("checking for presence of existing Spatial Anchors Account %q (Resource Group %q): %s", name, resourceGroup, err) + } + } + + if existing.ID != nil && *existing.ID != "" { + return tf.ImportAsExistsError("azurerm_spatial_anchors_account", *existing.ID) + } + } + + account := mixedreality.SpatialAnchorsAccount{ + Location: &location, + Tags: tags.Expand(t), + } + + if _, err := client.Create(ctx, resourceGroup, name, account); err != nil { + return fmt.Errorf("creating/updating Spatial Anchors Account %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + resp, err := client.Get(ctx, resourceGroup, name) + if err != nil { + return fmt.Errorf("retrieving Spatial Anchors Account %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + if resp.ID == nil { + return fmt.Errorf("cannot read Spatial Anchors Account %q (Resource Group %q) ID", name, resourceGroup) + } + + d.SetId(*resp.ID) + + return resourceArmSpatialAnchorsAccountRead(d, meta) +} + +func resourceArmSpatialAnchorsAccountRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).MixedReality.SpatialAnchorsAccountClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := parse.SpatialAnchorsAccountID(d.Id()) + if err != nil { + return err + } + + resp, err := client.Get(ctx, id.ResourceGroup, id.Name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + d.SetId("") + return nil + } + + return fmt.Errorf("retrieving Spatial Anchors Account %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) + } + + d.Set("name", resp.Name) + d.Set("resource_group_name", id.ResourceGroup) + if location := resp.Location; location != nil { + d.Set("location", azure.NormalizeLocation(*location)) + } + + return tags.FlattenAndSet(d, resp.Tags) +} + +func resourceArmSpatialAnchorsAccountDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).MixedReality.SpatialAnchorsAccountClient + ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := parse.SpatialAnchorsAccountID(d.Id()) + if err != nil { + return err + } + + response, err := client.Delete(ctx, id.ResourceGroup, id.Name) + if err != nil { + if !utils.ResponseWasNotFound(response) { + return fmt.Errorf("deleting Spatial Anchors Account %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) + } + } + + return nil +} diff --git a/azurerm/internal/services/mixedreality/tests/resource_arm_spatial_anchors_account_test.go b/azurerm/internal/services/mixedreality/tests/resource_arm_spatial_anchors_account_test.go new file mode 100644 index 0000000000000..a0426b237a494 --- /dev/null +++ b/azurerm/internal/services/mixedreality/tests/resource_arm_spatial_anchors_account_test.go @@ -0,0 +1,185 @@ +package tests + +import ( + "fmt" + "net/http" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/mixedreality/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func TestAccAzureRMSpatialAnchorsAccount_basic(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_data_factory", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMSpatialAnchorsAccountDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMSpatialAnchorsAccount_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMSpatialAnchorsAccountExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMSpatialAnchorsAccount_tagsUpdated(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_data_factory", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMSpatialAnchorsAccountDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMSpatialAnchorsAccount_tags(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMSpatialAnchorsAccountExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.environment", "production"), + ), + }, + { + Config: testAccAzureRMSpatialAnchorsAccount_tagsUpdated(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMSpatialAnchorsAccountExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "2"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.environment", "production"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.updated", "true"), + ), + }, + data.ImportStep(), + }, + }) +} + +func testCheckAzureRMSpatialAnchorsAccountExists(name string) resource.TestCheckFunc { + return func(s *terraform.State) error { + client := acceptance.AzureProvider.Meta().(*clients.Client).MixedReality.SpatialAnchorsAccountClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + // Ensure we have enough information in state to look up in API + rs, ok := s.RootModule().Resources[name] + if !ok { + return fmt.Errorf("Not found: %s", name) + } + + id, err := parse.SpatialAnchorsAccountID(rs.Primary.ID) + if err != nil { + return err + } + + resp, err := client.Get(ctx, id.ResourceGroup, id.Name) + if err != nil { + return fmt.Errorf("Bad: Get on spatialAnchorsAccountClient: %+v", err) + } + + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Bad: Spatial Anchors Account %q (resource group: %q) does not exist", id.Name, id.ResourceGroup) + } + + return nil + } +} + +func testCheckAzureRMSpatialAnchorsAccountDestroy(s *terraform.State) error { + client := acceptance.AzureProvider.Meta().(*clients.Client).MixedReality.SpatialAnchorsAccountClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_spatial_anchors_account" { + continue + } + + id, err := parse.SpatialAnchorsAccountID(rs.Primary.ID) + if err != nil { + return err + } + resp, err := client.Get(ctx, id.ResourceGroup, id.Name) + + if err != nil { + return nil + } + + if resp.StatusCode != http.StatusNotFound { + return fmt.Errorf("Spatial Anchors Account still exists: %q", id.Name) + } + } + + return nil +} + +func testAccAzureRMSpatialAnchorsAccount_basic(data acceptance.TestData) string { + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_spatial_anchors_account" "test" { + name = "acctest_saa%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) +} + +func testAccAzureRMSpatialAnchorsAccount_tags(data acceptance.TestData) string { + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_spatial_anchors_account" "test" { + name = "acctestdf%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + + tags = { + environment = "production" + } +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) +} + +func testAccAzureRMSpatialAnchorsAccount_tagsUpdated(data acceptance.TestData) string { + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_spatial_anchors_account" "test" { + name = "acctestdf%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + + tags = { + environment = "production" + updated = "true" + } +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) +} From 254fa348e5bbd7df228a9c5c549b9500754dce2f Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Thu, 5 Mar 2020 16:27:24 -0800 Subject: [PATCH 471/498] Website and testing --- azurerm/internal/provider/services.go | 2 + .../services/mixedreality/registration.go | 2 +- .../resource_arm_spatial_anchors_account.go | 7 +- ...source_arm_spatial_anchors_account_test.go | 39 +- .../mgmt/2019-02-28/mixedreality/client.go | 145 ++++ .../mgmt/2019-02-28/mixedreality/models.go | 588 +++++++++++++ .../2019-02-28/mixedreality/operations.go | 147 ++++ .../mixedreality/spatialanchorsaccounts.go | 815 ++++++++++++++++++ .../mgmt/2019-02-28/mixedreality/version.go | 30 + vendor/modules.txt | 1 + website/azurerm.erb | 9 + .../r/spatial_anchors_account.html.markdown | 61 ++ 12 files changed, 1805 insertions(+), 41 deletions(-) create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality/client.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality/models.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality/operations.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality/spatialanchorsaccounts.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality/version.go create mode 100644 website/docs/r/spatial_anchors_account.html.markdown diff --git a/azurerm/internal/provider/services.go b/azurerm/internal/provider/services.go index 2b284eb41e51c..46520c90b881a 100644 --- a/azurerm/internal/provider/services.go +++ b/azurerm/internal/provider/services.go @@ -35,6 +35,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/maps" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/mariadb" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/media" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/mixedreality" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/monitor" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/msi" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/mssql" @@ -100,6 +101,7 @@ func SupportedServices() []common.ServiceRegistration { maps.Registration{}, mariadb.Registration{}, media.Registration{}, + mixedreality.Registration{}, monitor.Registration{}, msi.Registration{}, mssql.Registration{}, diff --git a/azurerm/internal/services/mixedreality/registration.go b/azurerm/internal/services/mixedreality/registration.go index c76b0bf1cc07c..424e761692e48 100644 --- a/azurerm/internal/services/mixedreality/registration.go +++ b/azurerm/internal/services/mixedreality/registration.go @@ -26,6 +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_spatial_anchors_accoun": resourceArmSpatialAnchorsAccount(), + "azurerm_spatial_anchors_account": resourceArmSpatialAnchorsAccount(), } } diff --git a/azurerm/internal/services/mixedreality/resource_arm_spatial_anchors_account.go b/azurerm/internal/services/mixedreality/resource_arm_spatial_anchors_account.go index 6009ccdd1b5ea..00047fd14f0a7 100644 --- a/azurerm/internal/services/mixedreality/resource_arm_spatial_anchors_account.go +++ b/azurerm/internal/services/mixedreality/resource_arm_spatial_anchors_account.go @@ -21,9 +21,8 @@ import ( func resourceArmSpatialAnchorsAccount() *schema.Resource { return &schema.Resource{ - Create: resourceArmSpatialAnchorsAccountCreateUpdate, + Create: resourceArmSpatialAnchorsAccountCreate, Read: resourceArmSpatialAnchorsAccountRead, - Update: resourceArmSpatialAnchorsAccountCreateUpdate, Delete: resourceArmSpatialAnchorsAccountDelete, Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { _, err := parse.SpatialAnchorsAccountID(id) @@ -52,12 +51,12 @@ func resourceArmSpatialAnchorsAccount() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), - "tags": tags.Schema(), + "tags": tags.ForceNewSchema(), }, } } -func resourceArmSpatialAnchorsAccountCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceArmSpatialAnchorsAccountCreate(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).MixedReality.SpatialAnchorsAccountClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/mixedreality/tests/resource_arm_spatial_anchors_account_test.go b/azurerm/internal/services/mixedreality/tests/resource_arm_spatial_anchors_account_test.go index a0426b237a494..5a979e2afecda 100644 --- a/azurerm/internal/services/mixedreality/tests/resource_arm_spatial_anchors_account_test.go +++ b/azurerm/internal/services/mixedreality/tests/resource_arm_spatial_anchors_account_test.go @@ -14,7 +14,7 @@ import ( ) func TestAccAzureRMSpatialAnchorsAccount_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_data_factory", "test") + data := acceptance.BuildTestData(t, "azurerm_spatial_anchors_account", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -32,8 +32,8 @@ func TestAccAzureRMSpatialAnchorsAccount_basic(t *testing.T) { }) } -func TestAccAzureRMSpatialAnchorsAccount_tagsUpdated(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_data_factory", "test") +func TestAccAzureRMSpatialAnchorsAccount_tags(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_spatial_anchors_account", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -48,15 +48,6 @@ func TestAccAzureRMSpatialAnchorsAccount_tagsUpdated(t *testing.T) { resource.TestCheckResourceAttr(data.ResourceName, "tags.environment", "production"), ), }, - { - Config: testAccAzureRMSpatialAnchorsAccount_tagsUpdated(data), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMSpatialAnchorsAccountExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "2"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.environment", "production"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.updated", "true"), - ), - }, data.ImportStep(), }, }) @@ -159,27 +150,3 @@ resource "azurerm_spatial_anchors_account" "test" { } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } - -func testAccAzureRMSpatialAnchorsAccount_tagsUpdated(data acceptance.TestData) string { - return fmt.Sprintf(` -provider "azurerm" { - features {} -} - -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_spatial_anchors_account" "test" { - name = "acctestdf%d" - location = azurerm_resource_group.test.location - resource_group_name = azurerm_resource_group.test.name - - tags = { - environment = "production" - updated = "true" - } -} -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) -} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality/client.go new file mode 100644 index 0000000000000..e7a769ea2627c --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality/client.go @@ -0,0 +1,145 @@ +// Package mixedreality implements the Azure ARM Mixedreality service API version 2019-02-28-preview. +// +// Mixed Reality Client +package mixedreality + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "github.com/Azure/go-autorest/tracing" + "net/http" +) + +const ( + // DefaultBaseURI is the default URI used for the service Mixedreality + DefaultBaseURI = "https://management.azure.com" +) + +// BaseClient is the base client for Mixedreality. +type BaseClient struct { + autorest.Client + BaseURI string + SubscriptionID string +} + +// New creates an instance of the BaseClient client. +func New(subscriptionID string) BaseClient { + return NewWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewWithBaseURI creates an instance of the BaseClient client. +func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { + return BaseClient{ + Client: autorest.NewClientWithUserAgent(UserAgent()), + BaseURI: baseURI, + SubscriptionID: subscriptionID, + } +} + +// CheckNameAvailabilityLocal check Name Availability for global uniqueness +// Parameters: +// location - the location in which uniqueness will be verified. +// checkNameAvailability - check Name Availability Request. +func (client BaseClient) CheckNameAvailabilityLocal(ctx context.Context, location string, checkNameAvailability CheckNameAvailabilityRequest) (result CheckNameAvailabilityResponse, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/BaseClient.CheckNameAvailabilityLocal") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: location, + Constraints: []validation.Constraint{{Target: "location", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "location", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "location", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}, + {TargetValue: checkNameAvailability, + Constraints: []validation.Constraint{{Target: "checkNameAvailability.Name", Name: validation.Null, Rule: true, Chain: nil}, + {Target: "checkNameAvailability.Type", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil { + return result, validation.NewError("mixedreality.BaseClient", "CheckNameAvailabilityLocal", err.Error()) + } + + req, err := client.CheckNameAvailabilityLocalPreparer(ctx, location, checkNameAvailability) + if err != nil { + err = autorest.NewErrorWithError(err, "mixedreality.BaseClient", "CheckNameAvailabilityLocal", nil, "Failure preparing request") + return + } + + resp, err := client.CheckNameAvailabilityLocalSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "mixedreality.BaseClient", "CheckNameAvailabilityLocal", resp, "Failure sending request") + return + } + + result, err = client.CheckNameAvailabilityLocalResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "mixedreality.BaseClient", "CheckNameAvailabilityLocal", resp, "Failure responding to request") + } + + return +} + +// CheckNameAvailabilityLocalPreparer prepares the CheckNameAvailabilityLocal request. +func (client BaseClient) CheckNameAvailabilityLocalPreparer(ctx context.Context, location string, checkNameAvailability CheckNameAvailabilityRequest) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "location": autorest.Encode("path", location), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-02-28-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.MixedReality/locations/{location}/checkNameAvailability", pathParameters), + autorest.WithJSON(checkNameAvailability), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CheckNameAvailabilityLocalSender sends the CheckNameAvailabilityLocal request. The method will close the +// http.Response Body if it receives an error. +func (client BaseClient) CheckNameAvailabilityLocalSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// CheckNameAvailabilityLocalResponder handles the response to the CheckNameAvailabilityLocal request. The method always +// closes the http.Response Body. +func (client BaseClient) CheckNameAvailabilityLocalResponder(resp *http.Response) (result CheckNameAvailabilityResponse, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality/models.go new file mode 100644 index 0000000000000..77017e86020e4 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality/models.go @@ -0,0 +1,588 @@ +package mixedreality + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "encoding/json" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/to" + "github.com/Azure/go-autorest/tracing" + "net/http" +) + +// The package's fully qualified name. +const fqdn = "github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality" + +// NameAvailability enumerates the values for name availability. +type NameAvailability string + +const ( + // False ... + False NameAvailability = "false" + // True ... + True NameAvailability = "true" +) + +// PossibleNameAvailabilityValues returns an array of possible values for the NameAvailability const type. +func PossibleNameAvailabilityValues() []NameAvailability { + return []NameAvailability{False, True} +} + +// NameUnavailableReason enumerates the values for name unavailable reason. +type NameUnavailableReason string + +const ( + // AlreadyExists ... + AlreadyExists NameUnavailableReason = "AlreadyExists" + // Invalid ... + Invalid NameUnavailableReason = "Invalid" +) + +// PossibleNameUnavailableReasonValues returns an array of possible values for the NameUnavailableReason const type. +func PossibleNameUnavailableReasonValues() []NameUnavailableReason { + return []NameUnavailableReason{AlreadyExists, Invalid} +} + +// AzureEntityResource the resource model definition for a Azure Resource Manager resource with an etag. +type AzureEntityResource struct { + // Etag - READ-ONLY; Resource Etag. + Etag *string `json:"etag,omitempty"` + // ID - READ-ONLY; Fully qualified resource Id for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; The name of the resource + Name *string `json:"name,omitempty"` + // Type - READ-ONLY; The type of the resource. Ex- Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts. + Type *string `json:"type,omitempty"` +} + +// CheckNameAvailabilityRequest check Name Availability Request +type CheckNameAvailabilityRequest struct { + // Name - Resource Name To Verify + Name *string `json:"name,omitempty"` + // Type - Fully qualified resource type which includes provider namespace + Type *string `json:"type,omitempty"` +} + +// CheckNameAvailabilityResponse check Name Availability Response +type CheckNameAvailabilityResponse struct { + autorest.Response `json:"-"` + // NameAvailable - if name Available. Possible values include: 'True', 'False' + NameAvailable NameAvailability `json:"nameAvailable,omitempty"` + // Reason - Resource Name To Verify. Possible values include: 'Invalid', 'AlreadyExists' + Reason NameUnavailableReason `json:"reason,omitempty"` + // Message - detail message + Message *string `json:"message,omitempty"` +} + +// ErrorResponse response on Error +type ErrorResponse struct { + // Message - Describes the error in detail and provides debugging information + Message *string `json:"message,omitempty"` + // Code - String that can be used to programmatically identify the error. + Code *string `json:"code,omitempty"` + // Target - The target of the particular error + Target *string `json:"target,omitempty"` + // Details - An array of JSON objects that MUST contain name/value pairs for code and message, and MAY contain a name/value pair for target, as described above.The contents of this section are service-defined but must adhere to the aforementioned schema. + Details *string `json:"details,omitempty"` +} + +// Operation REST API operation +type Operation struct { + // Name - Operation name: {provider}/{resource}/{operation} + Name *string `json:"name,omitempty"` + // Display - The object that represents the operation. + Display *OperationDisplay `json:"display,omitempty"` +} + +// OperationDisplay the object that represents the operation. +type OperationDisplay struct { + // Provider - Service provider: Microsoft.ResourceProvider + Provider *string `json:"provider,omitempty"` + // Resource - Resource on which the operation is performed: Profile, endpoint, etc. + Resource *string `json:"resource,omitempty"` + // Operation - Operation type: Read, write, delete, etc. + Operation *string `json:"operation,omitempty"` + // Description - Description of operation + Description *string `json:"description,omitempty"` +} + +// OperationList result of the request to list Resource Provider operations. It contains a list of +// operations and a URL link to get the next set of results. +type OperationList struct { + autorest.Response `json:"-"` + // Value - List of operations supported by the Resource Provider. + Value *[]Operation `json:"value,omitempty"` + // NextLink - URL to get the next set of operation list results if there are any. + NextLink *string `json:"nextLink,omitempty"` +} + +// OperationListIterator provides access to a complete listing of Operation values. +type OperationListIterator struct { + i int + page OperationListPage +} + +// NextWithContext advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *OperationListIterator) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/OperationListIterator.NextWithContext") + defer func() { + sc := -1 + if iter.Response().Response.Response != nil { + sc = iter.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err = iter.page.NextWithContext(ctx) + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (iter *OperationListIterator) Next() error { + return iter.NextWithContext(context.Background()) +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter OperationListIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter OperationListIterator) Response() OperationList { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter OperationListIterator) Value() Operation { + if !iter.page.NotDone() { + return Operation{} + } + return iter.page.Values()[iter.i] +} + +// Creates a new instance of the OperationListIterator type. +func NewOperationListIterator(page OperationListPage) OperationListIterator { + return OperationListIterator{page: page} +} + +// IsEmpty returns true if the ListResult contains no values. +func (ol OperationList) IsEmpty() bool { + return ol.Value == nil || len(*ol.Value) == 0 +} + +// operationListPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (ol OperationList) operationListPreparer(ctx context.Context) (*http.Request, error) { + if ol.NextLink == nil || len(to.String(ol.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare((&http.Request{}).WithContext(ctx), + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(ol.NextLink))) +} + +// OperationListPage contains a page of Operation values. +type OperationListPage struct { + fn func(context.Context, OperationList) (OperationList, error) + ol OperationList +} + +// NextWithContext advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *OperationListPage) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/OperationListPage.NextWithContext") + defer func() { + sc := -1 + if page.Response().Response.Response != nil { + sc = page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + next, err := page.fn(ctx, page.ol) + if err != nil { + return err + } + page.ol = next + return nil +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (page *OperationListPage) Next() error { + return page.NextWithContext(context.Background()) +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page OperationListPage) NotDone() bool { + return !page.ol.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page OperationListPage) Response() OperationList { + return page.ol +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page OperationListPage) Values() []Operation { + if page.ol.IsEmpty() { + return nil + } + return *page.ol.Value +} + +// Creates a new instance of the OperationListPage type. +func NewOperationListPage(getNextPage func(context.Context, OperationList) (OperationList, error)) OperationListPage { + return OperationListPage{fn: getNextPage} +} + +// ProxyResource the resource model definition for a ARM proxy resource. It will have everything other than +// required location and tags +type ProxyResource struct { + // ID - READ-ONLY; Fully qualified resource Id for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; The name of the resource + Name *string `json:"name,omitempty"` + // Type - READ-ONLY; The type of the resource. Ex- Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts. + Type *string `json:"type,omitempty"` +} + +// Resource ... +type Resource struct { + // ID - READ-ONLY; Fully qualified resource Id for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; The name of the resource + Name *string `json:"name,omitempty"` + // Type - READ-ONLY; The type of the resource. Ex- Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts. + Type *string `json:"type,omitempty"` +} + +// SpatialAnchorsAccount spatialAnchorsAccount Response. +type SpatialAnchorsAccount struct { + autorest.Response `json:"-"` + // SpatialAnchorsAccountProperties - Property bag. + *SpatialAnchorsAccountProperties `json:"properties,omitempty"` + // Tags - Resource tags. + Tags map[string]*string `json:"tags"` + // Location - The geo-location where the resource lives + Location *string `json:"location,omitempty"` + // ID - READ-ONLY; Fully qualified resource Id for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; The name of the resource + Name *string `json:"name,omitempty"` + // Type - READ-ONLY; The type of the resource. Ex- Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for SpatialAnchorsAccount. +func (saa SpatialAnchorsAccount) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if saa.SpatialAnchorsAccountProperties != nil { + objectMap["properties"] = saa.SpatialAnchorsAccountProperties + } + if saa.Tags != nil { + objectMap["tags"] = saa.Tags + } + if saa.Location != nil { + objectMap["location"] = saa.Location + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for SpatialAnchorsAccount struct. +func (saa *SpatialAnchorsAccount) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var spatialAnchorsAccountProperties SpatialAnchorsAccountProperties + err = json.Unmarshal(*v, &spatialAnchorsAccountProperties) + if err != nil { + return err + } + saa.SpatialAnchorsAccountProperties = &spatialAnchorsAccountProperties + } + case "tags": + if v != nil { + var tags map[string]*string + err = json.Unmarshal(*v, &tags) + if err != nil { + return err + } + saa.Tags = tags + } + case "location": + if v != nil { + var location string + err = json.Unmarshal(*v, &location) + if err != nil { + return err + } + saa.Location = &location + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + saa.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + saa.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + saa.Type = &typeVar + } + } + } + + return nil +} + +// SpatialAnchorsAccountKeyRegenerateRequest spatial Anchors Account Regenerate Key +type SpatialAnchorsAccountKeyRegenerateRequest struct { + // Serial - serial of key to be regenerated + Serial *int32 `json:"serial,omitempty"` +} + +// SpatialAnchorsAccountKeys spatial Anchors Account Keys +type SpatialAnchorsAccountKeys struct { + autorest.Response `json:"-"` + // PrimaryKey - READ-ONLY; value of primary key. + PrimaryKey *string `json:"primaryKey,omitempty"` + // SecondaryKey - READ-ONLY; value of secondary key. + SecondaryKey *string `json:"secondaryKey,omitempty"` +} + +// SpatialAnchorsAccountList result of the request to get resource collection. It contains a list of +// resources and a URL link to get the next set of results. +type SpatialAnchorsAccountList struct { + autorest.Response `json:"-"` + // Value - List of resources supported by the Resource Provider. + Value *[]SpatialAnchorsAccount `json:"value,omitempty"` + // NextLink - URL to get the next set of resource list results if there are any. + NextLink *string `json:"nextLink,omitempty"` +} + +// SpatialAnchorsAccountListIterator provides access to a complete listing of SpatialAnchorsAccount values. +type SpatialAnchorsAccountListIterator struct { + i int + page SpatialAnchorsAccountListPage +} + +// NextWithContext advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *SpatialAnchorsAccountListIterator) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/SpatialAnchorsAccountListIterator.NextWithContext") + defer func() { + sc := -1 + if iter.Response().Response.Response != nil { + sc = iter.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err = iter.page.NextWithContext(ctx) + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (iter *SpatialAnchorsAccountListIterator) Next() error { + return iter.NextWithContext(context.Background()) +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter SpatialAnchorsAccountListIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter SpatialAnchorsAccountListIterator) Response() SpatialAnchorsAccountList { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter SpatialAnchorsAccountListIterator) Value() SpatialAnchorsAccount { + if !iter.page.NotDone() { + return SpatialAnchorsAccount{} + } + return iter.page.Values()[iter.i] +} + +// Creates a new instance of the SpatialAnchorsAccountListIterator type. +func NewSpatialAnchorsAccountListIterator(page SpatialAnchorsAccountListPage) SpatialAnchorsAccountListIterator { + return SpatialAnchorsAccountListIterator{page: page} +} + +// IsEmpty returns true if the ListResult contains no values. +func (saal SpatialAnchorsAccountList) IsEmpty() bool { + return saal.Value == nil || len(*saal.Value) == 0 +} + +// spatialAnchorsAccountListPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (saal SpatialAnchorsAccountList) spatialAnchorsAccountListPreparer(ctx context.Context) (*http.Request, error) { + if saal.NextLink == nil || len(to.String(saal.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare((&http.Request{}).WithContext(ctx), + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(saal.NextLink))) +} + +// SpatialAnchorsAccountListPage contains a page of SpatialAnchorsAccount values. +type SpatialAnchorsAccountListPage struct { + fn func(context.Context, SpatialAnchorsAccountList) (SpatialAnchorsAccountList, error) + saal SpatialAnchorsAccountList +} + +// NextWithContext advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *SpatialAnchorsAccountListPage) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/SpatialAnchorsAccountListPage.NextWithContext") + defer func() { + sc := -1 + if page.Response().Response.Response != nil { + sc = page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + next, err := page.fn(ctx, page.saal) + if err != nil { + return err + } + page.saal = next + return nil +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (page *SpatialAnchorsAccountListPage) Next() error { + return page.NextWithContext(context.Background()) +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page SpatialAnchorsAccountListPage) NotDone() bool { + return !page.saal.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page SpatialAnchorsAccountListPage) Response() SpatialAnchorsAccountList { + return page.saal +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page SpatialAnchorsAccountListPage) Values() []SpatialAnchorsAccount { + if page.saal.IsEmpty() { + return nil + } + return *page.saal.Value +} + +// Creates a new instance of the SpatialAnchorsAccountListPage type. +func NewSpatialAnchorsAccountListPage(getNextPage func(context.Context, SpatialAnchorsAccountList) (SpatialAnchorsAccountList, error)) SpatialAnchorsAccountListPage { + return SpatialAnchorsAccountListPage{fn: getNextPage} +} + +// SpatialAnchorsAccountProperties spatial Anchors Account Customize Properties +type SpatialAnchorsAccountProperties struct { + // AccountID - READ-ONLY; unique id of certain Spatial Anchors Account data contract. + AccountID *string `json:"accountId,omitempty"` + // AccountDomain - READ-ONLY; Correspond domain name of certain Spatial Anchors Account + AccountDomain *string `json:"accountDomain,omitempty"` +} + +// TrackedResource the resource model definition for a ARM tracked top level resource +type TrackedResource struct { + // Tags - Resource tags. + Tags map[string]*string `json:"tags"` + // Location - The geo-location where the resource lives + Location *string `json:"location,omitempty"` + // ID - READ-ONLY; Fully qualified resource Id for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; The name of the resource + Name *string `json:"name,omitempty"` + // Type - READ-ONLY; The type of the resource. Ex- Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for TrackedResource. +func (tr TrackedResource) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if tr.Tags != nil { + objectMap["tags"] = tr.Tags + } + if tr.Location != nil { + objectMap["location"] = tr.Location + } + return json.Marshal(objectMap) +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality/operations.go new file mode 100644 index 0000000000000..c99c3264e7d79 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality/operations.go @@ -0,0 +1,147 @@ +package mixedreality + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/tracing" + "net/http" +) + +// OperationsClient is the mixed Reality Client +type OperationsClient struct { + BaseClient +} + +// NewOperationsClient creates an instance of the OperationsClient client. +func NewOperationsClient(subscriptionID string) OperationsClient { + return NewOperationsClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewOperationsClientWithBaseURI creates an instance of the OperationsClient client. +func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient { + return OperationsClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// List exposing Available Operations +func (client OperationsClient) List(ctx context.Context) (result OperationListPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/OperationsClient.List") + defer func() { + sc := -1 + if result.ol.Response.Response != nil { + sc = result.ol.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.fn = client.listNextResults + req, err := client.ListPreparer(ctx) + if err != nil { + err = autorest.NewErrorWithError(err, "mixedreality.OperationsClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.ol.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "mixedreality.OperationsClient", "List", resp, "Failure sending request") + return + } + + result.ol, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "mixedreality.OperationsClient", "List", resp, "Failure responding to request") + } + + return +} + +// ListPreparer prepares the List request. +func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { + const APIVersion = "2019-02-28-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPath("/providers/Microsoft.MixedReality/operations"), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client OperationsClient) ListSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + return autorest.SendWithSender(client, req, sd...) +} + +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client OperationsClient) ListResponder(resp *http.Response) (result OperationList, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listNextResults retrieves the next set of results, if any. +func (client OperationsClient) listNextResults(ctx context.Context, lastResults OperationList) (result OperationList, err error) { + req, err := lastResults.operationListPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "mixedreality.OperationsClient", "listNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "mixedreality.OperationsClient", "listNextResults", resp, "Failure sending next results request") + } + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "mixedreality.OperationsClient", "listNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListComplete enumerates all values, automatically crossing page boundaries as required. +func (client OperationsClient) ListComplete(ctx context.Context) (result OperationListIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/OperationsClient.List") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.List(ctx) + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality/spatialanchorsaccounts.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality/spatialanchorsaccounts.go new file mode 100644 index 0000000000000..035518a71fd6b --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality/spatialanchorsaccounts.go @@ -0,0 +1,815 @@ +package mixedreality + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "github.com/Azure/go-autorest/tracing" + "net/http" +) + +// SpatialAnchorsAccountsClient is the mixed Reality Client +type SpatialAnchorsAccountsClient struct { + BaseClient +} + +// NewSpatialAnchorsAccountsClient creates an instance of the SpatialAnchorsAccountsClient client. +func NewSpatialAnchorsAccountsClient(subscriptionID string) SpatialAnchorsAccountsClient { + return NewSpatialAnchorsAccountsClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewSpatialAnchorsAccountsClientWithBaseURI creates an instance of the SpatialAnchorsAccountsClient client. +func NewSpatialAnchorsAccountsClientWithBaseURI(baseURI string, subscriptionID string) SpatialAnchorsAccountsClient { + return SpatialAnchorsAccountsClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// Create creating or Updating a Spatial Anchors Account. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// spatialAnchorsAccountName - name of an Mixed Reality Spatial Anchors Account. +// spatialAnchorsAccount - spatial Anchors Account parameter. +func (client SpatialAnchorsAccountsClient) Create(ctx context.Context, resourceGroupName string, spatialAnchorsAccountName string, spatialAnchorsAccount SpatialAnchorsAccount) (result SpatialAnchorsAccount, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/SpatialAnchorsAccountsClient.Create") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}, + {TargetValue: spatialAnchorsAccountName, + Constraints: []validation.Constraint{{Target: "spatialAnchorsAccountName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "spatialAnchorsAccountName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "spatialAnchorsAccountName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("mixedreality.SpatialAnchorsAccountsClient", "Create", err.Error()) + } + + req, err := client.CreatePreparer(ctx, resourceGroupName, spatialAnchorsAccountName, spatialAnchorsAccount) + if err != nil { + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "Create", nil, "Failure preparing request") + return + } + + resp, err := client.CreateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "Create", resp, "Failure sending request") + return + } + + result, err = client.CreateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "Create", resp, "Failure responding to request") + } + + return +} + +// CreatePreparer prepares the Create request. +func (client SpatialAnchorsAccountsClient) CreatePreparer(ctx context.Context, resourceGroupName string, spatialAnchorsAccountName string, spatialAnchorsAccount SpatialAnchorsAccount) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "spatialAnchorsAccountName": autorest.Encode("path", spatialAnchorsAccountName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-02-28-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/spatialAnchorsAccounts/{spatialAnchorsAccountName}", pathParameters), + autorest.WithJSON(spatialAnchorsAccount), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateSender sends the Create request. The method will close the +// http.Response Body if it receives an error. +func (client SpatialAnchorsAccountsClient) CreateSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// CreateResponder handles the response to the Create request. The method always +// closes the http.Response Body. +func (client SpatialAnchorsAccountsClient) CreateResponder(resp *http.Response) (result SpatialAnchorsAccount, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Delete delete a Spatial Anchors Account. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// spatialAnchorsAccountName - name of an Mixed Reality Spatial Anchors Account. +func (client SpatialAnchorsAccountsClient) Delete(ctx context.Context, resourceGroupName string, spatialAnchorsAccountName string) (result autorest.Response, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/SpatialAnchorsAccountsClient.Delete") + defer func() { + sc := -1 + if result.Response != nil { + sc = result.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}, + {TargetValue: spatialAnchorsAccountName, + Constraints: []validation.Constraint{{Target: "spatialAnchorsAccountName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "spatialAnchorsAccountName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "spatialAnchorsAccountName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("mixedreality.SpatialAnchorsAccountsClient", "Delete", err.Error()) + } + + req, err := client.DeletePreparer(ctx, resourceGroupName, spatialAnchorsAccountName) + if err != nil { + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "Delete", nil, "Failure preparing request") + return + } + + resp, err := client.DeleteSender(req) + if err != nil { + result.Response = resp + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "Delete", resp, "Failure sending request") + return + } + + result, err = client.DeleteResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "Delete", resp, "Failure responding to request") + } + + return +} + +// DeletePreparer prepares the Delete request. +func (client SpatialAnchorsAccountsClient) DeletePreparer(ctx context.Context, resourceGroupName string, spatialAnchorsAccountName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "spatialAnchorsAccountName": autorest.Encode("path", spatialAnchorsAccountName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-02-28-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/spatialAnchorsAccounts/{spatialAnchorsAccountName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client SpatialAnchorsAccountsClient) DeleteSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client SpatialAnchorsAccountsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// Get retrieve a Spatial Anchors Account. +// Parameters: +// resourceGroupName - name of an Azure resource group. +// spatialAnchorsAccountName - name of an Mixed Reality Spatial Anchors Account. +func (client SpatialAnchorsAccountsClient) Get(ctx context.Context, resourceGroupName string, spatialAnchorsAccountName string) (result SpatialAnchorsAccount, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/SpatialAnchorsAccountsClient.Get") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}, + {TargetValue: spatialAnchorsAccountName, + Constraints: []validation.Constraint{{Target: "spatialAnchorsAccountName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "spatialAnchorsAccountName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "spatialAnchorsAccountName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("mixedreality.SpatialAnchorsAccountsClient", "Get", err.Error()) + } + + req, err := client.GetPreparer(ctx, resourceGroupName, spatialAnchorsAccountName) + if err != nil { + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client SpatialAnchorsAccountsClient) GetPreparer(ctx context.Context, resourceGroupName string, spatialAnchorsAccountName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "spatialAnchorsAccountName": autorest.Encode("path", spatialAnchorsAccountName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-02-28-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/spatialAnchorsAccounts/{spatialAnchorsAccountName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client SpatialAnchorsAccountsClient) GetSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client SpatialAnchorsAccountsClient) GetResponder(resp *http.Response) (result SpatialAnchorsAccount, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// GetKeys get Both of the 2 Keys of a Spatial Anchors Account +// Parameters: +// resourceGroupName - name of an Azure resource group. +// spatialAnchorsAccountName - name of an Mixed Reality Spatial Anchors Account. +func (client SpatialAnchorsAccountsClient) GetKeys(ctx context.Context, resourceGroupName string, spatialAnchorsAccountName string) (result SpatialAnchorsAccountKeys, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/SpatialAnchorsAccountsClient.GetKeys") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}, + {TargetValue: spatialAnchorsAccountName, + Constraints: []validation.Constraint{{Target: "spatialAnchorsAccountName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "spatialAnchorsAccountName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "spatialAnchorsAccountName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("mixedreality.SpatialAnchorsAccountsClient", "GetKeys", err.Error()) + } + + req, err := client.GetKeysPreparer(ctx, resourceGroupName, spatialAnchorsAccountName) + if err != nil { + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "GetKeys", nil, "Failure preparing request") + return + } + + resp, err := client.GetKeysSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "GetKeys", resp, "Failure sending request") + return + } + + result, err = client.GetKeysResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "GetKeys", resp, "Failure responding to request") + } + + return +} + +// GetKeysPreparer prepares the GetKeys request. +func (client SpatialAnchorsAccountsClient) GetKeysPreparer(ctx context.Context, resourceGroupName string, spatialAnchorsAccountName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "spatialAnchorsAccountName": autorest.Encode("path", spatialAnchorsAccountName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-02-28-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/spatialAnchorsAccounts/{spatialAnchorsAccountName}/keys", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetKeysSender sends the GetKeys request. The method will close the +// http.Response Body if it receives an error. +func (client SpatialAnchorsAccountsClient) GetKeysSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// GetKeysResponder handles the response to the GetKeys request. The method always +// closes the http.Response Body. +func (client SpatialAnchorsAccountsClient) GetKeysResponder(resp *http.Response) (result SpatialAnchorsAccountKeys, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// ListByResourceGroup list Resources by Resource Group +// Parameters: +// resourceGroupName - name of an Azure resource group. +func (client SpatialAnchorsAccountsClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result SpatialAnchorsAccountListPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/SpatialAnchorsAccountsClient.ListByResourceGroup") + defer func() { + sc := -1 + if result.saal.Response.Response != nil { + sc = result.saal.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("mixedreality.SpatialAnchorsAccountsClient", "ListByResourceGroup", err.Error()) + } + + result.fn = client.listByResourceGroupNextResults + req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName) + if err != nil { + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "ListByResourceGroup", nil, "Failure preparing request") + return + } + + resp, err := client.ListByResourceGroupSender(req) + if err != nil { + result.saal.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "ListByResourceGroup", resp, "Failure sending request") + return + } + + result.saal, err = client.ListByResourceGroupResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "ListByResourceGroup", resp, "Failure responding to request") + } + + return +} + +// ListByResourceGroupPreparer prepares the ListByResourceGroup request. +func (client SpatialAnchorsAccountsClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-02-28-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/spatialAnchorsAccounts", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the +// http.Response Body if it receives an error. +func (client SpatialAnchorsAccountsClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always +// closes the http.Response Body. +func (client SpatialAnchorsAccountsClient) ListByResourceGroupResponder(resp *http.Response) (result SpatialAnchorsAccountList, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listByResourceGroupNextResults retrieves the next set of results, if any. +func (client SpatialAnchorsAccountsClient) listByResourceGroupNextResults(ctx context.Context, lastResults SpatialAnchorsAccountList) (result SpatialAnchorsAccountList, err error) { + req, err := lastResults.spatialAnchorsAccountListPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "listByResourceGroupNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListByResourceGroupSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "listByResourceGroupNextResults", resp, "Failure sending next results request") + } + result, err = client.ListByResourceGroupResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListByResourceGroupComplete enumerates all values, automatically crossing page boundaries as required. +func (client SpatialAnchorsAccountsClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result SpatialAnchorsAccountListIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/SpatialAnchorsAccountsClient.ListByResourceGroup") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.ListByResourceGroup(ctx, resourceGroupName) + return +} + +// ListBySubscription list Spatial Anchors Accounts by Subscription +func (client SpatialAnchorsAccountsClient) ListBySubscription(ctx context.Context) (result SpatialAnchorsAccountListPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/SpatialAnchorsAccountsClient.ListBySubscription") + defer func() { + sc := -1 + if result.saal.Response.Response != nil { + sc = result.saal.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.fn = client.listBySubscriptionNextResults + req, err := client.ListBySubscriptionPreparer(ctx) + if err != nil { + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "ListBySubscription", nil, "Failure preparing request") + return + } + + resp, err := client.ListBySubscriptionSender(req) + if err != nil { + result.saal.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "ListBySubscription", resp, "Failure sending request") + return + } + + result.saal, err = client.ListBySubscriptionResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "ListBySubscription", resp, "Failure responding to request") + } + + return +} + +// ListBySubscriptionPreparer prepares the ListBySubscription request. +func (client SpatialAnchorsAccountsClient) ListBySubscriptionPreparer(ctx context.Context) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-02-28-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.MixedReality/spatialAnchorsAccounts", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListBySubscriptionSender sends the ListBySubscription request. The method will close the +// http.Response Body if it receives an error. +func (client SpatialAnchorsAccountsClient) ListBySubscriptionSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// ListBySubscriptionResponder handles the response to the ListBySubscription request. The method always +// closes the http.Response Body. +func (client SpatialAnchorsAccountsClient) ListBySubscriptionResponder(resp *http.Response) (result SpatialAnchorsAccountList, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listBySubscriptionNextResults retrieves the next set of results, if any. +func (client SpatialAnchorsAccountsClient) listBySubscriptionNextResults(ctx context.Context, lastResults SpatialAnchorsAccountList) (result SpatialAnchorsAccountList, err error) { + req, err := lastResults.spatialAnchorsAccountListPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "listBySubscriptionNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListBySubscriptionSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "listBySubscriptionNextResults", resp, "Failure sending next results request") + } + result, err = client.ListBySubscriptionResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "listBySubscriptionNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListBySubscriptionComplete enumerates all values, automatically crossing page boundaries as required. +func (client SpatialAnchorsAccountsClient) ListBySubscriptionComplete(ctx context.Context) (result SpatialAnchorsAccountListIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/SpatialAnchorsAccountsClient.ListBySubscription") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.ListBySubscription(ctx) + return +} + +// RegenerateKeys regenerate 1 Key of a Spatial Anchors Account +// Parameters: +// resourceGroupName - name of an Azure resource group. +// spatialAnchorsAccountName - name of an Mixed Reality Spatial Anchors Account. +// spatialAnchorsAccountKeyRegenerate - specifying which key to be regenerated. +func (client SpatialAnchorsAccountsClient) RegenerateKeys(ctx context.Context, resourceGroupName string, spatialAnchorsAccountName string, spatialAnchorsAccountKeyRegenerate SpatialAnchorsAccountKeyRegenerateRequest) (result SpatialAnchorsAccountKeys, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/SpatialAnchorsAccountsClient.RegenerateKeys") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}, + {TargetValue: spatialAnchorsAccountName, + Constraints: []validation.Constraint{{Target: "spatialAnchorsAccountName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "spatialAnchorsAccountName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "spatialAnchorsAccountName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("mixedreality.SpatialAnchorsAccountsClient", "RegenerateKeys", err.Error()) + } + + req, err := client.RegenerateKeysPreparer(ctx, resourceGroupName, spatialAnchorsAccountName, spatialAnchorsAccountKeyRegenerate) + if err != nil { + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "RegenerateKeys", nil, "Failure preparing request") + return + } + + resp, err := client.RegenerateKeysSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "RegenerateKeys", resp, "Failure sending request") + return + } + + result, err = client.RegenerateKeysResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "RegenerateKeys", resp, "Failure responding to request") + } + + return +} + +// RegenerateKeysPreparer prepares the RegenerateKeys request. +func (client SpatialAnchorsAccountsClient) RegenerateKeysPreparer(ctx context.Context, resourceGroupName string, spatialAnchorsAccountName string, spatialAnchorsAccountKeyRegenerate SpatialAnchorsAccountKeyRegenerateRequest) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "spatialAnchorsAccountName": autorest.Encode("path", spatialAnchorsAccountName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-02-28-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/spatialAnchorsAccounts/{spatialAnchorsAccountName}/keys", pathParameters), + autorest.WithJSON(spatialAnchorsAccountKeyRegenerate), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// RegenerateKeysSender sends the RegenerateKeys request. The method will close the +// http.Response Body if it receives an error. +func (client SpatialAnchorsAccountsClient) RegenerateKeysSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// RegenerateKeysResponder handles the response to the RegenerateKeys request. The method always +// closes the http.Response Body. +func (client SpatialAnchorsAccountsClient) RegenerateKeysResponder(resp *http.Response) (result SpatialAnchorsAccountKeys, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Update updating a Spatial Anchors Account +// Parameters: +// resourceGroupName - name of an Azure resource group. +// spatialAnchorsAccountName - name of an Mixed Reality Spatial Anchors Account. +// spatialAnchorsAccount - spatial Anchors Account parameter. +func (client SpatialAnchorsAccountsClient) Update(ctx context.Context, resourceGroupName string, spatialAnchorsAccountName string, spatialAnchorsAccount SpatialAnchorsAccount) (result SpatialAnchorsAccount, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/SpatialAnchorsAccountsClient.Update") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: resourceGroupName, + Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}, + {TargetValue: spatialAnchorsAccountName, + Constraints: []validation.Constraint{{Target: "spatialAnchorsAccountName", Name: validation.MaxLength, Rule: 90, Chain: nil}, + {Target: "spatialAnchorsAccountName", Name: validation.MinLength, Rule: 1, Chain: nil}, + {Target: "spatialAnchorsAccountName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil { + return result, validation.NewError("mixedreality.SpatialAnchorsAccountsClient", "Update", err.Error()) + } + + req, err := client.UpdatePreparer(ctx, resourceGroupName, spatialAnchorsAccountName, spatialAnchorsAccount) + if err != nil { + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "Update", nil, "Failure preparing request") + return + } + + resp, err := client.UpdateSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "Update", resp, "Failure sending request") + return + } + + result, err = client.UpdateResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "mixedreality.SpatialAnchorsAccountsClient", "Update", resp, "Failure responding to request") + } + + return +} + +// UpdatePreparer prepares the Update request. +func (client SpatialAnchorsAccountsClient) UpdatePreparer(ctx context.Context, resourceGroupName string, spatialAnchorsAccountName string, spatialAnchorsAccount SpatialAnchorsAccount) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "spatialAnchorsAccountName": autorest.Encode("path", spatialAnchorsAccountName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2019-02-28-preview" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPatch(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/spatialAnchorsAccounts/{spatialAnchorsAccountName}", pathParameters), + autorest.WithJSON(spatialAnchorsAccount), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// UpdateSender sends the Update request. The method will close the +// http.Response Body if it receives an error. +func (client SpatialAnchorsAccountsClient) UpdateSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// UpdateResponder handles the response to the Update request. The method always +// closes the http.Response Body. +func (client SpatialAnchorsAccountsClient) UpdateResponder(resp *http.Response) (result SpatialAnchorsAccount, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality/version.go new file mode 100644 index 0000000000000..a70d2e9ba9ce0 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality/version.go @@ -0,0 +1,30 @@ +package mixedreality + +import "github.com/Azure/azure-sdk-for-go/version" + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +// UserAgent returns the UserAgent string to use when sending http.Requests. +func UserAgent() string { + return "Azure-SDK-For-Go/" + version.Number + " mixedreality/2019-02-28-preview" +} + +// Version returns the semantic version (see http://semver.org) of the client. +func Version() string { + return version.Number +} diff --git a/vendor/modules.txt b/vendor/modules.txt index ef8827c62e164..114c02e121520 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -51,6 +51,7 @@ github.com/Azure/azure-sdk-for-go/services/preview/botservice/mgmt/2018-07-12/bo github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2018-09-15-preview/eventgrid github.com/Azure/azure-sdk-for-go/services/preview/hdinsight/mgmt/2018-06-01-preview/hdinsight github.com/Azure/azure-sdk-for-go/services/preview/iothub/mgmt/2018-12-01-preview/devices +github.com/Azure/azure-sdk-for-go/services/preview/mixedreality/mgmt/2019-02-28/mixedreality github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights github.com/Azure/azure-sdk-for-go/services/preview/msi/mgmt/2015-08-31-preview/msi github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights diff --git a/website/azurerm.erb b/website/azurerm.erb index 88f177bed221d..bcc7a7465bef2 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -1593,6 +1593,15 @@
            • +
          • + Mixed Reality + +
            • +
          • Messaging Resources
              diff --git a/website/docs/r/spatial_anchors_account.html.markdown b/website/docs/r/spatial_anchors_account.html.markdown new file mode 100644 index 0000000000000..72fa45506d4b3 --- /dev/null +++ b/website/docs/r/spatial_anchors_account.html.markdown @@ -0,0 +1,61 @@ +--- +subcategory: "Mixed Reality" +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_spatial_anchors_account" +description: |- + Manages an Azure Spatial Anchors Account. +--- + +# azurerm_spatial_anchors_account + +Manages an Azure Spatial Anchors Account. + +## Example Usage + +```hcl +resource "azurerm_resource_group" "example" { + name = "example-resources" + location = "northeurope" +} + +resource "azurerm_spatial_anchors_account" "example" { + name = "example" + location = azurerm_resource_group.example.location + resource_group_name = azurerm_resource_group.example.name +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) Specifies the name of the Spatial Anchors Account. Changing this forces a new resource to be created. Must be globally unique. + +* `resource_group_name` - (Required) The name of the resource group in which to create the Spatial Anchors Account. + +* `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. + +* `tags` - (Optional) A mapping of tags to assign to the resource. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The ID of the Spatial Anchors Account. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: + +* `create` - (Defaults to 30 minutes) Used when creating the Spatial Anchors Account. +* `update` - (Defaults to 30 minutes) Used when updating the Spatial Anchors Account. +* `read` - (Defaults to 5 minutes) Used when retrieving the Spatial Anchors Account. +* `delete` - (Defaults to 30 minutes) Used when deleting the Spatial Anchors Account. + +## Import + +Spatial Anchors Account can be imported using the `resource id`, e.g. + +```shell +terraform import azurerm_spatial_anchors_account.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/example/providers/Microsoft.MixedReality/spatialAnchorsAccounts/example +``` From 84570fa8fa073629c649084b6bf7e8f4de14f8e3 Mon Sep 17 00:00:00 2001 From: Tracy P Holmes <12778804+tracypholmes@users.noreply.github.com> Date: Thu, 5 Mar 2020 19:36:46 -0600 Subject: [PATCH 472/498] docs: `Updates dev_test_windows_virtual_machine` example (#6013) Changes Linux based verbiage in `gallery_image_reference` with Windows Fixes #5370 --- .../docs/r/dev_test_windows_virtual_machine.html.markdown | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/website/docs/r/dev_test_windows_virtual_machine.html.markdown b/website/docs/r/dev_test_windows_virtual_machine.html.markdown index 378f87111b3ba..4a136c4617be7 100644 --- a/website/docs/r/dev_test_windows_virtual_machine.html.markdown +++ b/website/docs/r/dev_test_windows_virtual_machine.html.markdown @@ -53,9 +53,9 @@ resource "azurerm_dev_test_windows_virtual_machine" "example" { notes = "Some notes about this Virtual Machine." gallery_image_reference { - offer = "UbuntuServer" - publisher = "Canonical" - sku = "18.04-LTS" + offer = "WindowsServer" + publisher = "MicrosoftWindowsServer" + sku = "2019-Datacenter" version = "latest" } } @@ -143,8 +143,6 @@ A `inbound_nat_rule` block exports the following: ## Timeouts - - The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: * `create` - (Defaults to 30 minutes) Used when creating the DevTest Windows Virtual Machine. From 029e4e0e6490c060184054fb55c6e3838eff3664 Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 5 Mar 2020 23:06:43 -0800 Subject: [PATCH 473/498] provider: remove deprecated functions and other misc cleanup (#6009) * provider: remove deprecated functions and other misc cleanup * fix travis errors * make goimports --- .../azure/app_service_schedule_backup.go | 5 +-- azurerm/helpers/azure/batch_pool.go | 4 +- azurerm/helpers/azure/datalake.go | 2 +- azurerm/helpers/azure/elasticpool.go | 2 +- azurerm/helpers/azure/eventhub.go | 6 +-- azurerm/helpers/azure/key_vault.go | 2 +- azurerm/helpers/azure/mssql.go | 10 ++--- azurerm/helpers/azure/mssql_test.go | 8 ++-- azurerm/helpers/azure/servicebus.go | 6 +-- azurerm/helpers/azure/validate.go | 2 +- azurerm/helpers/azure/validate_test.go | 2 +- azurerm/helpers/tf/acctest.go | 4 +- azurerm/helpers/validate/base64.go | 11 ----- azurerm/helpers/validate/bot.go | 2 +- azurerm/helpers/validate/bot_test.go | 2 +- azurerm/helpers/validate/float.go | 11 ----- azurerm/helpers/validate/int.go | 21 ---------- azurerm/helpers/validate/strings.go | 7 ---- azurerm/helpers/validate/time.go | 16 ------- azurerm/helpers/validate/time_test.go | 42 ------------------- azurerm/helpers/validate/url.go | 16 ------- azurerm/helpers/validate/uuid.go | 20 +-------- ...rm_api_management_identity_provider_aad.go | 5 +-- ..._management_identity_provider_microsoft.go | 3 +- .../resource_arm_role_assignment.go | 6 +-- .../resource_arm_automation_job_schedule.go | 5 +-- .../resource_arm_automation_schedule.go | 27 ++++++------ ...source_arm_automation_variable_datetime.go | 4 +- .../resource_arm_automation_schedule_test.go | 8 ++-- .../resource_arm_bot_channel_directline.go | 8 ++-- .../bot/resource_arm_bot_channel_ms_teams.go | 2 +- .../compute/linux_virtual_machine_resource.go | 5 +-- .../services/compute/resource_arm_image.go | 8 ++-- .../compute/resource_arm_virtual_machine.go | 12 +++--- .../resource_arm_virtual_machine_scale_set.go | 18 ++++---- azurerm/internal/services/compute/ssh_keys.go | 2 +- .../compute/tests/resource_arm_image_test.go | 16 +++---- .../tests/resource_arm_managed_disk_test.go | 2 +- ..._arm_virtual_machine_managed_disks_test.go | 2 +- ...urce_arm_virtual_machine_scale_set_test.go | 2 +- ...rm_virtual_machine_unmanaged_disks_test.go | 4 +- .../services/compute/validation_test.go | 2 +- .../windows_virtual_machine_resource.go | 4 +- .../containers/kubernetes_nodepool.go | 2 +- .../resource_arm_container_group.go | 6 +-- .../resource_arm_container_registry.go | 2 +- .../cosmos/data_source_cosmos_db_account.go | 2 +- .../cosmos/resource_arm_cosmosdb_account.go | 30 ++++++------- .../resource_arm_cosmosdb_account_test.go | 2 +- .../resource_arm_databricks_workspace.go | 2 +- ...ource_arm_data_factory_trigger_schedule.go | 8 ++-- .../resource_arm_data_lake_store_file_test.go | 6 +-- ...m_eventhub_namespace_authorization_rule.go | 4 +- .../resource_arm_healthcare_service_test.go | 4 +- .../resource_arm_key_vault_certificate.go | 2 +- .../keyvault/resource_arm_key_vault_key.go | 13 +++--- .../keyvault/resource_arm_key_vault_secret.go | 14 +++---- ...source_arm_logic_app_trigger_recurrence.go | 3 +- ...source_arm_mariadb_virtual_network_rule.go | 4 +- ...e_arm_mariadb_virtual_network_rule_test.go | 10 ++--- .../resource_arm_media_services_account.go | 2 +- .../resource_arm_monitor_autoscale_setting.go | 4 +- .../resource_arm_monitor_metric_alert.go | 2 +- ...resource_arm_mysql_virtual_network_rule.go | 4 +- ...rce_arm_mysql_virtual_network_rule_test.go | 10 ++--- .../netapp/resource_arm_netapp_volume.go | 10 ++--- .../services/network/data_source_public_ip.go | 4 +- .../resource_arm_express_route_gateway.go | 3 +- .../resource_arm_network_security_rule.go | 4 +- .../resource_arm_private_link_service.go | 4 +- .../network/resource_arm_virtual_network.go | 6 +-- ..._arm_express_route_circuit_peering_test.go | 4 +- .../resource_arm_notification_hub.go | 2 +- ...resource_arm_notification_hub_namespace.go | 2 +- .../policy/resource_arm_policy_definition.go | 2 +- ...rce_arm_postgresql_virtual_network_rule.go | 2 +- ...rm_postgresql_virtual_network_rule_test.go | 10 ++--- .../resource_arm_backup_policy_file_share.go | 8 ++-- .../resource_arm_backup_policy_vm.go | 35 ++++++++-------- ...esource_arm_backup_protected_file_share.go | 2 +- .../resource_arm_backup_protected_vm.go | 2 +- ...ource_arm_site_recovery_network_mapping.go | 2 +- ...ce_arm_backup_protected_file_share_test.go | 4 +- .../resource_arm_backup_protected_vm_test.go | 8 ++-- .../redis/resource_arm_redis_cache.go | 3 +- .../services/resource/group_validator_test.go | 2 +- .../resource_arm_security_center_contact.go | 2 +- ...rm_security_center_subscription_pricing.go | 6 +-- .../resource_arm_security_center_workspace.go | 8 ++-- ...source_arm_security_center_contact_test.go | 2 +- ...curity_center_subscription_pricing_test.go | 2 +- ...urce_arm_security_center_workspace_test.go | 6 +-- ...servicebus_namespace_authorization_rule.go | 6 +-- .../services/sql/resource_arm_sql_database.go | 5 +-- .../resource_arm_sql_virtual_network_rule.go | 6 +-- ...ource_arm_sql_virtual_network_rule_test.go | 10 ++--- .../storage/resource_arm_hpc_cache.go | 3 +- .../storage/resource_arm_storage_account.go | 16 ------- ...rm_storage_account_customer_managed_key.go | 6 +-- .../resource_arm_stream_analytics_job.go | 2 +- .../subscription/data_source_subscriptions.go | 12 +++--- .../resource_arm_traffic_manager_endpoint.go | 2 +- .../web/resource_arm_app_service_plan.go | 2 +- .../services/web/resource_arm_function_app.go | 2 +- azurerm/internal/tags/expand.go | 2 +- 105 files changed, 265 insertions(+), 436 deletions(-) delete mode 100644 azurerm/helpers/validate/base64.go delete mode 100644 azurerm/helpers/validate/float.go delete mode 100644 azurerm/helpers/validate/url.go diff --git a/azurerm/helpers/azure/app_service_schedule_backup.go b/azurerm/helpers/azure/app_service_schedule_backup.go index 43ae08d1f309f..d26a3520e979b 100644 --- a/azurerm/helpers/azure/app_service_schedule_backup.go +++ b/azurerm/helpers/azure/app_service_schedule_backup.go @@ -11,7 +11,6 @@ import ( "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" ) func SchemaAppServiceBackup() *schema.Schema { @@ -78,7 +77,7 @@ func SchemaAppServiceBackup() *schema.Schema { Type: schema.TypeString, Optional: true, DiffSuppressFunc: suppress.RFC3339Time, - ValidateFunc: validate.RFC3339Time, + ValidateFunc: validation.IsRFC3339Time, }, }, }, @@ -129,7 +128,7 @@ func ExpandAppServiceBackup(input []interface{}) *web.BackupRequest { } if v, ok := schedule["start_time"].(string); ok { - dateTimeToStart, _ := time.Parse(time.RFC3339, v) //validated by schema + dateTimeToStart, _ := time.Parse(time.RFC3339, v) // validated by schema backupSchedule.StartTime = &date.Time{Time: dateTimeToStart} } diff --git a/azurerm/helpers/azure/batch_pool.go b/azurerm/helpers/azure/batch_pool.go index 7659f8037d5b2..86b46047ce903 100644 --- a/azurerm/helpers/azure/batch_pool.go +++ b/azurerm/helpers/azure/batch_pool.go @@ -587,7 +587,7 @@ func ExpandBatchPoolNetworkConfiguration(list []interface{}) (*batch.NetworkConf return networkConfiguration, nil } -//ExpandBatchPoolEndpointConfiguration expands Batch pool endpoint configuration +// ExpandBatchPoolEndpointConfiguration expands Batch pool endpoint configuration func ExpandBatchPoolEndpointConfiguration(list []interface{}) (*batch.PoolEndpointConfiguration, error) { if len(list) == 0 { return nil, nil @@ -626,7 +626,7 @@ func ExpandBatchPoolEndpointConfiguration(list []interface{}) (*batch.PoolEndpoi }, nil } -//ExpandBatchPoolNetworkSecurityGroupRule expands Batch pool network security group rule +// ExpandBatchPoolNetworkSecurityGroupRule expands Batch pool network security group rule func ExpandBatchPoolNetworkSecurityGroupRule(list []interface{}) ([]batch.NetworkSecurityGroupRule, error) { if len(list) == 0 { return nil, nil diff --git a/azurerm/helpers/azure/datalake.go b/azurerm/helpers/azure/datalake.go index 0434493f73cec..eb1c10355a1bf 100644 --- a/azurerm/helpers/azure/datalake.go +++ b/azurerm/helpers/azure/datalake.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/validation" ) -//store and analytic account names are the same +// store and analytic account names are the same func ValidateDataLakeAccountName() schema.SchemaValidateFunc { return validation.StringMatch( regexp.MustCompile(`\A([a-z0-9]{3,24})\z`), diff --git a/azurerm/helpers/azure/elasticpool.go b/azurerm/helpers/azure/elasticpool.go index 222fe7183bc99..f1c3a9409fe4d 100644 --- a/azurerm/helpers/azure/elasticpool.go +++ b/azurerm/helpers/azure/elasticpool.go @@ -230,7 +230,7 @@ func MSSQLElasticPoolValidateSKU(diff *schema.ResourceDiff) error { return fmt.Errorf("Mismatch between SKU name '%s' and family '%s', expected '%s'", s.Name, s.Family, getFamilyFromName(s)) } - //get max GB and do validation based on SKU type + // get max GB and do validation based on SKU type if s.SkuType == DTU { s.MaxAllowedGB = getDTUMaxGB[strings.ToLower(s.Tier)][s.Capacity] return doDTUSKUValidation(s) diff --git a/azurerm/helpers/azure/eventhub.go b/azurerm/helpers/azure/eventhub.go index 9015731f15499..fcf8c67c3e9c8 100644 --- a/azurerm/helpers/azure/eventhub.go +++ b/azurerm/helpers/azure/eventhub.go @@ -11,7 +11,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub" ) -//validation +// validation func ValidateEventHubNamespaceName() schema.SchemaValidateFunc { return validation.StringMatch( regexp.MustCompile("^[a-zA-Z][-a-zA-Z0-9]{4,48}[a-zA-Z0-9]$"), @@ -40,7 +40,7 @@ func ValidateEventHubAuthorizationRuleName() schema.SchemaValidateFunc { ) } -//schema +// schema func ExpandEventHubAuthorizationRuleRights(d *schema.ResourceData) *[]eventhub.AccessRights { rights := make([]eventhub.AccessRights, 0) @@ -60,7 +60,7 @@ func ExpandEventHubAuthorizationRuleRights(d *schema.ResourceData) *[]eventhub.A } func FlattenEventHubAuthorizationRuleRights(rights *[]eventhub.AccessRights) (listen, send, manage bool) { - //zero (initial) value for a bool in go is false + // zero (initial) value for a bool in go is false if rights != nil { for _, right := range *rights { diff --git a/azurerm/helpers/azure/key_vault.go b/azurerm/helpers/azure/key_vault.go index 7957380bb5946..1460cd8d0dc85 100644 --- a/azurerm/helpers/azure/key_vault.go +++ b/azurerm/helpers/azure/key_vault.go @@ -59,7 +59,7 @@ func GetKeyVaultIDFromBaseUrl(ctx context.Context, client *keyvault.VaultsClient resourceGroup := vid.ResourceGroup name := vid.Path["vaults"] - //resp does not appear to contain the vault properties, so lets fetch them + // resp does not appear to contain the vault properties, so lets fetch them get, err := client.Get(ctx, resourceGroup, name) if err != nil { if utils.ResponseWasNotFound(get.Response) { diff --git a/azurerm/helpers/azure/mssql.go b/azurerm/helpers/azure/mssql.go index de9e37befe34c..4f9ed77386ed9 100644 --- a/azurerm/helpers/azure/mssql.go +++ b/azurerm/helpers/azure/mssql.go @@ -6,7 +6,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" ) -//Your server name can contain only lowercase letters, numbers, and '-', but can't start or end with '-' or have more than 63 characters. +// Your server name can contain only lowercase letters, numbers, and '-', but can't start or end with '-' or have more than 63 characters. func ValidateMsSqlServerName(i interface{}, k string) (_ []string, errors []error) { if m, regexErrs := validate.RegExHelper(i, k, `^[0-9a-z]([-0-9a-z]{0,61}[0-9a-z])?$`); !m { errors = append(regexErrs, fmt.Errorf("%q can contain only lowercase letters, numbers, and '-', but can't start or end with '-' or have more than 63 characters.", k)) @@ -15,7 +15,7 @@ func ValidateMsSqlServerName(i interface{}, k string) (_ []string, errors []erro return nil, errors } -//Your database name can't end with '.' or ' ', can't contain '<,>,*,%,&,:,\,/,?' or control characters, and can't have more than 128 characters. +// Your database name can't end with '.' or ' ', can't contain '<,>,*,%,&,:,\,/,?' or control characters, and can't have more than 128 characters. func ValidateMsSqlDatabaseName(i interface{}, k string) (_ []string, errors []error) { if m, regexErrs := validate.RegExHelper(i, k, `^[^<>*%&:\\\/?]{0,127}[^\s.<>*%&:\\\/?]$`); !m { errors = append(regexErrs, fmt.Errorf(`%q can't end with '.' or ' ', can't contain '<,>,*,%%,&,:,\,/,?' or control characters, and can't have more than 128 characters.`, k)) @@ -32,9 +32,9 @@ func ValidateMsSqlFailoverGroupName(i interface{}, k string) (_ []string, errors return nil, errors } -//Following characters and any control characters are not allowed for resource name '%,&,\\\\,?,/'.\" -//The name can not end with characters: '. ' -//TODO: unsure about length, was able to deploy one at 120 +// Following characters and any control characters are not allowed for resource name '%,&,\\\\,?,/'.\" +// The name can not end with characters: '. ' +// TODO: unsure about length, was able to deploy one at 120 func ValidateMsSqlElasticPoolName(i interface{}, k string) (_ []string, errors []error) { if m, regexErrs := validate.RegExHelper(i, k, `^[^&%\\\/?]{0,127}[^\s.&%\\\/?]$`); !m { errors = append(regexErrs, fmt.Errorf(`%q can't end with '.' or ' ', can't contain '%%,&,\,/,?' or control characters, and can't have more than 128 characters.`, k)) diff --git a/azurerm/helpers/azure/mssql_test.go b/azurerm/helpers/azure/mssql_test.go index 0ebf853cb6d13..fbd391a4204f6 100644 --- a/azurerm/helpers/azure/mssql_test.go +++ b/azurerm/helpers/azure/mssql_test.go @@ -2,7 +2,7 @@ package azure import "testing" -//Your server name can contain only lowercase letters, numbers, and '-', but can't start or end with '-' or have more than 63 characters. +// Your server name can contain only lowercase letters, numbers, and '-', but can't start or end with '-' or have more than 63 characters. func TestValidateMsSqlServerName(t *testing.T) { cases := []struct { Value string @@ -63,7 +63,7 @@ func TestValidateMsSqlServerName(t *testing.T) { } } -//Your database name can't end with '.' or ' ', can't contain '<,>,*,%,&,:,\,/,?' or control characters, and can't have more than 128 characters. +// Your database name can't end with '.' or ' ', can't contain '<,>,*,%,&,:,\,/,?' or control characters, and can't have more than 128 characters. func TestValidateMsSqlDatabaseName(t *testing.T) { cases := []struct { Value string @@ -140,8 +140,8 @@ func TestValidateMsSqlDatabaseName(t *testing.T) { } } -//Following characters and any control characters are not allowed for resource name '%,&,\\\\,?,/'.\" -//The name can not end with characters: '. ' +// Following characters and any control characters are not allowed for resource name '%,&,\\\\,?,/'.\" +// The name can not end with characters: '. ' func TestValidateMsSqlElasticPoolName(t *testing.T) { cases := []struct { Value string diff --git a/azurerm/helpers/azure/servicebus.go b/azurerm/helpers/azure/servicebus.go index 4d0cce2b263b9..97ade4d9de514 100644 --- a/azurerm/helpers/azure/servicebus.go +++ b/azurerm/helpers/azure/servicebus.go @@ -11,7 +11,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus" ) -//validation +// validation func ValidateServiceBusNamespaceName() schema.SchemaValidateFunc { return validation.StringMatch( regexp.MustCompile("^[a-zA-Z][-a-zA-Z0-9]{4,48}[a-zA-Z0-9]$"), @@ -66,7 +66,7 @@ func ExpandServiceBusAuthorizationRuleRights(d *schema.ResourceData) *[]serviceb } func FlattenServiceBusAuthorizationRuleRights(rights *[]servicebus.AccessRights) (listen, send, manage bool) { - //zero (initial) value for a bool in go is false + // zero (initial) value for a bool in go is false if rights != nil { for _, right := range *rights { @@ -86,7 +86,7 @@ func FlattenServiceBusAuthorizationRuleRights(rights *[]servicebus.AccessRights) return listen, send, manage } -//shared schema +// shared schema func MergeSchema(a map[string]*schema.Schema, b map[string]*schema.Schema) map[string]*schema.Schema { s := map[string]*schema.Schema{} diff --git a/azurerm/helpers/azure/validate.go b/azurerm/helpers/azure/validate.go index 5788b23b5e694..9dad815eb5bd2 100644 --- a/azurerm/helpers/azure/validate.go +++ b/azurerm/helpers/azure/validate.go @@ -18,7 +18,7 @@ func ValidateResourceID(i interface{}, k string) (warnings []string, errors []er return warnings, errors } -//true for a resource ID or an empty string +// true for a resource ID or an empty string func ValidateResourceIDOrEmpty(i interface{}, k string) (_ []string, errors []error) { v, ok := i.(string) if !ok { diff --git a/azurerm/helpers/azure/validate_test.go b/azurerm/helpers/azure/validate_test.go index b8b17ab474f0a..a668deb2b034e 100644 --- a/azurerm/helpers/azure/validate_test.go +++ b/azurerm/helpers/azure/validate_test.go @@ -73,7 +73,7 @@ func TestAzureResourceIDOrEmpty(t *testing.T) { ID: "nonsense", Errors: 1, }, - //as this function just calls TestAzureResourceId lets not be as comprehensive + // as this function just calls TestAzureResourceId lets not be as comprehensive { ID: "/providers/provider.name/", Errors: 0, diff --git a/azurerm/helpers/tf/acctest.go b/azurerm/helpers/tf/acctest.go index 68ebf1ee88310..359fcf8d17143 100644 --- a/azurerm/helpers/tf/acctest.go +++ b/azurerm/helpers/tf/acctest.go @@ -13,9 +13,9 @@ func AccRandTimeInt() int { // 000000000000000000 // YYMMddHHmmsshhRRRR - //go format: 2006-01-02 15:04:05.00 + // go format: 2006-01-02 15:04:05.00 - timeStr := strings.Replace(time.Now().Local().Format("060102150405.00"), ".", "", 1) //no way to not have a .? + timeStr := strings.Replace(time.Now().Local().Format("060102150405.00"), ".", "", 1) // no way to not have a .? postfix := acctest.RandStringFromCharSet(4, "0123456789") i, err := strconv.Atoi(timeStr + postfix) diff --git a/azurerm/helpers/validate/base64.go b/azurerm/helpers/validate/base64.go deleted file mode 100644 index 08a85fd809cb7..0000000000000 --- a/azurerm/helpers/validate/base64.go +++ /dev/null @@ -1,11 +0,0 @@ -package validate - -import ( - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" -) - -// deprecated: please use validation.StringIsBase64 instead -func Base64String() schema.SchemaValidateFunc { - return validation.StringIsBase64 -} diff --git a/azurerm/helpers/validate/bot.go b/azurerm/helpers/validate/bot.go index 430bbcec9d9fe..a04ece21c7aa0 100644 --- a/azurerm/helpers/validate/bot.go +++ b/azurerm/helpers/validate/bot.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/schema" ) -func ValidateBotMSTeamsCallingWebHook() schema.SchemaValidateFunc { +func BotMSTeamsCallingWebHook() schema.SchemaValidateFunc { return func(i interface{}, k string) (warnings []string, errors []error) { value := i.(string) if !strings.HasPrefix(value, "https://") || !strings.HasSuffix(value, "/") { diff --git a/azurerm/helpers/validate/bot_test.go b/azurerm/helpers/validate/bot_test.go index 756bcb0b592ba..9011efb63c938 100644 --- a/azurerm/helpers/validate/bot_test.go +++ b/azurerm/helpers/validate/bot_test.go @@ -32,7 +32,7 @@ func TestValidateBotMSTeamsCallingWebHook(t *testing.T) { } for _, tt := range tests { t.Run(tt.webhook, func(t *testing.T) { - _, err := ValidateBotMSTeamsCallingWebHook()(tt.webhook, "") + _, err := BotMSTeamsCallingWebHook()(tt.webhook, "") valid := err == nil if valid != tt.valid { t.Errorf("Expected valid status %t but got %t for input %s", tt.valid, valid, tt.webhook) diff --git a/azurerm/helpers/validate/float.go b/azurerm/helpers/validate/float.go deleted file mode 100644 index 6066d221be6bd..0000000000000 --- a/azurerm/helpers/validate/float.go +++ /dev/null @@ -1,11 +0,0 @@ -package validate - -import ( - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" -) - -// deprecated: please use validation.FloatAtLeast instead -func FloatAtLeast(min float64) schema.SchemaValidateFunc { - return validation.FloatAtLeast(min) -} diff --git a/azurerm/helpers/validate/int.go b/azurerm/helpers/validate/int.go index 335a934da7606..6eecfc8fd34ce 100644 --- a/azurerm/helpers/validate/int.go +++ b/azurerm/helpers/validate/int.go @@ -4,14 +4,8 @@ import ( "fmt" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" ) -// deprecated: use validation.All(validation.IntBetween, validation.IntNotInSlice) -func IntBetweenAndNot(min, max, not int) schema.SchemaValidateFunc { - return validation.All(validation.IntBetween(min, max), validation.IntNotInSlice([]int{not})) -} - func IntBetweenAndNotInRange(min, max, rangeMin, rangeMax int) schema.SchemaValidateFunc { return func(i interface{}, k string) (_ []string, errors []error) { v, ok := i.(int) @@ -32,18 +26,3 @@ func IntBetweenAndNotInRange(min, max, rangeMin, rangeMax int) schema.SchemaVali return } } - -// deprecated: use validation.All(validation.IntBetween, validation.IntDivisibleBy) -func IntBetweenAndDivisibleBy(min, max, divisor int) schema.SchemaValidateFunc { // nolint: unparam - return validation.All(validation.IntBetween(min, max), validation.IntDivisibleBy(divisor)) -} - -// deprecated: use validation.IntDivisibleBy -func IntDivisibleBy(divisor int) schema.SchemaValidateFunc { // nolint: unparam - return validation.IntDivisibleBy(divisor) -} - -// deprecated: use validation.IntInSlice -func IntInSlice(valid []int) schema.SchemaValidateFunc { - return validation.IntInSlice(valid) -} diff --git a/azurerm/helpers/validate/strings.go b/azurerm/helpers/validate/strings.go index 22b4e81e327d6..d40a05d89ddc0 100644 --- a/azurerm/helpers/validate/strings.go +++ b/azurerm/helpers/validate/strings.go @@ -3,8 +3,6 @@ package validate import ( "fmt" "strings" - - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" ) // LowerCasedString validates that the string is lower-cased @@ -28,8 +26,3 @@ func LowerCasedString(i interface{}, k string) ([]string, []error) { return nil, nil } - -// deprecated use validation.StringIsNotEmpty instead -func NoEmptyStrings(i interface{}, k string) ([]string, []error) { - return validation.StringIsNotEmpty(i, k) -} diff --git a/azurerm/helpers/validate/time.go b/azurerm/helpers/validate/time.go index 7bce6bba290b1..027a8cf33ce9d 100644 --- a/azurerm/helpers/validate/time.go +++ b/azurerm/helpers/validate/time.go @@ -8,7 +8,6 @@ import ( "github.com/Azure/go-autorest/autorest/date" iso8601 "github.com/btubbs/datetime" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" ) func ISO8601Duration(i interface{}, k string) (warnings []string, errors []error) { @@ -26,11 +25,6 @@ func ISO8601Duration(i interface{}, k string) (warnings []string, errors []error return warnings, errors } -// deprecated use validation.IsRFC3339Time instead -func RFC3339Time(i interface{}, k string) (warnings []string, errors []error) { - return validation.IsRFC3339Time(i, k) -} - func ISO8601DateTime(i interface{}, k string) (warnings []string, errors []error) { v, ok := i.(string) if !ok { @@ -67,13 +61,3 @@ func RFC3339DateInFutureBy(d time.Duration) schema.SchemaValidateFunc { return warnings, errors } } - -// deprecated use validation.IsDayOfTheWeek instead -func DayOfTheWeek(ignoreCase bool) schema.SchemaValidateFunc { - return validation.IsDayOfTheWeek(ignoreCase) -} - -// deprecated use validation.IsMonth instead -func Month(ignoreCase bool) schema.SchemaValidateFunc { - return validation.IsMonth(ignoreCase) -} diff --git a/azurerm/helpers/validate/time_test.go b/azurerm/helpers/validate/time_test.go index b9751d6398f9e..aa106d7cca18b 100644 --- a/azurerm/helpers/validate/time_test.go +++ b/azurerm/helpers/validate/time_test.go @@ -5,48 +5,6 @@ import ( "time" ) -func TestRFC3339Time(t *testing.T) { - cases := []struct { - Time string - Errors int - }{ - { - Time: "", - Errors: 1, - }, - { - Time: "this is not a date", - Errors: 1, - }, - { - Time: "2000-01-01", - Errors: 1, - }, - { - Time: "2000-01-01T01:23:45", - Errors: 1, - }, - { - Time: "2000-01-01T01:23:45Z", - Errors: 0, - }, - { - Time: "2000-01-01T01:23:45+00:00", - Errors: 0, - }, - } - - for _, tc := range cases { - t.Run(tc.Time, func(t *testing.T) { - _, errors := RFC3339Time(tc.Time, "test") - - if len(errors) != tc.Errors { - t.Fatalf("Expected RFC3339Time to have %d not %d errors for %q", tc.Errors, len(errors), tc.Time) - } - }) - } -} - func TestISO8601DateTime(t *testing.T) { cases := []struct { Time string diff --git a/azurerm/helpers/validate/url.go b/azurerm/helpers/validate/url.go deleted file mode 100644 index 8027def99814f..0000000000000 --- a/azurerm/helpers/validate/url.go +++ /dev/null @@ -1,16 +0,0 @@ -package validate - -import ( - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" -) - -// deprecated use validation.IsURLWithHTTPS instead -func URLIsHTTPS(i interface{}, k string) (_ []string, errors []error) { - return validation.IsURLWithHTTPS(i, k) -} - -// todo ad to sdk -// deprecated use validation.IsURLWithScheme instead -func URLIsHTTPOrHTTPS(i interface{}, k string) (_ []string, errors []error) { - return validation.IsURLWithScheme([]string{"http", "https"})(i, k) -} diff --git a/azurerm/helpers/validate/uuid.go b/azurerm/helpers/validate/uuid.go index 8911285e33daa..de482fc923138 100644 --- a/azurerm/helpers/validate/uuid.go +++ b/azurerm/helpers/validate/uuid.go @@ -1,24 +1,6 @@ package validate -import ( - "regexp" - - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" -) +import "regexp" //uuid regex helper var UUIDRegExp = regexp.MustCompile("^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-4[a-fA-F0-9]{3}-[8|9|aA|bB][a-fA-F0-9]{3}-[a-fA-F0-9]{12}$") - -// deprecated use validation.IsUUID instead -func UUID(i interface{}, k string) (warnings []string, errors []error) { - return validation.IsUUID(i, k) -} - -func GUID(i interface{}, k string) (warnings []string, errors []error) { - return validation.IsUUID(i, k) -} - -// deprecated use validation.Any(validation.IsUUID, validation.StringIsEmpty) instead -func UUIDOrEmpty(i interface{}, k string) (warnings []string, errors []error) { - return validation.Any(validation.IsUUID, validation.StringIsEmpty)(i, k) -} diff --git a/azurerm/internal/services/apimanagement/resource_arm_api_management_identity_provider_aad.go b/azurerm/internal/services/apimanagement/resource_arm_api_management_identity_provider_aad.go index 75879270f7f28..3cd60f701a13d 100644 --- a/azurerm/internal/services/apimanagement/resource_arm_api_management_identity_provider_aad.go +++ b/azurerm/internal/services/apimanagement/resource_arm_api_management_identity_provider_aad.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" @@ -42,7 +41,7 @@ func resourceArmApiManagementIdentityProviderAAD() *schema.Resource { "client_id": { Type: schema.TypeString, Required: true, - ValidateFunc: validate.GUID, + ValidateFunc: validation.IsUUID, }, "client_secret": { @@ -57,7 +56,7 @@ func resourceArmApiManagementIdentityProviderAAD() *schema.Resource { Required: true, Elem: &schema.Schema{ Type: schema.TypeString, - ValidateFunc: validate.GUID, + ValidateFunc: validation.IsUUID, }, }, }, diff --git a/azurerm/internal/services/apimanagement/resource_arm_api_management_identity_provider_microsoft.go b/azurerm/internal/services/apimanagement/resource_arm_api_management_identity_provider_microsoft.go index f9effe135c332..b8498d0d456e7 100644 --- a/azurerm/internal/services/apimanagement/resource_arm_api_management_identity_provider_microsoft.go +++ b/azurerm/internal/services/apimanagement/resource_arm_api_management_identity_provider_microsoft.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" @@ -42,7 +41,7 @@ func resourceArmApiManagementIdentityProviderMicrosoft() *schema.Resource { "client_id": { Type: schema.TypeString, Required: true, - ValidateFunc: validate.GUID, + ValidateFunc: validation.IsUUID, }, "client_secret": { diff --git a/azurerm/internal/services/authorization/resource_arm_role_assignment.go b/azurerm/internal/services/authorization/resource_arm_role_assignment.go index f11016a66c8c7..c3ffb6b93ba32 100644 --- a/azurerm/internal/services/authorization/resource_arm_role_assignment.go +++ b/azurerm/internal/services/authorization/resource_arm_role_assignment.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/go-uuid" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" @@ -41,7 +41,7 @@ func resourceArmRoleAssignment() *schema.Resource { Optional: true, Computed: true, ForceNew: true, - ValidateFunc: validate.GUID, + ValidateFunc: validation.IsUUID, }, "scope": { @@ -194,7 +194,7 @@ func resourceArmRoleAssignmentRead(d *schema.ResourceData, meta interface{}) err d.Set("principal_id", props.PrincipalID) d.Set("principal_type", props.PrincipalType) - //allows for import when role name is used (also if the role name changes a plan will show a diff) + // allows for import when role name is used (also if the role name changes a plan will show a diff) if roleId := props.RoleDefinitionID; roleId != nil { roleResp, err := roleDefinitionsClient.GetByID(ctx, *roleId) if err != nil { diff --git a/azurerm/internal/services/automation/resource_arm_automation_job_schedule.go b/azurerm/internal/services/automation/resource_arm_automation_job_schedule.go index 44bab456468d5..105cc25c134d9 100644 --- a/azurerm/internal/services/automation/resource_arm_automation_job_schedule.go +++ b/azurerm/internal/services/automation/resource_arm_automation_job_schedule.go @@ -6,10 +6,9 @@ import ( "strings" "time" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" - "github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" uuid "github.com/satori/go.uuid" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" @@ -91,7 +90,7 @@ func resourceArmAutomationJobSchedule() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - ValidateFunc: validate.UUID, + ValidateFunc: validation.IsUUID, }, }, } diff --git a/azurerm/internal/services/automation/resource_arm_automation_schedule.go b/azurerm/internal/services/automation/resource_arm_automation_schedule.go index c2be124ebfa21..5beb6fefc6767 100644 --- a/azurerm/internal/services/automation/resource_arm_automation_schedule.go +++ b/azurerm/internal/services/automation/resource_arm_automation_schedule.go @@ -14,7 +14,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/set" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" @@ -69,11 +68,11 @@ func resourceArmAutomationSchedule() *schema.Resource { }, true), }, - //ignored when frequency is `OneTime` + // ignored when frequency is `OneTime` "interval": { Type: schema.TypeInt, Optional: true, - Computed: true, //defaults to 1 if frequency is not OneTime + Computed: true, // defaults to 1 if frequency is not OneTime ValidateFunc: validation.IntBetween(1, 100), }, @@ -82,16 +81,16 @@ func resourceArmAutomationSchedule() *schema.Resource { Optional: true, Computed: true, DiffSuppressFunc: suppress.RFC3339Time, - ValidateFunc: validate.RFC3339Time, - //defaults to now + 7 minutes in create function if not set + ValidateFunc: validation.IsRFC3339Time, + // defaults to now + 7 minutes in create function if not set }, "expiry_time": { Type: schema.TypeString, Optional: true, - Computed: true, //same as start time when OneTime, ridiculous value when recurring: "9999-12-31T15:59:00-08:00" + Computed: true, // same as start time when OneTime, ridiculous value when recurring: "9999-12-31T15:59:00-08:00" DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validate.RFC3339Time, + ValidateFunc: validation.IsRFC3339Time, }, "description": { @@ -103,7 +102,7 @@ func resourceArmAutomationSchedule() *schema.Resource { Type: schema.TypeString, Optional: true, Default: "UTC", - //todo figure out how to validate this properly + // todo figure out how to validate this properly }, "week_days": { @@ -237,9 +236,9 @@ func resourceArmAutomationScheduleCreateUpdate(d *schema.ResourceData, meta inte } properties := parameters.ScheduleCreateOrUpdateProperties - //start time can default to now + 7 (5 could be invalid by the time the API is called) + // start time can default to now + 7 (5 could be invalid by the time the API is called) if v, ok := d.GetOk("start_time"); ok { - t, _ := time.Parse(time.RFC3339, v.(string)) //should be validated by the schema + t, _ := time.Parse(time.RFC3339, v.(string)) // should be validated by the schema duration := time.Duration(5) * time.Minute if time.Until(t) < duration { return fmt.Errorf("start_time is %q and should be at least %q in the future", t, duration) @@ -250,11 +249,11 @@ func resourceArmAutomationScheduleCreateUpdate(d *schema.ResourceData, meta inte } if v, ok := d.GetOk("expiry_time"); ok { - t, _ := time.Parse(time.RFC3339, v.(string)) //should be validated by the schema + t, _ := time.Parse(time.RFC3339, v.(string)) // should be validated by the schema properties.ExpiryTime = &date.Time{Time: t} } - //only pay attention to interval if frequency is not OneTime, and default it to 1 if not set + // only pay attention to interval if frequency is not OneTime, and default it to 1 if not set if properties.Frequency != automation.OneTime { if v, ok := d.GetOk("interval"); ok { properties.Interval = utils.Int32(int32(v.(int))) @@ -263,7 +262,7 @@ func resourceArmAutomationScheduleCreateUpdate(d *schema.ResourceData, meta inte } } - //only pay attention to the advanced schedule fields if frequency is either Week or Month + // only pay attention to the advanced schedule fields if frequency is either Week or Month if properties.Frequency == automation.Week || properties.Frequency == automation.Month { advancedRef, err := expandArmAutomationScheduleAdvanced(d, d.Id() != "") if err != nil { @@ -326,7 +325,7 @@ func resourceArmAutomationScheduleRead(d *schema.ResourceData, meta interface{}) d.Set("expiry_time", v.Format(time.RFC3339)) } if v := resp.Interval; v != nil { - //seems to me missing its type in swagger, leading to it being a interface{} float64 + // seems to me missing its type in swagger, leading to it being a interface{} float64 d.Set("interval", int(v.(float64))) } if v := resp.Description; v != nil { diff --git a/azurerm/internal/services/automation/resource_arm_automation_variable_datetime.go b/azurerm/internal/services/automation/resource_arm_automation_variable_datetime.go index 80b76aca33e6e..2d4b48093c7e8 100644 --- a/azurerm/internal/services/automation/resource_arm_automation_variable_datetime.go +++ b/azurerm/internal/services/automation/resource_arm_automation_variable_datetime.go @@ -4,7 +4,7 @@ import ( "time" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" ) func resourceArmAutomationVariableDateTime() *schema.Resource { @@ -25,7 +25,7 @@ func resourceArmAutomationVariableDateTime() *schema.Resource { Delete: schema.DefaultTimeout(30 * time.Minute), }, - Schema: resourceAutomationVariableCommonSchema(schema.TypeString, validate.RFC3339Time), + Schema: resourceAutomationVariableCommonSchema(schema.TypeString, validation.IsRFC3339Time), } } diff --git a/azurerm/internal/services/automation/tests/resource_arm_automation_schedule_test.go b/azurerm/internal/services/automation/tests/resource_arm_automation_schedule_test.go index 3d63a22505d5e..b9f92f3c973b4 100644 --- a/azurerm/internal/services/automation/tests/resource_arm_automation_schedule_test.go +++ b/azurerm/internal/services/automation/tests/resource_arm_automation_schedule_test.go @@ -54,8 +54,8 @@ func TestAccAzureRMAutomationSchedule_requiresImport(t *testing.T) { func TestAccAzureRMAutomationSchedule_oneTime_complete(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_automation_schedule", "test") - //the API returns the time in the timezone we pass in - //it also seems to strip seconds, hijack the RFC3339 format to have 0s there + // the API returns the time in the timezone we pass in + // it also seems to strip seconds, hijack the RFC3339 format to have 0s there loc, _ := time.LoadLocation("CET") startTime := time.Now().UTC().Add(time.Hour * 7).In(loc).Format("2006-01-02T15:04:00Z07:00") @@ -76,8 +76,8 @@ func TestAccAzureRMAutomationSchedule_oneTime_complete(t *testing.T) { func TestAccAzureRMAutomationSchedule_oneTime_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_automation_schedule", "test") - //the API returns the time in the timezone we pass in - //it also seems to strip seconds, hijack the RFC3339 format to have 0s there + // the API returns the time in the timezone we pass in + // it also seems to strip seconds, hijack the RFC3339 format to have 0s there loc, _ := time.LoadLocation("CET") startTime := time.Now().UTC().Add(time.Hour * 7).In(loc).Format("2006-01-02T15:04:00Z07:00") diff --git a/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go b/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go index b84927665a03e..6377f93f13126 100644 --- a/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go +++ b/azurerm/internal/services/bot/resource_arm_bot_channel_directline.go @@ -8,9 +8,9 @@ import ( "github.com/Azure/azure-sdk-for-go/services/preview/botservice/mgmt/2018-07-12/botservice" "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" @@ -43,7 +43,7 @@ func resourceArmBotChannelDirectline() *schema.Resource { "bot_name": { Type: schema.TypeString, Required: true, - ValidateFunc: validate.NoEmptyStrings, + ValidateFunc: validation.StringIsNotEmpty, }, "site": { @@ -55,7 +55,7 @@ func resourceArmBotChannelDirectline() *schema.Resource { "name": { Type: schema.TypeString, Required: true, - ValidateFunc: validate.NoEmptyStrings, + ValidateFunc: validation.StringIsNotEmpty, }, "enabled": { @@ -87,7 +87,7 @@ func resourceArmBotChannelDirectline() *schema.Resource { Optional: true, Elem: &schema.Schema{ Type: schema.TypeString, - ValidateFunc: validate.NoEmptyStrings, + ValidateFunc: validation.StringIsNotEmpty, }, }, diff --git a/azurerm/internal/services/bot/resource_arm_bot_channel_ms_teams.go b/azurerm/internal/services/bot/resource_arm_bot_channel_ms_teams.go index 4de43f02a0244..4e860c805557d 100644 --- a/azurerm/internal/services/bot/resource_arm_bot_channel_ms_teams.go +++ b/azurerm/internal/services/bot/resource_arm_bot_channel_ms_teams.go @@ -50,7 +50,7 @@ func resourceArmBotChannelMsTeams() *schema.Resource { "calling_web_hook": { Type: schema.TypeString, Optional: true, - ValidateFunc: validate.ValidateBotMSTeamsCallingWebHook(), + ValidateFunc: validate.BotMSTeamsCallingWebHook(), }, "enable_calling": { diff --git a/azurerm/internal/services/compute/linux_virtual_machine_resource.go b/azurerm/internal/services/compute/linux_virtual_machine_resource.go index 702b9f0ce07a5..dbc11533d7789 100644 --- a/azurerm/internal/services/compute/linux_virtual_machine_resource.go +++ b/azurerm/internal/services/compute/linux_virtual_machine_resource.go @@ -13,7 +13,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/locks" @@ -64,7 +63,7 @@ func resourceLinuxVirtualMachine() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: validate.NoEmptyStrings, + ValidateFunc: validation.StringIsNotEmpty, }, "network_interface_ids": { @@ -82,7 +81,7 @@ func resourceLinuxVirtualMachine() *schema.Resource { "size": { Type: schema.TypeString, Required: true, - ValidateFunc: validate.NoEmptyStrings, + ValidateFunc: validation.StringIsNotEmpty, }, // Optional diff --git a/azurerm/internal/services/compute/resource_arm_image.go b/azurerm/internal/services/compute/resource_arm_image.go index b57ac390839a8..d085ba11f4b6a 100644 --- a/azurerm/internal/services/compute/resource_arm_image.go +++ b/azurerm/internal/services/compute/resource_arm_image.go @@ -243,16 +243,16 @@ func resourceArmImageCreateUpdate(d *schema.ResourceData, meta interface{}) erro } } - //either source VM or storage profile can be specified, but not both + // either source VM or storage profile can be specified, but not both if sourceVM.ID == nil { - //if both sourceVM and storageProfile are empty, return an error + // if both sourceVM and storageProfile are empty, return an error if storageProfile.OsDisk == nil && len(*storageProfile.DataDisks) == 0 { return fmt.Errorf("[ERROR] Cannot create image when both source VM and storage profile are empty") } properties.StorageProfile = &storageProfile } else { - //creating an image from source VM + // creating an image from source VM properties.SourceVirtualMachine = &sourceVM } @@ -312,7 +312,7 @@ func resourceArmImageRead(d *schema.ResourceData, meta interface{}) error { d.Set("location", azure.NormalizeLocation(*location)) } - //either source VM or storage profile can be specified, but not both + // either source VM or storage profile can be specified, but not both if resp.SourceVirtualMachine != nil { d.Set("source_virtual_machine_id", resp.SourceVirtualMachine.ID) } else if resp.StorageProfile != nil { diff --git a/azurerm/internal/services/compute/resource_arm_virtual_machine.go b/azurerm/internal/services/compute/resource_arm_virtual_machine.go index 4daa120ba8a08..83c90a3e0e76d 100644 --- a/azurerm/internal/services/compute/resource_arm_virtual_machine.go +++ b/azurerm/internal/services/compute/resource_arm_virtual_machine.go @@ -178,7 +178,7 @@ func resourceArmVirtualMachine() *schema.Resource { DiffSuppressFunc: suppress.CaseDifference, }, - //lintignore:S018 + // lintignore:S018 "storage_image_reference": { Type: schema.TypeSet, Optional: true, @@ -421,7 +421,7 @@ func resourceArmVirtualMachine() *schema.Resource { }, }, - //lintignore:S018 + // lintignore:S018 "os_profile": { Type: schema.TypeSet, Optional: true, @@ -457,7 +457,7 @@ func resourceArmVirtualMachine() *schema.Resource { Set: resourceArmVirtualMachineStorageOsProfileHash, }, - //lintignore:S018 + // lintignore:S018 "os_profile_windows_config": { Type: schema.TypeSet, Optional: true, @@ -544,7 +544,7 @@ func resourceArmVirtualMachine() *schema.Resource { ConflictsWith: []string{"os_profile_linux_config"}, }, - //lintignore:S018 + // lintignore:S018 "os_profile_linux_config": { Type: schema.TypeSet, Optional: true, @@ -1856,14 +1856,14 @@ func expandAzureRmVirtualMachineOsDisk(d *schema.ResourceData) (*compute.OSDisk, osDisk.ManagedDisk = managedDisk } - //BEGIN: code to be removed after GH-13016 is merged + // BEGIN: code to be removed after GH-13016 is merged if vhdURI != "" && managedDiskID != "" { return nil, fmt.Errorf("[ERROR] Conflict between `vhd_uri` and `managed_disk_id` (only one or the other can be used)") } if vhdURI != "" && managedDiskType != "" { return nil, fmt.Errorf("[ERROR] Conflict between `vhd_uri` and `managed_disk_type` (only one or the other can be used)") } - //END: code to be removed after GH-13016 is merged + // END: code to be removed after GH-13016 is merged if managedDiskID == "" && vhdURI == "" && strings.EqualFold(string(osDisk.CreateOption), string(compute.Attach)) { return nil, fmt.Errorf("[ERROR] Must specify `vhd_uri` or `managed_disk_id` to attach") } diff --git a/azurerm/internal/services/compute/resource_arm_virtual_machine_scale_set.go b/azurerm/internal/services/compute/resource_arm_virtual_machine_scale_set.go index a8dfb62e97e04..66f917584d8c9 100644 --- a/azurerm/internal/services/compute/resource_arm_virtual_machine_scale_set.go +++ b/azurerm/internal/services/compute/resource_arm_virtual_machine_scale_set.go @@ -292,7 +292,7 @@ func resourceArmVirtualMachineScaleSet() *schema.Resource { }, }, - //lintignore:S018 + // lintignore:S018 "os_profile_windows_config": { Type: schema.TypeSet, Optional: true, @@ -353,7 +353,7 @@ func resourceArmVirtualMachineScaleSet() *schema.Resource { Set: resourceArmVirtualMachineScaleSetOsProfileWindowsConfigHash, }, - //lintignore:S018 + // lintignore:S018 "os_profile_linux_config": { Type: schema.TypeSet, Optional: true, @@ -388,7 +388,7 @@ func resourceArmVirtualMachineScaleSet() *schema.Resource { Set: resourceArmVirtualMachineScaleSetOsProfileLinuxConfigHash, }, - //lintignore:S018 + // lintignore:S018 "network_profile": { Type: schema.TypeSet, Required: true, @@ -547,7 +547,7 @@ func resourceArmVirtualMachineScaleSet() *schema.Resource { }, }, - //lintignore:S018 + // lintignore:S018 "storage_profile_os_disk": { Type: schema.TypeSet, Required: true, @@ -645,7 +645,7 @@ func resourceArmVirtualMachineScaleSet() *schema.Resource { }, }, - //lintignore:S018 + // lintignore:S018 "storage_profile_image_reference": { Type: schema.TypeSet, Optional: true, @@ -682,7 +682,7 @@ func resourceArmVirtualMachineScaleSet() *schema.Resource { Set: resourceArmVirtualMachineScaleSetStorageProfileImageReferenceHash, }, - //lintignore:S018 + // lintignore:S018 "plan": { Type: schema.TypeSet, Optional: true, @@ -707,7 +707,7 @@ func resourceArmVirtualMachineScaleSet() *schema.Resource { }, }, - //lintignore:S018 + // lintignore:S018 "extension": { Type: schema.TypeSet, Optional: true, @@ -2048,7 +2048,7 @@ func expandAzureRMVirtualMachineScaleSetsStorageProfileOsDisk(d *schema.Resource osDisk.ManagedDisk = managedDisk } - //BEGIN: code to be removed after GH-13016 is merged + // BEGIN: code to be removed after GH-13016 is merged if image != "" && managedDiskType != "" { return nil, fmt.Errorf("[ERROR] Conflict between `image` and `managed_disk_type` on `storage_profile_os_disk` (only one or the other can be used)") } @@ -2056,7 +2056,7 @@ func expandAzureRMVirtualMachineScaleSetsStorageProfileOsDisk(d *schema.Resource if len(vhd_containers) > 0 && managedDiskType != "" { return nil, fmt.Errorf("[ERROR] Conflict between `vhd_containers` and `managed_disk_type` on `storage_profile_os_disk` (only one or the other can be used)") } - //END: code to be removed after GH-13016 is merged + // END: code to be removed after GH-13016 is merged return osDisk, nil } diff --git a/azurerm/internal/services/compute/ssh_keys.go b/azurerm/internal/services/compute/ssh_keys.go index 78e34ada7e223..9f12ff850435f 100644 --- a/azurerm/internal/services/compute/ssh_keys.go +++ b/azurerm/internal/services/compute/ssh_keys.go @@ -143,7 +143,7 @@ func ValidateSSHKey(i interface{}, k string) (warnings []string, errors []error) if pubKey.Type() != ssh.KeyAlgoRSA { return nil, []error{fmt.Errorf("Error - only ssh-rsa keys with 2048 bits or higher are supported by Azure")} } else { - //check length - held at bytes 20 and 21 for ssh-rsa + // check length - held at bytes 20 and 21 for ssh-rsa sizeRaw := []byte{byteStr[20], byteStr[21]} sizeDec := binary.BigEndian.Uint16(sizeRaw) if sizeDec < 257 { diff --git a/azurerm/internal/services/compute/tests/resource_arm_image_test.go b/azurerm/internal/services/compute/tests/resource_arm_image_test.go index c4ba7978be2ab..8a1cfe7ca04dc 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_image_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_image_test.go @@ -34,7 +34,7 @@ func TestAccAzureRMImage_standaloneImage(t *testing.T) { CheckDestroy: testCheckAzureRMImageDestroy, Steps: []resource.TestStep{ { - //need to create a vm and then reference it in the image creation + // need to create a vm and then reference it in the image creation Config: testAccAzureRMImage_standaloneImage_setup(data, userName, password, hostName, "LRS"), Destroy: false, Check: resource.ComposeTestCheckFunc( @@ -67,7 +67,7 @@ func TestAccAzureRMImage_standaloneImage_hyperVGeneration_V2(t *testing.T) { CheckDestroy: testCheckAzureRMImageDestroy, Steps: []resource.TestStep{ { - //need to create a vm and then reference it in the image creation + // need to create a vm and then reference it in the image creation Config: testAccAzureRMImage_standaloneImage_setup(data, userName, password, hostName, "LRS"), Destroy: false, Check: resource.ComposeTestCheckFunc( @@ -100,7 +100,7 @@ func TestAccAzureRMImage_standaloneImageZoneRedundant(t *testing.T) { CheckDestroy: testCheckAzureRMImageDestroy, Steps: []resource.TestStep{ { - //need to create a vm and then reference it in the image creation + // need to create a vm and then reference it in the image creation Config: testAccAzureRMImage_standaloneImage_setup(data, userName, password, hostName, "ZRS"), Destroy: false, Check: resource.ComposeTestCheckFunc( @@ -139,7 +139,7 @@ func TestAccAzureRMImage_requiresImport(t *testing.T) { CheckDestroy: testCheckAzureRMImageDestroy, Steps: []resource.TestStep{ { - //need to create a vm and then reference it in the image creation + // need to create a vm and then reference it in the image creation Config: testAccAzureRMImage_standaloneImage_setup(data, userName, password, hostName, "LRS"), Destroy: false, Check: resource.ComposeTestCheckFunc( @@ -176,7 +176,7 @@ func TestAccAzureRMImage_customImageVMFromVHD(t *testing.T) { CheckDestroy: testCheckAzureRMImageDestroy, Steps: []resource.TestStep{ { - //need to create a vm and then reference it in the image creation + // need to create a vm and then reference it in the image creation Config: testAccAzureRMImage_customImage_fromVHD_setup(data, userName, password, hostName, data.Locations.Primary), Destroy: false, Check: resource.ComposeTestCheckFunc( @@ -209,7 +209,7 @@ func TestAccAzureRMImage_customImageVMFromVM(t *testing.T) { CheckDestroy: testCheckAzureRMImageDestroy, Steps: []resource.TestStep{ { - //need to create a vm and then reference it in the image creation + // need to create a vm and then reference it in the image creation Config: testAccAzureRMImage_customImage_fromVM_sourceVM(data, userName, password, hostName, data.Locations.Primary), Destroy: false, Check: resource.ComposeTestCheckFunc( @@ -242,7 +242,7 @@ func TestAccAzureRMImageVMSS_customImageVMSSFromVHD(t *testing.T) { CheckDestroy: testCheckAzureRMImageDestroy, Steps: []resource.TestStep{ { - //need to create a vm and then reference it in the image creation + // need to create a vm and then reference it in the image creation Config: testAccAzureRMImageVMSS_customImage_fromVHD_setup(data, userName, password, hostName, data.Locations.Primary), Destroy: false, Check: resource.ComposeTestCheckFunc( @@ -334,7 +334,7 @@ func testGeneralizeVMImage(resourceGroup string, vmName string, userName string, } func deprovisionVM(userName string, password string, hostName string, port string) error { - //SSH into the machine and execute a waagent deprovisioning command + // SSH into the machine and execute a waagent deprovisioning command var b bytes.Buffer cmd := "sudo waagent -verbose -deprovision+user -force" diff --git a/azurerm/internal/services/compute/tests/resource_arm_managed_disk_test.go b/azurerm/internal/services/compute/tests/resource_arm_managed_disk_test.go index 0255bd4a670bf..9bad68ae13112 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_managed_disk_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_managed_disk_test.go @@ -92,7 +92,7 @@ func TestAccAzureRMManagedDisk_import(t *testing.T) { CheckDestroy: testCheckAzureRMManagedDiskDestroy, Steps: []resource.TestStep{ { - //need to create a vm and then delete it so we can use the vhd to test import + // need to create a vm and then delete it so we can use the vhd to test import Config: testAccAzureRMVirtualMachine_basicLinuxMachine(data), Destroy: false, ExpectNonEmptyPlan: true, diff --git a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go index e89202a4a4a0e..caef7bee2bb86 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go @@ -2259,7 +2259,7 @@ func testGetAzureRMVirtualMachineManagedDisk(managedDiskID *string) (*compute.Di resourceGroup := armID.ResourceGroup d, err := client.Get(ctx, resourceGroup, name) - //check status first since sdk client returns error if not 200 + // check status first since sdk client returns error if not 200 if d.Response.StatusCode == http.StatusNotFound { return &d, nil } diff --git a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_scale_set_test.go b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_scale_set_test.go index 09a59eb5d80b0..477e4d4b49c2f 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_scale_set_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_scale_set_test.go @@ -587,7 +587,7 @@ func TestAccAzureRMVirtualMachineScaleSet_customImage(t *testing.T) { CheckDestroy: testCheckAzureRMVirtualMachineScaleSetDestroy, Steps: []resource.TestStep{ { - //need to create a vm and then reference it in the image creation + // need to create a vm and then reference it in the image creation Config: testAccAzureRMImage_standaloneImage_setup(data, userName, password, hostName, "LRS"), Destroy: false, Check: resource.ComposeTestCheckFunc( diff --git a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_unmanaged_disks_test.go b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_unmanaged_disks_test.go index b29fa520cd019..7b290eea00a1c 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_unmanaged_disks_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_unmanaged_disks_test.go @@ -187,8 +187,8 @@ func TestAccAzureRMVirtualMachine_tags(t *testing.T) { }) } -//This is a regression test around https://github.com/hashicorp/terraform/issues/6517 -//Because we use CreateUpdate, we were sending an empty password on update requests +// This is a regression test around https://github.com/hashicorp/terraform/issues/6517 +// Because we use CreateUpdate, we were sending an empty password on update requests func TestAccAzureRMVirtualMachine_updateMachineSize(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_virtual_machine", "test") diff --git a/azurerm/internal/services/compute/validation_test.go b/azurerm/internal/services/compute/validation_test.go index 0eb577a0b0f22..38990854633a8 100644 --- a/azurerm/internal/services/compute/validation_test.go +++ b/azurerm/internal/services/compute/validation_test.go @@ -149,7 +149,7 @@ func TestValidateDiskEncryptionSetName(t *testing.T) { expected: false, }, { - //basic example + // basic example input: "hello", expected: true, }, diff --git a/azurerm/internal/services/compute/windows_virtual_machine_resource.go b/azurerm/internal/services/compute/windows_virtual_machine_resource.go index 2da51519cb9d4..2b2c8dd404b83 100644 --- a/azurerm/internal/services/compute/windows_virtual_machine_resource.go +++ b/azurerm/internal/services/compute/windows_virtual_machine_resource.go @@ -72,7 +72,7 @@ func resourceWindowsVirtualMachine() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: validate.NoEmptyStrings, + ValidateFunc: validation.StringIsNotEmpty, }, "network_interface_ids": { @@ -90,7 +90,7 @@ func resourceWindowsVirtualMachine() *schema.Resource { "size": { Type: schema.TypeString, Required: true, - ValidateFunc: validate.NoEmptyStrings, + ValidateFunc: validation.StringIsNotEmpty, }, // Optional diff --git a/azurerm/internal/services/containers/kubernetes_nodepool.go b/azurerm/internal/services/containers/kubernetes_nodepool.go index d7a63d3699a44..6fcc5d9838782 100644 --- a/azurerm/internal/services/containers/kubernetes_nodepool.go +++ b/azurerm/internal/services/containers/kubernetes_nodepool.go @@ -161,7 +161,7 @@ func ExpandDefaultNodePool(d *schema.ResourceData) (*[]containerservice.ManagedC // Windows agents can be configured via the separate node pool resource OsType: containerservice.Linux, - //// TODO: support these in time + // // TODO: support these in time // OrchestratorVersion: nil, // ScaleSetEvictionPolicy: "", // ScaleSetPriority: "", diff --git a/azurerm/internal/services/containers/resource_arm_container_group.go b/azurerm/internal/services/containers/resource_arm_container_group.go index 423a9cabc7d5a..76b64aa84429b 100644 --- a/azurerm/internal/services/containers/resource_arm_container_group.go +++ b/azurerm/internal/services/containers/resource_arm_container_group.go @@ -1040,7 +1040,7 @@ func flattenContainerImageRegistryCredentials(d *schema.ResourceData, input *[]c } func flattenContainerGroupContainers(d *schema.ResourceData, containers *[]containerinstance.Container, ipAddress *containerinstance.IPAddress, containerGroupVolumes *[]containerinstance.Volume) []interface{} { - //map old container names to index so we can look up things up + // map old container names to index so we can look up things up nameIndexMap := map[string]int{} for i, c := range d.Get("container").([]interface{}) { cfg := c.(map[string]interface{}) @@ -1049,10 +1049,10 @@ func flattenContainerGroupContainers(d *schema.ResourceData, containers *[]conta containerCfg := make([]interface{}, 0, len(*containers)) for _, container := range *containers { - //TODO fix this crash point + // TODO fix this crash point name := *container.Name - //get index from name + // get index from name index := nameIndexMap[name] containerConfig := make(map[string]interface{}) diff --git a/azurerm/internal/services/containers/resource_arm_container_registry.go b/azurerm/internal/services/containers/resource_arm_container_registry.go index dda7a150e6ee0..3addd1c8b9100 100644 --- a/azurerm/internal/services/containers/resource_arm_container_registry.go +++ b/azurerm/internal/services/containers/resource_arm_container_registry.go @@ -642,7 +642,7 @@ func flattenNetworkRuleSet(networkRuleSet *containerregistry.NetworkRuleSet) []i value := make(map[string]interface{}) value["action"] = string(ipRule.Action) - //When a /32 CIDR is passed as an ip rule, Azure will drop the /32 leading to the resource wanting to be re-created next run + // When a /32 CIDR is passed as an ip rule, Azure will drop the /32 leading to the resource wanting to be re-created next run if !strings.Contains(*ipRule.IPAddressOrRange, "/") { *ipRule.IPAddressOrRange += "/32" } diff --git a/azurerm/internal/services/cosmos/data_source_cosmos_db_account.go b/azurerm/internal/services/cosmos/data_source_cosmos_db_account.go index 43ddda9aa9296..15f202d0b0114 100644 --- a/azurerm/internal/services/cosmos/data_source_cosmos_db_account.go +++ b/azurerm/internal/services/cosmos/data_source_cosmos_db_account.go @@ -222,7 +222,7 @@ func dataSourceArmCosmosDbAccountRead(d *schema.ResourceData, meta interface{}) return fmt.Errorf("Error setting `consistency_policy`: %+v", err) } - //sort `geo_locations` by fail over priority + // sort `geo_locations` by fail over priority locations := make([]map[string]interface{}, len(*props.FailoverPolicies)) for _, l := range *props.FailoverPolicies { locations[*l.FailoverPriority] = map[string]interface{}{ diff --git a/azurerm/internal/services/cosmos/resource_arm_cosmosdb_account.go b/azurerm/internal/services/cosmos/resource_arm_cosmosdb_account.go index cf632b22bdc6a..19937b1af49ca 100644 --- a/azurerm/internal/services/cosmos/resource_arm_cosmosdb_account.go +++ b/azurerm/internal/services/cosmos/resource_arm_cosmosdb_account.go @@ -57,7 +57,7 @@ func resourceArmCosmosDbAccount() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), - //resource fields + // resource fields "offer_type": { Type: schema.TypeString, Required: true, @@ -215,7 +215,7 @@ func resourceArmCosmosDbAccount() *schema.Resource { Default: false, }, - //computed + // computed "endpoint": { Type: schema.TypeString, Computed: true, @@ -370,7 +370,7 @@ func resourceArmCosmosDbAccountUpdate(d *schema.ResourceData, meta interface{}) defer cancel() log.Printf("[INFO] preparing arguments for AzureRM Cosmos DB Account update.") - //move to function + // move to function name := d.Get("name").(string) location := d.Get("location").(string) resourceGroup := d.Get("resource_group_name").(string) @@ -388,7 +388,7 @@ func resourceArmCosmosDbAccountUpdate(d *schema.ResourceData, meta interface{}) return fmt.Errorf("Error expanding CosmosDB Account %q (Resource Group %q) geo locations: %+v", name, resourceGroup, err) } - //get existing locations (if exists) + // get existing locations (if exists) resp, err := client.Get(ctx, resourceGroup, name) if err != nil { return fmt.Errorf("Error making Read request on AzureRM CosmosDB Account '%s': %s", name, err) @@ -407,8 +407,8 @@ func resourceArmCosmosDbAccountUpdate(d *schema.ResourceData, meta interface{}) oldLocationsMap[azure.NormalizeLocation(*location.LocationName)] = location } - //cannot update properties and add/remove replication locations at the same time - //so first just update any changed properties + // cannot update properties and add/remove replication locations at the same time + // so first just update any changed properties account := documentdb.DatabaseAccountCreateUpdateParameters{ Location: utils.String(location), Kind: documentdb.DatabaseAccountKind(kind), @@ -430,7 +430,7 @@ func resourceArmCosmosDbAccountUpdate(d *schema.ResourceData, meta interface{}) return fmt.Errorf("Error updating CosmosDB Account %q properties (Resource Group %q): %+v", name, resourceGroup, err) } - //determine if any locations have been renamed/priority reordered and remove them + // determine if any locations have been renamed/priority reordered and remove them removedOne := false for _, l := range newLocations { if ol, ok := oldLocationsMap[*l.LocationName]; ok { @@ -467,7 +467,7 @@ func resourceArmCosmosDbAccountUpdate(d *schema.ResourceData, meta interface{}) } } - //add any new/renamed locations + // add any new/renamed locations account.DatabaseAccountCreateUpdateProperties.Locations = &newLocations upsertResponse, err := resourceArmCosmosDbAccountApiUpsert(client, ctx, resourceGroup, name, account, d) if err != nil { @@ -646,7 +646,7 @@ func resourceArmCosmosDbAccountDelete(d *schema.ResourceData, meta interface{}) return fmt.Errorf("Error issuing AzureRM delete request for CosmosDB Account '%s': %+v", name, err) } - //the SDK now will return a `WasNotFound` response even when still deleting + // the SDK now will return a `WasNotFound` response even when still deleting stateConf := &resource.StateChangeConf{ Pending: []string{"Deleting"}, Target: []string{"NotFound"}, @@ -682,7 +682,7 @@ func resourceArmCosmosDbAccountApiUpsert(client *documentdb.DatabaseAccountsClie return nil, fmt.Errorf("Error waiting for the CosmosDB Account %q (Resource Group %q) to finish creating/updating: %+v", name, resourceGroup, err) } - //if a replication location is added or removed it can take some time to provision + // if a replication location is added or removed it can take some time to provision stateConf := &resource.StateChangeConf{ Pending: []string{"Creating", "Updating", "Deleting", "Initializing"}, Target: []string{"Succeeded"}, @@ -697,7 +697,7 @@ func resourceArmCosmosDbAccountApiUpsert(client *documentdb.DatabaseAccountsClie status := "Succeeded" for _, l := range append(*resp.ReadLocations, *resp.WriteLocations...) { if status = *l.ProvisioningState; status == "Creating" || status == "Updating" || status == "Deleting" { - break //return the first non successful status. + break // return the first non successful status. } } @@ -766,7 +766,7 @@ func expandAzureRmCosmosDBAccountGeoLocations(databaseName string, d *schema.Res locations = append(locations, location) } - //TODO maybe this should be in a CustomizeDiff + // TODO maybe this should be in a CustomizeDiff // all priorities & locations must be unique byPriorities := make(map[int]interface{}, len(locations)) byName := make(map[string]interface{}, len(locations)) @@ -786,7 +786,7 @@ func expandAzureRmCosmosDBAccountGeoLocations(databaseName string, d *schema.Res byName[name] = location } - //and must have one of 0 priority + // and must have one of 0 priority if _, ok := byPriorities[0]; !ok { return nil, fmt.Errorf("There needs to be a `geo_location` with a failover_priority of 0") } @@ -835,7 +835,7 @@ func flattenAzureRmCosmosDBAccountGeoLocations(d *schema.ResourceData, account d F: resourceAzureRMCosmosDBAccountGeoLocationHash, } - //we need to propagate the `prefix` field so fetch existing + // we need to propagate the `prefix` field so fetch existing prefixMap := map[string]string{} if locations, ok := d.GetOk("geo_location"); ok { for _, lRaw := range locations.(*schema.Set).List() { @@ -852,7 +852,7 @@ func flattenAzureRmCosmosDBAccountGeoLocations(d *schema.ResourceData, account d "failover_priority": int(*l.FailoverPriority), } - //if id is not the default then it must be set via prefix + // if id is not the default then it must be set via prefix if id != resourceArmCosmosDbAccountGenerateDefaultId(d.Get("name").(string), lb["location"].(string)) { lb["prefix"] = id } diff --git a/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go b/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go index 7b83f5c9dfcbe..976153d5688e7 100644 --- a/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go +++ b/azurerm/internal/services/cosmos/tests/resource_arm_cosmosdb_account_test.go @@ -241,7 +241,7 @@ func testAccAzureRMCosmosDBAccount_updateWith(t *testing.T, kind documentdb.Data { Config: testAccAzureRMCosmosDBAccount_basic(data, kind, documentdb.Eventual), Check: resource.ComposeAggregateTestCheckFunc( - //checkAccAzureRMCosmosDBAccount_basic(data, documentdb.Eventual, 1), + // checkAccAzureRMCosmosDBAccount_basic(data, documentdb.Eventual, 1), ), }, data.ImportStep(), diff --git a/azurerm/internal/services/databricks/resource_arm_databricks_workspace.go b/azurerm/internal/services/databricks/resource_arm_databricks_workspace.go index bdffef8b4005a..38a5a1a2d2c5c 100644 --- a/azurerm/internal/services/databricks/resource_arm_databricks_workspace.go +++ b/azurerm/internal/services/databricks/resource_arm_databricks_workspace.go @@ -149,7 +149,7 @@ func resourceArmDatabricksWorkspaceCreateUpdate(d *schema.ResourceData, meta int expandedTags := tags.Expand(t) if managedResourceGroupName == "" { - //no managed resource group name was provided, we use the default pattern + // no managed resource group name was provided, we use the default pattern log.Printf("[DEBUG][azurerm_databricks_workspace] no managed resource group id was provided, we use the default pattern.") managedResourceGroupID = fmt.Sprintf("/subscriptions/%s/resourceGroups/databricks-rg-%s", subscriptionID, resourceGroup) } else { diff --git a/azurerm/internal/services/datafactory/resource_arm_data_factory_trigger_schedule.go b/azurerm/internal/services/datafactory/resource_arm_data_factory_trigger_schedule.go index e6cd3e8d026a6..5f08bfa4ea0ce 100644 --- a/azurerm/internal/services/datafactory/resource_arm_data_factory_trigger_schedule.go +++ b/azurerm/internal/services/datafactory/resource_arm_data_factory_trigger_schedule.go @@ -63,7 +63,7 @@ func resourceArmDataFactoryTriggerSchedule() *schema.Resource { Optional: true, Computed: true, DiffSuppressFunc: suppress.RFC3339Time, - ValidateFunc: validate.RFC3339Time, //times in the past just start immediately + ValidateFunc: validation.IsRFC3339Time, // times in the past just start immediately }, // This time can only be represented in UTC. @@ -73,7 +73,7 @@ func resourceArmDataFactoryTriggerSchedule() *schema.Resource { Type: schema.TypeString, Optional: true, DiffSuppressFunc: suppress.RFC3339Time, - ValidateFunc: validate.RFC3339Time, //times in the past just start immediately + ValidateFunc: validation.IsRFC3339Time, // times in the past just start immediately }, "frequency": { @@ -154,14 +154,14 @@ func resourceArmDataFactoryTriggerScheduleCreateUpdate(d *schema.ResourceData, m } if v, ok := d.GetOk("start_time"); ok { - t, _ := time.Parse(time.RFC3339, v.(string)) //should be validated by the schema + t, _ := time.Parse(time.RFC3339, v.(string)) // should be validated by the schema props.Recurrence.StartTime = &date.Time{Time: t} } else { props.Recurrence.StartTime = &date.Time{Time: time.Now()} } if v, ok := d.GetOk("end_time"); ok { - t, _ := time.Parse(time.RFC3339, v.(string)) //should be validated by the schema + t, _ := time.Parse(time.RFC3339, v.(string)) // should be validated by the schema props.Recurrence.EndTime = &date.Time{Time: t} } diff --git a/azurerm/internal/services/datalake/tests/resource_arm_data_lake_store_file_test.go b/azurerm/internal/services/datalake/tests/resource_arm_data_lake_store_file_test.go index 6dc5c1722c0e2..4a5660e44e878 100644 --- a/azurerm/internal/services/datalake/tests/resource_arm_data_lake_store_file_test.go +++ b/azurerm/internal/services/datalake/tests/resource_arm_data_lake_store_file_test.go @@ -63,10 +63,10 @@ func TestAccAzureRMDataLakeStoreFile_basic(t *testing.T) { func TestAccAzureRMDataLakeStoreFile_largefiles(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_data_lake_store_file", "test") - //"large" in this context is anything greater than 4 megabytes - largeSize := 12 * 1024 * 1024 //12 mb + // "large" in this context is anything greater than 4 megabytes + largeSize := 12 * 1024 * 1024 // 12 mb bytes := make([]byte, largeSize) - rand.Read(bytes) //fill with random data + rand.Read(bytes) // fill with random data tmpfile, err := ioutil.TempFile("", "azurerm-acc-datalake-file-large") if err != nil { diff --git a/azurerm/internal/services/eventhub/resource_arm_eventhub_namespace_authorization_rule.go b/azurerm/internal/services/eventhub/resource_arm_eventhub_namespace_authorization_rule.go index b1e96d35f049a..7ae9a036c6c56 100644 --- a/azurerm/internal/services/eventhub/resource_arm_eventhub_namespace_authorization_rule.go +++ b/azurerm/internal/services/eventhub/resource_arm_eventhub_namespace_authorization_rule.go @@ -115,7 +115,7 @@ func resourceArmEventHubNamespaceAuthorizationRuleRead(d *schema.ResourceData, m return err } - name := id.Path["AuthorizationRules"] //this is different then eventhub where its authorizationRules + name := id.Path["AuthorizationRules"] // this is different then eventhub where its authorizationRules resourceGroup := id.ResourceGroup namespaceName := id.Path["namespaces"] @@ -162,7 +162,7 @@ func resourceArmEventHubNamespaceAuthorizationRuleDelete(d *schema.ResourceData, return err } - name := id.Path["AuthorizationRules"] //this is different then eventhub where its authorizationRules + name := id.Path["AuthorizationRules"] // this is different then eventhub where its authorizationRules resourceGroup := id.ResourceGroup namespaceName := id.Path["namespaces"] diff --git a/azurerm/internal/services/healthcare/tests/resource_arm_healthcare_service_test.go b/azurerm/internal/services/healthcare/tests/resource_arm_healthcare_service_test.go index d3b8d17acbf33..6537bd4ba65c0 100644 --- a/azurerm/internal/services/healthcare/tests/resource_arm_healthcare_service_test.go +++ b/azurerm/internal/services/healthcare/tests/resource_arm_healthcare_service_test.go @@ -156,7 +156,7 @@ resource "azurerm_healthcare_service" "test" { data.azurerm_client_config.current.object_id, ] } -`, data.RandomInteger, location, data.RandomIntOfLength(17)) //name can only be 24 chars long +`, data.RandomInteger, location, data.RandomIntOfLength(17)) // name can only be 24 chars long } func testAccAzureRMHealthCareService_requiresImport(data acceptance.TestData) string { @@ -221,5 +221,5 @@ resource "azurerm_healthcare_service" "test" { allow_credentials = true } } -`, data.RandomInteger, location, data.RandomIntOfLength(17)) //name can only be 24 chars long +`, data.RandomInteger, location, data.RandomIntOfLength(17)) // name can only be 24 chars long } diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault_certificate.go b/azurerm/internal/services/keyvault/resource_arm_key_vault_certificate.go index 7de47dd8431ee..83068b44f346d 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault_certificate.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault_certificate.go @@ -23,7 +23,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -//todo refactor and find a home for this wayward func +// todo refactor and find a home for this wayward func func resourceArmKeyVaultChildResourceImporter(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { client := meta.(*clients.Client).KeyVault.VaultsClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go b/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go index 74f87464b3a87..339960f390a33 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault_key.go @@ -12,7 +12,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" @@ -113,13 +112,13 @@ func resourceArmKeyVaultKey() *schema.Resource { "not_before_date": { Type: schema.TypeString, Optional: true, - ValidateFunc: validate.RFC3339Time, + ValidateFunc: validation.IsRFC3339Time, }, "expiration_date": { Type: schema.TypeString, Optional: true, - ValidateFunc: validate.RFC3339Time, + ValidateFunc: validation.IsRFC3339Time, }, // Computed @@ -211,13 +210,13 @@ func resourceArmKeyVaultKeyCreate(d *schema.ResourceData, meta interface{}) erro // https://github.com/Azure/azure-rest-api-specs/issues/1739#issuecomment-332236257 if v, ok := d.GetOk("not_before_date"); ok { - notBeforeDate, _ := time.Parse(time.RFC3339, v.(string)) //validated by schema + notBeforeDate, _ := time.Parse(time.RFC3339, v.(string)) // validated by schema notBeforeUnixTime := date.UnixTime(notBeforeDate) parameters.KeyAttributes.NotBefore = ¬BeforeUnixTime } if v, ok := d.GetOk("expiration_date"); ok { - expirationDate, _ := time.Parse(time.RFC3339, v.(string)) //validated by schema + expirationDate, _ := time.Parse(time.RFC3339, v.(string)) // validated by schema expirationUnixTime := date.UnixTime(expirationDate) parameters.KeyAttributes.Expires = &expirationUnixTime } @@ -278,13 +277,13 @@ func resourceArmKeyVaultKeyUpdate(d *schema.ResourceData, meta interface{}) erro } if v, ok := d.GetOk("not_before_date"); ok { - notBeforeDate, _ := time.Parse(time.RFC3339, v.(string)) //validated by schema + notBeforeDate, _ := time.Parse(time.RFC3339, v.(string)) // validated by schema notBeforeUnixTime := date.UnixTime(notBeforeDate) parameters.KeyAttributes.NotBefore = ¬BeforeUnixTime } if v, ok := d.GetOk("expiration_date"); ok { - expirationDate, _ := time.Parse(time.RFC3339, v.(string)) //validated by schema + expirationDate, _ := time.Parse(time.RFC3339, v.(string)) // validated by schema expirationUnixTime := date.UnixTime(expirationDate) parameters.KeyAttributes.Expires = &expirationUnixTime } diff --git a/azurerm/internal/services/keyvault/resource_arm_key_vault_secret.go b/azurerm/internal/services/keyvault/resource_arm_key_vault_secret.go index 7e4508bfca17b..76342089bc897 100644 --- a/azurerm/internal/services/keyvault/resource_arm_key_vault_secret.go +++ b/azurerm/internal/services/keyvault/resource_arm_key_vault_secret.go @@ -8,9 +8,9 @@ import ( "github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault" "github.com/Azure/go-autorest/autorest/date" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" @@ -64,13 +64,13 @@ func resourceArmKeyVaultSecret() *schema.Resource { "not_before_date": { Type: schema.TypeString, Optional: true, - ValidateFunc: validate.RFC3339Time, + ValidateFunc: validation.IsRFC3339Time, }, "expiration_date": { Type: schema.TypeString, Optional: true, - ValidateFunc: validate.RFC3339Time, + ValidateFunc: validation.IsRFC3339Time, }, "version": { @@ -124,13 +124,13 @@ func resourceArmKeyVaultSecretCreate(d *schema.ResourceData, meta interface{}) e } if v, ok := d.GetOk("not_before_date"); ok { - notBeforeDate, _ := time.Parse(time.RFC3339, v.(string)) //validated by schema + notBeforeDate, _ := time.Parse(time.RFC3339, v.(string)) // validated by schema notBeforeUnixTime := date.UnixTime(notBeforeDate) parameters.SecretAttributes.NotBefore = ¬BeforeUnixTime } if v, ok := d.GetOk("expiration_date"); ok { - expirationDate, _ := time.Parse(time.RFC3339, v.(string)) //validated by schema + expirationDate, _ := time.Parse(time.RFC3339, v.(string)) // validated by schema expirationUnixTime := date.UnixTime(expirationDate) parameters.SecretAttributes.Expires = &expirationUnixTime } @@ -190,13 +190,13 @@ func resourceArmKeyVaultSecretUpdate(d *schema.ResourceData, meta interface{}) e secretAttributes := &keyvault.SecretAttributes{} if v, ok := d.GetOk("not_before_date"); ok { - notBeforeDate, _ := time.Parse(time.RFC3339, v.(string)) //validated by schema + notBeforeDate, _ := time.Parse(time.RFC3339, v.(string)) // validated by schema notBeforeUnixTime := date.UnixTime(notBeforeDate) secretAttributes.NotBefore = ¬BeforeUnixTime } if v, ok := d.GetOk("expiration_date"); ok { - expirationDate, _ := time.Parse(time.RFC3339, v.(string)) //validated by schema + expirationDate, _ := time.Parse(time.RFC3339, v.(string)) // validated by schema expirationUnixTime := date.UnixTime(expirationDate) secretAttributes.Expires = &expirationUnixTime } diff --git a/azurerm/internal/services/logic/resource_arm_logic_app_trigger_recurrence.go b/azurerm/internal/services/logic/resource_arm_logic_app_trigger_recurrence.go index c9ad22c308b34..1982867c7cc56 100644 --- a/azurerm/internal/services/logic/resource_arm_logic_app_trigger_recurrence.go +++ b/azurerm/internal/services/logic/resource_arm_logic_app_trigger_recurrence.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" ) func resourceArmLogicAppTriggerRecurrence() *schema.Resource { @@ -64,7 +63,7 @@ func resourceArmLogicAppTriggerRecurrence() *schema.Resource { "start_time": { Type: schema.TypeString, Optional: true, - ValidateFunc: validate.RFC3339Time, + ValidateFunc: validation.IsRFC3339Time, }, }, } diff --git a/azurerm/internal/services/mariadb/resource_arm_mariadb_virtual_network_rule.go b/azurerm/internal/services/mariadb/resource_arm_mariadb_virtual_network_rule.go index 0a07e309edb10..d59179d23a91e 100644 --- a/azurerm/internal/services/mariadb/resource_arm_mariadb_virtual_network_rule.go +++ b/azurerm/internal/services/mariadb/resource_arm_mariadb_virtual_network_rule.go @@ -138,7 +138,7 @@ func resourceArmMariaDbVirtualNetworkRuleCreateUpdate(d *schema.ResourceData, me return fmt.Errorf("Error creating MariaDb Virtual Network Rule %q (MariaDb Server: %q, Resource Group: %q): %+v", name, serverName, resourceGroup, err) } - //Wait for the provisioning state to become ready + // Wait for the provisioning state to become ready log.Printf("[DEBUG] Waiting for MariaDb Virtual Network Rule %q (MariaDb Server: %q, Resource Group: %q) to become ready: %+v", name, serverName, resourceGroup, err) stateConf := &resource.StateChangeConf{ Pending: []string{"Initializing", "InProgress", "Unknown", "ResponseNotFound"}, @@ -253,7 +253,7 @@ func mariaDbVirtualNetworkStateStatusCodeRefreshFunc(ctx context.Context, client return resp, string(props.State), nil } - //Valid response was returned but VirtualNetworkRuleProperties was nil. Basically the rule exists, but with no properties for some reason. Assume Unknown instead of returning error. + // Valid response was returned but VirtualNetworkRuleProperties was nil. Basically the rule exists, but with no properties for some reason. Assume Unknown instead of returning error. log.Printf("[DEBUG] Retrieving MariaDb Virtual Network Rule %q (MariaDb Server: %q, Resource Group: %q) returned empty VirtualNetworkRuleProperties", resourceGroup, serverName, name) return resp, "Unknown", nil } diff --git a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_virtual_network_rule_test.go b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_virtual_network_rule_test.go index 24a82d3d803aa..a84a79dbf277c 100644 --- a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_virtual_network_rule_test.go +++ b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_virtual_network_rule_test.go @@ -63,8 +63,8 @@ func TestAccAzureRMMariaDBVirtualNetworkRule_switchSubnets(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_mariadb_virtual_network_rule", "test") // Create regex strings that will ensure that one subnet name exists, but not the other - preConfigRegex := regexp.MustCompile(fmt.Sprintf("(subnet1%d)$|(subnet[^2]%d)$", data.RandomInteger, data.RandomInteger)) //subnet 1 but not 2 - postConfigRegex := regexp.MustCompile(fmt.Sprintf("(subnet2%d)$|(subnet[^1]%d)$", data.RandomInteger, data.RandomInteger)) //subnet 2 but not 1 + preConfigRegex := regexp.MustCompile(fmt.Sprintf("(subnet1%d)$|(subnet[^2]%d)$", data.RandomInteger, data.RandomInteger)) // subnet 1 but not 2 + postConfigRegex := regexp.MustCompile(fmt.Sprintf("(subnet2%d)$|(subnet[^1]%d)$", data.RandomInteger, data.RandomInteger)) // subnet 2 but not 1 resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -203,8 +203,8 @@ func testCheckAzureRMMariaDBVirtualNetworkRuleDisappears(resourceName string) re future, err := client.Delete(ctx, resourceGroup, serverName, ruleName) if err != nil { - //If the error is that the resource we want to delete does not exist in the first - //place (404), then just return with no error. + // If the error is that the resource we want to delete does not exist in the first + // place (404), then just return with no error. if response.WasNotFound(future.Response()) { return nil } @@ -213,7 +213,7 @@ func testCheckAzureRMMariaDBVirtualNetworkRuleDisappears(resourceName string) re } if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - //Same deal as before. Just in case. + // Same deal as before. Just in case. if response.WasNotFound(future.Response()) { return nil } diff --git a/azurerm/internal/services/media/resource_arm_media_services_account.go b/azurerm/internal/services/media/resource_arm_media_services_account.go index 9d3b9992b152d..95421fa25d500 100644 --- a/azurerm/internal/services/media/resource_arm_media_services_account.go +++ b/azurerm/internal/services/media/resource_arm_media_services_account.go @@ -74,7 +74,7 @@ func resourceArmMediaServicesAccount() *schema.Resource { // TODO: support Tags when this bug is fixed: // https://github.com/Azure/azure-rest-api-specs/issues/5249 - //"tags": tags.Schema(), + // "tags": tags.Schema(), }, } } diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_autoscale_setting.go b/azurerm/internal/services/monitor/resource_arm_monitor_autoscale_setting.go index 202c588e644ac..b667882eb0200 100644 --- a/azurerm/internal/services/monitor/resource_arm_monitor_autoscale_setting.go +++ b/azurerm/internal/services/monitor/resource_arm_monitor_autoscale_setting.go @@ -230,12 +230,12 @@ func resourceArmMonitorAutoScaleSetting() *schema.Resource { "start": { Type: schema.TypeString, Required: true, - ValidateFunc: validate.RFC3339Time, + ValidateFunc: validation.IsRFC3339Time, }, "end": { Type: schema.TypeString, Required: true, - ValidateFunc: validate.RFC3339Time, + ValidateFunc: validation.IsRFC3339Time, }, }, }, diff --git a/azurerm/internal/services/monitor/resource_arm_monitor_metric_alert.go b/azurerm/internal/services/monitor/resource_arm_monitor_metric_alert.go index c9eed84502a38..8ecd89efb760b 100644 --- a/azurerm/internal/services/monitor/resource_arm_monitor_metric_alert.go +++ b/azurerm/internal/services/monitor/resource_arm_monitor_metric_alert.go @@ -52,7 +52,7 @@ func resourceArmMonitorMetricAlert() *schema.Resource { // Issue to track: https://github.com/Azure/azure-sdk-for-go/issues/2920 // But to prevent potential state migration in the future, let's stick to use Set now - //lintignore:S018 + // lintignore:S018 "scopes": { Type: schema.TypeSet, Required: true, diff --git a/azurerm/internal/services/mysql/resource_arm_mysql_virtual_network_rule.go b/azurerm/internal/services/mysql/resource_arm_mysql_virtual_network_rule.go index 303935da3ec19..21a520afca60e 100644 --- a/azurerm/internal/services/mysql/resource_arm_mysql_virtual_network_rule.go +++ b/azurerm/internal/services/mysql/resource_arm_mysql_virtual_network_rule.go @@ -97,7 +97,7 @@ func resourceArmMySqlVirtualNetworkRuleCreateUpdate(d *schema.ResourceData, meta return fmt.Errorf("Error creating MySQL Virtual Network Rule %q (MySQL Server: %q, Resource Group: %q): %+v", name, serverName, resourceGroup, err) } - //Wait for the provisioning state to become ready + // Wait for the provisioning state to become ready log.Printf("[DEBUG] Waiting for MySQL Virtual Network Rule %q (MySQL Server: %q, Resource Group: %q) to become ready", name, serverName, resourceGroup) stateConf := &resource.StateChangeConf{ Pending: []string{"Initializing", "InProgress", "Unknown", "ResponseNotFound"}, @@ -212,7 +212,7 @@ func mySQLVirtualNetworkStateStatusCodeRefreshFunc(ctx context.Context, client * return resp, string(props.State), nil } - //Valid response was returned but VirtualNetworkRuleProperties was nil. Basically the rule exists, but with no properties for some reason. Assume Unknown instead of returning error. + // Valid response was returned but VirtualNetworkRuleProperties was nil. Basically the rule exists, but with no properties for some reason. Assume Unknown instead of returning error. log.Printf("[DEBUG] Retrieving MySQL Virtual Network Rule %q (MySQL Server: %q, Resource Group: %q) returned empty VirtualNetworkRuleProperties", resourceGroup, serverName, name) return resp, "Unknown", nil } diff --git a/azurerm/internal/services/mysql/tests/resource_arm_mysql_virtual_network_rule_test.go b/azurerm/internal/services/mysql/tests/resource_arm_mysql_virtual_network_rule_test.go index d2403c3ac2ec5..20c05f9e578c3 100644 --- a/azurerm/internal/services/mysql/tests/resource_arm_mysql_virtual_network_rule_test.go +++ b/azurerm/internal/services/mysql/tests/resource_arm_mysql_virtual_network_rule_test.go @@ -82,8 +82,8 @@ func TestAccAzureRMMySqlVirtualNetworkRule_switchSubnets(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_mysql_virtual_network_rule", "test") // Create regex strings that will ensure that one subnet name exists, but not the other - preConfigRegex := regexp.MustCompile(fmt.Sprintf("(subnet1%d)$|(subnet[^2]%d)$", data.RandomInteger, data.RandomInteger)) //subnet 1 but not 2 - postConfigRegex := regexp.MustCompile(fmt.Sprintf("(subnet2%d)$|(subnet[^1]%d)$", data.RandomInteger, data.RandomInteger)) //subnet 2 but not 1 + preConfigRegex := regexp.MustCompile(fmt.Sprintf("(subnet1%d)$|(subnet[^2]%d)$", data.RandomInteger, data.RandomInteger)) // subnet 1 but not 2 + postConfigRegex := regexp.MustCompile(fmt.Sprintf("(subnet2%d)$|(subnet[^1]%d)$", data.RandomInteger, data.RandomInteger)) // subnet 2 but not 1 resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -223,8 +223,8 @@ func testCheckAzureRMMySqlVirtualNetworkRuleDisappears(resourceName string) reso future, err := client.Delete(ctx, resourceGroup, serverName, ruleName) if err != nil { - //If the error is that the resource we want to delete does not exist in the first - //place (404), then just return with no error. + // If the error is that the resource we want to delete does not exist in the first + // place (404), then just return with no error. if response.WasNotFound(future.Response()) { return nil } @@ -233,7 +233,7 @@ func testCheckAzureRMMySqlVirtualNetworkRuleDisappears(resourceName string) reso } if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - //Same deal as before. Just in case. + // Same deal as before. Just in case. if response.WasNotFound(future.Response()) { return nil } diff --git a/azurerm/internal/services/netapp/resource_arm_netapp_volume.go b/azurerm/internal/services/netapp/resource_arm_netapp_volume.go index a1c4fca422f87..b608044c524ea 100644 --- a/azurerm/internal/services/netapp/resource_arm_netapp_volume.go +++ b/azurerm/internal/services/netapp/resource_arm_netapp_volume.go @@ -422,7 +422,7 @@ func flattenArmNetAppVolumeExportPolicyRule(input *netapp.VolumePropertiesExport if v := item.AllowedClients; v != nil { allowedClients = strings.Split(*v, ",") } - //TODO: Start - Remove in next major version + // TODO: Start - Remove in next major version cifsEnabled := false nfsv3Enabled := false nfsv4Enabled := false @@ -432,19 +432,19 @@ func flattenArmNetAppVolumeExportPolicyRule(input *netapp.VolumePropertiesExport if *v { protocolsEnabled = append(protocolsEnabled, "CIFS") } - cifsEnabled = *v //TODO: Remove in next major version + cifsEnabled = *v // TODO: Remove in next major version } if v := item.Nfsv3; v != nil { if *v { protocolsEnabled = append(protocolsEnabled, "NFSv3") } - nfsv3Enabled = *v //TODO: Remove in next major version + nfsv3Enabled = *v // TODO: Remove in next major version } if v := item.Nfsv41; v != nil { if *v { protocolsEnabled = append(protocolsEnabled, "NFSv4.1") } - nfsv4Enabled = *v //TODO: Remove in next major version + nfsv4Enabled = *v // TODO: Remove in next major version } unixReadOnly := false if v := item.UnixReadOnly; v != nil { @@ -461,7 +461,7 @@ func flattenArmNetAppVolumeExportPolicyRule(input *netapp.VolumePropertiesExport "unix_read_only": unixReadOnly, "unix_read_write": unixReadWrite, "protocols_enabled": utils.FlattenStringSlice(&protocolsEnabled), - //TODO: Remove in next major version + // TODO: Remove in next major version "cifs_enabled": cifsEnabled, "nfsv3_enabled": nfsv3Enabled, "nfsv4_enabled": nfsv4Enabled, diff --git a/azurerm/internal/services/network/data_source_public_ip.go b/azurerm/internal/services/network/data_source_public_ip.go index 3d241ea1688da..d808124e50716 100644 --- a/azurerm/internal/services/network/data_source_public_ip.go +++ b/azurerm/internal/services/network/data_source_public_ip.go @@ -99,8 +99,8 @@ func dataSourceArmPublicIPRead(d *schema.ResourceData, meta interface{}) error { d.Set("zones", resp.Zones) - //ensure values are at least set to "", d.Set() is a noop on a nil - //there must be a better way... + // ensure values are at least set to "", d.Set() is a noop on a nil + // there must be a better way... d.Set("location", "") d.Set("sku", "") d.Set("fqdn", "") diff --git a/azurerm/internal/services/network/resource_arm_express_route_gateway.go b/azurerm/internal/services/network/resource_arm_express_route_gateway.go index 43c00367718e1..7414ef94a633e 100644 --- a/azurerm/internal/services/network/resource_arm_express_route_gateway.go +++ b/azurerm/internal/services/network/resource_arm_express_route_gateway.go @@ -11,7 +11,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" @@ -41,7 +40,7 @@ func resourceArmExpressRouteGateway() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: validate.NoEmptyStrings, + ValidateFunc: validation.StringIsNotEmpty, }, "location": azure.SchemaLocation(), diff --git a/azurerm/internal/services/network/resource_arm_network_security_rule.go b/azurerm/internal/services/network/resource_arm_network_security_rule.go index 8ca6e1a092ad2..fe76f486facf3 100644 --- a/azurerm/internal/services/network/resource_arm_network_security_rule.go +++ b/azurerm/internal/services/network/resource_arm_network_security_rule.go @@ -123,7 +123,7 @@ func resourceArmNetworkSecurityRule() *schema.Resource { ConflictsWith: []string{"destination_address_prefix"}, }, - //lintignore:S018 + // lintignore:S018 "source_application_security_group_ids": { Type: schema.TypeSet, MaxItems: 1, @@ -132,7 +132,7 @@ func resourceArmNetworkSecurityRule() *schema.Resource { Set: schema.HashString, }, - //lintignore:S018 + // lintignore:S018 "destination_application_security_group_ids": { Type: schema.TypeSet, MaxItems: 1, diff --git a/azurerm/internal/services/network/resource_arm_private_link_service.go b/azurerm/internal/services/network/resource_arm_private_link_service.go index 23efec6c50d6f..5b686571f5007 100644 --- a/azurerm/internal/services/network/resource_arm_private_link_service.go +++ b/azurerm/internal/services/network/resource_arm_private_link_service.go @@ -56,7 +56,7 @@ func resourceArmPrivateLinkService() *schema.Resource { Optional: true, Elem: &schema.Schema{ Type: schema.TypeString, - ValidateFunc: validate.GUID, + ValidateFunc: validation.IsUUID, }, Set: schema.HashString, }, @@ -71,7 +71,7 @@ func resourceArmPrivateLinkService() *schema.Resource { Optional: true, Elem: &schema.Schema{ Type: schema.TypeString, - ValidateFunc: validate.GUID, + ValidateFunc: validation.IsUUID, }, Set: schema.HashString, }, diff --git a/azurerm/internal/services/network/resource_arm_virtual_network.go b/azurerm/internal/services/network/resource_arm_virtual_network.go index 3b7ce65bf6640..25f761ef7e8b8 100644 --- a/azurerm/internal/services/network/resource_arm_virtual_network.go +++ b/azurerm/internal/services/network/resource_arm_virtual_network.go @@ -297,7 +297,7 @@ func expandVirtualNetworkProperties(ctx context.Context, d *schema.ResourceData, name := subnet["name"].(string) log.Printf("[INFO] setting subnets inside vNet, processing %q", name) - //since subnets can also be created outside of vNet definition (as root objects) + // since subnets can also be created outside of vNet definition (as root objects) // do a GET on subnet properties from the server before setting them resGroup := d.Get("resource_group_name").(string) vnetName := d.Get("name").(string) @@ -310,7 +310,7 @@ func expandVirtualNetworkProperties(ctx context.Context, d *schema.ResourceData, prefix := subnet["address_prefix"].(string) secGroup := subnet["security_group"].(string) - //set the props from config and leave the rest intact + // set the props from config and leave the rest intact subnetObj.Name = &name if subnetObj.SubnetPropertiesFormat == nil { subnetObj.SubnetPropertiesFormat = &network.SubnetPropertiesFormat{} @@ -452,7 +452,7 @@ func getExistingSubnet(ctx context.Context, resGroup string, vnetName string, su if resp.StatusCode == http.StatusNotFound { return &network.Subnet{}, nil } - //raise an error if there was an issue other than 404 in getting subnet properties + // raise an error if there was an issue other than 404 in getting subnet properties return nil, err } diff --git a/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_peering_test.go b/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_peering_test.go index c78e59c373464..c6f5f3b6e088d 100644 --- a/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_peering_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_peering_test.go @@ -29,7 +29,7 @@ func testAccAzureRMExpressRouteCircuitPeering_azurePrivatePeering(t *testing.T) resource.TestCheckResourceAttr(data.ResourceName, "microsoft_peering_config.#", "0"), ), }, - data.ImportStep("shared_key"), //is not returned by the API + data.ImportStep("shared_key"), // is not returned by the API }, }) } @@ -103,7 +103,7 @@ func testAccAzureRMExpressRouteCircuitPeering_azurePrivatePeeringWithCircuitUpda resource.TestCheckResourceAttr(data.ResourceName, "microsoft_peering_config.#", "0"), ), }, - data.ImportStep("shared_key"), //is not returned by the API + data.ImportStep("shared_key"), // is not returned by the API }, }) } diff --git a/azurerm/internal/services/notificationhub/resource_arm_notification_hub.go b/azurerm/internal/services/notificationhub/resource_arm_notification_hub.go index fb8533ea59bb6..3b29b6ad97fd4 100644 --- a/azurerm/internal/services/notificationhub/resource_arm_notification_hub.go +++ b/azurerm/internal/services/notificationhub/resource_arm_notification_hub.go @@ -137,7 +137,7 @@ func resourceArmNotificationHub() *schema.Resource { // NOTE: skipping tags as there's a bug in the API where the Keys for Tags are returned in lower-case // Azure Rest API Specs issue: https://github.com/Azure/azure-sdk-for-go/issues/2239 - //"tags": tags.Schema(), + // "tags": tags.Schema(), }, } } diff --git a/azurerm/internal/services/notificationhub/resource_arm_notification_hub_namespace.go b/azurerm/internal/services/notificationhub/resource_arm_notification_hub_namespace.go index b7f8a05b2580e..894852a5fe277 100644 --- a/azurerm/internal/services/notificationhub/resource_arm_notification_hub_namespace.go +++ b/azurerm/internal/services/notificationhub/resource_arm_notification_hub_namespace.go @@ -80,7 +80,7 @@ func resourceArmNotificationHubNamespace() *schema.Resource { // NOTE: skipping tags as there's a bug in the API where the Keys for Tags are returned in lower-case // Azure Rest API Specs issue: https://github.com/Azure/azure-sdk-for-go/issues/2239 - //"tags": tags.Schema(), + // "tags": tags.Schema(), "servicebus_endpoint": { Type: schema.TypeString, diff --git a/azurerm/internal/services/policy/resource_arm_policy_definition.go b/azurerm/internal/services/policy/resource_arm_policy_definition.go index aa03c8994460c..9d5ff49a7dead 100644 --- a/azurerm/internal/services/policy/resource_arm_policy_definition.go +++ b/azurerm/internal/services/policy/resource_arm_policy_definition.go @@ -334,7 +334,7 @@ func resourceArmPolicyDefinitionImport(d *schema.ResourceData, meta interface{}) return []*schema.ResourceData{d}, nil } - //import a subscription based policy as before + // import a subscription based policy as before return schema.ImportStatePassthrough(d, meta) } diff --git a/azurerm/internal/services/postgres/resource_arm_postgresql_virtual_network_rule.go b/azurerm/internal/services/postgres/resource_arm_postgresql_virtual_network_rule.go index ba39d406f9371..807775b8b0e73 100644 --- a/azurerm/internal/services/postgres/resource_arm_postgresql_virtual_network_rule.go +++ b/azurerm/internal/services/postgres/resource_arm_postgresql_virtual_network_rule.go @@ -226,7 +226,7 @@ func postgreSQLVirtualNetworkStateStatusCodeRefreshFunc(ctx context.Context, cli return resp, string(props.State), nil } - //Valid response was returned but VirtualNetworkRuleProperties was nil. Basically the rule exists, but with no properties for some reason. Assume Unknown instead of returning error. + // Valid response was returned but VirtualNetworkRuleProperties was nil. Basically the rule exists, but with no properties for some reason. Assume Unknown instead of returning error. log.Printf("[DEBUG] Retrieving PostgreSQL Virtual Network Rule %q (PostgreSQL Server: %q, Resource Group: %q) returned empty VirtualNetworkRuleProperties", resourceGroup, serverName, name) return resp, "Unknown", nil } diff --git a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_virtual_network_rule_test.go b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_virtual_network_rule_test.go index 60ec25e07ca55..0c2890c19129f 100644 --- a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_virtual_network_rule_test.go +++ b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_virtual_network_rule_test.go @@ -59,8 +59,8 @@ func TestAccAzureRMPostgreSQLVirtualNetworkRule_switchSubnets(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_postgresql_virtual_network_rule", "test") // Create regex strings that will ensure that one subnet name exists, but not the other - preConfigRegex := regexp.MustCompile(fmt.Sprintf("(acctest-SN1-%d)$|(acctest-SN[^2]-%d)$", data.RandomInteger, data.RandomInteger)) //subnet 1 but not 2 - postConfigRegex := regexp.MustCompile(fmt.Sprintf("(acctest-SN2-%d)$|(acctest-SN-[^1]%d)$", data.RandomInteger, data.RandomInteger)) //subnet 2 but not 1 + preConfigRegex := regexp.MustCompile(fmt.Sprintf("(acctest-SN1-%d)$|(acctest-SN[^2]-%d)$", data.RandomInteger, data.RandomInteger)) // subnet 1 but not 2 + postConfigRegex := regexp.MustCompile(fmt.Sprintf("(acctest-SN2-%d)$|(acctest-SN-[^1]%d)$", data.RandomInteger, data.RandomInteger)) // subnet 2 but not 1 resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -215,8 +215,8 @@ func testCheckAzureRMPostgreSQLVirtualNetworkRuleDisappears(resourceName string) future, err := client.Delete(ctx, resourceGroup, serverName, ruleName) if err != nil { - //If the error is that the resource we want to delete does not exist in the first - //place (404), then just return with no error. + // If the error is that the resource we want to delete does not exist in the first + // place (404), then just return with no error. if response.WasNotFound(future.Response()) { return nil } @@ -225,7 +225,7 @@ func testCheckAzureRMPostgreSQLVirtualNetworkRuleDisappears(resourceName string) } if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - //Same deal as before. Just in case. + // Same deal as before. Just in case. if response.WasNotFound(future.Response()) { return nil } diff --git a/azurerm/internal/services/recoveryservices/resource_arm_backup_policy_file_share.go b/azurerm/internal/services/recoveryservices/resource_arm_backup_policy_file_share.go index 82e0ecc20e19c..d2d0b921714e7 100644 --- a/azurerm/internal/services/recoveryservices/resource_arm_backup_policy_file_share.go +++ b/azurerm/internal/services/recoveryservices/resource_arm_backup_policy_file_share.go @@ -87,7 +87,7 @@ func resourceArmBackupProtectionPolicyFileShare() *schema.Resource { Type: schema.TypeString, Required: true, ValidateFunc: validation.StringMatch( - regexp.MustCompile("^([01][0-9]|[2][0-3]):([03][0])$"), //time must be on the hour or half past + regexp.MustCompile("^([01][0-9]|[2][0-3]):([03][0])$"), // time must be on the hour or half past "Time of day must match the format HH:mm where HH is 00-23 and mm is 00 or 30", ), }, @@ -124,7 +124,7 @@ func resourceArmBackupProtectionPolicyFileShareCreateUpdate(d *schema.ResourceDa log.Printf("[DEBUG] Creating/updating Recovery Service Protection Policy %s (resource group %q)", policyName, resourceGroup) - //getting this ready now because its shared between *everything*, time is... complicated for this resource + // getting this ready now because its shared between *everything*, time is... complicated for this resource timeOfDay := d.Get("backup.0.time").(string) dateOfDay, err := time.Parse(time.RFC3339, fmt.Sprintf("2018-07-30T%s:00Z", timeOfDay)) if err != nil { @@ -151,7 +151,7 @@ func resourceArmBackupProtectionPolicyFileShareCreateUpdate(d *schema.ResourceDa BackupManagementType: backup.BackupManagementTypeAzureStorage, WorkLoadType: backup.WorkloadTypeAzureFileShare, SchedulePolicy: expandArmBackupProtectionPolicyFileShareSchedule(d, times), - RetentionPolicy: &backup.LongTermRetentionPolicy{ //SimpleRetentionPolicy only has duration property ¯\_(ツ)_/¯ + RetentionPolicy: &backup.LongTermRetentionPolicy{ // SimpleRetentionPolicy only has duration property ¯\_(ツ)_/¯ RetentionPolicyType: backup.RetentionPolicyTypeLongTermRetentionPolicy, DailySchedule: expandArmBackupProtectionPolicyFileShareRetentionDaily(d, times), }, @@ -259,7 +259,7 @@ func expandArmBackupProtectionPolicyFileShareSchedule(d *schema.ResourceData, ti if bb, ok := d.Get("backup").([]interface{}); ok && len(bb) > 0 { block := bb[0].(map[string]interface{}) - schedule := backup.SimpleSchedulePolicy{ //LongTermSchedulePolicy has no properties + schedule := backup.SimpleSchedulePolicy{ // LongTermSchedulePolicy has no properties SchedulePolicyType: backup.SchedulePolicyTypeSimpleSchedulePolicy, ScheduleRunTimes: ×, } diff --git a/azurerm/internal/services/recoveryservices/resource_arm_backup_policy_vm.go b/azurerm/internal/services/recoveryservices/resource_arm_backup_policy_vm.go index ab6a31120502a..f0a91ba7b4ff8 100644 --- a/azurerm/internal/services/recoveryservices/resource_arm_backup_policy_vm.go +++ b/azurerm/internal/services/recoveryservices/resource_arm_backup_policy_vm.go @@ -17,7 +17,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/set" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" @@ -87,23 +86,23 @@ func resourceArmBackupProtectionPolicyVM() *schema.Resource { }, true), }, - "time": { //applies to all backup schedules & retention times (they all must be the same) + "time": { // applies to all backup schedules & retention times (they all must be the same) Type: schema.TypeString, Required: true, ValidateFunc: validation.StringMatch( - regexp.MustCompile("^([01][0-9]|[2][0-3]):([03][0])$"), //time must be on the hour or half past + regexp.MustCompile("^([01][0-9]|[2][0-3]):([03][0])$"), // time must be on the hour or half past "Time of day must match the format HH:mm where HH is 00-23 and mm is 00 or 30", ), }, - "weekdays": { //only for weekly + "weekdays": { // only for weekly Type: schema.TypeSet, Optional: true, Set: set.HashStringIgnoreCase, Elem: &schema.Schema{ Type: schema.TypeString, DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validate.DayOfTheWeek(true), + ValidateFunc: validation.IsDayOfTheWeek(true), }, }, }, @@ -144,7 +143,7 @@ func resourceArmBackupProtectionPolicyVM() *schema.Resource { Elem: &schema.Schema{ Type: schema.TypeString, DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validate.DayOfTheWeek(true), + ValidateFunc: validation.IsDayOfTheWeek(true), }, }, }, @@ -187,7 +186,7 @@ func resourceArmBackupProtectionPolicyVM() *schema.Resource { Elem: &schema.Schema{ Type: schema.TypeString, DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validate.DayOfTheWeek(true), + ValidateFunc: validation.IsDayOfTheWeek(true), }, }, }, @@ -213,7 +212,7 @@ func resourceArmBackupProtectionPolicyVM() *schema.Resource { Elem: &schema.Schema{ Type: schema.TypeString, DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validate.Month(true), + ValidateFunc: validation.IsMonth(true), }, }, @@ -241,7 +240,7 @@ func resourceArmBackupProtectionPolicyVM() *schema.Resource { Elem: &schema.Schema{ Type: schema.TypeString, DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validate.DayOfTheWeek(true), + ValidateFunc: validation.IsDayOfTheWeek(true), }, }, }, @@ -251,8 +250,8 @@ func resourceArmBackupProtectionPolicyVM() *schema.Resource { "tags": tags.Schema(), }, - //if daily, we need daily retention - //if weekly daily cannot be set, and we need weekly + // if daily, we need daily retention + // if weekly daily cannot be set, and we need weekly CustomizeDiff: func(diff *schema.ResourceDiff, v interface{}) error { _, hasDaily := diff.GetOk("retention_daily") _, hasWeekly := diff.GetOk("retention_weekly") @@ -295,7 +294,7 @@ func resourceArmBackupProtectionPolicyVMCreateUpdate(d *schema.ResourceData, met log.Printf("[DEBUG] Creating/updating Azure Backup Protection Policy %s (resource group %q)", policyName, resourceGroup) - //getting this ready now because its shared between *everything*, time is... complicated for this resource + // getting this ready now because its shared between *everything*, time is... complicated for this resource timeOfDay := d.Get("backup.0.time").(string) dateOfDay, err := time.Parse(time.RFC3339, fmt.Sprintf("2018-07-30T%s:00Z", timeOfDay)) if err != nil { @@ -322,7 +321,7 @@ func resourceArmBackupProtectionPolicyVMCreateUpdate(d *schema.ResourceData, met TimeZone: utils.String(d.Get("timezone").(string)), BackupManagementType: backup.BackupManagementTypeAzureIaasVM, SchedulePolicy: expandArmBackupProtectionPolicyVMSchedule(d, times), - RetentionPolicy: &backup.LongTermRetentionPolicy{ //SimpleRetentionPolicy only has duration property ¯\_(ツ)_/¯ + RetentionPolicy: &backup.LongTermRetentionPolicy{ // SimpleRetentionPolicy only has duration property ¯\_(ツ)_/¯ RetentionPolicyType: backup.RetentionPolicyTypeLongTermRetentionPolicy, DailySchedule: expandArmBackupProtectionPolicyVMRetentionDaily(d, times), WeeklySchedule: expandArmBackupProtectionPolicyVMRetentionWeekly(d, times), @@ -457,7 +456,7 @@ func expandArmBackupProtectionPolicyVMSchedule(d *schema.ResourceData, times []d if bb, ok := d.Get("backup").([]interface{}); ok && len(bb) > 0 { block := bb[0].(map[string]interface{}) - schedule := backup.SimpleSchedulePolicy{ //LongTermSchedulePolicy has no properties + schedule := backup.SimpleSchedulePolicy{ // LongTermSchedulePolicy has no properties SchedulePolicyType: backup.SchedulePolicyTypeSimpleSchedulePolicy, ScheduleRunTimes: ×, } @@ -527,8 +526,8 @@ func expandArmBackupProtectionPolicyVMRetentionMonthly(d *schema.ResourceData, t block := rb[0].(map[string]interface{}) retention := backup.MonthlyRetentionSchedule{ - RetentionScheduleFormatType: backup.RetentionScheduleFormatWeekly, //this is always weekly ¯\_(ツ)_/¯ - RetentionScheduleDaily: nil, //and this is always nil.. + RetentionScheduleFormatType: backup.RetentionScheduleFormatWeekly, // this is always weekly ¯\_(ツ)_/¯ + RetentionScheduleDaily: nil, // and this is always nil.. RetentionScheduleWeekly: expandArmBackupProtectionPolicyVMRetentionWeeklyFormat(block), RetentionTimes: ×, RetentionDuration: &backup.RetentionDuration{ @@ -548,8 +547,8 @@ func expandArmBackupProtectionPolicyVMRetentionYearly(d *schema.ResourceData, ti block := rb[0].(map[string]interface{}) retention := backup.YearlyRetentionSchedule{ - RetentionScheduleFormatType: backup.RetentionScheduleFormatWeekly, //this is always weekly ¯\_(ツ)_/¯ - RetentionScheduleDaily: nil, //and this is always nil.. + RetentionScheduleFormatType: backup.RetentionScheduleFormatWeekly, // this is always weekly ¯\_(ツ)_/¯ + RetentionScheduleDaily: nil, // and this is always nil.. RetentionScheduleWeekly: expandArmBackupProtectionPolicyVMRetentionWeeklyFormat(block), RetentionTimes: ×, RetentionDuration: &backup.RetentionDuration{ diff --git a/azurerm/internal/services/recoveryservices/resource_arm_backup_protected_file_share.go b/azurerm/internal/services/recoveryservices/resource_arm_backup_protected_file_share.go index 550205b18ecb7..56d8dd3fd5211 100644 --- a/azurerm/internal/services/recoveryservices/resource_arm_backup_protected_file_share.go +++ b/azurerm/internal/services/recoveryservices/resource_arm_backup_protected_file_share.go @@ -84,7 +84,7 @@ func resourceArmBackupProtectedFileShareCreateUpdate(d *schema.ResourceData, met fileShareName := d.Get("source_file_share_name").(string) policyID := d.Get("backup_policy_id").(string) - //get storage account name from id + // get storage account name from id parsedStorageAccountID, err := azure.ParseAzureResourceID(storageAccountID) if err != nil { return fmt.Errorf("[ERROR] Unable to parse source_storage_account_id '%s': %+v", storageAccountID, err) diff --git a/azurerm/internal/services/recoveryservices/resource_arm_backup_protected_vm.go b/azurerm/internal/services/recoveryservices/resource_arm_backup_protected_vm.go index 36f3c38584f8c..3bc9098f237c1 100644 --- a/azurerm/internal/services/recoveryservices/resource_arm_backup_protected_vm.go +++ b/azurerm/internal/services/recoveryservices/resource_arm_backup_protected_vm.go @@ -78,7 +78,7 @@ func resourceArmRecoveryServicesBackupProtectedVMCreateUpdate(d *schema.Resource vmId := d.Get("source_vm_id").(string) policyId := d.Get("backup_policy_id").(string) - //get VM name from id + // get VM name from id parsedVmId, err := azure.ParseAzureResourceID(vmId) if err != nil { return fmt.Errorf("[ERROR] Unable to parse source_vm_id '%s': %+v", vmId, err) 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 1deb7410705a9..94a6efdb862c3 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 @@ -90,7 +90,7 @@ func resourceArmSiteRecoveryNetworkMappingCreate(d *schema.ResourceData, meta in ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) defer cancel() - //get network name from id + // get network name from id parsedSourceNetworkId, err := azure.ParseAzureResourceID(sourceNetworkId) if err != nil { return fmt.Errorf("[ERROR] Unable to parse source_network_id '%s' (network mapping %s): %+v", sourceNetworkId, name, err) diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_file_share_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_file_share_test.go index 669170431ce89..383bc268728d7 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_file_share_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_file_share_test.go @@ -30,7 +30,7 @@ func TestAccAzureRMBackupProtectedFileShare_basic(t *testing.T) { ), }, data.ImportStep(), - { //vault cannot be deleted unless we unregister all backups + { // vault cannot be deleted unless we unregister all backups Config: testAccAzureRMBackupProtectedFileShare_base(data), Check: resource.ComposeTestCheckFunc(), }, @@ -59,7 +59,7 @@ func TestAccAzureRMBackupProtectedFileShare_requiresImport(t *testing.T) { ), }, data.RequiresImportErrorStep(testAccAzureRMBackupProtectedFileShare_requiresImport), - { //vault cannot be deleted unless we unregister all backups + { // vault cannot be deleted unless we unregister all backups Config: testAccAzureRMBackupProtectedFileShare_base(data), Check: resource.ComposeTestCheckFunc(), }, diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_vm_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_vm_test.go index 3153bcee1a0b2..00fe5d1c8d2be 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_vm_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_vm_test.go @@ -29,7 +29,7 @@ func TestAccAzureRMBackupProtectedVm_basic(t *testing.T) { ), }, data.ImportStep(), - { //vault cannot be deleted unless we unregister all backups + { // vault cannot be deleted unless we unregister all backups Config: testAccAzureRMBackupProtectedVm_base(data), Check: resource.ComposeTestCheckFunc(), }, @@ -58,7 +58,7 @@ func TestAccAzureRMBackupProtectedVm_requiresImport(t *testing.T) { ), }, data.RequiresImportErrorStep(testAccAzureRMBackupProtectedVm_requiresImport), - { //vault cannot be deleted unless we unregister all backups + { // vault cannot be deleted unless we unregister all backups Config: testAccAzureRMBackupProtectedVm_base(data), Check: resource.ComposeTestCheckFunc(), }, @@ -82,7 +82,7 @@ func TestAccAzureRMBackupProtectedVm_separateResourceGroups(t *testing.T) { ), }, data.ImportStep(), - { //vault cannot be deleted unless we unregister all backups + { // vault cannot be deleted unless we unregister all backups Config: testAccAzureRMBackupProtectedVm_additionalVault(data), Check: resource.ComposeTestCheckFunc(), }, @@ -196,7 +196,7 @@ func testCheckAzureRMBackupProtectedVmExists(resourceName string) resource.TestC vaultName := rs.Primary.Attributes["recovery_vault_name"] vmId := rs.Primary.Attributes["source_vm_id"] - //get VM name from id + // get VM name from id parsedVmId, err := azure.ParseAzureResourceID(vmId) if err != nil { return fmt.Errorf("[ERROR] Unable to parse source_vm_id '%s': %+v", vmId, err) diff --git a/azurerm/internal/services/redis/resource_arm_redis_cache.go b/azurerm/internal/services/redis/resource_arm_redis_cache.go index dc31c2a065080..1ef1a3f1c2f99 100644 --- a/azurerm/internal/services/redis/resource_arm_redis_cache.go +++ b/azurerm/internal/services/redis/resource_arm_redis_cache.go @@ -19,7 +19,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/locks" @@ -219,7 +218,7 @@ func resourceArmRedisCache() *schema.Resource { Type: schema.TypeString, Required: true, DiffSuppressFunc: suppress.CaseDifference, - ValidateFunc: validate.DayOfTheWeek(true), + ValidateFunc: validation.IsDayOfTheWeek(true), }, "start_hour_utc": { Type: schema.TypeInt, diff --git a/azurerm/internal/services/resource/group_validator_test.go b/azurerm/internal/services/resource/group_validator_test.go index d242856c08064..d8fef9e6cfd87 100644 --- a/azurerm/internal/services/resource/group_validator_test.go +++ b/azurerm/internal/services/resource/group_validator_test.go @@ -73,7 +73,7 @@ func TestValidateResourceGroupIDOrEmpty(t *testing.T) { ID: "nonsense", Errors: 1, }, - //as this function just calls TestAzureResourceGroupId lets not be as comprehensive + // as this function just calls TestAzureResourceGroupId lets not be as comprehensive { ID: "/providers/provider.name/", Errors: 0, diff --git a/azurerm/internal/services/securitycenter/resource_arm_security_center_contact.go b/azurerm/internal/services/securitycenter/resource_arm_security_center_contact.go index e47fc662bcf4a..084c783986c51 100644 --- a/azurerm/internal/services/securitycenter/resource_arm_security_center_contact.go +++ b/azurerm/internal/services/securitycenter/resource_arm_security_center_contact.go @@ -15,7 +15,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -//seems you can only set one contact: +// seems you can only set one contact: // Invalid security contact name was provided - only 'defaultX' is allowed where X is an index // Invalid security contact name 'default0' was provided. Expected 'default1' // Message="Invalid security contact name 'default2' was provided. Expected 'default1'" diff --git a/azurerm/internal/services/securitycenter/resource_arm_security_center_subscription_pricing.go b/azurerm/internal/services/securitycenter/resource_arm_security_center_subscription_pricing.go index 2d0674f045058..29cab0c324b5f 100644 --- a/azurerm/internal/services/securitycenter/resource_arm_security_center_subscription_pricing.go +++ b/azurerm/internal/services/securitycenter/resource_arm_security_center_subscription_pricing.go @@ -13,8 +13,8 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -//NOTE: seems default is the only valid pricing name: -//Code="InvalidInputJson" Message="Pricing name 'kt's price' is not allowed. Expected 'default' for this scope." +// NOTE: seems default is the only valid pricing name: +// Code="InvalidInputJson" Message="Pricing name 'kt's price' is not allowed. Expected 'default' for this scope." const securityCenterSubscriptionPricingName = "default" func resourceArmSecurityCenterSubscriptionPricing() *schema.Resource { @@ -106,5 +106,5 @@ func resourceArmSecurityCenterSubscriptionPricingRead(d *schema.ResourceData, me func resourceArmSecurityCenterSubscriptionPricingDelete(_ *schema.ResourceData, _ interface{}) error { log.Printf("[DEBUG] Security Center Subscription deletion invocation") - return nil //cannot be deleted. + return nil // cannot be deleted. } 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 e3c437c01a789..e90bd175bea4b 100644 --- a/azurerm/internal/services/securitycenter/resource_arm_security_center_workspace.go +++ b/azurerm/internal/services/securitycenter/resource_arm_security_center_workspace.go @@ -17,7 +17,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -//only valid name is default +// only valid name is default // Message="Invalid workspace settings name 'kttest' , only default is allowed " const securityCenterWorkspaceName = "default" @@ -76,8 +76,8 @@ 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 + // 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 price, err := priceClient.GetSubscriptionPricing(ctx, securityCenterSubscriptionPricingName) if err != nil { return fmt.Errorf("Error reading Security Center Subscription pricing: %+v", err) @@ -107,7 +107,7 @@ func resourceArmSecurityCenterWorkspaceCreateUpdate(d *schema.ResourceData, meta } } - //api returns "" for workspace id after an create/update and eventually the new value + // api returns "" for workspace id after an create/update and eventually the new value stateConf := &resource.StateChangeConf{ Pending: []string{"Waiting"}, Target: []string{"Populated"}, diff --git a/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_contact_test.go b/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_contact_test.go index d814b97466108..2f15eefa6878a 100644 --- a/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_contact_test.go +++ b/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_contact_test.go @@ -13,7 +13,7 @@ import ( ) func TestAccAzureRMSecurityCenter_contact(t *testing.T) { - //there is only *one* read contact, if tests will conflict if run at the same time + // there is only *one* read contact, if tests will conflict if run at the same time testCases := map[string]map[string]func(t *testing.T){ "contact": { "basic": testAccAzureRMSecurityCenterContact_basic, diff --git a/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_subscription_pricing_test.go b/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_subscription_pricing_test.go index d50b3e0108b2b..b285d0413b2bd 100644 --- a/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_subscription_pricing_test.go +++ b/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_subscription_pricing_test.go @@ -14,7 +14,7 @@ import ( func testAccAzureRMSecurityCenterSubscriptionPricing_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_security_center_subscription_pricing", "test") - //lintignore:AT001 + // lintignore:AT001 resource.Test(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, diff --git a/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_workspace_test.go b/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_workspace_test.go index f4d043f852bf5..c79e500d6ae2c 100644 --- a/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_workspace_test.go +++ b/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_workspace_test.go @@ -32,7 +32,7 @@ func testAccAzureRMSecurityCenterWorkspace_basic(t *testing.T) { }, data.ImportStep(), { - //reset pricing to free + // reset pricing to free Config: testAccAzureRMSecurityCenterSubscriptionPricing_tier("Free"), }, }, @@ -65,7 +65,7 @@ func testAccAzureRMSecurityCenterWorkspace_requiresImport(t *testing.T) { ExpectError: acceptance.RequiresImportError("azurerm_security_center_workspace"), }, { - //reset pricing to free + // reset pricing to free Config: testAccAzureRMSecurityCenterSubscriptionPricing_tier("Free"), }, }, @@ -97,7 +97,7 @@ func testAccAzureRMSecurityCenterWorkspace_update(t *testing.T) { }, data.ImportStep(), { - //reset pricing to free + // reset pricing to free Config: testAccAzureRMSecurityCenterSubscriptionPricing_tier("Free"), }, }, diff --git a/azurerm/internal/services/servicebus/resource_arm_servicebus_namespace_authorization_rule.go b/azurerm/internal/services/servicebus/resource_arm_servicebus_namespace_authorization_rule.go index f5fd09f3c0989..2d2888e70363d 100644 --- a/azurerm/internal/services/servicebus/resource_arm_servicebus_namespace_authorization_rule.go +++ b/azurerm/internal/services/servicebus/resource_arm_servicebus_namespace_authorization_rule.go @@ -33,7 +33,7 @@ func resourceArmServiceBusNamespaceAuthorizationRule() *schema.Resource { Delete: schema.DefaultTimeout(30 * time.Minute), }, - //function takes a schema map and adds the authorization rule properties to it + // function takes a schema map and adds the authorization rule properties to it Schema: azure.ServiceBusAuthorizationRuleSchemaFrom(map[string]*schema.Schema{ "name": { Type: schema.TypeString, @@ -117,7 +117,7 @@ func resourceArmServiceBusNamespaceAuthorizationRuleRead(d *schema.ResourceData, resGroup := id.ResourceGroup namespaceName := id.Path["namespaces"] - name := id.Path["AuthorizationRules"] //this is slightly different then a topic rule (Authorization vs authorization) + name := id.Path["AuthorizationRules"] // this is slightly different then a topic rule (Authorization vs authorization) resp, err := client.GetAuthorizationRule(ctx, resGroup, namespaceName, name) if err != nil { @@ -164,7 +164,7 @@ func resourceArmServiceBusNamespaceAuthorizationRuleDelete(d *schema.ResourceDat resGroup := id.ResourceGroup namespaceName := id.Path["namespaces"] - name := id.Path["AuthorizationRules"] //this is slightly different then topic/queue (Authorization vs authorization) + name := id.Path["AuthorizationRules"] // this is slightly different then topic/queue (Authorization vs authorization) if _, err = client.DeleteAuthorizationRule(ctx, resGroup, namespaceName, name); err != nil { return fmt.Errorf("Error issuing Azure ARM delete request of ServiceBus Namespace Authorization Rule %q (Resource Group %q): %+v", name, resGroup, err) diff --git a/azurerm/internal/services/sql/resource_arm_sql_database.go b/azurerm/internal/services/sql/resource_arm_sql_database.go index d8e3b5b73c1ea..8f0e84d562a9f 100644 --- a/azurerm/internal/services/sql/resource_arm_sql_database.go +++ b/azurerm/internal/services/sql/resource_arm_sql_database.go @@ -14,7 +14,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" @@ -141,7 +140,7 @@ func resourceArmSqlDatabase() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - ValidateFunc: validate.RFC3339Time, + ValidateFunc: validation.IsRFC3339Time, }, "edition": { @@ -208,7 +207,7 @@ func resourceArmSqlDatabase() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - ValidateFunc: validate.RFC3339Time, + ValidateFunc: validation.IsRFC3339Time, }, "elastic_pool_name": { 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 29194cd5e6a2c..06f4f89ebd67b 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 @@ -62,7 +62,7 @@ func resourceArmSqlVirtualNetworkRule() *schema.Resource { "ignore_missing_vnet_service_endpoint": { Type: schema.TypeBool, Optional: true, - Default: false, //When not provided, Azure defaults to false + Default: false, // When not provided, Azure defaults to false }, }, } @@ -103,7 +103,7 @@ func resourceArmSqlVirtualNetworkRuleCreateUpdate(d *schema.ResourceData, meta i return fmt.Errorf("Error creating SQL Virtual Network Rule %q (SQL Server: %q, Resource Group: %q): %+v", name, serverName, resourceGroup, err) } - //Wait for the provisioning state to become ready + // Wait for the provisioning state to become ready log.Printf("[DEBUG] Waiting for SQL Virtual Network Rule %q (SQL Server: %q, Resource Group: %q) to become ready", name, serverName, resourceGroup) stateConf := &resource.StateChangeConf{ Pending: []string{"Initializing", "InProgress", "Unknown", "ResponseNotFound"}, @@ -276,7 +276,7 @@ func sqlVirtualNetworkStateStatusCodeRefreshFunc(ctx context.Context, client *sq return resp, string(props.State), nil } - //Valid response was returned but VirtualNetworkRuleProperties was nil. Basically the rule exists, but with no properties for some reason. Assume Unknown instead of returning error. + // Valid response was returned but VirtualNetworkRuleProperties was nil. Basically the rule exists, but with no properties for some reason. Assume Unknown instead of returning error. log.Printf("[DEBUG] Retrieving SQL Virtual Network Rule %q (SQL Server: %q, Resource Group: %q) returned empty VirtualNetworkRuleProperties", resourceGroup, serverName, name) return resp, "Unknown", 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 853001a4d634a..73af388e886a2 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 @@ -85,8 +85,8 @@ func TestAccAzureRMSqlVirtualNetworkRule_switchSubnets(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_sql_virtual_network_rule", "test") // Create regex strings that will ensure that one subnet name exists, but not the other - preConfigRegex := regexp.MustCompile(fmt.Sprintf("(subnet1%d)$|(subnet[^2]%d)$", data.RandomInteger, data.RandomInteger)) //subnet 1 but not 2 - postConfigRegex := regexp.MustCompile(fmt.Sprintf("(subnet2%d)$|(subnet[^1]%d)$", data.RandomInteger, data.RandomInteger)) //subnet 2 but not 1 + preConfigRegex := regexp.MustCompile(fmt.Sprintf("(subnet1%d)$|(subnet[^2]%d)$", data.RandomInteger, data.RandomInteger)) // subnet 1 but not 2 + postConfigRegex := regexp.MustCompile(fmt.Sprintf("(subnet2%d)$|(subnet[^1]%d)$", data.RandomInteger, data.RandomInteger)) // subnet 2 but not 1 resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -412,8 +412,8 @@ func testCheckAzureRMSqlVirtualNetworkRuleDisappears(resourceName string) resour future, err := client.Delete(ctx, resourceGroup, serverName, ruleName) if err != nil { - //If the error is that the resource we want to delete does not exist in the first - //place (404), then just return with no error. + // If the error is that the resource we want to delete does not exist in the first + // place (404), then just return with no error. if response.WasNotFound(future.Response()) { return nil } @@ -422,7 +422,7 @@ func testCheckAzureRMSqlVirtualNetworkRuleDisappears(resourceName string) resour } if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - //Same deal as before. Just in case. + // Same deal as before. Just in case. if response.WasNotFound(future.Response()) { return nil } diff --git a/azurerm/internal/services/storage/resource_arm_hpc_cache.go b/azurerm/internal/services/storage/resource_arm_hpc_cache.go index a936aad41711c..f5f28215bd7c4 100644 --- a/azurerm/internal/services/storage/resource_arm_hpc_cache.go +++ b/azurerm/internal/services/storage/resource_arm_hpc_cache.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/storage/parsers" @@ -40,7 +39,7 @@ func resourceArmHPCCache() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: validate.NoEmptyStrings, + ValidateFunc: validation.StringIsNotEmpty, }, "resource_group_name": azure.SchemaResourceGroupName(), diff --git a/azurerm/internal/services/storage/resource_arm_storage_account.go b/azurerm/internal/services/storage/resource_arm_storage_account.go index 4df3721c5ddef..1aaea4eec3914 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account.go @@ -1786,22 +1786,6 @@ func ValidateArmStorageAccountName(v interface{}, _ string) (warnings []string, return warnings, errors } -func ValidateArmStorageAccountType(v interface{}, _ string) (warnings []string, errors []error) { - validAccountTypes := []string{"standard_lrs", "standard_zrs", - "standard_grs", "standard_ragrs", "premium_lrs"} - - input := strings.ToLower(v.(string)) - - for _, valid := range validAccountTypes { - if valid == input { - return - } - } - - errors = append(errors, fmt.Errorf("Invalid storage account type %q", input)) - return warnings, errors -} - func expandAzureRmStorageAccountIdentity(d *schema.ResourceData) *storage.Identity { identities := d.Get("identity").([]interface{}) identity := identities[0].(map[string]interface{}) diff --git a/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go b/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go index 5eecd10114edb..824df8e3de6ba 100644 --- a/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go +++ b/azurerm/internal/services/storage/resource_arm_storage_account_customer_managed_key.go @@ -7,9 +7,9 @@ import ( "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-04-01/storage" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/locks" keyVaultParse "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/keyvault/parse" @@ -56,13 +56,13 @@ func resourceArmStorageAccountCustomerManagedKey() *schema.Resource { "key_name": { Type: schema.TypeString, Required: true, - ValidateFunc: validate.NoEmptyStrings, + ValidateFunc: validation.StringIsNotEmpty, }, "key_version": { Type: schema.TypeString, Required: true, - ValidateFunc: validate.NoEmptyStrings, + ValidateFunc: validation.StringIsNotEmpty, }, }, } diff --git a/azurerm/internal/services/streamanalytics/resource_arm_stream_analytics_job.go b/azurerm/internal/services/streamanalytics/resource_arm_stream_analytics_job.go index ac43aa2d11efd..c824560677aa5 100644 --- a/azurerm/internal/services/streamanalytics/resource_arm_stream_analytics_job.go +++ b/azurerm/internal/services/streamanalytics/resource_arm_stream_analytics_job.go @@ -57,7 +57,7 @@ func resourceArmStreamAnalyticsJob() *schema.Resource { "1.1", // TODO: support for 1.2 when this is fixed: // https://github.com/Azure/azure-rest-api-specs/issues/5604 - //"1.2", + // "1.2", }, false), }, diff --git a/azurerm/internal/services/subscription/data_source_subscriptions.go b/azurerm/internal/services/subscription/data_source_subscriptions.go index 4b9743d3d99e6..bb0d0febf37b4 100644 --- a/azurerm/internal/services/subscription/data_source_subscriptions.go +++ b/azurerm/internal/services/subscription/data_source_subscriptions.go @@ -48,13 +48,13 @@ func dataSourceArmSubscriptionsRead(d *schema.ResourceData, meta interface{}) er displayNamePrefix := strings.ToLower(d.Get("display_name_prefix").(string)) displayNameContains := strings.ToLower(d.Get("display_name_contains").(string)) - //ListComplete returns an iterator struct + // ListComplete returns an iterator struct results, err := subClient.ListComplete(ctx) if err != nil { return fmt.Errorf("Error listing subscriptions: %+v", err) } - //iterate across each subscriptions and append them to slice + // iterate across each subscriptions and append them to slice subscriptions := make([]map[string]interface{}, 0) for results.NotDone() { val := results.Value() @@ -86,18 +86,18 @@ func dataSourceArmSubscriptionsRead(d *schema.ResourceData, meta interface{}) er return fmt.Errorf("Error going to next subscriptions value: %+v", err) } - //check if the display name prefix matches the given input + // check if the display name prefix matches the given input if displayNamePrefix != "" { if !strings.HasPrefix(strings.ToLower(s["display_name"].(string)), displayNamePrefix) { - //the display name does not match the given prefix + // the display name does not match the given prefix continue } } - //check if the display name matches the 'contains' comparison + // check if the display name matches the 'contains' comparison if displayNameContains != "" { if !strings.Contains(strings.ToLower(s["display_name"].(string)), displayNameContains) { - //the display name does not match the contains check + // the display name does not match the contains check continue } } diff --git a/azurerm/internal/services/trafficmanager/resource_arm_traffic_manager_endpoint.go b/azurerm/internal/services/trafficmanager/resource_arm_traffic_manager_endpoint.go index f4b8c22f19741..893389b00857e 100644 --- a/azurerm/internal/services/trafficmanager/resource_arm_traffic_manager_endpoint.go +++ b/azurerm/internal/services/trafficmanager/resource_arm_traffic_manager_endpoint.go @@ -356,7 +356,7 @@ func getArmTrafficManagerEndpointProperties(d *schema.ResourceData) *trafficmana if resourceId := d.Get("target_resource_id").(string); resourceId != "" { endpointProps.TargetResourceID = utils.String(resourceId) - //NOTE: Workaround for upstream behavior: if the target is blank instead of nil, the REST API will throw a 500 error + // NOTE: Workaround for upstream behavior: if the target is blank instead of nil, the REST API will throw a 500 error if target == "" { endpointProps.Target = nil } diff --git a/azurerm/internal/services/web/resource_arm_app_service_plan.go b/azurerm/internal/services/web/resource_arm_app_service_plan.go index 185c4be02d778..77be6ec3a0248 100644 --- a/azurerm/internal/services/web/resource_arm_app_service_plan.go +++ b/azurerm/internal/services/web/resource_arm_app_service_plan.go @@ -94,7 +94,7 @@ func resourceArmAppServicePlan() *schema.Resource { }, }, - /// AppServicePlanProperties + // / AppServicePlanProperties "app_service_environment_id": { Type: schema.TypeString, Optional: true, diff --git a/azurerm/internal/services/web/resource_arm_function_app.go b/azurerm/internal/services/web/resource_arm_function_app.go index c42e64a1c0ffa..6b5cefe30b6ca 100644 --- a/azurerm/internal/services/web/resource_arm_function_app.go +++ b/azurerm/internal/services/web/resource_arm_function_app.go @@ -221,7 +221,7 @@ func resourceArmFunctionApp() *schema.Resource { "subnet_id": { Type: schema.TypeString, Optional: true, - ValidateFunc: validate.NoEmptyStrings, + ValidateFunc: validation.StringIsNotEmpty, }, }, }, diff --git a/azurerm/internal/tags/expand.go b/azurerm/internal/tags/expand.go index deb6ce7827de7..e5a05ee9e0f1e 100644 --- a/azurerm/internal/tags/expand.go +++ b/azurerm/internal/tags/expand.go @@ -4,7 +4,7 @@ func Expand(tagsMap map[string]interface{}) map[string]*string { output := make(map[string]*string, len(tagsMap)) for i, v := range tagsMap { - //Validate should have ignored this error already + // Validate should have ignored this error already value, _ := TagValueToString(v) output[i] = &value } From 16d09db11c475278eb256ebc5f82738b553cbfb2 Mon Sep 17 00:00:00 2001 From: aqche <39076898+aqche@users.noreply.github.com> Date: Thu, 5 Mar 2020 23:46:12 -0800 Subject: [PATCH 474/498] =?UTF-8?q?`azurerm=5Fnetapp=5F*`=20-=20support=20?= =?UTF-8?q?for=20`tags`=20&=20add=20ID=20parsing=20functi=E2=80=A6=20(#599?= =?UTF-8?q?5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: #5532 Adds the tags option for NetApp resources. I wrote the code, but I didn't realize you need to request access to NetApp before you can create resources, so I an unable to run the tests atm. I'll put in a request, but if someone has time to run the tests that would be helpful as well! --- .../services/netapp/parse/netapp_account.go | 33 +++++ .../netapp/parse/netapp_account_test.go | 73 +++++++++++ .../services/netapp/parse/netapp_pool.go | 38 ++++++ .../services/netapp/parse/netapp_pool_test.go | 88 +++++++++++++ .../services/netapp/parse/netapp_snapshot.go | 48 +++++++ .../netapp/parse/netapp_snapshot_test.go | 118 ++++++++++++++++++ .../services/netapp/parse/netapp_volume.go | 43 +++++++ .../netapp/parse/netapp_volume_test.go | 103 +++++++++++++++ .../netapp/resource_arm_netapp_account.go | 36 +++--- .../netapp/resource_arm_netapp_pool.go | 46 +++---- .../netapp/resource_arm_netapp_snapshot.go | 81 +++++++----- .../netapp/resource_arm_netapp_volume.go | 50 ++++---- .../tests/resource_arm_netapp_account_test.go | 9 ++ .../tests/resource_arm_netapp_pool_test.go | 9 ++ .../resource_arm_netapp_snapshot_test.go | 39 ++++++ .../tests/resource_arm_netapp_volume_test.go | 14 +++ website/docs/r/netapp_account.html.markdown | 2 + website/docs/r/netapp_pool.html.markdown | 2 + website/docs/r/netapp_snapshot.html.markdown | 2 + website/docs/r/netapp_volume.html.markdown | 2 + 20 files changed, 741 insertions(+), 95 deletions(-) create mode 100644 azurerm/internal/services/netapp/parse/netapp_account.go create mode 100644 azurerm/internal/services/netapp/parse/netapp_account_test.go create mode 100644 azurerm/internal/services/netapp/parse/netapp_pool.go create mode 100644 azurerm/internal/services/netapp/parse/netapp_pool_test.go create mode 100644 azurerm/internal/services/netapp/parse/netapp_snapshot.go create mode 100644 azurerm/internal/services/netapp/parse/netapp_snapshot_test.go create mode 100644 azurerm/internal/services/netapp/parse/netapp_volume.go create mode 100644 azurerm/internal/services/netapp/parse/netapp_volume_test.go diff --git a/azurerm/internal/services/netapp/parse/netapp_account.go b/azurerm/internal/services/netapp/parse/netapp_account.go new file mode 100644 index 0000000000000..96b2f1e902170 --- /dev/null +++ b/azurerm/internal/services/netapp/parse/netapp_account.go @@ -0,0 +1,33 @@ +package parse + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type NetAppAccountId struct { + ResourceGroup string + Name string +} + +func NetAppAccountID(input string) (*NetAppAccountId, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("[ERROR] Unable to parse NetApp Account ID %q: %+v", input, err) + } + + service := NetAppAccountId{ + ResourceGroup: id.ResourceGroup, + } + + if service.Name, err = id.PopSegment("netAppAccounts"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &service, nil +} diff --git a/azurerm/internal/services/netapp/parse/netapp_account_test.go b/azurerm/internal/services/netapp/parse/netapp_account_test.go new file mode 100644 index 0000000000000..11195171297d3 --- /dev/null +++ b/azurerm/internal/services/netapp/parse/netapp_account_test.go @@ -0,0 +1,73 @@ +package parse + +import ( + "testing" +) + +func TestNetAppAccountId(t *testing.T) { + testData := []struct { + Name string + Input string + Expected *NetAppAccountId + }{ + { + Name: "Empty", + Input: "", + Expected: nil, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Expected: nil, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Expected: nil, + }, + { + Name: "Resource Group ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", + Expected: nil, + }, + { + Name: "Missing NetApp Account Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/netAppAccounts/", + Expected: nil, + }, + { + Name: "NetApp Account ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/netAppAccounts/account1", + Expected: &NetAppAccountId{ + Name: "account1", + ResourceGroup: "resGroup1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/NETAPPACCOUNTS/account1", + Expected: nil, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Name) + + actual, err := NetAppAccountID(v.Input) + if err != nil { + if v.Expected == nil { + continue + } + + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.Name != v.Expected.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expected.Name, actual.Name) + } + + if actual.ResourceGroup != v.Expected.ResourceGroup { + t.Fatalf("Expected %q but got %q for Resource Group", v.Expected.ResourceGroup, actual.ResourceGroup) + } + } +} diff --git a/azurerm/internal/services/netapp/parse/netapp_pool.go b/azurerm/internal/services/netapp/parse/netapp_pool.go new file mode 100644 index 0000000000000..23c2fcff7ad07 --- /dev/null +++ b/azurerm/internal/services/netapp/parse/netapp_pool.go @@ -0,0 +1,38 @@ +package parse + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type NetAppPoolId struct { + ResourceGroup string + AccountName string + Name string +} + +func NetAppPoolID(input string) (*NetAppPoolId, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("[ERROR] Unable to parse NetApp Pool ID %q: %+v", input, err) + } + + service := NetAppPoolId{ + ResourceGroup: id.ResourceGroup, + } + + if service.AccountName, err = id.PopSegment("netAppAccounts"); err != nil { + return nil, err + } + + if service.Name, err = id.PopSegment("capacityPools"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &service, nil +} diff --git a/azurerm/internal/services/netapp/parse/netapp_pool_test.go b/azurerm/internal/services/netapp/parse/netapp_pool_test.go new file mode 100644 index 0000000000000..8e4b0131ed923 --- /dev/null +++ b/azurerm/internal/services/netapp/parse/netapp_pool_test.go @@ -0,0 +1,88 @@ +package parse + +import ( + "testing" +) + +func TestNetAppPoolId(t *testing.T) { + testData := []struct { + Name string + Input string + Expected *NetAppPoolId + }{ + { + Name: "Empty", + Input: "", + Expected: nil, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Expected: nil, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Expected: nil, + }, + { + Name: "Resource Group ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", + Expected: nil, + }, + { + Name: "Missing NetApp Account Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/netAppAccounts/", + Expected: nil, + }, + { + Name: "NetApp Account ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/netAppAccounts/account1", + Expected: nil, + }, + { + Name: "Missing NetApp Pool Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/netAppAccounts/account1/capacityPools/", + Expected: nil, + }, + { + Name: "NetApp Pool ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/netAppAccounts/account1/capacityPools/pool1", + Expected: &NetAppPoolId{ + Name: "pool1", + AccountName: "account1", + ResourceGroup: "resGroup1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/netAppAccounts/account1/CAPACITYPOOLS/pool1", + Expected: nil, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Name) + + actual, err := NetAppPoolID(v.Input) + if err != nil { + if v.Expected == nil { + continue + } + + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.Name != v.Expected.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expected.Name, actual.Name) + } + + if actual.AccountName != v.Expected.AccountName { + t.Fatalf("Expected %q but got %q for Account Name", v.Expected.AccountName, actual.AccountName) + } + + if actual.ResourceGroup != v.Expected.ResourceGroup { + t.Fatalf("Expected %q but got %q for Resource Group", v.Expected.ResourceGroup, actual.ResourceGroup) + } + } +} diff --git a/azurerm/internal/services/netapp/parse/netapp_snapshot.go b/azurerm/internal/services/netapp/parse/netapp_snapshot.go new file mode 100644 index 0000000000000..5e0b78a4aaad0 --- /dev/null +++ b/azurerm/internal/services/netapp/parse/netapp_snapshot.go @@ -0,0 +1,48 @@ +package parse + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type NetAppSnapshotId struct { + ResourceGroup string + AccountName string + PoolName string + VolumeName string + Name string +} + +func NetAppSnapshotID(input string) (*NetAppSnapshotId, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("[ERROR] Unable to parse NetApp Snapshot ID %q: %+v", input, err) + } + + service := NetAppSnapshotId{ + ResourceGroup: id.ResourceGroup, + } + + if service.AccountName, err = id.PopSegment("netAppAccounts"); err != nil { + return nil, err + } + + if service.PoolName, err = id.PopSegment("capacityPools"); err != nil { + return nil, err + } + + if service.VolumeName, err = id.PopSegment("volumes"); err != nil { + return nil, err + } + + if service.Name, err = id.PopSegment("snapshots"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &service, nil +} diff --git a/azurerm/internal/services/netapp/parse/netapp_snapshot_test.go b/azurerm/internal/services/netapp/parse/netapp_snapshot_test.go new file mode 100644 index 0000000000000..c0e061a78e8b3 --- /dev/null +++ b/azurerm/internal/services/netapp/parse/netapp_snapshot_test.go @@ -0,0 +1,118 @@ +package parse + +import ( + "testing" +) + +func TestNetAppSnapshotId(t *testing.T) { + testData := []struct { + Name string + Input string + Expected *NetAppSnapshotId + }{ + { + Name: "Empty", + Input: "", + Expected: nil, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Expected: nil, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Expected: nil, + }, + { + Name: "Resource Group ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", + Expected: nil, + }, + { + Name: "Missing NetApp Account Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/netAppAccounts/", + Expected: nil, + }, + { + Name: "NetApp Account ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/netAppAccounts/account1", + Expected: nil, + }, + { + Name: "Missing NetApp Pool Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/netAppAccounts/account1/capacityPools/", + Expected: nil, + }, + { + Name: "NetApp Pool ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/netAppAccounts/account1/capacityPools/pool1", + Expected: nil, + }, + { + Name: "Missing NetApp Volume Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/netAppAccounts/account1/capacityPools/pool1/volumes/", + Expected: nil, + }, + { + Name: "NetApp Volume ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/netAppAccounts/account1/capacityPools/pool1/volumes/volume1", + Expected: nil, + }, + { + Name: "Missing NetApp Snapshot Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/netAppAccounts/account1/capacityPools/pool1/volumes/volume1/snapshots/", + Expected: nil, + }, + { + Name: "NetApp Snapshot ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/netAppAccounts/account1/capacityPools/pool1/volumes/volume1/snapshots/snapshot1", + Expected: &NetAppSnapshotId{ + Name: "snapshot1", + VolumeName: "volume1", + PoolName: "pool1", + AccountName: "account1", + ResourceGroup: "resGroup1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/netAppAccounts/account1/capacityPools/pool1/volumes/volume1/SNAPSHOTS/snapshot1", + Expected: nil, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Name) + + actual, err := NetAppSnapshotID(v.Input) + if err != nil { + if v.Expected == nil { + continue + } + + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.Name != v.Expected.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expected.Name, actual.Name) + } + + if actual.AccountName != v.Expected.AccountName { + t.Fatalf("Expected %q but got %q for Account Name", v.Expected.AccountName, actual.AccountName) + } + + if actual.PoolName != v.Expected.PoolName { + t.Fatalf("Expected %q but got %q for Pool Name", v.Expected.PoolName, actual.PoolName) + } + + if actual.VolumeName != v.Expected.VolumeName { + t.Fatalf("Expected %q but got %q for Volume Name", v.Expected.VolumeName, actual.VolumeName) + } + + if actual.ResourceGroup != v.Expected.ResourceGroup { + t.Fatalf("Expected %q but got %q for Resource Group", v.Expected.ResourceGroup, actual.ResourceGroup) + } + } +} diff --git a/azurerm/internal/services/netapp/parse/netapp_volume.go b/azurerm/internal/services/netapp/parse/netapp_volume.go new file mode 100644 index 0000000000000..cd2d55cf06ae6 --- /dev/null +++ b/azurerm/internal/services/netapp/parse/netapp_volume.go @@ -0,0 +1,43 @@ +package parse + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type NetAppVolumeId struct { + ResourceGroup string + AccountName string + PoolName string + Name string +} + +func NetAppVolumeID(input string) (*NetAppVolumeId, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("[ERROR] Unable to parse NetApp Volume ID %q: %+v", input, err) + } + + service := NetAppVolumeId{ + ResourceGroup: id.ResourceGroup, + } + + if service.AccountName, err = id.PopSegment("netAppAccounts"); err != nil { + return nil, err + } + + if service.PoolName, err = id.PopSegment("capacityPools"); err != nil { + return nil, err + } + + if service.Name, err = id.PopSegment("volumes"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &service, nil +} diff --git a/azurerm/internal/services/netapp/parse/netapp_volume_test.go b/azurerm/internal/services/netapp/parse/netapp_volume_test.go new file mode 100644 index 0000000000000..c893056cb9f9c --- /dev/null +++ b/azurerm/internal/services/netapp/parse/netapp_volume_test.go @@ -0,0 +1,103 @@ +package parse + +import ( + "testing" +) + +func TestNetAppVolumeId(t *testing.T) { + testData := []struct { + Name string + Input string + Expected *NetAppVolumeId + }{ + { + Name: "Empty", + Input: "", + Expected: nil, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Expected: nil, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Expected: nil, + }, + { + Name: "Resource Group ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", + Expected: nil, + }, + { + Name: "Missing NetApp Account Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/netAppAccounts/", + Expected: nil, + }, + { + Name: "NetApp Account ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/netAppAccounts/account1", + Expected: nil, + }, + { + Name: "Missing NetApp Pool Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/netAppAccounts/account1/capacityPools/", + Expected: nil, + }, + { + Name: "NetApp Pool ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/netAppAccounts/account1/capacityPools/pool1", + Expected: nil, + }, + { + Name: "Missing NetApp Volume Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/netAppAccounts/account1/capacityPools/pool1/volumes/", + Expected: nil, + }, + { + Name: "NetApp Volume ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/netAppAccounts/account1/capacityPools/pool1/volumes/volume1", + Expected: &NetAppVolumeId{ + Name: "volume1", + PoolName: "pool1", + AccountName: "account1", + ResourceGroup: "resGroup1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.NetApp/netAppAccounts/account1/capacityPools/pool1/VOLUMES/volume1", + Expected: nil, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Name) + + actual, err := NetAppVolumeID(v.Input) + if err != nil { + if v.Expected == nil { + continue + } + + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.Name != v.Expected.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expected.Name, actual.Name) + } + + if actual.AccountName != v.Expected.AccountName { + t.Fatalf("Expected %q but got %q for Account Name", v.Expected.AccountName, actual.AccountName) + } + + if actual.PoolName != v.Expected.PoolName { + t.Fatalf("Expected %q but got %q for Pool Name", v.Expected.PoolName, actual.PoolName) + } + + if actual.ResourceGroup != v.Expected.ResourceGroup { + t.Fatalf("Expected %q but got %q for Resource Group", v.Expected.ResourceGroup, actual.ResourceGroup) + } + } +} diff --git a/azurerm/internal/services/netapp/resource_arm_netapp_account.go b/azurerm/internal/services/netapp/resource_arm_netapp_account.go index 13a5e3bea09f6..47953e039d282 100644 --- a/azurerm/internal/services/netapp/resource_arm_netapp_account.go +++ b/azurerm/internal/services/netapp/resource_arm_netapp_account.go @@ -16,6 +16,9 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/netapp/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -27,16 +30,16 @@ func resourceArmNetAppAccount() *schema.Resource { Update: resourceArmNetAppAccountCreateUpdate, Delete: resourceArmNetAppAccountDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(30 * time.Minute), Read: schema.DefaultTimeout(5 * time.Minute), Update: schema.DefaultTimeout(30 * time.Minute), Delete: schema.DefaultTimeout(30 * time.Minute), }, + Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { + _, err := parse.NetAppAccountID(id) + return err + }), Schema: map[string]*schema.Schema{ "name": { @@ -99,7 +102,7 @@ func resourceArmNetAppAccount() *schema.Resource { }, }, - // Handles tags being interface{} until https://github.com/Azure/azure-rest-api-specs/issues/7447 is fixed + "tags": tags.Schema(), }, } } @@ -132,6 +135,7 @@ func resourceArmNetAppAccountCreateUpdate(d *schema.ResourceData, meta interface AccountProperties: &netapp.AccountProperties{ ActiveDirectories: expandArmNetAppActiveDirectories(activeDirectories), }, + Tags: tags.Expand(d.Get("tags").(map[string]interface{})), } future, err := client.CreateOrUpdate(ctx, accountParameters, resourceGroup, name) @@ -159,30 +163,28 @@ func resourceArmNetAppAccountRead(d *schema.ResourceData, meta interface{}) erro ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.NetAppAccountID(d.Id()) if err != nil { return err } - resourceGroup := id.ResourceGroup - name := id.Path["netAppAccounts"] - resp, err := client.Get(ctx, resourceGroup, name) + resp, err := client.Get(ctx, id.ResourceGroup, id.Name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { log.Printf("[INFO] NetApp Accounts %q does not exist - removing from state", d.Id()) d.SetId("") return nil } - return fmt.Errorf("Error reading NetApp Accounts %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error reading NetApp Accounts %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } d.Set("name", resp.Name) - d.Set("resource_group_name", resourceGroup) + d.Set("resource_group_name", id.ResourceGroup) if location := resp.Location; location != nil { d.Set("location", azure.NormalizeLocation(*location)) } - return nil + return tags.FlattenAndSet(d, resp.Tags) } func resourceArmNetAppAccountDelete(d *schema.ResourceData, meta interface{}) error { @@ -190,21 +192,19 @@ func resourceArmNetAppAccountDelete(d *schema.ResourceData, meta interface{}) er ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.NetAppAccountID(d.Id()) if err != nil { return err } - resourceGroup := id.ResourceGroup - name := id.Path["netAppAccounts"] - future, err := client.Delete(ctx, resourceGroup, name) + future, err := client.Delete(ctx, id.ResourceGroup, id.Name) if err != nil { - return fmt.Errorf("Error deleting NetApp Account %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error deleting NetApp Account %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { if !response.WasNotFound(future.Response()) { - return fmt.Errorf("Error waiting for deleting NetApp Account %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error waiting for deleting NetApp Account %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } } diff --git a/azurerm/internal/services/netapp/resource_arm_netapp_pool.go b/azurerm/internal/services/netapp/resource_arm_netapp_pool.go index 418df5a96d02a..1c1f62d64d965 100644 --- a/azurerm/internal/services/netapp/resource_arm_netapp_pool.go +++ b/azurerm/internal/services/netapp/resource_arm_netapp_pool.go @@ -15,6 +15,9 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/netapp/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -26,16 +29,16 @@ func resourceArmNetAppPool() *schema.Resource { Update: resourceArmNetAppPoolCreateUpdate, Delete: resourceArmNetAppPoolDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(30 * time.Minute), Read: schema.DefaultTimeout(5 * time.Minute), Update: schema.DefaultTimeout(30 * time.Minute), Delete: schema.DefaultTimeout(30 * time.Minute), }, + Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { + _, err := parse.NetAppPoolID(id) + return err + }), Schema: map[string]*schema.Schema{ "name": { @@ -71,6 +74,8 @@ func resourceArmNetAppPool() *schema.Resource { Required: true, ValidateFunc: validation.IntBetween(4, 500), }, + + "tags": tags.Schema(), }, } } @@ -108,6 +113,7 @@ func resourceArmNetAppPoolCreateUpdate(d *schema.ResourceData, meta interface{}) ServiceLevel: netapp.ServiceLevel(serviceLevel), Size: utils.Int64(sizeInBytes), }, + Tags: tags.Expand(d.Get("tags").(map[string]interface{})), } future, err := client.CreateOrUpdate(ctx, capacityPoolParameters, resourceGroup, accountName, name) @@ -135,27 +141,24 @@ func resourceArmNetAppPoolRead(d *schema.ResourceData, meta interface{}) error { ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.NetAppPoolID(d.Id()) if err != nil { return err } - resourceGroup := id.ResourceGroup - accountName := id.Path["netAppAccounts"] - name := id.Path["capacityPools"] - resp, err := client.Get(ctx, resourceGroup, accountName, name) + resp, err := client.Get(ctx, id.ResourceGroup, id.AccountName, id.Name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { log.Printf("[INFO] NetApp Pools %q does not exist - removing from state", d.Id()) d.SetId("") return nil } - return fmt.Errorf("Error reading NetApp Pools %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error reading NetApp Pools %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } - d.Set("name", name) - d.Set("resource_group_name", resourceGroup) - d.Set("account_name", accountName) + d.Set("name", id.Name) + d.Set("resource_group_name", id.ResourceGroup) + d.Set("account_name", id.AccountName) if location := resp.Location; location != nil { d.Set("location", azure.NormalizeLocation(*location)) } @@ -171,7 +174,7 @@ func resourceArmNetAppPoolRead(d *schema.ResourceData, meta interface{}) error { d.Set("size_in_tb", int(sizeInTB)) } - return nil + return tags.FlattenAndSet(d, resp.Tags) } func resourceArmNetAppPoolDelete(d *schema.ResourceData, meta interface{}) error { @@ -179,29 +182,26 @@ func resourceArmNetAppPoolDelete(d *schema.ResourceData, meta interface{}) error ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.NetAppPoolID(d.Id()) if err != nil { return err } - resourceGroup := id.ResourceGroup - accountName := id.Path["netAppAccounts"] - name := id.Path["capacityPools"] - _, err = client.Delete(ctx, resourceGroup, accountName, name) + _, err = client.Delete(ctx, id.ResourceGroup, id.AccountName, id.Name) if err != nil { - return fmt.Errorf("Error deleting NetApp Pool %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error deleting NetApp Pool %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } - log.Printf("[DEBUG] Waiting for NetApp Pool %q (Resource Group %q) to be deleted", name, resourceGroup) + log.Printf("[DEBUG] Waiting for NetApp Pool %q (Resource Group %q) to be deleted", id.Name, id.ResourceGroup) stateConf := &resource.StateChangeConf{ Pending: []string{"200", "202"}, Target: []string{"404"}, - Refresh: netappPoolDeleteStateRefreshFunc(ctx, client, resourceGroup, accountName, name), + Refresh: netappPoolDeleteStateRefreshFunc(ctx, client, id.ResourceGroup, id.AccountName, id.Name), Timeout: d.Timeout(schema.TimeoutDelete), } if _, err := stateConf.WaitForState(); err != nil { - return fmt.Errorf("Error waiting for NetApp Pool %q (Resource Group %q) to be deleted: %+v", name, resourceGroup, err) + return fmt.Errorf("Error waiting for NetApp Pool %q (Resource Group %q) to be deleted: %+v", id.Name, id.ResourceGroup, err) } return nil diff --git a/azurerm/internal/services/netapp/resource_arm_netapp_snapshot.go b/azurerm/internal/services/netapp/resource_arm_netapp_snapshot.go index dc8e0d3152f3f..28f1740c58eef 100644 --- a/azurerm/internal/services/netapp/resource_arm_netapp_snapshot.go +++ b/azurerm/internal/services/netapp/resource_arm_netapp_snapshot.go @@ -12,6 +12,9 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/netapp/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -20,19 +23,19 @@ func resourceArmNetAppSnapshot() *schema.Resource { return &schema.Resource{ Create: resourceArmNetAppSnapshotCreate, Read: resourceArmNetAppSnapshotRead, - Update: nil, + Update: resourceArmNetAppSnapshotUpdate, Delete: resourceArmNetAppSnapshotDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(30 * time.Minute), Read: schema.DefaultTimeout(5 * time.Minute), Update: schema.DefaultTimeout(30 * time.Minute), Delete: schema.DefaultTimeout(30 * time.Minute), }, + Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { + _, err := parse.NetAppSnapshotID(id) + return err + }), Schema: map[string]*schema.Schema{ "name": { @@ -66,6 +69,8 @@ func resourceArmNetAppSnapshot() *schema.Resource { ForceNew: true, ValidateFunc: ValidateNetAppVolumeName, }, + + "tags": tags.Schema(), }, } } @@ -97,6 +102,7 @@ func resourceArmNetAppSnapshotCreate(d *schema.ResourceData, meta interface{}) e parameters := netapp.Snapshot{ Location: utils.String(location), + Tags: tags.Expand(d.Get("tags").(map[string]interface{})), } future, err := client.Create(ctx, parameters, resourceGroup, accountName, poolName, volumeName, name) @@ -124,36 +130,60 @@ func resourceArmNetAppSnapshotRead(d *schema.ResourceData, meta interface{}) err ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.NetAppSnapshotID(d.Id()) if err != nil { return err } - resourceGroup := id.ResourceGroup - accountName := id.Path["netAppAccounts"] - poolName := id.Path["capacityPools"] - volumeName := id.Path["volumes"] - name := id.Path["snapshots"] - resp, err := client.Get(ctx, resourceGroup, accountName, poolName, volumeName, name) + resp, err := client.Get(ctx, id.ResourceGroup, id.AccountName, id.PoolName, id.VolumeName, id.Name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { log.Printf("[INFO] NetApp Snapshots %q does not exist - removing from state", d.Id()) d.SetId("") return nil } - return fmt.Errorf("Error reading NetApp Snapshots %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error reading NetApp Snapshots %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } - d.Set("name", name) - d.Set("resource_group_name", resourceGroup) - d.Set("account_name", accountName) - d.Set("pool_name", poolName) - d.Set("volume_name", volumeName) + d.Set("name", id.Name) + d.Set("resource_group_name", id.ResourceGroup) + d.Set("account_name", id.AccountName) + d.Set("pool_name", id.PoolName) + d.Set("volume_name", id.VolumeName) if location := resp.Location; location != nil { d.Set("location", azure.NormalizeLocation(*location)) } - return nil + return tags.FlattenAndSet(d, resp.Tags) +} + +func resourceArmNetAppSnapshotUpdate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).NetApp.SnapshotClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := parse.NetAppSnapshotID(d.Id()) + if err != nil { + return err + } + + parameters := netapp.SnapshotPatch{ + Tags: tags.Expand(d.Get("tags").(map[string]interface{})), + } + + if _, err = client.Update(ctx, parameters, id.ResourceGroup, id.AccountName, id.PoolName, id.VolumeName, id.Name); err != nil { + return fmt.Errorf("Error updating NetApp Snapshot %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) + } + + resp, err := client.Get(ctx, id.ResourceGroup, id.AccountName, id.PoolName, id.VolumeName, id.Name) + if err != nil { + return fmt.Errorf("Error retrieving NetApp Snapshot %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) + } + if resp.ID == nil || *resp.ID == "" { + return fmt.Errorf("Cannot read NetApp Snapshot %q (Resource Group %q) ID", id.Name, id.ResourceGroup) + } + + return resourceArmNetAppSnapshotRead(d, meta) } func resourceArmNetAppSnapshotDelete(d *schema.ResourceData, meta interface{}) error { @@ -161,27 +191,22 @@ func resourceArmNetAppSnapshotDelete(d *schema.ResourceData, meta interface{}) e ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.NetAppSnapshotID(d.Id()) if err != nil { return err } - resourceGroup := id.ResourceGroup - accountName := id.Path["netAppAccounts"] - poolName := id.Path["capacityPools"] - volumeName := id.Path["volumes"] - name := id.Path["snapshots"] - future, err := client.Delete(ctx, resourceGroup, accountName, poolName, volumeName, name) + future, err := client.Delete(ctx, id.ResourceGroup, id.AccountName, id.PoolName, id.VolumeName, id.Name) if err != nil { if response.WasNotFound(future.Response()) { return nil } - return fmt.Errorf("Error deleting NetApp Snapshot %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error deleting NetApp Snapshot %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { if !response.WasNotFound(future.Response()) { - return fmt.Errorf("Error waiting for deleting NetApp Snapshot %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error waiting for deleting NetApp Snapshot %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } } diff --git a/azurerm/internal/services/netapp/resource_arm_netapp_volume.go b/azurerm/internal/services/netapp/resource_arm_netapp_volume.go index b608044c524ea..8fa6a6fabc6b6 100644 --- a/azurerm/internal/services/netapp/resource_arm_netapp_volume.go +++ b/azurerm/internal/services/netapp/resource_arm_netapp_volume.go @@ -17,6 +17,9 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/netapp/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -28,16 +31,16 @@ func resourceArmNetAppVolume() *schema.Resource { Update: resourceArmNetAppVolumeCreateUpdate, Delete: resourceArmNetAppVolumeDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(30 * time.Minute), Read: schema.DefaultTimeout(5 * time.Minute), Update: schema.DefaultTimeout(30 * time.Minute), Delete: schema.DefaultTimeout(60 * time.Minute), }, + Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error { + _, err := parse.NetAppVolumeID(id) + return err + }), Schema: map[string]*schema.Schema{ "name": { @@ -178,6 +181,8 @@ func resourceArmNetAppVolume() *schema.Resource { }, }, }, + + "tags": tags.Schema(), }, } } @@ -226,6 +231,7 @@ func resourceArmNetAppVolumeCreateUpdate(d *schema.ResourceData, meta interface{ UsageThreshold: utils.Int64(storageQuotaInGB), ExportPolicy: expandArmNetAppVolumeExportPolicyRule(exportPolicyRule), }, + Tags: tags.Expand(d.Get("tags").(map[string]interface{})), } future, err := client.CreateOrUpdate(ctx, parameters, resourceGroup, accountName, poolName, name) @@ -253,29 +259,25 @@ func resourceArmNetAppVolumeRead(d *schema.ResourceData, meta interface{}) error ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.NetAppVolumeID(d.Id()) if err != nil { return err } - resourceGroup := id.ResourceGroup - accountName := id.Path["netAppAccounts"] - poolName := id.Path["capacityPools"] - name := id.Path["volumes"] - resp, err := client.Get(ctx, resourceGroup, accountName, poolName, name) + resp, err := client.Get(ctx, id.ResourceGroup, id.AccountName, id.PoolName, id.Name) if err != nil { if utils.ResponseWasNotFound(resp.Response) { log.Printf("[INFO] NetApp Volumes %q does not exist - removing from state", d.Id()) d.SetId("") return nil } - return fmt.Errorf("Error reading NetApp Volumes %q (Resource Group %q): %+v", name, resourceGroup, err) + return fmt.Errorf("Error reading NetApp Volumes %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } - d.Set("name", name) - d.Set("resource_group_name", resourceGroup) - d.Set("account_name", accountName) - d.Set("pool_name", poolName) + d.Set("name", id.Name) + d.Set("resource_group_name", id.ResourceGroup) + d.Set("account_name", id.AccountName) + d.Set("pool_name", id.PoolName) if location := resp.Location; location != nil { d.Set("location", azure.NormalizeLocation(*location)) } @@ -292,7 +294,7 @@ func resourceArmNetAppVolumeRead(d *schema.ResourceData, meta interface{}) error } } - return nil + return tags.FlattenAndSet(d, resp.Tags) } func resourceArmNetAppVolumeDelete(d *schema.ResourceData, meta interface{}) error { @@ -300,17 +302,13 @@ func resourceArmNetAppVolumeDelete(d *schema.ResourceData, meta interface{}) err ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() - id, err := azure.ParseAzureResourceID(d.Id()) + id, err := parse.NetAppVolumeID(d.Id()) if err != nil { return err } - resourceGroup := id.ResourceGroup - accountName := id.Path["netAppAccounts"] - poolName := id.Path["capacityPools"] - name := id.Path["volumes"] - if _, err = client.Delete(ctx, resourceGroup, accountName, poolName, name); err != nil { - return fmt.Errorf("Error deleting NetApp Volume %q (Resource Group %q): %+v", name, resourceGroup, err) + if _, err = client.Delete(ctx, id.ResourceGroup, id.AccountName, id.PoolName, id.Name); err != nil { + return fmt.Errorf("Error deleting NetApp Volume %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } // The resource NetApp Volume depends on the resource NetApp Pool. @@ -318,16 +316,16 @@ func resourceArmNetAppVolumeDelete(d *schema.ResourceData, meta interface{}) err // Then it tries to immediately delete NetApp Pool but it still throws error `Can not delete resource before nested resources are deleted.` // In this case we're going to try triggering the Deletion again, in-case it didn't work prior to this attempt. // For more details, see related Bug: https://github.com/Azure/azure-sdk-for-go/issues/6485 - log.Printf("[DEBUG] Waiting for NetApp Volume Provisioning Service %q (Resource Group %q) to be deleted", name, resourceGroup) + log.Printf("[DEBUG] Waiting for NetApp Volume Provisioning Service %q (Resource Group %q) to be deleted", id.Name, id.ResourceGroup) stateConf := &resource.StateChangeConf{ Pending: []string{"200", "202"}, Target: []string{"404"}, - Refresh: netappVolumeDeleteStateRefreshFunc(ctx, client, resourceGroup, accountName, poolName, name), + Refresh: netappVolumeDeleteStateRefreshFunc(ctx, client, id.ResourceGroup, id.AccountName, id.PoolName, id.Name), Timeout: d.Timeout(schema.TimeoutDelete), } if _, err := stateConf.WaitForState(); err != nil { - return fmt.Errorf("Error waiting for NetApp Volume Provisioning Service %q (Resource Group %q) to be deleted: %+v", name, resourceGroup, err) + return fmt.Errorf("Error waiting for NetApp Volume Provisioning Service %q (Resource Group %q) to be deleted: %+v", id.Name, id.ResourceGroup, err) } return nil diff --git a/azurerm/internal/services/netapp/tests/resource_arm_netapp_account_test.go b/azurerm/internal/services/netapp/tests/resource_arm_netapp_account_test.go index fff167f19452d..4707d89700281 100644 --- a/azurerm/internal/services/netapp/tests/resource_arm_netapp_account_test.go +++ b/azurerm/internal/services/netapp/tests/resource_arm_netapp_account_test.go @@ -98,6 +98,8 @@ func testAccAzureRMNetAppAccount_complete(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetAppAccountExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "active_directory.#", "1"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.FoO", "BaR"), ), }, data.ImportStep("active_directory"), @@ -118,6 +120,7 @@ func testAccAzureRMNetAppAccount_update(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetAppAccountExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "active_directory.#", "0"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "0"), ), }, { @@ -125,6 +128,8 @@ func testAccAzureRMNetAppAccount_update(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetAppAccountExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "active_directory.#", "1"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.FoO", "BaR"), ), }, data.ImportStep("active_directory"), @@ -234,6 +239,10 @@ resource "azurerm_netapp_account" "test" { domain = "westcentralus.com" organizational_unit = "OU=FirstLevel" } + + tags = { + "FoO" = "BaR" + } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } diff --git a/azurerm/internal/services/netapp/tests/resource_arm_netapp_pool_test.go b/azurerm/internal/services/netapp/tests/resource_arm_netapp_pool_test.go index d3a4b4268d0a2..ee8497556d50c 100644 --- a/azurerm/internal/services/netapp/tests/resource_arm_netapp_pool_test.go +++ b/azurerm/internal/services/netapp/tests/resource_arm_netapp_pool_test.go @@ -72,6 +72,8 @@ func TestAccAzureRMNetAppPool_complete(t *testing.T) { testCheckAzureRMNetAppPoolExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "service_level", "Standard"), resource.TestCheckResourceAttr(data.ResourceName, "size_in_tb", "15"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.FoO", "BaR"), ), }, data.ImportStep(), @@ -93,6 +95,7 @@ func TestAccAzureRMNetAppPool_update(t *testing.T) { testCheckAzureRMNetAppPoolExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "service_level", "Standard"), resource.TestCheckResourceAttr(data.ResourceName, "size_in_tb", "4"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "0"), ), }, data.ImportStep(), @@ -102,6 +105,8 @@ func TestAccAzureRMNetAppPool_update(t *testing.T) { testCheckAzureRMNetAppPoolExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "service_level", "Standard"), resource.TestCheckResourceAttr(data.ResourceName, "size_in_tb", "15"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.FoO", "BaR"), ), }, data.ImportStep(), @@ -225,6 +230,10 @@ resource "azurerm_netapp_pool" "test" { resource_group_name = azurerm_resource_group.test.name service_level = "Standard" size_in_tb = 15 + + tags = { + "FoO" = "BaR" + } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) } diff --git a/azurerm/internal/services/netapp/tests/resource_arm_netapp_snapshot_test.go b/azurerm/internal/services/netapp/tests/resource_arm_netapp_snapshot_test.go index fdbdd90f88135..50e1fc277d3f2 100644 --- a/azurerm/internal/services/netapp/tests/resource_arm_netapp_snapshot_test.go +++ b/azurerm/internal/services/netapp/tests/resource_arm_netapp_snapshot_test.go @@ -70,6 +70,8 @@ func TestAccAzureRMNetAppSnapshot_complete(t *testing.T) { Config: testAccAzureRMNetAppSnapshot_complete(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetAppSnapshotExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.FoO", "BaR"), ), }, data.ImportStep(), @@ -92,6 +94,18 @@ func TestAccAzureRMNetAppSnapshot_update(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetAppSnapshotExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "volume_name", oldVolumeName), + resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.FoO", "BaR"), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMNetAppSnapshot_updateTags(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetAppSnapshotExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "volume_name", oldVolumeName), + resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.FoO", "BaZ"), ), }, data.ImportStep(), @@ -100,6 +114,7 @@ func TestAccAzureRMNetAppSnapshot_update(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMNetAppSnapshotExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "volume_name", newVolumeName), + resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "0"), ), }, data.ImportStep(), @@ -204,6 +219,30 @@ resource "azurerm_netapp_snapshot" "test" { volume_name = azurerm_netapp_volume.test.name location = azurerm_resource_group.test.location resource_group_name = azurerm_resource_group.test.name + + tags = { + "FoO" = "BaR" + } +} +`, template, data.RandomInteger) +} + +func testAccAzureRMNetAppSnapshot_updateTags(data acceptance.TestData) string { + template := testAccAzureRMNetAppSnapshot_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_netapp_snapshot" "test" { + name = "acctest-NetAppSnapshot-%d" + account_name = azurerm_netapp_account.test.name + pool_name = azurerm_netapp_pool.test.name + volume_name = azurerm_netapp_volume.test.name + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + + tags = { + "FoO" = "BaZ" + } } `, template, data.RandomInteger) } diff --git a/azurerm/internal/services/netapp/tests/resource_arm_netapp_volume_test.go b/azurerm/internal/services/netapp/tests/resource_arm_netapp_volume_test.go index c6cd35fee4b0a..c6543d8bd69a0 100644 --- a/azurerm/internal/services/netapp/tests/resource_arm_netapp_volume_test.go +++ b/azurerm/internal/services/netapp/tests/resource_arm_netapp_volume_test.go @@ -95,6 +95,8 @@ func TestAccAzureRMNetAppVolume_complete(t *testing.T) { resource.TestCheckResourceAttr(data.ResourceName, "service_level", "Standard"), resource.TestCheckResourceAttr(data.ResourceName, "storage_quota_in_gb", "101"), resource.TestCheckResourceAttr(data.ResourceName, "export_policy_rule.#", "3"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.FoO", "BaR"), ), }, data.ImportStep(), @@ -116,6 +118,7 @@ func TestAccAzureRMNetAppVolume_update(t *testing.T) { testCheckAzureRMNetAppVolumeExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "storage_quota_in_gb", "100"), resource.TestCheckResourceAttr(data.ResourceName, "export_policy_rule.#", "0"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "0"), ), }, data.ImportStep(), @@ -125,6 +128,8 @@ func TestAccAzureRMNetAppVolume_update(t *testing.T) { testCheckAzureRMNetAppVolumeExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "storage_quota_in_gb", "101"), resource.TestCheckResourceAttr(data.ResourceName, "export_policy_rule.#", "3"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.FoO", "BaR"), ), }, data.ImportStep(), @@ -134,6 +139,7 @@ func TestAccAzureRMNetAppVolume_update(t *testing.T) { testCheckAzureRMNetAppVolumeExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "storage_quota_in_gb", "100"), resource.TestCheckResourceAttr(data.ResourceName, "export_policy_rule.#", "0"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "0"), ), }, data.ImportStep(), @@ -366,6 +372,10 @@ resource "azurerm_netapp_volume" "test" { unix_read_only = true unix_read_write = false } + + tags = { + "FoO" = "BaR" + } } `, template, data.RandomInteger, data.RandomInteger) } @@ -437,6 +447,10 @@ resource "azurerm_netapp_volume" "test" { unix_read_only = false unix_read_write = true } + + tags = { + "FoO" = "BaR" + } } `, template, data.RandomInteger, data.RandomInteger) } diff --git a/website/docs/r/netapp_account.html.markdown b/website/docs/r/netapp_account.html.markdown index 3540442f8a505..c58c59482de33 100644 --- a/website/docs/r/netapp_account.html.markdown +++ b/website/docs/r/netapp_account.html.markdown @@ -48,6 +48,8 @@ The following arguments are supported: * `active_directory` - (Optional) A `active_directory` block as defined below. +* `tags` - (Optional) A mapping of tags to assign to the resource. + --- The `active_directory` block supports the following: diff --git a/website/docs/r/netapp_pool.html.markdown b/website/docs/r/netapp_pool.html.markdown index d3b70460f614c..60dd04058f256 100644 --- a/website/docs/r/netapp_pool.html.markdown +++ b/website/docs/r/netapp_pool.html.markdown @@ -50,6 +50,8 @@ The following arguments are supported: * `size_in_tb` - (Required) Provisioned size of the pool in TB. Value must be between `4` and `500`. +* `tags` - (Optional) A mapping of tags to assign to the resource. + --- ## Attributes Reference diff --git a/website/docs/r/netapp_snapshot.html.markdown b/website/docs/r/netapp_snapshot.html.markdown index 9e47b24b2bfee..e84fac7cca322 100644 --- a/website/docs/r/netapp_snapshot.html.markdown +++ b/website/docs/r/netapp_snapshot.html.markdown @@ -94,6 +94,8 @@ The following arguments are supported: * `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. +* `tags` - (Optional) A mapping of tags to assign to the resource. + --- ## Attributes Reference diff --git a/website/docs/r/netapp_volume.html.markdown b/website/docs/r/netapp_volume.html.markdown index 891125b5dd5de..76294e7c10e10 100644 --- a/website/docs/r/netapp_volume.html.markdown +++ b/website/docs/r/netapp_volume.html.markdown @@ -100,6 +100,8 @@ The following arguments are supported: * `export_policy_rule` - (Optional) One or more `export_policy_rule` block defined below. +* `tags` - (Optional) A mapping of tags to assign to the resource. + -> **Note**: It is highly recommended to use the **lifecycle** property as noted in the example since it will prevent an accidental deletion of the volume if the `protocols` argument changes to a different protocol type. --- From bc9e0d869a8b50fae9083081a9dce3e19c8d44d9 Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 5 Mar 2020 23:48:17 -0800 Subject: [PATCH 475/498] Update CHANGELOG.md to include #5995 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d394b59a0ee0..52a0feabb7007 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,10 @@ netapp: upgrading to API version `2019-10-01` [GH-5485] * `azurerm_frontdoor` - exposed new attributes in `backend_pool_health_probe` block `enabled` and `probe_method` [GH-5924] * `azurerm_function_app` - Added `os_type` field to facilitate support of `linux` function apps [GH-5839] * `azurerm_kusto_cluster` - support for `enable_disk_encryption` and `enable_streaming_ingest` properties [GH-5855] +* `azurerm_netapp_account` - support for the `tags` property [GH-5995] +* `azurerm_netapp_pool` - support for the `tags` property [GH-5995] +* `azurerm_netapp_snapshot` - support for the `tags` property [GH-5995] +* `azurerm_netapp_volume` - support for the `tags` property [GH-5995] * `azurerm_netapp_volume` - support for the `protocol_types` property [GH-5485] * `azurerm_netapp_volume` - deprecated the `cifs_enabled`, `nfsv3_enabled`, and `nfsv4_enabled` properties in favour of `protocols_enabled` [GH-5485] * `azurerm_private_dns_a_record` - export the `fqdn` property [GH-5949] From 3439c969ba345d41a1f9a4b4c5190bd5274ae91b Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Fri, 6 Mar 2020 09:44:01 -0800 Subject: [PATCH 476/498] Address review --- ...esource_arm_spatial_anchors_account_test.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/azurerm/internal/services/mixedreality/tests/resource_arm_spatial_anchors_account_test.go b/azurerm/internal/services/mixedreality/tests/resource_arm_spatial_anchors_account_test.go index 5a979e2afecda..79d963e84e6ea 100644 --- a/azurerm/internal/services/mixedreality/tests/resource_arm_spatial_anchors_account_test.go +++ b/azurerm/internal/services/mixedreality/tests/resource_arm_spatial_anchors_account_test.go @@ -32,7 +32,7 @@ func TestAccAzureRMSpatialAnchorsAccount_basic(t *testing.T) { }) } -func TestAccAzureRMSpatialAnchorsAccount_tags(t *testing.T) { +func TestAccAzureRMSpatialAnchorsAccount_complete(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_spatial_anchors_account", "test") resource.ParallelTest(t, resource.TestCase{ @@ -41,11 +41,11 @@ func TestAccAzureRMSpatialAnchorsAccount_tags(t *testing.T) { CheckDestroy: testCheckAzureRMSpatialAnchorsAccountDestroy, Steps: []resource.TestStep{ { - Config: testAccAzureRMSpatialAnchorsAccount_tags(data), + Config: testAccAzureRMSpatialAnchorsAccount_complete(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMSpatialAnchorsAccountExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"), - resource.TestCheckResourceAttr(data.ResourceName, "tags.environment", "production"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.Environment", "Production"), ), }, data.ImportStep(), @@ -116,36 +116,36 @@ provider "azurerm" { } resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" + name = "acctestRG-mr-%d" location = "%s" } resource "azurerm_spatial_anchors_account" "test" { - name = "acctest_saa%d" + name = "accTEst_saa%d" location = azurerm_resource_group.test.location resource_group_name = azurerm_resource_group.test.name } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } -func testAccAzureRMSpatialAnchorsAccount_tags(data acceptance.TestData) string { +func testAccAzureRMSpatialAnchorsAccount_complete(data acceptance.TestData) string { return fmt.Sprintf(` provider "azurerm" { features {} } resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" + name = "acctestRG-mr-%d" location = "%s" } resource "azurerm_spatial_anchors_account" "test" { - name = "acctestdf%d" + name = "acCTestdf%d" location = azurerm_resource_group.test.location resource_group_name = azurerm_resource_group.test.name tags = { - environment = "production" + Environment = "Production" } } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) From c596427015cd751c1d0e8a4951d2b69673df6be5 Mon Sep 17 00:00:00 2001 From: Tracy P Holmes <12778804+tracypholmes@users.noreply.github.com> Date: Fri, 6 Mar 2020 12:03:12 -0600 Subject: [PATCH 477/498] docs: Updated `traffic_manager_profile` arguments (#6024) Corrects `name` and `resource_group_name` from Virtual Network to Traffic Manager Fixes #4850 --- .../r/traffic_manager_profile.html.markdown | 35 +++++++------------ 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/website/docs/r/traffic_manager_profile.html.markdown b/website/docs/r/traffic_manager_profile.html.markdown index b15495dc5d396..afa790a061f17 100644 --- a/website/docs/r/traffic_manager_profile.html.markdown +++ b/website/docs/r/traffic_manager_profile.html.markdown @@ -13,7 +13,6 @@ Manages a Traffic Manager Profile to which multiple endpoints can be attached. ## Example Usage - ```hcl resource "random_id" "server" { keepers = { @@ -57,39 +56,31 @@ resource "azurerm_traffic_manager_profile" "example" { The following arguments are supported: -* `name` - (Required) The name of the virtual network. Changing this forces a - new resource to be created. +* `name` - (Required) The name of the Traffic Manager profile. Changing this forces a new resource to be created. -* `resource_group_name` - (Required) The name of the resource group in which to - create the virtual network. +* `resource_group_name` - (Required) The name of the resource group in which to create the Traffic Manager profile. -* `profile_status` - (Optional) The status of the profile, can be set to either - `Enabled` or `Disabled`. Defaults to `Enabled`. +* `profile_status` - (Optional) The status of the profile, can be set to either `Enabled` or `Disabled`. Defaults to `Enabled`. * `traffic_routing_method` - (Required) Specifies the algorithm used to route traffic, possible values are: - - `Geographic` - Traffic is routed based on Geographic regions specified in the Endpoint. - - `MultiValue`- All healthy Endpoints are returned. MultiValue routing method works only if all the endpoints of type ‘External’ and are specified as IPv4 or IPv6 addresses. - - `Performance` - Traffic is routed via the User's closest Endpoint - - `Priority` - Traffic is routed to the Endpoint with the lowest `priority` value. - - `Subnet` - Traffic is routed based on a mapping of sets of end-user IP address ranges to a specific Endpoint within a Traffic Manager profile. - - `Weighted` - Traffic is spread across Endpoints proportional to their `weight` value. + * `Geographic` - Traffic is routed based on Geographic regions specified in the Endpoint. + * `MultiValue` - All healthy Endpoints are returned. MultiValue routing method works only if all the endpoints of type ‘External’ and are specified as IPv4 or IPv6 addresses. + * `Performance` - Traffic is routed via the User's closest Endpoint + * `Priority` - Traffic is routed to the Endpoint with the lowest `priority` value. + * `Subnet` - Traffic is routed based on a mapping of sets of end-user IP address ranges to a specific Endpoint within a Traffic Manager profile. + * `Weighted` - Traffic is spread across Endpoints proportional to their `weight` value. -* `dns_config` - (Required) This block specifies the DNS configuration of the - Profile, it supports the fields documented below. +* `dns_config` - (Required) This block specifies the DNS configuration of the Profile, it supports the fields documented below. -* `monitor_config` - (Required) This block specifies the Endpoint monitoring - configuration for the Profile, it supports the fields documented below. +* `monitor_config` - (Required) This block specifies the Endpoint monitoring configuration for the Profile, it supports the fields documented below. * `tags` - (Optional) A mapping of tags to assign to the resource. The `dns_config` block supports: -* `relative_name` - (Required) The relative domain name, this is combined with - the domain name used by Traffic Manager to form the FQDN which is exported - as documented below. Changing this forces a new resource to be created. +* `relative_name` - (Required) The relative domain name, this is combined with the domain name used by Traffic Manager to form the FQDN which is exported as documented below. Changing this forces a new resource to be created. -* `ttl` - (Required) The TTL value of the Profile used by Local DNS resolvers - and clients. +* `ttl` - (Required) The TTL value of the Profile used by Local DNS resolvers and clients. The `monitor_config` block supports: From 190d333ed2394482729ea475d6126e1c5c47a69f Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Fri, 6 Mar 2020 10:29:50 -0800 Subject: [PATCH 478/498] Fix sidebar link --- website/azurerm.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/azurerm.erb b/website/azurerm.erb index d04fe05ee01c1..21528bff1d577 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -1618,7 +1618,7 @@ Mixed Reality From 70915ecc4b0b029b59896c11abc265591a2f91ac Mon Sep 17 00:00:00 2001 From: xuzhang3 <57888764+xuzhang3@users.noreply.github.com> Date: Sat, 7 Mar 2020 03:14:35 +0800 Subject: [PATCH 479/498] New Resource: IoTCentralApplocation (#5446) --- azurerm/internal/clients/client.go | 3 + azurerm/internal/provider/services.go | 2 + .../services/iotcentral/client/client.go | 18 + .../parse/iotcentral_application.go | 33 + .../parse/iotcentral_application_test.go | 73 ++ .../services/iotcentral/registration.go | 31 + .../resource_arm_iotcentral_application.go | 267 ++++++ ...esource_arm_iotcentral_application_test.go | 245 +++++ .../iotcentral/validate/iotcentral_app.go | 44 + .../validate/iotcentral_app_test.go | 468 +++++++++ .../mgmt/2018-09-01/iotcentral/apps.go | 870 +++++++++++++++++ .../mgmt/2018-09-01/iotcentral/client.go | 51 + .../mgmt/2018-09-01/iotcentral/models.go | 889 ++++++++++++++++++ .../mgmt/2018-09-01/iotcentral/operations.go | 147 +++ .../mgmt/2018-09-01/iotcentral/version.go | 30 + vendor/modules.txt | 1 + website/allowed-subcategories | 1 + website/azurerm.erb | 9 + .../r/iotcentral_application.html.markdown | 69 ++ 19 files changed, 3251 insertions(+) create mode 100644 azurerm/internal/services/iotcentral/client/client.go create mode 100644 azurerm/internal/services/iotcentral/parse/iotcentral_application.go create mode 100644 azurerm/internal/services/iotcentral/parse/iotcentral_application_test.go create mode 100644 azurerm/internal/services/iotcentral/registration.go create mode 100644 azurerm/internal/services/iotcentral/resource_arm_iotcentral_application.go create mode 100644 azurerm/internal/services/iotcentral/tests/resource_arm_iotcentral_application_test.go create mode 100644 azurerm/internal/services/iotcentral/validate/iotcentral_app.go create mode 100644 azurerm/internal/services/iotcentral/validate/iotcentral_app_test.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral/apps.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral/client.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral/models.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral/operations.go create mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral/version.go create mode 100644 website/docs/r/iotcentral_application.html.markdown diff --git a/azurerm/internal/clients/client.go b/azurerm/internal/clients/client.go index 1f4f1f0369cdb..d66215ef19d23 100644 --- a/azurerm/internal/clients/client.go +++ b/azurerm/internal/clients/client.go @@ -30,6 +30,7 @@ import ( frontdoor "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/frontdoor/client" hdinsight "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/hdinsight/client" healthcare "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/healthcare/client" + iotcentral "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/iotcentral/client" iothub "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/iothub/client" keyvault "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/keyvault/client" kusto "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/kusto/client" @@ -100,6 +101,7 @@ type Client struct { HDInsight *hdinsight.Client HealthCare *healthcare.Client IoTHub *iothub.Client + IoTCentral *iotcentral.Client KeyVault *keyvault.Client Kusto *kusto.Client LogAnalytics *loganalytics.Client @@ -168,6 +170,7 @@ func (client *Client) Build(ctx context.Context, o *common.ClientOptions) error client.HDInsight = hdinsight.NewClient(o) client.HealthCare = healthcare.NewClient(o) client.IoTHub = iothub.NewClient(o) + client.IoTCentral = iotcentral.NewClient(o) client.KeyVault = keyvault.NewClient(o) client.Kusto = kusto.NewClient(o) client.LogAnalytics = loganalytics.NewClient(o) diff --git a/azurerm/internal/provider/services.go b/azurerm/internal/provider/services.go index a7411f635e155..dc2075a8562be 100644 --- a/azurerm/internal/provider/services.go +++ b/azurerm/internal/provider/services.go @@ -27,6 +27,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/frontdoor" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/hdinsight" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/healthcare" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/iotcentral" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/iothub" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/keyvault" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/kusto" @@ -94,6 +95,7 @@ func SupportedServices() []common.ServiceRegistration { hdinsight.Registration{}, healthcare.Registration{}, iothub.Registration{}, + iotcentral.Registration{}, keyvault.Registration{}, kusto.Registration{}, loganalytics.Registration{}, diff --git a/azurerm/internal/services/iotcentral/client/client.go b/azurerm/internal/services/iotcentral/client/client.go new file mode 100644 index 0000000000000..5bd0b54bbd3b9 --- /dev/null +++ b/azurerm/internal/services/iotcentral/client/client.go @@ -0,0 +1,18 @@ +package client + +import ( + "github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common" +) + +type Client struct { + AppsClient *iotcentral.AppsClient +} + +func NewClient(o *common.ClientOptions) *Client { + AppsClient := iotcentral.NewAppsClient(o.SubscriptionId) + o.ConfigureClient(&AppsClient.Client, o.ResourceManagerAuthorizer) + return &Client{ + AppsClient: &AppsClient, + } +} diff --git a/azurerm/internal/services/iotcentral/parse/iotcentral_application.go b/azurerm/internal/services/iotcentral/parse/iotcentral_application.go new file mode 100644 index 0000000000000..5cce5e047314d --- /dev/null +++ b/azurerm/internal/services/iotcentral/parse/iotcentral_application.go @@ -0,0 +1,33 @@ +package parse + +import ( + "fmt" + + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" +) + +type IoTCentralApplicationId struct { + ResourceGroup string + Name string +} + +func IoTCentralApplicationID(input string) (*IoTCentralApplicationId, error) { + id, err := azure.ParseAzureResourceID(input) + if err != nil { + return nil, fmt.Errorf("[ERROR] Unable to parse IoT Central Application ID %q: %+v", input, err) + } + + server := IoTCentralApplicationId{ + ResourceGroup: id.ResourceGroup, + } + + if server.Name, err = id.PopSegment("IoTApps"); err != nil { + return nil, err + } + + if err := id.ValidateNoEmptySegments(input); err != nil { + return nil, err + } + + return &server, nil +} diff --git a/azurerm/internal/services/iotcentral/parse/iotcentral_application_test.go b/azurerm/internal/services/iotcentral/parse/iotcentral_application_test.go new file mode 100644 index 0000000000000..eb7e27b0dc60f --- /dev/null +++ b/azurerm/internal/services/iotcentral/parse/iotcentral_application_test.go @@ -0,0 +1,73 @@ +package parse + +import ( + "testing" +) + +func TestIotCentralApplicationID(t *testing.T) { + testData := []struct { + Name string + Input string + Expected *IoTCentralApplicationId + }{ + { + Name: "Empty", + Input: "", + Expected: nil, + }, + { + Name: "No Resource Groups Segment", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000", + Expected: nil, + }, + { + Name: "No Resource Groups Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/", + Expected: nil, + }, + { + Name: "Resource Group ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo/", + Expected: nil, + }, + { + Name: "Missing IoT Central Application Value", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.IoTCentral/IoTApps/", + Expected: nil, + }, + { + Name: "IoT Central Application ID", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.IoTCentral/IoTApps/App1", + Expected: &IoTCentralApplicationId{ + Name: "App1", + ResourceGroup: "resGroup1", + }, + }, + { + Name: "Wrong Casing", + Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.IoTCentral/IotApps/App1", + Expected: nil, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Name) + + actual, err := IoTCentralApplicationID(v.Input) + if err != nil { + if v.Expected == nil { + continue + } + + t.Fatalf("Expected a value but got an error: %s", err) + } + + if actual.Name != v.Expected.Name { + t.Fatalf("Expected %q but got %q for Name", v.Expected.Name, actual.Name) + } + + if actual.ResourceGroup != v.Expected.ResourceGroup { + t.Fatalf("Expected %q but got %q for Resource Group", v.Expected.ResourceGroup, actual.ResourceGroup) + } + } +} diff --git a/azurerm/internal/services/iotcentral/registration.go b/azurerm/internal/services/iotcentral/registration.go new file mode 100644 index 0000000000000..bfa321dcd032c --- /dev/null +++ b/azurerm/internal/services/iotcentral/registration.go @@ -0,0 +1,31 @@ +package iotcentral + +import ( + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" +) + +type Registration struct{} + +// Name is the name of this Service +func (r Registration) Name() string { + return "IoT Central" +} + +// SupportedDataSources returns the supported Data Sources supported by this Service +func (r Registration) SupportedDataSources() map[string]*schema.Resource { + return 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_iotcentral_application": resourceArmIotCentralApplication(), + } +} + +// WebsiteCategories returns a list of categories which can be used for the sidebar +func (r Registration) WebsiteCategories() []string { + return []string{ + "IoT Central", + } +} diff --git a/azurerm/internal/services/iotcentral/resource_arm_iotcentral_application.go b/azurerm/internal/services/iotcentral/resource_arm_iotcentral_application.go new file mode 100644 index 0000000000000..1005c97956ccb --- /dev/null +++ b/azurerm/internal/services/iotcentral/resource_arm_iotcentral_application.go @@ -0,0 +1,267 @@ +package iotcentral + +import ( + "fmt" + "time" + + "github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral" + "github.com/hashicorp/go-azure-helpers/response" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/iotcentral/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/iotcentral/validate" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmIotCentralApplication() *schema.Resource { + return &schema.Resource{ + Create: resourceArmIotCentralAppCreate, + Read: resourceArmIotCentralAppRead, + Update: resourceArmIotCentralAppUpdate, + Delete: resourceArmIotCentralAppDelete, + + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(30 * time.Minute), + Read: schema.DefaultTimeout(5 * time.Minute), + Update: schema.DefaultTimeout(30 * time.Minute), + Delete: schema.DefaultTimeout(30 * time.Minute), + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validate.IotCentralAppName, + }, + + "location": azure.SchemaLocation(), + + "resource_group_name": azure.SchemaResourceGroupName(), + + "sub_domain": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validate.IotCentralAppSubdomain, + }, + + "display_name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validate.IotCentralAppDisplayName, + }, + + "sku": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringInSlice([]string{ + string(iotcentral.F1), + string(iotcentral.S1), + string(iotcentral.ST1), + string(iotcentral.ST2), + }, true), + Default: iotcentral.ST1, + }, + "template": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validate.IotCentralAppTemplateName, + }, + + "tags": tags.Schema(), + }, + } +} + +func resourceArmIotCentralAppCreate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).IoTCentral.AppsClient + ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) + defer cancel() + + name := d.Get("name").(string) + resourceGroup := d.Get("resource_group_name").(string) + + if features.ShouldResourcesBeImported() { + existing, err := client.Get(ctx, resourceGroup, name) + if err != nil { + if !utils.ResponseWasNotFound(existing.Response) { + return fmt.Errorf("Error checking for presence of existing IoT Central Application %q (Resource Group %q): %+v", name, resourceGroup, err) + } + } + + if existing.ID != nil && *existing.ID != "" { + return tf.ImportAsExistsError("azurerm_iotcentral_application", *existing.ID) + } + } + + resp, err := client.CheckNameAvailability(ctx, iotcentral.OperationInputs{ + Name: utils.String(name), + }) + if err != nil { + return fmt.Errorf("Error happened on check name availability. %q (Group Name %q). Error: %+v", name, resourceGroup, err) + } + if !*resp.NameAvailable { + return fmt.Errorf("Resource name not available. name: %s, Reason: %q, Message %q", name, *resp.Reason, *resp.Message) + } + + displayName := d.Get("display_name").(string) + if displayName == "" { + displayName = name + } + + subdomain := d.Get("sub_domain").(string) + template := d.Get("template").(string) + location := d.Get("location").(string) + app := iotcentral.App{ + AppProperties: &iotcentral.AppProperties{ + DisplayName: &displayName, + Subdomain: &subdomain, + Template: &template, + }, + Sku: &iotcentral.AppSkuInfo{ + Name: iotcentral.AppSku(d.Get("sku").(string)), + }, + Location: &location, + Tags: tags.Expand(d.Get("tags").(map[string]interface{})), + } + + future, err := client.CreateOrUpdate(ctx, resourceGroup, name, app) + if err != nil { + return fmt.Errorf("Error creating Iot Central Application. %v", err) + } + + if err = future.Future.WaitForCompletionRef(ctx, client.Client); err != nil { + return fmt.Errorf("Error waiting for creating IoT Central Application %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + response, err := client.Get(ctx, resourceGroup, name) + if err != nil { + return fmt.Errorf("Error retrieving IoT Central Application %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + if response.ID == nil || *response.ID == "" { + return fmt.Errorf("Error creating IoT Central Application %q (Resource Group %q): %+v", name, resourceGroup, err) + } + + d.SetId(*response.ID) + return resourceArmIotCentralAppRead(d, meta) +} + +func resourceArmIotCentralAppUpdate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).IoTCentral.AppsClient + ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := parse.IoTCentralApplicationID(d.Id()) + if err != nil { + return err + } + + displayName := d.Get("display_name").(string) + if displayName == "" { + displayName = id.Name + } + + subdomain := d.Get("sub_domain").(string) + template := d.Get("template").(string) + appPatch := iotcentral.AppPatch{ + Tags: tags.Expand(d.Get("tags").(map[string]interface{})), + AppProperties: &iotcentral.AppProperties{ + DisplayName: &displayName, + Subdomain: &subdomain, + Template: &template, + }, + } + future, err := client.Update(ctx, id.ResourceGroup, id.Name, appPatch) + if err != nil { + return fmt.Errorf("Error update Iot Central Application %q (Resource Group %q). %+v", id.Name, id.ResourceGroup, err) + } + + if err := future.WaitForCompletionRef(ctx, client.Client); err != nil { + return fmt.Errorf("Error waiting for the completion of update Iot Central Application %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) + } + + resp, err := client.Get(ctx, id.ResourceGroup, id.Name) + if err != nil { + return fmt.Errorf("Error retrieving IoT Central Application %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) + } + + if resp.ID == nil || *resp.ID == "" { + return fmt.Errorf("Cannot read IoT Central Application %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) + } + + d.SetId(*resp.ID) + return resourceArmIotCentralAppRead(d, meta) +} + +func resourceArmIotCentralAppRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).IoTCentral.AppsClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := parse.IoTCentralApplicationID(d.Id()) + if err != nil { + return err + } + + resp, err := client.Get(ctx, id.ResourceGroup, id.Name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + d.SetId("") + return nil + } + return fmt.Errorf("Error retrieving IoT Central Application %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) + } + + d.Set("name", resp.Name) + d.Set("resource_group_name", id.ResourceGroup) + + if location := resp.Location; location != nil { + d.Set("location", azure.NormalizeLocation(*location)) + } + if err := d.Set("sku", resp.Sku.Name); err != nil { + return fmt.Errorf("Error setting `sku`: %+v", err) + } + + if props := resp.AppProperties; props != nil { + d.Set("sub_domain", props.Subdomain) + d.Set("display_name", props.DisplayName) + d.Set("template", props.Template) + } + + return tags.FlattenAndSet(d, resp.Tags) +} + +func resourceArmIotCentralAppDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).IoTCentral.AppsClient + ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) + defer cancel() + + id, err := parse.IoTCentralApplicationID(d.Id()) + if err != nil { + return err + } + resp, err := client.Delete(ctx, id.ResourceGroup, id.Name) + if err != nil { + if !response.WasNotFound(resp.Response()) { + return fmt.Errorf("Error delete Iot Central Application %q (Resource Group %q). %+v", id.Name, id.ResourceGroup, err) + } + } + + if err := resp.WaitForCompletionRef(ctx, client.Client); err != nil { + return fmt.Errorf("Error delete Iot Central Application %q Resource Group %q). %+v", id.Name, id.ResourceGroup, err) + } + return nil +} diff --git a/azurerm/internal/services/iotcentral/tests/resource_arm_iotcentral_application_test.go b/azurerm/internal/services/iotcentral/tests/resource_arm_iotcentral_application_test.go new file mode 100644 index 0000000000000..faa77523145f2 --- /dev/null +++ b/azurerm/internal/services/iotcentral/tests/resource_arm_iotcentral_application_test.go @@ -0,0 +1,245 @@ +package tests + +import ( + "fmt" + "net/http" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" +) + +func TestAccAzureRMIoTCentralApplication_basic(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_iotcentral_application", "test") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMIotCentralApplicationDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMIotCentralApplication_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMIotCentralApplicationExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "sku", "ST1"), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMIoTCentralApplication_complete(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_iotcentral_application", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMIotCentralApplicationDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMIotCentralApplication_complete(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMIotCentralApplicationExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "template", "iotc-default@1.0.0"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.ENV", "Test"), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMIoTCentralApplication_update(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_iotcentral_application", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMIotCentralApplicationDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMIotCentralApplication_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMIotCentralApplicationExists(data.ResourceName), + ), + }, + { + Config: testAccAzureRMIotCentralApplication_update(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMIotCentralApplicationExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "sku", "ST1"), + resource.TestCheckResourceAttr(data.ResourceName, "tags.ENV", "Test"), + ), + }, + data.ImportStep(), + }, + }) +} + +func TestAccAzureRMIoTCentralApplication_requiresImportErrorStep(t *testing.T) { + if !features.ShouldResourcesBeImported() { + t.Skip("Skipping since resources aren't required to be imported") + return + } + + data := acceptance.BuildTestData(t, "azurerm_iotcentral_application", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMIotCentralApplicationDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMIotCentralApplication_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMIotCentralApplicationExists(data.ResourceName), + ), + }, + { + Config: testAccAzureRMIotCentralApplication_requiresImport(data), + ExpectError: acceptance.RequiresImportError("azurerm_iotcentral_application"), + }, + }, + }) +} + +func testCheckAzureRMIotCentralApplicationExists(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("Not found: %s", resourceName) + } + appName := rs.Primary.Attributes["name"] + resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] + if !hasResourceGroup { + return fmt.Errorf("Bad: no resource group found in state for IoT Central Application: %s", appName) + } + + client := acceptance.AzureProvider.Meta().(*clients.Client).IoTCentral.AppsClient + resp, err := client.Get(ctx, resourceGroup, appName) + if err != nil { + if resp.StatusCode == http.StatusNotFound { + return fmt.Errorf("Bad: IoT Central Application %q (Resource Group %q) does not exist", appName, resourceGroup) + } + + return fmt.Errorf("Bad: Get IoT Central Application: %+v", err) + } + + return nil + } +} + +func testCheckAzureRMIotCentralApplicationDestroy(s *terraform.State) error { + client := acceptance.AzureProvider.Meta().(*clients.Client).IoTCentral.AppsClient + ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_iotcentral_application" { + continue + } + + name := rs.Primary.Attributes["name"] + resourceGroup := rs.Primary.Attributes["resource_group_name"] + + if resp, err := client.Get(ctx, resourceGroup, name); err != nil { + if resp.StatusCode != http.StatusNotFound { + return fmt.Errorf("Bad: Get IoT Central Application: %+v", err) + } + } + } + return nil +} + +func testAccAzureRMIotCentralApplication_basic(data acceptance.TestData) string { + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-%[1]d" + location = "%[2]s" +} + +resource "azurerm_iotcentral_application" "test" { + name = "acctest-iotcentralapp-%[1]d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + sub_domain = "acctest-iotcentralapp-%[1]d" + sku = "ST1" +} +`, data.RandomInteger, data.Locations.Primary) +} + +func testAccAzureRMIotCentralApplication_complete(data acceptance.TestData) string { + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-%[2]d" + location = "%[1]s" +} + +resource "azurerm_iotcentral_application" "test" { + name = "acctest-iotcentralapp-%[2]d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + sub_domain = "acctest-iotcentralapp-%[2]d" + display_name = "acctest-iotcentralapp-%[2]d" + sku = "ST1" + template = "iotc-default@1.0.0" + tags = { + ENV = "Test" + } +} +`, data.Locations.Primary, data.RandomInteger) +} + +func testAccAzureRMIotCentralApplication_update(data acceptance.TestData) string { + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-%[2]d" + location = "%[1]s" +} + +resource "azurerm_iotcentral_application" "test" { + name = "acctest-iotcentralapp-%[2]d" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" + sub_domain = "acctest-iotcentralapp-%[2]d" + display_name = "acctest-iotcentralapp-%[2]d" + sku = "ST1" + tags = { + + ENV = "Test" + } +} +`, data.Locations.Primary, data.RandomInteger) +} + +func testAccAzureRMIotCentralApplication_requiresImport(data acceptance.TestData) string { + template := testAccAzureRMIotCentralApplication_basic(data) + return fmt.Sprintf(` +%s +resource "azurerm_iotcentral_application" "import" { + name = azurerm_iotcentral_application.test.name + resource_group_name = azurerm_iotcentral_application.test.resource_group_name + location = azurerm_iotcentral_application.test.location + sub_domain = azurerm_iotcentral_application.test.sub_domain + display_name = azurerm_iotcentral_application.test.display_name + sku = "ST1" +} +`, template) +} diff --git a/azurerm/internal/services/iotcentral/validate/iotcentral_app.go b/azurerm/internal/services/iotcentral/validate/iotcentral_app.go new file mode 100644 index 0000000000000..bfda4ecb46bf1 --- /dev/null +++ b/azurerm/internal/services/iotcentral/validate/iotcentral_app.go @@ -0,0 +1,44 @@ +package validate + +import ( + "fmt" + "regexp" +) + +func IotCentralAppName(v interface{}, k string) (warnings []string, errors []error) { + value := v.(string) + + // Portal: The value must contain only alphanumeric characters or the following: - + if matched := regexp.MustCompile(`^[a-z\d][a-z\d-]{0,61}[a-z\d]$`).Match([]byte(value)); !matched { + errors = append(errors, fmt.Errorf("test: %s, %q may only contain alphanumeric characters and dashes, length between 2-63", k, v)) + } + return warnings, errors +} + +func IotCentralAppSubdomain(v interface{}, k string) (warnings []string, errors []error) { + value := v.(string) + + // Portal: The value must contain only alphanumeric characters or the following: - + if matched := regexp.MustCompile(`^[a-z\d][a-z\d-]{0,61}[a-z\d]$`).Match([]byte(value)); !matched { + errors = append(errors, fmt.Errorf("test: %s, %q may only contain alphanumeric characters and dashes, length between 2-63", k, v)) + } + return warnings, errors +} + +func IotCentralAppDisplayName(v interface{}, k string) (warnings []string, errors []error) { + value := v.(string) + + if matched := regexp.MustCompile(`^.{1,200}$`).Match([]byte(value)); !matched { + errors = append(errors, fmt.Errorf("test: %s, %q length should between 1~200", k, v)) + } + return warnings, errors +} + +func IotCentralAppTemplateName(v interface{}, k string) (warnings []string, errors []error) { + value := v.(string) + + if matched := regexp.MustCompile(`^.{1,50}$`).Match([]byte(value)); !matched { + errors = append(errors, fmt.Errorf("test: %s, %q length should between 1~50", k, v)) + } + return warnings, errors +} diff --git a/azurerm/internal/services/iotcentral/validate/iotcentral_app_test.go b/azurerm/internal/services/iotcentral/validate/iotcentral_app_test.go new file mode 100644 index 0000000000000..f9ce1cc36bdb8 --- /dev/null +++ b/azurerm/internal/services/iotcentral/validate/iotcentral_app_test.go @@ -0,0 +1,468 @@ +package validate + +import ( + "testing" +) + +func TestIotCentralAppName(t *testing.T) { + testData := []struct { + Value string + Error bool + }{ + { + Value: "a1", + Error: false, + }, + { + Value: "11", + Error: false, + }, + { + Value: "1a", + Error: false, + }, + { + Value: "aa", + Error: false, + }, + { + Value: "1-1", + Error: false, + }, + { + Value: "aaa-aa", + Error: false, + }, + { + Value: "a--a-aa", + Error: false, + }, + { + Value: "a1-1", + Error: false, + }, + { + Value: "a1-a", + Error: false, + }, + { + Value: "1a-1", + Error: false, + }, + { + Value: "1a-a-1-2", + Error: false, + }, + { + Value: "abcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcde", + Error: false, + }, + { + Value: "abcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcde123", + Error: false, + }, { + Value: "a", + Error: true, + }, + { + Value: "1", + Error: true, + }, + { + Value: "1-", + Error: true, + }, + { + Value: "a-", + Error: true, + }, + { + Value: "a1-", + Error: true, + }, + { + Value: "1a--1-1-a-", + Error: true, + }, + { + Value: "aa-", + Error: true, + }, + { + Value: "a1-", + Error: true, + }, + { + Value: "1a--a1-", + Error: true, + }, + { + Value: "aa-", + Error: true, + }, + { + Value: "-", + Error: true, + }, + { + Value: "-1", + Error: true, + }, + { + Value: "-a", + Error: true, + }, + { + Value: "AA", + Error: true, + }, + { + Value: "AA-1", + Error: true, + }, + { + Value: "AA-a", + Error: true, + }, + { + Value: "abcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcde1234", + Error: true, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Value) + + _, err := IotCentralAppName(v.Value, "unit test") + if err != nil && !v.Error { + t.Fatalf("Expected pass but got an error: %s", err) + } + } +} + +func TestIotCentralAppSubdomain(t *testing.T) { + testData := []struct { + Value string + Error bool + }{ + { + Value: "a1", + Error: false, + }, + { + Value: "11", + Error: false, + }, + { + Value: "1a", + Error: false, + }, + { + Value: "aa", + Error: false, + }, + { + Value: "1-1", + Error: false, + }, + { + Value: "a-a", + Error: false, + }, + { + Value: "a1-1", + Error: false, + }, + { + Value: "a1-a", + Error: false, + }, + { + Value: "1a-1", + Error: false, + }, + { + Value: "1a-a", + Error: false, + }, + { + Value: "a1-11", + Error: false, + }, + { + Value: "aa-11", + Error: false, + }, + { + Value: "11-1a", + Error: false, + }, + { + Value: "11-a1", + Error: false, + }, + { + Value: "abcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcde", + Error: false, + }, + { + Value: "abcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcde123", + Error: false, + }, + { + Value: "a", + Error: true, + }, + { + Value: "1", + Error: true, + }, + { + Value: "1-", + Error: true, + }, + { + Value: "a-", + Error: true, + }, + { + Value: "a1-", + Error: true, + }, + { + Value: "1a-", + Error: true, + }, + { + Value: "aa-", + Error: true, + }, + { + Value: "-", + Error: true, + }, + { + Value: "-1", + Error: true, + }, + { + Value: "-a", + Error: true, + }, + { + Value: "AA", + Error: true, + }, + { + Value: "AA-1", + Error: true, + }, + { + Value: "AA-a", + Error: true, + }, + { + Value: "A1-", + Error: true, + }, + { + Value: "AA-A", + Error: true, + }, + { + Value: "AA-aA", + Error: true, + }, + { + Value: "abcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcde1234", + Error: true, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Value) + + _, err := IotCentralAppSubdomain(v.Value, "unit test") + if err != nil && !v.Error { + t.Fatalf("Expected pass but got an error: %s", err) + } + } +} + +func TestIotCentralAppDisplayName(t *testing.T) { + testData := []struct { + Value string + Error bool + }{ + { + Value: "a", + Error: false, + }, + { + Value: "A", + Error: false, + }, + { + Value: "1", + Error: false, + }, + { + Value: "1-", + Error: false, + }, + { + Value: "a-", + Error: false, + }, + { + Value: "A-", + Error: false, + }, + { + Value: "a1-", + Error: false, + }, + { + Value: "1a-", + Error: false, + }, + { + Value: "aA-", + Error: false, + }, + { + Value: "Aa-", + Error: false, + }, + { + Value: "-", + Error: false, + }, + { + Value: "-1", + Error: false, + }, + { + Value: "_-a", + Error: false, + }, + { + Value: "#$%$#!", + Error: false, + }, + { + Value: "AA", + Error: false, + }, + { + Value: "AA-1", + Error: false, + }, + { + Value: "AA-a", + Error: false, + }, + { + Value: "A1-", + Error: false, + }, + { + Value: "AA-A", + Error: false, + }, + { + Value: "AA-aA", + Error: false, + }, + { + Value: "abcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcde1234", + Error: false, + }, + + { + Value: "", + Error: true, + }, + { + Value: "adcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdssdavcadcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdsadcdssdavcc", + Error: true, + }, + } + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Value) + + _, err := IotCentralAppDisplayName(v.Value, "unit test") + if err != nil && !v.Error { + t.Fatalf("Expected pass but got an error: %s", err) + } + } +} + +func TestIotCentralAppTemplateName(t *testing.T) { + testData := []struct { + Value string + Error bool + }{ + { + Value: "a", + Error: false, + }, + { + Value: "A", + Error: false, + }, + { + Value: "1", + Error: false, + }, + { + Value: "1-", + Error: false, + }, + { + Value: "a-", + Error: false, + }, + { + Value: "A-", + Error: false, + }, + { + Value: "-", + Error: false, + }, + { + Value: "-1", + Error: false, + }, + { + Value: "_-a", + Error: false, + }, + { + Value: "#$%$#!", + Error: false, + }, + { + Value: "abcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcde", + Error: false, + }, + { + Value: "", + Error: true, + }, + { + Value: "abcdeabcdeabcdeabcde@$#%abcdeabcdeadeabcdeabcdeabcdeabcde-1a", + Error: true, + }, + } + + for _, v := range testData { + t.Logf("[DEBUG] Testing %q", v.Value) + + _, err := IotCentralAppTemplateName(v.Value, "unit test") + if err != nil && !v.Error { + t.Fatalf("Expected pass but got an error: %s", err) + } + } +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral/apps.go b/vendor/github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral/apps.go new file mode 100644 index 0000000000000..42989117a7be0 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral/apps.go @@ -0,0 +1,870 @@ +package iotcentral + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/validation" + "github.com/Azure/go-autorest/tracing" + "net/http" +) + +// AppsClient is the use this API to manage IoT Central Applications in your Azure subscription. +type AppsClient struct { + BaseClient +} + +// NewAppsClient creates an instance of the AppsClient client. +func NewAppsClient(subscriptionID string) AppsClient { + return NewAppsClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewAppsClientWithBaseURI creates an instance of the AppsClient client. +func NewAppsClientWithBaseURI(baseURI string, subscriptionID string) AppsClient { + return AppsClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// CheckNameAvailability check if an IoT Central application name is available. +// Parameters: +// operationInputs - set the name parameter in the OperationInputs structure to the name of the IoT Central +// application to check. +func (client AppsClient) CheckNameAvailability(ctx context.Context, operationInputs OperationInputs) (result AppAvailabilityInfo, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.CheckNameAvailability") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: operationInputs, + Constraints: []validation.Constraint{{Target: "operationInputs.Name", Name: validation.Null, Rule: true, + Chain: []validation.Constraint{{Target: "operationInputs.Name", Name: validation.Pattern, Rule: `^[a-z0-9-]{1,63}$`, Chain: nil}}}}}}); err != nil { + return result, validation.NewError("iotcentral.AppsClient", "CheckNameAvailability", err.Error()) + } + + req, err := client.CheckNameAvailabilityPreparer(ctx, operationInputs) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "CheckNameAvailability", nil, "Failure preparing request") + return + } + + resp, err := client.CheckNameAvailabilitySender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "CheckNameAvailability", resp, "Failure sending request") + return + } + + result, err = client.CheckNameAvailabilityResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "CheckNameAvailability", resp, "Failure responding to request") + } + + return +} + +// CheckNameAvailabilityPreparer prepares the CheckNameAvailability request. +func (client AppsClient) CheckNameAvailabilityPreparer(ctx context.Context, operationInputs OperationInputs) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-09-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.IoTCentral/checkNameAvailability", pathParameters), + autorest.WithJSON(operationInputs), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CheckNameAvailabilitySender sends the CheckNameAvailability request. The method will close the +// http.Response Body if it receives an error. +func (client AppsClient) CheckNameAvailabilitySender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// CheckNameAvailabilityResponder handles the response to the CheckNameAvailability request. The method always +// closes the http.Response Body. +func (client AppsClient) CheckNameAvailabilityResponder(resp *http.Response) (result AppAvailabilityInfo, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// CheckSubdomainAvailability check if an IoT Central application subdomain is available. +// Parameters: +// operationInputs - set the name parameter in the OperationInputs structure to the subdomain of the IoT +// Central application to check. +func (client AppsClient) CheckSubdomainAvailability(ctx context.Context, operationInputs OperationInputs) (result AppAvailabilityInfo, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.CheckSubdomainAvailability") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: operationInputs, + Constraints: []validation.Constraint{{Target: "operationInputs.Name", Name: validation.Null, Rule: true, + Chain: []validation.Constraint{{Target: "operationInputs.Name", Name: validation.Pattern, Rule: `^[a-z0-9-]{1,63}$`, Chain: nil}}}}}}); err != nil { + return result, validation.NewError("iotcentral.AppsClient", "CheckSubdomainAvailability", err.Error()) + } + + req, err := client.CheckSubdomainAvailabilityPreparer(ctx, operationInputs) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "CheckSubdomainAvailability", nil, "Failure preparing request") + return + } + + resp, err := client.CheckSubdomainAvailabilitySender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "CheckSubdomainAvailability", resp, "Failure sending request") + return + } + + result, err = client.CheckSubdomainAvailabilityResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "CheckSubdomainAvailability", resp, "Failure responding to request") + } + + return +} + +// CheckSubdomainAvailabilityPreparer prepares the CheckSubdomainAvailability request. +func (client AppsClient) CheckSubdomainAvailabilityPreparer(ctx context.Context, operationInputs OperationInputs) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-09-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.IoTCentral/checkSubdomainAvailability", pathParameters), + autorest.WithJSON(operationInputs), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CheckSubdomainAvailabilitySender sends the CheckSubdomainAvailability request. The method will close the +// http.Response Body if it receives an error. +func (client AppsClient) CheckSubdomainAvailabilitySender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// CheckSubdomainAvailabilityResponder handles the response to the CheckSubdomainAvailability request. The method always +// closes the http.Response Body. +func (client AppsClient) CheckSubdomainAvailabilityResponder(resp *http.Response) (result AppAvailabilityInfo, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// CreateOrUpdate create or update the metadata of an IoT Central application. The usual pattern to modify a property +// is to retrieve the IoT Central application metadata and security metadata, and then combine them with the modified +// values in a new body to update the IoT Central application. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT Central application. +// resourceName - the ARM resource name of the IoT Central application. +// app - the IoT Central application metadata and security metadata. +func (client AppsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, resourceName string, app App) (result AppsCreateOrUpdateFuture, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.CreateOrUpdate") + defer func() { + sc := -1 + if result.Response() != nil { + sc = result.Response().StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + if err := validation.Validate([]validation.Validation{ + {TargetValue: app, + Constraints: []validation.Constraint{{Target: "app.AppProperties", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "app.AppProperties.DisplayName", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "app.AppProperties.DisplayName", Name: validation.Pattern, Rule: `^.{1,200}$`, Chain: nil}}}, + {Target: "app.AppProperties.Subdomain", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "app.AppProperties.Subdomain", Name: validation.Pattern, Rule: `^[a-z0-9-]{1,63}$`, Chain: nil}}}, + }}, + {Target: "app.Sku", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil { + return result, validation.NewError("iotcentral.AppsClient", "CreateOrUpdate", err.Error()) + } + + req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, resourceName, app) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "CreateOrUpdate", nil, "Failure preparing request") + return + } + + result, err = client.CreateOrUpdateSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "CreateOrUpdate", result.Response(), "Failure sending request") + return + } + + return +} + +// CreateOrUpdatePreparer prepares the CreateOrUpdate request. +func (client AppsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, resourceName string, app App) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "resourceName": autorest.Encode("path", resourceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-09-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPut(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.IoTCentral/IoTApps/{resourceName}", pathParameters), + autorest.WithJSON(app), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the +// http.Response Body if it receives an error. +func (client AppsClient) CreateOrUpdateSender(req *http.Request) (future AppsCreateOrUpdateFuture, err error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, sd...) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always +// closes the http.Response Body. +func (client AppsClient) CreateOrUpdateResponder(resp *http.Response) (result App, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// Delete delete an IoT Central application. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT Central application. +// resourceName - the ARM resource name of the IoT Central application. +func (client AppsClient) Delete(ctx context.Context, resourceGroupName string, resourceName string) (result AppsDeleteFuture, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.Delete") + defer func() { + sc := -1 + if result.Response() != nil { + sc = result.Response().StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + req, err := client.DeletePreparer(ctx, resourceGroupName, resourceName) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "Delete", nil, "Failure preparing request") + return + } + + result, err = client.DeleteSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "Delete", result.Response(), "Failure sending request") + return + } + + return +} + +// DeletePreparer prepares the Delete request. +func (client AppsClient) DeletePreparer(ctx context.Context, resourceGroupName string, resourceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "resourceName": autorest.Encode("path", resourceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-09-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsDelete(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.IoTCentral/IoTApps/{resourceName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// DeleteSender sends the Delete request. The method will close the +// http.Response Body if it receives an error. +func (client AppsClient) DeleteSender(req *http.Request) (future AppsDeleteFuture, err error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, sd...) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// DeleteResponder handles the response to the Delete request. The method always +// closes the http.Response Body. +func (client AppsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent), + autorest.ByClosing()) + result.Response = resp + return +} + +// Get get the metadata of an IoT Central application. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT Central application. +// resourceName - the ARM resource name of the IoT Central application. +func (client AppsClient) Get(ctx context.Context, resourceGroupName string, resourceName string) (result App, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.Get") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + req, err := client.GetPreparer(ctx, resourceGroupName, resourceName) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "Get", nil, "Failure preparing request") + return + } + + resp, err := client.GetSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "Get", resp, "Failure sending request") + return + } + + result, err = client.GetResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "Get", resp, "Failure responding to request") + } + + return +} + +// GetPreparer prepares the Get request. +func (client AppsClient) GetPreparer(ctx context.Context, resourceGroupName string, resourceName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "resourceName": autorest.Encode("path", resourceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-09-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.IoTCentral/IoTApps/{resourceName}", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// GetSender sends the Get request. The method will close the +// http.Response Body if it receives an error. +func (client AppsClient) GetSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// GetResponder handles the response to the Get request. The method always +// closes the http.Response Body. +func (client AppsClient) GetResponder(resp *http.Response) (result App, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// ListByResourceGroup get all the IoT Central Applications in a resource group. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT Central application. +func (client AppsClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result AppListResultPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListByResourceGroup") + defer func() { + sc := -1 + if result.alr.Response.Response != nil { + sc = result.alr.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.fn = client.listByResourceGroupNextResults + req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "ListByResourceGroup", nil, "Failure preparing request") + return + } + + resp, err := client.ListByResourceGroupSender(req) + if err != nil { + result.alr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "ListByResourceGroup", resp, "Failure sending request") + return + } + + result.alr, err = client.ListByResourceGroupResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "ListByResourceGroup", resp, "Failure responding to request") + } + + return +} + +// ListByResourceGroupPreparer prepares the ListByResourceGroup request. +func (client AppsClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-09-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.IoTCentral/IoTApps", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the +// http.Response Body if it receives an error. +func (client AppsClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always +// closes the http.Response Body. +func (client AppsClient) ListByResourceGroupResponder(resp *http.Response) (result AppListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listByResourceGroupNextResults retrieves the next set of results, if any. +func (client AppsClient) listByResourceGroupNextResults(ctx context.Context, lastResults AppListResult) (result AppListResult, err error) { + req, err := lastResults.appListResultPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "iotcentral.AppsClient", "listByResourceGroupNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListByResourceGroupSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "iotcentral.AppsClient", "listByResourceGroupNextResults", resp, "Failure sending next results request") + } + result, err = client.ListByResourceGroupResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListByResourceGroupComplete enumerates all values, automatically crossing page boundaries as required. +func (client AppsClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result AppListResultIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListByResourceGroup") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.ListByResourceGroup(ctx, resourceGroupName) + return +} + +// ListBySubscription get all IoT Central Applications in a subscription. +func (client AppsClient) ListBySubscription(ctx context.Context) (result AppListResultPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListBySubscription") + defer func() { + sc := -1 + if result.alr.Response.Response != nil { + sc = result.alr.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.fn = client.listBySubscriptionNextResults + req, err := client.ListBySubscriptionPreparer(ctx) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "ListBySubscription", nil, "Failure preparing request") + return + } + + resp, err := client.ListBySubscriptionSender(req) + if err != nil { + result.alr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "ListBySubscription", resp, "Failure sending request") + return + } + + result.alr, err = client.ListBySubscriptionResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "ListBySubscription", resp, "Failure responding to request") + } + + return +} + +// ListBySubscriptionPreparer prepares the ListBySubscription request. +func (client AppsClient) ListBySubscriptionPreparer(ctx context.Context) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-09-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.IoTCentral/IoTApps", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListBySubscriptionSender sends the ListBySubscription request. The method will close the +// http.Response Body if it receives an error. +func (client AppsClient) ListBySubscriptionSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// ListBySubscriptionResponder handles the response to the ListBySubscription request. The method always +// closes the http.Response Body. +func (client AppsClient) ListBySubscriptionResponder(resp *http.Response) (result AppListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listBySubscriptionNextResults retrieves the next set of results, if any. +func (client AppsClient) listBySubscriptionNextResults(ctx context.Context, lastResults AppListResult) (result AppListResult, err error) { + req, err := lastResults.appListResultPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "iotcentral.AppsClient", "listBySubscriptionNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListBySubscriptionSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "iotcentral.AppsClient", "listBySubscriptionNextResults", resp, "Failure sending next results request") + } + result, err = client.ListBySubscriptionResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "listBySubscriptionNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListBySubscriptionComplete enumerates all values, automatically crossing page boundaries as required. +func (client AppsClient) ListBySubscriptionComplete(ctx context.Context) (result AppListResultIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListBySubscription") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.ListBySubscription(ctx) + return +} + +// ListTemplates get all available application templates. +func (client AppsClient) ListTemplates(ctx context.Context) (result AppTemplatesResultPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListTemplates") + defer func() { + sc := -1 + if result.atr.Response.Response != nil { + sc = result.atr.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.fn = client.listTemplatesNextResults + req, err := client.ListTemplatesPreparer(ctx) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "ListTemplates", nil, "Failure preparing request") + return + } + + resp, err := client.ListTemplatesSender(req) + if err != nil { + result.atr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "ListTemplates", resp, "Failure sending request") + return + } + + result.atr, err = client.ListTemplatesResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "ListTemplates", resp, "Failure responding to request") + } + + return +} + +// ListTemplatesPreparer prepares the ListTemplates request. +func (client AppsClient) ListTemplatesPreparer(ctx context.Context) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-09-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.IoTCentral/appTemplates", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListTemplatesSender sends the ListTemplates request. The method will close the +// http.Response Body if it receives an error. +func (client AppsClient) ListTemplatesSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + return autorest.SendWithSender(client, req, sd...) +} + +// ListTemplatesResponder handles the response to the ListTemplates request. The method always +// closes the http.Response Body. +func (client AppsClient) ListTemplatesResponder(resp *http.Response) (result AppTemplatesResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listTemplatesNextResults retrieves the next set of results, if any. +func (client AppsClient) listTemplatesNextResults(ctx context.Context, lastResults AppTemplatesResult) (result AppTemplatesResult, err error) { + req, err := lastResults.appTemplatesResultPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "iotcentral.AppsClient", "listTemplatesNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListTemplatesSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "iotcentral.AppsClient", "listTemplatesNextResults", resp, "Failure sending next results request") + } + result, err = client.ListTemplatesResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "listTemplatesNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListTemplatesComplete enumerates all values, automatically crossing page boundaries as required. +func (client AppsClient) ListTemplatesComplete(ctx context.Context) (result AppTemplatesResultIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.ListTemplates") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.ListTemplates(ctx) + return +} + +// Update update the metadata of an IoT Central application. +// Parameters: +// resourceGroupName - the name of the resource group that contains the IoT Central application. +// resourceName - the ARM resource name of the IoT Central application. +// appPatch - the IoT Central application metadata and security metadata. +func (client AppsClient) Update(ctx context.Context, resourceGroupName string, resourceName string, appPatch AppPatch) (result AppsUpdateFuture, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppsClient.Update") + defer func() { + sc := -1 + if result.Response() != nil { + sc = result.Response().StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + req, err := client.UpdatePreparer(ctx, resourceGroupName, resourceName, appPatch) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "Update", nil, "Failure preparing request") + return + } + + result, err = client.UpdateSender(req) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "Update", result.Response(), "Failure sending request") + return + } + + return +} + +// UpdatePreparer prepares the Update request. +func (client AppsClient) UpdatePreparer(ctx context.Context, resourceGroupName string, resourceName string, appPatch AppPatch) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "resourceGroupName": autorest.Encode("path", resourceGroupName), + "resourceName": autorest.Encode("path", resourceName), + "subscriptionId": autorest.Encode("path", client.SubscriptionID), + } + + const APIVersion = "2018-09-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPatch(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.IoTCentral/IoTApps/{resourceName}", pathParameters), + autorest.WithJSON(appPatch), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// UpdateSender sends the Update request. The method will close the +// http.Response Body if it receives an error. +func (client AppsClient) UpdateSender(req *http.Request) (future AppsUpdateFuture, err error) { + sd := autorest.GetSendDecorators(req.Context(), azure.DoRetryWithRegistration(client.Client)) + var resp *http.Response + resp, err = autorest.SendWithSender(client, req, sd...) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return +} + +// UpdateResponder handles the response to the Update request. The method always +// closes the http.Response Body. +func (client AppsClient) UpdateResponder(resp *http.Response) (result App, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral/client.go new file mode 100644 index 0000000000000..2f1d8942ff703 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral/client.go @@ -0,0 +1,51 @@ +// Package iotcentral implements the Azure ARM Iotcentral service API version 2018-09-01. +// +// Use this API to manage IoT Central Applications in your Azure subscription. +package iotcentral + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "github.com/Azure/go-autorest/autorest" +) + +const ( + // DefaultBaseURI is the default URI used for the service Iotcentral + DefaultBaseURI = "https://management.azure.com" +) + +// BaseClient is the base client for Iotcentral. +type BaseClient struct { + autorest.Client + BaseURI string + SubscriptionID string +} + +// New creates an instance of the BaseClient client. +func New(subscriptionID string) BaseClient { + return NewWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewWithBaseURI creates an instance of the BaseClient client. +func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient { + return BaseClient{ + Client: autorest.NewClientWithUserAgent(UserAgent()), + BaseURI: baseURI, + SubscriptionID: subscriptionID, + } +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral/models.go new file mode 100644 index 0000000000000..10b3c2c10a1fa --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral/models.go @@ -0,0 +1,889 @@ +package iotcentral + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "encoding/json" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/to" + "github.com/Azure/go-autorest/tracing" + "net/http" +) + +// The package's fully qualified name. +const fqdn = "github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral" + +// AppSku enumerates the values for app sku. +type AppSku string + +const ( + // F1 ... + F1 AppSku = "F1" + // S1 ... + S1 AppSku = "S1" + // ST0 ... + ST0 AppSku = "ST0" + // ST1 ... + ST1 AppSku = "ST1" + // ST2 ... + ST2 AppSku = "ST2" +) + +// PossibleAppSkuValues returns an array of possible values for the AppSku const type. +func PossibleAppSkuValues() []AppSku { + return []AppSku{F1, S1, ST0, ST1, ST2} +} + +// App the IoT Central application. +type App struct { + autorest.Response `json:"-"` + // AppProperties - The common properties of an IoT Central application. + *AppProperties `json:"properties,omitempty"` + // Sku - A valid instance SKU. + Sku *AppSkuInfo `json:"sku,omitempty"` + // ID - READ-ONLY; The ARM resource identifier. + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; The ARM resource name. + Name *string `json:"name,omitempty"` + // Type - READ-ONLY; The resource type. + Type *string `json:"type,omitempty"` + // Location - The resource location. + Location *string `json:"location,omitempty"` + // Tags - The resource tags. + Tags map[string]*string `json:"tags"` +} + +// MarshalJSON is the custom marshaler for App. +func (a App) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if a.AppProperties != nil { + objectMap["properties"] = a.AppProperties + } + if a.Sku != nil { + objectMap["sku"] = a.Sku + } + if a.Location != nil { + objectMap["location"] = a.Location + } + if a.Tags != nil { + objectMap["tags"] = a.Tags + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for App struct. +func (a *App) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var appProperties AppProperties + err = json.Unmarshal(*v, &appProperties) + if err != nil { + return err + } + a.AppProperties = &appProperties + } + case "sku": + if v != nil { + var sku AppSkuInfo + err = json.Unmarshal(*v, &sku) + if err != nil { + return err + } + a.Sku = &sku + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + a.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + a.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + a.Type = &typeVar + } + case "location": + if v != nil { + var location string + err = json.Unmarshal(*v, &location) + if err != nil { + return err + } + a.Location = &location + } + case "tags": + if v != nil { + var tags map[string]*string + err = json.Unmarshal(*v, &tags) + if err != nil { + return err + } + a.Tags = tags + } + } + } + + return nil +} + +// AppAvailabilityInfo the properties indicating whether a given IoT Central application name or subdomain +// is available. +type AppAvailabilityInfo struct { + autorest.Response `json:"-"` + // NameAvailable - READ-ONLY; The value which indicates whether the provided name is available. + NameAvailable *bool `json:"nameAvailable,omitempty"` + // Reason - READ-ONLY; The reason for unavailability. + Reason *string `json:"reason,omitempty"` + // Message - READ-ONLY; The detailed reason message. + Message *string `json:"message,omitempty"` +} + +// AppListResult a list of IoT Central Applications with a next link. +type AppListResult struct { + autorest.Response `json:"-"` + // NextLink - The link used to get the next page of IoT Central Applications. + NextLink *string `json:"nextLink,omitempty"` + // Value - A list of IoT Central Applications. + Value *[]App `json:"value,omitempty"` +} + +// AppListResultIterator provides access to a complete listing of App values. +type AppListResultIterator struct { + i int + page AppListResultPage +} + +// NextWithContext advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *AppListResultIterator) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppListResultIterator.NextWithContext") + defer func() { + sc := -1 + if iter.Response().Response.Response != nil { + sc = iter.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err = iter.page.NextWithContext(ctx) + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (iter *AppListResultIterator) Next() error { + return iter.NextWithContext(context.Background()) +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter AppListResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter AppListResultIterator) Response() AppListResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter AppListResultIterator) Value() App { + if !iter.page.NotDone() { + return App{} + } + return iter.page.Values()[iter.i] +} + +// Creates a new instance of the AppListResultIterator type. +func NewAppListResultIterator(page AppListResultPage) AppListResultIterator { + return AppListResultIterator{page: page} +} + +// IsEmpty returns true if the ListResult contains no values. +func (alr AppListResult) IsEmpty() bool { + return alr.Value == nil || len(*alr.Value) == 0 +} + +// appListResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (alr AppListResult) appListResultPreparer(ctx context.Context) (*http.Request, error) { + if alr.NextLink == nil || len(to.String(alr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare((&http.Request{}).WithContext(ctx), + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(alr.NextLink))) +} + +// AppListResultPage contains a page of App values. +type AppListResultPage struct { + fn func(context.Context, AppListResult) (AppListResult, error) + alr AppListResult +} + +// NextWithContext advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *AppListResultPage) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppListResultPage.NextWithContext") + defer func() { + sc := -1 + if page.Response().Response.Response != nil { + sc = page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + next, err := page.fn(ctx, page.alr) + if err != nil { + return err + } + page.alr = next + return nil +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (page *AppListResultPage) Next() error { + return page.NextWithContext(context.Background()) +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page AppListResultPage) NotDone() bool { + return !page.alr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page AppListResultPage) Response() AppListResult { + return page.alr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page AppListResultPage) Values() []App { + if page.alr.IsEmpty() { + return nil + } + return *page.alr.Value +} + +// Creates a new instance of the AppListResultPage type. +func NewAppListResultPage(getNextPage func(context.Context, AppListResult) (AppListResult, error)) AppListResultPage { + return AppListResultPage{fn: getNextPage} +} + +// AppPatch the description of the IoT Central application. +type AppPatch struct { + // Tags - Instance tags + Tags map[string]*string `json:"tags"` + // AppProperties - The common properties of an IoT Central application. + *AppProperties `json:"properties,omitempty"` +} + +// MarshalJSON is the custom marshaler for AppPatch. +func (ap AppPatch) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if ap.Tags != nil { + objectMap["tags"] = ap.Tags + } + if ap.AppProperties != nil { + objectMap["properties"] = ap.AppProperties + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for AppPatch struct. +func (ap *AppPatch) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "tags": + if v != nil { + var tags map[string]*string + err = json.Unmarshal(*v, &tags) + if err != nil { + return err + } + ap.Tags = tags + } + case "properties": + if v != nil { + var appProperties AppProperties + err = json.Unmarshal(*v, &appProperties) + if err != nil { + return err + } + ap.AppProperties = &appProperties + } + } + } + + return nil +} + +// AppProperties the properties of an IoT Central application. +type AppProperties struct { + // ApplicationID - READ-ONLY; The ID of the application. + ApplicationID *string `json:"applicationId,omitempty"` + // DisplayName - The display name of the application. + DisplayName *string `json:"displayName,omitempty"` + // Subdomain - The subdomain of the application. + Subdomain *string `json:"subdomain,omitempty"` + // Template - The ID of the application template, which is a blueprint that defines the characteristics and behaviors of an application. Optional; if not specified, defaults to a blank blueprint and allows the application to be defined from scratch. + Template *string `json:"template,omitempty"` +} + +// AppsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running +// operation. +type AppsCreateOrUpdateFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *AppsCreateOrUpdateFuture) Result(client AppsClient) (a App, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("iotcentral.AppsCreateOrUpdateFuture") + return + } + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if a.Response.Response, err = future.GetResult(sender); err == nil && a.Response.Response.StatusCode != http.StatusNoContent { + a, err = client.CreateOrUpdateResponder(a.Response.Response) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsCreateOrUpdateFuture", "Result", a.Response.Response, "Failure responding to request") + } + } + return +} + +// AppsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. +type AppsDeleteFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *AppsDeleteFuture) Result(client AppsClient) (ar autorest.Response, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsDeleteFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("iotcentral.AppsDeleteFuture") + return + } + ar.Response = future.Response() + return +} + +// AppSkuInfo information about the SKU of the IoT Central application. +type AppSkuInfo struct { + // Name - The name of the SKU. Possible values include: 'F1', 'S1', 'ST0', 'ST1', 'ST2' + Name AppSku `json:"name,omitempty"` +} + +// AppsUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. +type AppsUpdateFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *AppsUpdateFuture) Result(client AppsClient) (a App, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsUpdateFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("iotcentral.AppsUpdateFuture") + return + } + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if a.Response.Response, err = future.GetResult(sender); err == nil && a.Response.Response.StatusCode != http.StatusNoContent { + a, err = client.UpdateResponder(a.Response.Response) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.AppsUpdateFuture", "Result", a.Response.Response, "Failure responding to request") + } + } + return +} + +// AppTemplate ioT Central Application Template. +type AppTemplate struct { + // ManifestID - READ-ONLY; The ID of the template. + ManifestID *string `json:"manifestId,omitempty"` + // ManifestVersion - READ-ONLY; The version of the template. + ManifestVersion *string `json:"manifestVersion,omitempty"` + // AppTemplateName - READ-ONLY; The name of the template. + AppTemplateName *string `json:"appTemplateName,omitempty"` + // Title - READ-ONLY; The title of the template. + Title *string `json:"title,omitempty"` + // Order - READ-ONLY; The order of the template in the templates list. + Order *float64 `json:"order,omitempty"` + // Description - READ-ONLY; The description of the template. + Description *string `json:"description,omitempty"` +} + +// AppTemplatesResult a list of IoT Central Application Templates with a next link. +type AppTemplatesResult struct { + autorest.Response `json:"-"` + // NextLink - The link used to get the next page of IoT Central application templates. + NextLink *string `json:"nextLink,omitempty"` + // Value - READ-ONLY; A list of IoT Central Application Templates. + Value *[]AppTemplate `json:"value,omitempty"` +} + +// AppTemplatesResultIterator provides access to a complete listing of AppTemplate values. +type AppTemplatesResultIterator struct { + i int + page AppTemplatesResultPage +} + +// NextWithContext advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *AppTemplatesResultIterator) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppTemplatesResultIterator.NextWithContext") + defer func() { + sc := -1 + if iter.Response().Response.Response != nil { + sc = iter.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err = iter.page.NextWithContext(ctx) + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (iter *AppTemplatesResultIterator) Next() error { + return iter.NextWithContext(context.Background()) +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter AppTemplatesResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter AppTemplatesResultIterator) Response() AppTemplatesResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter AppTemplatesResultIterator) Value() AppTemplate { + if !iter.page.NotDone() { + return AppTemplate{} + } + return iter.page.Values()[iter.i] +} + +// Creates a new instance of the AppTemplatesResultIterator type. +func NewAppTemplatesResultIterator(page AppTemplatesResultPage) AppTemplatesResultIterator { + return AppTemplatesResultIterator{page: page} +} + +// IsEmpty returns true if the ListResult contains no values. +func (atr AppTemplatesResult) IsEmpty() bool { + return atr.Value == nil || len(*atr.Value) == 0 +} + +// appTemplatesResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (atr AppTemplatesResult) appTemplatesResultPreparer(ctx context.Context) (*http.Request, error) { + if atr.NextLink == nil || len(to.String(atr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare((&http.Request{}).WithContext(ctx), + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(atr.NextLink))) +} + +// AppTemplatesResultPage contains a page of AppTemplate values. +type AppTemplatesResultPage struct { + fn func(context.Context, AppTemplatesResult) (AppTemplatesResult, error) + atr AppTemplatesResult +} + +// NextWithContext advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *AppTemplatesResultPage) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/AppTemplatesResultPage.NextWithContext") + defer func() { + sc := -1 + if page.Response().Response.Response != nil { + sc = page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + next, err := page.fn(ctx, page.atr) + if err != nil { + return err + } + page.atr = next + return nil +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (page *AppTemplatesResultPage) Next() error { + return page.NextWithContext(context.Background()) +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page AppTemplatesResultPage) NotDone() bool { + return !page.atr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page AppTemplatesResultPage) Response() AppTemplatesResult { + return page.atr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page AppTemplatesResultPage) Values() []AppTemplate { + if page.atr.IsEmpty() { + return nil + } + return *page.atr.Value +} + +// Creates a new instance of the AppTemplatesResultPage type. +func NewAppTemplatesResultPage(getNextPage func(context.Context, AppTemplatesResult) (AppTemplatesResult, error)) AppTemplatesResultPage { + return AppTemplatesResultPage{fn: getNextPage} +} + +// ErrorDetails error details. +type ErrorDetails struct { + // ErrorResponseBody - Error response body. + *ErrorResponseBody `json:"error,omitempty"` +} + +// MarshalJSON is the custom marshaler for ErrorDetails. +func (ed ErrorDetails) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if ed.ErrorResponseBody != nil { + objectMap["error"] = ed.ErrorResponseBody + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for ErrorDetails struct. +func (ed *ErrorDetails) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "error": + if v != nil { + var errorResponseBody ErrorResponseBody + err = json.Unmarshal(*v, &errorResponseBody) + if err != nil { + return err + } + ed.ErrorResponseBody = &errorResponseBody + } + } + } + + return nil +} + +// ErrorResponseBody details of error response. +type ErrorResponseBody struct { + // Code - READ-ONLY; The error code. + Code *string `json:"code,omitempty"` + // Message - READ-ONLY; The error message. + Message *string `json:"message,omitempty"` + // Target - READ-ONLY; The target of the particular error. + Target *string `json:"target,omitempty"` + // Details - A list of additional details about the error. + Details *[]ErrorResponseBody `json:"details,omitempty"` +} + +// Operation ioT Central REST API operation +type Operation struct { + // Name - READ-ONLY; Operation name: {provider}/{resource}/{read | write | action | delete} + Name *string `json:"name,omitempty"` + // Display - The object that represents the operation. + Display *OperationDisplay `json:"display,omitempty"` +} + +// OperationDisplay the object that represents the operation. +type OperationDisplay struct { + // Provider - READ-ONLY; Service provider: Microsoft IoT Central + Provider *string `json:"provider,omitempty"` + // Resource - READ-ONLY; Resource Type: IoT Central + Resource *string `json:"resource,omitempty"` + // Operation - READ-ONLY; Name of the operation + Operation *string `json:"operation,omitempty"` + // Description - READ-ONLY; Friendly description for the operation, + Description *string `json:"description,omitempty"` +} + +// OperationInputs input values. +type OperationInputs struct { + // Name - The name of the IoT Central application instance to check. + Name *string `json:"name,omitempty"` + // Type - The type of the IoT Central resource to query. + Type *string `json:"type,omitempty"` +} + +// OperationListResult a list of IoT Central operations. It contains a list of operations and a URL link to +// get the next set of results. +type OperationListResult struct { + autorest.Response `json:"-"` + // NextLink - The link used to get the next page of IoT Central description objects. + NextLink *string `json:"nextLink,omitempty"` + // Value - READ-ONLY; A list of operations supported by the Microsoft.IoTCentral resource provider. + Value *[]Operation `json:"value,omitempty"` +} + +// OperationListResultIterator provides access to a complete listing of Operation values. +type OperationListResultIterator struct { + i int + page OperationListResultPage +} + +// NextWithContext advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *OperationListResultIterator) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/OperationListResultIterator.NextWithContext") + defer func() { + sc := -1 + if iter.Response().Response.Response != nil { + sc = iter.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err = iter.page.NextWithContext(ctx) + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (iter *OperationListResultIterator) Next() error { + return iter.NextWithContext(context.Background()) +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter OperationListResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter OperationListResultIterator) Response() OperationListResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter OperationListResultIterator) Value() Operation { + if !iter.page.NotDone() { + return Operation{} + } + return iter.page.Values()[iter.i] +} + +// Creates a new instance of the OperationListResultIterator type. +func NewOperationListResultIterator(page OperationListResultPage) OperationListResultIterator { + return OperationListResultIterator{page: page} +} + +// IsEmpty returns true if the ListResult contains no values. +func (olr OperationListResult) IsEmpty() bool { + return olr.Value == nil || len(*olr.Value) == 0 +} + +// operationListResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (olr OperationListResult) operationListResultPreparer(ctx context.Context) (*http.Request, error) { + if olr.NextLink == nil || len(to.String(olr.NextLink)) < 1 { + return nil, nil + } + return autorest.Prepare((&http.Request{}).WithContext(ctx), + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(olr.NextLink))) +} + +// OperationListResultPage contains a page of Operation values. +type OperationListResultPage struct { + fn func(context.Context, OperationListResult) (OperationListResult, error) + olr OperationListResult +} + +// NextWithContext advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *OperationListResultPage) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/OperationListResultPage.NextWithContext") + defer func() { + sc := -1 + if page.Response().Response.Response != nil { + sc = page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + next, err := page.fn(ctx, page.olr) + if err != nil { + return err + } + page.olr = next + return nil +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (page *OperationListResultPage) Next() error { + return page.NextWithContext(context.Background()) +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page OperationListResultPage) NotDone() bool { + return !page.olr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page OperationListResultPage) Response() OperationListResult { + return page.olr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page OperationListResultPage) Values() []Operation { + if page.olr.IsEmpty() { + return nil + } + return *page.olr.Value +} + +// Creates a new instance of the OperationListResultPage type. +func NewOperationListResultPage(getNextPage func(context.Context, OperationListResult) (OperationListResult, error)) OperationListResultPage { + return OperationListResultPage{fn: getNextPage} +} + +// Resource the common properties of an ARM resource. +type Resource struct { + // ID - READ-ONLY; The ARM resource identifier. + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; The ARM resource name. + Name *string `json:"name,omitempty"` + // Type - READ-ONLY; The resource type. + Type *string `json:"type,omitempty"` + // Location - The resource location. + Location *string `json:"location,omitempty"` + // Tags - The resource tags. + Tags map[string]*string `json:"tags"` +} + +// MarshalJSON is the custom marshaler for Resource. +func (r Resource) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if r.Location != nil { + objectMap["location"] = r.Location + } + if r.Tags != nil { + objectMap["tags"] = r.Tags + } + return json.Marshal(objectMap) +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral/operations.go new file mode 100644 index 0000000000000..04c51574f2b4c --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral/operations.go @@ -0,0 +1,147 @@ +package iotcentral + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +import ( + "context" + "github.com/Azure/go-autorest/autorest" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/tracing" + "net/http" +) + +// OperationsClient is the use this API to manage IoT Central Applications in your Azure subscription. +type OperationsClient struct { + BaseClient +} + +// NewOperationsClient creates an instance of the OperationsClient client. +func NewOperationsClient(subscriptionID string) OperationsClient { + return NewOperationsClientWithBaseURI(DefaultBaseURI, subscriptionID) +} + +// NewOperationsClientWithBaseURI creates an instance of the OperationsClient client. +func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient { + return OperationsClient{NewWithBaseURI(baseURI, subscriptionID)} +} + +// List lists all of the available IoT Central application REST API operations. +func (client OperationsClient) List(ctx context.Context) (result OperationListResultPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/OperationsClient.List") + defer func() { + sc := -1 + if result.olr.Response.Response != nil { + sc = result.olr.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.fn = client.listNextResults + req, err := client.ListPreparer(ctx) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.OperationsClient", "List", nil, "Failure preparing request") + return + } + + resp, err := client.ListSender(req) + if err != nil { + result.olr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "iotcentral.OperationsClient", "List", resp, "Failure sending request") + return + } + + result.olr, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.OperationsClient", "List", resp, "Failure responding to request") + } + + return +} + +// ListPreparer prepares the List request. +func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { + const APIVersion = "2018-09-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPath("/providers/Microsoft.IoTCentral/operations"), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListSender sends the List request. The method will close the +// http.Response Body if it receives an error. +func (client OperationsClient) ListSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + return autorest.SendWithSender(client, req, sd...) +} + +// ListResponder handles the response to the List request. The method always +// closes the http.Response Body. +func (client OperationsClient) ListResponder(resp *http.Response) (result OperationListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listNextResults retrieves the next set of results, if any. +func (client OperationsClient) listNextResults(ctx context.Context, lastResults OperationListResult) (result OperationListResult, err error) { + req, err := lastResults.operationListResultPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "iotcentral.OperationsClient", "listNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "iotcentral.OperationsClient", "listNextResults", resp, "Failure sending next results request") + } + result, err = client.ListResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "iotcentral.OperationsClient", "listNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListComplete enumerates all values, automatically crossing page boundaries as required. +func (client OperationsClient) ListComplete(ctx context.Context) (result OperationListResultIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/OperationsClient.List") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.List(ctx) + return +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral/version.go new file mode 100644 index 0000000000000..45eef622e74c4 --- /dev/null +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral/version.go @@ -0,0 +1,30 @@ +package iotcentral + +import "github.com/Azure/azure-sdk-for-go/version" + +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +// UserAgent returns the UserAgent string to use when sending http.Requests. +func UserAgent() string { + return "Azure-SDK-For-Go/" + version.Number + " iotcentral/2018-09-01" +} + +// Version returns the semantic version (see http://semver.org) of the client. +func Version() string { + return version.Number +} diff --git a/vendor/modules.txt b/vendor/modules.txt index b5f403bbf7733..ecfa6ab041a07 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -34,6 +34,7 @@ github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub github.com/Azure/azure-sdk-for-go/services/frontdoor/mgmt/2019-11-01/frontdoor github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac github.com/Azure/azure-sdk-for-go/services/healthcareapis/mgmt/2019-09-16/healthcareapis +github.com/Azure/azure-sdk-for-go/services/iotcentral/mgmt/2018-09-01/iotcentral github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2018-02-14/keyvault github.com/Azure/azure-sdk-for-go/services/kusto/mgmt/2019-05-15/kusto diff --git a/website/allowed-subcategories b/website/allowed-subcategories index 405f97ba144aa..ddaa243ba3283 100644 --- a/website/allowed-subcategories +++ b/website/allowed-subcategories @@ -24,6 +24,7 @@ Dev Test DevSpace HDInsight Healthcare +IoT Central IoT Hub Key Vault Load Balancer diff --git a/website/azurerm.erb b/website/azurerm.erb index 290b01a4ac9ce..3fe6fba4945d2 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -1438,6 +1438,15 @@
            • +
          • + IoTCentral Application Resources + +
            • +
          • IoT Hub Resources
              diff --git a/website/docs/r/iotcentral_application.html.markdown b/website/docs/r/iotcentral_application.html.markdown new file mode 100644 index 0000000000000..e7ea7a21759ee --- /dev/null +++ b/website/docs/r/iotcentral_application.html.markdown @@ -0,0 +1,69 @@ +--- +subcategory: "IoT Central" +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_iotcentral_application" +description: |- + Manages an IotCentral Application +--- + +# azurerm_iotcentral_application + +Manages an IotCentral Application + +## Example Usage + +```hcl +resource "azurerm_resource_group" "example" { + name = "example-resource" + location = "West Europe" +} + +resource "azurerm_iotcentral_application" "example" { + name = "example-iotcentral-app" + resource_group_name = "${azurerm_resource_group.example.name}" + location = "${azurerm_resource_group.example.location}" + sub_domain = "example-iotcentral-app-subdomain" + + display_name = "example-iotcentral-app-display-name" + sku = "S1" + template = "iotc-default@1.0.0" + + tags = { + Foo = "Bar" + } +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) Specifies the name of the IotHub resource. Changing this forces a new resource to be created. + +* `resource_group_name` - (Required) The name of the resource group under which the IotHub resource has to be created. Changing this forces a new resource to be created. + +* `location` - (Required) Specifies the supported Azure location where the resource has to be create. Changing this forces a new resource to be created. + +* `sub_domain` - (Required) A `sub_domain` name. Subdomain for the IoT Central URL. Each application must have a unique subdomain. + +* `display_name` - (Optional) A `display_name` name. Custom display name for the IoT Central application. Default is resource name. + +* `sku` - (Optional) A `sku` name. Possible values is `ST1`, `ST2`, Default value is `ST1` + +* `template` - (Optional) A `template` name. IoT Central application template name. Default is a custom application. + +* `tags` - (Optional) A mapping of tags to assign to the resource. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The ID of the IoT Central Application. + +## Import + +IoTCentralApplication can be imported using the `resource id`, e.g. + +```shell +terraform import azurerm_iotcentral_application.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.IoTCentral/IoTApps/app1 +``` From 920c207396a45754eda7b66d710dd8a394a979d6 Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 6 Mar 2020 11:16:01 -0800 Subject: [PATCH 480/498] Update CHANGELOG.md to include #5446 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52a0feabb7007..bbe08cc130be5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ FEATURES: * **New Resource:** `azurerm_database_migration_project` [GH-5993] * **New Resource:** `azurerm_database_migration_service` [GH-5258] * **New Resource:** `azurerm_hpc_cache` [GH-5528] +* **New Resource:** `azurerm_iotcentral_application` [GH-5446] * **New Resource:** `azurerm_monitor_scheduled_query_rules_alert` [GH-5053] * **New Resource:** `azurerm_monitor_scheduled_query_rules_log` [GH-5053] From 515c15e127edeb8437c388cc1ae9ccc3cde90276 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Fri, 6 Mar 2020 13:11:21 -0800 Subject: [PATCH 481/498] Update Changelog for #6011 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bbe08cc130be5..cbf7d04e47bc7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ FEATURES: * **New Resource:** `azurerm_iotcentral_application` [GH-5446] * **New Resource:** `azurerm_monitor_scheduled_query_rules_alert` [GH-5053] * **New Resource:** `azurerm_monitor_scheduled_query_rules_log` [GH-5053] +* **New Resource:** `azurerm_spatial_anchors_account` [GH-6011] IMPROVEMENTS: From e7b360e7097580e7ec97bdcc2d44be3f00a0f86d Mon Sep 17 00:00:00 2001 From: Marceline Abadeer Date: Sun, 8 Mar 2020 21:41:35 -0600 Subject: [PATCH 482/498] Updated virtual_hub.html.markdown (#6033) Fixed Usage definition: resource_group >> resource_group_name --- website/docs/d/virtual_hub.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/d/virtual_hub.html.markdown b/website/docs/d/virtual_hub.html.markdown index d4ed43d726d86..d0d73787ffb04 100644 --- a/website/docs/d/virtual_hub.html.markdown +++ b/website/docs/d/virtual_hub.html.markdown @@ -14,8 +14,8 @@ Uses this data source to access information about an existing Virtual Hub. ```hcl data "azurerm_virtual_hub" "example" { - name = "example-hub" - resource_group = "example-resources" + name = "example-hub" + resource_group_name = "example-resources" } output "virtual_hub_id" { From cd0a4f93f4df650d59dc20d5b72fac07baa640c0 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 20 Feb 2020 07:46:51 +0100 Subject: [PATCH 483/498] wip: adding a scaffolder for resources/data sources --- .../internal/tools/website-scaffold/main.go | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 azurerm/internal/tools/website-scaffold/main.go diff --git a/azurerm/internal/tools/website-scaffold/main.go b/azurerm/internal/tools/website-scaffold/main.go new file mode 100644 index 0000000000000..b1b943bea8d9e --- /dev/null +++ b/azurerm/internal/tools/website-scaffold/main.go @@ -0,0 +1,73 @@ +package main + +import ( + "flag" + "fmt" + + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/provider" +) + +func main() { + isResource := flag.Bool("resource", true, "True if this is a Resource, False if this is a Data Source") + resourceName := flag.String("name", "", "The name of the Data Source/Resource which should be generated") + flag.Parse() + + if err := run(*isResource, *resourceName); err != nil { + panic(err) + } +} + +func run(isResource bool, resourceName string) error { + if isResource { + return runForResource(resourceName) + } + + return runForDataSource(resourceName) +} + +func runForDataSource(resourceName string) error { + var dataSource *schema.Resource + + for _, service := range provider.SupportedServices() { + for key, ds := range service.SupportedDataSources() { + if key == resourceName { + dataSource = ds + break + } + } + } + + if dataSource == nil { + return fmt.Errorf("Data Source %q was not registered!", resourceName) + } + + return buildDocumentationForDataSource(resourceName, dataSource) +} + +func runForResource(resourceName string) error { + var resource *schema.Resource + + for _, service := range provider.SupportedServices() { + for key, rs := range service.SupportedResources() { + if key == resourceName { + resource = rs + break + } + } + } + + if resource == nil { + return fmt.Errorf("Resource %q was not registered!", resourceName) + } + + return buildDocumentationForResource(resourceName, resource) +} + +func buildDocumentationForDataSource(resourceName string, resource *schema.Resource) error { + return nil +} + +func buildDocumentationForResource(resourceName string, resource *schema.Resource) error { + return nil +} From d17d53cb9f011d06489c56db504c29a20a100ffd Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 24 Feb 2020 19:17:55 +0100 Subject: [PATCH 484/498] New Tool: website-scaffolder This tools intended to aid with building new resources, in particular by scaffolding the documentation from the resource definition. Note: this is intentionally scaffolding - not full codegen - since documentation should always require human review for clarity / grammar. --- .../internal/tools/website-scaffold/README.md | 23 + .../internal/tools/website-scaffold/main.go | 882 +++++++++++++++++- 2 files changed, 873 insertions(+), 32 deletions(-) create mode 100644 azurerm/internal/tools/website-scaffold/README.md diff --git a/azurerm/internal/tools/website-scaffold/README.md b/azurerm/internal/tools/website-scaffold/README.md new file mode 100644 index 0000000000000..285b4da72cc04 --- /dev/null +++ b/azurerm/internal/tools/website-scaffold/README.md @@ -0,0 +1,23 @@ +## Website Scaffolder + +This application scaffolds the documentation for a Data Source/Resource. + +**Note:** the documentation generated from this application is intended to be a starting point, which when finished requires human review - rather than generating a finished product. + +## Example Usage + +``` +$ go run main.go -name azurerm_resource_group -brand-name "Resource Group" -type "resource" -resource-id "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1" -website-path ../../../../website/ +``` + +## Arguments + +* `-name` - (Required) The Name used for the Resource in Terraform e.g. `azurerm_resource_group` + +* `-brand-name` - (Required) The Brand Name used for this Resource in Azure e.g. `Resource Group` or `App Service (Web Apps)` + +* `-type` - (Required) The Type of Documentation to generate. Possible values are `data` (for a Data Source) or `resource` (for a Resource). + +* `-resource-id` - (Required when scaffolding a Resource) An Azure Resource ID which can be used as a placeholder in the import documentation. + +* `-website-path` - (Required) The path to the `./website` directory in the root of this repository. diff --git a/azurerm/internal/tools/website-scaffold/main.go b/azurerm/internal/tools/website-scaffold/main.go index b1b943bea8d9e..cde6184883846 100644 --- a/azurerm/internal/tools/website-scaffold/main.go +++ b/azurerm/internal/tools/website-scaffold/main.go @@ -3,71 +3,889 @@ package main import ( "flag" "fmt" + "log" + "math" + "os" + "path/filepath" + "sort" + "strconv" + "strings" + "time" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/provider" ) +// NOTE: since we're using `go run` for these tools all of the code needs to live within the main.go + func main() { - isResource := flag.Bool("resource", true, "True if this is a Resource, False if this is a Data Source") - resourceName := flag.String("name", "", "The name of the Data Source/Resource which should be generated") - flag.Parse() + f := flag.NewFlagSet("example", flag.ExitOnError) + + resourceName := f.String("name", "", "The name of the Data Source/Resource which should be generated") + brandName := f.String("brand-name", "", "The friendly/brand name of this Data Source/Resource (e.g. Resource Group)") + resourceId := f.String("resource-id", "", "An Azure Resource ID showing an example of how to Import this Resource") + resourceType := f.String("type", "", "Whether this is a Data Source (data) or a Resource (resource)") + websitePath := f.String("website-path", "", "The relative path to the website folder") + + f.Parse(os.Args[1:]) + + var quitWithError = func(message string) { + log.Printf(message) + os.Exit(1) + } - if err := run(*isResource, *resourceName); err != nil { + if resourceName == nil || *resourceName == "" { + quitWithError("The name of the Data Source/Resource must be specified via `-name`") + return + } + + if brandName == nil || *brandName == "" { + quitWithError("The friendly/brannd name of the Data Source/Resource must be specified via `-brand`") + return + } + + if resourceType == nil || *resourceType == "" { + quitWithError("The type of the Data Source/Resource must be specified via `-type`") + return + } + + if *resourceType != "data" && *resourceType != "resource" { + quitWithError("The type of the Data Source/Resource specified via `-type` must be either `data` or `resource`") + return + } + + if websitePath == nil || *websitePath == "" { + quitWithError("The Relative Website Path must be specified via `-website-path`") + return + } + + isResource := *resourceType == "resource" + if isResource && (resourceId == nil || *resourceId == "") { + quitWithError("An example of an Azure Resource ID must be specified via `-resource-id` when scaffolding for a Resource") + return + } + + if err := run(*resourceName, *brandName, resourceId, isResource, *websitePath); err != nil { panic(err) } } -func run(isResource bool, resourceName string) error { - if isResource { - return runForResource(resourceName) +func run(resourceName, brandName string, resourceId *string, isResource bool, websitePath string) error { + + content, err := getContent(resourceName, brandName, resourceId, isResource) + if err != nil { + return fmt.Errorf("Error building content: %s", err) + } + + return saveContent(resourceName, websitePath, *content, isResource) +} + +func getContent(resourceName, brandName string, resourceId *string, isResource bool) (*string, error) { + generator := documentationGenerator{ + resourceName: resourceName, + brandName: brandName, + resourceId: resourceId, + isDataSource: !isResource, + } + + if !isResource { + for _, service := range provider.SupportedServices() { + for key, ds := range service.SupportedDataSources() { + if key == resourceName { + generator.resource = ds + generator.websiteCategories = service.WebsiteCategories() + break + } + } + } + + if generator.resource == nil { + return nil, fmt.Errorf("Data Source %q was not registered!", resourceName) + } + } else { + for _, service := range provider.SupportedServices() { + for key, rs := range service.SupportedResources() { + if key == resourceName { + generator.resource = rs + generator.websiteCategories = service.WebsiteCategories() + break + } + } + } + + if generator.resource == nil { + return nil, fmt.Errorf("Resource %q was not registered!", resourceName) + } + } + + docs := generator.generate() + return &docs, nil +} + +func saveContent(resourceName string, websitePath string, content string, isResource bool) error { + resourceKind := "r" + if !isResource { + resourceKind = "d" + } + + fileName := strings.TrimPrefix(resourceName, "azurerm_") + outputFileName := fmt.Sprintf("%s/docs/%s/%s.html.markdown", websitePath, resourceKind, fileName) + outputPath, err := filepath.Abs(outputFileName) + if err != nil { + return err + } + + file, err := os.Create(outputPath) + if err != nil { + return err + } + if os.IsExist(err) { + os.Remove(outputPath) + file, err = os.Create(outputPath) + if err != nil { + return err + } + } + defer file.Close() + + content = strings.TrimSpace(content) + _, _ = file.WriteString(content) + return file.Sync() +} + +type documentationGenerator struct { + resource *schema.Resource + + // brandName is the marketing brand name used for this resource (e.g. Resource Group / App Service / Web Apps) + brandName string + + // resourceName is the name of the resource e.g. `azurerm_resource_group` + resourceName string + + // isDataSource defines if this is a Data Source (if not it's a Resource) + isDataSource bool + + // resourceId is an example of the ID used by this Resource + resourceId *string + + // websiteCategories is the list of categories available by this service definition + websiteCategories []string +} + +func (gen documentationGenerator) generate() string { + title := gen.title() + argumentsBlock := gen.argumentsBlock() + attributesBlock := gen.attributesBlock() + description := gen.description() + exampleUsageBlock := gen.exampleUsageBlock() + frontMatterBlock := gen.frontMatterBlock() + importBlock := gen.importBlock() + timeoutsBlock := gen.timeoutsBlock() + + template := fmt.Sprintf(`%s +# %s + +%s. + +## Example Usage + +[][][]hcl +%s +[][][] + +%s + +%s + +%s + +%s`, frontMatterBlock, title, description, exampleUsageBlock, argumentsBlock, attributesBlock, timeoutsBlock, importBlock) + return strings.ReplaceAll(template, "[][][]", "```") +} + +// blocks +func (gen documentationGenerator) argumentsBlock() string { + var documentationForArguments = func(input map[string]*schema.Schema, onlyRequired, onlyOptional bool, blockName string) string { + fields := "" + + for _, fieldName := range gen.sortFields(input) { + field := input[fieldName] + + // nothing to see here, move along + if !field.Optional && !field.Required { + continue + } + + if onlyRequired && !field.Required { + continue + } + + if onlyOptional && !field.Optional { + continue + } + + status := "Optional" + if field.Required { + status = "Required" + } + + value := gen.buildDescriptionForArgument(fieldName, field, blockName) + if len(field.ConflictsWith) > 0 { + conflictingValues := make([]string, 0) + for _, v := range field.ConflictsWith { + conflictingValues = append(conflictingValues, fmt.Sprintf("`%s`", v)) + } + + value += fmt.Sprintf("Conflicts with %s", strings.Join(conflictingValues, ",")) + } + if field.ForceNew { + value += fmt.Sprintf(" Changing this forces a new %s to be created.", gen.brandName) + } + fields += fmt.Sprintf("* `%s` - (%s) %s\n\n", fieldName, status, value) + } + + return fields + } + + // first output the Required fields + fields := documentationForArguments(gen.resource.Schema, true, false, "") + // then prepare the Optional fields + optionalFields := documentationForArguments(gen.resource.Schema, false, true, "") + + // assuming we have both optional & required fields - let's add a separarer + if len(fields) > 0 && len(optionalFields) > 0 { + fields += "---\n\n" + } + fields += optionalFields + + // first list all of the top-level fields / blocks alphabetically + + // then we need to collect a list of all block names, everywhere + blockNames, blocks := gen.uniqueBlockNamesForArgument(gen.resource.Schema) + + for _, blockName := range blockNames { + block := blocks[blockName] + + fields += "---\n\n" + fields += fmt.Sprintf("A `%s` block supports the following:\n\n", blockName) + // required + fields += documentationForArguments(block, true, false, blockName) + // optional + fields += documentationForArguments(block, false, true, blockName) + } + + fields = strings.TrimSuffix(fields, "\n\n") + + return fmt.Sprintf(`## Arguments Reference + +The following arguments are supported: + +%s`, fields) +} + +func (gen documentationGenerator) attributesBlock() string { + var documentationForAttributes = func(input map[string]*schema.Schema, onlyComputed bool, blockName string) string { + fields := "" + + // now list all of the top-level fields / blocks alphabetically + for _, fieldName := range gen.sortFields(input) { + field := input[fieldName] + // when we're in a nested block there's no need to duplicate the fields + if onlyComputed && !field.Computed { + continue + } + if onlyComputed && (field.Optional || field.Required) { + continue + } + + value := gen.buildDescriptionForAttribute(fieldName, field, blockName) + fields += fmt.Sprintf("* `%s` - %s\n\n", fieldName, value) + } + + return fields + } + + // present in everything + fields := fmt.Sprintf("* `id` - The ID of the %s.\n\n", gen.brandName) + + // now list all of the top-level fields / blocks alphabetically + fields += documentationForAttributes(gen.resource.Schema, true, "") + + // then we need to collect a list of all block names, everywhere + blockNames, blocks := gen.uniqueBlockNamesForAttribute(gen.resource.Schema) + + for _, blockName := range blockNames { + block := blocks[blockName] + + fields += "---\n\n" + fields += fmt.Sprintf("A `%s` block exports the following:\n\n", blockName) + fields += documentationForAttributes(block, false, blockName) + } + + fields = strings.TrimSuffix(fields, "\n\n") + + return fmt.Sprintf(`## Attributes Reference + +In addition to the Arguments listed above - the following Attributes are exported: + +%s`, fields) +} + +func (gen documentationGenerator) description() string { + if gen.isDataSource { + return fmt.Sprintf("Use this data source to access information about an existing %s", gen.brandName) + } + + return fmt.Sprintf("Manages a %s", gen.brandName) +} + +func (gen documentationGenerator) exampleUsageBlock() string { + requiredFields := gen.requiredFieldsForExampleBlock(gen.resource.Schema, 1) + + if gen.isDataSource { + return fmt.Sprintf(`data "%s" "example" { +%s +} + +output "id" { + value = data.%s.example.id" +}`, gen.resourceName, requiredFields, gen.resourceName) + } + + return fmt.Sprintf(`resource "%s" "example" { +%s +}`, gen.resourceName, requiredFields) +} + +func (gen documentationGenerator) frontMatterBlock() string { + category := "TODO" + if len(gen.websiteCategories) > 0 { + if len(gen.websiteCategories) == 1 { + category = gen.websiteCategories[0] + } else { + category = fmt.Sprintf("TODO - pick from: %s", strings.Join(gen.websiteCategories, "|")) + } + } + + title := gen.title() + var description string + if gen.isDataSource { + description = fmt.Sprintf("Gets information about an existing %s", gen.brandName) + } else { + description = fmt.Sprintf("Manages a %s", gen.brandName) + } + + return fmt.Sprintf(` +--- +subcategory: "%s" +layout: "azurerm" +page_title: "Azure Resource Manager: %s" +description: |- + %s. +--- +`, category, title, description) +} + +func (gen documentationGenerator) importBlock() string { + // data source don't support import + if gen.isDataSource { + return "" + } + + template := fmt.Sprintf(`## Import + +%ss can be imported using the []resource id[], e.g. + +[][][]shell +terraform import %s.example %s +[][][]`, gen.brandName, gen.resourceName, *gen.resourceId) + return strings.ReplaceAll(template, "[]", "`") +} + +func (gen documentationGenerator) timeoutsBlock() string { + if gen.resource.Timeouts == nil { + return "" + } + timeouts := *gen.resource.Timeouts + + 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 { + hours := int(math.Floor(duration.Hours())) + if hours > 0 { + var hoursText string + if hours > 1 { + hoursText = fmt.Sprintf("%d hours", hours) + } else { + hoursText = "1 hour" + } + + minutesRemaining := int(math.Floor(duration.Minutes())) % 60.0 + if minutesRemaining == 0 { + return hoursText + } + + var minutesText string + if minutesRemaining > 1 { + minutesText = fmt.Sprintf("%d minutes", minutesRemaining) + } else { + minutesText = "1 minute" + } + + return fmt.Sprintf("%s and %s", hoursText, minutesText) + } + + minutes := int(duration.Minutes()) + if minutes > 1 { + return fmt.Sprintf("%d minutes", minutes) + } + + return "1 minute" + } + + timeoutsText := "" + if timeouts.Create != nil { + friendlyText := timeoutToFriendlyText(*timeouts.Create) + timeoutsText += fmt.Sprintf("* `create` - (Defaults to %s) Used when creating the %s.\n", friendlyText, gen.brandName) + } + + if timeouts.Read != nil { + friendlyText := timeoutToFriendlyText(*timeouts.Read) + timeoutsText += fmt.Sprintf("* `read` - (Defaults to %s) Used when retrieving the %s.\n", friendlyText, gen.brandName) + } + + if timeouts.Update != nil { + friendlyText := timeoutToFriendlyText(*timeouts.Update) + timeoutsText += fmt.Sprintf("* `update` - (Defaults to %s) Used when updating the %s.\n", friendlyText, gen.brandName) + } + + if timeouts.Create != nil { + friendlyText := timeoutToFriendlyText(*timeouts.Create) + timeoutsText += fmt.Sprintf("* `delete` - (Defaults to %s) Used when deleting the %s.\n", friendlyText, gen.brandName) + } + + timeoutsText = strings.TrimSuffix(timeoutsText, "\n") + return fmt.Sprintf(`## Timeouts + +%s + +%s`, timeoutsBlurb, timeoutsText) +} + +func (gen documentationGenerator) title() string { + if gen.isDataSource { + return fmt.Sprintf("Data Source: %s", gen.resourceName) } - return runForDataSource(resourceName) + return gen.resourceName } -func runForDataSource(resourceName string) error { - var dataSource *schema.Resource +// helpers +func (gen documentationGenerator) blockIsBefore(name string, blockName string) bool { + if blockName == "" { + return false + } - for _, service := range provider.SupportedServices() { - for key, ds := range service.SupportedDataSources() { - if key == resourceName { - dataSource = ds - break + items := []string{name, blockName} + sort.Strings(items) + return items[0] == name +} + +func (gen documentationGenerator) buildIndentForExample(level int) string { + out := "" + for i := 0; i < level; i++ { + out += " " + } + return out +} + +func (gen documentationGenerator) buildDescriptionForArgument(name string, field *schema.Schema, blockName string) string { + if name == "name" { + if blockName == "" { + if gen.isDataSource { + return fmt.Sprintf("The Name of this %s.", gen.brandName) } + + return fmt.Sprintf("The Name which should be used for this %s.", gen.brandName) + } else { + return "The Name which should be used for this TODO." + } + } + if name == "location" { + if gen.isDataSource { + return fmt.Sprintf("The Azure Region where the %s exists.", gen.brandName) } + + return fmt.Sprintf("The Azure Region where the %s should exist.", gen.brandName) + } + if name == "resource_group_name" { + if gen.isDataSource { + return fmt.Sprintf("The name of the Resource Group where the %s exists.", gen.brandName) + } + + return fmt.Sprintf("The name of the Resource Group where the %s should exist.", gen.brandName) + } + if name == "tags" { + return fmt.Sprintf("A mapping of tags which should be assigned to the %s.", gen.brandName) + } + + if name == "enabled" || strings.HasSuffix(name, "_enabled") { + return fmt.Sprintf("Should the TODO be enabled?") } - if dataSource == nil { - return fmt.Errorf("Data Source %q was not registered!", resourceName) + if strings.HasSuffix(name, "_id") { + return fmt.Sprintf("The ID of the TODO.") } - return buildDocumentationForDataSource(resourceName, dataSource) + if field.Elem != nil { + if _, ok := field.Elem.(*schema.Schema); ok { + if gen.blockIsBefore(name, blockName) { + return fmt.Sprintf("A `%s` block as defined above.", name) + } else { + return fmt.Sprintf("A `%s` block as defined below.", name) + } + } + + if _, ok := field.Elem.(*schema.Resource); ok { + if gen.blockIsBefore(name, blockName) { + return fmt.Sprintf("A `%s` block as defined above.", name) + } else { + return fmt.Sprintf("A `%s` block as defined below.", name) + } + } + } + if field.Type == schema.TypeList { + if gen.blockIsBefore(name, blockName) { + return fmt.Sprintf("A `%s` block as defined above.", name) + } else { + return fmt.Sprintf("A `%s` block as defined below.", name) + } + } + + return "TODO." } -func runForResource(resourceName string) error { - var resource *schema.Resource +func (gen documentationGenerator) buildDescriptionForAttribute(name string, field *schema.Schema, blockName string) string { + if name == "name" { + if blockName == "" { + return fmt.Sprintf("The Name of this %s.", gen.brandName) + } else { + return "The Name of this TODO." + } + } + if name == "location" { + return fmt.Sprintf("The Azure Region where the %s exists.", gen.brandName) + } + if name == "resource_group_name" { + return fmt.Sprintf("The name of the Resource Group where the %s is located.", gen.brandName) + } + if name == "tags" { + return fmt.Sprintf("A mapping of tags assigned to the %s.", gen.brandName) + } + + if name == "enabled" || strings.HasSuffix(name, "_enabled") { + return fmt.Sprintf("Is the TODO enabled?") + } + + if strings.HasSuffix(name, "_id") { + return fmt.Sprintf("The ID of the TODO.") + } + + if field.Elem != nil { + if _, ok := field.Elem.(*schema.Schema); ok { + if gen.blockIsBefore(name, blockName) { + return fmt.Sprintf("A `%s` block as defined above.", name) + } else { + return fmt.Sprintf("A `%s` block as defined below.", name) + } + } - for _, service := range provider.SupportedServices() { - for key, rs := range service.SupportedResources() { - if key == resourceName { - resource = rs - break + if _, ok := field.Elem.(*schema.Resource); ok { + if gen.blockIsBefore(name, blockName) { + return fmt.Sprintf("A `%s` block as defined above.", name) + } else { + return fmt.Sprintf("A `%s` block as defined below.", name) } } } + if field.Type == schema.TypeList { + if gen.blockIsBefore(name, blockName) { + return fmt.Sprintf("A `%s` block as defined above.", name) + } else { + return fmt.Sprintf("A `%s` block as defined below.", name) + } + } + + return "TODO." +} + +func (gen documentationGenerator) determineDefaultValueForExample(name string, field *schema.Schema) string { + if field.Default != nil { + if v, ok := field.Default.(bool); ok { + return strconv.FormatBool(v) + } + + if v, ok := field.Default.(int); ok { + return fmt.Sprintf("%d", v) + } + + if v, ok := field.Default.(string); ok { + return v + } + } + + if field.Type == schema.TypeBool { + return "false" + } + + if field.Type == schema.TypeInt { + return "42" + } + + if field.Type == schema.TypeFloat { + return "1.23456" + } + + if name == "name" || strings.HasSuffix(name, "_name") { + if gen.isDataSource { + return "\"existing\"" + } + + return "\"example\"" + } + if name == "location" { + return "\"West Europe\"" + } + if name == "resource_group_name" { + return "\"example-resources\"" + } + + return "\"TODO\"" +} + +func (gen documentationGenerator) distinctBlockNames(input []string) []string { + // this is a delightful hack to work around multiple blocks being a thing + temp := make(map[string]struct{}, 0) + for _, v := range input { + temp[v] = struct{}{} + } + + output := make([]string, 0) + for k := range temp { + output = append(output, k) + } + + return output +} + +func (gen documentationGenerator) processElementForExample(field string, indentLevel int, elem interface{}, isAttribute bool) string { + indent := gen.buildIndentForExample(indentLevel) + + // it's an array of something, work out what + if array, ok := elem.(*schema.Schema); ok { + switch array.Type { + case schema.TypeString: + return fmt.Sprintf("%s%s = [ \"example\" ]\n", indent, field) + + case schema.TypeInt: + return fmt.Sprintf("%s%s = [ 1 ]\n", indent, field) + + default: + return "TODO" + } + } + + // otherwise it's a list so we're gonna have to go around + if list, ok := elem.(*schema.Resource); ok && len(list.Schema) > 0 { + innerFields := gen.requiredFieldsForExampleBlock(list.Schema, indentLevel+1) + attributeSyntax := "" + if isAttribute { + attributeSyntax = " =" + } + return fmt.Sprintf("\n%s%s%s {\n%s %s\n%s}\n", indent, field, attributeSyntax, innerFields, indent, indent) + } + + // unless something's broken, since this is likely during provider dev it's likely things could be missing + panic("Field %q has an Element but isn't a Set or List - double-check the schema") +} + +func (gen documentationGenerator) requiredFieldsForExampleBlock(fields map[string]*schema.Schema, indentLevel int) string { + indent := gen.buildIndentForExample(indentLevel) + output := "" + + var processField = func(name string, field *schema.Schema) string { + value := gen.determineDefaultValueForExample(name, field) + return fmt.Sprintf("%s%s = %s\n", indent, name, value) + } + + // if we have a "name", "location" "resource_group_name" field output those first as per convention + if v, ok := fields["name"]; ok && v.Required { + output += processField("name", v) + } + if v, ok := fields["resource_group_name"]; ok && v.Required { + output += processField("resource_group_name", v) + } + if v, ok := fields["location"]; ok && v.Required { + output += processField("location", v) + } + + for field, v := range fields { + if !v.Required { + continue + } + if field == "location" || field == "name" || field == "resource_group_name" { + continue + } - if resource == nil { - return fmt.Errorf("Resource %q was not registered!", resourceName) + if v.Elem != nil { + isAttribute := v.ConfigMode == schema.SchemaConfigModeAttr + output += gen.processElementForExample(field, indentLevel, v.Elem, isAttribute) + continue + } + + output += processField(field, v) } + return strings.TrimSuffix(output, "\n") +} - return buildDocumentationForResource(resourceName, resource) +func (gen documentationGenerator) sortFields(input map[string]*schema.Schema) []string { + fieldNames := make([]string, 0) + for field := range input { + fieldNames = append(fieldNames, field) + } + sort.Strings(fieldNames) + return fieldNames } -func buildDocumentationForDataSource(resourceName string, resource *schema.Resource) error { - return nil +func (gen documentationGenerator) uniqueBlockNamesForArgument(fields map[string]*schema.Schema) ([]string, map[string]map[string]*schema.Schema) { + blockNames := make([]string, 0) + blocks := make(map[string]map[string]*schema.Schema, 0) + + for _, fieldName := range gen.sortFields(fields) { + field := fields[fieldName] + + // compute-only fields can be omited + if field.Computed && !(field.Optional || field.Required) { + continue + } + + if field.Type != schema.TypeList && field.Type != schema.TypeSet { + continue + } + + if field.Elem == nil { + continue + } + v, ok := field.Elem.(*schema.Resource) + if !ok { + continue + } + if v == nil { + continue + } + + // add this block + blockNames = append(blockNames, fieldName) + blocks[fieldName] = v.Schema + + // at this point we want to iterate over all the fields to determine which ones are nested blocks, then iterate over/aggregate those + for _, innerElem := range v.Schema { + if innerElem.Type != schema.TypeList && innerElem.Type != schema.TypeSet { + continue + } + if field.Elem == nil { + continue + } + + innerV, ok := field.Elem.(*schema.Resource) + if !ok { + continue + } + if innerV == nil { + continue + } + + innerBlockNames, innerBlocks := gen.uniqueBlockNamesForArgument(innerV.Schema) + for _, innerBlockName := range innerBlockNames { + innerBlock := innerBlocks[innerBlockName] + + blockNames = append(blockNames, innerBlockName) + blocks[innerBlockName] = innerBlock + } + } + } + + blockNames = gen.distinctBlockNames(blockNames) + sort.Strings(blockNames) + + return blockNames, blocks } -func buildDocumentationForResource(resourceName string, resource *schema.Resource) error { - return nil +func (gen documentationGenerator) uniqueBlockNamesForAttribute(fields map[string]*schema.Schema) ([]string, map[string]map[string]*schema.Schema) { + blockNames := make([]string, 0) + blocks := make(map[string]map[string]*schema.Schema, 0) + + for _, fieldName := range gen.sortFields(fields) { + field := fields[fieldName] + + // fields which are setable but aren't computed-only can be skipped + if (field.Optional || field.Required) && !field.Computed { + continue + } + + // optional+computed blocks with fields which aren't computed shouldn't be documented for attributes + if field.Optional && field.Computed { + continue + } + + if field.Type != schema.TypeList && field.Type != schema.TypeSet { + continue + } + + if field.Elem == nil { + continue + } + v, ok := field.Elem.(*schema.Resource) + if !ok { + continue + } + if v == nil { + continue + } + + // add this block + blockNames = append(blockNames, fieldName) + blocks[fieldName] = v.Schema + + // at this point we want to iterate over all the fields to determine which ones are nested blocks, then iterate over/aggregate those + for _, innerElem := range v.Schema { + if innerElem.Type != schema.TypeList && innerElem.Type != schema.TypeSet { + continue + } + if field.Elem == nil { + continue + } + + innerV, ok := field.Elem.(*schema.Resource) + if !ok { + continue + } + if innerV == nil { + continue + } + + innerBlockNames, innerBlocks := gen.uniqueBlockNamesForAttribute(innerV.Schema) + for _, innerBlockName := range innerBlockNames { + innerBlock := innerBlocks[innerBlockName] + + blockNames = append(blockNames, innerBlockName) + blocks[innerBlockName] = innerBlock + } + } + } + + blockNames = gen.distinctBlockNames(blockNames) + sort.Strings(blockNames) + + return blockNames, blocks } From 88e9f3acafe9020a2846782ccedf8cc7872ece99 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 24 Feb 2020 19:31:36 +0100 Subject: [PATCH 485/498] d|r/resource_group: generating updated documentation --- website/docs/d/resource_group.html.markdown | 27 ++++++++-------- website/docs/r/resource_group.html.markdown | 35 +++++++++------------ 2 files changed, 28 insertions(+), 34 deletions(-) diff --git a/website/docs/d/resource_group.html.markdown b/website/docs/d/resource_group.html.markdown index 74d587e70aa4e..9e4ec5220dfa1 100644 --- a/website/docs/d/resource_group.html.markdown +++ b/website/docs/d/resource_group.html.markdown @@ -1,7 +1,7 @@ --- subcategory: "Base" layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_resource_group" +page_title: "Azure Resource Manager: Data Source: azurerm_resource_group" description: |- Gets information about an existing Resource Group. --- @@ -14,30 +14,29 @@ Use this data source to access information about an existing Resource Group. ```hcl data "azurerm_resource_group" "example" { - name = "dsrg_test" + name = "existing" } -resource "azurerm_managed_disk" "example" { - name = "managed_disk_name" - location = data.azurerm_resource_group.example.location - resource_group_name = data.azurerm_resource_group.example.name - storage_account_type = "Standard_LRS" - create_option = "Empty" - disk_size_gb = "1" +output "id" { + value = data.azurerm_resource_group.example.id" } ``` -## Argument Reference +## Arguments Reference -* `name` - Specifies the name of the resource group. +The following arguments are supported: -~> **Note:** If the specified location doesn't match the actual resource group location, an error message with the actual location value will be shown. +* `name` - (Required) The Name of this Resource Group. ## Attributes Reference +In addition to the Arguments listed above - the following Attributes are exported: + * `id` - The ID of the Resource Group. -* `location` - The location of the resource group. -* `tags` - A mapping of tags assigned to the resource group. + +* `location` - The Azure Region where the Resource Group exists. + +* `tags` - A mapping of tags assigned to the Resource Group. ## Timeouts diff --git a/website/docs/r/resource_group.html.markdown b/website/docs/r/resource_group.html.markdown index cfea275b7ec36..3adaaa8aa75eb 100644 --- a/website/docs/r/resource_group.html.markdown +++ b/website/docs/r/resource_group.html.markdown @@ -3,58 +3,53 @@ subcategory: "Base" layout: "azurerm" page_title: "Azure Resource Manager: azurerm_resource_group" description: |- - Manages a resource group on Azure. + Manages a Resource Group. --- # azurerm_resource_group -Manages a resource group on Azure. +Manages a Resource Group. ## Example Usage ```hcl resource "azurerm_resource_group" "example" { - name = "testResourceGroup1" - location = "West US" - - tags = { - environment = "Production" - } + name = "example" + location = "West Europe" } ``` -## Argument Reference +## Arguments Reference The following arguments are supported: -* `name` - (Required) The name of the resource group. Must be unique on your - Azure subscription. +* `location` - (Required) The Azure Region where the Resource Group should exist. Changing this forces a new Resource Group to be created. + +* `name` - (Required) The Name which should be used for this Resource Group. Changing this forces a new Resource Group to be created. -* `location` - (Required) The location where the resource group should be created. - For a list of all Azure locations, please consult [this link](http://azure.microsoft.com/en-us/regions/) or run `az account list-locations --output table`. +--- -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `tags` - (Optional) A mapping of tags which should be assigned to the Resource Group. ## Attributes Reference -In addition to the arguments above, the following attributes are exported: +In addition to the Arguments listed above - the following Attributes are exported: * `id` - The ID of the Resource Group. - ## Timeouts The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: -* `create` - (Defaults to 90 minutes) Used when creating the Resource Group. -* `update` - (Defaults to 90 minutes) Used when updating the Resource Group. +* `create` - (Defaults to 1 hour and 30 minutes) Used when creating the Resource Group. * `read` - (Defaults to 5 minutes) Used when retrieving the Resource Group. -* `delete` - (Defaults to 90 minutes) Used when deleting the Resource Group. +* `update` - (Defaults to 1 hour and 30 minutes) Used when updating the Resource Group. +* `delete` - (Defaults to 1 hour and 30 minutes) Used when deleting the Resource Group. ## Import Resource Groups can be imported using the `resource id`, e.g. ```shell -terraform import azurerm_resource_group.mygroup /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myresourcegroup +terraform import azurerm_resource_group.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1 ``` From 4a8f2ce49560f991c6a36c6521223e7b85ddb1f8 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 24 Feb 2020 19:46:07 +0100 Subject: [PATCH 486/498] tooling: adding the scaffold-website tool to the makefile --- GNUmakefile | 5 ++++- README.md | 23 +++++++++++++++++++--- scripts/scaffold-website.sh | 38 +++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 4 deletions(-) create mode 100755 scripts/scaffold-website.sh diff --git a/GNUmakefile b/GNUmakefile index c8893dee148ad..a6b019fd30885 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -123,6 +123,9 @@ ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO))) endif @$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME) +scaffold-website: + ./scripts/scaffold-website.sh + website-test: ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO))) echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), get-ting..." @@ -130,4 +133,4 @@ ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO))) endif @$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider-test PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME) -.PHONY: build build-docker test test-docker testacc vet fmt fmtcheck errcheck test-compile website website-test +.PHONY: build build-docker test test-docker testacc vet fmt fmtcheck errcheck scaffold-website test-compile website website-test diff --git a/README.md b/README.md index 60022faafd3d1..33eefeb0f4e3c 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,9 @@ The AzureRM Provider supports Terraform 0.10.x and later - but Terraform 0.12.x provider "azurerm" { # We recommend pinning to the specific version of the Azure Provider you're using # since new versions are released frequently - version = "=1.43.0" + version = "=2.0.0" + + features {} # More information on the authentication methods supported by # the AzureRM Provider can be found here: @@ -45,7 +47,7 @@ Further [usage documentation is available on the Terraform website](https://www. ## Developer Requirements -* [Terraform](https://www.terraform.io/downloads.html) version 0.10.x + +* [Terraform](https://www.terraform.io/downloads.html) version 0.12.x + * [Go](https://golang.org/doc/install) version 1.13.x (to build the provider plugin) If you're on Windows you'll also need: @@ -93,7 +95,7 @@ $ make test The majority of tests in the provider are Acceptance Tests - which provisions real resources in Azure. It's possible to run the entire acceptance test suite by running `make testacc` - however it's likely you'll want to run a subset, which you can do using a prefix, by running: -``` +```sh make testacc SERVICE='resource' TESTARGS='-run=TestAccAzureRMResourceGroup' TESTTIMEOUT='60m' ``` @@ -110,3 +112,18 @@ The following Environment Variables must be set in your shell prior to running a **Note:** Acceptance tests create real resources in Azure which often cost money to run. +--- + +## Developer: Scaffolding the Website Documentation + +You can scaffold the documentation for a Data Source by running: + +```sh +$ make scaffold-website BRAND_NAME="Resource Group" RESOURCE_NAME="azurerm_resource_group" RESOURCE_TYPE="data" +``` + +You can scaffold the documentation for a Resource by running: + +```sh +$ make scaffold-website BRAND_NAME="Resource Group" RESOURCE_NAME="azurerm_resource_group" RESOURCE_TYPE="resource" RESOURCE_ID="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1" +``` diff --git a/scripts/scaffold-website.sh b/scripts/scaffold-website.sh new file mode 100755 index 0000000000000..51e14f109d8fe --- /dev/null +++ b/scripts/scaffold-website.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +function verifyVars { + echo "==> Verifying required variables are set..." + if [ "${BRAND_NAME}" == "" ]; then + echo "\nBRAND_NAME is unset, exiting" + exit 1 + fi + if [ "${RESOURCE_NAME}" == "" ]; then + echo "\nRESOURCE_NAME is unset, exiting" + exit 1 + fi + if [ "${RESOURCE_TYPE}" == "" ]; then + echo "\nRESOURCE_TYPE is unset, exiting" + exit 1 + fi + if [ "${RESOURCE_TYPE}" == "resource" ]; then + if [ "${RESOURCE_ID}" == "" ]; then + echo "\nRESOURCE_ID is unset, exiting" + exit 1 + fi + fi + + echo "==> Validated." +} + +function scaffoldDocumentation { + echo "==> Scaffolding Documentation..." + go run azurerm/internal/tools/website-scaffold/main.go -name "${RESOURCE_NAME}" -brand-name "${BRAND_NAME}" -type "${RESOURCE_TYPE}" -resource-id "${RESOURCE_ID}" -website-path ./website/ + echo "==> Done." +} + +function main { + verifyVars + scaffoldDocumentation +} + +main From 3f8e5796a00dbdd7f88905b05298990da2a764c2 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 24 Feb 2020 21:08:51 +0100 Subject: [PATCH 487/498] r/search_service: updating the docs --- website/docs/r/search_service.html.markdown | 56 +++++++++++---------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/website/docs/r/search_service.html.markdown b/website/docs/r/search_service.html.markdown index c997f14d503d3..0756e213466ea 100644 --- a/website/docs/r/search_service.html.markdown +++ b/website/docs/r/search_service.html.markdown @@ -8,73 +8,77 @@ description: |- # azurerm_search_service -Allows you to manage an Azure Search Service. +Manages a Search Service. ## Example Usage ```hcl resource "azurerm_resource_group" "example" { - name = "acceptanceTestResourceGroup1" - location = "West US" + name = "example-resources" + location = "West Europe" } resource "azurerm_search_service" "example" { - name = "acceptanceTestSearchService1" + name = "example-search-service" resource_group_name = azurerm_resource_group.example.name location = azurerm_resource_group.example.location sku = "standard" - - tags = { - environment = "staging" - database = "test" - } } ``` -## Argument Reference + +## Arguments Reference The following arguments are supported: -* `name` - (Required) The name of the Search Service. Changing this forces a new resource to be created. +* `location` - (Required) The Azure Region where the Search Service should exist. Changing this forces a new Search Service to be created. + +* `name` - (Required) The Name which should be used for this Search Service. Changing this forces a new Search Service to be created. -* `resource_group_name` - (Required) The name of the resource group in which to create the Search Service. Changing this forces a new resource to be created. +* `resource_group_name` - (Required) The name of the Resource Group where the Search Service should exist. Changing this forces a new Search Service to be created. -* `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. +* `sku` - (Required) The SKU which should be used for this Search Service. Possible values are `basic`, `free`, `standard`, `standard2` and `standard3` Changing this forces a new Search Service to be created. -* `sku` - (Required) Valid values are `basic`, `free` and `standard`. `standard2` and `standard3` are also valid, but can only be used when it's enabled on the backend by Microsoft support. `free` provisions the service in shared clusters. `standard` provisions the service in dedicated clusters. Changing this forces a new resource to be created. +-> The `basic` and `free` SKU's provision the Search Service in a Shared Cluster - the `standard` SKU's use a Dedicated Cluster. -* `replica_count` - (Optional) Default is 1. Valid values include 1 through 12. Valid only when `sku` is `standard`. Changing this forces a new resource to be created. +~> **Note:** The SKU's `standard2` and `standard3` are only available when enabled on the backend by Microsoft. -* `partition_count` - (Optional) Default is 1. Valid values include 1, 2, 3, 4, 6, or 12. Valid only when `sku` is `standard`. Changing this forces a new resource to be created. +--- -* `tags` - (Optional) A mapping of tags to assign to the resource. +* `partition_count` - (Optional) The number of partitions which should be created. Possible values are `1`, `2`, `3`, `4`, `6`, or `12`. Defaults to `1`. Changing this forces a new Search Service to be created. -## Attributes Reference +* `replica_count` - (Optional) The number of replica's which should be created. Changing this forces a new Search Service to be created. -The following attributes are exported: +-> **Note:** `partition_count` and `replica_count` can only be configured when using a `standard` sku. -* `id` - The Search Service ID. +* `tags` - (Optional) A mapping of tags which should be assigned to the Search Service. -* `primary_key` - The Search Service Administration primary key. +## Attributes Reference -* `secondary_key` - The Search Service Administration secondary key. +In addition to the Arguments listed above - the following Attributes are exported: + +* `id` - The ID of the Search Service. + +* `primary_key` - The Primary Key used for Search Service Administration. * `query_keys` - A `query_keys` block as defined below. +* `secondary_key` - The Secondary Key used for Search Service Administration. + --- A `query_keys` block exports the following: -* `name` - The name of the query key. +* `key` - The value of this Query Key. -* `key` - The value of the query key. +* `name` - The name of this Query Key. ## Timeouts The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: * `create` - (Defaults to 30 minutes) Used when creating the Search Service. -* `update` - (Defaults to 30 minutes) Used when updating the Search Service. * `read` - (Defaults to 5 minutes) Used when retrieving the Search Service. +* `update` - (Defaults to 30 minutes) Used when updating the Search Service. * `delete` - (Defaults to 30 minutes) Used when deleting the Search Service. ## Import @@ -82,5 +86,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d Search Services can be imported using the `resource id`, e.g. ```shell -terraform import azurerm_search_service.service1 /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.Search/searchServices/service1 +terraform import azurerm_search_service.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.Search/searchServices/service1 ``` From 7ea1a464eae93abc4e7253312b3ec6959ca4f304 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 28 Feb 2020 11:46:14 -0500 Subject: [PATCH 488/498] tools: fixing an issue when scaffolding the example for a data source --- azurerm/internal/tools/website-scaffold/main.go | 2 +- website/docs/d/resource_group.html.markdown | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/tools/website-scaffold/main.go b/azurerm/internal/tools/website-scaffold/main.go index cde6184883846..03d9c689a032f 100644 --- a/azurerm/internal/tools/website-scaffold/main.go +++ b/azurerm/internal/tools/website-scaffold/main.go @@ -348,7 +348,7 @@ func (gen documentationGenerator) exampleUsageBlock() string { } output "id" { - value = data.%s.example.id" + value = data.%s.example.id }`, gen.resourceName, requiredFields, gen.resourceName) } diff --git a/website/docs/d/resource_group.html.markdown b/website/docs/d/resource_group.html.markdown index 9e4ec5220dfa1..908792088fe09 100644 --- a/website/docs/d/resource_group.html.markdown +++ b/website/docs/d/resource_group.html.markdown @@ -18,7 +18,7 @@ data "azurerm_resource_group" "example" { } output "id" { - value = data.azurerm_resource_group.example.id" + value = data.azurerm_resource_group.example.id } ``` From f3fc044eb317741d7a3cd42e3952a09d11607af0 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 28 Feb 2020 11:48:53 -0500 Subject: [PATCH 489/498] linting --- azurerm/internal/tools/website-scaffold/main.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/azurerm/internal/tools/website-scaffold/main.go b/azurerm/internal/tools/website-scaffold/main.go index 03d9c689a032f..6b0960718d265 100644 --- a/azurerm/internal/tools/website-scaffold/main.go +++ b/azurerm/internal/tools/website-scaffold/main.go @@ -27,10 +27,10 @@ func main() { resourceType := f.String("type", "", "Whether this is a Data Source (data) or a Resource (resource)") websitePath := f.String("website-path", "", "The relative path to the website folder") - f.Parse(os.Args[1:]) + _ = f.Parse(os.Args[1:]) var quitWithError = func(message string) { - log.Printf(message) + log.Print(message) os.Exit(1) } @@ -71,7 +71,6 @@ func main() { } func run(resourceName, brandName string, resourceId *string, isResource bool, websitePath string) error { - content, err := getContent(resourceName, brandName, resourceId, isResource) if err != nil { return fmt.Errorf("Error building content: %s", err) @@ -665,7 +664,7 @@ func (gen documentationGenerator) determineDefaultValueForExample(name string, f func (gen documentationGenerator) distinctBlockNames(input []string) []string { // this is a delightful hack to work around multiple blocks being a thing - temp := make(map[string]struct{}, 0) + temp := make(map[string]struct{}) for _, v := range input { temp[v] = struct{}{} } @@ -759,12 +758,12 @@ func (gen documentationGenerator) sortFields(input map[string]*schema.Schema) [] func (gen documentationGenerator) uniqueBlockNamesForArgument(fields map[string]*schema.Schema) ([]string, map[string]map[string]*schema.Schema) { blockNames := make([]string, 0) - blocks := make(map[string]map[string]*schema.Schema, 0) + blocks := make(map[string]map[string]*schema.Schema) for _, fieldName := range gen.sortFields(fields) { field := fields[fieldName] - // compute-only fields can be omited + // compute-only fields can be omitted if field.Computed && !(field.Optional || field.Required) { continue } @@ -823,7 +822,7 @@ func (gen documentationGenerator) uniqueBlockNamesForArgument(fields map[string] func (gen documentationGenerator) uniqueBlockNamesForAttribute(fields map[string]*schema.Schema) ([]string, map[string]map[string]*schema.Schema) { blockNames := make([]string, 0) - blocks := make(map[string]map[string]*schema.Schema, 0) + blocks := make(map[string]map[string]*schema.Schema) for _, fieldName := range gen.sortFields(fields) { field := fields[fieldName] From 8b80acaa1d6922532bde41bc2b418725b7bad4a1 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 28 Feb 2020 11:56:16 -0500 Subject: [PATCH 490/498] tools/website-scaffold: fixing a typo --- azurerm/internal/tools/website-scaffold/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/tools/website-scaffold/main.go b/azurerm/internal/tools/website-scaffold/main.go index 6b0960718d265..1029bcdeda3c3 100644 --- a/azurerm/internal/tools/website-scaffold/main.go +++ b/azurerm/internal/tools/website-scaffold/main.go @@ -458,8 +458,8 @@ func (gen documentationGenerator) timeoutsBlock() string { timeoutsText += fmt.Sprintf("* `update` - (Defaults to %s) Used when updating the %s.\n", friendlyText, gen.brandName) } - if timeouts.Create != nil { - friendlyText := timeoutToFriendlyText(*timeouts.Create) + if timeouts.Delete != nil { + friendlyText := timeoutToFriendlyText(*timeouts.Delete) timeoutsText += fmt.Sprintf("* `delete` - (Defaults to %s) Used when deleting the %s.\n", friendlyText, gen.brandName) } From e1e638f4072046c9f4bd8c2024fa7fa2ca8292b0 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 9 Mar 2020 09:49:17 +0100 Subject: [PATCH 491/498] r/search_service: the fields `partition_count` and `replica_count` are no longer forcenew --- website/docs/r/search_service.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/r/search_service.html.markdown b/website/docs/r/search_service.html.markdown index 0756e213466ea..c73733214382b 100644 --- a/website/docs/r/search_service.html.markdown +++ b/website/docs/r/search_service.html.markdown @@ -44,9 +44,9 @@ The following arguments are supported: --- -* `partition_count` - (Optional) The number of partitions which should be created. Possible values are `1`, `2`, `3`, `4`, `6`, or `12`. Defaults to `1`. Changing this forces a new Search Service to be created. +* `partition_count` - (Optional) The number of partitions which should be created. -* `replica_count` - (Optional) The number of replica's which should be created. Changing this forces a new Search Service to be created. +* `replica_count` - (Optional) The number of replica's which should be created. -> **Note:** `partition_count` and `replica_count` can only be configured when using a `standard` sku. From 05d7f365fcfbde70cc1b77d2efd515e85e16201e Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 9 Mar 2020 10:08:01 +0100 Subject: [PATCH 492/498] tests: clarifying the features block is required going forward The temporary patch in the provider/test suite allows for us to gradually add provider blocks to the test suite, rather than doing it in a big-bang (and breaking open PR's). Unfortunately this workaround was unintentionally available in release binaries, as such this commit changes this patch to only work for test providers rather than released versions since this isn't intended to be used by users. Instead we require that Provider blocks and Feature blocks are both specified to be explicit about which instance of a provider is being used when provisioning resources. --- azurerm/internal/acceptance/data.go | 2 +- azurerm/internal/provider/features.go | 9 ++++----- azurerm/internal/provider/provider.go | 10 +++++++++- azurerm/internal/provider/provider_test.go | 13 +++---------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/azurerm/internal/acceptance/data.go b/azurerm/internal/acceptance/data.go index 2a7ad06e102e7..e173e4d283488 100644 --- a/azurerm/internal/acceptance/data.go +++ b/azurerm/internal/acceptance/data.go @@ -52,7 +52,7 @@ type TestData struct { // BuildTestData generates some test data for the given resource func BuildTestData(t *testing.T, resourceType string, resourceLabel string) TestData { once.Do(func() { - azureProvider := provider.AzureProvider().(*schema.Provider) + azureProvider := provider.TestAzureProvider().(*schema.Provider) AzureProvider = azureProvider SupportedProviders = map[string]terraform.ResourceProvider{ diff --git a/azurerm/internal/provider/features.go b/azurerm/internal/provider/features.go index 3df1e7014a496..f5e56a24ba067 100644 --- a/azurerm/internal/provider/features.go +++ b/azurerm/internal/provider/features.go @@ -1,13 +1,11 @@ package provider import ( - "os" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) -func schemaFeatures() *schema.Schema { +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{ @@ -59,8 +57,9 @@ func schemaFeatures() *schema.Schema { }, } - runningAcceptanceTests := os.Getenv("TF_ACC") != "" - if runningAcceptanceTests { + // this is a temporary hack to enable us to gradually add provider blocks to test configurations + // rather than doing it as a big-bang and breaking all open PR's + if supportLegacyTestSuite { return &schema.Schema{ Type: schema.TypeList, Optional: true, diff --git a/azurerm/internal/provider/provider.go b/azurerm/internal/provider/provider.go index f55a6173d813a..c99cf79247ed8 100644 --- a/azurerm/internal/provider/provider.go +++ b/azurerm/internal/provider/provider.go @@ -15,6 +15,14 @@ import ( ) func AzureProvider() terraform.ResourceProvider { + return azureProvider(false) +} + +func TestAzureProvider() terraform.ResourceProvider { + return azureProvider(true) +} + +func azureProvider(supportLegacyTestSuite bool) terraform.ResourceProvider { // avoids this showing up in test output var debugLog = func(f string, v ...interface{}) { if os.Getenv("TF_LOG") == "" { @@ -149,7 +157,7 @@ func AzureProvider() terraform.ResourceProvider { Description: "This will disable the Terraform Partner ID which is used if a custom `partner_id` isn't specified.", }, - "features": schemaFeatures(), + "features": schemaFeatures(supportLegacyTestSuite), // Advanced feature flags "skip_credentials_validation": { diff --git a/azurerm/internal/provider/provider_test.go b/azurerm/internal/provider/provider_test.go index d41e663cfa3ac..1e5a2d37844cb 100644 --- a/azurerm/internal/provider/provider_test.go +++ b/azurerm/internal/provider/provider_test.go @@ -2,23 +2,19 @@ package provider import ( "fmt" - "os" "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" ) func TestProvider(t *testing.T) { - if err := AzureProvider().(*schema.Provider).InternalValidate(); err != nil { + if err := TestAzureProvider().(*schema.Provider).InternalValidate(); err != nil { t.Fatalf("err: %s", err) } } func TestDataSourcesSupportCustomTimeouts(t *testing.T) { - // this is required until 2.0 - os.Setenv("ARM_PROVIDER_CUSTOM_TIMEOUTS", "true") - - provider := AzureProvider().(*schema.Provider) + provider := TestAzureProvider().(*schema.Provider) for dataSourceName, dataSource := range provider.DataSourcesMap { t.Run(fmt.Sprintf("DataSource/%s", dataSourceName), func(t *testing.T) { t.Logf("[DEBUG] Testing Data Source %q..", dataSourceName) @@ -54,10 +50,7 @@ func TestDataSourcesSupportCustomTimeouts(t *testing.T) { } func TestResourcesSupportCustomTimeouts(t *testing.T) { - // this is required until 2.0 - os.Setenv("ARM_PROVIDER_CUSTOM_TIMEOUTS", "true") - - provider := AzureProvider().(*schema.Provider) + provider := TestAzureProvider().(*schema.Provider) for resourceName, resource := range provider.ResourcesMap { t.Run(fmt.Sprintf("Resource/%s", resourceName), func(t *testing.T) { t.Logf("[DEBUG] Testing Resource %q..", resourceName) From 0223478d58b89c303eed3dc4a2dc08009125ca7b Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 9 Mar 2020 10:44:22 +0100 Subject: [PATCH 493/498] features: removing the unused "two point oh" feature --- azurerm/internal/features/two_point_oh.go | 23 ------------------- .../internal/services/compute/registration.go | 10 -------- 2 files changed, 33 deletions(-) delete mode 100644 azurerm/internal/features/two_point_oh.go diff --git a/azurerm/internal/features/two_point_oh.go b/azurerm/internal/features/two_point_oh.go deleted file mode 100644 index d028d8e883787..0000000000000 --- a/azurerm/internal/features/two_point_oh.go +++ /dev/null @@ -1,23 +0,0 @@ -package features - -// SupportsTwoPointZeroResources returns whether the new VM and VMSS resources from 2.0 -// should be supported -// -// There's 5 new resources coming as a part of 2.0, which are intentionally feature-flagged off -// until all 5 are supported: -// * `azurerm_linux_virtual_machine` -// * `azurerm_linux_virtual_machine_scale_set` -// * `azurerm_windows_virtual_machine` -// * `azurerm_windows_virtual_machine_scale_set` -// * `azurerm_virtual_machine_scale_set_extension` -// -// This feature-toggle defaults to off in 1.x versions of the Azure Provider, however this will -// become enabled by default in version 2.0 of the Azure Provider (where this toggle will be removed). -// As outlined in the announcement for v2.0 of the Azure Provider: -// https://github.com/terraform-providers/terraform-provider-azurerm/issues/2807 -// -// Operators wishing to beta-test these resources can opt-into them in 1.x versions of the -// Azure Provider by setting the Environment Variable 'ARM_PROVIDER_TWOPOINTZERO_RESOURCES' to 'true' -func SupportsTwoPointZeroResources() bool { - return true -} diff --git a/azurerm/internal/services/compute/registration.go b/azurerm/internal/services/compute/registration.go index 5ab1ab2bdfe89..01e7eb742a911 100644 --- a/azurerm/internal/services/compute/registration.go +++ b/azurerm/internal/services/compute/registration.go @@ -2,7 +2,6 @@ package compute import ( "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) type Registration struct{} @@ -64,14 +63,5 @@ func (r Registration) SupportedResources() map[string]*schema.Resource { "azurerm_windows_virtual_machine_scale_set": resourceArmWindowsVirtualMachineScaleSet(), } - // 2.0 resources - if features.SupportsTwoPointZeroResources() { - resources["azurerm_linux_virtual_machine"] = resourceLinuxVirtualMachine() - resources["azurerm_linux_virtual_machine_scale_set"] = resourceArmLinuxVirtualMachineScaleSet() - resources["azurerm_virtual_machine_scale_set_extension"] = resourceArmVirtualMachineScaleSetExtension() - resources["azurerm_windows_virtual_machine"] = resourceWindowsVirtualMachine() - resources["azurerm_windows_virtual_machine_scale_set"] = resourceArmWindowsVirtualMachineScaleSet() - } - return resources } From eedb10e1ad3ee9e913dd5af29d962f010d7d20d8 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Mon, 9 Mar 2020 11:45:50 +0100 Subject: [PATCH 494/498] tidying --- CHANGELOG.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cbf7d04e47bc7..99630a06bcac5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,8 +16,8 @@ FEATURES: IMPROVEMENTS: -batch: upgrading to API version `2019-08-01` [GH-5967] -netapp: upgrading to API version `2019-10-01` [GH-5485] +* batch: upgrading to API version `2019-08-01` [GH-5967] +* netapp: upgrading to API version `2019-10-01` [GH-5485] * `azurerm_application_gateway` - support up to `125` for the `capacity` property with V2 SKU's [GH-5906] * `azurerm_automation_dsc_configuration` - support for the `tags` property [GH-5827] * `azurerm_batch_pool` - support for the `public_ips` property [GH-5967] @@ -41,7 +41,6 @@ netapp: upgrading to API version `2019-10-01` [GH-5485] * `azurerm_storage_account` - support up to 50 tags [GH-5934] * `azurerm_virtual_wan` - support for the `type` property [GH-5877] - BUG FIXES: * `azurerm_app_service_plan` - no longer sends an empty `app_service_environment_id` property on update [GH-5915] @@ -53,7 +52,6 @@ BUG FIXES: * `azurerm_linux_virtual_machine_scale_set` - correct `source_image_id` validation [GH-5901] * `azurerm_netapp_volume` - support volmes uoto `100TB` in size [GH-5485] * `azurerm_search_service` - changing the properties `replica_count` & `partition_count` properties no longer force a new resource [GH-5935] -* `azurerm_app_service_plan` - Updates no longer fail if App Service Environment ID is not specified [GH-5915] ## 2.0.0 (February 24, 2020) From 4ddb0e0d5a4db9f5dc9eeff4036e8014bab14e60 Mon Sep 17 00:00:00 2001 From: Yuping Wei <56525716+yupwei68@users.noreply.github.com> Date: Tue, 10 Mar 2020 03:19:44 +0800 Subject: [PATCH 495/498] =?UTF-8?q?`azurerm=5Fsql=5Fserver`=20-=20support?= =?UTF-8?q?=20for=20the=20`extended=5Fauditing=5Fpolic=E2=80=A6=20(#5036)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #2217 --- .../internal/services/sql/client/client.go | 37 +++--- .../sql/helper/sqlExtendedAuditing.go | 98 ++++++++++++++ .../services/sql/resource_arm_sql_server.go | 22 ++++ .../sql/tests/resource_arm_sql_server_test.go | 120 ++++++++++++++++++ website/docs/r/sql_server.html.markdown | 31 ++++- 5 files changed, 291 insertions(+), 17 deletions(-) create mode 100644 azurerm/internal/services/sql/helper/sqlExtendedAuditing.go diff --git a/azurerm/internal/services/sql/client/client.go b/azurerm/internal/services/sql/client/client.go index 5510353d46801..7e47528b4cfc5 100644 --- a/azurerm/internal/services/sql/client/client.go +++ b/azurerm/internal/services/sql/client/client.go @@ -6,14 +6,15 @@ import ( ) type Client struct { - DatabasesClient *sql.DatabasesClient - DatabaseThreatDetectionPoliciesClient *sql.DatabaseThreatDetectionPoliciesClient - ElasticPoolsClient *sql.ElasticPoolsClient - FirewallRulesClient *sql.FirewallRulesClient - FailoverGroupsClient *sql.FailoverGroupsClient - ServersClient *sql.ServersClient - ServerAzureADAdministratorsClient *sql.ServerAzureADAdministratorsClient - VirtualNetworkRulesClient *sql.VirtualNetworkRulesClient + DatabasesClient *sql.DatabasesClient + DatabaseThreatDetectionPoliciesClient *sql.DatabaseThreatDetectionPoliciesClient + ElasticPoolsClient *sql.ElasticPoolsClient + FirewallRulesClient *sql.FirewallRulesClient + FailoverGroupsClient *sql.FailoverGroupsClient + ServersClient *sql.ServersClient + ServerAzureADAdministratorsClient *sql.ServerAzureADAdministratorsClient + VirtualNetworkRulesClient *sql.VirtualNetworkRulesClient + ExtendedServerBlobAuditingPoliciesClient *sql.ExtendedServerBlobAuditingPoliciesClient } func NewClient(o *common.ClientOptions) *Client { @@ -42,14 +43,18 @@ func NewClient(o *common.ClientOptions) *Client { VirtualNetworkRulesClient := sql.NewVirtualNetworkRulesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&VirtualNetworkRulesClient.Client, o.ResourceManagerAuthorizer) + ExtendedServerBlobAuditingPoliciesClient := sql.NewExtendedServerBlobAuditingPoliciesClient(o.SubscriptionId) + o.ConfigureClient(&ExtendedServerBlobAuditingPoliciesClient.Client, o.ResourceManagerAuthorizer) + return &Client{ - DatabasesClient: &DatabasesClient, - DatabaseThreatDetectionPoliciesClient: &DatabaseThreatDetectionPoliciesClient, - ElasticPoolsClient: &ElasticPoolsClient, - FailoverGroupsClient: &FailoverGroupsClient, - FirewallRulesClient: &FirewallRulesClient, - ServersClient: &ServersClient, - ServerAzureADAdministratorsClient: &ServerAzureADAdministratorsClient, - VirtualNetworkRulesClient: &VirtualNetworkRulesClient, + DatabasesClient: &DatabasesClient, + DatabaseThreatDetectionPoliciesClient: &DatabaseThreatDetectionPoliciesClient, + ElasticPoolsClient: &ElasticPoolsClient, + FailoverGroupsClient: &FailoverGroupsClient, + FirewallRulesClient: &FirewallRulesClient, + ServersClient: &ServersClient, + ServerAzureADAdministratorsClient: &ServerAzureADAdministratorsClient, + VirtualNetworkRulesClient: &VirtualNetworkRulesClient, + ExtendedServerBlobAuditingPoliciesClient: &ExtendedServerBlobAuditingPoliciesClient, } } diff --git a/azurerm/internal/services/sql/helper/sqlExtendedAuditing.go b/azurerm/internal/services/sql/helper/sqlExtendedAuditing.go new file mode 100644 index 0000000000000..b7129a628f9eb --- /dev/null +++ b/azurerm/internal/services/sql/helper/sqlExtendedAuditing.go @@ -0,0 +1,98 @@ +package helper + +import ( + "github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2017-03-01-preview/sql" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func ExtendedAuditingSchema() *schema.Schema { + return &schema.Schema{ + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "storage_account_access_key": { + Type: schema.TypeString, + Required: true, + Sensitive: true, + ValidateFunc: validation.StringIsNotEmpty, + }, + + "storage_endpoint": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.IsURLWithHTTPS, + }, + + "storage_account_access_key_is_secondary": { + Type: schema.TypeBool, + Optional: true, + }, + + "retention_in_days": { + Type: schema.TypeInt, + Optional: true, + ValidateFunc: validation.IntBetween(0, 3285), + }, + }, + }, + } +} + +func ExpandAzureRmSqlServerBlobAuditingPolicies(input []interface{}) *sql.ExtendedServerBlobAuditingPolicyProperties { + if len(input) == 0 { + return &sql.ExtendedServerBlobAuditingPolicyProperties{ + State: sql.BlobAuditingPolicyStateDisabled, + } + } + serverBlobAuditingPolicies := input[0].(map[string]interface{}) + + ExtendedServerBlobAuditingPolicyProperties := sql.ExtendedServerBlobAuditingPolicyProperties{ + State: sql.BlobAuditingPolicyStateEnabled, + StorageAccountAccessKey: utils.String(serverBlobAuditingPolicies["storage_account_access_key"].(string)), + StorageEndpoint: utils.String(serverBlobAuditingPolicies["storage_endpoint"].(string)), + } + if v, ok := serverBlobAuditingPolicies["storage_account_access_key_is_secondary"]; ok { + ExtendedServerBlobAuditingPolicyProperties.IsStorageSecondaryKeyInUse = utils.Bool(v.(bool)) + } + if v, ok := serverBlobAuditingPolicies["retention_in_days"]; ok { + ExtendedServerBlobAuditingPolicyProperties.RetentionDays = utils.Int32(int32(v.(int))) + } + + return &ExtendedServerBlobAuditingPolicyProperties +} + +func FlattenAzureRmSqlServerBlobAuditingPolicies(extendedServerBlobAuditingPolicy *sql.ExtendedServerBlobAuditingPolicy, d *schema.ResourceData) []interface{} { + if extendedServerBlobAuditingPolicy == nil || extendedServerBlobAuditingPolicy.State == sql.BlobAuditingPolicyStateDisabled { + return []interface{}{} + } + var storageEndpoint, storageAccessKey string + // storage_account_access_key will not be returned, so we transfer the schema value + if v, ok := d.GetOk("extended_auditing_policy.0.storage_account_access_key"); ok { + storageAccessKey = v.(string) + } + if extendedServerBlobAuditingPolicy.StorageEndpoint != nil { + storageEndpoint = *extendedServerBlobAuditingPolicy.StorageEndpoint + } + + var secondKeyInUse bool + if extendedServerBlobAuditingPolicy.IsStorageSecondaryKeyInUse != nil { + secondKeyInUse = *extendedServerBlobAuditingPolicy.IsStorageSecondaryKeyInUse + } + var retentionDays int32 + if extendedServerBlobAuditingPolicy.RetentionDays != nil { + retentionDays = *extendedServerBlobAuditingPolicy.RetentionDays + } + + return []interface{}{ + map[string]interface{}{ + "storage_account_access_key": storageAccessKey, + "storage_endpoint": storageEndpoint, + "storage_account_access_key_is_secondary": secondKeyInUse, + "retention_in_days": retentionDays, + }, + } +} diff --git a/azurerm/internal/services/sql/resource_arm_sql_server.go b/azurerm/internal/services/sql/resource_arm_sql_server.go index 648b3a820ed18..93ba4d02b7efd 100644 --- a/azurerm/internal/services/sql/resource_arm_sql_server.go +++ b/azurerm/internal/services/sql/resource_arm_sql_server.go @@ -13,6 +13,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/sql/helper" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" @@ -100,6 +101,8 @@ func resourceArmSqlServer() *schema.Resource { }, }, + "extended_auditing_policy": helper.ExtendedAuditingSchema(), + "tags": tags.Schema(), }, } @@ -171,6 +174,14 @@ func resourceArmSqlServerCreateUpdate(d *schema.ResourceData, meta interface{}) d.SetId(*resp.ID) + auditingClient := meta.(*clients.Client).Sql.ExtendedServerBlobAuditingPoliciesClient + auditingProps := sql.ExtendedServerBlobAuditingPolicy{ + ExtendedServerBlobAuditingPolicyProperties: helper.ExpandAzureRmSqlServerBlobAuditingPolicies(d.Get("extended_auditing_policy").([]interface{})), + } + if _, err = auditingClient.CreateOrUpdate(ctx, resGroup, name, auditingProps); err != nil { + return fmt.Errorf("Error issuing create/update request for SQL Server %q Blob Auditing Policies(Resource Group %q): %+v", name, resGroup, err) + } + return resourceArmSqlServerRead(d, meta) } @@ -214,6 +225,17 @@ func resourceArmSqlServerRead(d *schema.ResourceData, meta interface{}) error { d.Set("fully_qualified_domain_name", serverProperties.FullyQualifiedDomainName) } + auditingClient := meta.(*clients.Client).Sql.ExtendedServerBlobAuditingPoliciesClient + auditingResp, err := auditingClient.Get(ctx, resGroup, name) + if err != nil { + return fmt.Errorf("Error reading SQL Server %s Blob Auditing Policies: %v ", name, err) + } + + flattenBlobAuditing := helper.FlattenAzureRmSqlServerBlobAuditingPolicies(&auditingResp, d) + if err := d.Set("extended_auditing_policy", flattenBlobAuditing); err != nil { + return fmt.Errorf("Error setting `extended_auditing_policy`: %+v", err) + } + return tags.FlattenAndSet(d, resp.Tags) } 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 0ab1cfd03ae52..fce99e68a1527 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 @@ -171,6 +171,36 @@ func TestAccAzureRMSqlServer_updateWithIdentityAdded(t *testing.T) { }) } +func TestAccAzureRMSqlServer_updateWithBlobAuditingPolices(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_sql_server", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMSqlServerDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMSqlServer_withBlobAuditingPolices(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMSqlServerExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "extended_auditing_policy.0.storage_account_access_key_is_secondary", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "extended_auditing_policy.0.retention_in_days", "6"), + ), + }, + data.ImportStep("administrator_login_password", "extended_auditing_policy.0.storage_account_access_key"), + { + Config: testAccAzureRMSqlServer_withBlobAuditingPolicesUpdated(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMSqlServerExists(data.ResourceName), + resource.TestCheckResourceAttr(data.ResourceName, "extended_auditing_policy.0.storage_account_access_key_is_secondary", "false"), + resource.TestCheckResourceAttr(data.ResourceName, "extended_auditing_policy.0.retention_in_days", "11"), + ), + }, + data.ImportStep("administrator_login_password", "extended_auditing_policy.0.storage_account_access_key"), + }, + }) +} + func testCheckAzureRMSqlServerExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { conn := acceptance.AzureProvider.Meta().(*clients.Client).Sql.ServersClient @@ -366,3 +396,93 @@ resource "azurerm_sql_server" "test" { } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } + +func testAccAzureRMSqlServer_withBlobAuditingPolices(data acceptance.TestData) string { + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-sql-%[1]d" + location = "%[2]s" +} + +resource "azurerm_storage_account" "test" { + name = "acctest%[1]d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + account_tier = "Standard" + account_replication_type = "LRS" +} + +resource "azurerm_storage_account" "test2" { + name = "acctest2%[1]d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + account_tier = "Standard" + account_replication_type = "LRS" +} + +resource "azurerm_sql_server" "test" { + name = "acctestsqlserver%[1]d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + version = "12.0" + administrator_login = "mradministrator" + administrator_login_password = "thisIsDog11" + + extended_auditing_policy { + storage_account_access_key = azurerm_storage_account.test.primary_access_key + storage_endpoint = azurerm_storage_account.test.primary_blob_endpoint + storage_account_access_key_is_secondary = true + retention_in_days = 6 + } +} +`, data.RandomIntOfLength(15), data.Locations.Primary) +} + +func testAccAzureRMSqlServer_withBlobAuditingPolicesUpdated(data acceptance.TestData) string { + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-sql-%[1]d" + location = "%[2]s" +} + +resource "azurerm_storage_account" "test" { + name = "acctest%[1]d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + account_tier = "Standard" + account_replication_type = "LRS" +} + +resource "azurerm_storage_account" "test2" { + name = "acctest2%[1]d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + account_tier = "Standard" + account_replication_type = "LRS" +} + +resource "azurerm_sql_server" "test" { + name = "acctestsqlserver%[1]d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + version = "12.0" + administrator_login = "mradministrator" + administrator_login_password = "thisIsDog11" + + extended_auditing_policy { + storage_account_access_key = azurerm_storage_account.test2.primary_access_key + storage_endpoint = azurerm_storage_account.test2.primary_blob_endpoint + storage_account_access_key_is_secondary = false + retention_in_days = 11 + } +} +`, data.RandomIntOfLength(15), data.Locations.Primary) +} diff --git a/website/docs/r/sql_server.html.markdown b/website/docs/r/sql_server.html.markdown index 5f258b06835d3..3e41f9cbdc69e 100644 --- a/website/docs/r/sql_server.html.markdown +++ b/website/docs/r/sql_server.html.markdown @@ -22,6 +22,14 @@ resource "azurerm_resource_group" "example" { location = "West US" } +resource "azurerm_storage_account" "example" { + name = "examplesa" + resource_group_name = azurerm_resource_group.example.name + location = azurerm_resource_group.example.location + account_tier = "Standard" + account_replication_type = "LRS" +} + resource "azurerm_sql_server" "example" { name = "mysqlserver" resource_group_name = azurerm_resource_group.example.name @@ -30,6 +38,13 @@ resource "azurerm_sql_server" "example" { administrator_login = "mradministrator" administrator_login_password = "thisIsDog11" + extended_auditing_policy { + storage_endpoint = azurerm_storage_account.example.primary_blob_endpoint + storage_account_access_key = azurerm_storage_account.example.primary_access_key + storage_account_access_key_is_secondary = true + retention_in_days = 6 + } + tags = { environment = "production" } @@ -53,6 +68,8 @@ The following arguments are supported: * `identity` - (Optional) An `identity` block as defined below. +* `extended_auditing_policy` - (Optional) A `extended_auditing_policy` block as defined below. + * `tags` - (Optional) A mapping of tags to assign to the resource. --- @@ -80,7 +97,19 @@ The following attributes are exported: -> You can access the Principal ID via `${azurerm_sql_server.example.identity.0.principal_id}` and the Tenant ID via `${azurerm_sql_server.example.identity.0.tenant_id}` -## Timeouts +--- + +A `extended_auditing_policy` block supports the following: + +* `storage_account_access_key` - (Required) Specifies the access key to use for the auditing storage account. + +* `storage_endpoint` - (Required) Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). + +* `storage_account_access_key_is_secondary` - (Optional) Specifies whether `storage_account_access_key` value is the storage's secondary key. + +* `retention_in_days` - (Optional) Specifies the number of days to retain logs for in the storage account. + +### Timeouts The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: From 7a767de43ec1f76c931b86ce6c21e5006c8c81c1 Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 9 Mar 2020 12:20:32 -0700 Subject: [PATCH 496/498] Update CHANGELOG.md to include #5036 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99630a06bcac5..7a8408a379f77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ IMPROVEMENTS: * `azurerm_private_dns_srv_record` - export the `fqdn` property [GH-5949] * `azurerm_private_endpoint` - exposed `private_ip_address` as a computed attribute [GH-5838] * `azurerm_redis_cache` - support for the `primary_connection_string` and `secondary_connection_string` properties [GH-5958] +* `azurerm_sql_server` - support for the `extended_auditing_policy` property [GH-5036] * `azurerm_storage_account` - support up to 50 tags [GH-5934] * `azurerm_virtual_wan` - support for the `type` property [GH-5877] From 4ea792fdd0748e27fc27a3756cd375caa82902ef Mon Sep 17 00:00:00 2001 From: magodo Date: Tue, 10 Mar 2020 04:26:08 +0800 Subject: [PATCH 497/498] =?UTF-8?q?azurerm=5Fnetwork=5Fwatcher=5Fflow=5Flo?= =?UTF-8?q?g=20=20-=20support=20for=20the`interval=5Fin=E2=80=A6=20(#5851)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR fix issue #5830 Additionally, fix one bug of example in document, which lacks of specifying account_kind to StorageV2 (which defaults to v1) for storage account, which is required by azurerm_log_analytics_workspace. --- .../resource_arm_network_watcher_flow_log.go | 20 +++++-- ...ource_arm_network_watcher_flow_log_test.go | 58 +++++++++++++++++++ .../r/network_watcher_flow_log.html.markdown | 3 + 3 files changed, 77 insertions(+), 4 deletions(-) diff --git a/azurerm/internal/services/network/resource_arm_network_watcher_flow_log.go b/azurerm/internal/services/network/resource_arm_network_watcher_flow_log.go index e98419ee6c4c4..3f089f552b459 100644 --- a/azurerm/internal/services/network/resource_arm_network_watcher_flow_log.go +++ b/azurerm/internal/services/network/resource_arm_network_watcher_flow_log.go @@ -141,6 +141,13 @@ func resourceArmNetworkWatcherFlowLog() *schema.Resource { Required: true, ValidateFunc: azure.ValidateResourceIDOrEmpty, }, + + "interval_in_minutes": { + Type: schema.TypeInt, + Optional: true, + ValidateFunc: validation.IntInSlice([]int{10, 60}), + Default: 60, + }, }, }, }, @@ -386,6 +393,9 @@ func flattenAzureRmNetworkWatcherFlowLogTrafficAnalytics(input *network.TrafficA if cfg.WorkspaceResourceID != nil { result["workspace_resource_id"] = *cfg.WorkspaceResourceID } + if cfg.TrafficAnalyticsInterval != nil { + result["interval_in_minutes"] = int(*cfg.TrafficAnalyticsInterval) + } } return []interface{}{result} @@ -399,13 +409,15 @@ func expandAzureRmNetworkWatcherFlowLogTrafficAnalytics(d *schema.ResourceData) workspaceID := v["workspace_id"].(string) workspaceRegion := v["workspace_region"].(string) workspaceResourceID := v["workspace_resource_id"].(string) + interval := v["interval_in_minutes"].(int) return &network.TrafficAnalyticsProperties{ NetworkWatcherFlowAnalyticsConfiguration: &network.TrafficAnalyticsConfigurationProperties{ - Enabled: utils.Bool(enabled), - WorkspaceID: utils.String(workspaceID), - WorkspaceRegion: utils.String(workspaceRegion), - WorkspaceResourceID: utils.String(workspaceResourceID), + Enabled: utils.Bool(enabled), + WorkspaceID: utils.String(workspaceID), + WorkspaceRegion: utils.String(workspaceRegion), + WorkspaceResourceID: utils.String(workspaceResourceID), + TrafficAnalyticsInterval: utils.Int32(int32(interval)), }, } } diff --git a/azurerm/internal/services/network/tests/resource_arm_network_watcher_flow_log_test.go b/azurerm/internal/services/network/tests/resource_arm_network_watcher_flow_log_test.go index 4259d5c263035..091bcbc7a390f 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_watcher_flow_log_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_watcher_flow_log_test.go @@ -228,6 +228,7 @@ func testAccAzureRMNetworkWatcherFlowLog_trafficAnalytics(t *testing.T) { resource.TestCheckResourceAttr(data.ResourceName, "enabled", "true"), ), }, + data.ImportStep(), { Config: testAccAzureRMNetworkWatcherFlowLog_TrafficAnalyticsEnabledConfig(data), Check: resource.ComposeTestCheckFunc( @@ -242,6 +243,28 @@ func testAccAzureRMNetworkWatcherFlowLog_trafficAnalytics(t *testing.T) { resource.TestCheckResourceAttr(data.ResourceName, "enabled", "true"), resource.TestCheckResourceAttr(data.ResourceName, "traffic_analytics.#", "1"), resource.TestCheckResourceAttr(data.ResourceName, "traffic_analytics.0.enabled", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "traffic_analytics.0.interval_in_minutes", "60"), + resource.TestCheckResourceAttrSet(data.ResourceName, "traffic_analytics.0.workspace_id"), + resource.TestCheckResourceAttrSet(data.ResourceName, "traffic_analytics.0.workspace_region"), + resource.TestCheckResourceAttrSet(data.ResourceName, "traffic_analytics.0.workspace_resource_id"), + ), + }, + data.ImportStep(), + { + Config: testAccAzureRMNetworkWatcherFlowLog_TrafficAnalyticsUpdateInterval(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMNetworkWatcherFlowLogExists(data.ResourceName), + resource.TestCheckResourceAttrSet(data.ResourceName, "network_watcher_name"), + resource.TestCheckResourceAttrSet(data.ResourceName, "resource_group_name"), + resource.TestCheckResourceAttrSet(data.ResourceName, "network_security_group_id"), + resource.TestCheckResourceAttrSet(data.ResourceName, "storage_account_id"), + resource.TestCheckResourceAttr(data.ResourceName, "retention_policy.#", "1"), + resource.TestCheckResourceAttr(data.ResourceName, "retention_policy.0.enabled", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "retention_policy.0.days", "7"), + resource.TestCheckResourceAttr(data.ResourceName, "enabled", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "traffic_analytics.#", "1"), + resource.TestCheckResourceAttr(data.ResourceName, "traffic_analytics.0.enabled", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "traffic_analytics.0.interval_in_minutes", "10"), resource.TestCheckResourceAttrSet(data.ResourceName, "traffic_analytics.0.workspace_id"), resource.TestCheckResourceAttrSet(data.ResourceName, "traffic_analytics.0.workspace_region"), resource.TestCheckResourceAttrSet(data.ResourceName, "traffic_analytics.0.workspace_resource_id"), @@ -492,6 +515,41 @@ resource "azurerm_network_watcher_flow_log" "test" { `, testAccAzureRMNetworkWatcherFlowLog_prerequisites(data), data.RandomInteger) } +func testAccAzureRMNetworkWatcherFlowLog_TrafficAnalyticsUpdateInterval(data acceptance.TestData) string { + return fmt.Sprintf(` +%s + +resource "azurerm_log_analytics_workspace" "test" { + name = "acctestLAW-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku = "PerGB2018" +} + +resource "azurerm_network_watcher_flow_log" "test" { + network_watcher_name = "${azurerm_network_watcher.test.name}" + resource_group_name = "${azurerm_resource_group.test.name}" + + network_security_group_id = "${azurerm_network_security_group.test.id}" + storage_account_id = "${azurerm_storage_account.test.id}" + enabled = true + + retention_policy { + enabled = true + days = 7 + } + + traffic_analytics { + enabled = true + workspace_id = "${azurerm_log_analytics_workspace.test.workspace_id}" + workspace_region = "${azurerm_log_analytics_workspace.test.location}" + workspace_resource_id = "${azurerm_log_analytics_workspace.test.id}" + interval_in_minutes = 10 + } +} +`, testAccAzureRMNetworkWatcherFlowLog_prerequisites(data), data.RandomInteger) +} + func testAccAzureRMNetworkWatcherFlowLog_TrafficAnalyticsDisabledConfig(data acceptance.TestData) string { return fmt.Sprintf(` %s diff --git a/website/docs/r/network_watcher_flow_log.html.markdown b/website/docs/r/network_watcher_flow_log.html.markdown index 44c0a42852a43..2e2c91ee93461 100644 --- a/website/docs/r/network_watcher_flow_log.html.markdown +++ b/website/docs/r/network_watcher_flow_log.html.markdown @@ -37,6 +37,7 @@ resource "azurerm_storage_account" "test" { location = azurerm_resource_group.test.location account_tier = "Standard" + account_kind = "StorageV2" account_replication_type = "LRS" enable_https_traffic_only = true } @@ -66,6 +67,7 @@ resource "azurerm_network_watcher_flow_log" "test" { workspace_id = azurerm_log_analytics_workspace.test.workspace_id workspace_region = azurerm_log_analytics_workspace.test.location workspace_resource_id = azurerm_log_analytics_workspace.test.id + interval_in_minutes = 10 } } ``` @@ -105,6 +107,7 @@ The following arguments are supported: * `workspace_id` - (Required) The resource guid of the attached workspace. * `workspace_region` - (Required) The location of the attached workspace. * `workspace_resource_id` - (Required) The resource ID of the attached workspace. +* `interval_in_minutes` - (Optional) How frequently service should do flow analytics in minutes. ## Attributes Reference From 1c09b6320132cf075304a6c3b692d29a49396460 Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 9 Mar 2020 13:27:27 -0700 Subject: [PATCH 498/498] Update CHANGELOG.md to include #5851 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a8408a379f77..b15039d367d4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ IMPROVEMENTS: * `azurerm_netapp_volume` - support for the `tags` property [GH-5995] * `azurerm_netapp_volume` - support for the `protocol_types` property [GH-5485] * `azurerm_netapp_volume` - deprecated the `cifs_enabled`, `nfsv3_enabled`, and `nfsv4_enabled` properties in favour of `protocols_enabled` [GH-5485] +* `azurerm_network_watcher_flow_log` - support for the traffic analysis `interval_in_minutes` property [GH-5851] * `azurerm_private_dns_a_record` - export the `fqdn` property [GH-5949] * `azurerm_private_dns_aaaa_record` - export the `fqdn` property [GH-5949] * `azurerm_private_dns_cname_record` - export the `fqdn` property [GH-5949]