Merge pull request #39756 from hashicorp/b-dms-acctest.CheckResourceA…

…ttrJSONNoDiff dms: Fix failing acceptance tests
hashicorp · Oct 16, 2024 · 18254f1 · 18254f1
2 parents b10bffc + 6967da3
commit 18254f1
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 37 deletions.
diff --git a/internal/service/dms/event_subscription_test.go b/internal/service/dms/event_subscription_test.go
@@ -221,7 +221,7 @@ resource "aws_dms_replication_subnet_group" "test" {
 
 resource "aws_dms_replication_instance" "test" {
  apply_immediately = true
- replication_instance_class = data.aws_partition.current.partition == "aws" ? "dms.t2.micro" : "dms.c4.large"
+ replication_instance_class = data.aws_partition.current.partition == "aws" ? "dms.t3.micro" : "dms.c4.large"
  replication_instance_id = %[1]q
  replication_subnet_group_id = aws_dms_replication_subnet_group.test.replication_subnet_group_id
 }

diff --git a/internal/service/dms/replication_config_test.go b/internal/service/dms/replication_config_test.go
@@ -55,7 +55,7 @@ func TestAccDMSReplicationConfig_basic(t *testing.T) {
  resource.TestCheckResourceAttrSet(resourceName, "compute_config.0.replication_subnet_group_id"),
  resource.TestCheckResourceAttr(resourceName, "compute_config.0.vpc_security_group_ids.#", acctest.Ct0),
  resource.TestCheckResourceAttr(resourceName, "replication_config_identifier", rName),
- acctest.CheckResourceAttrEquivalentJSON(resourceName, "replication_settings", defaultReplicationConfigSettings[migrationType]),
+ acctest.CheckResourceAttrJSONNoDiff(resourceName, "replication_settings", defaultReplicationConfigSettings[awstypes.MigrationTypeValue(migrationType)]),
  resource.TestCheckResourceAttr(resourceName, "replication_type", migrationType),
  resource.TestCheckNoResourceAttr(resourceName, "resource_identifier"),
  resource.TestCheckResourceAttrPair(resourceName, "source_endpoint_arn", "aws_dms_endpoint.source", "endpoint_arn"),
@@ -624,10 +624,10 @@ resource "aws_dms_replication_config" "test" {
 }
 
 var (
- defaultReplicationConfigSettings = map[string]string{
- "cdc":  defaultReplicationConfigCdcSettings,
- "full-load":  defaultReplicationConfigFullLoadSettings,
- "full-load-and-cdc": defaultReplicationConfigFullLoadAndCdcSettings,
+ defaultReplicationConfigSettings = map[awstypes.MigrationTypeValue]string{
+ awstypes.MigrationTypeValueCdc: defaultReplicationConfigCdcSettings,
+ awstypes.MigrationTypeValueFullLoad: defaultReplicationConfigFullLoadSettings,
+ awstypes.MigrationTypeValueFullLoadAndCdc: defaultReplicationConfigFullLoadAndCdcSettings,
  }
 
  //go:embed testdata/replication_config/defaults/cdc.json

diff --git a/internal/service/dms/replication_instance_test.go b/internal/service/dms/replication_instance_test.go
@@ -207,10 +207,10 @@ func TestAccDMSReplicationInstance_engineVersion(t *testing.T) {
  CheckDestroy: testAccCheckReplicationInstanceDestroy(ctx),
  Steps: []resource.TestStep{
  {
- Config: testAccReplicationInstanceConfig_engineVersion(rName, "3.4.7"),
+ Config: testAccReplicationInstanceConfig_engineVersion(rName, "3.5.2"),
  Check: resource.ComposeTestCheckFunc(
  testAccCheckReplicationInstanceExists(ctx, resourceName),
- resource.TestCheckResourceAttr(resourceName, names.AttrEngineVersion, "3.4.7"),
+ resource.TestCheckResourceAttr(resourceName, names.AttrEngineVersion, "3.5.2"),
  ),
  },
  {
@@ -220,10 +220,10 @@ func TestAccDMSReplicationInstance_engineVersion(t *testing.T) {
  ImportStateVerifyIgnore: []string{names.AttrAllowMajorVersionUpgrade, names.AttrApplyImmediately},
  },
  {
- Config: testAccReplicationInstanceConfig_engineVersion(rName, "3.5.1"),
+ Config: testAccReplicationInstanceConfig_engineVersion(rName, "3.5.3"),
  Check: resource.ComposeTestCheckFunc(
  testAccCheckReplicationInstanceExists(ctx, resourceName),
- resource.TestCheckResourceAttr(resourceName, names.AttrEngineVersion, "3.5.1"),
+ resource.TestCheckResourceAttr(resourceName, names.AttrEngineVersion, "3.5.3"),
  ),
  },
  },
@@ -526,7 +526,7 @@ data "aws_partition" "current" {}
 resource "aws_dms_replication_instance" "test" {
  allocated_storage = %[2]d
  apply_immediately = true
- replication_instance_class = data.aws_partition.current.partition == "aws" ? "dms.t2.micro" : "dms.c4.large"
+ replication_instance_class = data.aws_partition.current.partition == "aws" ? "dms.t3.micro" : "dms.c4.large"
  replication_instance_id = %[1]q
  replication_subnet_group_id = aws_dms_replication_subnet_group.test.id
 }
@@ -540,7 +540,7 @@ data "aws_partition" "current" {}
 resource "aws_dms_replication_instance" "test" {
  apply_immediately = true
  auto_minor_version_upgrade = %[2]t
- replication_instance_class = data.aws_partition.current.partition == "aws" ? "dms.t2.micro" : "dms.c4.large"
+ replication_instance_class = data.aws_partition.current.partition == "aws" ? "dms.t3.micro" : "dms.c4.large"
  replication_instance_id = %[1]q
  replication_subnet_group_id = aws_dms_replication_subnet_group.test.id
 }
@@ -554,7 +554,7 @@ data "aws_partition" "current" {}
 resource "aws_dms_replication_instance" "test" {
  apply_immediately = true
  availability_zone = data.aws_availability_zones.available.names[0]
- replication_instance_class = data.aws_partition.current.partition == "aws" ? "dms.t2.micro" : "dms.c4.large"
+ replication_instance_class = data.aws_partition.current.partition == "aws" ? "dms.t3.micro" : "dms.c4.large"
  replication_instance_id = %[1]q
  replication_subnet_group_id = aws_dms_replication_subnet_group.test.id
 }
@@ -569,7 +569,7 @@ resource "aws_dms_replication_instance" "test" {
  apply_immediately = true
  allow_major_version_upgrade = true
  engine_version = %[2]q
- replication_instance_class = data.aws_partition.current.partition == "aws" ? "dms.t2.micro" : "dms.c4.large"
+ replication_instance_class = data.aws_partition.current.partition == "aws" ? "dms.t3.micro" : "dms.c4.large"
  replication_instance_id = %[1]q
  replication_subnet_group_id = aws_dms_replication_subnet_group.test.id
 }
@@ -587,7 +587,7 @@ resource "aws_kms_key" "test" {
 resource "aws_dms_replication_instance" "test" {
  apply_immediately = true
  kms_key_arn = aws_kms_key.test.arn
- replication_instance_class = data.aws_partition.current.partition == "aws" ? "dms.t2.micro" : "dms.c4.large"
+ replication_instance_class = data.aws_partition.current.partition == "aws" ? "dms.t3.micro" : "dms.c4.large"
  replication_instance_id = %[1]q
  replication_subnet_group_id = aws_dms_replication_subnet_group.test.id
 }
@@ -601,7 +601,7 @@ data "aws_partition" "current" {}
 resource "aws_dms_replication_instance" "test" {
  apply_immediately = true
  multi_az = %[2]t
- replication_instance_class = data.aws_partition.current.partition == "aws" ? "dms.t2.micro" : "dms.c4.large"
+ replication_instance_class = data.aws_partition.current.partition == "aws" ? "dms.t3.micro" : "dms.c4.large"
  replication_instance_id = %[1]q
  replication_subnet_group_id = aws_dms_replication_subnet_group.test.id
 }
@@ -621,7 +621,7 @@ resource "aws_dms_replication_subnet_group" "test" {
 resource "aws_dms_replication_instance" "test" {
  apply_immediately = true
  network_type = %[2]q
- replication_instance_class = data.aws_partition.current.partition == "aws" ? "dms.t2.micro" : "dms.c4.large"
+ replication_instance_class = data.aws_partition.current.partition == "aws" ? "dms.t3.micro" : "dms.c4.large"
  replication_instance_id = %[1]q
  replication_subnet_group_id = aws_dms_replication_subnet_group.test.id
 }
@@ -635,7 +635,7 @@ data "aws_partition" "current" {}
 resource "aws_dms_replication_instance" "test" {
  apply_immediately = true
  preferred_maintenance_window = %[2]q
- replication_instance_class = data.aws_partition.current.partition == "aws" ? "dms.t2.micro" : "dms.c4.large"
+ replication_instance_class = data.aws_partition.current.partition == "aws" ? "dms.t3.micro" : "dms.c4.large"
  replication_instance_id = %[1]q
  replication_subnet_group_id = aws_dms_replication_subnet_group.test.id
 }
@@ -657,7 +657,7 @@ resource "aws_internet_gateway" "test" {
 resource "aws_dms_replication_instance" "test" {
  apply_immediately = true
  publicly_accessible = %[2]t
- replication_instance_class = data.aws_partition.current.partition == "aws" ? "dms.t2.micro" : "dms.c4.large"
+ replication_instance_class = data.aws_partition.current.partition == "aws" ? "dms.t3.micro" : "dms.c4.large"
  replication_instance_id = %[1]q
  replication_subnet_group_id = aws_dms_replication_subnet_group.test.id
 
@@ -692,7 +692,7 @@ resource "aws_security_group" "test" {
 
 resource "aws_dms_replication_instance" "test" {
  apply_immediately = true
- replication_instance_class = data.aws_partition.current.partition == "aws" ? "dms.t2.micro" : "dms.c4.large"
+ replication_instance_class = data.aws_partition.current.partition == "aws" ? "dms.t3.micro" : "dms.c4.large"
  replication_instance_id = %[1]q
  replication_subnet_group_id = aws_dms_replication_subnet_group.test.replication_subnet_group_id
  vpc_security_group_ids = [aws_security_group.test.id]

diff --git a/internal/service/dms/replication_task_test.go b/internal/service/dms/replication_task_test.go
@@ -54,7 +54,7 @@ func TestAccDMSReplicationTask_basic(t *testing.T) {
  resource.TestCheckNoResourceAttr(resourceName, "cdc_start_time"),
  resource.TestCheckResourceAttr(resourceName, "migration_type", migrationType),
  resource.TestCheckResourceAttrPair(resourceName, "replication_instance_arn", "aws_dms_replication_instance.test", "replication_instance_arn"),
- acctest.CheckResourceAttrEquivalentJSON(resourceName, "replication_task_settings", defaultReplicationTaskSettings[migrationType]),
+ acctest.CheckResourceAttrJSONNoDiff(resourceName, "replication_task_settings", defaultReplicationTaskSettings[awstypes.MigrationTypeValue(migrationType)]),
  resource.TestCheckResourceAttrPair(resourceName, "source_endpoint_arn", "aws_dms_endpoint.source", "endpoint_arn"),
  resource.TestCheckResourceAttr(resourceName, "start_replication_task", acctest.CtFalse),
  resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "ready"),
@@ -1284,10 +1284,10 @@ resource "aws_dms_replication_instance" "test2" {
 }
 
 var (
- defaultReplicationTaskSettings = map[string]string{
- "cdc":  defaultReplicationTaskCdcSettings,
- "full-load":  defaultReplicationTaskFullLoadSettings,
- "full-load-and-cdc": defaultReplicationTaskFullLoadAndCdcSettings,
+ defaultReplicationTaskSettings = map[awstypes.MigrationTypeValue]string{
+ awstypes.MigrationTypeValueCdc: defaultReplicationTaskCdcSettings,
+ awstypes.MigrationTypeValueFullLoad: defaultReplicationTaskFullLoadSettings,
+ awstypes.MigrationTypeValueFullLoadAndCdc: defaultReplicationTaskFullLoadAndCdcSettings,
  }
 
  //go:embed testdata/replication_task/defaults/cdc.json

diff --git a/internal/service/dms/testdata/replication_config/defaults/cdc.json b/internal/service/dms/testdata/replication_config/defaults/cdc.json
@@ -81,7 +81,11 @@
  }
  ],
  "CloudWatchLogGroup": null,
- "CloudWatchLogStream": null
+ "CloudWatchLogStream": null,
+ "LogConfiguration": {
+ "EnableTraceOnError": false,
+ "TraceOnErrorMb": 10
+ }
  },
  "StreamBufferSettings": {
  "StreamBufferCount": 3,
@@ -126,7 +130,8 @@
  "MaxFullLoadSubTasks": 8,
  "TransactionConsistencyTimeout": 600,
  "CreatePkAfterFullLoad": false,
- "TargetTablePrepMode": "DO_NOTHING"
+ "TargetTablePrepMode": "DO_NOTHING",
+ "PersistPartitionProgressForResumption": false
  },
  "TargetMetadata": {
  "ParallelApplyBufferSize": 0,
@@ -170,7 +175,8 @@
  "MinTransactionSize": 1000,
  "MemoryKeepTime": 60,
  "BatchApplyMemoryLimit": 500,
- "MemoryLimitTotal": 1024
+ "MemoryLimitTotal": 1024,
+ "RecoveryTimeout": -1
  },
  "ChangeProcessingDdlHandlingPolicy": {
  "HandleSourceTableDropped": true,

diff --git a/internal/service/dms/testdata/replication_config/defaults/full-load-and-cdc.json b/internal/service/dms/testdata/replication_config/defaults/full-load-and-cdc.json
@@ -81,7 +81,11 @@
  }
  ],
  "CloudWatchLogGroup": null,
- "CloudWatchLogStream": null
+ "CloudWatchLogStream": null,
+ "LogConfiguration": {
+ "EnableTraceOnError": false,
+ "TraceOnErrorMb": 10
+ }
  },
  "StreamBufferSettings": {
  "StreamBufferCount": 3,
@@ -126,7 +130,8 @@
  "MaxFullLoadSubTasks": 8,
  "TransactionConsistencyTimeout": 600,
  "CreatePkAfterFullLoad": false,
- "TargetTablePrepMode": "DROP_AND_CREATE"
+ "TargetTablePrepMode": "DROP_AND_CREATE",
+ "PersistPartitionProgressForResumption": false
  },
  "TargetMetadata": {
  "ParallelApplyBufferSize": 0,
@@ -170,7 +175,8 @@
  "MinTransactionSize": 1000,
  "MemoryKeepTime": 60,
  "BatchApplyMemoryLimit": 500,
- "MemoryLimitTotal": 1024
+ "MemoryLimitTotal": 1024,
+ "RecoveryTimeout": -1
  },
  "ChangeProcessingDdlHandlingPolicy": {
  "HandleSourceTableDropped": true,

diff --git a/internal/service/dms/testdata/replication_config/defaults/full-load.json b/internal/service/dms/testdata/replication_config/defaults/full-load.json
@@ -81,7 +81,11 @@
  }
  ],
  "CloudWatchLogGroup": null,
- "CloudWatchLogStream": null
+ "CloudWatchLogStream": null,
+ "LogConfiguration": {
+ "EnableTraceOnError": false,
+ "TraceOnErrorMb": 10
+ }
  },
  "StreamBufferSettings": {
  "StreamBufferCount": 3,
@@ -121,7 +125,8 @@
  "MaxFullLoadSubTasks": 8,
  "TransactionConsistencyTimeout": 600,
  "CreatePkAfterFullLoad": false,
- "TargetTablePrepMode": "DROP_AND_CREATE"
+ "TargetTablePrepMode": "DROP_AND_CREATE",
+ "PersistPartitionProgressForResumption": false
  },
  "TargetMetadata": {
  "ParallelApplyBufferSize": 0,
@@ -165,7 +170,8 @@
  "MinTransactionSize": 1000,
  "MemoryKeepTime": 60,
  "BatchApplyMemoryLimit": 500,
- "MemoryLimitTotal": 1024
+ "MemoryLimitTotal": 1024,
+ "RecoveryTimeout": -1
  },
  "ChangeProcessingDdlHandlingPolicy": {
  "HandleSourceTableDropped": true,

diff --git a/internal/service/dms/testdata/replication_task/defaults/cdc.json b/internal/service/dms/testdata/replication_task/defaults/cdc.json
@@ -167,7 +167,8 @@
  "MinTransactionSize": 1000,
  "MemoryKeepTime": 60,
  "BatchApplyMemoryLimit": 500,
- "MemoryLimitTotal": 1024
+ "MemoryLimitTotal": 1024,
+ "RecoveryTimeout": -1
  },
  "ChangeProcessingDdlHandlingPolicy": {
  "HandleSourceTableDropped": true,

diff --git a/internal/service/dms/testdata/replication_task/defaults/full-load-and-cdc.json b/internal/service/dms/testdata/replication_task/defaults/full-load-and-cdc.json
@@ -167,7 +167,8 @@
  "MinTransactionSize": 1000,
  "MemoryKeepTime": 60,
  "BatchApplyMemoryLimit": 500,
- "MemoryLimitTotal": 1024
+ "MemoryLimitTotal": 1024,
+ "RecoveryTimeout": -1
  },
  "ChangeProcessingDdlHandlingPolicy": {
  "HandleSourceTableDropped": true,

diff --git a/internal/service/dms/testdata/replication_task/defaults/full-load.json b/internal/service/dms/testdata/replication_task/defaults/full-load.json
@@ -163,7 +163,8 @@
  "MinTransactionSize": 1000,
  "MemoryKeepTime": 60,
  "BatchApplyMemoryLimit": 500,
- "MemoryLimitTotal": 1024
+ "MemoryLimitTotal": 1024,
+ "RecoveryTimeout": -1
  },
  "ChangeProcessingDdlHandlingPolicy": {
  "HandleSourceTableDropped": true,