refactoring and address comment

Gopkg.toml

@@ -40,3 +40,7 @@
 
 [[constraint]]
   name = "golang.org/x/time"
+
+[[constraint]]
+  name = "github.com/Azure/azure-sdk-for-go"
+  version = "v11.3.0-beta"

pkg/apis/etcd/v1beta2/zz_generated.deepcopy.go

@@ -32,6 +32,14 @@ import (
 // Deprecated: deepcopy registration will go away when static deepcopy is fully implemented.
 func GetGeneratedDeepCopyFuncs() []conversion.GeneratedDeepCopyFunc {
 	return []conversion.GeneratedDeepCopyFunc{
+		{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
+			in.(*ABSBackupSource).DeepCopyInto(out.(*ABSBackupSource))
+			return nil
+		}, InType: reflect.TypeOf(&ABSBackupSource{})},
+		{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
+			in.(*ABSRestoreSource).DeepCopyInto(out.(*ABSRestoreSource))
+			return nil
+		}, InType: reflect.TypeOf(&ABSRestoreSource{})},
 		{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
 			in.(*BackupSource).DeepCopyInto(out.(*BackupSource))
 			return nil
@@ -131,6 +139,38 @@ func GetGeneratedDeepCopyFuncs() []conversion.GeneratedDeepCopyFunc {
 	}
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ABSBackupSource) DeepCopyInto(out *ABSBackupSource) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ABSBackupSource.
+func (in *ABSBackupSource) DeepCopy() *ABSBackupSource {
+	if in == nil {
+		return nil
+	}
+	out := new(ABSBackupSource)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ABSRestoreSource) DeepCopyInto(out *ABSRestoreSource) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ABSRestoreSource.
+func (in *ABSRestoreSource) DeepCopy() *ABSRestoreSource {
+	if in == nil {
+		return nil
+	}
+	out := new(ABSRestoreSource)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *BackupSource) DeepCopyInto(out *BackupSource) {
 	*out = *in
@@ -143,6 +183,15 @@ func (in *BackupSource) DeepCopyInto(out *BackupSource) {
 			**out = **in
 		}
 	}
+	if in.ABS != nil {
+		in, out := &in.ABS, &out.ABS
+		if *in == nil {
+			*out = nil
+		} else {
+			*out = new(ABSBackupSource)
+			**out = **in
+		}
+	}
 	return
 }
 
@@ -597,6 +646,15 @@ func (in *RestoreSource) DeepCopyInto(out *RestoreSource) {
 			**out = **in
 		}
 	}
+	if in.ABS != nil {
+		in, out := &in.ABS, &out.ABS
+		if *in == nil {
+			*out = nil
+		} else {
+			*out = new(ABSRestoreSource)
+			**out = **in
+		}
+	}
 	return
 }
 

pkg/backup/reader/abs_reader.go

@@ -31,6 +31,7 @@ type absReader struct {
 	abs *storage.BlobStorageClient
 }
 
+// NewABSReader return a Reader implementation to read a file from ABS in the form of absReader
 func NewABSReader(abs *storage.BlobStorageClient) Reader {
 	return &absReader{abs}
 }
@@ -53,6 +54,5 @@ func (absr *absReader) Open(path string) (io.ReadCloser, error) {
 	}
 
 	blob := containerRef.GetBlobReference(key)
-	getBlobOpts := &storage.GetBlobOptions{}
-	return blob.Get(getBlobOpts)
+	return blob.Get(&storage.GetBlobOptions{})
 }

pkg/backup/writer/abs_writer.go

@@ -20,8 +20,9 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/Azure/azure-sdk-for-go/storage"
 	"github.com/coreos/etcd-operator/pkg/backup/util"
+
+	"github.com/Azure/azure-sdk-for-go/storage"
 	"github.com/pborman/uuid"
 )
 
@@ -38,7 +39,7 @@ func NewABSWriter(abs *storage.BlobStorageClient) Writer {
 
 const (
 	// AzureBlobBlockChunkLimitInBytes 100MiB is the limit
-	AzureBlobBlockChunkLimitInBytes = 104857600
+	AzureBlobBlockChunkLimitInBytes = 100 * 1024 * 1024
 )
 
 // Write writes the backup file to the given abs path, "<abs-container-name>/<key>".
@@ -59,9 +60,7 @@ func (absw *absWriter) Write(path string, r io.Reader) (int64, error) {
 	}
 
 	blob := containerRef.GetBlobReference(key)
-	putBlobOpts := storage.PutBlobOptions{}
-
-	err = blob.CreateBlockBlob(&putBlobOpts)
+	err = blob.CreateBlockBlob(&storage.PutBlobOptions{})
 	if err != nil {
 		return 0, err
 	}
@@ -92,8 +91,7 @@ func (absw *absWriter) Write(path string, r io.Reader) (int64, error) {
 		return 0, err
 	}
 
-	getBlobOpts := &storage.GetBlobOptions{}
-	_, err = blob.Get(getBlobOpts)
+	_, err = blob.Get(&storage.GetBlobOptions{})
 	if err != nil {
 		return 0, err
 	}

pkg/controller/backup-operator/abs_backup.go

@@ -22,13 +22,10 @@ import (
 	"github.com/coreos/etcd-operator/pkg/backup"
 	"github.com/coreos/etcd-operator/pkg/backup/writer"
 	"github.com/coreos/etcd-operator/pkg/util/azureutil/absfactory"
-	"github.com/coreos/etcd-operator/pkg/util/etcdutil"
-	"github.com/coreos/etcd-operator/pkg/util/k8sutil"
 
 	"k8s.io/client-go/kubernetes"
 )
 
-// TODO: replace this with generic backend interface for other options (PV, Azure)
 // handleABS saves etcd cluster's backup to specificed ABS path.
 func handleABS(kubecli kubernetes.Interface, s *api.ABSBackupSource, endpoints []string, clientTLSSecret, namespace string) (*api.BackupStatus, error) {
 	cli, err := absfactory.NewClientFromSecret(kubecli, namespace, s.ABSSecret)
@@ -37,15 +34,8 @@ func handleABS(kubecli kubernetes.Interface, s *api.ABSBackupSource, endpoints [
 	}
 
 	var tlsConfig *tls.Config
-	if len(clientTLSSecret) != 0 {
-		d, err := k8sutil.GetTLSDataFromSecret(kubecli, namespace, clientTLSSecret)
-		if err != nil {
-			return nil, fmt.Errorf("failed to get TLS data from secret (%v): %v", clientTLSSecret, err)
-		}
-		tlsConfig, err = etcdutil.NewTLSConfig(d.CertData, d.KeyData, d.CAData)
-		if err != nil {
-			return nil, fmt.Errorf("failed to constructs tls config: %v", err)
-		}
+	if tlsConfig, err = generateTLSConfig(kubecli, clientTLSSecret, namespace); err != nil {
+		return nil, err
 	}
 
 	bm := backup.NewBackupManagerFromWriter(kubecli, writer.NewABSWriter(cli.ABS), tlsConfig, endpoints, namespace)

pkg/controller/backup-operator/s3_backup.go

@@ -22,8 +22,6 @@ import (
 	"github.com/coreos/etcd-operator/pkg/backup"
 	"github.com/coreos/etcd-operator/pkg/backup/writer"
 	"github.com/coreos/etcd-operator/pkg/util/awsutil/s3factory"
-	"github.com/coreos/etcd-operator/pkg/util/etcdutil"
-	"github.com/coreos/etcd-operator/pkg/util/k8sutil"
 
 	"k8s.io/client-go/kubernetes"
 )
@@ -38,15 +36,8 @@ func handleS3(kubecli kubernetes.Interface, s *api.S3BackupSource, endpoints []s
 	defer cli.Close()
 
 	var tlsConfig *tls.Config
-	if len(clientTLSSecret) != 0 {
-		d, err := k8sutil.GetTLSDataFromSecret(kubecli, namespace, clientTLSSecret)
-		if err != nil {
-			return nil, fmt.Errorf("failed to get TLS data from secret (%v): %v", clientTLSSecret, err)
-		}
-		tlsConfig, err = etcdutil.NewTLSConfig(d.CertData, d.KeyData, d.CAData)
-		if err != nil {
-			return nil, fmt.Errorf("failed to constructs tls config: %v", err)
-		}
+	if tlsConfig, err = generateTLSConfig(kubecli, clientTLSSecret, namespace); err != nil {
+		return nil, err
 	}
 
 	bm := backup.NewBackupManagerFromWriter(kubecli, writer.NewS3Writer(cli.S3), tlsConfig, endpoints, namespace)

pkg/controller/backup-operator/util.go

@@ -0,0 +1,40 @@
+// Copyright 2017 The etcd-operator Authors
+//
+// 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 controller
+
+import (
+	"crypto/tls"
+	"fmt"
+
+	"github.com/coreos/etcd-operator/pkg/util/etcdutil"
+	"github.com/coreos/etcd-operator/pkg/util/k8sutil"
+
+	"k8s.io/client-go/kubernetes"
+)
+
+func generateTLSConfig(kubecli kubernetes.Interface, clientTLSSecret, namespace string) (*tls.Config, error) {
+	var tlsConfig *tls.Config
+	if len(clientTLSSecret) != 0 {
+		d, err := k8sutil.GetTLSDataFromSecret(kubecli, namespace, clientTLSSecret)
+		if err != nil {
+			return nil, fmt.Errorf("failed to get TLS data from secret (%v): %v", clientTLSSecret, err)
+		}
+		tlsConfig, err = etcdutil.NewTLSConfig(d.CertData, d.KeyData, d.CAData)
+		if err != nil {
+			return nil, fmt.Errorf("failed to constructs tls config: %v", err)
+		}
+	}
+	return tlsConfig, nil
+}

pkg/util/azureutil/absfactory/client.go

@@ -24,10 +24,6 @@ import (
 	"k8s.io/client-go/kubernetes"
 )
 
-const (
-	tmpdir = "/tmp"
-)
-
 // ABSClient is a wrapper of ABS client that provides cleanup functionality.
 type ABSClient struct {
 	ABS *storage.BlobStorageClient
@@ -41,7 +37,6 @@ func NewClientFromSecret(kubecli kubernetes.Interface, namespace, absSecret stri
 		}
 	}()
 
-	w = &ABSClient{}
 	se, err := kubecli.CoreV1().Secrets(namespace).Get(absSecret, metav1.GetOptions{})
 	if err != nil {
 		return nil, fmt.Errorf("failed to get k8s secret: %v", err)
@@ -58,6 +53,5 @@ func NewClientFromSecret(kubecli kubernetes.Interface, namespace, absSecret stri
 	}
 
 	abs := bc.GetBlobService()
-	w.ABS = &abs
-	return w, nil
+	return &ABSClient{ABS: &abs}, nil
 }