refactor: moving Azurite setup code to utils. (cloudnative-pg#419)

Moving Azurite setup code to utils.

Signed-off-by: Danish Khan <danish.khan@enterprisedb.com>
Signed-off-by: Tao Li <tao.li@enterprisedb.com>
Signed-off-by: Jitendra Wadle <jitendra.wadle@enterprisedb.com>
Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>

Co-authored-by: Tao Li <tao.li@enterprisedb.com>
Co-authored-by: Jitendra Wadle <jitendra.wadle@enterprisedb.com>
Co-authored-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>

Author: 4 people

tests/e2e/asserts_test.go

@@ -1185,28 +1185,6 @@ func CreateAndAssertClientCertificatesSecrets(
 	Expect(err).ToNot(HaveOccurred())
 }
 
-func CreateAndAssertCertificateSecretsOnAzurite(
-	namespace,
-	clusterName,
-	azuriteCaSecName,
-	azuriteTLSSecName string,
-) {
-	By("creating ca and tls certificate secrets", func() {
-		// create CA certificates
-		_, caPair, err := testsUtils.CreateSecretCA(namespace, clusterName, azuriteCaSecName, true, env)
-		Expect(err).ToNot(HaveOccurred())
-
-		// sign and create secret using CA certificate and key
-		serverPair, err := caPair.CreateAndSignPair("azurite", certs.CertTypeServer,
-			[]string{"azurite.internal.mydomain.net, azurite.default.svc, azurite.default,"},
-		)
-		Expect(err).ToNot(HaveOccurred())
-		serverSecret := serverPair.GenerateCertificateSecret(namespace, azuriteTLSSecName)
-		err = env.Client.Create(env.Ctx, serverSecret)
-		Expect(err).ToNot(HaveOccurred())
-	})
-}
-
 func AssertSSLVerifyFullDBConnectionFromAppPod(namespace string, clusterName string, appPod corev1.Pod) {
 	By("creating an app Pod and connecting to DB, using Certificate authentication", func() {
 		// Connecting to DB, using Certificate authentication
@@ -1326,14 +1304,6 @@ func AssertClusterAsyncReplica(namespace, sourceClusterFile, restoreClusterFile,
 	})
 }
 
-func AssertStorageCredentialsAreCreatedOnAzurite(namespace string) {
-	// This is required by Azurite deployment
-	secretFile := fixturesDir + "/backup/azurite/azurite-secret.yaml"
-	_, _, err := testsUtils.Run(fmt.Sprintf("kubectl apply -n %v -f %v",
-		namespace, secretFile))
-	Expect(err).ToNot(HaveOccurred())
-}
-
 func AssertClusterRestoreWithApplicationDB(namespace, restoreClusterFile, tableName string) {
 	restoredClusterName, err := env.GetResourceNameFromYAML(restoreClusterFile)
 	Expect(err).ToNot(HaveOccurred())
@@ -1735,18 +1705,21 @@ func prepareClusterForPITROnAzureBlob(namespace, clusterName, backupSampleFile,
 
 func prepareClusterOnAzurite(namespace, clusterName, clusterSampleFile string) {
 	By("creating the Azurite storage credentials", func() {
-		AssertStorageCredentialsAreCreatedOnAzurite(namespace)
+		err := testsUtils.CreateStorageCredentialsOnAzurite(namespace, env)
+		Expect(err).ToNot(HaveOccurred())
 	})
 
 	By("setting up Azurite to hold the backups", func() {
 		// Deploying azurite for blob storage
-		installAzurite(namespace)
+		err := testsUtils.InstallAzurite(namespace, env)
+		Expect(err).ToNot(HaveOccurred())
 	})
 
 	By("setting up az-cli", func() {
 		// This is required as we have a service of Azurite running locally.
 		// In order to connect, we need az cli inside the namespace
-		installAzCli(namespace)
+		err := testsUtils.InstallAzCli(namespace, env)
+		Expect(err).ToNot(HaveOccurred())
 	})
 
 	// Creating cluster
@@ -1812,50 +1785,6 @@ func prepareClusterForPITROnAzurite(namespace, clusterName, backupSampleFile str
 	AssertArchiveWalOnAzurite(namespace, clusterName)
 }
 
-func installAzurite(namespace string) {
-	// Create an Azurite for blob storage
-	azuriteDeploymentFile := fixturesDir +
-		"/backup/azurite/azurite-deployment.yaml"
-
-	_, _, err := testsUtils.Run(fmt.Sprintf("kubectl apply -n %v -f %v",
-		namespace, azuriteDeploymentFile))
-	Expect(err).ToNot(HaveOccurred())
-
-	// Wait for the Azurite pod to be ready
-	deploymentNamespacedName := types.NamespacedName{
-		Namespace: namespace,
-		Name:      "azurite",
-	}
-	Eventually(func() (int32, error) {
-		deployment := &appsv1.Deployment{}
-		err = env.Client.Get(env.Ctx, deploymentNamespacedName, deployment)
-		return deployment.Status.ReadyReplicas, err
-	}, 300).Should(BeEquivalentTo(1))
-
-	// Create an Azurite service
-	serviceFile := fixturesDir + "/backup/azurite/azurite-service.yaml"
-	_, _, err = testsUtils.Run(fmt.Sprintf("kubectl apply -n %v -f %v",
-		namespace, serviceFile))
-	Expect(err).ToNot(HaveOccurred())
-}
-
-func installAzCli(namespace string) {
-	clientFile := fixturesDir + "/backup/azurite/az-cli.yaml"
-	_, _, err := testsUtils.Run(fmt.Sprintf(
-		"kubectl apply -n %v -f %v",
-		namespace, clientFile))
-	Expect(err).ToNot(HaveOccurred())
-	azCliNamespacedName := types.NamespacedName{
-		Namespace: namespace,
-		Name:      "az-cli",
-	}
-	Eventually(func() (bool, error) {
-		az := &corev1.Pod{}
-		err = env.Client.Get(env.Ctx, azCliNamespacedName, az)
-		return utils.IsPodReady(*az), err
-	}, 180).Should(BeTrue())
-}
-
 func createAndAssertPgBouncerPoolerIsSetUp(namespace, poolerYamlFilePath string, expectedInstanceCount int) {
 	CreateResourceFromFile(namespace, poolerYamlFilePath)
 	Eventually(func() (int32, error) {

tests/e2e/backup_restore_test.go

@@ -513,7 +513,11 @@ var _ = Describe("Backup and restore", Label(tests.LabelBackupRestore), func() {
 			err = env.CreateNamespace(namespace)
 			Expect(err).ToNot(HaveOccurred())
 			// Create and assert ca and tls certificate secrets on Azurite
-			CreateAndAssertCertificateSecretsOnAzurite(namespace, clusterName, azuriteCaSecName, azuriteTLSSecName)
+			By("creating ca and tls certificate secrets", func() {
+				err := testUtils.CreateCertificateSecretsOnAzurite(namespace, clusterName,
+					azuriteCaSecName, azuriteTLSSecName, env)
+				Expect(err).ToNot(HaveOccurred())
+			})
 			// Setup Azurite and az cli along with Postgresql cluster
 			prepareClusterBackupOnAzurite(namespace, clusterName, azuriteBlobSampleFile, backupFile, tableName)
 		})
@@ -953,7 +957,11 @@ var _ = Describe("Clusters Recovery From Barman Object Store", Label(tests.Label
 			err = env.CreateNamespace(namespace)
 			Expect(err).ToNot(HaveOccurred())
 			// Create and assert ca and tls certificate secrets on Azurite
-			CreateAndAssertCertificateSecretsOnAzurite(namespace, clusterName, azuriteCaSecName, azuriteTLSSecName)
+			By("creating ca and tls certificate secrets", func() {
+				err := testUtils.CreateCertificateSecretsOnAzurite(namespace, clusterName,
+					azuriteCaSecName, azuriteTLSSecName, env)
+				Expect(err).ToNot(HaveOccurred())
+			})
 			// Setup Azurite and az cli along with PostgreSQL cluster
 			prepareClusterBackupOnAzurite(namespace, clusterName, azuriteBlobSampleFile, backupFileAzurite, tableName)
 		})