Skip to content

Commit 693dd11

Browse files
yunus-qureshiyunus-qureshi
committed
Fix lint errors
1 parent d2e55b4 commit 693dd11

File tree

2 files changed

+43
-42
lines changed

2 files changed

+43
-42
lines changed

‎controllers/database/dataguardbroker_controller.go

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import (
4444
"fmt"
4545
"strings"
4646
"time"
47+
4748
"github.com/go-logr/logr"
4849
corev1 "k8s.io/api/core/v1"
4950
apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -100,15 +101,15 @@ func (r *DataguardBrokerReconciler) Reconcile(ctx context.Context, req ctrl.Requ
100101
return requeueN, err
101102
}
102103

103-
// Manage SingleInstanceDatabase Deletion
104+
// Manage DataguardBroker Deletion
104105
result, err := r.manageDataguardBrokerDeletion(req, ctx, dataguardBroker)
105106
if result.Requeue {
106107
r.Log.Info("Reconcile queued")
107108
return result, err
108109
}
109110
if err != nil {
110-
r.Log.Error(err,err.Error())
111-
return result,err
111+
r.Log.Error(err, err.Error())
112+
return result, err
112113
}
113114

114115
// Fetch Primary Database Reference
@@ -254,7 +255,7 @@ func (r *DataguardBrokerReconciler) instantiateSVCSpec(m *dbapi.DataguardBroker)
254255
Labels: map[string]string{
255256
"app": m.Name,
256257
},
257-
Annotations : func() map[string]string {
258+
Annotations: func() map[string]string {
258259
annotations := make(map[string]string)
259260
if len(m.Spec.ServiceAnnotations) != 0 {
260261
for key, value := range m.Spec.ServiceAnnotations {
@@ -399,7 +400,7 @@ func (r *DataguardBrokerReconciler) setupDataguardBrokerConfiguration(m *dbapi.D
399400
_, ok := dbSet[standbyDatabase.Status.Sid]
400401
if ok {
401402
log.Info("A database with the same SID is already configured in the DG")
402-
r.Recorder.Eventf(m, corev1.EventTypeWarning, "Spec Error", "A database with the same SID " + standbyDatabase.Status.Sid + " is already configured in the DG")
403+
r.Recorder.Eventf(m, corev1.EventTypeWarning, "Spec Error", "A database with the same SID "+standbyDatabase.Status.Sid+" is already configured in the DG")
403404
continue
404405
}
405406

@@ -436,7 +437,7 @@ func (r *DataguardBrokerReconciler) setupDataguardBrokerConfiguration(m *dbapi.D
436437

437438
// Update Databases
438439
r.updateReconcileStatus(m, sidbReadyPod, ctx, req)
439-
}
440+
}
440441

441442
eventReason := "DG Configuration up to date"
442443
eventMsg := ""
@@ -689,7 +690,7 @@ func (r *DataguardBrokerReconciler) setupDataguardBrokerConfigurationForGivenDB(
689690
}
690691

691692
// ## SET PROPERTY FASTSTARTFAILOVERTARGET FOR EACH DATABASE TO ALL OTHER DATABASES IN DG CONFIG .
692-
if (m.Spec.FastStartFailOver.Enable == true){
693+
if m.Spec.FastStartFailOver.Enable {
693694
for i := 0; i < len(databases); i++ {
694695
out, err = dbcommons.ExecCommand(r, r.Config, standbyDatabaseReadyPod.Name, standbyDatabaseReadyPod.Namespace, "", ctx, req, false, "bash", "-c",
695696
fmt.Sprintf("dgmgrl sys@%s \"EDIT DATABASE %s SET PROPERTY FASTSTARTFAILOVERTARGET=%s\"< admin.pwd", primaryConnectString,
@@ -730,20 +731,22 @@ func (r *DataguardBrokerReconciler) setupDataguardBrokerConfigurationForGivenDB(
730731

731732
// #############################################################################
732733
//
733-
// Remove up DG Configuration for a given StandbyDatabase - To be Tested
734+
// Remove a Database from DG Configuration
734735
//
735736
// #############################################################################
736-
func (r *DataguardBrokerReconciler) removeDataguardBrokerConfigurationForGivenDB( m *dbapi.DataguardBroker,n *dbapi.SingleInstanceDatabase,standbyDatabase *dbapi.SingleInstanceDatabase, standbyDatabaseReadyPod corev1.Pod, sidbReadyPod corev1.Pod, ctx context.Context, req ctrl.Request) ctrl.Result {
737+
//
738+
//lint:ignore U1000 deferred for next release
739+
func (r *DataguardBrokerReconciler) removeDatabaseFromDGConfig(m *dbapi.DataguardBroker, n *dbapi.SingleInstanceDatabase, standbyDatabase *dbapi.SingleInstanceDatabase, standbyDatabaseReadyPod corev1.Pod, sidbReadyPod corev1.Pod, ctx context.Context, req ctrl.Request) ctrl.Result {
737740
log := r.Log.WithValues("removeDataguardBrokerConfigurationForGivenDB", req.NamespacedName)
738741

739-
if standbyDatabaseReadyPod.Name == "" || sidbReadyPod.Name == ""{
742+
if standbyDatabaseReadyPod.Name == "" || sidbReadyPod.Name == "" {
740743
return requeueY
741744
}
742745

743746
// ## CHECK IF DG CONFIGURATION IS AVAILABLE IN PRIMARY DATABASE ##
744-
out, err := dbcommons.ExecCommand(r, r.Config, sidbReadyPod.Name, sidbReadyPod.Namespace, "", ctx, req, false, "bash", "-c",
747+
out, err := dbcommons.ExecCommand(r, r.Config, sidbReadyPod.Name, sidbReadyPod.Namespace, "", ctx, req, false, "bash", "-c",
745748
fmt.Sprintf("echo -e \"%s\" | dgmgrl / as sysdba", dbcommons.DBShowConfigCMD))
746-
749+
747750
if err != nil {
748751
log.Error(err, err.Error())
749752
return requeueY
@@ -757,16 +760,16 @@ func (r *DataguardBrokerReconciler) removeDataguardBrokerConfigurationForGivenDB
757760
}
758761

759762
// ## REMOVING STANDBY DATABASE FROM DG CONFIGURATION ##
760-
out, err = dbcommons.ExecCommand(r, r.Config, sidbReadyPod.Name, sidbReadyPod.Namespace, "", ctx, req, false, "bash", "-c",
763+
_, err = dbcommons.ExecCommand(r, r.Config, sidbReadyPod.Name, sidbReadyPod.Namespace, "", ctx, req, false, "bash", "-c",
761764
fmt.Sprintf(dbcommons.CreateDGMGRLScriptFile, dbcommons.RemoveStandbyDBFromDGConfgCMD))
762765

763766
if err != nil {
764767
log.Error(err, err.Error())
765768
return requeueY
766769
}
767770

768-
// ## SHOW CONFIGURATION
769-
out, err = dbcommons.ExecCommand(r, r.Config, sidbReadyPod.Name, sidbReadyPod.Namespace, "", ctx, req, false, "bash", "-c",
771+
// ## SHOW CONFIGURATION
772+
_, err = dbcommons.ExecCommand(r, r.Config, sidbReadyPod.Name, sidbReadyPod.Namespace, "", ctx, req, false, "bash", "-c",
770773
fmt.Sprintf("echo -e \"%s\" | dgmgrl / as sysdba", dbcommons.DBShowConfigCMD))
771774
if err != nil {
772775
log.Error(err, err.Error())
@@ -1122,7 +1125,7 @@ func (r *DataguardBrokerReconciler) cleanupDataguardBroker(req ctrl.Request, ctx
11221125
return result, nil
11231126
}
11241127

1125-
// Get its Role
1128+
// Get its Role
11261129
out, err := dbcommons.GetDatabaseRole(sidbReadyPod, r, r.Config, ctx, req, singleInstanceDatabase.Spec.Edition)
11271130
if err != nil {
11281131
log.Error(err, err.Error())
@@ -1137,7 +1140,7 @@ func (r *DataguardBrokerReconciler) cleanupDataguardBroker(req ctrl.Request, ctx
11371140
}
11381141

11391142
// Get Primary database to remove dataguard configuration
1140-
_, out, err = dbcommons.GetDatabasesInDgConfig(sidbReadyPod, r, r.Config, ctx, req)
1143+
_, _, err = dbcommons.GetDatabasesInDgConfig(sidbReadyPod, r, r.Config, ctx, req)
11411144
if err != nil {
11421145
log.Error(err, err.Error())
11431146
return requeueY, err

‎controllers/database/singleinstancedatabase_controller.go

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ import (
4848

4949
dbapi "github.com/oracle/oracle-database-operator/apis/database/v1alpha1"
5050
dbcommons "github.com/oracle/oracle-database-operator/commons/database"
51+
"golang.org/x/text/cases"
52+
"golang.org/x/text/language"
5153

5254
"github.com/go-logr/logr"
5355
corev1 "k8s.io/api/core/v1"
@@ -130,7 +132,7 @@ func (r *SingleInstanceDatabaseReconciler) Reconcile(ctx context.Context, req ct
130132
if singleInstanceDatabase.Status.Status == "" {
131133
singleInstanceDatabase.Status.Status = dbcommons.StatusPending
132134
if singleInstanceDatabase.Spec.Edition != "" {
133-
singleInstanceDatabase.Status.Edition = strings.Title(singleInstanceDatabase.Spec.Edition)
135+
singleInstanceDatabase.Status.Edition = cases.Title(language.English).String(singleInstanceDatabase.Spec.Edition)
134136
} else {
135137
singleInstanceDatabase.Status.Edition = dbcommons.ValueUnavailable
136138
}
@@ -150,7 +152,7 @@ func (r *SingleInstanceDatabaseReconciler) Reconcile(ctx context.Context, req ct
150152
return result, nil
151153
}
152154
if err != nil {
153-
r.Log.Error(err,err.Error())
155+
r.Log.Error(err, err.Error())
154156
return result, err
155157
}
156158

@@ -205,8 +207,6 @@ func (r *SingleInstanceDatabaseReconciler) Reconcile(ctx context.Context, req ct
205207
}
206208
}
207209

208-
209-
210210
if strings.ToUpper(singleInstanceDatabase.Status.Role) == "PRIMARY" {
211211

212212
// Update DB config
@@ -236,17 +236,17 @@ func (r *SingleInstanceDatabaseReconciler) Reconcile(ctx context.Context, req ct
236236
if err != nil {
237237
return requeueY, err
238238
}
239-
240-
databaseOpenMode,err := dbcommons.GetDatabaseOpenMode(readyPod, r, r.Config, ctx, req, singleInstanceDatabase.Spec.Edition)
241-
239+
240+
databaseOpenMode, err := dbcommons.GetDatabaseOpenMode(readyPod, r, r.Config, ctx, req, singleInstanceDatabase.Spec.Edition)
241+
242242
if err != nil {
243243
r.Log.Error(err, err.Error())
244244
return requeueY, err
245245
}
246246
r.Log.Info("DB openMode Output")
247247
r.Log.Info(databaseOpenMode)
248248
if databaseOpenMode == "READ_ONLY" {
249-
out, err := dbcommons.ExecCommand(r, r.Config, readyPod.Name, readyPod.Namespace, "", ctx, req, false, "bash", "-c",fmt.Sprintf("echo -e \"%s\" | %s",dbcommons.ModifyStdbyDBOpenMode,dbcommons.SQLPlusCLI))
249+
out, err := dbcommons.ExecCommand(r, r.Config, readyPod.Name, readyPod.Namespace, "", ctx, req, false, "bash", "-c", fmt.Sprintf("echo -e \"%s\" | %s", dbcommons.ModifyStdbyDBOpenMode, dbcommons.SQLPlusCLI))
250250
if err != nil {
251251
r.Log.Error(err, err.Error())
252252
return requeueY, err
@@ -398,7 +398,7 @@ func (r *SingleInstanceDatabaseReconciler) validate(m *dbapi.SingleInstanceDatab
398398

399399
// If Express/Free Edition, ensure Replicas=1
400400
if (m.Spec.Edition == "express" || m.Spec.Edition == "free") && m.Spec.Replicas > 1 {
401-
eventMsgs = append(eventMsgs, m.Spec.Edition + " edition supports only one replica")
401+
eventMsgs = append(eventMsgs, m.Spec.Edition+" edition supports only one replica")
402402
}
403403
// If no persistence, ensure Replicas=1
404404
if m.Spec.Persistence.Size == "" && m.Spec.Replicas > 1 {
@@ -422,10 +422,10 @@ func (r *SingleInstanceDatabaseReconciler) validate(m *dbapi.SingleInstanceDatab
422422
eventMsgs = append(eventMsgs, "cloneFrom cannot be updated")
423423
}
424424
if (m.Spec.Edition == "express" || m.Spec.Edition == "free") && m.Spec.CloneFrom != "" {
425-
eventMsgs = append(eventMsgs, "cloning not supported for " + m.Spec.Edition + " edition")
425+
eventMsgs = append(eventMsgs, "cloning not supported for "+m.Spec.Edition+" edition")
426426
}
427427
if (m.Spec.Edition == "express" || m.Spec.Edition == "free") && m.Spec.PrimaryDatabaseRef != "" && m.Spec.CreateAsStandby {
428-
eventMsgs = append(eventMsgs, "Standby database creation is not supported for " + m.Spec.Edition + " edition")
428+
eventMsgs = append(eventMsgs, "Standby database creation is not supported for "+m.Spec.Edition+" edition")
429429
}
430430
if m.Status.OrdsReference != "" && m.Status.Persistence.Size != "" && m.Status.Persistence != m.Spec.Persistence {
431431
eventMsgs = append(eventMsgs, "uninstall ORDS to change Peristence")
@@ -1502,7 +1502,7 @@ func (r *SingleInstanceDatabaseReconciler) createOrReplaceSVC(ctx context.Contex
15021502
if sid == "" || pdbName == "" || edition == "" {
15031503
return requeueN, nil
15041504
}
1505-
m.Status.Edition = strings.Title(edition)
1505+
m.Status.Edition = cases.Title(language.English).String(edition)
15061506
}
15071507

15081508
if m.Spec.LoadBalancer {
@@ -2050,27 +2050,26 @@ func (r *SingleInstanceDatabaseReconciler) validateDBReadiness(m *dbapi.SingleIn
20502050
m.Status.ReleaseUpdate = version
20512051
}
20522052
}
2053-
dbMajorVersion, err := strconv.Atoi(strings.Split(m.Status.ReleaseUpdate,".")[0])
2053+
dbMajorVersion, err := strconv.Atoi(strings.Split(m.Status.ReleaseUpdate, ".")[0])
20542054
if err != nil {
20552055
r.Log.Error(err, err.Error())
20562056
return requeueY, readyPod, err
20572057
}
20582058
r.Log.Info("DB Major Version is " + strconv.Itoa(dbMajorVersion))
20592059
// Validating that free edition of the database is only supported from database 23c onwards
2060-
if (m.Spec.Edition == "free" && dbMajorVersion < 23){
2061-
r.Log.Info("Oracle Database Free is only supported from version 23c onwards")
2062-
r.Recorder.Eventf(m, corev1.EventTypeWarning, "Spec Error", "Oracle Database Free is only supported from version 23c onwards")
2060+
if m.Spec.Edition == "free" && dbMajorVersion < 23 {
2061+
errMsg := "the Oracle Database Free is only available from version 23c onwards"
2062+
r.Recorder.Eventf(m, corev1.EventTypeWarning, "Spec Error", errMsg)
20632063
m.Status.Status = dbcommons.StatusError
2064-
return requeueN, readyPod, errors.New("Oracle Database Free is only supported from version 23c onwards")
2064+
return requeueN, readyPod, errors.New(errMsg)
20652065
}
2066-
// Checking if OEM is supported in the provided Database version
2067-
if (dbMajorVersion >= 23 ) {
2066+
// Checking if OEM is supported in the provided Database version
2067+
if dbMajorVersion >= 23 {
20682068
m.Status.OemExpressUrl = dbcommons.ValueUnavailable
20692069
} else {
20702070
m.Status.OemExpressUrl = oemExpressUrl
20712071
}
20722072

2073-
20742073
if strings.ToUpper(m.Status.Role) == "PRIMARY" && m.Status.DatafilesPatched != "true" {
20752074
eventReason := "Datapatch Pending"
20762075
eventMsg := "datapatch execution pending"
@@ -2647,7 +2646,6 @@ func (r *SingleInstanceDatabaseReconciler) manageSingleInstanceDatabaseDeletion(
26472646
m *dbapi.SingleInstanceDatabase) (ctrl.Result, error) {
26482647
log := r.Log.WithValues("manageSingleInstanceDatabaseDeletion", req.NamespacedName)
26492648

2650-
26512649
// Check if the SingleInstanceDatabase instance is marked to be deleted, which is
26522650
// indicated by the deletion timestamp being set.
26532651
isSingleInstanceDatabaseMarkedToBeDeleted := m.GetDeletionTimestamp() != nil
@@ -2704,11 +2702,11 @@ func (r *SingleInstanceDatabaseReconciler) cleanupSingleInstanceDatabase(req ctr
27042702
return requeueY, nil
27052703
}
27062704

2707-
if (m.Status.DgBrokerConfigured){
2705+
if m.Status.DgBrokerConfigured {
27082706
eventReason := "Cannot Delete"
2709-
eventMsg := "Database cannot be deleted as it is present in a DataGuard Broker configuration"
2707+
eventMsg := "database cannot be deleted as it is present in a DataGuard Broker configuration"
27102708
r.Recorder.Eventf(m, corev1.EventTypeWarning, eventReason, eventReason)
2711-
return requeueY,errors.New(eventMsg)
2709+
return requeueY, errors.New(eventMsg)
27122710
}
27132711

27142712
// call deletePods() with zero pods in avaiable and nil readyPod to delete all pods
@@ -2864,7 +2862,7 @@ func ValidatePrimaryDatabaseForStandbyCreation(r *SingleInstanceDatabaseReconcil
28642862
log.Info(fmt.Sprintf("Validating primary database %s configuration...", primary.Name))
28652863
err = ValidateDatabaseConfiguration(primary)
28662864
if err != nil {
2867-
r.Recorder.Eventf(stdby,corev1.EventTypeWarning,"Spec Error", "all of Archivelog, Flashback and ForceLogging modes are not enabled in the primary database " + primary.Name)
2865+
r.Recorder.Eventf(stdby, corev1.EventTypeWarning, "Spec Error", "all of Archivelog, Flashback and ForceLogging modes are not enabled in the primary database "+primary.Name)
28682866
stdby.Status.Status = dbcommons.StatusError
28692867
return err
28702868
}

0 commit comments

Comments
 (0)