devtestlabs: Upgrade API to 2018-09-15 and... (#13074)

Fixes #7221
hashicorp · Aug 25, 2021 · 9543263 · 9543263
1 parent d683b13
commit 9543263
Show file tree

Hide file tree

Showing 45 changed files with 8,320 additions and 4,902 deletions.
diff --git a/internal/services/devtestlabs/client/client.go b/internal/services/devtestlabs/client/client.go
@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2016-05-15/dtl"
+	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2018-09-15/dtl"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/common"
 )
 

diff --git a/internal/services/devtestlabs/dev_test_global_vm_shutdown_schedule_resource.go b/internal/services/devtestlabs/dev_test_global_vm_shutdown_schedule_resource.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2016-05-15/dtl"
+	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2018-09-15/dtl"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
@@ -88,6 +88,10 @@ func resourceDevTestGlobalVMShutdownSchedule() *pluginsdk.Resource {
 							Type:     pluginsdk.TypeString,
 							Optional: true,
 						},
+						"email": {
+							Type:     pluginsdk.TypeString,
+							Optional: true,
+						},
 					},
 				},
 			},
@@ -257,18 +261,20 @@ func expandDevTestGlobalVMShutdownScheduleNotificationSettings(d *pluginsdk.Reso
 	notificationSettingsConfig := notificationSettingsConfigs[0].(map[string]interface{})
 	webhookUrl := notificationSettingsConfig["webhook_url"].(string)
 	timeInMinutes := int32(notificationSettingsConfig["time_in_minutes"].(int))
+	email := notificationSettingsConfig["email"].(string)
 
-	var notificationStatus dtl.NotificationStatus
+	var notificationStatus dtl.EnableStatus
 	if notificationSettingsConfig["enabled"].(bool) {
-		notificationStatus = dtl.NotificationStatusEnabled
+		notificationStatus = dtl.EnableStatusEnabled
 	} else {
-		notificationStatus = dtl.NotificationStatusDisabled
+		notificationStatus = dtl.EnableStatusDisabled
 	}
 
 	return &dtl.NotificationSettings{
-		WebhookURL:    &webhookUrl,
-		TimeInMinutes: &timeInMinutes,
-		Status:        notificationStatus,
+		WebhookURL:     &webhookUrl,
+		TimeInMinutes:  &timeInMinutes,
+		Status:         notificationStatus,
+		EmailRecipient: &email,
 	}
 }
 
@@ -287,7 +293,8 @@ func flattenDevTestGlobalVMShutdownScheduleNotificationSettings(notificationSett
 		result["time_in_minutes"] = *notificationSettings.TimeInMinutes
 	}
 
-	result["enabled"] = notificationSettings.Status == dtl.NotificationStatusEnabled
+	result["enabled"] = notificationSettings.Status == dtl.EnableStatusEnabled
+	result["email"] = notificationSettings.EmailRecipient
 
 	return []interface{}{result}
 }
diff --git a/internal/services/devtestlabs/dev_test_global_vm_shutdown_schedule_resource_test.go b/internal/services/devtestlabs/dev_test_global_vm_shutdown_schedule_resource_test.go
@@ -55,6 +55,7 @@ func TestAccDevTestGlobalVMShutdownSchedule_autoShutdownComplete(t *testing.T) {
 				check.That(data.ResourceName).Key("notification_settings.0.enabled").HasValue("true"),
 				check.That(data.ResourceName).Key("notification_settings.0.time_in_minutes").HasValue("15"),
 				check.That(data.ResourceName).Key("notification_settings.0.webhook_url").HasValue("https://www.bing.com/2/4"),
+				check.That(data.ResourceName).Key("notification_settings.0.email").HasValue("alerts@devtest.com"),
 				check.That(data.ResourceName).Key("daily_recurrence_time").HasValue("1100"),
 				check.That(data.ResourceName).Key("tags.%").HasValue("1"),
 				check.That(data.ResourceName).Key("tags.Environment").HasValue("Production"),
@@ -217,6 +218,7 @@ resource "azurerm_dev_test_global_vm_shutdown_schedule" "test" {
   notification_settings {
     time_in_minutes = 15
     webhook_url     = "https://www.bing.com/2/4"
+    email           = "alerts@devtest.com"
     enabled         = true
   }
 

diff --git a/internal/services/devtestlabs/dev_test_lab_resource.go b/internal/services/devtestlabs/dev_test_lab_resource.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2016-05-15/dtl"
+	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2018-09-15/dtl"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"

diff --git a/internal/services/devtestlabs/dev_test_lab_schedule_resource.go b/internal/services/devtestlabs/dev_test_lab_schedule_resource.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2016-05-15/dtl"
+	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2018-09-15/dtl"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
@@ -153,10 +153,10 @@ func resourceDevTestLabSchedules() *pluginsdk.Resource {
 						"status": {
 							Type:     pluginsdk.TypeString,
 							Optional: true,
-							Default:  dtl.NotificationStatusDisabled,
+							Default:  dtl.EnableStatusDisabled,
 							ValidateFunc: validation.StringInSlice([]string{
-								string(dtl.NotificationStatusEnabled),
-								string(dtl.NotificationStatusDisabled),
+								string(dtl.EnableStatusEnabled),
+								string(dtl.EnableStatusDisabled),
 							}, false),
 						},
 						"time_in_minutes": {
@@ -430,7 +430,7 @@ func expandDevTestScheduleNotificationSettings(d *pluginsdk.ResourceData) *dtl.N
 	webhookUrl := notificationSettingsConfig["webhook_url"].(string)
 	timeInMinutes := int32(notificationSettingsConfig["time_in_minutes"].(int))
 
-	notificationStatus := dtl.NotificationStatus(notificationSettingsConfig["status"].(string))
+	notificationStatus := dtl.EnableStatus(notificationSettingsConfig["status"].(string))
 
 	return &dtl.NotificationSettings{
 		WebhookURL:    &webhookUrl,

diff --git a/internal/services/devtestlabs/dev_test_linux_virtual_machine_resource.go b/internal/services/devtestlabs/dev_test_linux_virtual_machine_resource.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2016-05-15/dtl"
+	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2018-09-15/dtl"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"

diff --git a/internal/services/devtestlabs/dev_test_policy_resource.go b/internal/services/devtestlabs/dev_test_policy_resource.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2016-05-15/dtl"
+	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2018-09-15/dtl"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"

diff --git a/internal/services/devtestlabs/dev_test_virtual_network_data_source.go b/internal/services/devtestlabs/dev_test_virtual_network_data_source.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2016-05-15/dtl"
+	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2018-09-15/dtl"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/devtestlabs/validate"

diff --git a/internal/services/devtestlabs/dev_test_virtual_network_resource.go b/internal/services/devtestlabs/dev_test_virtual_network_resource.go
@@ -6,7 +6,7 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2016-05-15/dtl"
+	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2018-09-15/dtl"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"

diff --git a/internal/services/devtestlabs/dev_test_windows_virtual_machine_resource.go b/internal/services/devtestlabs/dev_test_windows_virtual_machine_resource.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2016-05-15/dtl"
+	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2018-09-15/dtl"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"

diff --git a/internal/services/devtestlabs/helpers.go b/internal/services/devtestlabs/helpers.go
@@ -1,7 +1,7 @@
 package devtestlabs
 
 import (
-	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2016-05-15/dtl"
+	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2018-09-15/dtl"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/validate"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"

diff --git a/internal/services/devtestlabs/validate/devtest.go b/internal/services/devtestlabs/validate/devtest.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2016-05-15/dtl"
+	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2018-09-15/dtl"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
 )

diff --git a/...testlabs/mgmt/2016-05-15/dtl/CHANGELOG.md → ...testlabs/mgmt/2018-09-15/dtl/CHANGELOG.md b/...testlabs/mgmt/2016-05-15/dtl/CHANGELOG.md → ...testlabs/mgmt/2018-09-15/dtl/CHANGELOG.md
diff --git a/...evtestlabs/mgmt/2016-05-15/dtl/_meta.json → ...evtestlabs/mgmt/2018-09-15/dtl/_meta.json b/...evtestlabs/mgmt/2016-05-15/dtl/_meta.json → ...evtestlabs/mgmt/2018-09-15/dtl/_meta.json
diff --git a/...tlabs/mgmt/2016-05-15/dtl/armtemplates.go → ...tlabs/mgmt/2018-09-15/dtl/armtemplates.go b/...tlabs/mgmt/2016-05-15/dtl/armtemplates.go → ...tlabs/mgmt/2018-09-15/dtl/armtemplates.go