Skip to content
This repository was archived by the owner on Mar 1, 2023. It is now read-only.

Commit b5df776

Browse files
author
[Partner] Alexander Sokolov
committed
GCLOUD2-6985 baremetal name_tempaltes fixed
1 parent 58bf64b commit b5df776

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

gcore/resource_gcore_baremetal.go

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -321,9 +321,17 @@ func resourceBmInstanceCreate(ctx context.Context, d *schema.ResourceData, m int
321321
opts.Names = []string{name}
322322
}
323323

324-
nameTpl := d.Get("name_templates").(string)
325-
if len(nameTpl) > 0 {
326-
opts.NameTemplates = []string{nameTpl}
324+
if nameTemplatesRaw, ok := d.GetOk("name_templates"); ok {
325+
nameTemplates := nameTemplatesRaw.([]interface{})
326+
if len(nameTemplates) > 0 {
327+
NameTemp := make([]string, len(nameTemplates))
328+
for i, nametemp := range nameTemplates {
329+
NameTemp[i] = nametemp.(string)
330+
}
331+
opts.NameTemplates = NameTemp
332+
}
333+
} else if nameTemplate, ok := d.GetOk("name_template"); ok {
334+
opts.NameTemplates = []string{nameTemplate.(string)}
327335
}
328336

329337
if metadata, ok := d.GetOk("metadata"); ok {
@@ -562,8 +570,9 @@ func resourceBmInstanceUpdate(ctx context.Context, d *schema.ResourceData, m int
562570
}
563571

564572
if d.HasChange("name") {
565-
nameTemplate := d.Get("name_templates").(string)
566-
if len(nameTemplate) == 0 {
573+
nameTemplates := d.Get("name_templates").([]interface{})
574+
nameTemplate := d.Get("name_template").(string)
575+
if len(nameTemplate) == 0 && len(nameTemplates) == 0 {
567576
opts := instances.RenameInstanceOpts{
568577
Name: d.Get("name").(string),
569578
}

gcore/resource_gcore_instance.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ func resourceInstanceUpdate(ctx context.Context, d *schema.ResourceData, m inter
686686

687687
if d.HasChange("name") {
688688
nameTemplates := d.Get("name_templates").([]interface{})
689-
nameTemplate := d.Get("name_template").([]interface{})
689+
nameTemplate := d.Get("name_template").(string)
690690
if len(nameTemplate) == 0 && len(nameTemplates) == 0 {
691691
opts := instances.RenameInstanceOpts{
692692
Name: d.Get("name").(string),

0 commit comments

Comments
 (0)