alexvanin/certificates
1
0
Fork 0
forked from TrueCloudLab/certificates
Code Pull requests Activity

Make GCP client public to facilitate extensibility.

Browse source
This commit is contained in:
Mariano Cano 2020-01-21 12:50:21 -08:00
parent dff498f17f
commit 5d5ee68d88
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
kms/cloudkms/cloudkms.go
View file

@ -68,7 +68,7 @@ type keyManagementClient interface {
// CloudKMS implements a KMS using Google's Cloud apiv1. // CloudKMS implements a KMS using Google's Cloud apiv1.
type CloudKMS struct { type CloudKMS struct {
client keyManagementClient Client keyManagementClient
} }
func New(ctx context.Context, opts apiv1.Options) (*CloudKMS, error) { func New(ctx context.Context, opts apiv1.Options) (*CloudKMS, error) {
@ -83,13 +83,13 @@ func New(ctx context.Context, opts apiv1.Options) (*CloudKMS, error) {
} }
return &CloudKMS{ return &CloudKMS{
client: client, Client: client,
}, nil }, nil
} }
// Close closes the connection of the Cloud KMS client. // Close closes the connection of the Cloud KMS client.
func (k *CloudKMS) Close() error { func (k *CloudKMS) Close() error {
if err := k.client.Close(); err != nil { if err := k.Client.Close(); err != nil {
return errors.Wrap(err, "cloudKMS Close failed") return errors.Wrap(err, "cloudKMS Close failed")
} }
return nil return nil
@ -102,7 +102,7 @@ func (k *CloudKMS) CreateSigner(req *apiv1.CreateSignerRequest) (crypto.Signer,
return nil, errors.New("signing key cannot be empty") return nil, errors.New("signing key cannot be empty")
} }
return newSigner(k.client, req.SigningKey), nil return newSigner(k.Client, req.SigningKey), nil
} }
// CreateKey creates in Google's Cloud KMS a new asymmetric key for signing. // CreateKey creates in Google's Cloud KMS a new asymmetric key for signing.
@ -145,7 +145,7 @@ func (k *CloudKMS) CreateKey(req *apiv1.CreateKeyRequest) (*apiv1.CreateKeyRespo
defer cancel() defer cancel()
// Create private key in CloudKMS. // Create private key in CloudKMS.
response, err := k.client.CreateCryptoKey(ctx, &kmspb.CreateCryptoKeyRequest{ response, err := k.Client.CreateCryptoKey(ctx, &kmspb.CreateCryptoKeyRequest{
Parent: keyRing, Parent: keyRing,
CryptoKeyId: keyID, CryptoKeyId: keyID,
CryptoKey: &kmspb.CryptoKey{ CryptoKey: &kmspb.CryptoKey{
@ -170,7 +170,7 @@ func (k *CloudKMS) CreateKey(req *apiv1.CreateKeyRequest) (*apiv1.CreateKeyRespo
State: kmspb.CryptoKeyVersion_ENABLED, State: kmspb.CryptoKeyVersion_ENABLED,
}, },
} }
response, err := k.client.CreateCryptoKeyVersion(ctx, req) response, err := k.Client.CreateCryptoKeyVersion(ctx, req)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "cloudKMS CreateCryptoKeyVersion failed") return nil, errors.Wrap(err, "cloudKMS CreateCryptoKeyVersion failed")
} }
@ -200,7 +200,7 @@ func (k *CloudKMS) createKeyRingIfNeeded(name string) error {
ctx, cancel := defaultContext() ctx, cancel := defaultContext()
defer cancel() defer cancel()
_, err := k.client.GetKeyRing(ctx, &kmspb.GetKeyRingRequest{ _, err := k.Client.GetKeyRing(ctx, &kmspb.GetKeyRingRequest{
Name: name, Name: name,
}) })
if err == nil { if err == nil {
@ -208,7 +208,7 @@ func (k *CloudKMS) createKeyRingIfNeeded(name string) error {
} }
parent, child := Parent(name) parent, child := Parent(name)
_, err = k.client.CreateKeyRing(ctx, &kmspb.CreateKeyRingRequest{ _, err = k.Client.CreateKeyRing(ctx, &kmspb.CreateKeyRingRequest{
Parent: parent, Parent: parent,
KeyRingId: child, KeyRingId: child,
}) })
@ -230,7 +230,7 @@ func (k *CloudKMS) GetPublicKey(req *apiv1.GetPublicKeyRequest) (crypto.PublicKe
ctx, cancel := defaultContext() ctx, cancel := defaultContext()
defer cancel() defer cancel()
response, err := k.client.GetPublicKey(ctx, &kmspb.GetPublicKeyRequest{ response, err := k.Client.GetPublicKey(ctx, &kmspb.GetPublicKeyRequest{
Name: req.Name, Name: req.Name,
}) })
if err != nil { if err != nil {

8
kms/cloudkms/cloudkms_test.go
View file

@ -91,7 +91,7 @@ func TestCloudKMS_Close(t *testing.T) {
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
k := &CloudKMS{ k := &CloudKMS{
client: tt.fields.client, Client: tt.fields.client,
} }
if err := k.Close(); (err != nil) != tt.wantErr { if err := k.Close(); (err != nil) != tt.wantErr {
t.Errorf("CloudKMS.Close() error = %v, wantErr %v", err, tt.wantErr) t.Errorf("CloudKMS.Close() error = %v, wantErr %v", err, tt.wantErr)
@ -121,7 +121,7 @@ func TestCloudKMS_CreateSigner(t *testing.T) {
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
k := &CloudKMS{ k := &CloudKMS{
client: tt.fields.client, Client: tt.fields.client,
} }
got, err := k.CreateSigner(tt.args.req) got, err := k.CreateSigner(tt.args.req)
if (err != nil) != tt.wantErr { if (err != nil) != tt.wantErr {
@ -269,7 +269,7 @@ func TestCloudKMS_CreateKey(t *testing.T) {
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
k := &CloudKMS{ k := &CloudKMS{
client: tt.fields.client, Client: tt.fields.client,
} }
got, err := k.CreateKey(tt.args.req) got, err := k.CreateKey(tt.args.req)
if (err != nil) != tt.wantErr { if (err != nil) != tt.wantErr {
@ -335,7 +335,7 @@ func TestCloudKMS_GetPublicKey(t *testing.T) {
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
k := &CloudKMS{ k := &CloudKMS{
client: tt.fields.client, Client: tt.fields.client,
} }
got, err := k.GetPublicKey(tt.args.req) got, err := k.GetPublicKey(tt.args.req)
if (err != nil) != tt.wantErr { if (err != nil) != tt.wantErr {