Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

VAULT-28281: Pass in accountName variable into validation function #27563

Merged
merged 6 commits into from
Jun 21, 2024
Merged

VAULT-28281: Pass in accountName variable into validation function #27563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8efcaed
pass in correct accountName variable into validation function
davidadeleon Jun 21, 2024
ddce601
modify test fixture to better test validation functionality
davidadeleon Jun 21, 2024
afef426
pass in accountName variable into error message
davidadeleon Jun 21, 2024
4ff9861
Merge branch 'main' into davidadeleon/vault-28281
davidadeleon Jun 21, 2024
99e7be9
changelog
davidadeleon Jun 21, 2024
57b105b
Merge branch 'main' into davidadeleon/vault-28281
davidadeleon Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelog/27563.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
storage/azure: Fix invalid account name initialization bug
```
4 changes: 2 additions & 2 deletions physical/azure/azure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ func NewAzureBackend(conf map[string]string, logger log.Logger) (physical.Backen
return nil, fmt.Errorf("'accountName' must be set")
}
}
if err := validateAccountName(name); err != nil {
return nil, fmt.Errorf("invalid account name %s: %w", name, err)
if err := validateAccountName(accountName); err != nil {
return nil, fmt.Errorf("invalid account name %s: %w", accountName, err)
}

accountKey := os.Getenv("AZURE_ACCOUNT_KEY")
Expand Down
2 changes: 1 addition & 1 deletion physical/azure/azure_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func testFixture(t *testing.T) (*AzureBackend, func()) {
t.Helper()

ts := time.Now().UnixNano()
name := fmt.Sprintf("vlt%d", ts)
name := fmt.Sprintf("vlt-%d", ts)
_ = os.Setenv("AZURE_BLOB_CONTAINER", name)

cleanup := func() {}
Expand Down
Loading