From 7974aebcc892c3b4bd88c40f5ca6bb0e45b1a0e1 Mon Sep 17 00:00:00 2001 From: Andrea Zucchini Date: Wed, 22 May 2024 18:05:36 +0100 Subject: [PATCH] test: use dms package [#187430076](https://www.pivotaltracker.com/story/show/187430076) --- .../aurora_mysql_data_migration_test.go | 14 +++++++------- acceptance-tests/mssql_data_migration_test.go | 14 +++++++------- acceptance-tests/mysql_data_migration_test.go | 14 +++++++------- acceptance-tests/postgresql_data_migration_test.go | 14 +++++++------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/acceptance-tests/aurora_mysql_data_migration_test.go b/acceptance-tests/aurora_mysql_data_migration_test.go index ca581d7e3..47fe03426 100644 --- a/acceptance-tests/aurora_mysql_data_migration_test.go +++ b/acceptance-tests/aurora_mysql_data_migration_test.go @@ -2,7 +2,7 @@ package acceptance_tests_test import ( "csbbrokerpakaws/acceptance-tests/helpers/apps" - dms2 "csbbrokerpakaws/acceptance-tests/helpers/awscli/dms" + "csbbrokerpakaws/acceptance-tests/helpers/awscli/dms" "csbbrokerpakaws/acceptance-tests/helpers/random" "csbbrokerpakaws/acceptance-tests/helpers/services" @@ -51,7 +51,7 @@ var _ = Describe("Aurora MySQL data migration", Label("aurora-mysql-migration"), defer csbServiceInstance.Delete() By("creating a replication instance") - replicationInstance := dms2.CreateReplicationInstance(metadata.VPC, metadata.Name, metadata.Region) + replicationInstance := dms.CreateReplicationInstance(metadata.VPC, metadata.Name, metadata.Region) defer replicationInstance.Cleanup() By("waiting for the replication instance to be ready") @@ -67,8 +67,8 @@ var _ = Describe("Aurora MySQL data migration", Label("aurora-mysql-migration"), Port int `mapstructure:"port"` } Expect(mapstructure.Decode(sourceCreds, &sourceReceiver)).NotTo(HaveOccurred()) - sourceEndpoint := dms2.CreateEndpoint(dms2.CreateEndpointParams{ - EndpointType: dms2.Source, + sourceEndpoint := dms.CreateEndpoint(dms.CreateEndpointParams{ + EndpointType: dms.Source, EnvironmentName: metadata.Name, Username: sourceReceiver.Username, Password: sourceReceiver.Password, @@ -91,8 +91,8 @@ var _ = Describe("Aurora MySQL data migration", Label("aurora-mysql-migration"), Port int `json:"port"` } csbKey.Get(&targetReceiver) - targetEndpoint := dms2.CreateEndpoint(dms2.CreateEndpointParams{ - EndpointType: dms2.Target, + targetEndpoint := dms.CreateEndpoint(dms.CreateEndpointParams{ + EndpointType: dms.Target, EnvironmentName: metadata.Name, Username: targetReceiver.Username, Password: targetReceiver.Password, @@ -105,7 +105,7 @@ var _ = Describe("Aurora MySQL data migration", Label("aurora-mysql-migration"), defer targetEndpoint.Cleanup() By("running the replication task") - dms2.RunReplicationTask(replicationInstance, sourceEndpoint, targetEndpoint, metadata.Region, "%") + dms.RunReplicationTask(replicationInstance, sourceEndpoint, targetEndpoint, metadata.Region, "%") By("deleting the target service key to trigger data ownership update") csbKey.Delete() diff --git a/acceptance-tests/mssql_data_migration_test.go b/acceptance-tests/mssql_data_migration_test.go index 8e762b950..0dd34e9cc 100644 --- a/acceptance-tests/mssql_data_migration_test.go +++ b/acceptance-tests/mssql_data_migration_test.go @@ -1,7 +1,7 @@ package acceptance_tests_test import ( - dms2 "csbbrokerpakaws/acceptance-tests/helpers/awscli/dms" + "csbbrokerpakaws/acceptance-tests/helpers/awscli/dms" "fmt" "os" "os/exec" @@ -32,7 +32,7 @@ var _ = Describe("MSSQL data migration", Label("mssql-migration"), func() { Expect(sourceAdminUsername).NotTo(BeEmpty(), "The MasterUsername environment variable is mandatory") By("creating a replication instance") - replicationInstance := dms2.CreateReplicationInstance(metadata.VPC, metadata.Name, metadata.Region) + replicationInstance := dms.CreateReplicationInstance(metadata.VPC, metadata.Name, metadata.Region) defer replicationInstance.Cleanup() By("creating a legacy service instance with the previous broker to serve as source") @@ -96,8 +96,8 @@ var _ = Describe("MSSQL data migration", Label("mssql-migration"), func() { Port int `mapstructure:"port"` } Expect(mapstructure.Decode(sourceCreds, &sourceReceiver)).NotTo(HaveOccurred()) - sourceEndpoint := dms2.CreateEndpoint(dms2.CreateEndpointParams{ - EndpointType: dms2.Source, + sourceEndpoint := dms.CreateEndpoint(dms.CreateEndpointParams{ + EndpointType: dms.Source, EnvironmentName: metadata.Name, Username: sourceAdminUsername, Password: sourceAdminPassword, @@ -134,8 +134,8 @@ var _ = Describe("MSSQL data migration", Label("mssql-migration"), func() { Port int `json:"port"` } csbKey.Get(&targetReceiver) - targetEndpoint := dms2.CreateEndpoint(dms2.CreateEndpointParams{ - EndpointType: dms2.Target, + targetEndpoint := dms.CreateEndpoint(dms.CreateEndpointParams{ + EndpointType: dms.Target, EnvironmentName: metadata.Name, Username: targetReceiver.Username, Password: targetReceiver.Password, @@ -148,7 +148,7 @@ var _ = Describe("MSSQL data migration", Label("mssql-migration"), func() { defer targetEndpoint.Cleanup() By("running the replication task") - dms2.RunReplicationTask(replicationInstance, sourceEndpoint, targetEndpoint, metadata.Region, schema) + dms.RunReplicationTask(replicationInstance, sourceEndpoint, targetEndpoint, metadata.Region, schema) By("switching the app data source from the legacy MSSQL to the new CSB created MSSQL") legacyBinding.Unbind() diff --git a/acceptance-tests/mysql_data_migration_test.go b/acceptance-tests/mysql_data_migration_test.go index 5d5ece8e7..b8593455c 100644 --- a/acceptance-tests/mysql_data_migration_test.go +++ b/acceptance-tests/mysql_data_migration_test.go @@ -2,7 +2,7 @@ package acceptance_tests_test import ( "csbbrokerpakaws/acceptance-tests/helpers/apps" - dms2 "csbbrokerpakaws/acceptance-tests/helpers/awscli/dms" + "csbbrokerpakaws/acceptance-tests/helpers/awscli/dms" "csbbrokerpakaws/acceptance-tests/helpers/random" "csbbrokerpakaws/acceptance-tests/helpers/services" @@ -14,7 +14,7 @@ import ( var _ = Describe("MySQL data migration", Label("mysql-migration"), func() { It("can migrate data from the previous broker to the CSB", func() { By("creating a replication instance") - replicationInstance := dms2.CreateReplicationInstance(metadata.VPC, metadata.Name, metadata.Region) + replicationInstance := dms.CreateReplicationInstance(metadata.VPC, metadata.Name, metadata.Region) defer replicationInstance.Cleanup() By("creating a legacy service instance with the previous broker to serve as source") @@ -62,8 +62,8 @@ var _ = Describe("MySQL data migration", Label("mysql-migration"), func() { Port int `mapstructure:"port"` } Expect(mapstructure.Decode(sourceCreds, &sourceReceiver)).NotTo(HaveOccurred()) - sourceEndpoint := dms2.CreateEndpoint(dms2.CreateEndpointParams{ - EndpointType: dms2.Source, + sourceEndpoint := dms.CreateEndpoint(dms.CreateEndpointParams{ + EndpointType: dms.Source, EnvironmentName: metadata.Name, Username: sourceReceiver.Username, Password: sourceReceiver.Password, @@ -86,8 +86,8 @@ var _ = Describe("MySQL data migration", Label("mysql-migration"), func() { Port int `json:"port"` } csbKey.Get(&targetReceiver) - targetEndpoint := dms2.CreateEndpoint(dms2.CreateEndpointParams{ - EndpointType: dms2.Target, + targetEndpoint := dms.CreateEndpoint(dms.CreateEndpointParams{ + EndpointType: dms.Target, EnvironmentName: metadata.Name, Username: targetReceiver.Username, Password: targetReceiver.Password, @@ -100,7 +100,7 @@ var _ = Describe("MySQL data migration", Label("mysql-migration"), func() { defer targetEndpoint.Cleanup() By("running the replication task") - dms2.RunReplicationTask(replicationInstance, sourceEndpoint, targetEndpoint, metadata.Region, sourceReceiver.DBName) + dms.RunReplicationTask(replicationInstance, sourceEndpoint, targetEndpoint, metadata.Region, sourceReceiver.DBName) By("deleting the target service key to trigger data ownership update") csbKey.Delete() diff --git a/acceptance-tests/postgresql_data_migration_test.go b/acceptance-tests/postgresql_data_migration_test.go index 089e44067..b7f465cb1 100644 --- a/acceptance-tests/postgresql_data_migration_test.go +++ b/acceptance-tests/postgresql_data_migration_test.go @@ -2,7 +2,7 @@ package acceptance_tests_test import ( "csbbrokerpakaws/acceptance-tests/helpers/apps" - dms2 "csbbrokerpakaws/acceptance-tests/helpers/awscli/dms" + "csbbrokerpakaws/acceptance-tests/helpers/awscli/dms" "csbbrokerpakaws/acceptance-tests/helpers/random" "csbbrokerpakaws/acceptance-tests/helpers/services" @@ -14,7 +14,7 @@ import ( var _ = Describe("PostgreSQL data migration", Label("postgresql-migration"), func() { It("can migrate data from the previous broker to the CSB", func() { By("creating a replication instance") - replicationInstance := dms2.CreateReplicationInstance(metadata.VPC, metadata.Name, metadata.Region) + replicationInstance := dms.CreateReplicationInstance(metadata.VPC, metadata.Name, metadata.Region) defer replicationInstance.Cleanup() By("creating a source service instance with the previous broker") @@ -61,8 +61,8 @@ var _ = Describe("PostgreSQL data migration", Label("postgresql-migration"), fun Port int `mapstructure:"port"` } Expect(mapstructure.Decode(sourceCreds, &sourceReceiver)).NotTo(HaveOccurred()) - sourceEndpoint := dms2.CreateEndpoint(dms2.CreateEndpointParams{ - EndpointType: dms2.Source, + sourceEndpoint := dms.CreateEndpoint(dms.CreateEndpointParams{ + EndpointType: dms.Source, EnvironmentName: metadata.Name, Username: sourceReceiver.Username, Password: sourceReceiver.Password, @@ -85,8 +85,8 @@ var _ = Describe("PostgreSQL data migration", Label("postgresql-migration"), fun Port int `json:"port"` } targetKey.Get(&targetReceiver) - targetEndpoint := dms2.CreateEndpoint(dms2.CreateEndpointParams{ - EndpointType: dms2.Target, + targetEndpoint := dms.CreateEndpoint(dms.CreateEndpointParams{ + EndpointType: dms.Target, EnvironmentName: metadata.Name, Username: targetReceiver.Username, Password: targetReceiver.Password, @@ -99,7 +99,7 @@ var _ = Describe("PostgreSQL data migration", Label("postgresql-migration"), fun defer targetEndpoint.Cleanup() By("running the replication task") - dms2.RunReplicationTask(replicationInstance, sourceEndpoint, targetEndpoint, metadata.Region, schema) + dms.RunReplicationTask(replicationInstance, sourceEndpoint, targetEndpoint, metadata.Region, schema) By("deleting the target service key to trigger data ownership update") targetKey.Delete()