Improve maintenance code

cmd/maintenance.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"time"
@@ -20,6 +21,10 @@ var (
 	MaintenanceCMD = newMaintenanceCMD()
 )
 
+type Maintenance interface {
+	DoMaintenance(ctx context.Context) error
+}
+
 type service enumflag.Flag
 
 const (
@@ -73,6 +78,7 @@ func (c *controller) runMaintenance(cmd *cobra.Command, _ []string) error {
 		return err
 	}
 
+	var m Maintenance
 	switch serviceName {
 	case postgresql:
 
@@ -81,34 +87,31 @@ func (c *controller) runMaintenance(cmd *cobra.Command, _ []string) error {
 			return fmt.Errorf("missing environment variable: %s", "SG_NAMESPACE")
 		}
 
-		pg := maintenance.PostgreSQL{
+		m = &maintenance.PostgreSQL{
 			Client:       kubeClient,
 			SgURL:        "https://stackgres-restapi." + sgNamespace + ".svc",
 			MaintTimeout: time.Hour,
 		}
-		return pg.DoMaintenance(cmd.Context())
 	case redis:
-		r := maintenance.NewRedis(kubeClient, getHTTPClient())
-		return r.DoMaintenance(cmd.Context())
+		m = maintenance.NewRedis(kubeClient, getHTTPClient())
 
 	case minio:
-		m := maintenance.NewMinio(kubeClient, getHTTPClient())
-		return m.DoMaintenance(cmd.Context())
+		m = maintenance.NewMinio(kubeClient, getHTTPClient())
 
 	case mariadb:
-		m := maintenance.NewMariaDB(kubeClient, getHTTPClient())
-		return m.DoMaintenance(cmd.Context())
+		m = maintenance.NewMariaDB(kubeClient, getHTTPClient())
 
 	case keycloak:
-		k := maintenance.NewKeycloak(kubeClient, getHTTPClient())
-		return k.DoMaintenance(cmd.Context())
+		m = maintenance.NewKeycloak(kubeClient, getHTTPClient())
 
 	case nextcloud:
-		k := maintenance.NewNextcloud(kubeClient, getHTTPClient())
-		return k.DoMaintenance(cmd.Context())
+		m = maintenance.NewNextcloud(kubeClient, getHTTPClient())
+	default:
+
+		panic("service name is mandatory")
 	}
 
-	return nil
+	return m.DoMaintenance(cmd.Context())
 }
 
 func getHTTPClient() *http.Client {

pkg/maintenance/keycloak.go

@@ -21,8 +21,8 @@ type Keycloak struct {
 }
 
 // NewKeycloak returns a new Keycloak object
-func NewKeycloak(c client.Client, hc *http.Client) Keycloak {
-	return Keycloak{
+func NewKeycloak(c client.Client, hc *http.Client) *Keycloak {
+	return &Keycloak{
 		k8sClient:  c,
 		httpClient: hc,
 	}

pkg/maintenance/mariadb.go

@@ -20,8 +20,8 @@ type MariaDB struct {
 }
 
 // NewMariaDB returns a new Redis maintenance job runner
-func NewMariaDB(c client.Client, hc *http.Client) MariaDB {
-	return MariaDB{
+func NewMariaDB(c client.Client, hc *http.Client) *MariaDB {
+	return &MariaDB{
 		k8sClient:  c,
 		httpClient: hc,
 	}

pkg/maintenance/minio.go

@@ -31,8 +31,8 @@ type Minio struct {
 }
 
 // NewMinio returns a new Minio object
-func NewMinio(c client.Client, hc *http.Client) Minio {
-	return Minio{
+func NewMinio(c client.Client, hc *http.Client) *Minio {
+	return &Minio{
 		k8sClient:  c,
 		httpClient: hc,
 	}

pkg/maintenance/nextcloud.go

@@ -21,8 +21,8 @@ type Nextcloud struct {
 }
 
 // NewNextcloud returns a new Nextcloud object
-func NewNextcloud(c client.Client, hc *http.Client) Nextcloud {
-	return Nextcloud{
+func NewNextcloud(c client.Client, hc *http.Client) *Nextcloud {
+	return &Nextcloud{
 		k8sClient:  c,
 		httpClient: hc,
 	}

pkg/maintenance/redis.go

@@ -20,8 +20,8 @@ type Redis struct {
 }
 
 // NewRedis returns a new Redis maintenance job runner
-func NewRedis(c client.Client, hc *http.Client) Redis {
-	return Redis{
+func NewRedis(c client.Client, hc *http.Client) *Redis {
+	return &Redis{
 		k8sClient:  c,
 		httpClient: hc,
 	}