Merge pull request #62 from kloeckner-i/METAL-2772/bugfix_gsql_user_update

gsql user assignment fix

Author: hyunysmile

helm/db-operator-0.5.1.tgz

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "v0.11.1"
+appVersion: "v0.11.2"
 description: A Database Operator
 name: db-operator
 version: 0.5.1

helm/db-operator/Chart.yaml

@@ -3,7 +3,7 @@ entries:
   db-instances:
   - apiVersion: v1
     appVersion: "1.0"
-    created: "2021-06-02T17:18:46.768533+02:00"
+    created: "2021-06-03T13:51:39.828869+02:00"
     description: Database Instances for db operator
     digest: 312b8c8e7adff876cb43ff1243dcb176c2db5e5cff533806d903dc0fba44b8fd
     name: db-instances
@@ -12,7 +12,7 @@ entries:
     version: 0.5.1
   - apiVersion: v1
     appVersion: "1.0"
-    created: "2021-06-02T17:18:46.768111+02:00"
+    created: "2021-06-03T13:51:39.828342+02:00"
     description: Database Instances for db operator
     digest: 77e5674516f5f7257901da7c128cd75ff03f1f03a0291e8ffcbf0ec28bef24f6
     name: db-instances
@@ -21,7 +21,7 @@ entries:
     version: 0.5.0
   - apiVersion: v1
     appVersion: "1.0"
-    created: "2021-06-02T17:18:46.767665+02:00"
+    created: "2021-06-03T13:51:39.827814+02:00"
     description: Database Instances for db operator
     digest: b039af38554da0fc8037b16397d49757d2c0b1a9e652867309df81b45950f375
     name: db-instances
@@ -30,7 +30,7 @@ entries:
     version: 0.4.0
   - apiVersion: v1
     appVersion: "1.0"
-    created: "2021-06-02T17:18:46.766401+02:00"
+    created: "2021-06-03T13:51:39.82719+02:00"
     description: Database Instances for db operator
     digest: 3593c0f28606ed4ee028d779ce70b23e257f85d8c96f93449ed4deb25bcea208
     name: db-instances
@@ -39,7 +39,7 @@ entries:
     version: 0.3.1
   - apiVersion: v1
     appVersion: "1.0"
-    created: "2021-06-02T17:18:46.765891+02:00"
+    created: "2021-06-03T13:51:39.826597+02:00"
     description: Database Instances for db operator
     digest: 6abeb95a030681041d41bb416624846819a7fb284a1f9b8cd8ef00d4517343e4
     name: db-instances
@@ -48,7 +48,7 @@ entries:
     version: 0.3.0
   - apiVersion: v1
     appVersion: "1.0"
-    created: "2021-06-02T17:18:46.765283+02:00"
+    created: "2021-06-03T13:51:39.826101+02:00"
     description: Database Instances for db operator
     digest: ba545b09123c5cf0276da24cf16fcaeae1d51a92e253731768b35478fb0294f4
     name: db-instances
@@ -57,7 +57,7 @@ entries:
     version: 0.2.0
   - apiVersion: v1
     appVersion: "1.0"
-    created: "2021-06-02T17:18:46.764714+02:00"
+    created: "2021-06-03T13:51:39.825515+02:00"
     description: Database Instances for db operator
     digest: 0a9f5c620c9ee8d8e33ea96f797be989efab296fbeeca24e26c84fdb2136d704
     name: db-instances
@@ -66,17 +66,17 @@ entries:
     version: 0.1.0
   db-operator:
   - apiVersion: v1
-    appVersion: v0.11.1
-    created: "2021-06-02T17:18:46.774035+02:00"
+    appVersion: v0.11.2
+    created: "2021-06-03T13:51:39.83889+02:00"
     description: A Database Operator
-    digest: 22317d1893d139082b31683f654bd4a492bc6c4c7f99001c010d6c0d4a44ce3e
+    digest: 81e180978c9fa169a3a53e9b3a429e0de0770f989104c2f0120058c43e27e564
     name: db-operator
     urls:
     - https://kloeckner-i.github.io/db-operator/helm/db-operator-0.5.1.tgz
     version: 0.5.1
   - apiVersion: v1
     appVersion: v0.11.0
-    created: "2021-06-02T17:18:46.773364+02:00"
+    created: "2021-06-03T13:51:39.837896+02:00"
     description: A Database Operator
     digest: 5d41951841df565d7cd932af6735ac6dde371ab34ab95b63022ac787917e75d5
     name: db-operator
@@ -85,7 +85,7 @@ entries:
     version: 0.5.0
   - apiVersion: v1
     appVersion: v0.10.0
-    created: "2021-06-02T17:18:46.772686+02:00"
+    created: "2021-06-03T13:51:39.837116+02:00"
     description: A Database Operator
     digest: 35156de1b3147580058b99e9dfa84142587fc839f96933f8d7f070352ae3334e
     name: db-operator
@@ -94,7 +94,7 @@ entries:
     version: 0.4.2
   - apiVersion: v1
     appVersion: v0.10.0
-    created: "2021-06-02T17:18:46.771962+02:00"
+    created: "2021-06-03T13:51:39.836403+02:00"
     description: A Database Operator
     digest: ea285400e9559404de1a057275fe02dc2d0c727a395869c489cf5ed8f3a62700
     name: db-operator
@@ -103,7 +103,7 @@ entries:
     version: 0.4.1
   - apiVersion: v1
     appVersion: v0.10.0
-    created: "2021-06-02T17:18:46.771328+02:00"
+    created: "2021-06-03T13:51:39.835613+02:00"
     description: A Database Operator
     digest: 87d60156202002a3224ca04c8d90f201b2c29648f39c23f6507107bf23dcedc3
     name: db-operator
@@ -112,7 +112,7 @@ entries:
     version: 0.4.0
   - apiVersion: v1
     appVersion: "1.0"
-    created: "2021-06-02T17:18:46.770716+02:00"
+    created: "2021-06-03T13:51:39.834939+02:00"
     description: A Database Operator
     digest: 2a018ac35e235e895ca5fdbd2b32a0c291e971e11b3c29ef47bfaebef814af93
     name: db-operator
@@ -121,7 +121,7 @@ entries:
     version: 0.3.0
   - apiVersion: v1
     appVersion: "1.0"
-    created: "2021-06-02T17:18:46.770158+02:00"
+    created: "2021-06-03T13:51:39.833941+02:00"
     description: A Database Operator
     digest: a00294defa1914f326b363c1cb0d36b22297fefd71e72a83510c70a1a8020d31
     name: db-operator
@@ -130,7 +130,7 @@ entries:
     version: 0.2.0
   - apiVersion: v1
     appVersion: "1.0"
-    created: "2021-06-02T17:18:46.769614+02:00"
+    created: "2021-06-03T13:51:39.833228+02:00"
     description: A Database Operator
     digest: d2d2a7f6b7913585283d72cea95770067e6c9625479e349c2e18b7dc3fbd3a52
     name: db-operator
@@ -139,11 +139,11 @@ entries:
     version: 0.1.1
   - apiVersion: v1
     appVersion: "1.0"
-    created: "2021-06-02T17:18:46.76907+02:00"
+    created: "2021-06-03T13:51:39.829576+02:00"
     description: A Database Operator
     digest: 6f41f18fe10b74edaec021defdcca99e2c65b5ed60b3c53b3d7ee7b124ccfeb0
     name: db-operator
     urls:
     - https://kloeckner-i.github.io/db-operator/helm/db-operator-0.1.0.tgz
     version: 0.1.0
-generated: "2021-06-02T17:18:46.764011+02:00"
+generated: "2021-06-03T13:51:39.824033+02:00"

helm/index.yaml

@@ -187,13 +187,13 @@ func updateUserHandler(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json")
 
 	hostList, ok := r.URL.Query()["host"]
-	if !ok {
+	if !ok || hostList[0] == "" {
 		w.WriteHeader(http.StatusBadRequest)
 		json.NewEncoder(w).Encode("Missing parameter: host.")
 		return
 	}
 	nameList, ok := r.URL.Query()["name"]
-	if !ok {
+	if !ok || nameList[0] == "" {
 		w.WriteHeader(http.StatusBadRequest)
 		json.NewEncoder(w).Encode("Missing parameter: user.")
 		return
@@ -208,6 +208,8 @@ func updateUserHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	logrus.Infof("Request body: %v", sqlUser)
+
 	s := newapiService()
 	s.project = vars["project"]
 	s.instance = vars["instance"]

mock/sqladmin.go

@@ -34,6 +34,7 @@ func GsqlNew(name, config, user, password, apiEndpoint string) *Gsql {
 	return &Gsql{
 		Name:        name,
 		Config:      config,
+		User:        user,
 		Password:    password,
 		ProjectID:   projectID,
 		APIEndpoint: apiEndpoint,
@@ -153,7 +154,7 @@ func (ins *Gsql) updateUser() error {
 		Password: ins.Password,
 	}
 
-	resp, err := sqladminService.Users.Update(ins.ProjectID, ins.Name, rb).Host(host).Name(rb.Name).Context(ctx).Do()
+	resp, err := sqladminService.Users.Update(ins.ProjectID, ins.Name, rb).Host(host).Name(ins.User).Context(ctx).Do()
 	if err != nil {
 		return err
 	}