From 39eca91a0c7a721627c9d2ec7db7ed9fa3c76e94 Mon Sep 17 00:00:00 2001 From: Balazs Gibizer Date: Thu, 28 Sep 2023 12:17:40 +0200 Subject: [PATCH] [envtest]Use database helpers from mariadb-operator This is necessary to remove a dependency cycle from lib-common --- go.mod | 2 +- go.sum | 4 ++-- tests/functional/heat_controller_test.go | 12 ++++++------ tests/functional/suite_test.go | 6 +++++- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 90faa3a9..6aedf6a2 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/openstack-k8s-operators/lib-common/modules/database v0.1.1-0.20230927082538-4f614f333d17 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.1.1-0.20230927082538-4f614f333d17 github.com/openstack-k8s-operators/lib-common/modules/test v0.1.2-0.20230927082538-4f614f333d17 - github.com/openstack-k8s-operators/mariadb-operator/api v0.1.1-0.20230918111825-8999b3b2dc3c + github.com/openstack-k8s-operators/mariadb-operator/api v0.1.1-0.20230928103342-106bb85983f4 k8s.io/api v0.26.9 k8s.io/apimachinery v0.26.9 k8s.io/client-go v0.26.9 diff --git a/go.sum b/go.sum index b5194921..2995a6d9 100644 --- a/go.sum +++ b/go.sum @@ -143,8 +143,8 @@ github.com/openstack-k8s-operators/lib-common/modules/openstack v0.1.1-0.2023092 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.1.1-0.20230927082538-4f614f333d17/go.mod h1:+iJZo5alCeOGD/524hWWdlINA6zqY+MjfWT7cDcbvBE= github.com/openstack-k8s-operators/lib-common/modules/test v0.1.2-0.20230927082538-4f614f333d17 h1:zJguNin+9IwRnGKy1A7ranxASKO1vTvWxoXwkCz8MWw= github.com/openstack-k8s-operators/lib-common/modules/test v0.1.2-0.20230927082538-4f614f333d17/go.mod h1:YOFHrNK/QqCvZUPlDJYmDyaCkbKIB98V04uyofiC9a8= -github.com/openstack-k8s-operators/mariadb-operator/api v0.1.1-0.20230918111825-8999b3b2dc3c h1:9R8T1WRwuPS5KMfsQWxAMSGPuJrGMJ7bODKK9dirhHA= -github.com/openstack-k8s-operators/mariadb-operator/api v0.1.1-0.20230918111825-8999b3b2dc3c/go.mod h1:xXHF/R/L0XamRHR/UkzlgzSTocBQ6GSQ2U16Q9Mf/bA= +github.com/openstack-k8s-operators/mariadb-operator/api v0.1.1-0.20230928103342-106bb85983f4 h1:37bbJ9XzpCvB+zZckdweJEEH3pqM6Q88OHH8eHFvlpI= +github.com/openstack-k8s-operators/mariadb-operator/api v0.1.1-0.20230928103342-106bb85983f4/go.mod h1:xhiz5wFdKWwVM7BF/VYon4TT3NuUPXp/Pyn2hWcp0CE= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= diff --git a/tests/functional/heat_controller_test.go b/tests/functional/heat_controller_test.go index d3907840..f0556c4d 100644 --- a/tests/functional/heat_controller_test.go +++ b/tests/functional/heat_controller_test.go @@ -334,8 +334,8 @@ var _ = Describe("Heat controller", func() { keystoneAPI := keystone.CreateKeystoneAPI(namespace) DeferCleanup(keystone.DeleteKeystoneAPI, keystoneAPI) DeferCleanup( - th.DeleteDBService, - th.CreateDBService( + mariadb.DeleteDBService, + mariadb.CreateDBService( namespace, GetHeat(heatName).Spec.DatabaseInstance, corev1.ServiceSpec{ @@ -343,7 +343,7 @@ var _ = Describe("Heat controller", func() { }, ), ) - th.SimulateMariaDBDatabaseCompleted(heatName) + mariadb.SimulateMariaDBDatabaseCompleted(heatName) }) It("should have db ready condition", func() { @@ -390,8 +390,8 @@ var _ = Describe("Heat controller", func() { keystoneAPI := keystone.CreateKeystoneAPI(namespace) DeferCleanup(keystone.DeleteKeystoneAPI, keystoneAPI) DeferCleanup( - th.DeleteDBService, - th.CreateDBService( + mariadb.DeleteDBService, + mariadb.CreateDBService( namespace, GetHeat(heatName).Spec.DatabaseInstance, corev1.ServiceSpec{ @@ -399,7 +399,7 @@ var _ = Describe("Heat controller", func() { }, ), ) - th.SimulateMariaDBDatabaseCompleted(heatName) + mariadb.SimulateMariaDBDatabaseCompleted(heatName) dbSyncJobName := types.NamespacedName{ Name: "heat-db-sync", Namespace: namespace, diff --git a/tests/functional/suite_test.go b/tests/functional/suite_test.go index 2699330e..08c7194c 100644 --- a/tests/functional/suite_test.go +++ b/tests/functional/suite_test.go @@ -31,6 +31,7 @@ import ( "github.com/openstack-k8s-operators/heat-operator/controllers" keystone_test "github.com/openstack-k8s-operators/keystone-operator/api/test/helpers" common_test "github.com/openstack-k8s-operators/lib-common/modules/test/helpers" + mariadb_test "github.com/openstack-k8s-operators/mariadb-operator/api/test/helpers" //+kubebuilder:scaffold:imports ) @@ -46,6 +47,7 @@ var ( logger logr.Logger th *common_test.TestHelper keystone *keystone_test.TestHelper + mariadb *mariadb_test.TestHelper namespace string ) @@ -122,7 +124,9 @@ var _ = BeforeSuite(func() { th = common_test.NewTestHelper(ctx, k8sClient, timeout, interval, logger) Expect(th).NotTo(BeNil()) keystone = keystone_test.NewTestHelper(ctx, k8sClient, timeout, interval, logger) - Expect(th).NotTo(BeNil()) + Expect(keystone).NotTo(BeNil()) + mariadb = mariadb_test.NewTestHelper(ctx, k8sClient, timeout, interval, logger) + Expect(mariadb).NotTo(BeNil()) // Start the controller-manager if goroutine webhookInstallOptions := &testEnv.WebhookInstallOptions