Skip to content

Commit 72d7e02

Browse files
committed
feat(pat-rules): add test and rebase
1 parent ed3f0f2 commit 72d7e02

5 files changed

+688
-220
lines changed

go.mod

+57
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,64 @@ require (
1515
)
1616

1717
require (
18+
cloud.google.com/go v0.61.0 // indirect
19+
cloud.google.com/go/storage v1.10.0 // indirect
20+
github.com/agext/levenshtein v1.2.2 // indirect
21+
github.com/apparentlymart/go-textseg v1.0.0 // indirect
22+
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
23+
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
24+
github.com/davecgh/go-spew v1.1.1 // indirect
25+
github.com/fatih/color v1.7.0 // indirect
26+
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
27+
github.com/golang/protobuf v1.4.2 // indirect
28+
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
29+
github.com/hashicorp/errwrap v1.0.0 // indirect
30+
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
31+
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
32+
github.com/hashicorp/go-getter v1.5.3 // indirect
33+
github.com/hashicorp/go-hclog v0.15.0 // indirect
34+
github.com/hashicorp/go-multierror v1.0.0 // indirect
35+
github.com/hashicorp/go-plugin v1.4.1 // indirect
36+
github.com/hashicorp/go-safetemp v1.0.0 // indirect
37+
github.com/hashicorp/go-uuid v1.0.1 // indirect
38+
github.com/hashicorp/go-version v1.3.0 // indirect
39+
github.com/hashicorp/hcl/v2 v2.3.0 // indirect
40+
github.com/hashicorp/logutils v1.0.0 // indirect
41+
github.com/hashicorp/terraform-exec v0.14.0 // indirect
42+
github.com/hashicorp/terraform-json v0.12.0 // indirect
43+
github.com/hashicorp/terraform-plugin-go v0.4.0 // indirect
44+
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
45+
github.com/jmespath/go-jmespath v0.4.0 // indirect
46+
github.com/jstemmer/go-junit-report v0.9.1 // indirect
47+
github.com/klauspost/compress v1.11.2 // indirect
48+
github.com/mattn/go-colorable v0.1.4 // indirect
49+
github.com/mattn/go-isatty v0.0.10 // indirect
50+
github.com/mitchellh/copystructure v1.2.0 // indirect
51+
github.com/mitchellh/go-homedir v1.1.0 // indirect
52+
github.com/mitchellh/go-testing-interface v1.0.4 // indirect
53+
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
54+
github.com/mitchellh/mapstructure v1.1.2 // indirect
55+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
56+
github.com/oklog/run v1.0.0 // indirect
57+
github.com/pmezard/go-difflib v1.0.0 // indirect
58+
github.com/ulikunitz/xz v0.5.8 // indirect
59+
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
60+
github.com/zclconf/go-cty v1.8.4 // indirect
61+
go.opencensus.io v0.22.4 // indirect
62+
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b // indirect
63+
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
64+
golang.org/x/mod v0.4.2 // indirect
65+
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect
66+
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
67+
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e // indirect
68+
golang.org/x/text v0.3.6 // indirect
1869
golang.org/x/tools v0.1.6 // indirect
70+
google.golang.org/api v0.29.0 // indirect
71+
google.golang.org/appengine v1.6.6 // indirect
72+
google.golang.org/genproto v0.0.0-20200711021454-869866162049 // indirect
73+
google.golang.org/grpc v1.32.0 // indirect
74+
google.golang.org/protobuf v1.25.0 // indirect
75+
gopkg.in/yaml.v2 v2.4.0 // indirect
1976
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
2077
)
2178

scaleway/resource_vpc_public_gateway_network.go

-196
This file was deleted.

scaleway/resource_vpc_public_gateway_network_test.go

-1
This file was deleted.

scaleway/resource_vpc_public_gateway_pat_rule_test.go

+12-3
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,31 @@ func TestAccScalewayVPCPublicGatewayPATRule_Basic(t *testing.T) {
2727
Steps: []resource.TestStep{
2828
{
2929
Config: `
30-
resource scaleway_vpc_public_gateway main {
30+
resource scaleway_vpc_public_gateway pg01 {
3131
type = "VPC-GW-S"
3232
}
3333
3434
resource scaleway_vpc_public_gateway_dhcp dhcp01 {
3535
subnet = "192.168.1.0/24"
3636
}
3737
38-
//add resource to add a public gateway to a pn
38+
resource scaleway_vpc_private_network pn01 {
39+
name = "pn_test_network"
40+
}
41+
42+
resource scaleway_vpc_gateway_network gn01 {
43+
gateway_id = scaleway_vpc_public_gateway.pg01.id
44+
private_network_id = scaleway_vpc_private_network.pn01.id
45+
dhcp_id = scaleway_vpc_public_gateway_dhcp.dhcp01.id
46+
}
3947
4048
resource scaleway_vpc_public_gateway_pat_rule main {
41-
gateway_id = scaleway_vpc_public_gateway.main.id
49+
gateway_id = scaleway_vpc_public_gateway.pg01.id
4250
private_ip = scaleway_vpc_public_gateway_dhcp.dhcp01.address
4351
private_port = 42
4452
public_port = 42
4553
protocol = "both"
54+
depends_on = [scaleway_vpc_gateway_network.gn01]
4655
}
4756
`,
4857
Check: resource.ComposeTestCheckFunc(

0 commit comments

Comments
 (0)