Skip to content

Commit a24e76e

Browse files
committed
unit tests: fix breakage caused by client-go & apimachinery bump
Changes in the apimachinery and client-go packages broke our unit tests after upgrade. client-go stopped serializing the empty preferences: {} field for the kubeconfig. apimachinery, with kubernetes/apimachinery@c58e197 caused much more extensive breakage by changing the format with which errors are returned, and our unit tests hard code the expected error messages. For the most part, I used claude to fix these issues, and here is the summary it created: Changes Made Root Cause: The k8s apimachinery package (errors.go:93-96) now uses json.Marshal() to format BadValue in error messages instead of Go's native format. Error Format Changes: Arrays: []string{"a", "b"} → ["a","b"] (JSON format, no spaces) Nil values: []string(nil) → null Structs: aws.Subnet{ID:"x", Roles:...} → {"id":"x"} (JSON with lowercase keys) Custom types: gcp.OSImage{Name:"x", Project:"y"} → {"name":"x","project":"y"}
1 parent 587e814 commit a24e76e

File tree

20 files changed

+54
-70
lines changed

20 files changed

+54
-70
lines changed

pkg/asset/agent/image/oc_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ func TestGetIcspContents(t *testing.T) {
2828
Mirrors: []string{"virthost.ostest.test.metalkube.org:5000/localimages/local-release-image"},
2929
},
3030
},
31-
expectedConfig: "apiVersion: operator.openshift.io/v1alpha1\nkind: ImageContentSourcePolicy\nmetadata:\n creationTimestamp: null\n name: image-policy\nspec:\n repositoryDigestMirrors:\n - mirrors:\n - virthost.ostest.test.metalkube.org:5000/localimages/local-release-image\n source: registry.ci.openshift.org/ocp/release\n - mirrors:\n - virthost.ostest.test.metalkube.org:5000/localimages/local-release-image\n source: quay.io/openshift-release-dev/ocp-v4.0-art-dev\n",
31+
expectedConfig: "apiVersion: operator.openshift.io/v1alpha1\nkind: ImageContentSourcePolicy\nmetadata:\n name: image-policy\nspec:\n repositoryDigestMirrors:\n - mirrors:\n - virthost.ostest.test.metalkube.org:5000/localimages/local-release-image\n source: registry.ci.openshift.org/ocp/release\n - mirrors:\n - virthost.ostest.test.metalkube.org:5000/localimages/local-release-image\n source: quay.io/openshift-release-dev/ocp-v4.0-art-dev\n",
3232
expectedError: "",
3333
},
3434
{
3535
name: "empty-config",
3636
mirrorConfig: []mirror.RegistriesConfig{},
37-
expectedConfig: "apiVersion: operator.openshift.io/v1alpha1\nkind: ImageContentSourcePolicy\nmetadata:\n creationTimestamp: null\n name: image-policy\nspec:\n repositoryDigestMirrors: []\n",
37+
expectedConfig: "apiVersion: operator.openshift.io/v1alpha1\nkind: ImageContentSourcePolicy\nmetadata:\n name: image-policy\nspec:\n repositoryDigestMirrors: []\n",
3838
expectedError: "",
3939
},
4040
}

pkg/asset/agent/installconfig_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ platform:
655655
pullSecret: "{\"auths\":{\"example.com\":{\"auth\":\"c3VwZXItc2VjcmV0Cg==\"}}}"
656656
`,
657657
expectedFound: false,
658-
expectedError: `invalid install-config configuration: [platform.vsphere.apiVIPs: Invalid value: []string{"192.168.122.10", "192.168.122.11"}: If two API VIPs are given, one must be an IPv4 address, the other an IPv6, platform.vsphere.ingressVIPs: Invalid value: []string{"192.168.122.12", "192.168.122.13"}: If two Ingress VIPs are given, one must be an IPv4 address, the other an IPv6]`,
658+
expectedError: `invalid install-config configuration: [platform.vsphere.apiVIPs: Invalid value: {"192.168.122.10", "192.168.122.11"}: If two API VIPs are given, one must be an IPv4 address, the other an IPv6, platform.vsphere.ingressVIPs: Invalid value: []string{"192.168.122.12", "192.168.122.13"}: If two Ingress VIPs are given, one must be an IPv4 address, the other an IPv6]`,
659659
},
660660
{
661661
name: "api and ingress vips must belong to primary machine network's family for dual stack ipv4/v6",

pkg/asset/agent/joiner/addnodesconfig_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ sshKey: "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAklOUpkDHrfHY17SbrmTIpNLTGK9Tjom/BWD
4646
- name: eth0
4747
macAddress: 00:ef:29:72:b9:771
4848
sshKey: "not a valid ssh key"`,
49-
expectedError: "sshKey: Invalid value: \"not a valid ssh key\": ssh: no key found",
49+
expectedError: "sshKey: Invalid value: \"not a valid ssh key\": ssh: no key found; last parsing error for ignored line: illegal base64 data at input byte 4",
5050
},
5151
}
5252
for _, tc := range cases {

pkg/asset/installconfig/aws/validation_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ func TestValidate(t *testing.T) {
370370
Public: validSubnets("public"),
371371
VpcID: validVPCID,
372372
},
373-
expectErr: `^\[platform\.aws\.vpc\.subnets: Invalid value: \[\]aws\.Subnet\{aws\.Subnet\{ID:\"subnet-valid-public-a\", Roles:\[\]aws\.SubnetRole\(nil\)\}, aws\.Subnet\{ID:\"subnet-valid-public-b\", Roles:\[\]aws\.SubnetRole\(nil\)\}, aws\.Subnet\{ID:\"subnet-valid-public-c\", Roles:\[\]aws\.SubnetRole\(nil\)\}\}: no private subnets found, controlPlane\.platform\.aws\.zones: Invalid value: \[\]string\{\"a\", \"b\", \"c\"\}: No subnets provided for zones \[a b c\], compute\[0\]\.platform\.aws\.zones: Invalid value: \[\]string\{\"a\", \"b\", \"c\"\}: No subnets provided for zones \[a b c\]\]$`,
373+
expectErr: `^\[platform\.aws\.vpc\.subnets: Invalid value: \[{"id":"subnet-valid-public-a"},{"id":"subnet-valid-public-b"},{"id":"subnet-valid-public-c"}\]: no private subnets found, controlPlane\.platform\.aws\.zones: Invalid value: \[\"a\",\"b\",\"c\"]: No subnets provided for zones \[a b c\], compute\[0\]\.platform\.aws\.zones: Invalid value: \[\"a\",\"b\",\"c\"]: No subnets provided for zones \[a b c\]\]$`,
374374
},
375375
{
376376
name: "invalid byo subnets, no public subnets",
@@ -384,7 +384,7 @@ func TestValidate(t *testing.T) {
384384
Private: validSubnets("private"),
385385
VpcID: validVPCID,
386386
},
387-
expectErr: `^platform\.aws\.vpc\.subnets: Invalid value: \[\]aws\.Subnet\{aws\.Subnet\{ID:\"subnet-valid-private-a\", Roles:\[\]aws\.SubnetRole\(nil\)\}, aws\.Subnet\{ID:\"subnet-valid-private-b\", Roles:\[\]aws\.SubnetRole\(nil\)\}, aws\.Subnet\{ID:\"subnet-valid-private-c\", Roles:\[\]aws\.SubnetRole\(nil\)\}\}: No public subnet provided for zones \[a b c\]$`,
387+
expectErr: `^platform\.aws\.vpc\.subnets: Invalid value: \[{"id":"subnet-valid-private-a"},{"id":"subnet-valid-private-b"},{"id":"subnet-valid-private-c"}\]: No public subnet provided for zones \[a b c\]$`,
388388
},
389389
{
390390
name: "invalid byo subnets, invalid cidr does not belong to machine CIDR",
@@ -426,7 +426,7 @@ func TestValidate(t *testing.T) {
426426
Public: validSubnets("public"),
427427
VpcID: validVPCID,
428428
},
429-
expectErr: `^platform\.aws\.vpc\.subnets: Invalid value: \[\]aws\.Subnet\{aws\.Subnet\{ID:\"subnet-valid-private-a\", Roles:\[\]aws\.SubnetRole\(nil\)\}, aws\.Subnet\{ID:\"subnet-valid-private-b\", Roles:\[\]aws\.SubnetRole\(nil\)\}, aws\.Subnet\{ID:\"subnet-valid-private-c\", Roles:\[\]aws\.SubnetRole\(nil\)\}, aws\.Subnet\{ID:\"subnet-valid-public-a\", Roles:\[\]aws\.SubnetRole\(nil\)\}, aws\.Subnet\{ID:\"subnet-valid-public-b\", Roles:\[\]aws\.SubnetRole\(nil\)\}, aws\.Subnet\{ID:\"subnet-valid-public-c\", Roles:\[\]aws\.SubnetRole\(nil\)\}, aws\.Subnet\{ID:\"no-matching-public-private-zone\", Roles:\[\]aws\.SubnetRole\(nil\)\}\}: No public subnet provided for zones \[f\]$`,
429+
expectErr: `^platform\.aws\.vpc\.subnets: Invalid value: \[{"id":"subnet-valid-private-a"},{"id":"subnet-valid-private-b"},{"id":"subnet-valid-private-c"},{"id":"subnet-valid-public-a"},{"id":"subnet-valid-public-b"},{"id":"subnet-valid-public-c"},{"id":"no-matching-public-private-zone"}\]: No public subnet provided for zones \[f\]$`,
430430
},
431431
{
432432
name: "invalid byo subnets with no roles, multiple private in same zone",
@@ -516,7 +516,7 @@ func TestValidate(t *testing.T) {
516516
Edge: validSubnets("edge"),
517517
VpcID: validVPCID,
518518
},
519-
expectErr: `^\[platform\.aws\.vpc\.subnets: Invalid value: \[\]aws\.Subnet\{aws\.Subnet\{ID:\"subnet-valid-public-edge-a\", Roles:\[\]aws\.SubnetRole\(nil\)\}, aws\.Subnet\{ID:\"subnet-valid-public-edge-b\", Roles:\[\]aws\.SubnetRole\(nil\)\}, aws\.Subnet\{ID:\"subnet-valid-public-edge-c\", Roles:\[\]aws\.SubnetRole\(nil\)\}\}: no private subnets found, controlPlane\.platform\.aws\.zones: Invalid value: \[\]string\{\"a\", \"b\", \"c\"\}: No subnets provided for zones \[a b c\], compute\[0\]\.platform\.aws\.zones: Invalid value: \[\]string\{\"a\", \"b\", \"c\"\}: No subnets provided for zones \[a b c\]\]$`,
519+
expectErr: `^\[platform\.aws\.vpc\.subnets: Invalid value: \[{"id":"subnet-valid-public-edge-a"},{"id":"subnet-valid-public-edge-b"},{"id":"subnet-valid-public-edge-c"}\]: no private subnets found, controlPlane\.platform\.aws\.zones: Invalid value: \[\"a\",\"b\",\"c\"]: No subnets provided for zones \[a b c\], compute\[0\]\.platform\.aws\.zones: Invalid value: \[\"a\",\"b\",\"c\"]: No subnets provided for zones \[a b c\]\]$`,
520520
},
521521
{
522522
name: "invalid byo subnets, no subnet for control plane zones",
@@ -531,7 +531,7 @@ func TestValidate(t *testing.T) {
531531
Public: validSubnets("public"),
532532
VpcID: validVPCID,
533533
},
534-
expectErr: `^controlPlane\.platform\.aws\.zones: Invalid value: \[\]string{\"a\", \"b\", \"c\", \"d\", \"e\"}: No subnets provided for zones \[d e\]$`,
534+
expectErr: `^controlPlane\.platform\.aws\.zones: Invalid value: \[\"a\",\"b\",\"c\",\"d\",\"e\"\]: No subnets provided for zones \[d e\]$`,
535535
},
536536
{
537537
name: "invalid byo subnets, no subnet for compute[0] zones",
@@ -546,7 +546,7 @@ func TestValidate(t *testing.T) {
546546
Public: validSubnets("public"),
547547
VpcID: validVPCID,
548548
},
549-
expectErr: `^compute\[0\]\.platform\.aws\.zones: Invalid value: \[\]string{\"a\", \"b\", \"c\", \"d\"}: No subnets provided for zones \[d\]$`,
549+
expectErr: `^compute\[0\]\.platform\.aws\.zones: Invalid value: \[\"a\",\"b\",\"c\",\"d\"\]: No subnets provided for zones \[d\]$`,
550550
},
551551
{
552552
name: "invalid byo subnets, no subnet for compute zone",
@@ -569,7 +569,7 @@ func TestValidate(t *testing.T) {
569569
Public: validSubnets("public"),
570570
VpcID: validVPCID,
571571
},
572-
expectErr: `^\[compute\[0\]\.platform\.aws\.zones: Invalid value: \[\]string{\"a\", \"b\", \"c\", \"d\"}: No subnets provided for zones \[d\], compute\[1\]\.platform\.aws\.zones: Invalid value: \[\]string{\"a\", \"b\", \"e\"}: No subnets provided for zones \[e\]\]$`,
572+
expectErr: `^\[compute\[0\]\.platform\.aws\.zones: Invalid value: \[\"a\",\"b\",\"c\",\"d\"\]: No subnets provided for zones \[d\], compute\[1\]\.platform\.aws\.zones: Invalid value: \[\"a\",\"b\",\"e\"\]: No subnets provided for zones \[e\]\]$`,
573573
},
574574
{
575575
name: "valid byo subnets, private and public subnets provided for public-only subnets cluster",
@@ -611,7 +611,7 @@ func TestValidate(t *testing.T) {
611611
VpcID: validVPCID,
612612
},
613613
publicOnly: true,
614-
expectErr: `^\Q[platform.aws.vpc.subnets: Required value: public subnets are required for a public-only subnets cluster, platform.aws.vpc.subnets: Invalid value: []aws.Subnet{aws.Subnet{ID:"subnet-valid-private-a", Roles:[]aws.SubnetRole(nil)}, aws.Subnet{ID:"subnet-valid-private-b", Roles:[]aws.SubnetRole(nil)}, aws.Subnet{ID:"subnet-valid-private-c", Roles:[]aws.SubnetRole(nil)}}: No public subnet provided for zones [a b c]]\E$`,
614+
expectErr: `^\Q[platform.aws.vpc.subnets: Required value: public subnets are required for a public-only subnets cluster, platform.aws.vpc.subnets: Invalid value: [{"id":"subnet-valid-private-a"},{"id":"subnet-valid-private-b"},{"id":"subnet-valid-private-c"}]: No public subnet provided for zones [a b c]]\E$`,
615615
},
616616
{
617617
name: "invalid byo subnets, internal publish method for public-only subnets install",

pkg/asset/installconfig/azure/validation_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,7 @@ func TestAzureDiskEncryptionSet(t *testing.T) {
806806
{
807807
name: "Invalid disk encryption set for default pool",
808808
edits: editFunctions{invalidDiskEncryptionSetDefaultMachinePlatform},
809-
errorMsg: fmt.Sprintf(`^platform.azure.defaultMachinePlatform.osDisk.diskEncryptionSet: Invalid value: azure.DiskEncryptionSet{SubscriptionID:"%s", ResourceGroup:"%s", Name:"%s"}: failed to get disk encryption set$`, validDiskEncryptionSetSubscriptionID, validDiskEncryptionSetResourceGroup, invalidDiskEncryptionSetName),
809+
errorMsg: fmt.Sprintf(`^platform.azure.defaultMachinePlatform.osDisk.diskEncryptionSet: Invalid value: {"subscriptionId":"%s","resourceGroup":"%s","name":"%s"}: failed to get disk encryption set$`, validDiskEncryptionSetSubscriptionID, validDiskEncryptionSetResourceGroup, invalidDiskEncryptionSetName),
810810
},
811811
{
812812
name: "Valid disk encryption set for control-plane",
@@ -816,7 +816,7 @@ func TestAzureDiskEncryptionSet(t *testing.T) {
816816
{
817817
name: "Invalid disk encryption set for control-plane",
818818
edits: editFunctions{invalidDiskEncryptionSetControlPlane},
819-
errorMsg: fmt.Sprintf(`^platform.azure.osDisk.diskEncryptionSet: Invalid value: azure.DiskEncryptionSet{SubscriptionID:"%s", ResourceGroup:"%s", Name:"%s"}: failed to get disk encryption set$`, validDiskEncryptionSetSubscriptionID, validDiskEncryptionSetResourceGroup, invalidDiskEncryptionSetName),
819+
errorMsg: fmt.Sprintf(`^platform.azure.osDisk.diskEncryptionSet: Invalid value: {"subscriptionId":"%s","resourceGroup":"%s","name":"%s"}: failed to get disk encryption set$`, validDiskEncryptionSetSubscriptionID, validDiskEncryptionSetResourceGroup, invalidDiskEncryptionSetName),
820820
},
821821
{
822822
name: "Valid disk encryption set for compute",
@@ -826,7 +826,7 @@ func TestAzureDiskEncryptionSet(t *testing.T) {
826826
{
827827
name: "Invalid disk encryption set for compute",
828828
edits: editFunctions{invalidDiskEncryptionSetCompute},
829-
errorMsg: fmt.Sprintf(`^compute\[0\].platform.azure.osDisk.diskEncryptionSet: Invalid value: azure.DiskEncryptionSet{SubscriptionID:"%s", ResourceGroup:"%s", Name:"%s"}: failed to get disk encryption set$`, validDiskEncryptionSetSubscriptionID, validDiskEncryptionSetResourceGroup, invalidDiskEncryptionSetName),
829+
errorMsg: fmt.Sprintf(`^compute\[0\].platform.azure.osDisk.diskEncryptionSet: Invalid value: {"subscriptionId":"%s","resourceGroup":"%s","name":"%s"}: failed to get disk encryption set$`, validDiskEncryptionSetSubscriptionID, validDiskEncryptionSetResourceGroup, invalidDiskEncryptionSetName),
830830
},
831831
}
832832

@@ -871,12 +871,12 @@ func TestAzureSecurityProfileDiskEncryptionSet(t *testing.T) {
871871
{
872872
name: "Invalid security profile disk encryption set not found for default pool",
873873
edits: editFunctions{invalidConfidentialVMDiskEncryptionSetDefaultMachinePlatform},
874-
errorMsg: fmt.Sprintf(`^platform.azure.defaultMachinePlatform.osDisk.securityProfile.diskEncryptionSet: Invalid value: azure.DiskEncryptionSet{SubscriptionID:"%s", ResourceGroup:"%s", Name:"%s"}: failed to get disk encryption set$`, validDiskEncryptionSetSubscriptionID, validDiskEncryptionSetResourceGroup, invalidDiskEncryptionSetName),
874+
errorMsg: fmt.Sprintf(`^platform.azure.defaultMachinePlatform.osDisk.securityProfile.diskEncryptionSet: Invalid value: {"subscriptionId":"%s","resourceGroup":"%s","name":"%s"}: failed to get disk encryption set$`, validDiskEncryptionSetSubscriptionID, validDiskEncryptionSetResourceGroup, invalidDiskEncryptionSetName),
875875
},
876876
{
877877
name: "Invalid security profile disk encryption set with default encryption type for default pool",
878878
edits: editFunctions{invalidTypeConfidentialVMDiskEncryptionSetDefaultMachinePlatform},
879-
errorMsg: fmt.Sprintf(`^platform.azure.defaultMachinePlatform.osDisk.securityProfile.diskEncryptionSet: Invalid value: azure.DiskEncryptionSet{SubscriptionID:"%s", ResourceGroup:"%s", Name:"%s"}: the disk encryption set should be created with type %s$`, validDiskEncryptionSetSubscriptionID, validDiskEncryptionSetResourceGroup, validDiskEncryptionSetName, azenc.ConfidentialVMEncryptedWithCustomerKey),
879+
errorMsg: fmt.Sprintf(`^platform.azure.defaultMachinePlatform.osDisk.securityProfile.diskEncryptionSet: Invalid value: {"subscriptionId":"%s","resourceGroup":"%s","name":"%s"}: the disk encryption set should be created with type %s$`, validDiskEncryptionSetSubscriptionID, validDiskEncryptionSetResourceGroup, validDiskEncryptionSetName, azenc.ConfidentialVMEncryptedWithCustomerKey),
880880
},
881881
{
882882
name: "Valid security profile disk encryption set for control-plane",
@@ -886,12 +886,12 @@ func TestAzureSecurityProfileDiskEncryptionSet(t *testing.T) {
886886
{
887887
name: "Invalid security profile disk encryption set not found for control-plane",
888888
edits: editFunctions{invalidConfidentialVMDiskEncryptionSetControlPlane},
889-
errorMsg: fmt.Sprintf(`^platform.azure.osDisk.securityProfile.diskEncryptionSet: Invalid value: azure.DiskEncryptionSet{SubscriptionID:"%s", ResourceGroup:"%s", Name:"%s"}: failed to get disk encryption set$`, validDiskEncryptionSetSubscriptionID, validDiskEncryptionSetResourceGroup, invalidDiskEncryptionSetName),
889+
errorMsg: fmt.Sprintf(`^platform.azure.osDisk.securityProfile.diskEncryptionSet: Invalid value: {"subscriptionId":"%s","resourceGroup":"%s","name":"%s"}: failed to get disk encryption set$`, validDiskEncryptionSetSubscriptionID, validDiskEncryptionSetResourceGroup, invalidDiskEncryptionSetName),
890890
},
891891
{
892892
name: "Invalid security profile disk encryption set with default encryption type for control-plane",
893893
edits: editFunctions{invalidTypeConfidentialVMDiskEncryptionSetControlPlane},
894-
errorMsg: fmt.Sprintf(`^platform.azure.osDisk.securityProfile.diskEncryptionSet: Invalid value: azure.DiskEncryptionSet{SubscriptionID:"%s", ResourceGroup:"%s", Name:"%s"}: the disk encryption set should be created with type %s$`, validDiskEncryptionSetSubscriptionID, validDiskEncryptionSetResourceGroup, validDiskEncryptionSetName, azenc.ConfidentialVMEncryptedWithCustomerKey),
894+
errorMsg: fmt.Sprintf(`^platform.azure.osDisk.securityProfile.diskEncryptionSet: Invalid value: {"subscriptionId":"%s","resourceGroup":"%s","name":"%s"}: the disk encryption set should be created with type %s$`, validDiskEncryptionSetSubscriptionID, validDiskEncryptionSetResourceGroup, validDiskEncryptionSetName, azenc.ConfidentialVMEncryptedWithCustomerKey),
895895
},
896896
{
897897
name: "Valid security profile disk encryption set for compute",
@@ -901,12 +901,12 @@ func TestAzureSecurityProfileDiskEncryptionSet(t *testing.T) {
901901
{
902902
name: "Invalid security profile disk encryption set not found for compute",
903903
edits: editFunctions{invalidConfidentialVMDiskEncryptionSetCompute},
904-
errorMsg: fmt.Sprintf(`^compute\[0\].platform.azure.osDisk.securityProfile.diskEncryptionSet: Invalid value: azure.DiskEncryptionSet{SubscriptionID:"%s", ResourceGroup:"%s", Name:"%s"}: failed to get disk encryption set$`, validDiskEncryptionSetSubscriptionID, validDiskEncryptionSetResourceGroup, invalidDiskEncryptionSetName),
904+
errorMsg: fmt.Sprintf(`^compute\[0\].platform.azure.osDisk.securityProfile.diskEncryptionSet: Invalid value: {"subscriptionId":"%s","resourceGroup":"%s","name":"%s"}: failed to get disk encryption set$`, validDiskEncryptionSetSubscriptionID, validDiskEncryptionSetResourceGroup, invalidDiskEncryptionSetName),
905905
},
906906
{
907907
name: "Invalid security profile disk encryption set with default encryption type for compute",
908908
edits: editFunctions{invalidTypeConfidentialVMDiskEncryptionSetCompute},
909-
errorMsg: fmt.Sprintf(`^compute\[0\].platform.azure.osDisk.securityProfile.diskEncryptionSet: Invalid value: azure.DiskEncryptionSet{SubscriptionID:"%s", ResourceGroup:"%s", Name:"%s"}: the disk encryption set should be created with type %s$`, validDiskEncryptionSetSubscriptionID, validDiskEncryptionSetResourceGroup, validDiskEncryptionSetName, azenc.ConfidentialVMEncryptedWithCustomerKey),
909+
errorMsg: fmt.Sprintf(`^compute\[0\].platform.azure.osDisk.securityProfile.diskEncryptionSet: Invalid value: {"subscriptionId":"%s","resourceGroup":"%s","name":"%s"}: the disk encryption set should be created with type %s$`, validDiskEncryptionSetSubscriptionID, validDiskEncryptionSetResourceGroup, validDiskEncryptionSetName, azenc.ConfidentialVMEncryptedWithCustomerKey),
910910
},
911911
}
912912

0 commit comments

Comments
 (0)