Skip to content

Commit e06eeea

Browse files
yfodilyfodil
committed
update tests
1 parent b6cb20a commit e06eeea

24 files changed

+6154
-16969
lines changed

‎internal/services/vpcgw/helpers.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ func readVPCGWResourceDataV2(d *schema.ResourceData, gw *v2.Gateway) diag.Diagno
195195
_ = d.Set("bastion_port", int(gw.BastionPort))
196196
_ = d.Set("enable_smtp", gw.SMTPEnabled)
197197
_ = d.Set("bandwidth", gw.Bandwidth)
198+
_ = d.Set("upstream_dns_servers", nil)
198199
ips, err := FlattenIPNetList(gw.BastionAllowedIPs)
199200
if err != nil {
200201
return diag.FromErr(err)

‎internal/services/vpcgw/ip_reverse_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
88
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
9-
vpcgwSDK "github.com/scaleway/scaleway-sdk-go/api/vpcgw/v1"
9+
vpcgwSDK "github.com/scaleway/scaleway-sdk-go/api/vpcgw/v2"
1010
"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
1111
"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/domain"
1212
instancechecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs"
@@ -63,7 +63,7 @@ func testAccCheckVPCPublicGatewayIPDefaultReverse(tt *acctest.TestTools, n strin
6363
return fmt.Errorf("resource not found: %s", n)
6464
}
6565

66-
api, zone, ID, err := vpcgw.NewAPIWithZoneAndID(tt.Meta, rs.Primary.ID)
66+
api, zone, ID, err := vpcgw.NewAPIWithZoneAndIDv2(tt.Meta, rs.Primary.ID)
6767
if err != nil {
6868
return err
6969
}

‎internal/services/vpcgw/ip_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
88
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
9-
vpcgwSDK "github.com/scaleway/scaleway-sdk-go/api/vpcgw/v1"
9+
vpcgwSDK "github.com/scaleway/scaleway-sdk-go/api/vpcgw/v2"
1010
"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
1111
"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/vpcgw"
1212
vpcgwchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/vpcgw/testfuncs"
@@ -104,7 +104,7 @@ func testAccCheckVPCPublicGatewayIPExists(tt *acctest.TestTools, n string) resou
104104
return fmt.Errorf("resource not found: %s", n)
105105
}
106106

107-
api, zone, ID, err := vpcgw.NewAPIWithZoneAndID(tt.Meta, rs.Primary.ID)
107+
api, zone, ID, err := vpcgw.NewAPIWithZoneAndIDv2(tt.Meta, rs.Primary.ID)
108108
if err != nil {
109109
return err
110110
}

‎internal/services/vpcgw/network_data_source_test.go‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ func TestAccDataSourceVPCGatewayNetwork_Basic(t *testing.T) {
2424
resource "scaleway_vpc_public_gateway_ip" "gw01" {
2525
}
2626
27-
resource "scaleway_vpc_public_gateway_dhcp" "dhcp01" {
28-
subnet = "192.168.1.0/24"
29-
push_default_route = true
30-
}
31-
3227
resource "scaleway_vpc_public_gateway" "pg01" {
3328
type = "VPC-GW-S"
3429
ip_id = scaleway_vpc_public_gateway_ip.gw01.id
@@ -37,8 +32,9 @@ func TestAccDataSourceVPCGatewayNetwork_Basic(t *testing.T) {
3732
resource "scaleway_vpc_gateway_network" "main" {
3833
gateway_id = scaleway_vpc_public_gateway.pg01.id
3934
private_network_id = scaleway_vpc_private_network.pn01.id
40-
dhcp_id = scaleway_vpc_public_gateway_dhcp.dhcp01.id
41-
cleanup_dhcp = true
35+
ipam_config {
36+
push_default_route = false
37+
}
4238
enable_masquerade = true
4339
}`,
4440
},
@@ -49,12 +45,7 @@ func TestAccDataSourceVPCGatewayNetwork_Basic(t *testing.T) {
4945
5046
resource "scaleway_vpc_public_gateway_ip" "gw01" {
5147
}
52-
53-
resource "scaleway_vpc_public_gateway_dhcp" "dhcp01" {
54-
subnet = "192.168.1.0/24"
55-
push_default_route = true
56-
}
57-
48+
5849
resource "scaleway_vpc_public_gateway" "pg01" {
5950
type = "VPC-GW-S"
6051
ip_id = scaleway_vpc_public_gateway_ip.gw01.id
@@ -63,8 +54,9 @@ func TestAccDataSourceVPCGatewayNetwork_Basic(t *testing.T) {
6354
resource "scaleway_vpc_gateway_network" "main" {
6455
gateway_id = scaleway_vpc_public_gateway.pg01.id
6556
private_network_id = scaleway_vpc_private_network.pn01.id
66-
dhcp_id = scaleway_vpc_public_gateway_dhcp.dhcp01.id
67-
cleanup_dhcp = true
57+
ipam_config {
58+
push_default_route = false
59+
}
6860
enable_masquerade = true
6961
}
7062

‎internal/services/vpcgw/network_test.go‎

Lines changed: 2 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -6,147 +6,13 @@ import (
66

77
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
88
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
9-
vpcgwSDK "github.com/scaleway/scaleway-sdk-go/api/vpcgw/v1"
9+
vpcgwSDK "github.com/scaleway/scaleway-sdk-go/api/vpcgw/v2"
1010
"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
1111
ipamchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/ipam/testfuncs"
1212
"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/vpcgw"
1313
vpcgwchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/vpcgw/testfuncs"
1414
)
1515

16-
func TestAccVPCGatewayNetwork_Basic(t *testing.T) {
17-
tt := acctest.NewTestTools(t)
18-
defer tt.Cleanup()
19-
resource.ParallelTest(t, resource.TestCase{
20-
PreCheck: func() { acctest.PreCheck(t) },
21-
ProviderFactories: tt.ProviderFactories,
22-
CheckDestroy: vpcgwchecks.IsGatewayNetworkDestroyed(tt),
23-
Steps: []resource.TestStep{
24-
{
25-
Config: `
26-
resource scaleway_vpc_private_network pn01 {
27-
name = "pn_test_network"
28-
}
29-
30-
resource scaleway_vpc_public_gateway_ip gw01 {
31-
}
32-
33-
resource scaleway_vpc_public_gateway_dhcp dhcp01 {
34-
subnet = "192.168.1.0/24"
35-
}
36-
`,
37-
},
38-
{
39-
Config: `
40-
resource scaleway_vpc_private_network pn01 {
41-
name = "pn_test_network"
42-
}
43-
44-
resource scaleway_vpc_public_gateway_ip gw01 {
45-
}
46-
47-
resource scaleway_vpc_public_gateway_dhcp dhcp01 {
48-
subnet = "192.168.1.0/24"
49-
}
50-
51-
resource scaleway_vpc_public_gateway pg01 {
52-
name = "foobar"
53-
type = "VPC-GW-S"
54-
ip_id = scaleway_vpc_public_gateway_ip.gw01.id
55-
}
56-
57-
resource scaleway_vpc_gateway_network main {
58-
gateway_id = scaleway_vpc_public_gateway.pg01.id
59-
private_network_id = scaleway_vpc_private_network.pn01.id
60-
dhcp_id = scaleway_vpc_public_gateway_dhcp.dhcp01.id
61-
cleanup_dhcp = true
62-
enable_masquerade = true
63-
depends_on = [scaleway_vpc_public_gateway_ip.gw01, scaleway_vpc_private_network.pn01]
64-
}
65-
`,
66-
Check: resource.ComposeTestCheckFunc(
67-
testAccCheckVPCGatewayNetworkExists(tt, "scaleway_vpc_gateway_network.main"),
68-
resource.TestCheckResourceAttrPair("scaleway_vpc_gateway_network.main",
69-
"private_network_id", "scaleway_vpc_private_network.pn01", "id"),
70-
resource.TestCheckResourceAttrSet("scaleway_vpc_gateway_network.main", "gateway_id"),
71-
resource.TestCheckResourceAttrSet("scaleway_vpc_gateway_network.main", "private_network_id"),
72-
resource.TestCheckResourceAttrSet("scaleway_vpc_gateway_network.main", "dhcp_id"),
73-
resource.TestCheckResourceAttrSet("scaleway_vpc_gateway_network.main", "mac_address"),
74-
resource.TestCheckResourceAttrSet("scaleway_vpc_gateway_network.main", "created_at"),
75-
resource.TestCheckResourceAttrSet("scaleway_vpc_gateway_network.main", "updated_at"),
76-
resource.TestCheckResourceAttrSet("scaleway_vpc_gateway_network.main", "zone"),
77-
resource.TestCheckResourceAttr("scaleway_vpc_gateway_network.main", "enable_dhcp", "true"),
78-
resource.TestCheckResourceAttr("scaleway_vpc_gateway_network.main", "cleanup_dhcp", "true"),
79-
resource.TestCheckResourceAttr("scaleway_vpc_gateway_network.main", "enable_masquerade", "true"),
80-
),
81-
},
82-
{
83-
Config: `
84-
resource scaleway_vpc_private_network pn01 {
85-
name = "pn_test_network"
86-
}
87-
88-
resource scaleway_vpc_public_gateway_ip gw01 {
89-
}
90-
91-
resource scaleway_vpc_public_gateway pg01 {
92-
name = "foobar"
93-
type = "VPC-GW-S"
94-
ip_id = scaleway_vpc_public_gateway_ip.gw01.id
95-
}
96-
`,
97-
Check: resource.ComposeTestCheckFunc(
98-
resource.TestCheckResourceAttrSet("scaleway_vpc_private_network.pn01", "name"),
99-
),
100-
},
101-
},
102-
})
103-
}
104-
105-
func TestAccVPCGatewayNetwork_WithoutDHCP(t *testing.T) {
106-
tt := acctest.NewTestTools(t)
107-
defer tt.Cleanup()
108-
resource.ParallelTest(t, resource.TestCase{
109-
PreCheck: func() { acctest.PreCheck(t) },
110-
ProviderFactories: tt.ProviderFactories,
111-
CheckDestroy: vpcgwchecks.IsGatewayNetworkDestroyed(tt),
112-
Steps: []resource.TestStep{
113-
{
114-
Config: `
115-
resource scaleway_vpc_private_network pn01 {
116-
name = "pn_test_network"
117-
}
118-
119-
resource scaleway_vpc_public_gateway pg01 {
120-
name = "foobar"
121-
type = "VPC-GW-S"
122-
}
123-
124-
resource scaleway_vpc_gateway_network main {
125-
gateway_id = scaleway_vpc_public_gateway.pg01.id
126-
private_network_id = scaleway_vpc_private_network.pn01.id
127-
enable_dhcp = false
128-
enable_masquerade = true
129-
static_address = "192.168.1.42/24"
130-
}
131-
`,
132-
Check: resource.ComposeTestCheckFunc(
133-
testAccCheckVPCGatewayNetworkExists(tt, "scaleway_vpc_gateway_network.main"),
134-
resource.TestCheckResourceAttrSet("scaleway_vpc_gateway_network.main", "gateway_id"),
135-
resource.TestCheckResourceAttrSet("scaleway_vpc_gateway_network.main", "private_network_id"),
136-
resource.TestCheckResourceAttrSet("scaleway_vpc_gateway_network.main", "mac_address"),
137-
resource.TestCheckResourceAttrSet("scaleway_vpc_gateway_network.main", "created_at"),
138-
resource.TestCheckResourceAttrSet("scaleway_vpc_gateway_network.main", "updated_at"),
139-
resource.TestCheckResourceAttrSet("scaleway_vpc_gateway_network.main", "zone"),
140-
resource.TestCheckResourceAttr("scaleway_vpc_gateway_network.main", "static_address", "192.168.1.42/24"),
141-
resource.TestCheckResourceAttr("scaleway_vpc_gateway_network.main", "enable_dhcp", "false"),
142-
resource.TestCheckResourceAttr("scaleway_vpc_gateway_network.main", "cleanup_dhcp", "false"),
143-
resource.TestCheckResourceAttr("scaleway_vpc_gateway_network.main", "enable_masquerade", "true"),
144-
),
145-
},
146-
},
147-
})
148-
}
149-
15016
func TestAccVPCGatewayNetwork_WithIPAMConfig(t *testing.T) {
15117
tt := acctest.NewTestTools(t)
15218
defer tt.Cleanup()
@@ -195,10 +61,8 @@ func TestAccVPCGatewayNetwork_WithIPAMConfig(t *testing.T) {
19561
resource.TestCheckResourceAttrSet("scaleway_vpc_gateway_network.main", "updated_at"),
19662
resource.TestCheckResourceAttrSet("scaleway_vpc_gateway_network.main", "status"),
19763
resource.TestCheckResourceAttrSet("scaleway_vpc_gateway_network.main", "zone"),
198-
resource.TestCheckResourceAttrSet("scaleway_vpc_gateway_network.main", "static_address"),
19964
resource.TestCheckResourceAttr("scaleway_vpc_gateway_network.main", "ipam_config.0.push_default_route", "true"),
20065
resource.TestCheckResourceAttrSet("scaleway_vpc_gateway_network.main", "ipam_config.0.ipam_ip_id"),
201-
resource.TestCheckResourceAttr("scaleway_vpc_gateway_network.main", "enable_dhcp", "true"),
20266
resource.TestCheckResourceAttr("scaleway_vpc_gateway_network.main", "enable_masquerade", "true"),
20367
),
20468
},
@@ -256,7 +120,7 @@ func testAccCheckVPCGatewayNetworkExists(tt *acctest.TestTools, n string) resour
256120
return fmt.Errorf("resource not found: %s", n)
257121
}
258122

259-
api, zone, ID, err := vpcgw.NewAPIWithZoneAndID(tt.Meta, rs.Primary.ID)
123+
api, zone, ID, err := vpcgw.NewAPIWithZoneAndIDv2(tt.Meta, rs.Primary.ID)
260124
if err != nil {
261125
return err
262126
}

0 commit comments

Comments
 (0)