Skip to content

Commit 27dee65

Browse files
authored
fix(baremetal): set partition in request only if not nil (#3518)
* fix(baremetal): set partition in request only if not nil * test(baremetal): update cassette creaateSever * test(flexibleip): update offer * test(flexibleip): update cassettes * test(bm): update cassettes
1 parent 3820105 commit 27dee65

16 files changed

+19528
-18348
lines changed

internal/services/baremetal/server.go

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -382,31 +382,32 @@ func ResourceServerCreate(ctx context.Context, d *schema.ResourceData, m any) di
382382
req.UserData = &cloudInitStr
383383
}
384384

385-
partitioningSchema := baremetal.Schema{}
386-
387385
if file, ok := d.GetOk("partitioning"); ok || !d.Get("install_config_afterward").(bool) {
388386
if diags := validateInstallConfig(ctx, d, m); len(diags) > 0 {
389387
return diags
390388
}
391389

390+
req.Install = &baremetal.CreateServerRequestInstall{
391+
OsID: zonal.ExpandID(d.Get("os")).ID,
392+
Hostname: d.Get("hostname").(string),
393+
SSHKeyIDs: types.ExpandStrings(d.Get("ssh_key_ids")),
394+
User: types.ExpandStringPtr(d.Get("user")),
395+
Password: types.ExpandStringPtr(d.Get("password")),
396+
ServicePassword: types.ExpandStringPtr(d.Get("service_password")),
397+
ServiceUser: types.ExpandStringPtr(d.Get("service_user")),
398+
}
399+
400+
partitioningSchema := baremetal.Schema{}
401+
392402
if file != "" {
393403
todecode, _ := file.(string)
394404

395405
err = json.Unmarshal([]byte(todecode), &partitioningSchema)
396406
if err != nil {
397407
return diag.FromErr(err)
398408
}
399-
}
400409

401-
req.Install = &baremetal.CreateServerRequestInstall{
402-
OsID: zonal.ExpandID(d.Get("os")).ID,
403-
Hostname: d.Get("hostname").(string),
404-
SSHKeyIDs: types.ExpandStrings(d.Get("ssh_key_ids")),
405-
User: types.ExpandStringPtr(d.Get("user")),
406-
Password: types.ExpandStringPtr(d.Get("password")),
407-
PartitioningSchema: &partitioningSchema,
408-
ServicePassword: types.ExpandStringPtr(d.Get("service_password")),
409-
ServiceUser: types.ExpandStringPtr(d.Get("service_user")),
410+
req.Install.PartitioningSchema = &partitioningSchema
410411
}
411412
}
412413

internal/services/baremetal/testdata/data-source-server-basic.cassette.yaml

Lines changed: 1425 additions & 1327 deletions
Large diffs are not rendered by default.

internal/services/baremetal/testdata/server-add-another-private-network.cassette.yaml

Lines changed: 1817 additions & 1425 deletions
Large diffs are not rendered by default.

internal/services/baremetal/testdata/server-add-option.cassette.yaml

Lines changed: 1199 additions & 1787 deletions
Large diffs are not rendered by default.

internal/services/baremetal/testdata/server-add-private-network.cassette.yaml

Lines changed: 4036 additions & 1047 deletions
Large diffs are not rendered by default.

internal/services/baremetal/testdata/server-add-two-options-then-delete-one.cassette.yaml

Lines changed: 1389 additions & 1928 deletions
Large diffs are not rendered by default.

internal/services/baremetal/testdata/server-basic.cassette.yaml

Lines changed: 1227 additions & 1619 deletions
Large diffs are not rendered by default.

internal/services/baremetal/testdata/server-cloud-init-not-compatible-offer.cassette.yaml

Lines changed: 70 additions & 70 deletions
Large diffs are not rendered by default.

internal/services/baremetal/testdata/server-cloud-init.cassette.yaml

Lines changed: 1216 additions & 1020 deletions
Large diffs are not rendered by default.

internal/services/baremetal/testdata/server-create-server-with-option.cassette.yaml

Lines changed: 884 additions & 1080 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)