PTEUDO-2363: Implement AWS provider

helm/db-controller/minikube.yaml

@@ -1,4 +1,5 @@
 controllerConfig:
+  enableProvider: true
   #AWS us-east-1 GCP us-east1
   region: us-east-1
   vpcSecurityGroupIDRefs: box-3

internal/controller/databaseclaim_controller_tagging_test.go

@@ -164,6 +164,7 @@ var _ = Describe("Tagging", Ordered, func() {
 				},
 			}
 			mockReconciler.Config.Viper.Set("dbMultiAZEnabled", true)
+			mockReconciler.Config.Viper.Set("cloud", "aws")
 			mockReconciler.Setup()
 
 			// providing names of non-existing resources below
@@ -221,6 +222,7 @@ var _ = Describe("Tagging", Ordered, func() {
 				},
 			}
 			mockReconciler.Config.Viper.Set("dbMultiAZEnabled", false)
+			mockReconciler.Config.Viper.Set("cloud", "aws")
 			mockReconciler.Setup()
 
 			check, err := mockReconciler.Reconciler().ManageOperationalTagging(context.Background(), logger, name, name, true)
@@ -278,6 +280,7 @@ var _ = Describe("Tagging", Ordered, func() {
 				},
 			}
 			mockReconciler.Config.Viper.Set("dbMultiAZEnabled", true)
+			mockReconciler.Config.Viper.Set("cloud", "aws")
 			mockReconciler.Setup()
 
 			check, err := mockReconciler.Reconciler().ManageOperationalTagging(context.Background(), logger, name, name, true)
@@ -318,6 +321,7 @@ var _ = Describe("Tagging", Ordered, func() {
 				},
 			}
 			mockReconciler.Config.Viper.Set("dbMultiAZEnabled", true)
+			mockReconciler.Config.Viper.Set("cloud", "aws")
 			mockReconciler.Setup()
 
 			By("adding tags beforehand to .status.AtProvier.TagList. As in reality, if tags gets successfully added. It will reflect at the said path")

pkg/basefunctions/basefunctions.go

@@ -259,3 +259,7 @@ func GetDynamicHostWaitTime(viperConfig *viper.Viper) time.Duration {
 func GetDBIdentifierPrefix(viperConfig *viper.Viper) string {
 	return viperConfig.GetString("env")
 }
+
+func IsProviderEnable(viperConfig *viper.Viper) bool {
+	return viperConfig.GetBool("enableProvider")
+}

pkg/databaseclaim/databaseclaim.go

@@ -3,6 +3,7 @@ package databaseclaim
 import (
 	"context"
 	"fmt"
+	"github.com/infobloxopen/db-controller/pkg/providers"
 	"strings"
 	"time"
 
@@ -79,6 +80,7 @@ type DatabaseClaimReconciler struct {
 	Config        *DatabaseClaimConfig
 	kctl          *kctlutils.Client
 	statusManager *StatusManager
+	cloudProvider providers.Provider
 }
 
 // New returns a configured databaseclaim reconciler
@@ -88,6 +90,7 @@ func New(cli client.Client, cfg *DatabaseClaimConfig) *DatabaseClaimReconciler {
 		Config:        cfg,
 		kctl:          kctlutils.New(cli, cfg.Viper.GetString("SERVICE_NAMESPACE")),
 		statusManager: NewStatusManager(cli, cfg.Viper),
+		cloudProvider: providers.NewProvider(cfg.Viper, cli, cfg.Namespace),
 	}
 }
 
@@ -187,7 +190,12 @@ func (r *DatabaseClaimReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 				//ignore delete request, continue to process rds migration
 				return r.executeDbClaimRequest(ctx, &reqInfo, &dbClaim)
 			}
-			if basefun.GetCloud(r.Config.Viper) == "aws" {
+			if basefun.IsProviderEnable(r.Config.Viper) {
+				spec := NewDatabaseSpecFromRequestInfo(&reqInfo, &dbClaim, r.getMode(ctx, &reqInfo, &dbClaim), r.Config.Viper)
+				if _, err := r.cloudProvider.DeleteDatabaseResources(ctx, spec); err != nil {
+					return ctrl.Result{}, err
+				}
+			} else if basefun.GetCloud(r.Config.Viper) == "aws" {
 				// our finalizer is present, so lets handle any external dependency
 				if err := r.deleteExternalResourcesAWS(ctx, &reqInfo, &dbClaim); err != nil {
 					// if fail to delete the external dependency here, return with error
@@ -250,8 +258,40 @@ func (r *DatabaseClaimReconciler) createMetricsDeployment(ctx context.Context, d
 
 func (r *DatabaseClaimReconciler) postMigrationInProgress(ctx context.Context, dbClaim *v1.DatabaseClaim) (ctrl.Result, error) {
 	logger := log.FromContext(ctx).WithValues("databaseclaim", dbClaim.Namespace+"/"+dbClaim.Name)
-	logger.Info("Post migration is in progress")
+	logger.Info("post migration is in progress")
+
+	if basefun.IsProviderEnable(r.Config.Viper) {
+		dbInstanceName := strings.Split(dbClaim.Status.OldDB.ConnectionInfo.Host, ".")[0]
+		deleted, err := r.cloudProvider.DeleteDatabaseResources(ctx, providers.DatabaseSpec{ResourceName: dbInstanceName})
+		if err != nil {
+			return ctrl.Result{}, err
+		}
+
+		if time.Since(dbClaim.Status.OldDB.PostMigrationActionStartedAt.Time).Minutes() > 10 {
+			_, err := r.cloudProvider.DeleteDatabaseResources(ctx, providers.DatabaseSpec{ResourceName: dbInstanceName, TagInactive: false})
+			if err != nil {
+				return ctrl.Result{}, err
+			}
+			dbClaim.Status.OldDB = v1.StatusForOldDB{}
+		}
+
+		if !deleted {
+			return ctrl.Result{RequeueAfter: time.Minute}, nil
+		}
+
+		if err := r.statusManager.ClearError(ctx, dbClaim); err != nil {
+			logger.Error(err, "Error updating DatabaseClaim status")
+			return ctrl.Result{}, err
+		}
+
+		if !dbClaim.ObjectMeta.DeletionTimestamp.IsZero() {
+			return ctrl.Result{Requeue: true}, nil
+		}
+		return ctrl.Result{}, err
+	}
 
+	// TODO: after cloudProvider implementation is validated, below code can be deprecated
+	// get name of DBInstance from connectionInfo
 	dbInstanceName := strings.Split(dbClaim.Status.OldDB.ConnectionInfo.Host, ".")[0]
 	isAurora := dbClaim.Status.OldDB.Type == v1.AuroraPostgres
 	dbVersionPrefix := strings.Split(dbClaim.Status.OldDB.DBVersion, ".")[0]
@@ -515,7 +555,11 @@ func (r *DatabaseClaimReconciler) reconcileNewDB(ctx context.Context, reqInfo *r
 
 	isReady := false
 	var err error
-	if cloud == "aws" {
+	// TODO: Once the providers implementation is ready, we could completely remove this if cloud condition
+	if basefun.IsProviderEnable(r.Config.Viper) {
+		spec := NewDatabaseSpecFromRequestInfo(reqInfo, dbClaim, operationalMode, r.Config.Viper)
+		isReady, err = r.cloudProvider.CreateDatabase(ctx, spec)
+	} else if cloud == "aws" {
 		isReady, err = r.manageCloudHostAWS(ctx, reqInfo, dbClaim, operationalMode)
 		if err != nil {
 			logr.Error(err, "manage_cloud_host_AWS")
@@ -627,7 +671,7 @@ func (r *DatabaseClaimReconciler) providerCRAlreadyExists(ctx context.Context, r
 	case "gcp":
 		instance, cluster = &crossplanegcp.Instance{}, &crossplanegcp.Cluster{}
 	default:
-		return false, fmt.Errorf("unsupported cloud provider: %s", cloudProvider)
+		return false, fmt.Errorf("unsupported cloud cloudProvider: %s", cloudProvider)
 	}
 
 	exists := crExists(ctx, r.Client, dbHostIdentifier, cluster) && crExists(ctx, r.Client, dbHostIdentifier, instance)

pkg/databaseclaim/databaseclaim_test.go

@@ -132,8 +132,8 @@ func Test_providerCRAlreadyExists(t *testing.T) {
 		_, err := r.providerCRAlreadyExists(ctx, reqInfo, dbClaim)
 		if err == nil {
 			t.Errorf("expected an error but got nil")
-		} else if err.Error() != "unsupported cloud provider: anything" {
-			t.Errorf("expected error 'unsupported cloud provider: anything', got '%s'", err.Error())
+		} else if err.Error() != "unsupported cloud cloudProvider: anything" {
+			t.Errorf("expected error 'unsupported cloud cloudProvider: anything', got '%s'", err.Error())
 		}
 	})
 }

pkg/databaseclaim/requestinfo.go

@@ -3,6 +3,7 @@ package databaseclaim
 import (
 	"context"
 	"fmt"
+	"github.com/infobloxopen/db-controller/pkg/providers"
 
 	v1 "github.com/infobloxopen/db-controller/api/v1"
 	basefun "github.com/infobloxopen/db-controller/pkg/basefunctions"
@@ -94,3 +95,47 @@ func NewRequestInfo(ctx context.Context, cfg *viper.Viper, dbClaim *v1.DatabaseC
 
 	return ri, nil
 }
+
+func NewDatabaseSpecFromRequestInfo(ri *requestInfo, claim *v1.DatabaseClaim, mode ModeEnum, cfg *viper.Viper) providers.DatabaseSpec {
+	var snapshotID *string
+	if mode == M_UseNewDB && claim.Spec.RestoreFrom != "" {
+		snapshotID = &claim.Spec.RestoreFrom
+	}
+
+	var prefix string
+	suffix := "-" + ri.HostParams.Hash()
+
+	if basefun.GetDBIdentifierPrefix(cfg) != "" {
+		prefix = basefun.GetDBIdentifierPrefix(cfg) + "-"
+	}
+
+	return providers.DatabaseSpec{
+		ResourceName:                    prefix + claim.Name + suffix,
+		DatabaseName:                    ri.MasterConnInfo.DatabaseName,
+		DbType:                          ri.HostParams.Type,
+		Port:                            ri.HostParams.Port,
+		MinStorageGB:                    ri.HostParams.MinStorageGB,
+		MaxStorageGB:                    ri.HostParams.MaxStorageGB,
+		DBVersion:                       ri.HostParams.DBVersion,
+		MasterUsername:                  ri.HostParams.MasterUsername,
+		InstanceClass:                   ri.HostParams.InstanceClass,
+		StorageType:                     ri.HostParams.StorageType,
+		SkipFinalSnapshotBeforeDeletion: ri.HostParams.SkipFinalSnapshotBeforeDeletion,
+		PubliclyAccessible:              ri.HostParams.PubliclyAccessible,
+		EnableIAMDatabaseAuthentication: ri.HostParams.EnableIAMDatabaseAuthentication,
+		DeletionPolicy:                  ri.HostParams.DeletionPolicy,
+		IsDefaultVersion:                ri.HostParams.IsDefaultVersion,
+
+		EnablePerfInsight:          ri.EnablePerfInsight,
+		EnableCloudwatchLogsExport: ri.EnableCloudwatchLogsExport,
+		BackupRetentionDays:        ri.BackupRetentionDays,
+		CACertificateIdentifier:    &ri.CACertificateIdentifier,
+		Tags: providers.ConvertToProviderTags(claim.Spec.Tags, func(tag v1.Tag) (string, string) {
+			return tag.Key, tag.Value
+		}),
+		Labels:                     claim.Labels,
+		PreferredMaintenanceWindow: claim.Spec.PreferredMaintenanceWindow,
+		BackupPolicy:               claim.Spec.BackupPolicy, // this is added as a TAG
+		SnapshotID:                 snapshotID,
+	}
+}

pkg/providers/cloudnative_pg.go

@@ -9,12 +9,12 @@ import (
 type CloudNativePGProvider struct {
 }
 
-func newCloudNativePGProvider(k8sClient client.Client, config *viper.Viper, serviceNS string) Provider {
+func NewCloudNativePGProvider(k8sClient client.Client, config *viper.Viper) *CloudNativePGProvider {
 	return &CloudNativePGProvider{}
 }
 
-func (p *CloudNativePGProvider) CreateDatabase(ctx context.Context, spec DatabaseSpec) (bool, error) {
-	return false, nil
+func (p *CloudNativePGProvider) CreateDatabase(ctx context.Context, spec DatabaseSpec) error {
+	return nil
 }
 
 func (p *CloudNativePGProvider) DeleteDatabase(ctx context.Context, spec DatabaseSpec) error {