update unit tests for unified config

storage/aws_test.go

@@ -4,37 +4,8 @@ import (
 	"os"
 	"strings"
 	"testing"
-
-	"github.com/mschuchard/vault-raft-backup/util"
-)
-
-const (
-	bucket = "my_bucket"
-	prefix = "my_prefix"
 )
 
-var (
-	backupAWSConfig = &util.AWSConfig{S3Prefix: prefix}
-	expectedConfig  = awsConfig{s3Bucket: bucket, s3Prefix: prefix}
-)
-
-func TestNewAWSConfig(test *testing.T) {
-	_, err := newAWSConfig(backupAWSConfig)
-	if err == nil || err.Error() != "empty s3 bucket input setting" {
-		test.Errorf("expected error: empty s3 bucket input setting, actual %v", err)
-	}
-
-	backupAWSConfig.S3Bucket = bucket
-	config, err := newAWSConfig(backupAWSConfig)
-	if err != nil {
-		test.Errorf("constructor unexpectedly errored with %v", err)
-	}
-	if *config != expectedConfig {
-		test.Errorf("expected aws config values: %v", expectedConfig)
-		test.Errorf("actual aws config value: %v", *config)
-	}
-}
-
 func TestSnapshotS3Upload(test *testing.T) {
 	// test this fails at s3upload
 	os.Setenv("AWS_REGION", "us-west-1")

storage/storage_test.go

@@ -0,0 +1,34 @@
+package storage
+
+import (
+	"testing"
+
+	"github.com/mschuchard/vault-raft-backup/util"
+)
+
+const (
+	object = "my_bucket"
+	prefix = "my_prefix"
+)
+
+var (
+	backupAWSConfig = &util.AWSConfig{S3Prefix: prefix}
+	expectedConfig  = config{object: object, prefix: prefix}
+)
+
+func TestNewConfig(test *testing.T) {
+	_, err := NewConfig(backupAWSConfig)
+	if err == nil || err.Error() != "empty storage object input setting" {
+		test.Errorf("expected error: empty storage object input setting, actual %s", err)
+	}
+
+	backupAWSConfig.S3Bucket = object
+	config, err := NewConfig(backupAWSConfig)
+	if err != nil {
+		test.Errorf("constructor unexpectedly errored with %v", err)
+	}
+	if *config != expectedConfig {
+		test.Errorf("expected aws config values: %v", expectedConfig)
+		test.Errorf("actual aws config value: %v", *config)
+	}
+}