update user delete cmd logic

Author: Jeff McCormick

client/cmd/user.go

@@ -159,7 +159,7 @@ func userManager() {
 			}
 			if DeleteUser != "" {
 				fmt.Println("deleting user " + DeleteUser)
-				deleteUser(info, DeleteUser)
+				deleteUser(cluster.Spec.Name, info, DeleteUser)
 			}
 			if AddUser != "" {
 				fmt.Println("adding new user " + AddUser)
@@ -411,7 +411,7 @@ func addUser(clusterName string, info ConnInfo, newUser string) {
 	}
 
 }
-func deleteUser(info ConnInfo, user string) {
+func deleteUser(clusterName string, info ConnInfo, user string) {
 	var conn *sql.DB
 	var err error
 
@@ -423,7 +423,14 @@ func deleteUser(info ConnInfo, user string) {
 
 	var rows *sql.Rows
 
-	querystr := "drop user if exists " + user
+	querystr := "drop owned by  " + user + " cascade"
+	log.Debug(querystr)
+	rows, err = conn.Query(querystr)
+	if err != nil {
+		log.Debug(err.Error())
+		os.Exit(2)
+	}
+	querystr = "drop user if exists " + user
 	log.Debug(querystr)
 	rows, err = conn.Query(querystr)
 	if err != nil {
@@ -440,4 +447,10 @@ func deleteUser(info ConnInfo, user string) {
 		}
 	}()
 
+	err = util.DeleteUserSecret(Clientset, clusterName, user, Namespace)
+	if err != nil {
+		log.Debug(err.Error())
+		os.Exit(2)
+	}
+
 }

operator/util/secrets.go

@@ -250,3 +250,18 @@ func UpdateUserSecret(clientset *kubernetes.Clientset, clustername, username, pa
 
 	return err
 }
+
+func DeleteUserSecret(clientset *kubernetes.Clientset, clustername, username, namespace string) error {
+	//delete current secret
+	secretName := clustername + "-" + username + "-secret"
+
+	options := meta_v1.DeleteOptions{}
+	err := clientset.Secrets(namespace).Delete(secretName, &options)
+	if err != nil {
+		log.Error("error deleting secret" + err.Error())
+		return err
+	} else {
+		log.Info("deleted secret " + secretName)
+	}
+	return err
+}