Skip to content

Commit 061218e

Browse files
YuanMSFTYuanMSFT
authored
Add PlatformDiskId to VirtualHardDiskPropertie (#355)
1 parent 055784c commit 061218e

File tree

7 files changed

+60
-47
lines changed

7 files changed

+60
-47
lines changed

‎go.mod‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
module github.com/microsoft/moc-sdk-for-go
22

3-
go 1.23.0
3+
go 1.24.0
4+
5+
toolchain go1.24.7
46

57
require (
68
code.cloudfoundry.org/bytefmt v0.0.0-20210608160410-67692ebc98de
79
github.com/Azure/go-autorest/autorest v0.11.29
810
github.com/Azure/go-autorest/autorest/date v0.3.0
911
github.com/google/go-cmp v0.7.0
1012
github.com/google/uuid v1.6.0
11-
github.com/microsoft/moc v0.35.3
12-
google.golang.org/grpc v1.72.0
13+
github.com/microsoft/moc v0.35.4
14+
google.golang.org/grpc v1.75.1
1315
k8s.io/klog v1.0.0
1416
sigs.k8s.io/controller-runtime v0.20.4
1517
)
@@ -26,7 +28,7 @@ require (
2628
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
2729
github.com/fsnotify/fsnotify v1.7.0 // indirect
2830
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
29-
github.com/go-logr/logr v1.4.2 // indirect
31+
github.com/go-logr/logr v1.4.3 // indirect
3032
github.com/go-openapi/jsonpointer v0.21.0 // indirect
3133
github.com/go-openapi/jsonreference v0.20.2 // indirect
3234
github.com/go-openapi/swag v0.23.0 // indirect
@@ -60,15 +62,15 @@ require (
6062
github.com/stretchr/objx v0.5.2 // indirect
6163
github.com/subosito/gotenv v1.6.0 // indirect
6264
github.com/x448/float16 v0.8.4 // indirect
63-
golang.org/x/crypto v0.37.0 // indirect
64-
golang.org/x/net v0.39.0 // indirect
65-
golang.org/x/oauth2 v0.26.0 // indirect
66-
golang.org/x/sync v0.13.0 // indirect
65+
golang.org/x/crypto v0.39.0 // indirect
66+
golang.org/x/net v0.41.0 // indirect
67+
golang.org/x/oauth2 v0.30.0 // indirect
68+
golang.org/x/sync v0.17.0 // indirect
6769
golang.org/x/term v0.31.0 // indirect
68-
golang.org/x/text v0.24.0 // indirect
70+
golang.org/x/text v0.30.0 // indirect
6971
golang.org/x/time v0.7.0 // indirect
7072
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
71-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250428153025-10db94c68c34 // indirect
73+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251014184007-4626949a642f // indirect
7274
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7375
gopkg.in/inf.v0 v0.9.1 // indirect
7476
gopkg.in/ini.v1 v1.67.0 // indirect
@@ -94,8 +96,8 @@ require (
9496
github.com/stretchr/testify v1.9.0
9597
go.uber.org/multierr v1.11.0 // indirect
9698
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
97-
golang.org/x/sys v0.32.0 // indirect
98-
google.golang.org/protobuf v1.36.9
99+
golang.org/x/sys v0.33.0 // indirect
100+
google.golang.org/protobuf v1.36.10
99101
)
100102

101103
replace (

‎go.sum‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyT
4141
github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
4242
github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
4343
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
44-
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
45-
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
44+
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
45+
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
4646
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
4747
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
4848
github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
@@ -123,8 +123,8 @@ github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0V
123123
github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
124124
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
125125
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
126-
github.com/microsoft/moc v0.35.3 h1:FYdaYlbWJb/tpM3CH+iAmxePDNsbKLsWfTg7pbPrbsg=
127-
github.com/microsoft/moc v0.35.3/go.mod h1:UzCniwjpnp5sR/JsjAZtb3sTEh+S/qB6Kd67FQHpeD0=
126+
github.com/microsoft/moc v0.35.4 h1:TZ3tf/qCa23Ob7YLKTLJS85RUktB8UfYSjuusTMlVwE=
127+
github.com/microsoft/moc v0.35.4/go.mod h1:Z19DHc5ziqJ8BYKOw3RksDBH7vrdvxPw0PHrG+MzCtA=
128128
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
129129
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
130130
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -202,16 +202,16 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
202202
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
203203
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
204204
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
205-
go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
206-
go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
207-
go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
208-
go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
209-
go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
210-
go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
211-
go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk=
212-
go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=
213-
go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
214-
go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
205+
go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=
206+
go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=
207+
go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE=
208+
go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=
209+
go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI=
210+
go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg=
211+
go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFhbjxHHspCPc=
212+
go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps=
213+
go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
214+
go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
215215
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
216216
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
217217
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
@@ -242,8 +242,9 @@ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
242242
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
243243
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
244244
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
245-
golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
246245
golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
246+
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
247+
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
247248
golang.org/x/sys v0.0.0-20220823224334-20c2bfdbfe24 h1:TyKJRhyo17yWxOMCTHKWrc5rddHORMlnZ/j57umaUd8=
248249
golang.org/x/sys v0.0.0-20220823224334-20c2bfdbfe24/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
249250
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
@@ -253,8 +254,9 @@ golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
253254
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
254255
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
255256
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
256-
golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
257257
golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
258+
golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
259+
golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
258260
golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ=
259261
golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
260262
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -266,18 +268,20 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
266268
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
267269
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
268270
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
269-
golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
270-
golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
271+
golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE=
272+
golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w=
271273
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
272274
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
273275
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
274276
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
275277
gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
276278
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
277-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250428153025-10db94c68c34 h1:h6p3mQqrmT1XkHVTfzLdNz1u7IhINeZkz67/xTbOuWs=
278-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250428153025-10db94c68c34/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
279-
google.golang.org/grpc v1.72.0 h1:S7UkcVa60b5AAQTaO6ZKamFp1zMZSU0fGDK2WZLbBnM=
280-
google.golang.org/grpc v1.72.0/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
279+
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
280+
gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
281+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251014184007-4626949a642f h1:1FTH6cpXFsENbPR5Bu8NQddPSaUUE6NA2XdZdDSAJK4=
282+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251014184007-4626949a642f/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
283+
google.golang.org/grpc v1.75.1 h1:/ODCNEuf9VghjgO3rqLcfg8fiOP0nSluljWFlDxELLI=
284+
google.golang.org/grpc v1.75.1/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=
281285
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
282286
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
283287
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -286,8 +290,8 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
286290
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
287291
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
288292
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
289-
google.golang.org/protobuf v1.36.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7Iw=
290-
google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
293+
google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
294+
google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
291295
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
292296
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
293297
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎services/security/identity/identity_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ func Test_getWssdIdeneityValid(t *testing.T) {
127127
var err error
128128
_, err = getWssdIdentity(&expectedIdenityAutoRotateDisabled)
129129
if err != nil {
130-
t.Errorf(err.Error())
130+
t.Error(err.Error())
131131
}
132132
_, err = getWssdIdentity(&expectedIdenityAutoRotateEnabledEmptyPath)
133133
if err != nil {
134-
t.Errorf(err.Error())
134+
t.Error(err.Error())
135135
}
136136
if runtime.GOOS == "windows" {
137137
expectedIdenityAutoRotateEnabledAbsolutePath.LoginFilePath = &LoginFilePathAbsoluteWindows
@@ -140,7 +140,7 @@ func Test_getWssdIdeneityValid(t *testing.T) {
140140
}
141141
_, err = getWssdIdentity(&expectedIdenityAutoRotateEnabledAbsolutePath)
142142
if err != nil {
143-
t.Errorf(err.Error())
143+
t.Error(err.Error())
144144
}
145145
}
146146

‎services/security/role/role_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func Test_getMocRole(t *testing.T) {
124124

125125
mocRole, err := getMocRole(&expectedRole)
126126
if err != nil {
127-
t.Errorf(err.Error())
127+
t.Error(err.Error())
128128
}
129129

130130
if mocRole.Name != expectedMocRole.Name {
@@ -179,7 +179,7 @@ func Test_getRole(t *testing.T) {
179179

180180
role, err := getRole(&inputMocRole)
181181
if err != nil {
182-
t.Errorf(err.Error())
182+
t.Error(err.Error())
183183
}
184184

185185
if *role.ID != *outRole.ID {

‎services/security/roleassignment/roleassignment_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ var (
5858
func Test_getMocRoleAssignmentNoName(t *testing.T) {
5959
mocRA, err := getMocRoleAssignment(&expectedRA)
6060
if err != nil {
61-
t.Errorf(err.Error())
61+
t.Error(err.Error())
6262
}
6363
if err := compareMocRas(mocRA, &expectedMocRA); err != nil {
64-
t.Errorf(err.Error())
64+
t.Error(err.Error())
6565
}
6666
}
6767

@@ -73,11 +73,11 @@ func Test_getMocRoleAssignment(t *testing.T) {
7373

7474
mocRA, err := getMocRoleAssignment(&inputRA)
7575
if err != nil {
76-
t.Errorf(err.Error())
76+
t.Error(err.Error())
7777
}
7878

7979
if err := compareMocRas(mocRA, &outMocRA); err != nil {
80-
t.Errorf(err.Error())
80+
t.Error(err.Error())
8181
}
8282
}
8383

@@ -91,7 +91,7 @@ func Test_getRoleAssignmentNoName(t *testing.T) {
9191

9292
ra := getRoleAssignment(&inputMocRA)
9393
if err := compareRas(ra, &outRA); err != nil {
94-
t.Errorf(err.Error())
94+
t.Error(err.Error())
9595
}
9696
}
9797

@@ -105,7 +105,7 @@ func Test_getRoleAssignment(t *testing.T) {
105105

106106
ra := getRoleAssignment(&inputMocRA)
107107
if err := compareRas(ra, &outRA); err != nil {
108-
t.Errorf(err.Error())
108+
t.Error(err.Error())
109109
}
110110
}
111111

‎services/storage/storage.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ type VirtualHardDiskProperties struct {
4141
CloudInitDataSource common.CloudInitDataSource `json:"cloudInitDataSource,omitempty"`
4242
// Container name
4343
ContainerName *string `json:"containername,omitempty"`
44+
// PlatformDiskId of the VHD
45+
PlatformDiskId *string `json:"platformDiskId,omitempty"`
4446
}
4547

4648
// VirtualHardDisk defines the structure of a VHD

‎services/storage/virtualharddisk/virtualharddisk.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ func getWssdVirtualHardDisk(c *storage.VirtualHardDisk, groupName, containerName
6161
wssdvhd.DiskFileFormat = c.DiskFileFormat
6262

6363
wssdvhd.CloudInitDataSource = c.CloudInitDataSource
64+
65+
if c.PlatformDiskId != nil {
66+
wssdvhd.PlatformDiskId = *c.PlatformDiskId
67+
}
6468
}
6569
return wssdvhd, nil
6670
}
@@ -86,6 +90,7 @@ func getVirtualHardDisk(c *wssdcloudstorage.VirtualHardDisk, group string) *stor
8690
HyperVGeneration: c.HyperVGeneration,
8791
DiskFileFormat: c.DiskFileFormat,
8892
ContainerName: &c.ContainerName,
93+
PlatformDiskId: &c.PlatformDiskId,
8994
},
9095
Tags: tags.ProtoToMap(c.Tags),
9196
}

0 commit comments

Comments
 (0)