Skip to content

Commit 56fac5f

Browse files
Laure-diLaure-di
committed
fix tests enabled vpc with update
1 parent d5f1663 commit 56fac5f

File tree

7 files changed

+1184
-2978
lines changed

7 files changed

+1184
-2978
lines changed

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require (
2828
github.com/nats-io/jwt/v2 v2.7.3
2929
github.com/nats-io/nats.go v1.38.0
3030
github.com/robfig/cron/v3 v3.0.1
31-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20250117133139-e360c98f921d
31+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32.0.20250206152403-1eed2f2ce9d3
3232
github.com/stretchr/testify v1.10.0
3333
golang.org/x/crypto v0.32.0
3434
gopkg.in/dnaeon/go-vcr.v3 v3.2.0
@@ -125,9 +125,9 @@ require (
125125
go.opentelemetry.io/otel/trace v1.31.0 // indirect
126126
golang.org/x/mod v0.22.0 // indirect
127127
golang.org/x/net v0.34.0 // indirect
128-
golang.org/x/sync v0.10.0 // indirect
128+
golang.org/x/sync v0.11.0 // indirect
129129
golang.org/x/sys v0.29.0 // indirect
130-
golang.org/x/text v0.21.0 // indirect
130+
golang.org/x/text v0.22.0 // indirect
131131
golang.org/x/time v0.3.0 // indirect
132132
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
133133
google.golang.org/appengine v1.6.8 // indirect

‎go.sum‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,8 @@ github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
291291
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
292292
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20250117133139-e360c98f921d h1:npDtKGreHq1EA6DoHo18YG25bsvZVlo4XlNm822GZ7A=
293293
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20250117133139-e360c98f921d/go.mod h1:kzh+BSAvpoyHHdHBCDhmSWtBc1NbLMZ2lWHqnBoxFks=
294+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32.0.20250206152403-1eed2f2ce9d3 h1:wNQbwsFYaWiqTRtAgO5uroCTsS0o8FPGdI/x4hCJqtM=
295+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32.0.20250206152403-1eed2f2ce9d3/go.mod h1:792k1RTU+5JeMXm35/e2Wgp71qPH/DmDoZrRc+EFZDk=
294296
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
295297
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
296298
github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
@@ -387,6 +389,7 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
387389
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
388390
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
389391
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
392+
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
390393
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
391394
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
392395
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -419,6 +422,8 @@ golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
419422
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
420423
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
421424
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
425+
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
426+
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
422427
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
423428
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
424429
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

‎internal/services/applesilicon/server.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ func ResourceAppleSiliconServerRead(ctx context.Context, d *schema.ResourceData,
231231
if err != nil {
232232
return diag.FromErr(err)
233233
}
234+
//check if pn
234235
_ = d.Set("private_network", flattenPrivateNetworks(pnRegion, listPrivateNetworks.ServerPrivateNetworks))
235236

236237
return nil
@@ -266,12 +267,12 @@ func ResourceAppleSiliconServerUpdate(ctx context.Context, d *schema.ResourceDat
266267
return diag.FromErr(err)
267268
}
268269

269-
_, err = waitForAppleSiliconPrivateNetworkServer(ctx, appleSilisonPrivateNetworkAPI, zone, ID, d.Timeout(schema.TimeoutCreate))
270+
err = waitForTerminalVPCState(ctx, asAPI, zone, ID, d.Timeout(schema.TimeoutCreate))
270271
if err != nil {
271272
return diag.FromErr(err)
272273
}
273274

274-
if d.HasChange("private_network") && *req.EnableVpc {
275+
if d.HasChange("private_network") {
275276
privateNetwork := d.Get("private_network")
276277
req := &applesilicon.PrivateNetworkAPISetServerPrivateNetworksRequest{
277278
Zone: zone,

‎internal/services/applesilicon/server_test.go‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ func TestAccServer_EnableDisabledVPC(t *testing.T) {
5757
Config: `
5858
5959
resource scaleway_apple_silicon_server main {
60-
name = "TestAccServerEnableVPC"
60+
name = "TestAccServerEnableDisableVPC"
6161
type = "M2-M"
6262
enable_vpc = true
6363
}
6464
`,
6565
Check: resource.ComposeTestCheckFunc(
6666
isServerPresent(tt, "scaleway_apple_silicon_server.main"),
67-
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "name", "TestAccServerEnableVPC"),
67+
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "name", "TestAccServerEnableDisableVPC"),
6868
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "type", "M2-M"),
6969
// Computed
7070
resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "ip"),
@@ -78,21 +78,21 @@ func TestAccServer_EnableDisabledVPC(t *testing.T) {
7878
Config: `
7979
8080
resource scaleway_apple_silicon_server main {
81-
name = "TestAccServerEnableVPC"
81+
name = "TestAccServerEnableDisableVPC"
8282
type = "M2-M"
8383
enable_vpc = false
8484
}
8585
`,
8686
Check: resource.ComposeTestCheckFunc(
8787
isServerPresent(tt, "scaleway_apple_silicon_server.main"),
88-
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "name", "TestAccServerEnableVPC"),
88+
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "name", "TestAccServerEnableDisableVPC"),
8989
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "type", "M2-M"),
9090
// Computed
9191
resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "ip"),
9292
resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "vnc_url"),
9393
resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "created_at"),
9494
resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "deletable_at"),
95-
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "vpc_status", "vpc_updating"),
95+
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "vpc_status", "vpc_disabled"),
9696
),
9797
},
9898
},
@@ -143,6 +143,15 @@ func TestAccServer_EnableVPC(t *testing.T) {
143143
},
144144
{
145145
Config: `
146+
resource "scaleway_vpc" "vpc01" {
147+
name = "TestAccServerEnableVPC"
148+
}
149+
150+
resource "scaleway_vpc_private_network" "pn01" {
151+
name = "TestAccServerEnableVPC"
152+
vpc_id = scaleway_vpc.vpc01.id
153+
}
154+
146155
resource "scaleway_vpc" "vpc02" {
147156
name = "TestAccServerEnableVPCTwo"
148157
}
@@ -156,6 +165,9 @@ func TestAccServer_EnableVPC(t *testing.T) {
156165
name = "TestAccServerEnableVPC"
157166
type = "M2-M"
158167
enable_vpc = true
168+
private_network {
169+
id = scaleway_vpc_private_network.pn01.id
170+
}
159171
private_network {
160172
id = scaleway_vpc_private_network.pn02.id
161173
}
@@ -170,7 +182,9 @@ func TestAccServer_EnableVPC(t *testing.T) {
170182
resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "vnc_url"),
171183
resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "created_at"),
172184
resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "deletable_at"),
173-
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "vpc_status", "vpc_updating"),
185+
resource.TestCheckResourceAttrPair("scaleway_apple_silicon_server.main", "private_network.0.id", "scaleway_vpc_private_network.pn01", "id"),
186+
resource.TestCheckResourceAttrPair("scaleway_apple_silicon_server.main", "private_network.1.id", "scaleway_vpc_private_network.pn02", "id"),
187+
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "vpc_status", "vpc_enabled"),
174188
),
175189
},
176190
},

0 commit comments

Comments
 (0)