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

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

pkg/cloudprovider/gcp/block_storage_adapter.go

@@ -17,10 +17,14 @@ limitations under the License.
 package gcp
 
 import (
+	"errors"
+	"fmt"
 	"strings"
 	"time"
 
 	uuid "github.com/satori/go.uuid"
+	"golang.org/x/oauth2"
+	"golang.org/x/oauth2/google"
 	"google.golang.org/api/compute/v0.beta"
 
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -36,6 +40,41 @@ type blockStorageAdapter struct {
 
 var _ cloudprovider.BlockStorageAdapter = &blockStorageAdapter{}
 
+func NewBlockStorageAdapter(project, zone string) (cloudprovider.BlockStorageAdapter, error) {
+	if project == "" {
+		return nil, errors.New("missing project in gcp configuration in config file")
+	}
+	if zone == "" {
+		return nil, errors.New("missing zone in gcp configuration in config file")
+	}
+
+	client, err := google.DefaultClient(oauth2.NoContext, compute.ComputeScope)
+	if err != nil {
+		return nil, err
+	}
+
+	gce, err := compute.New(client)
+	if err != nil {
+		return nil, err
+	}
+
+	// validate project & zone
+	res, err := gce.Zones.Get(project, zone).Do()
+	if err != nil {
+		return nil, err
+	}
+
+	if res == nil {
+		return nil, fmt.Errorf("zone %q not found for project %q", project, zone)
+	}
+
+	return &blockStorageAdapter{
+		gce:     gce,
+		project: project,
+		zone:    zone,
+	}, nil
+}
+
 func (op *blockStorageAdapter) CreateVolumeFromSnapshot(snapshotID string, volumeType string, iops *int64) (volumeID string, err error) {
 	res, err := op.gce.Snapshots.Get(op.project, snapshotID).Do()
 	if err != nil {

pkg/cloudprovider/gcp/object_storage_adapter.go

@@ -20,6 +20,8 @@ import (
 	"io"
 	"strings"
 
+	"golang.org/x/oauth2"
+	"golang.org/x/oauth2/google"
 	storage "google.golang.org/api/storage/v1"
 
 	"github.com/heptio/ark/pkg/cloudprovider"
@@ -31,6 +33,22 @@ type objectStorageAdapter struct {
 
 var _ cloudprovider.ObjectStorageAdapter = &objectStorageAdapter{}
 
+func NewObjectStorageAdapter() (cloudprovider.ObjectStorageAdapter, error) {
+	client, err := google.DefaultClient(oauth2.NoContext, storage.DevstorageReadWriteScope)
+	if err != nil {
+		return nil, err
+	}
+
+	gcs, err := storage.New(client)
+	if err != nil {
+		return nil, err
+	}
+
+	return &objectStorageAdapter{
+		gcs: gcs,
+	}, nil
+}
+
 func (op *objectStorageAdapter) PutObject(bucket string, key string, body io.ReadSeeker) error {
 	obj := &storage.Object{
 		Name: key,

pkg/cloudprovider/gcp/storage_adapter.go

@@ -1,82 +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 gcp
-
-import (
-	"fmt"
-
-	"golang.org/x/oauth2"
-	"golang.org/x/oauth2/google"
-	"google.golang.org/api/compute/v0.beta"
-	"google.golang.org/api/storage/v1"
-
-	"github.com/heptio/ark/pkg/cloudprovider"
-)
-
-type storageAdapter struct {
-	blockStorage  *blockStorageAdapter
-	objectStorage *objectStorageAdapter
-}
-
-var _ cloudprovider.StorageAdapter = &storageAdapter{}
-
-func NewStorageAdapter(project string, zone string) (cloudprovider.StorageAdapter, error) {
-	client, err := google.DefaultClient(oauth2.NoContext, compute.ComputeScope, storage.DevstorageReadWriteScope)
-
-	if err != nil {
-		return nil, err
-	}
-
-	gce, err := compute.New(client)
-	if err != nil {
-		return nil, err
-	}
-
-	// validate project & zone
-	res, err := gce.Zones.Get(project, zone).Do()
-	if err != nil {
-		return nil, err
-	}
-
-	if res == nil {
-		return nil, fmt.Errorf("zone %q not found for project %q", project, zone)
-	}
-
-	gcs, err := storage.New(client)
-	if err != nil {
-		return nil, err
-	}
-
-	return &storageAdapter{
-		objectStorage: &objectStorageAdapter{
-			gcs: gcs,
-		},
-		blockStorage: &blockStorageAdapter{
-			gce:     gce,
-			project: project,
-			zone:    zone,
-		},
-	}, nil
-}
-
-func (op *storageAdapter) ObjectStorage() cloudprovider.ObjectStorageAdapter {
-	return op.objectStorage
-}
-
-func (op *storageAdapter) BlockStorage() cloudprovider.BlockStorageAdapter {
-	return op.blockStorage
-}