Fixing getSidPdbEdition function

IshaanDesai45 · IshaanDesai45 · commit b6fb409659a3 · 2023-09-06T18:41:46.000+05:30
diff --git a/controllers/database/singleinstancedatabase_controller.go b/controllers/database/singleinstancedatabase_controller.go
@@ -1498,9 +1498,9 @@ func (r *SingleInstanceDatabaseReconciler) createOrReplaceSVC(ctx context.Contex
 	sid := m.Spec.Sid
 	if m.Spec.Image.PrebuiltDB {
 		edition := ""
-		sid, pdbName, edition = dbcommons.GetSidPdbEdition(r, r.Config, ctx, req)
-		if sid == "" || pdbName == "" || edition == "" {
-			return requeueN, nil
+		_, _, edition, err := dbcommons.GetSidPdbEdition(r, r.Config, ctx, ctrl.Request{NamespacedName: types.NamespacedName{Namespace: m.Namespace, Name: m.Name}})
+		if err != nil {
+			return requeueY, err
 		}
 		m.Status.Edition = cases.Title(language.English).String(edition)
 	}

Original file line number	Diff line number	Diff line change
`@@ -1498,9 +1498,9 @@ func (r *SingleInstanceDatabaseReconciler) createOrReplaceSVC(ctx context.Contex`
`1498`	`1498`	`sid := m.Spec.Sid`
`1499`	`1499`	`if m.Spec.Image.PrebuiltDB {`
`1500`	`1500`	`edition := ""`
`1501`		`- sid, pdbName, edition = dbcommons.GetSidPdbEdition(r, r.Config, ctx, req)`
`1502`		`- if sid == "" \|\| pdbName == "" \|\| edition == "" {`
`1503`		`- return requeueN, nil`
	`1501`	`+ _, _, edition, err := dbcommons.GetSidPdbEdition(r, r.Config, ctx, ctrl.Request{NamespacedName: types.NamespacedName{Namespace: m.Namespace, Name: m.Name}})`
	`1502`	`+ if err != nil {`
	`1503`	`+ return requeueY, err`
`1504`	`1504`	`}`
`1505`	`1505`	`m.Status.Edition = cases.Title(language.English).String(edition)`
`1506`	`1506`	`}`