This commit is contained in:
Jeff Mitchell 2019-02-08 09:12:55 -05:00
parent a967078d80
commit 82a85aa8c8
3 changed files with 7 additions and 7 deletions

View File

@ -1225,8 +1225,8 @@ func TestBackend_validCIDR(t *testing.T) {
}
readCertReq := &logical.Request{
Operation: logical.ReadOperation,
Path: "certs/" + name,
Operation: logical.ReadOperation,
Path: "certs/" + name,
Storage: storage,
Connection: &logical.Connection{ConnState: &connState},
}
@ -1236,7 +1236,7 @@ func TestBackend_validCIDR(t *testing.T) {
if cidrsResult[0].String() != boundCIDRs[0] ||
cidrsResult[1].String() != boundCIDRs[1] {
t.Fatalf("bound_cidrs couldn't be set correctly, EXPECTED: %v, ACTUAL: %v", boundCIDRs, cidrsResult)
t.Fatalf("bound_cidrs couldn't be set correctly, EXPECTED: %v, ACTUAL: %v", boundCIDRs, cidrsResult)
}
loginReq := &logical.Request{

View File

@ -198,7 +198,7 @@ func (b *backend) pathCertRead(ctx context.Context, req *logical.Request, d *fra
"allowed_uri_sans": cert.AllowedURISANs,
"allowed_organizational_units": cert.AllowedOrganizationalUnits,
"required_extensions": cert.RequiredExtensions,
"bound_cidrs": cert.BoundCIDRs,
"bound_cidrs": cert.BoundCIDRs,
},
}, nil
}

View File

@ -140,7 +140,7 @@ func NewS3Backend(conf map[string]string, logger log.Logger) (physical.Backend,
if !ok {
kmsKeyId = ""
}
s := &S3Backend{
client: s3conn,
bucket: bucket,
@ -168,9 +168,9 @@ func (s *S3Backend) Put(ctx context.Context, entry *physical.Entry) error {
putObjectInput.ServerSideEncryption = aws.String("aws:kms")
putObjectInput.SSEKMSKeyId = aws.String(s.kmsKeyId)
}
_, err := s.client.PutObject(putObjectInput)
if err != nil {
return err
}