Skip to content

Commit c87cd73

Browse files
authored
Merge branch 'master' into add_framework
2 parents 7263e18 + fe9a05f commit c87cd73

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

go.mod

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/scaleway/terraform-provider-scaleway/v2
22

3-
go 1.24.0
3+
go 1.25.0
44

55
require (
66
github.com/alexedwards/argon2id v1.0.0
@@ -184,3 +184,10 @@ tool (
184184
github.com/katbyte/terrafmt
185185
gotest.tools/gotestsum
186186
)
187+
188+
ignore (
189+
./docs
190+
./examples
191+
./scripts
192+
./templates
193+
)

internal/services/instance/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ func ResourceInstanceServerCreate(ctx context.Context, d *schema.ResourceData, m
471471
req.PlacementGroup = types.ExpandStringPtr(zonal.ExpandID(placementGroupID).ID)
472472
}
473473

474-
if adminPasswordEncryptionSSHKeyID, ok := d.GetOk("admin_password_encryption_key_ssh_id"); ok {
474+
if adminPasswordEncryptionSSHKeyID, ok := d.GetOk("admin_password_encryption_ssh_key_id"); ok {
475475
req.AdminPasswordEncryptionSSHKeyID = types.ExpandStringPtr(adminPasswordEncryptionSSHKeyID)
476476
}
477477

0 commit comments

Comments
 (0)