changes as per review feedback

Signed-off-by: Rajesh Kalaria <[email protected]>

pkg/aws/opts.go

@@ -1,25 +1,36 @@
+/*
+Copyright SecureKey Technologies Inc. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
 package aws
 
 import (
-	envutil "github.com/trustbloc/kms/pkg/env"
+	"os"
 )
 
 type opts struct {
 	keyAliasPrefix string
 }
 
-func NewOpts() *opts {
+// NewOpts create new opts populated with environment variable.
+func newOpts() *opts {
+	value, _ := os.LookupEnv("AWS_KEY_ALIAS_PREFIX")
+
 	return &opts{
-		keyAliasPrefix: envutil.StringEnvOpt("AWS_KEY_ALIAS_PREFIX", ""),
+		keyAliasPrefix: value,
 	}
 }
 
 func (o *opts) KeyAliasPrefix() string {
 	return o.keyAliasPrefix
 }
 
+// Opts a Functional Options.
 type Opts func(opts *opts)
 
+// WithKeyAliasPrefix sets the given prefix in the returns Opts.
 func WithKeyAliasPrefix(prefix string) Opts {
 	return func(opts *opts) { opts.keyAliasPrefix = prefix }
 }

pkg/aws/opts_test.go

@@ -1,7 +1,10 @@
-//go:build unit
-// +build unit
+/*
+Copyright SecureKey Technologies Inc. All Rights Reserved.
 
-package aws
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package aws //nolint:testpackage
 
 import (
 	"testing"
@@ -11,13 +14,13 @@ import (
 
 func TestOpts(t *testing.T) {
 	t.Run("options: defaults", func(t *testing.T) {
-		options := NewOpts()
+		options := newOpts()
 
 		require.Equal(t, "", options.KeyAliasPrefix())
 	})
 
 	t.Run("options: set manually", func(t *testing.T) {
-		options := NewOpts()
+		options := newOpts()
 
 		WithKeyAliasPrefix("keyaliasprefix")(options)
 
@@ -27,7 +30,7 @@ func TestOpts(t *testing.T) {
 	t.Run("options: env vars", func(t *testing.T) {
 		t.Setenv("AWS_KEY_ALIAS_PREFIX", "keyaliasprefix")
 
-		options := NewOpts()
+		options := newOpts()
 
 		require.Equal(t, "keyaliasprefix", options.KeyAliasPrefix())
 	})

pkg/aws/service.go

@@ -76,7 +76,7 @@ var keySpecToCurve = map[string]elliptic.Curve{
 
 // New return aws service.
 func New(awsSession *session.Session, metrics metricsProvider, healthCheckKeyID string, opts ...Opts) *Service {
-	options := NewOpts()
+	options := newOpts()
 
 	for _, opt := range opts {
 		opt(options)
@@ -242,7 +242,6 @@ func (s *Service) Create(kt arieskms.KeyType) (string, interface{}, error) {
 		if err != nil {
 			return "", nil, err
 		}
-
 	}
 
 	return *result.KeyMetadata.KeyId, *result.KeyMetadata.KeyId, nil