Skip to content

Commit

Permalink
Various acceptance test tweaks.
Browse files Browse the repository at this point in the history
  • Loading branch information
ewbankkit committed Oct 9, 2023
1 parent a98d503 commit 146ab14
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion internal/service/dms/endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -1431,7 +1431,7 @@ func resourceEndpointSetState(d *schema.ResourceData, endpoint *dms.Endpoint) er
d.Set("endpoint_arn", endpoint.EndpointArn)
d.Set("endpoint_id", endpoint.EndpointIdentifier)
// For some reason the AWS API only accepts lowercase type but returns it as uppercase
d.Set("endpoint_type", strings.ToLower(*endpoint.EndpointType))
d.Set("endpoint_type", strings.ToLower(aws.StringValue(endpoint.EndpointType)))
d.Set("engine_name", endpoint.EngineName)
d.Set("extra_connection_attributes", endpoint.ExtraConnectionAttributes)

Expand Down
8 changes: 6 additions & 2 deletions internal/service/dms/endpoint_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ func TestAccDMSEndpoint_S3_basic(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "s3_settings.0.bucket_folder", "new-bucket_folder"),
resource.TestCheckResourceAttr(resourceName, "s3_settings.0.bucket_name", "new-bucket_name"),
resource.TestCheckResourceAttr(resourceName, "s3_settings.0.compression_type", "GZIP"),
resource.TestCheckResourceAttr(resourceName, "s3_settings.0.glue_catalog_generation", "true"),
resource.TestCheckResourceAttr(resourceName, "s3_settings.0.glue_catalog_generation", "false"),
),
},
{
Expand Down Expand Up @@ -346,6 +346,8 @@ func TestAccDMSEndpoint_S3_detachTargetOnLobLookupFailureParquet(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "s3_settings.0.bucket_folder", "new-bucket_folder"),
resource.TestCheckResourceAttr(resourceName, "s3_settings.0.bucket_name", "new-bucket_name"),
resource.TestCheckResourceAttr(resourceName, "s3_settings.0.compression_type", "GZIP"),
resource.TestCheckResourceAttr(resourceName, "s3_settings.0.glue_catalog_generation", "true"),
resource.TestCheckResourceAttr(resourceName, "s3_settings.0.include_op_for_full_load", "true"),
),
},
{
Expand Down Expand Up @@ -2989,7 +2991,7 @@ resource "aws_dms_endpoint" "test" {
bucket_folder = "new-bucket_folder"
bucket_name = "new-bucket_name"
compression_type = "GZIP"
glue_catalog_generation = true
glue_catalog_generation = false
}
}
Expand Down Expand Up @@ -3069,6 +3071,8 @@ resource "aws_dms_endpoint" "test" {
bucket_folder = "new-bucket_folder"
bucket_name = "new-bucket_name"
compression_type = "GZIP"
glue_catalog_generation = true
include_op_for_full_load = true
}
}
Expand Down
8 changes: 4 additions & 4 deletions internal/service/dms/s3_endpoint_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ func TestAccDMSS3Endpoint_basic(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "encoding_type", "plain"),
resource.TestCheckResourceAttr(resourceName, "encryption_mode", "SSE_S3"),
resource.TestCheckResourceAttrPair(resourceName, "expected_bucket_owner", "data.aws_caller_identity.current", "account_id"),
resource.TestCheckResourceAttr(resourceName, "glue_catalog_generation", "true"),
resource.TestCheckResourceAttr(resourceName, "ignore_header_rows", "1"),
resource.TestCheckResourceAttr(resourceName, "include_op_for_full_load", "true"),
resource.TestCheckResourceAttr(resourceName, "max_file_size", "1000000"),
Expand All @@ -67,7 +68,6 @@ func TestAccDMSS3Endpoint_basic(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "timestamp_column_name", "tx_commit_time"),
resource.TestCheckResourceAttr(resourceName, "use_csv_no_sup_value", "false"),
resource.TestCheckResourceAttr(resourceName, "use_task_start_time_for_full_load_timestamp", "true"),
resource.TestCheckResourceAttr(resourceName, "glue_catalog_generation", "true"),
),
},
{
Expand Down Expand Up @@ -119,6 +119,7 @@ func TestAccDMSS3Endpoint_update(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "encoding_type", "plain"),
resource.TestCheckResourceAttr(resourceName, "encryption_mode", "SSE_S3"),
resource.TestCheckResourceAttrPair(resourceName, "expected_bucket_owner", "data.aws_caller_identity.current", "account_id"),
resource.TestCheckResourceAttr(resourceName, "glue_catalog_generation", "true"),
resource.TestCheckResourceAttr(resourceName, "ignore_header_rows", "1"),
resource.TestCheckResourceAttr(resourceName, "include_op_for_full_load", "true"),
resource.TestCheckResourceAttr(resourceName, "max_file_size", "1000000"),
Expand All @@ -132,7 +133,6 @@ func TestAccDMSS3Endpoint_update(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "timestamp_column_name", "tx_commit_time"),
resource.TestCheckResourceAttr(resourceName, "use_csv_no_sup_value", "false"),
resource.TestCheckResourceAttr(resourceName, "use_task_start_time_for_full_load_timestamp", "true"),
resource.TestCheckResourceAttr(resourceName, "glue_catalog_generation", "true"),
),
},
{
Expand Down Expand Up @@ -165,6 +165,7 @@ func TestAccDMSS3Endpoint_update(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "encoding_type", "plain"),
resource.TestCheckResourceAttr(resourceName, "encryption_mode", "SSE_S3"),
resource.TestCheckResourceAttrPair(resourceName, "expected_bucket_owner", "data.aws_caller_identity.current", "account_id"),
resource.TestCheckResourceAttr(resourceName, "glue_catalog_generation", "false"),
resource.TestCheckResourceAttr(resourceName, "ignore_header_rows", "1"),
resource.TestCheckResourceAttr(resourceName, "include_op_for_full_load", "false"),
resource.TestCheckResourceAttr(resourceName, "max_file_size", "900000"),
Expand All @@ -178,7 +179,6 @@ func TestAccDMSS3Endpoint_update(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "timestamp_column_name", "tx_commit_time2"),
resource.TestCheckResourceAttr(resourceName, "use_csv_no_sup_value", "true"),
resource.TestCheckResourceAttr(resourceName, "use_task_start_time_for_full_load_timestamp", "false"),
resource.TestCheckResourceAttr(resourceName, "glue_catalog_generation", "false"),
),
},
},
Expand Down Expand Up @@ -226,6 +226,7 @@ func TestAccDMSS3Endpoint_simple(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "encoding_type", ""),
resource.TestCheckResourceAttr(resourceName, "encryption_mode", ""),
resource.TestCheckResourceAttr(resourceName, "expected_bucket_owner", ""),
resource.TestCheckResourceAttr(resourceName, "glue_catalog_generation", "false"),
resource.TestCheckResourceAttr(resourceName, "ignore_header_rows", "0"),
resource.TestCheckResourceAttr(resourceName, "include_op_for_full_load", "false"),
resource.TestCheckResourceAttr(resourceName, "max_file_size", "0"),
Expand All @@ -239,7 +240,6 @@ func TestAccDMSS3Endpoint_simple(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "timestamp_column_name", ""),
resource.TestCheckResourceAttr(resourceName, "use_csv_no_sup_value", "false"),
resource.TestCheckResourceAttr(resourceName, "use_task_start_time_for_full_load_timestamp", "false"),
resource.TestCheckResourceAttr(resourceName, "glue_catalog_generation", "false"),
),
},
{
Expand Down

0 comments on commit 146ab14

Please sign in to comment.