Merge pull request #102 from vshn/fix/redis-url

Fix Redis URL
vshn · Oct 16, 2023 · b0fba61 · b0fba61
2 parents 993448d + f5380d8
commit b0fba61
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Makefile.vars.mk b/Makefile.vars.mk
@@ -26,7 +26,7 @@ UPBOUND_PACKAGE_IMG ?= $(UPBOUND_CONTAINER_REGISTRY)/$(PROJECT_OWNER)/$(PROJECT_
 ## KIND:setup
 
 # https://hub.docker.com/r/kindest/node/tags
-KIND_NODE_VERSION ?= v1.24.0
+KIND_NODE_VERSION ?= v1.26.6
 KIND_IMAGE ?= docker.io/kindest/node:$(KIND_NODE_VERSION)
 KIND_KUBECONFIG ?= $(kind_dir)/kind-kubeconfig-$(KIND_NODE_VERSION)
 KIND_CLUSTER ?= $(PROJECT_NAME)-$(KIND_NODE_VERSION)

diff --git a/operator/rediscontroller/controller_test.go b/operator/rediscontroller/controller_test.go
@@ -291,7 +291,7 @@ func (ts *RedisControllerTestSuite) getRedisResponse(mg *exoscalev1.Redis, setti
 	providerSpec := mg.Spec.ForProvider
 	master := oapi.DbaasNodeStateRoleMaster
 	running := oapi.EnumServiceStateRunning
-
+	uri := "https://foo:bar@baz:5321"
 	return &oapi.GetDbaasServiceRedisResponse{
 		JSON200: &oapi.DbaasServiceRedis{
 			Maintenance: &oapi.DbaasServiceMaintenance{
@@ -318,7 +318,7 @@ func (ts *RedisControllerTestSuite) getRedisResponse(mg *exoscalev1.Redis, setti
 			}{
 				Uri: &[]string{"https://foo:bar@baz:5321"},
 			},
-			Uri:       nil,
+			Uri:       &uri,
 			UriParams: nil,
 			Users:     nil,
 			Version:   nil,

diff --git a/operator/rediscontroller/observe.go b/operator/rediscontroller/observe.go
@@ -106,10 +106,11 @@ func isUpToDate(current, external *exoscalev1.RedisParameters, log logr.Logger)
 }
 
 func connectionDetails(in oapi.DbaasServiceRedis) (map[string][]byte, error) {
-	if in.ConnectionInfo == nil || len(*in.ConnectionInfo.Uri) == 0 {
+	if in.Uri == nil {
 		return map[string][]byte{}, nil
 	}
-	uri := (*in.ConnectionInfo.Uri)[0]
+
+	uri := *in.Uri
 	parsed, err := url.Parse(uri)
 	if err != nil {
 		return nil, err