\o/ tests

digitalocean · Feb 22, 2024 · 57d73ee · 57d73ee
1 parent 4edfd16
commit 57d73ee
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/controllers/credentials_secret.go b/controllers/credentials_secret.go
@@ -2,10 +2,11 @@ package controllers
 
 import (
 	"fmt"
+	"net/url"
+
 	"github.com/digitalocean/godo"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"net/url"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 

diff --git a/controllers/databaseuser_controller_test.go b/controllers/databaseuser_controller_test.go
@@ -1,6 +1,8 @@
 package controllers
 
 import (
+	"fmt"
+
 	"github.com/digitalocean/do-operator/api/v1alpha1"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -89,6 +91,8 @@ var _ = Describe("DatabaseUser controller", func() {
 				Expect(secret.OwnerReferences).To(ContainElement(dbUserOwnerReference))
 				Expect(string(secret.Data["username"])).To(Equal(userName))
 				Expect(secret.Data["password"]).NotTo(BeEmpty())
+				Expect(string(secret.Data["uri"])).To(Equal(fmt.Sprintf("postgresql://%s:%s@host:12345/database?sslmode=require", secret.Data["username"], secret.Data["password"])))
+				Expect(string(secret.Data["private_uri"])).To(Equal(fmt.Sprintf("postgresql://%s:%s@private-host:12345/private-database?sslmode=require", secret.Data["username"], secret.Data["password"])))
 			})
 
 			By("deleting the DatabaseUser object", func() {
@@ -184,6 +188,8 @@ var _ = Describe("DatabaseUser controller", func() {
 				Expect(secret.OwnerReferences).To(ContainElement(dbUserOwnerReference))
 				Expect(string(secret.Data["username"])).To(Equal(userName))
 				Expect(secret.Data["password"]).NotTo(BeEmpty())
+				Expect(string(secret.Data["uri"])).To(Equal(fmt.Sprintf("postgresql://%s:%s@host:12345/database?sslmode=require", secret.Data["username"], secret.Data["password"])))
+				Expect(string(secret.Data["private_uri"])).To(Equal(fmt.Sprintf("postgresql://%s:%s@private-host:12345/private-database?sslmode=require", secret.Data["username"], secret.Data["password"])))
 			})
 
 			By("deleting the DatabaseUser object", func() {

diff --git a/controllers/databaseuserreference_controller_test.go b/controllers/databaseuserreference_controller_test.go
@@ -1,6 +1,8 @@
 package controllers
 
 import (
+	"fmt"
+
 	"github.com/digitalocean/do-operator/api/v1alpha1"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -83,6 +85,8 @@ var _ = Describe("DatabaseUserReference controller", func() {
 				Expect(secret.OwnerReferences).To(ContainElement(dbUserRefOwnerReference))
 				Expect(string(secret.Data["username"])).To(Equal(userName))
 				Expect(secret.Data["password"]).NotTo(BeEmpty())
+				Expect(string(secret.Data["uri"])).To(Equal(fmt.Sprintf("postgresql://%s:%s@host:12345/database?sslmode=require", secret.Data["username"], secret.Data["password"])))
+				Expect(string(secret.Data["private_uri"])).To(Equal(fmt.Sprintf("postgresql://%s:%s@private-host:12345/private-database?sslmode=require", secret.Data["username"], secret.Data["password"])))
 			})
 
 			By("deleting the DatabaseUserReference object", func() {
@@ -172,6 +176,8 @@ var _ = Describe("DatabaseUserReference controller", func() {
 				Expect(secret.OwnerReferences).To(ContainElement(dbUserRefOwnerReference))
 				Expect(string(secret.Data["username"])).To(Equal(userName))
 				Expect(secret.Data["password"]).NotTo(BeEmpty())
+				Expect(string(secret.Data["uri"])).To(Equal(fmt.Sprintf("postgresql://%s:%s@host:12345/database?sslmode=require", secret.Data["username"], secret.Data["password"])))
+				Expect(string(secret.Data["private_uri"])).To(Equal(fmt.Sprintf("postgresql://%s:%s@private-host:12345/private-database?sslmode=require", secret.Data["username"], secret.Data["password"])))
 			})
 
 			By("deleting the DatabaseUserReference object", func() {

diff --git a/fakegodo/databases.go b/fakegodo/databases.go
@@ -90,7 +90,7 @@ func (f *FakeDatabasesService) Create(_ context.Context, req *godo.DatabaseCreat
 		RegionSlug:  req.Region,
 		CreatedAt:   time.Now(),
 		Connection: &godo.DatabaseConnection{
-			URI:      "uri",
+			URI:      "postgresql://user:password@host:12345/database?sslmode=require",
 			Database: "database",
 			Host:     "host",
 			Port:     12345,
@@ -99,7 +99,7 @@ func (f *FakeDatabasesService) Create(_ context.Context, req *godo.DatabaseCreat
 			SSL:      true,
 		},
 		PrivateConnection: &godo.DatabaseConnection{
-			URI:      "private-uri",
+			URI:      "postgresql://private-user:private-password@private-host:12345/private-database?sslmode=require",
 			Database: "private-database",
 			Host:     "private_host",
 			Port:     12345,