Skip to content

Commit 6e977ba

Browse files
gracewilcoxgracewilcox
authored
update azadmin test (#21305)
1 parent 4766d8b commit 6e977ba

File tree

6 files changed

+69
-93
lines changed

6 files changed

+69
-93
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_6b57e62028"
5+
"Tag": "go/security/keyvault/azadmin_1bb2140fc8"
66
}

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

Lines changed: 22 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -35,30 +35,6 @@ var (
3535
)
3636

3737
func TestMain(m *testing.M) {
38-
if recording.GetRecordMode() != recording.PlaybackMode {
39-
hsmURL = os.Getenv("AZURE_MANAGEDHSM_URL")
40-
blobURL = "https://" + os.Getenv("BLOB_STORAGE_ACCOUNT_NAME") + ".blob." + os.Getenv("KEYVAULT_STORAGE_ENDPOINT_SUFFIX") + "/" + os.Getenv("BLOB_CONTAINER_NAME")
41-
token = os.Getenv("BLOB_STORAGE_SAS_TOKEN")
42-
}
43-
if hsmURL == "" {
44-
if recording.GetRecordMode() != recording.PlaybackMode {
45-
panic("no value for AZURE_MANAGEDHSM_URL")
46-
}
47-
hsmURL = fakeHsmURL
48-
}
49-
if blobURL == "" {
50-
if recording.GetRecordMode() != recording.PlaybackMode {
51-
panic("no value for blob url")
52-
}
53-
blobURL = fakeBlobURL
54-
}
55-
if token == "" {
56-
if recording.GetRecordMode() != recording.PlaybackMode {
57-
panic("no value for BLOB_STORAGE_SAS_TOKEN")
58-
}
59-
token = fakeToken
60-
}
61-
6238
err := recording.ResetProxy(nil)
6339
if err != nil {
6440
panic(err)
@@ -74,25 +50,16 @@ func TestMain(m *testing.M) {
7450
panic(err)
7551
}
7652
}
53+
54+
hsmURL = getEnvVar("AZURE_MANAGEDHSM_URL", fakeHsmURL)
55+
blobURL = getEnvVar("BLOB_CONTAINER_URL", fakeBlobURL)
56+
token = getEnvVar("BLOB_STORAGE_SAS_TOKEN", fakeToken)
57+
7758
if recording.GetRecordMode() == recording.RecordingMode {
78-
err := recording.AddGeneralRegexSanitizer(fakeHsmURL, hsmURL, nil)
79-
if err != nil {
80-
panic(err)
81-
}
82-
err = recording.AddGeneralRegexSanitizer(fakeBlobURL, blobURL, nil)
83-
if err != nil {
84-
panic(err)
85-
}
8659
err = recording.AddBodyRegexSanitizer(fakeToken, `sv=[^"]*`, nil)
8760
if err != nil {
8861
panic(err)
8962
}
90-
defer func() {
91-
err := recording.ResetProxy(nil)
92-
if err != nil {
93-
panic(err)
94-
}
95-
}()
9663
}
9764
code := m.Run()
9865
os.Exit(code)
@@ -122,12 +89,26 @@ func startBackupTest(t *testing.T) (*backup.Client, backup.SASTokenParameters) {
12289
return client, sasToken
12390
}
12491

92+
func getEnvVar(lookupValue string, fakeValue string) string {
93+
envVar := fakeValue
94+
if recording.GetRecordMode() != recording.PlaybackMode {
95+
envVar = lookupEnvVar(lookupValue)
96+
}
97+
if recording.GetRecordMode() == recording.RecordingMode {
98+
err := recording.AddGeneralRegexSanitizer(fakeValue, envVar, nil)
99+
if err != nil {
100+
panic(err)
101+
}
102+
}
103+
return envVar
104+
}
105+
125106
func lookupEnvVar(s string) string {
126-
ret, ok := os.LookupEnv(s)
127-
if !ok {
107+
v := os.Getenv(s)
108+
if v == "" {
128109
panic(fmt.Sprintf("Could not find env var: '%s'", s))
129110
}
130-
return ret
111+
return v
131112
}
132113

133114
type FakeCredential struct{}

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

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,6 @@ var (
3131
)
3232

3333
func TestMain(m *testing.M) {
34-
if recording.GetRecordMode() != recording.PlaybackMode {
35-
hsmURL = os.Getenv("AZURE_MANAGEDHSM_URL")
36-
}
37-
if hsmURL == "" {
38-
if recording.GetRecordMode() != recording.PlaybackMode {
39-
panic("no value for AZURE_MANAGEDHSM_URL")
40-
}
41-
hsmURL = fakeHsmURL
42-
}
43-
4434
err := recording.ResetProxy(nil)
4535
if err != nil {
4636
panic(err)
@@ -56,18 +46,9 @@ func TestMain(m *testing.M) {
5646
panic(err)
5747
}
5848
}
59-
if recording.GetRecordMode() == recording.RecordingMode {
60-
err := recording.AddGeneralRegexSanitizer(fakeHsmURL, hsmURL, nil)
61-
if err != nil {
62-
panic(err)
63-
}
64-
defer func() {
65-
err := recording.ResetProxy(nil)
66-
if err != nil {
67-
panic(err)
68-
}
69-
}()
70-
}
49+
50+
hsmURL = getEnvVar("AZURE_MANAGEDHSM_URL", fakeHsmURL)
51+
7152
code := m.Run()
7253
os.Exit(code)
7354
}
@@ -91,12 +72,27 @@ func startAccessControlTest(t *testing.T) *rbac.Client {
9172
return client
9273
}
9374

75+
func getEnvVar(lookupValue string, fakeValue string) string {
76+
envVar := fakeValue
77+
if recording.GetRecordMode() != recording.PlaybackMode {
78+
envVar = lookupEnvVar(lookupValue)
79+
}
80+
if recording.GetRecordMode() == recording.RecordingMode {
81+
err := recording.AddGeneralRegexSanitizer(fakeValue, envVar, nil)
82+
if err != nil {
83+
panic(err)
84+
}
85+
}
86+
87+
return envVar
88+
}
89+
9490
func lookupEnvVar(s string) string {
95-
ret, ok := os.LookupEnv(s)
96-
if !ok {
91+
v := os.Getenv(s)
92+
if v == "" {
9793
panic(fmt.Sprintf("Could not find env var: '%s'", s))
9894
}
99-
return ret
95+
return v
10096
}
10197

10298
type FakeCredential struct{}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,6 @@ func TestUpdateSetting_InvalidSettingName(t *testing.T) {
122122
require.Nil(t, res.Value)
123123
var httpErr *azcore.ResponseError
124124
require.ErrorAs(t, err, &httpErr)
125-
require.Equal(t, "Nocontentprovided", httpErr.ErrorCode)
125+
require.Equal(t, "InvalidSetting", httpErr.ErrorCode)
126126
require.Equal(t, 400, httpErr.StatusCode)
127127
}

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

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,6 @@ var (
3131
)
3232

3333
func TestMain(m *testing.M) {
34-
if recording.GetRecordMode() != recording.PlaybackMode {
35-
hsmURL = os.Getenv("AZURE_MANAGEDHSM_URL")
36-
}
37-
if hsmURL == "" {
38-
if recording.GetRecordMode() != recording.PlaybackMode {
39-
panic("no value for AZURE_MANAGEDHSM_URL")
40-
}
41-
hsmURL = fakeHsmURL
42-
}
43-
4434
err := recording.ResetProxy(nil)
4535
if err != nil {
4636
panic(err)
@@ -56,18 +46,9 @@ func TestMain(m *testing.M) {
5646
panic(err)
5747
}
5848
}
59-
if recording.GetRecordMode() == recording.RecordingMode {
60-
err := recording.AddGeneralRegexSanitizer(fakeHsmURL, hsmURL, nil)
61-
if err != nil {
62-
panic(err)
63-
}
64-
defer func() {
65-
err := recording.ResetProxy(nil)
66-
if err != nil {
67-
panic(err)
68-
}
69-
}()
70-
}
49+
50+
hsmURL = getEnvVar("AZURE_MANAGEDHSM_URL", fakeHsmURL)
51+
7152
code := m.Run()
7253
os.Exit(code)
7354
}
@@ -91,12 +72,26 @@ func startSettingsTest(t *testing.T) *settings.Client {
9172
return client
9273
}
9374

75+
func getEnvVar(lookupValue string, fakeValue string) string {
76+
envVar := fakeValue
77+
if recording.GetRecordMode() != recording.PlaybackMode {
78+
envVar = lookupEnvVar(lookupValue)
79+
}
80+
if recording.GetRecordMode() == recording.RecordingMode {
81+
err := recording.AddGeneralRegexSanitizer(fakeValue, envVar, nil)
82+
if err != nil {
83+
panic(err)
84+
}
85+
}
86+
return envVar
87+
}
88+
9489
func lookupEnvVar(s string) string {
95-
ret, ok := os.LookupEnv(s)
96-
if !ok {
90+
v := os.Getenv(s)
91+
if v == "" {
9792
panic(fmt.Sprintf("Could not find env var: '%s'", s))
9893
}
99-
return ret
94+
return v
10095
}
10196

10297
type FakeCredential struct{}

‎sdk/security/keyvault/azadmin/test-resources.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,10 @@
317317
"AZURE_KEYVAULT_ATTESTATION_URL": {
318318
"type": "string",
319319
"value": "[format('https://{0}/', reference(variables('attestationSite')).defaultHostName)]"
320+
},
321+
"BLOB_CONTAINER_URL": {
322+
"type": "string",
323+
"value": "[concat(reference(resourceId('Microsoft.Storage/storageAccounts', variables('primaryAccountName'))).primaryEndpoints.blob, variables('blobContainerName'))]"
320324
}
321325
}
322326
}

0 commit comments

Comments
 (0)