Skip to content

Commit a5df43a

Browse files
stuart-mclaren-hpestuart-mclaren-hpe
committed
Bump sdk version
Note: we override go-viper/mapstructure temporarily to pick up this fix: go-viper/mapstructure#122 We need to add that override to go.mod in this repo - it doesn't get picked up from the sdk repo. Update network datasource to pick up sdk changes - otherwise the code will no longer compile.
1 parent 0e4f575 commit a5df43a

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

‎go.mod‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ module github.com/HPE/terraform-provider-hpe
33
go 1.24.1
44

55
require (
6-
github.com/HewlettPackard/hpe-morpheus-go-sdk v0.0.0-20250709102943-5d15df406571
6+
github.com/HewlettPackard/hpe-morpheus-go-sdk v0.0.0-20250722162711-d1f318760b8f
7+
github.com/google/go-cmp v0.7.0
78
github.com/h2non/gock v1.2.0
89
github.com/hashicorp/terraform-plugin-framework v1.14.1
10+
github.com/hashicorp/terraform-plugin-framework-jsontypes v0.2.0
911
github.com/hashicorp/terraform-plugin-framework-validators v0.17.0
1012
github.com/hashicorp/terraform-plugin-go v0.26.0
1113
github.com/hashicorp/terraform-plugin-log v0.9.0
@@ -22,7 +24,6 @@ require (
2224
github.com/fatih/color v1.16.0 // indirect
2325
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
2426
github.com/golang/protobuf v1.5.4 // indirect
25-
github.com/google/go-cmp v0.7.0 // indirect
2627
github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 // indirect
2728
github.com/hashicorp/errwrap v1.1.0 // indirect
2829
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
@@ -39,7 +40,6 @@ require (
3940
github.com/hashicorp/logutils v1.0.0 // indirect
4041
github.com/hashicorp/terraform-exec v0.22.0 // indirect
4142
github.com/hashicorp/terraform-json v0.24.0 // indirect
42-
github.com/hashicorp/terraform-plugin-framework-jsontypes v0.2.0 // indirect
4343
github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.1 // indirect
4444
github.com/hashicorp/terraform-registry-address v0.2.4 // indirect
4545
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
@@ -72,3 +72,5 @@ require (
7272
gopkg.in/validator.v2 v2.0.1 // indirect
7373
gopkg.in/yaml.v3 v3.0.1 // indirect
7474
)
75+
76+
replace github.com/go-viper/mapstructure/v2 v2.3.0 => github.com/ZoeySimone/mapstructure/v2 v2.4.1-0.20250717172041-7e763acbe835

‎go.sum‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
22
dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
3-
github.com/HewlettPackard/hpe-morpheus-go-sdk v0.0.0-20250627141453-579e38eaf506 h1:hXI/89ybzcB4v3qpHCt3sIzO9wwVFvNcKbUK6Mb89wk=
4-
github.com/HewlettPackard/hpe-morpheus-go-sdk v0.0.0-20250627141453-579e38eaf506/go.mod h1:n9dT5IbZxQZ0TEORIdvAG7pc6usBeB8lRG2Obe1uCCs=
5-
github.com/HewlettPackard/hpe-morpheus-go-sdk v0.0.0-20250630125011-09e631a843f5 h1:8mJkBV6ltbqss8J6rvRgnD3ri/y9cbTy14wL2sy87Xo=
6-
github.com/HewlettPackard/hpe-morpheus-go-sdk v0.0.0-20250630125011-09e631a843f5/go.mod h1:SYbmX5el27ShD/jpIV4oCv+AfAD5I+c/gz+AP8P7EqI=
7-
github.com/HewlettPackard/hpe-morpheus-go-sdk v0.0.0-20250709102943-5d15df406571 h1:TwvgbAXXQTzIlYWbrNTV59syuXrjVi8IF6A31l0xusQ=
8-
github.com/HewlettPackard/hpe-morpheus-go-sdk v0.0.0-20250709102943-5d15df406571/go.mod h1:SYbmX5el27ShD/jpIV4oCv+AfAD5I+c/gz+AP8P7EqI=
3+
github.com/HewlettPackard/hpe-morpheus-go-sdk v0.0.0-20250722162711-d1f318760b8f h1:8UhPQHcB39tbS4hYh0JS+5depzaGlV0faKOJ4G+/7+M=
4+
github.com/HewlettPackard/hpe-morpheus-go-sdk v0.0.0-20250722162711-d1f318760b8f/go.mod h1:CpbMVklvvUIC4XC9WXKIDDyY9hk1RhK3kVr/PEuu9Gk=
95
github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
106
github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
117
github.com/ProtonMail/go-crypto v1.1.3 h1:nRBOetoydLeUb4nHajyO2bKqMLfWQ/ZPwkXqXxPxCFk=
128
github.com/ProtonMail/go-crypto v1.1.3/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
9+
github.com/ZoeySimone/mapstructure/v2 v2.4.1-0.20250717172041-7e763acbe835 h1:2rtZkuOyowfV0d7rG6tD9SC6N4gXYWZTOIPrAl1Wuvg=
10+
github.com/ZoeySimone/mapstructure/v2 v2.4.1-0.20250717172041-7e763acbe835/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
1311
github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=
1412
github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
1513
github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec=
@@ -42,8 +40,6 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
4240
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
4341
github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
4442
github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
45-
github.com/go-viper/mapstructure/v2 v2.3.0 h1:27XbWsHIqhbdR5TIC911OfYvgSaW93HM+dX7970Q7jk=
46-
github.com/go-viper/mapstructure/v2 v2.3.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
4743
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
4844
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
4945
github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -220,6 +216,8 @@ golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
220216
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
221217
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
222218
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
219+
golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
220+
golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
223221
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
224222
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
225223
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=

‎internal/subproviders/morpheus/datasources/network/datasource.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ func getNetworkByID(
8181

8282
state.Id = types.Int64Value(id)
8383
state.Name = convert.StrToType(net.Name)
84-
state.DisplayName = convert.StrToType(net.DisplayName)
84+
state.DisplayName = convert.StrToType(net.DisplayName.Get())
8585
state.Description = convert.StrToType(net.Description.Get())
86-
state.Cidr = convert.StrToType(net.Cidr)
86+
state.Cidr = convert.StrToType(net.Cidr.Get())
8787
state.Active = convert.BoolToType(net.Active)
8888
state.Visibility = convert.StrToType(net.Visibility)
8989

0 commit comments

Comments
 (0)