diff --git a/azurerm/internal/services/compute/registration.go b/azurerm/internal/services/compute/registration.go index b29001431de4..31c32398ac68 100644 --- a/azurerm/internal/services/compute/registration.go +++ b/azurerm/internal/services/compute/registration.go @@ -35,6 +35,7 @@ func (r Registration) SupportedDataSources() map[string]*schema.Resource { "azurerm_shared_image": dataSourceArmSharedImage(), "azurerm_snapshot": dataSourceArmSnapshot(), "azurerm_virtual_machine": dataSourceArmVirtualMachine(), + "azurerm_virtual_machine_scale_set": dataSourceArmVirtualMachineScaleSet(), } } diff --git a/azurerm/internal/services/compute/tests/linux_virtual_machine_scale_set_resource_test.go b/azurerm/internal/services/compute/tests/linux_virtual_machine_scale_set_resource_test.go index 762e6bb690e2..13504c6185a2 100644 --- a/azurerm/internal/services/compute/tests/linux_virtual_machine_scale_set_resource_test.go +++ b/azurerm/internal/services/compute/tests/linux_virtual_machine_scale_set_resource_test.go @@ -91,7 +91,7 @@ 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" + address_prefixes = ["10.0.2.0/24"] } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } diff --git a/azurerm/internal/services/compute/tests/virtual_machine_scale_set_data_source_test.go b/azurerm/internal/services/compute/tests/virtual_machine_scale_set_data_source_test.go new file mode 100644 index 000000000000..7710d507107d --- /dev/null +++ b/azurerm/internal/services/compute/tests/virtual_machine_scale_set_data_source_test.go @@ -0,0 +1,102 @@ +package tests + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" +) + +func TestAccDataSourceAzureRMVirtualMachineScaleSet_basicLinux(t *testing.T) { + data := acceptance.BuildTestData(t, "data.azurerm_virtual_machine_scale_set", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAzureRMVirtualMachineScaleSet_basicLinux(data), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(data.ResourceName, "identity.#", "1"), + resource.TestCheckResourceAttr(data.ResourceName, "identity.0.type", "SystemAssigned"), + resource.TestCheckResourceAttrSet(data.ResourceName, "identity.0.principal_id"), + ), + }, + }, + }) +} + +func TestAccDataSourceAzureRMVirtualMachineScaleSet_basicWindows(t *testing.T) { + data := acceptance.BuildTestData(t, "data.azurerm_virtual_machine_scale_set", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMVirtualMachineDestroy, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAzureRMVirtualMachineScaleSet_basicWindows(data), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(data.ResourceName, "identity.#", "1"), + resource.TestCheckResourceAttr(data.ResourceName, "identity.0.type", "SystemAssigned"), + resource.TestCheckResourceAttrSet(data.ResourceName, "identity.0.principal_id"), + ), + }, + }, + }) +} + +func TestAccDataSourceAzureRMVirtualMachineScaleSet_orchestrated(t *testing.T) { + data := acceptance.BuildTestData(t, "data.azurerm_virtual_machine_scale_set", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMVirtualMachineDestroy, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAzureRMVirtualMachineScaleSet_orchestrated(data), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrSet(data.ResourceName, "id"), + ), + }, + }, + }) +} + +func testAccDataSourceAzureRMVirtualMachineScaleSet_basicLinux(data acceptance.TestData) string { + template := testAccAzureRMLinuxVirtualMachineScaleSet_identitySystemAssigned(data) + return fmt.Sprintf(` +%s + +data "azurerm_virtual_machine_scale_set" "test" { + name = azurerm_linux_virtual_machine_scale_set.test.name + resource_group_name = azurerm_resource_group.test.name +} +`, template) +} + +func testAccDataSourceAzureRMVirtualMachineScaleSet_basicWindows(data acceptance.TestData) string { + template := testAccAzureRMWindowsVirtualMachineScaleSet_identitySystemAssigned(data) + return fmt.Sprintf(` +%s + +data "azurerm_virtual_machine_scale_set" "test" { + name = azurerm_windows_virtual_machine_scale_set.test.name + resource_group_name = azurerm_resource_group.test.name +} +`, template) +} + +func testAccDataSourceAzureRMVirtualMachineScaleSet_orchestrated(data acceptance.TestData) string { + template := testAccAzureRMWindowsVirtualMachine_orchestratedZonal(data) + return fmt.Sprintf(` +%s + +data "azurerm_virtual_machine_scale_set" "test" { + name = azurerm_orchestrated_virtual_machine_scale_set.test.name + resource_group_name = azurerm_resource_group.test.name +} +`, template) +} diff --git a/azurerm/internal/services/compute/tests/windows_virtual_machine_scale_set_resource_test.go b/azurerm/internal/services/compute/tests/windows_virtual_machine_scale_set_resource_test.go index c6b7daea5f32..6ed900743375 100644 --- a/azurerm/internal/services/compute/tests/windows_virtual_machine_scale_set_resource_test.go +++ b/azurerm/internal/services/compute/tests/windows_virtual_machine_scale_set_resource_test.go @@ -95,7 +95,7 @@ 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" + address_prefixes = ["10.0.2.0/24"] } `, name, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } diff --git a/azurerm/internal/services/compute/virtual_machine_scale_set_data_source.go b/azurerm/internal/services/compute/virtual_machine_scale_set_data_source.go new file mode 100644 index 000000000000..6daf74ab34c8 --- /dev/null +++ b/azurerm/internal/services/compute/virtual_machine_scale_set_data_source.go @@ -0,0 +1,90 @@ +package compute + +import ( + "fmt" + "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/timeouts" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func dataSourceArmVirtualMachineScaleSet() *schema.Resource { + return &schema.Resource{ + Read: dataSourceArmVirtualMachineScaleSetRead, + + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(5 * time.Minute), + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.NoZeroValues, + }, + + "resource_group_name": azure.SchemaResourceGroupNameForDataSource(), + + "location": azure.SchemaLocationForDataSource(), + + "identity": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "type": { + Type: schema.TypeString, + Computed: true, + }, + + "identity_ids": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + + "principal_id": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + }, + } +} + +func dataSourceArmVirtualMachineScaleSetRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*clients.Client).Compute.VMScaleSetClient + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) + defer cancel() + + resGroup := d.Get("resource_group_name").(string) + name := d.Get("name").(string) + + resp, err := client.Get(ctx, resGroup, name) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + return fmt.Errorf("Error: Virtual Machine Scale Set %q (Resource Group %q) was not found", name, resGroup) + } + + return fmt.Errorf("Error making Read request on Virtual Machine Scale Set %q (Resource Group %q): %+v", name, resGroup, err) + } + + if resp.ID == nil || *resp.ID == "" { + return fmt.Errorf("Error reading Virtual Machine Scale Set %q (Resource Group %q): ID is empty or nil", name, resGroup) + } + d.SetId(*resp.ID) + + if err := d.Set("identity", FlattenVirtualMachineScaleSetIdentity(resp.Identity)); err != nil { + return fmt.Errorf("setting `identity`: %+v", err) + } + + return nil +} diff --git a/website/azurerm.erb b/website/azurerm.erb index 972c812fe1e3..33da1373173a 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -601,6 +601,10 @@ azurerm_virtual_machine +