scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-29 17:52:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate built in auto seal to go-kms-wrapping (#8118)

Browse Source
This commit is contained in:
Jeff Mitchell
2020-01-10 20:39:52 -05:00
committed by GitHub
parent df6dad5a63
commit 157e805b97
366 changed files with 49468 additions and 21506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/credential/aws/backend.go
View File

@@ -10,8 +10,8 @@ import (
"github.com/aws/aws-sdk-go/aws/endpoints"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/aws/aws-sdk-go/service/iam"
"github.com/hashicorp/vault/helper/awsutil"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/awsutil"
"github.com/hashicorp/vault/sdk/helper/consts"
"github.com/hashicorp/vault/sdk/logical"
cache "github.com/patrickmn/go-cache"
@@ -255,14 +255,14 @@ func (b *backend) resolveArnToRealUniqueId(ctx context.Context, s logical.Storag
}
iamClient, err := b.clientIAM(ctx, s, region.ID(), entity.AccountNumber)
if err != nil {
return "", awsutil.AppendLogicalError(err)
return "", awsutil.AppendAWSError(err)
}
switch entity.Type {
case "user":
userInfo, err := iamClient.GetUser(&iam.GetUserInput{UserName: &entity.FriendlyName})
if err != nil {
return "", awsutil.AppendLogicalError(err)
return "", awsutil.AppendAWSError(err)
}
if userInfo == nil {
return "", fmt.Errorf("got nil result from GetUser")
@@ -271,7 +271,7 @@ func (b *backend) resolveArnToRealUniqueId(ctx context.Context, s logical.Storag
case "role":
roleInfo, err := iamClient.GetRole(&iam.GetRoleInput{RoleName: &entity.FriendlyName})
if err != nil {
return "", awsutil.AppendLogicalError(err)
return "", awsutil.AppendAWSError(err)
}
if roleInfo == nil {
return "", fmt.Errorf("got nil result from GetRole")
@@ -280,7 +280,7 @@ func (b *backend) resolveArnToRealUniqueId(ctx context.Context, s logical.Storag
case "instance-profile":
profileInfo, err := iamClient.GetInstanceProfile(&iam.GetInstanceProfileInput{InstanceProfileName: &entity.FriendlyName})
if err != nil {
return "", awsutil.AppendLogicalError(err)
return "", awsutil.AppendAWSError(err)
}
if profileInfo == nil {
return "", fmt.Errorf("got nil result from GetInstanceProfile")