Skip to content

secretstores: support more format of azure key vault #944

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

Merged
merged 5 commits into from
Jul 8, 2021
Merged

secretstores: support more format of azure key vault #944

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
32633f4
secretstores: support more format of azure key vault
daixiang0 Jun 16, 2021
0db710a
Merge branch 'master' into vault
daixiang0 Jun 17, 2021
f3a3498
Merge branch 'master' into vault
daixiang0 Jun 25, 2021
bfa68a4
Merge branch 'master' into vault
daixiang0 Jul 2, 2021
37b9ad8
Merge branch 'master' into vault
yaron2 Jul 8, 2021
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
19 changes: 18 additions & 1 deletion secretstores/azure/keyvault/keyvault.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ const (
componentVaultName = "vaultName"
VersionID = "version_id"
secretItemIDPrefix = "/secrets/"

// AzureCloud urls refer to https://docs.microsoft.com/en-us/azure/key-vault/general/about-keys-secrets-certificates#dns-suffixes-for-base-url
AzureCloud = ".vault.azure.net"
AzureChinaCloud = ".vault.azure.cn"
AzureUSGov = ".vault.usgovcloudapi.net"
AzureGermanCloud = ".vault.microsoftazure.de"
https = "https://"
)

type keyvaultSecretStore struct {
Expand Down Expand Up @@ -131,7 +138,17 @@ func (k *keyvaultSecretStore) BulkGetSecret(req secretstores.BulkGetSecretReques

// getVaultURI returns Azure Key Vault URI
func (k *keyvaultSecretStore) getVaultURI() string {
return fmt.Sprintf("https://%s.vault.azure.net", k.vaultName)
for _, suffix := range []string{AzureCloud, AzureChinaCloud, AzureGermanCloud, AzureUSGov} {
if strings.HasSuffix(k.vaultName, suffix) {
if strings.HasPrefix(k.vaultName, https) {
return k.vaultName
}

return fmt.Sprintf("%s%s", https, k.vaultName)
}
}

return fmt.Sprintf("%s%s%s", https, k.vaultName, AzureCloud)
}

func (k *keyvaultSecretStore) getMaxResultsFromMetadata(metadata map[string]string) (*int32, error) {
Expand Down