Skip to content

Commit f2e80a6

Browse files
committed
Fix userdata details being improperly serialized
1 parent f19bffc commit f2e80a6

3 files changed

Lines changed: 9 additions & 13 deletions

File tree

cloudstack/resource_cloudstack_instance.go

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -462,13 +462,11 @@ func resourceCloudStackInstanceCreate(d *schema.ResourceData, meta interface{})
462462
}
463463

464464
if userdataDetails, ok := d.GetOk("userdata_details"); ok {
465-
udDetails := make(map[string]string)
466-
index := 0
465+
ud := make(map[string]string)
467466
for k, v := range userdataDetails.(map[string]interface{}) {
468-
udDetails[fmt.Sprintf("userdatadetails[%d].%s", index, k)] = v.(string)
469-
index++
467+
ud[k] = v.(string)
470468
}
471-
p.SetUserdatadetails(udDetails)
469+
p.SetUserdatadetails(ud)
472470
}
473471

474472
// Create the new instance
@@ -825,13 +823,11 @@ func resourceCloudStackInstanceUpdate(d *schema.ResourceData, meta interface{})
825823

826824
p := cs.VirtualMachine.NewUpdateVirtualMachineParams(d.Id())
827825
if userdataDetails, ok := d.GetOk("userdata_details"); ok {
828-
udDetails := make(map[string]string)
829-
index := 0
826+
ud := make(map[string]string)
830827
for k, v := range userdataDetails.(map[string]interface{}) {
831-
udDetails[fmt.Sprintf("userdatadetails[%d].%s", index, k)] = v.(string)
832-
index++
828+
ud[k] = v.(string)
833829
}
834-
p.SetUserdatadetails(udDetails)
830+
p.SetUserdatadetails(ud)
835831
}
836832
_, err := cs.VirtualMachine.UpdateVirtualMachine(p)
837833
if err != nil {

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
module github.com/terraform-providers/terraform-provider-cloudstack
1919

2020
require (
21-
github.com/apache/cloudstack-go/v2 v2.18.1
21+
github.com/apache/cloudstack-go/v2 v2.19.0
2222
github.com/go-ini/ini v1.67.0
2323
github.com/hashicorp/go-multierror v1.1.1
2424
github.com/hashicorp/terraform-plugin-framework v1.12.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ github.com/ProtonMail/go-crypto v1.1.0-alpha.0 h1:nHGfwXmFvJrSR9xu8qL7BkO4DqTHXE
66
github.com/ProtonMail/go-crypto v1.1.0-alpha.0/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
77
github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE=
88
github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
9-
github.com/apache/cloudstack-go/v2 v2.18.1 h1:SgdRUEj5x17wSPfwAacjWgTqbtS/u7iaqnbpILWzE1c=
10-
github.com/apache/cloudstack-go/v2 v2.18.1/go.mod h1:p/YBUwIEkQN6CQxFhw8Ff0wzf1MY0qRRRuGYNbcb1F8=
9+
github.com/apache/cloudstack-go/v2 v2.19.0 h1:YHLw770MmgiqXx6NRFYw2Nr7DpnylLhLG2KYNCftgnc=
10+
github.com/apache/cloudstack-go/v2 v2.19.0/go.mod h1:p/YBUwIEkQN6CQxFhw8Ff0wzf1MY0qRRRuGYNbcb1F8=
1111
github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec=
1212
github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
1313
github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=

0 commit comments

Comments
 (0)