get rid of StorageAdapter structs and move validation into block/object

Signed-off-by: Steve Kriss <steve@heptio.com>

pkg/cloudprovider/aws/block_storage_adapter.go

@@ -17,8 +17,11 @@ limitations under the License.
 package aws
 
 import (
+	"errors"
 	"fmt"
 
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
 
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -33,6 +36,53 @@ type blockStorageAdapter struct {
 	az  string
 }
 
+func getSession(config *aws.Config) (*session.Session, error) {
+	sess, err := session.NewSession(config)
+	if err != nil {
+		return nil, err
+	}
+
+	if _, err := sess.Config.Credentials.Get(); err != nil {
+		return nil, err
+	}
+
+	return sess, nil
+}
+
+func NewBlockStorageAdapter(region, availabilityZone string) (cloudprovider.BlockStorageAdapter, error) {
+	if region == "" {
+		return nil, errors.New("missing region in aws configuration in config file")
+	}
+	if availabilityZone == "" {
+		return nil, errors.New("missing availabilityZone in aws configuration in config file")
+	}
+
+	awsConfig := aws.NewConfig().WithRegion(region)
+
+	sess, err := getSession(awsConfig)
+	if err != nil {
+		return nil, err
+	}
+
+	// validate the availabilityZone
+	var (
+		ec2Client = ec2.New(sess)
+		azReq     = &ec2.DescribeAvailabilityZonesInput{ZoneNames: []*string{&availabilityZone}}
+	)
+	res, err := ec2Client.DescribeAvailabilityZones(azReq)
+	if err != nil {
+		return nil, err
+	}
+	if len(res.AvailabilityZones) == 0 {
+		return nil, fmt.Errorf("availability zone %q not found", availabilityZone)
+	}
+
+	return &blockStorageAdapter{
+		ec2: ec2Client,
+		az:  availabilityZone,
+	}, nil
+}
+
 // iopsVolumeTypes is a set of AWS EBS volume types for which IOPS should
 // be captured during snapshot and provided when creating a new volume
 // from snapshot.

pkg/cloudprovider/aws/object_storage_adapter.go

@@ -17,9 +17,11 @@ limitations under the License.
 package aws
 
 import (
+	"errors"
 	"io"
 
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/endpoints"
 	"github.com/aws/aws-sdk-go/service/s3"
 
 	"github.com/heptio/ark/pkg/cloudprovider"
@@ -32,6 +34,40 @@ type objectStorageAdapter struct {
 	kmsKeyID string
 }
 
+func NewObjectStorageAdapter(region, s3URL, kmsKeyID string, s3ForcePathStyle bool) (cloudprovider.ObjectStorageAdapter, error) {
+	if region == "" {
+		return nil, errors.New("missing region in aws configuration in config file")
+	}
+
+	awsConfig := aws.NewConfig().
+		WithRegion(region).
+		WithS3ForcePathStyle(s3ForcePathStyle)
+
+	if s3URL != "" {
+		awsConfig = awsConfig.WithEndpointResolver(
+			endpoints.ResolverFunc(func(service, region string, optFns ...func(*endpoints.Options)) (endpoints.ResolvedEndpoint, error) {
+				if service == endpoints.S3ServiceID {
+					return endpoints.ResolvedEndpoint{
+						URL: s3URL,
+					}, nil
+				}
+
+				return endpoints.DefaultResolver().EndpointFor(service, region, optFns...)
+			}),
+		)
+	}
+
+	sess, err := getSession(awsConfig)
+	if err != nil {
+		return nil, err
+	}
+
+	return &objectStorageAdapter{
+		s3:       s3.New(sess),
+		kmsKeyID: kmsKeyID,
+	}, nil
+}
+
 func (op *objectStorageAdapter) PutObject(bucket string, key string, body io.ReadSeeker) error {
 	req := &s3.PutObjectInput{
 		Bucket: &bucket,

pkg/cloudprovider/aws/storage_adapter.go

@@ -1,78 +0,0 @@
-/*
-Copyright 2017 Heptio Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package aws
-
-import (
-	"fmt"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/aws/aws-sdk-go/service/s3"
-
-	"github.com/heptio/ark/pkg/cloudprovider"
-)
-
-type storageAdapter struct {
-	blockStorage  *blockStorageAdapter
-	objectStorage *objectStorageAdapter
-}
-
-var _ cloudprovider.StorageAdapter = &storageAdapter{}
-
-func NewStorageAdapter(config *aws.Config, availabilityZone string, kmsKeyID string) (cloudprovider.StorageAdapter, error) {
-	sess, err := session.NewSession(config)
-	if err != nil {
-		return nil, err
-	}
-
-	if _, err := sess.Config.Credentials.Get(); err != nil {
-		return nil, err
-	}
-
-	// validate the availabilityZone
-	var (
-		ec2Client = ec2.New(sess)
-		azReq     = &ec2.DescribeAvailabilityZonesInput{ZoneNames: []*string{&availabilityZone}}
-	)
-	res, err := ec2Client.DescribeAvailabilityZones(azReq)
-	if err != nil {
-		return nil, err
-	}
-	if len(res.AvailabilityZones) == 0 {
-		return nil, fmt.Errorf("availability zone %q not found", availabilityZone)
-	}
-
-	return &storageAdapter{
-		blockStorage: &blockStorageAdapter{
-			ec2: ec2Client,
-			az:  availabilityZone,
-		},
-		objectStorage: &objectStorageAdapter{
-			s3:       s3.New(sess),
-			kmsKeyID: kmsKeyID,
-		},
-	}, nil
-}
-
-func (op *storageAdapter) ObjectStorage() cloudprovider.ObjectStorageAdapter {
-	return op.objectStorage
-}
-
-func (op *storageAdapter) BlockStorage() cloudprovider.BlockStorageAdapter {
-	return op.blockStorage
-}