Skip to content

Commit ac7cc04

Browse files
gracewilcoxgracewilcox
authored
[keyvault] fix test recording sanitizers (#22911)
1 parent 276cf8c commit ac7cc04

File tree

28 files changed

+247
-289
lines changed

28 files changed

+247
-289
lines changed

‎sdk/security/keyvault/azadmin/assets.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "go",
44
"TagPrefix": "go/security/keyvault/azadmin",
5-
"Tag": "go/security/keyvault/azadmin_71b7c99818"
5+
"Tag": "go/security/keyvault/azadmin_634a3b12f7"
66
}

‎sdk/security/keyvault/azadmin/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.18
55
require (
66
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1
77
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2
8-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.7.0
8+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0
99
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.1.0
1010
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.1
1111
github.com/google/uuid v1.6.0
@@ -20,9 +20,9 @@ require (
2020
github.com/kylelemons/godebug v1.1.0 // indirect
2121
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
2222
github.com/pmezard/go-difflib v1.0.0 // indirect
23-
golang.org/x/crypto v0.23.0 // indirect
24-
golang.org/x/net v0.25.0 // indirect
25-
golang.org/x/sys v0.20.0 // indirect
26-
golang.org/x/text v0.15.0 // indirect
23+
golang.org/x/crypto v0.24.0 // indirect
24+
golang.org/x/net v0.26.0 // indirect
25+
golang.org/x/sys v0.21.0 // indirect
26+
golang.org/x/text v0.16.0 // indirect
2727
gopkg.in/yaml.v3 v3.0.1 // indirect
2828
)

‎sdk/security/keyvault/azadmin/go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 h1:E+OJmp2tPvt1W+amx48v1eqb
22
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1/go.mod h1:a6xsAQUZg+VsS3TJ05SRp524Hs4pZ/AeFSr5ENf0Yjo=
33
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2 h1:FDif4R1+UUR+00q6wquyX90K7A8dN+R5E8GEadoP7sU=
44
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2/go.mod h1:aiYBYui4BJ/BJCAIKs92XiPyQfTaBWqvHujDwKb6CBU=
5-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.7.0 h1:rTfKOCZGy5ViVrlA74ZPE99a+SgoEE2K/yg3RyW9dFA=
6-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.7.0/go.mod h1:4OG6tQ9EOP/MT0NMjDlRzWoVFxfu9rN9B2X+tlSVktg=
5+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 h1:jBQA3cKT4L2rWMpgE7Yt3Hwh2aUj8KXjIGLxjHeYNNo=
6+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0/go.mod h1:4OG6tQ9EOP/MT0NMjDlRzWoVFxfu9rN9B2X+tlSVktg=
77
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.1.0 h1:DRiANoJTiW6obBQe3SqZizkuV1PEgfiiGivmVocDy64=
88
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.1.0/go.mod h1:qLIye2hwb/ZouqhpSD9Zn3SJipvpEnz1Ywl3VUk9Y0s=
99
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.1 h1:9fXQS/0TtQmKXp8SureKouF+idbQvp7cPUxykiohnBs=
@@ -29,15 +29,15 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
2929
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
3030
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
3131
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
32-
golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
33-
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
34-
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
35-
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
32+
golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
33+
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
34+
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
35+
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
3636
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
37-
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
38-
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
39-
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
40-
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
37+
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
38+
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
39+
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
40+
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
4141
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
4242
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
4343
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

‎sdk/security/keyvault/azadmin/rbac/client_test.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ import (
2020
)
2121

2222
func TestRoleDefinition(t *testing.T) {
23-
if recording.GetRecordMode() == recording.PlaybackMode {
24-
t.Skip("https://github.com/Azure/azure-sdk-for-go/issues/22869")
25-
}
2623
client := startAccessControlTest(t)
2724

2825
var name, roleName string
@@ -139,9 +136,6 @@ func TestDeleteRoleDefinition_FailureInvalidRole(t *testing.T) {
139136
}
140137

141138
func TestRoleAssignment(t *testing.T) {
142-
if recording.GetRecordMode() == recording.PlaybackMode {
143-
t.Skip("https://github.com/Azure/azure-sdk-for-go/issues/22869")
144-
}
145139
client := startAccessControlTest(t)
146140

147141
var name, principalID, roleDefinitionID string
@@ -167,9 +161,14 @@ func TestRoleAssignment(t *testing.T) {
167161
require.NoError(t, err)
168162
require.Equal(t, name, *createdAssignment.Name)
169163
require.Equal(t, scope, *createdAssignment.Properties.Scope)
170-
require.Equal(t, principalID, *createdAssignment.Properties.PrincipalID)
171164
require.Equal(t, roleDefinitionID, *createdAssignment.Properties.RoleDefinitionID)
172165

166+
if recording.GetRecordMode() == recording.PlaybackMode {
167+
require.Equal(t, "00000000-0000-0000-0000-000000000000", *createdAssignment.Properties.PrincipalID)
168+
} else {
169+
require.Equal(t, principalID, *createdAssignment.Properties.PrincipalID)
170+
}
171+
173172
// test if able to get role assignment
174173
gotAssignment, err := client.GetRoleAssignment(context.Background(), scope, name, nil)
175174
require.NoError(t, err)

‎sdk/security/keyvault/azadmin/rbac/utils_test.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,16 @@ func run(m *testing.M) int {
6666

6767
hsmURL = getEnvVar("AZURE_MANAGEDHSM_URL", fakeHsmURL)
6868

69+
if recording.GetRecordMode() != recording.LiveMode {
70+
err := recording.RemoveRegisteredSanitizers([]string{
71+
"AZSDK3493", // name in body
72+
"AZSDK3430", // ID in body
73+
}, nil)
74+
if err != nil {
75+
panic(err)
76+
}
77+
}
78+
6979
return m.Run()
7080
}
7181

‎sdk/security/keyvault/azadmin/settings/client_test.go‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,15 @@ import (
2020
)
2121

2222
func TestGetSetting(t *testing.T) {
23-
if recording.GetRecordMode() == recording.PlaybackMode {
24-
t.Skip("https://github.com/Azure/azure-sdk-for-go/issues/22869")
25-
}
2623
client := startSettingsTest(t)
24+
2725
settingName := "AllowKeyManagementOperationsThroughARM"
2826

2927
res, err := client.GetSetting(context.Background(), settingName, nil)
3028
require.NoError(t, err)
3129
require.NotNil(t, res)
32-
require.Equal(t, *res.Name, settingName)
33-
require.Equal(t, *res.Type, settings.SettingTypeBoolean)
30+
require.Equal(t, settingName, *res.Name)
31+
require.Equal(t, settings.SettingTypeBoolean, *res.Type)
3432
require.NotNil(t, res.Value)
3533
testSerde(t, &res)
3634
}
@@ -71,10 +69,8 @@ func TestGetSettings(t *testing.T) {
7169
}
7270

7371
func TestUpdateSetting(t *testing.T) {
74-
if recording.GetRecordMode() == recording.PlaybackMode {
75-
t.Skip("https://github.com/Azure/azure-sdk-for-go/issues/22869")
76-
}
7772
client := startSettingsTest(t)
73+
7874
settingName := "AllowKeyManagementOperationsThroughARM"
7975
var updatedBool string
8076

‎sdk/security/keyvault/azadmin/settings/utils_test.go‎

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ package settings_test
99
import (
1010
"context"
1111
"encoding/json"
12-
"fmt"
1312
"os"
1413
"regexp"
1514
"testing"
@@ -54,9 +53,9 @@ func run(m *testing.M) int {
5453
if recording.GetRecordMode() == recording.PlaybackMode {
5554
credential = &FakeCredential{}
5655
} else {
57-
tenantID := lookupEnvVar("AZADMIN_TENANT_ID")
58-
clientID := lookupEnvVar("AZADMIN_CLIENT_ID")
59-
secret := lookupEnvVar("AZADMIN_CLIENT_SECRET")
56+
tenantID := getEnvVar("AZADMIN_TENANT_ID", "")
57+
clientID := getEnvVar("AZADMIN_CLIENT_ID", "")
58+
secret := getEnvVar("AZADMIN_CLIENT_SECRET", "")
6059
var err error
6160
credential, err = azidentity.NewClientSecretCredential(tenantID, clientID, secret, nil)
6261
if err != nil {
@@ -66,6 +65,15 @@ func run(m *testing.M) int {
6665

6766
hsmURL = getEnvVar("AZURE_MANAGEDHSM_URL", fakeHsmURL)
6867

68+
if recording.GetRecordMode() != recording.LiveMode {
69+
err := recording.RemoveRegisteredSanitizers([]string{
70+
"AZSDK3493", // name in body
71+
}, nil)
72+
if err != nil {
73+
panic(err)
74+
}
75+
}
76+
6977
return m.Run()
7078
}
7179

@@ -88,26 +96,25 @@ func startSettingsTest(t *testing.T) *settings.Client {
8896
return client
8997
}
9098

91-
func getEnvVar(lookupValue string, fakeValue string) string {
92-
envVar := fakeValue
93-
if recording.GetRecordMode() != recording.PlaybackMode {
94-
envVar = lookupEnvVar(lookupValue)
99+
func getEnvVar(envVar string, fakeValue string) string {
100+
// get value
101+
value := fakeValue
102+
if recording.GetRecordMode() == recording.LiveMode || recording.GetRecordMode() == recording.RecordingMode {
103+
value = os.Getenv(envVar)
104+
if value == "" {
105+
panic("no value for " + envVar)
106+
}
95107
}
96-
if recording.GetRecordMode() == recording.RecordingMode {
97-
err := recording.AddGeneralRegexSanitizer(fakeValue, envVar, nil)
108+
109+
// sanitize value
110+
if fakeValue != "" && recording.GetRecordMode() == recording.RecordingMode {
111+
err := recording.AddGeneralRegexSanitizer(fakeValue, value, nil)
98112
if err != nil {
99113
panic(err)
100114
}
101115
}
102-
return envVar
103-
}
104116

105-
func lookupEnvVar(s string) string {
106-
v := os.Getenv(s)
107-
if v == "" {
108-
panic(fmt.Sprintf("Could not find env var: '%s'", s))
109-
}
110-
return v
117+
return value
111118
}
112119

113120
type FakeCredential struct{}

‎sdk/security/keyvault/azcertificates/assets.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "go",
44
"TagPrefix": "go/security/keyvault/azcertificates",
5-
"Tag": "go/security/keyvault/azcertificates_d675d8f502"
5+
"Tag": "go/security/keyvault/azcertificates_0978442583"
66
}

‎sdk/security/keyvault/azcertificates/client_test.go‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,6 @@ func TestBackupRestore(t *testing.T) {
138138
}
139139

140140
func TestContactsCRUD(t *testing.T) {
141-
if recording.GetRecordMode() == recording.PlaybackMode {
142-
t.Skip("https://github.com/Azure/azure-sdk-for-go/issues/22869")
143-
}
144141
client := startTest(t)
145142

146143
contacts := azcertificates.Contacts{ContactList: []*azcertificates.Contact{
@@ -160,9 +157,6 @@ func TestContactsCRUD(t *testing.T) {
160157
}
161158

162159
func TestCRUD(t *testing.T) {
163-
if recording.GetRecordMode() == recording.PlaybackMode {
164-
t.Skip("https://github.com/Azure/azure-sdk-for-go/issues/22869")
165-
}
166160
client := startTest(t)
167161

168162
certName := getName(t, "")
@@ -225,9 +219,6 @@ func TestCRUD(t *testing.T) {
225219
}
226220

227221
func TestDeleteRecover(t *testing.T) {
228-
if recording.GetRecordMode() == recording.PlaybackMode {
229-
t.Skip("https://github.com/Azure/azure-sdk-for-go/issues/22869")
230-
}
231222
client := startTest(t)
232223
certName := getName(t, "")
233224
createParams := azcertificates.CreateCertificateParameters{CertificatePolicy: &selfSignedPolicy}
@@ -322,9 +313,6 @@ func TestID(t *testing.T) {
322313
}
323314

324315
func TestImportCertificate(t *testing.T) {
325-
if recording.GetRecordMode() == recording.PlaybackMode {
326-
t.Skip("https://github.com/Azure/azure-sdk-for-go/issues/22869")
327-
}
328316
client := startTest(t)
329317
certName := getName(t, "")
330318
importParams := azcertificates.ImportCertificateParameters{
@@ -411,9 +399,6 @@ func TestIssuerCRUD(t *testing.T) {
411399
}
412400

413401
func TestListCertificates(t *testing.T) {
414-
if recording.GetRecordMode() == recording.PlaybackMode {
415-
t.Skip("https://github.com/Azure/azure-sdk-for-go/issues/22869")
416-
}
417402
client := startTest(t)
418403

419404
tag := getName(t, "")
@@ -479,9 +464,6 @@ func TestListCertificates(t *testing.T) {
479464
}
480465

481466
func TestListCertificateVersions(t *testing.T) {
482-
if recording.GetRecordMode() == recording.PlaybackMode {
483-
t.Skip("https://github.com/Azure/azure-sdk-for-go/issues/22869")
484-
}
485467
client := startTest(t)
486468

487469
name := getName(t, "")
@@ -617,9 +599,6 @@ func TestOperationCRUD(t *testing.T) {
617599
}
618600

619601
func TestUpdateCertificatePolicy(t *testing.T) {
620-
if recording.GetRecordMode() == recording.PlaybackMode {
621-
t.Skip("https://github.com/Azure/azure-sdk-for-go/issues/22869")
622-
}
623602
client := startTest(t)
624603

625604
certName := getName(t, "")

‎sdk/security/keyvault/azcertificates/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.18
55
require (
66
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1
77
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2
8-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.7.0
8+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0
99
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.1
1010
github.com/stretchr/testify v1.9.0
1111
)
@@ -19,9 +19,9 @@ require (
1919
github.com/kylelemons/godebug v1.1.0 // indirect
2020
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
2121
github.com/pmezard/go-difflib v1.0.0 // indirect
22-
golang.org/x/crypto v0.22.0 // indirect
23-
golang.org/x/net v0.24.0 // indirect
24-
golang.org/x/sys v0.19.0 // indirect
25-
golang.org/x/text v0.14.0 // indirect
22+
golang.org/x/crypto v0.24.0 // indirect
23+
golang.org/x/net v0.26.0 // indirect
24+
golang.org/x/sys v0.21.0 // indirect
25+
golang.org/x/text v0.16.0 // indirect
2626
gopkg.in/yaml.v3 v3.0.1 // indirect
2727
)

0 commit comments

Comments
 (0)