rebase

Signed-off-by: Mikel Landa <mikel.landa@pepperservicing.es>

Author: Mikel-Landa

apis/mssql/v1alpha1/user_types.go

@@ -22,6 +22,12 @@ import (
 	xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
 )
 
+// UserTypes
+const (
+	UserTypeLocal = "Local"
+	UserTypeAD    = "AD"
+)
+
 // A UserSpec defines the desired state of a Database.
 type UserSpec struct {
 	xpv1.ResourceSpec `json:",inline"`

apis/mssql/v1alpha1/zz_generated.deepcopy.go

@@ -3,7 +3,8 @@ kind: User
 metadata:
   name: example-user-ad
   annotations:
-    crossplane.io/external-name: "example-user@example.com"
+    ##change to real user inside your AD
+    crossplane.io/external-name: "example-user@example-domain.com"
 spec:
   forProvider:
     type: AD

examples/mssql/ad/user.yaml

@@ -170,6 +170,8 @@ spec:
                     - name
                     - namespace
                     type: object
+                  type:
+                    type: string
                 type: object
               managementPolicies:
                 default:

package/crds/mssql.sql.crossplane.io_users.yaml

@@ -137,6 +137,20 @@ func (c *external) Observe(ctx context.Context, mg resource.Managed) (managed.Ex
 	}
 
 	var name string
+	var query string
+	var userType string
+	if cr.Spec.ForProvider.Type == nil {
+		userType = v1alpha1.UserTypeLocal
+	} else {
+		userType = *cr.Spec.ForProvider.Type
+	}
+	switch userType {
+	case v1alpha1.UserTypeAD:
+		query = "SELECT name FROM sys.database_principals WHERE type IN ('E','X') AND name = @p1"
+	case v1alpha1.UserTypeLocal:
+		query = "SELECT name FROM sys.database_principals WHERE type = 'S' AND name = @p1"
+	default:
+		return managed.ExternalObservation{}, errors.Errorf("Type '%s' is not valid", *cr.Spec.ForProvider.Type)
 
 	query := "SELECT name FROM sys.database_principals WHERE type = 'S' AND name = @p1"
 	err := c.db.Scan(ctx, xsql.Query{
@@ -170,9 +184,17 @@ func (c *external) Create(ctx context.Context, mg resource.Managed) (managed.Ext
 		return managed.ExternalCreation{}, errors.New(errNotUser)
 	}
 	var query string
-	var pw string
-	if t := cr.Spec.ForProvider.Type; t == nil || *t != "AD" {
-
+	var outPw string
+	var userType string
+	if cr.Spec.ForProvider.Type == nil {
+		userType = v1alpha1.UserTypeLocal
+	} else {
+		userType = *cr.Spec.ForProvider.Type
+	}
+	switch userType {
+	case v1alpha1.UserTypeAD:
+		query = fmt.Sprintf("CREATE USER %s FROM EXTERNAL PROVIDER", mssql.QuoteIdentifier(meta.GetExternalName(cr)))
+	case v1alpha1.UserTypeLocal:
 		pw, _, err := c.getPassword(ctx, cr)
 		if err != nil {
 			return managed.ExternalCreation{}, err
@@ -183,10 +205,10 @@ func (c *external) Create(ctx context.Context, mg resource.Managed) (managed.Ext
 				return managed.ExternalCreation{}, err
 			}
 		}
-
+		outPw = pw
 		query = fmt.Sprintf("CREATE USER %s WITH PASSWORD=%s", mssql.QuoteIdentifier(meta.GetExternalName(cr)), mssql.QuoteValue(pw))
-	} else {
-		query = fmt.Sprintf("CREATE USER %s", mssql.QuoteIdentifier(meta.GetExternalName(cr)))
+	default:
+		return managed.ExternalCreation{}, errors.Errorf("Type '%s' is not valid", *cr.Spec.ForProvider.Type)
 
 	}
 
@@ -205,7 +227,7 @@ func (c *external) Create(ctx context.Context, mg resource.Managed) (managed.Ext
 	}
 
 	return managed.ExternalCreation{
-		ConnectionDetails: c.db.GetConnectionDetails(meta.GetExternalName(cr), pw),
+		ConnectionDetails: c.db.GetConnectionDetails(meta.GetExternalName(cr), outPw),
 	}, nil
 }