Set .Status.BackupUri if .Status.BackupUri not specified. Fixes #48

Author: AMecea

pkg/apis/mysql/v1alpha1/types.go

@@ -216,6 +216,9 @@ type BackupStatus struct {
 	// Complete marks the backup in final state
 	Completed bool `json:"completed"`
 
+	// BackupUri represent the fully uri to the backup location
+	BackupUri string `json:"backupUri,omitempty"`
+
 	Conditions []BackupCondition `json:"conditions"`
 }
 

pkg/backupfactory/backupfactory.go

@@ -68,6 +68,13 @@ func (f *bFactory) Sync(ctx context.Context) error {
 			f.backup.AsOwnerReference(),
 		},
 	}
+
+	if len(f.GetBackupUri()) == 0 {
+		glog.Errorf("The backupUri for backupt: '%s' and cluster: '%s' not specified,"+
+			" neither in backup or cluster!", f.backup.Name, f.cluster.Name)
+		return fmt.Errorf("backupUri not specified")
+	}
+
 	_, _, err := kbatch.CreateOrPatchJob(f.k8Client, meta, func(in *batch.Job) *batch.Job {
 		if len(in.Spec.Template.Spec.Containers) == 0 {
 			in.Spec.Template.Spec = f.ensurePodSpec(in.Spec.Template.Spec)
@@ -97,15 +104,15 @@ func (f *bFactory) ensurePodSpec(in core.PodSpec) core.PodSpec {
 	in.Containers[0].Args = []string{
 		"take-backup-to",
 		f.cluster.GetBackupCandidate(),
-		f.backup.Spec.BackupUri,
+		f.GetBackupUri(),
 	}
 
-	if len(f.backup.Spec.BackupSecretName) != 0 {
+	if len(f.GetBackupSecretName()) != 0 {
 		in.Containers[0].EnvFrom = []core.EnvFromSource{
 			core.EnvFromSource{
 				SecretRef: &core.SecretEnvSource{
 					LocalObjectReference: core.LocalObjectReference{
-						Name: f.backup.Spec.BackupSecretName,
+						Name: f.GetBackupSecretName(),
 					},
 				},
 			},
@@ -124,23 +131,29 @@ func (f *bFactory) SetDefaults() error {
 	f.backup.UpdateStatusCondition(api.BackupComplete, core.ConditionUnknown, "set defaults",
 		"First initialization of backup")
 
-	if len(f.backup.Spec.BackupUri) == 0 {
-		if len(f.cluster.Spec.BackupUri) > 0 {
-			f.backup.Spec.BackupUri = getBucketUri(
-				f.cluster.Name, f.cluster.Spec.BackupUri)
-		} else {
-			return fmt.Errorf("backupUri not specified, neither in cluster")
-		}
+	// mark backup as not in final state
+	f.backup.Status.Completed = false
+
+	// update status backup uri
+	f.backup.Status.BackupUri = f.GetBackupUri()
+
+	return nil
+}
+
+func (f *bFactory) GetBackupUri() string {
+	if len(f.backup.Status.BackupUri) > 0 {
+		return f.backup.Status.BackupUri
 	}
 
-	if len(f.backup.Spec.BackupSecretName) == 0 {
-		f.backup.Spec.BackupSecretName = f.cluster.Spec.BackupSecretName
+	if len(f.backup.Spec.BackupUri) > 0 {
+		return f.backup.Spec.BackupUri
 	}
 
-	// mark backup as not in final state
-	f.backup.Status.Completed = false
+	if len(f.cluster.Spec.BackupUri) > 0 {
+		return getBucketUri(f.cluster.Name, f.cluster.Spec.BackupUri)
+	}
 
-	return nil
+	return ""
 }
 
 func getBucketUri(cluster, bucket string) string {
@@ -153,6 +166,14 @@ func getBucketUri(cluster, bucket string) string {
 	)
 }
 
+func (f *bFactory) GetBackupSecretName() string {
+	if len(f.backup.Spec.BackupSecretName) > 0 {
+		return f.backup.Spec.BackupSecretName
+	}
+
+	return f.cluster.Spec.BackupSecretName
+}
+
 func (f *bFactory) updateStatus(job *batch.Job) {
 	glog.V(2).Infof("Updating status of '%s' backup", f.backup.Name)
 

pkg/backupfactory/backupfactory_test.go

@@ -18,9 +18,10 @@ package backupfactory
 
 import (
 	"context"
-	"fmt"
 	"testing"
 
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
 	// core "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
@@ -31,16 +32,18 @@ import (
 	tutil "github.com/presslabs/mysql-operator/pkg/util/test"
 )
 
+func TestBackupFactory(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Test backups factory")
+}
+
 func getFakeFactory(backup *api.MysqlBackup, k8Client *fake.Clientset,
 	myClient *fakeMyClient.Clientset) *bFactory {
 
 	cluster, err := myClient.MysqlV1alpha1().MysqlClusters(backup.Namespace).Get(
 		backup.Spec.ClusterName, metav1.GetOptions{})
 
-	if err != nil {
-		fmt.Println("Failed to get cluster:", err)
-	}
-
+	Expect(err).To(Succeed())
 	return &bFactory{
 		backup:   backup,
 		cluster:  cluster,
@@ -49,40 +52,67 @@ func getFakeFactory(backup *api.MysqlBackup, k8Client *fake.Clientset,
 	}
 }
 
-// TestSync
-// Test: sync a backup for a cluster
-// Expect: sync successful, job created
-func TestSync(t *testing.T) {
-	client := fake.NewSimpleClientset()
-	myClient := fakeMyClient.NewSimpleClientset()
-
-	cluster := tutil.NewFakeCluster("test-2")
-	_, err := myClient.MysqlV1alpha1().MysqlClusters(tutil.Namespace).Create(cluster)
-	if err != nil {
-		fmt.Println("Failed to create cluster:", err)
-	}
-	backup := tutil.NewFakeBackup("test-1", cluster.Name)
-	f := getFakeFactory(backup, client, myClient)
-
-	err = f.SetDefaults()
-	if err != nil {
-		t.Fail()
-	}
-
-	ctx := context.TODO()
-	err = f.Sync(ctx)
-	if err != nil {
-		t.Fail()
-	}
-
-	_, err = client.BatchV1().Jobs(tutil.Namespace).Get(f.getJobName(), metav1.GetOptions{})
-	if err != nil {
-		t.Fail()
-		return
-	}
-
-	err = f.Sync(ctx)
-	if err != nil {
-		t.Fail()
-	}
-}
+var _ = Describe("Test backup factory", func() {
+	var (
+		client   *fake.Clientset
+		myClient *fakeMyClient.Clientset
+
+		ctx context.Context
+	)
+
+	BeforeEach(func() {
+		client = fake.NewSimpleClientset()
+		myClient = fakeMyClient.NewSimpleClientset()
+
+		ctx = context.TODO()
+	})
+
+	Describe("Test a simple sync", func() {
+		Context("A backup is created but not initialized", func() {
+			It("sync should be successful", func() {
+				cluster := tutil.NewFakeCluster("test-cluster-1")
+				backup := tutil.NewFakeBackup("test-backup-1", cluster.Name)
+
+				cluster.Spec.BackupUri = "gs://some-bucket/"
+				_, err := myClient.MysqlV1alpha1().MysqlClusters(tutil.Namespace).Create(cluster)
+				Expect(err).To(Succeed())
+
+				f := getFakeFactory(backup, client, myClient)
+				Expect(f.SetDefaults()).To(Succeed())
+				Expect(backup.Status.BackupUri).To(ContainSubstring("gs://some-bucket"))
+				Expect(f.Sync(ctx)).To(Succeed())
+
+				_, err = client.BatchV1().Jobs(tutil.Namespace).Get(
+					f.getJobName(), metav1.GetOptions{})
+				Expect(err).To(Succeed())
+				Expect(f.Sync(ctx)).To(Succeed())
+			})
+
+			It("sync a backup with init bucket uri", func() {
+				cluster := tutil.NewFakeCluster("test-cluster-1")
+				backup := tutil.NewFakeBackup("test-backup-1", cluster.Name)
+
+				backup.Spec.BackupUri = "gs://other-backup/test.gz"
+				cluster.Spec.BackupUri = "gs://some-bucket/"
+				_, err := myClient.MysqlV1alpha1().MysqlClusters(tutil.Namespace).Create(cluster)
+				Expect(err).To(Succeed())
+
+				f := getFakeFactory(backup, client, myClient)
+				Expect(f.SetDefaults()).To(Succeed())
+				Expect(backup.Status.BackupUri).To(ContainSubstring("gs://other-backup"))
+				Expect(f.Sync(ctx)).To(Succeed())
+			})
+			It("sync a backup with no bucket uri", func() {
+				cluster := tutil.NewFakeCluster("test-cluster-1")
+				backup := tutil.NewFakeBackup("test-backup-1", cluster.Name)
+
+				_, err := myClient.MysqlV1alpha1().MysqlClusters(tutil.Namespace).Create(cluster)
+				Expect(err).To(Succeed())
+
+				f := getFakeFactory(backup, client, myClient)
+				Expect(f.SetDefaults()).To(Succeed())
+				Expect(f.Sync(ctx)).ToNot(Succeed())
+			})
+		})
+	})
+})

pkg/util/test/test.go

@@ -59,9 +59,7 @@ func NewFakeBackup(name, clName string) *api.MysqlBackup {
 			Namespace: Namespace,
 		},
 		Spec: api.BackupSpec{
-			ClusterName:      clName,
-			BackupUri:        "gs://bucket/a.xb.gz",
-			BackupSecretName: name,
+			ClusterName: clName,
 		},
 	}
 }