upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-05-28 04:10:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mod: update secrets-gcp to latest (#10558)

Browse source
This commit is contained in:
Calvin Leung Huang 2020-12-14 11:42:53 -08:00 committed by GitHub
parent a9191bcb36
commit bbe715ebfa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -89,7 +89,7 @@ require (
github.com/hashicorp/vault-plugin-secrets-ad v0.8.0
github.com/hashicorp/vault-plugin-secrets-alicloud v0.7.0
github.com/hashicorp/vault-plugin-secrets-azure v0.8.0
github.com/hashicorp/vault-plugin-secrets-gcp v0.8.0
github.com/hashicorp/vault-plugin-secrets-gcp v0.6.6-0.20201124222157-51537e030ec3
github.com/hashicorp/vault-plugin-secrets-gcpkms v0.7.0
github.com/hashicorp/vault-plugin-secrets-kv v0.7.0
github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.2.0

4
go.sum
View file

@ -656,8 +656,8 @@ github.com/hashicorp/vault-plugin-secrets-alicloud v0.7.0 h1:VoB3Q11LX+wF5w5TC8j
github.com/hashicorp/vault-plugin-secrets-alicloud v0.7.0/go.mod h1:SSkKpSTOMnX84PfgYiWHgwVg+YMhxHNjo+YCJGNBoZk=
github.com/hashicorp/vault-plugin-secrets-azure v0.8.0 h1:3BAhoqqDN198vynAfS3rcxUW2STBjREluGPsYCOy2mA=
github.com/hashicorp/vault-plugin-secrets-azure v0.8.0/go.mod h1:4jCVjTG809NCQ8mrSnbBtX17gX1Iush+558BVO6MJeo=
github.com/hashicorp/vault-plugin-secrets-gcp v0.8.0 h1:RcJHTlsB3CuZ1xq+syjtgEKfPqIyYriUl+TnjTDRShc=
github.com/hashicorp/vault-plugin-secrets-gcp v0.8.0/go.mod h1:psRQ/dm5XatoUKLDUeWrpP9icMJNtu/jmscUr37YGK4=
github.com/hashicorp/vault-plugin-secrets-gcp v0.6.6-0.20201124222157-51537e030ec3 h1:Nvc8t0AjBKD8vCvJvLBRDiPAOM9PRLnSMXX7Xkw5juY=
github.com/hashicorp/vault-plugin-secrets-gcp v0.6.6-0.20201124222157-51537e030ec3/go.mod h1:psRQ/dm5XatoUKLDUeWrpP9icMJNtu/jmscUr37YGK4=
github.com/hashicorp/vault-plugin-secrets-gcpkms v0.7.0 h1:dKPQIr6tLcMmhNKdc2A9pbwaIFLooC80UfNZL+jWMlA=
github.com/hashicorp/vault-plugin-secrets-gcpkms v0.7.0/go.mod h1:hhwps56f2ATeC4Smgghrc5JH9dXR31b4ehSf1HblP5Q=
github.com/hashicorp/vault-plugin-secrets-kv v0.7.0 h1:Sq5CmKWxQu+MtO6AXYM+STPHGnrGD50iKuwzaw87OVM=

19
vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/role_set.go generated vendored
View file

@ -22,8 +22,10 @@ import (
)
const (
serviceAccountMaxLen = 30
serviceAccountDisplayNameTmpl = "Service account for Vault secrets backend role set %s"
serviceAccountMaxLen = 30
serviceAccountDisplayNameHashLen = 8
serviceAccountDisplayNameMaxLen = 100
serviceAccountDisplayNameTmpl = "Service account for Vault secrets backend role set %s"
)
type RoleSet struct {
@ -304,7 +306,7 @@ func (rs *RoleSet) addWALsForCurrentAccount(ctx context.Context, s logical.Stora
func (rs *RoleSet) newServiceAccount(ctx context.Context, s logical.Storage, iamAdmin *iam.Service, project string) (string, error) {
saEmailPrefix := roleSetServiceAccountName(rs.Name)
projectName := fmt.Sprintf("projects/%s", project)
displayName := fmt.Sprintf(serviceAccountDisplayNameTmpl, rs.Name)
displayName := roleSetServiceAccountDisplayName(rs.Name)
walId, err := framework.PutWAL(ctx, s, walTypeAccount, &walAccount{
RoleSet: rs.Name,
@ -415,6 +417,17 @@ func roleSetServiceAccountName(rsName string) (name string) {
return name
}
func roleSetServiceAccountDisplayName(name string) string {
fullDisplayName := fmt.Sprintf(serviceAccountDisplayNameTmpl, name)
displayName := fullDisplayName
if len(fullDisplayName) > serviceAccountDisplayNameMaxLen {
truncIndex := serviceAccountDisplayNameMaxLen - serviceAccountDisplayNameHashLen
h := fmt.Sprintf("%x", sha256.Sum256([]byte(fullDisplayName[truncIndex:])))
displayName = fullDisplayName[:truncIndex] + h[:serviceAccountDisplayNameHashLen]
}
return displayName
}
func getStringHash(bindingsRaw string) string {
ssum := sha256.Sum256([]byte(bindingsRaw)[:])
return base64.StdEncoding.EncodeToString(ssum[:])

2
vendor/modules.txt vendored
View file

@ -540,7 +540,7 @@ github.com/hashicorp/vault-plugin-secrets-alicloud
github.com/hashicorp/vault-plugin-secrets-alicloud/clients
# github.com/hashicorp/vault-plugin-secrets-azure v0.8.0
github.com/hashicorp/vault-plugin-secrets-azure
# github.com/hashicorp/vault-plugin-secrets-gcp v0.8.0
# github.com/hashicorp/vault-plugin-secrets-gcp v0.6.6-0.20201124222157-51537e030ec3
github.com/hashicorp/vault-plugin-secrets-gcp/plugin
github.com/hashicorp/vault-plugin-secrets-gcp/plugin/iamutil
github.com/hashicorp/vault-plugin-secrets-gcp/plugin/util