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

Jump to bottom

Removed some unsupported tests, modified the validation for Virtual Network Gateway Connection #173

Merged
merged 1 commit into from
Apr 5, 2022
Merged

Removed some unsupported tests, modified the validation for Virtual Network Gateway Connection #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion internal/services/network/virtual_network_gateway_connection_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ func virtualNetworkGatewayConnection() *pluginsdk.Resource {
ValidateFunc: validation.StringInSlice([]string{
string(network.ExpressRoute),
string(network.IPsec),
string(network.Vnet2Vnet),
}, true),
DiffSuppressFunc: suppress.CaseDifference,
},
Expand Down Expand Up @@ -155,6 +154,8 @@ func virtualNetworkGatewayConnection() *pluginsdk.Resource {
string(network.AES256),
string(network.DES),
string(network.DES3),
string(network.GCMAES128),
string(network.GCMAES256),
}, true),
},

Expand Down Expand Up @@ -210,9 +211,11 @@ func virtualNetworkGatewayConnection() *pluginsdk.Resource {
string(network.PfsGroupECP384),
string(network.PfsGroupNone),
string(network.PfsGroupPFS1),
string(network.PfsGroupPFS14),
string(network.PfsGroupPFS2),
string(network.PfsGroupPFS2048),
string(network.PfsGroupPFS24),
string(network.PfsGroupPFSMM),
}, true),
},

Expand Down
190 changes: 8 additions & 182 deletions internal/services/network/virtual_network_gateway_connection_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"testing"

"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-provider-azurestack/internal/clients"
"github.com/hashicorp/terraform-provider-azurestack/internal/tf/acceptance"
"github.com/hashicorp/terraform-provider-azurestack/internal/tf/acceptance/check"
Expand Down Expand Up @@ -62,25 +63,6 @@ func TestAccVirtualNetworkGatewayConnection_sitetositeWithoutSharedKey(t *testin
})
}

func TestAccVirtualNetworkGatewayConnection_vnettonet(t *testing.T) {
data1 := acceptance.BuildTestData(t, "azurestack_virtual_network_gateway_connection", "test_1")
data2 := acceptance.BuildTestData(t, "azurestack_virtual_network_gateway_connection", "test_2")
r := VirtualNetworkGatewayConnectionResource{}

sharedKey := "4-v3ry-53cr37-1p53c-5h4r3d-k3y"

data1.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.vnettovnet(data1, data2.RandomInteger, sharedKey),
Check: acceptance.ComposeTestCheckFunc(
check.That(data1.ResourceName).ExistsInAzure(r),
acceptance.TestCheckResourceAttr(data1.ResourceName, "shared_key", sharedKey),
acceptance.TestCheckResourceAttr(data2.ResourceName, "shared_key", sharedKey),
),
},
})
}

func TestAccVirtualNetworkGatewayConnection_ipsecpolicy(t *testing.T) {
data := acceptance.BuildTestData(t, "azurestack_virtual_network_gateway_connection", "test")
r := VirtualNetworkGatewayConnectionResource{}
Expand All @@ -95,36 +77,6 @@ func TestAccVirtualNetworkGatewayConnection_ipsecpolicy(t *testing.T) {
})
}

func TestAccVirtualNetworkGatewayConnection_updatingSharedKey(t *testing.T) {
data1 := acceptance.BuildTestData(t, "azurestack_virtual_network_gateway_connection", "test_1")
data2 := acceptance.BuildTestData(t, "azurestack_virtual_network_gateway_connection", "test_2")
r := VirtualNetworkGatewayConnectionResource{}

firstSharedKey := "4-v3ry-53cr37-1p53c-5h4r3d-k3y"
secondSharedKey := "4-r33ly-53cr37-1p53c-5h4r3d-k3y"

data1.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.vnettovnet(data1, data2.RandomInteger, firstSharedKey),
Check: acceptance.ComposeTestCheckFunc(
check.That(data1.ResourceName).ExistsInAzure(r),
check.That(data2.ResourceName).ExistsInAzure(r),
acceptance.TestCheckResourceAttr(data1.ResourceName, "shared_key", firstSharedKey),
acceptance.TestCheckResourceAttr(data2.ResourceName, "shared_key", firstSharedKey),
),
},
{
Config: r.vnettovnet(data1, data2.RandomInteger, secondSharedKey),
Check: acceptance.ComposeTestCheckFunc(
check.That(data1.ResourceName).ExistsInAzure(r),
check.That(data2.ResourceName).ExistsInAzure(r),
acceptance.TestCheckResourceAttr(data1.ResourceName, "shared_key", secondSharedKey),
acceptance.TestCheckResourceAttr(data2.ResourceName, "shared_key", secondSharedKey),
),
},
})
}

func (t VirtualNetworkGatewayConnectionResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
gatewayName := state.Attributes["name"]
resourceGroup := state.Attributes["resource_group_name"]
Expand Down Expand Up @@ -191,7 +143,7 @@ resource "azurestack_local_network_gateway" "test" {
location = azurestack_resource_group.test.location
resource_group_name = azurestack_resource_group.test.name

gateway_address = "168.62.225.23"
gateway_address = "168.62.225.%d"
address_space = ["10.1.1.0/24"]
}

Expand All @@ -206,7 +158,7 @@ resource "azurestack_virtual_network_gateway_connection" "test" {

shared_key = "4-v3ry-53cr37-1p53c-5h4r3d-k3y"
}
`, data.RandomInteger, data.Locations.Primary)
`, data.RandomInteger, data.Locations.Primary, acctest.RandIntRange(2, 253))
}

func (VirtualNetworkGatewayConnectionResource) sitetositeWithoutSharedKey(data acceptance.TestData) string {
Expand Down Expand Up @@ -263,7 +215,7 @@ resource "azurestack_local_network_gateway" "test" {
location = azurestack_resource_group.test.location
resource_group_name = azurestack_resource_group.test.name

gateway_address = "168.62.225.23"
gateway_address = "168.62.225.%d"
address_space = ["10.1.1.0/24"]
}

Expand All @@ -276,7 +228,7 @@ resource "azurestack_virtual_network_gateway_connection" "test" {
virtual_network_gateway_id = azurestack_virtual_network_gateway.test.id
local_network_gateway_id = azurestack_local_network_gateway.test.id
}
`, data.RandomInteger, data.Locations.Primary)
`, data.RandomInteger, data.Locations.Primary, acctest.RandIntRange(2, 253))
}

func (r VirtualNetworkGatewayConnectionResource) requiresImport(data acceptance.TestData) string {
Expand All @@ -295,132 +247,6 @@ resource "azurestack_virtual_network_gateway_connection" "import" {
`, r.sitetosite(data))
}

func (VirtualNetworkGatewayConnectionResource) vnettovnet(data acceptance.TestData, rInt2 int, sharedKey string) string {
return fmt.Sprintf(`
variable "random1" {
default = "%d"
}

variable "random2" {
default = "%d"
}

variable "shared_key" {
default = "%s"
}

resource "azurestack_resource_group" "test_1" {
name = "acctestRG-${var.random1}"
location = "%s"
}

resource "azurestack_virtual_network" "test_1" {
name = "acctestvn-${var.random1}"
location = azurestack_resource_group.test_1.location
resource_group_name = azurestack_resource_group.test_1.name
address_space = ["10.0.0.0/16"]
}

resource "azurestack_subnet" "test_1" {
name = "GatewaySubnet"
resource_group_name = azurestack_resource_group.test_1.name
virtual_network_name = azurestack_virtual_network.test_1.name
address_prefix = "10.0.1.0/24"
}

resource "azurestack_public_ip" "test_1" {
name = "acctest-${var.random1}"
location = azurestack_resource_group.test_1.location
resource_group_name = azurestack_resource_group.test_1.name
allocation_method = "Dynamic"
}

resource "azurestack_virtual_network_gateway" "test_1" {
name = "acctest-${var.random1}"
location = azurestack_resource_group.test_1.location
resource_group_name = azurestack_resource_group.test_1.name

type = "Vpn"
vpn_type = "RouteBased"
sku = "Basic"

ip_configuration {
name = "vnetGatewayConfig"
public_ip_address_id = azurestack_public_ip.test_1.id
private_ip_address_allocation = "Dynamic"
subnet_id = azurestack_subnet.test_1.id
}
}

resource "azurestack_virtual_network_gateway_connection" "test_1" {
name = "acctest-${var.random1}"
location = azurestack_resource_group.test_1.location
resource_group_name = azurestack_resource_group.test_1.name

type = "Vnet2Vnet"
virtual_network_gateway_id = azurestack_virtual_network_gateway.test_1.id
peer_virtual_network_gateway_id = azurestack_virtual_network_gateway.test_2.id

shared_key = var.shared_key
}

resource "azurestack_resource_group" "test_2" {
name = "acctestRG-${var.random2}"
location = "%s"
}

resource "azurestack_virtual_network" "test_2" {
name = "acctest-${var.random2}"
location = azurestack_resource_group.test_2.location
resource_group_name = azurestack_resource_group.test_2.name
address_space = ["10.1.0.0/16"]
}

resource "azurestack_subnet" "test_2" {
name = "GatewaySubnet"
resource_group_name = azurestack_resource_group.test_2.name
virtual_network_name = azurestack_virtual_network.test_2.name
address_prefix = "10.1.1.0/24"
}

resource "azurestack_public_ip" "test_2" {
name = "acctest-${var.random2}"
location = azurestack_resource_group.test_2.location
resource_group_name = azurestack_resource_group.test_2.name
allocation_method = "Dynamic"
}

resource "azurestack_virtual_network_gateway" "test_2" {
name = "acctest-${var.random2}"
location = azurestack_resource_group.test_2.location
resource_group_name = azurestack_resource_group.test_2.name

type = "Vpn"
vpn_type = "RouteBased"
sku = "Basic"

ip_configuration {
name = "vnetGatewayConfig"
public_ip_address_id = azurestack_public_ip.test_2.id
private_ip_address_allocation = "Dynamic"
subnet_id = azurestack_subnet.test_2.id
}
}

resource "azurestack_virtual_network_gateway_connection" "test_2" {
name = "acctest-${var.random2}"
location = azurestack_resource_group.test_2.location
resource_group_name = azurestack_resource_group.test_2.name

type = "Vnet2Vnet"
virtual_network_gateway_id = azurestack_virtual_network_gateway.test_2.id
peer_virtual_network_gateway_id = azurestack_virtual_network_gateway.test_1.id

shared_key = var.shared_key
}
`, data.RandomInteger, rInt2, sharedKey, data.Locations.Primary, data.Locations.Secondary)
}

func (VirtualNetworkGatewayConnectionResource) ipsecpolicy(data acceptance.TestData) string {
return fmt.Sprintf(`
variable "random" {
Expand Down Expand Up @@ -460,7 +286,7 @@ resource "azurestack_virtual_network_gateway" "test" {

type = "Vpn"
vpn_type = "RouteBased"
sku = "VpnGw1"
sku = "Standard"

ip_configuration {
name = "vnetGatewayConfig"
Expand All @@ -475,7 +301,7 @@ resource "azurestack_local_network_gateway" "test" {
location = azurestack_resource_group.test.location
resource_group_name = azurestack_resource_group.test.name

gateway_address = "168.62.225.23"
gateway_address = "168.62.225.%d"
address_space = ["10.1.1.0/24"]
}

Expand Down Expand Up @@ -504,5 +330,5 @@ resource "azurestack_virtual_network_gateway_connection" "test" {

shared_key = "4-v3ry-53cr37-1p53c-5h4r3d-k3y"
}
`, data.RandomInteger, data.Locations.Primary)
`, data.RandomInteger, data.Locations.Primary, acctest.RandIntRange(2, 253))
}
Loading