#52 fix password encoding in elasticsearch user resource (#53)

xco-sk · Apr 13, 2023 · b0fdc62 · b0fdc62
1 parent b8f952a
commit b0fdc62
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/charts/eck-custom-resources-operator/Chart.yaml b/charts/eck-custom-resources-operator/Chart.yaml
@@ -9,5 +9,5 @@ maintainers:
     email: [email protected]
     url: https://github.com/xco-sk
 type: application
-version: 0.5.2
-appVersion: 0.5.2
+version: 0.5.3
+appVersion: 0.5.3
diff --git a/charts/eck-custom-resources-operator/README.md b/charts/eck-custom-resources-operator/README.md
@@ -1,6 +1,6 @@
 # Helm chart for eck-custom-resources
 
-![Version: 0.5.2](https://img.shields.io/badge/Version-0.5.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.2](https://img.shields.io/badge/AppVersion-0.5.2-informational?style=flat-square)
+![Version: 0.5.3](https://img.shields.io/badge/Version-0.5.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.3](https://img.shields.io/badge/AppVersion-0.5.3-informational?style=flat-square)
 
 Helm chart for eck-custom-resources operator
 

diff --git a/config/samples/es.eck_v1alpha1_elasticsearchuser.yaml b/config/samples/es.eck_v1alpha1_elasticsearchuser.yaml
@@ -4,7 +4,7 @@ metadata:
   name: elasticsearchuser-secret
 type: Opaque
 data:
-  elasticsearchuser-sample: c2FtcGxlLnBhc3N3b3JkCg==
+  elasticsearchuser-sample: c2FtcGxlLnBhc3N3b3Jk
 
 ---
 apiVersion: es.eck.github.com/v1alpha1

diff --git a/utils/elasticsearch/user_utils.go b/utils/elasticsearch/user_utils.go
@@ -3,13 +3,14 @@ package elasticsearch
 import (
 	"context"
 	"encoding/json"
+	"strings"
+
 	"github.com/elastic/go-elasticsearch/v8"
 	"github.com/xco-sk/eck-custom-resources/apis/es.eck/v1alpha1"
 	"github.com/xco-sk/eck-custom-resources/utils"
 	k8sv1 "k8s.io/api/core/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"strings"
 )
 
 func DeleteUser(esClient *elasticsearch.Client, userName string) (ctrl.Result, error) {
@@ -36,7 +37,7 @@ func UpsertUser(esClient *elasticsearch.Client, cli client.Client, ctx context.C
 		return ctrl.Result{}, unmarshallErr
 	}
 
-	userBody["password"] = password
+	userBody["password"] = string(password)
 	userWithPassword, marshallErr := json.Marshal(userBody)
 	if marshallErr != nil {
 		return ctrl.Result{}, marshallErr