Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

azurerm_api_management - Reference additional location zones from additional_location block instead of primary location #23943

Merged
merged 2 commits into from
Nov 24, 2023
Merged

azurerm_api_management - Reference additional location zones from additional_location block instead of primary location #23943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb0909a
reference API Management additional location zones from additional lo…
access-domroutley Nov 15, 2023
265a933
fmt
access-domroutley Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/services/apimanagement/api_management_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1696,7 +1696,7 @@ func expandAzureRmApiManagementAdditionalLocations(d *pluginsdk.ResourceData, sk
additionalLocation.PublicIPAddressId = &publicIPAddressID
}

zones := zones.ExpandUntyped(d.Get("zones").(*schema.Set).List())
zones := zones.ExpandUntyped(config["zones"].(*schema.Set).List())
if len(zones) > 0 {
additionalLocation.Zones = &zones
}
Expand Down
234 changes: 233 additions & 1 deletion internal/services/apimanagement/api_management_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,6 +918,22 @@ func TestAccApiManagement_additionalLocationGateway(t *testing.T) {
})
}

func TestAccApiManagement_additionalLocationGateway_DivergentZones(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_api_management", "test")
r := ApiManagementResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.additionalLocationGateway_DivergentZones(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
check.That(data.ResourceName).Key("zones.#").HasValue("2"),
check.That(data.ResourceName).Key("additional_location.0.zones.#").HasValue("0"),
),
},
})
}

func (ApiManagementResource) basic(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
Expand Down Expand Up @@ -952,7 +968,6 @@ resource "azurerm_resource_group" "test" {
location = "%[2]s"
}


resource "azurerm_resource_group" "test2" {
name = "acctestRG2-%[1]d"
location = "%[3]s"
Expand All @@ -975,6 +990,223 @@ resource "azurerm_api_management" "test" {
`, data.RandomInteger, data.Locations.Primary, data.Locations.Secondary)
}

func (ApiManagementResource) additionalLocationGateway_DivergentZones(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
}

resource "azurerm_resource_group" "test" {
name = "acctestRG-%[1]d"
location = "%[2]s"
tags = {
owner = "Dom Routley"
}
}

resource "azurerm_virtual_network" "test" {
name = "acctestVNET-%[1]d"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
address_space = ["192.168.0.0/24"]
}

resource "azurerm_subnet" "test" {
name = "acctest-gateway"
resource_group_name = azurerm_resource_group.test.name
virtual_network_name = azurerm_virtual_network.test.name
address_prefixes = azurerm_virtual_network.test.address_space
}

resource "azurerm_network_security_group" "test" {
name = "acctest-NSG-%[1]d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name

security_rule {
name = "Client_communication_to_API_Management"
priority = 100
direction = "Inbound"
access = "Allow"
protocol = "Tcp"
source_port_range = "*"
destination_port_range = "80"
source_address_prefix = "VirtualNetwork"
destination_address_prefix = "VirtualNetwork"
}

security_rule {
name = "Secure_Client_communication_to_API_Management"
priority = 110
direction = "Inbound"
access = "Allow"
protocol = "Tcp"
source_port_range = "*"
destination_port_range = "443"
source_address_prefix = "VirtualNetwork"
destination_address_prefix = "VirtualNetwork"
}

security_rule {
name = "Management_endpoint_for_Azure_portal_and_Powershell"
priority = 120
direction = "Inbound"
access = "Allow"
protocol = "Tcp"
source_port_range = "*"
destination_port_range = "3443"
source_address_prefix = "ApiManagement"
destination_address_prefix = "VirtualNetwork"
}

security_rule {
name = "Authenticate_To_Azure_Active_Directory"
priority = 200
direction = "Outbound"
access = "Allow"
protocol = "Tcp"
source_port_range = "*"
destination_port_ranges = ["80", "443"]
source_address_prefix = "ApiManagement"
destination_address_prefix = "VirtualNetwork"
}
}

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_public_ip" "test" {
name = "acctestIP-%[1]d"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
sku = "Standard"
allocation_method = "Static"
domain_name_label = "acctest-ip-%[1]d"
}

resource "azurerm_resource_group" "test2" {
name = "acctestRG2-%[1]d"
location = "%[3]s"
tags = {
owner = "Dom Routley"
}
}

resource "azurerm_virtual_network" "test2" {
name = "acctestVNET2-%[1]d"
resource_group_name = azurerm_resource_group.test2.name
location = azurerm_resource_group.test2.location
address_space = ["192.168.1.0/24"]
}

resource "azurerm_subnet" "test2" {
name = "acctest2-gateway"
resource_group_name = azurerm_resource_group.test2.name
virtual_network_name = azurerm_virtual_network.test2.name
address_prefixes = azurerm_virtual_network.test2.address_space
}

resource "azurerm_network_security_group" "test2" {
name = "acctest-NSG2-%[1]d"
location = azurerm_resource_group.test2.location
resource_group_name = azurerm_resource_group.test2.name

security_rule {
name = "Client_communication_to_API_Management"
priority = 100
direction = "Inbound"
access = "Allow"
protocol = "Tcp"
source_port_range = "*"
destination_port_range = "80"
source_address_prefix = "VirtualNetwork"
destination_address_prefix = "VirtualNetwork"
}

security_rule {
name = "Secure_Client_communication_to_API_Management"
priority = 110
direction = "Inbound"
access = "Allow"
protocol = "Tcp"
source_port_range = "*"
destination_port_range = "443"
source_address_prefix = "VirtualNetwork"
destination_address_prefix = "VirtualNetwork"
}

security_rule {
name = "Management_endpoint_for_Azure_portal_and_Powershell"
priority = 120
direction = "Inbound"
access = "Allow"
protocol = "Tcp"
source_port_range = "*"
destination_port_range = "3443"
source_address_prefix = "ApiManagement"
destination_address_prefix = "VirtualNetwork"
}

security_rule {
name = "Authenticate_To_Azure_Active_Directory"
priority = 200
direction = "Outbound"
access = "Allow"
protocol = "Tcp"
source_port_range = "*"
destination_port_ranges = ["80", "443"]
source_address_prefix = "ApiManagement"
destination_address_prefix = "VirtualNetwork"
}
}

resource "azurerm_subnet_network_security_group_association" "test2" {
subnet_id = azurerm_subnet.test2.id
network_security_group_id = azurerm_network_security_group.test2.id
}

resource "azurerm_public_ip" "test2" {
name = "acctest2IP-%[1]d"
resource_group_name = azurerm_resource_group.test2.name
location = azurerm_resource_group.test2.location
sku = "Standard"
allocation_method = "Static"
domain_name_label = "acctest2-ip-%[1]d"
}

resource "azurerm_api_management" "test" {
name = "acctestAM-%[1]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 = "Premium_2"
public_ip_address_id = azurerm_public_ip.test.id
virtual_network_type = "Internal"
zones = ["1", "2"]

virtual_network_configuration {
subnet_id = azurerm_subnet.test.id
}

additional_location {
location = azurerm_resource_group.test2.location
public_ip_address_id = azurerm_public_ip.test2.id
virtual_network_configuration {
subnet_id = azurerm_subnet.test2.id
}
}

depends_on = [
azurerm_subnet_network_security_group_association.test,
azurerm_subnet_network_security_group_association.test2,
]
}
`, data.RandomInteger, data.Locations.Primary, data.Locations.Secondary)
}

func (ApiManagementResource) standardSku(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
Expand Down
Loading