Merge pull request #14 from vshn/fix-backup-info

Fix null value fields in vshn postgres backup
vshn · Mar 23, 2023 · 399ed3c · 399ed3c
2 parents 93a83f4 + 07fc136
commit 399ed3c
Show file tree

Hide file tree

Showing 6 changed files with 114 additions and 97 deletions.
diff --git a/apis/appcat/v1/generated.pb.go b/apis/appcat/v1/generated.pb.go
diff --git a/apis/appcat/v1/vshn_postgres_backup_types.go b/apis/appcat/v1/vshn_postgres_backup_types.go
@@ -48,9 +48,9 @@ type VSHNPostgresBackup struct {
 // VSHNPostgresBackupStatus defines the desired state of VSHNPostgresBackup
 type VSHNPostgresBackupStatus struct {
 	// Process holds status information of the backup process
-	Process runtime.RawExtension `json:"process,omitempty"`
+	Process *runtime.RawExtension `json:"process,omitempty"`
 	// BackupInformation holds specific backup information
-	BackupInformation runtime.RawExtension `json:"backupInformation,omitempty"`
+	BackupInformation *runtime.RawExtension `json:"backupInformation,omitempty"`
 	// DatabaseInstance is the database from which the backup has been done
 	DatabaseInstance string `json:"databaseInstance"`
 }
@@ -125,18 +125,18 @@ func NewVSHNPostgresBackup(backup *SGBackupInfo, db, originalNamespace string) *
 
 	vshnPostgresBackup := &VSHNPostgresBackup{
 		ObjectMeta: backup.ObjectMeta,
-		Status:     VSHNPostgresBackupStatus{},
 	}
 
 	vshnPostgresBackup.Status.DatabaseInstance = db
 	vshnPostgresBackup.Namespace = originalNamespace
 
 	if backup.Process.Object != nil {
-		vshnPostgresBackup.Status.Process = backup.Process
+		vshnPostgresBackup.Status.Process = &backup.Process
 	}
 
 	if backup.BackupInformation.Object != nil {
-		vshnPostgresBackup.Status.BackupInformation = backup.BackupInformation
+		vshnPostgresBackup.Status.BackupInformation = &backup.BackupInformation
 	}
+
 	return vshnPostgresBackup
 }
diff --git a/apis/appcat/v1/vshn_postgres_backup_types_test.go b/apis/appcat/v1/vshn_postgres_backup_types_test.go
@@ -5,7 +5,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/util/json"
 	"testing"
 )
 
@@ -23,16 +22,16 @@ func TestNewVSHNBackupFromBackInfo(t *testing.T) {
 		"GivenNoDB_ThenNil": {
 			backupInfo: &SGBackupInfo{
 				ObjectMeta:        metav1.ObjectMeta{Name: "backup"},
-				Process:           rawFromObject(getTestProcess()),
-				BackupInformation: rawFromObject(getTestBI()),
+				Process:           *rawFromObject(getTestProcess()),
+				BackupInformation: *rawFromObject(getTestBI()),
 			},
 			namespace: "namespace",
 		},
 		"GivenNoNamespace_ThenNil": {
 			backupInfo: &SGBackupInfo{
 				ObjectMeta:        metav1.ObjectMeta{Name: "backup"},
-				Process:           rawFromObject(getTestProcess()),
-				BackupInformation: rawFromObject(getTestBI()),
+				Process:           *rawFromObject(getTestProcess()),
+				BackupInformation: *rawFromObject(getTestBI()),
 			},
 			db: "db1",
 		},
@@ -41,8 +40,8 @@ func TestNewVSHNBackupFromBackInfo(t *testing.T) {
 			namespace: "namespace",
 			backupInfo: &SGBackupInfo{
 				ObjectMeta:        metav1.ObjectMeta{Name: "backup"},
-				Process:           rawFromObject(getTestProcess()),
-				BackupInformation: rawFromObject(getTestBI()),
+				Process:           *rawFromObject(getTestProcess()),
+				BackupInformation: *rawFromObject(getTestBI()),
 			},
 			vshnPostgresBackup: &VSHNPostgresBackup{
 				ObjectMeta: metav1.ObjectMeta{Name: "backup", Namespace: "namespace"},
@@ -58,7 +57,7 @@ func TestNewVSHNBackupFromBackInfo(t *testing.T) {
 			namespace: "namespace",
 			backupInfo: &SGBackupInfo{
 				ObjectMeta:        metav1.ObjectMeta{Name: "backup"},
-				BackupInformation: rawFromObject(getTestBI()),
+				BackupInformation: *rawFromObject(getTestBI()),
 			},
 			vshnPostgresBackup: &VSHNPostgresBackup{
 				ObjectMeta: metav1.ObjectMeta{Name: "backup", Namespace: "namespace"},
@@ -73,7 +72,7 @@ func TestNewVSHNBackupFromBackInfo(t *testing.T) {
 			namespace: "namespace",
 			backupInfo: &SGBackupInfo{
 				ObjectMeta: metav1.ObjectMeta{Name: "backup"},
-				Process:    rawFromObject(getTestProcess()),
+				Process:    *rawFromObject(getTestProcess()),
 			},
 			vshnPostgresBackup: &VSHNPostgresBackup{
 				ObjectMeta: metav1.ObjectMeta{Name: "backup", Namespace: "namespace"},
@@ -109,11 +108,6 @@ func getTestBI() unstructured.Unstructured {
 	}
 }
 
-func rawFromObject(object unstructured.Unstructured) runtime.RawExtension {
-	return runtime.RawExtension{Object: &object}
-}
-
-func rawFromString(str string) runtime.RawExtension {
-	marshal, _ := json.Marshal(str)
-	return runtime.RawExtension{Raw: marshal}
+func rawFromObject(object unstructured.Unstructured) *runtime.RawExtension {
+	return &runtime.RawExtension{Object: &object}
 }
diff --git a/apis/appcat/v1/zz_generated.deepcopy.go b/apis/appcat/v1/zz_generated.deepcopy.go
diff --git a/apiserver/vshn/postgres/backup_test.go b/apiserver/vshn/postgres/backup_test.go
@@ -34,8 +34,8 @@ var (
 		},
 		Status: v1.VSHNPostgresBackupStatus{
 			DatabaseInstance:  "postgres-one",
-			Process:           runtime.RawExtension{Object: &unstructured.Unstructured{Object: map[string]interface{}{"status": "Failed"}}},
-			BackupInformation: runtime.RawExtension{Object: &unstructured.Unstructured{Object: map[string]interface{}{"disk": "1GB", "cpu": "1"}}},
+			Process:           &runtime.RawExtension{Object: &unstructured.Unstructured{Object: map[string]interface{}{"status": "Failed"}}},
+			BackupInformation: &runtime.RawExtension{Object: &unstructured.Unstructured{Object: map[string]interface{}{"disk": "1GB", "cpu": "1"}}},
 		},
 	}
 
@@ -73,8 +73,8 @@ var (
 		},
 		Status: v1.VSHNPostgresBackupStatus{
 			DatabaseInstance:  "postgres-two",
-			Process:           runtime.RawExtension{Object: &unstructured.Unstructured{Object: map[string]interface{}{"status": "Completed"}}},
-			BackupInformation: runtime.RawExtension{Object: &unstructured.Unstructured{Object: map[string]interface{}{"disk": "2GB", "cpu": "2"}}},
+			Process:           &runtime.RawExtension{Object: &unstructured.Unstructured{Object: map[string]interface{}{"status": "Completed"}}},
+			BackupInformation: &runtime.RawExtension{Object: &unstructured.Unstructured{Object: map[string]interface{}{"disk": "2GB", "cpu": "2"}}},
 		},
 	}
 

diff --git a/apiserver/vshn/postgres/table.go b/apiserver/vshn/postgres/table.go
@@ -63,8 +63,8 @@ func backupToTableRow(backup *v1.VSHNPostgresBackup) metav1.TableRow {
 	}
 }
 
-func getStoredTime(process runtime.RawExtension) string {
-	if process.Object != nil {
+func getStoredTime(process *runtime.RawExtension) string {
+	if process != nil && process.Object != nil {
 		if v, err := runtime.DefaultUnstructuredConverter.ToUnstructured(process.Object); err == nil {
 			if storedTime, exists, _ := unstructured.NestedString(v, v1.Timing, v1.Stored); exists {
 				return storedTime
@@ -74,8 +74,8 @@ func getStoredTime(process runtime.RawExtension) string {
 	return ""
 }
 
-func getProcessStatus(process runtime.RawExtension) string {
-	if process.Object != nil {
+func getProcessStatus(process *runtime.RawExtension) string {
+	if process != nil && process.Object != nil {
 		unstructuredProcess, err := runtime.DefaultUnstructuredConverter.ToUnstructured(process.Object)
 		if err != nil {
 			return ""