Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

r/aws_pipes_pipe: fix zero value vs null value on update #34487

Merged
merged 3 commits into from
Nov 22, 2023
Merged

r/aws_pipes_pipe: fix zero value vs null value on update #34487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af0a16f
aws_pipes_pipe: prevent zero value from state being passed on update
johnsonaj Nov 20, 2023
69c76f1
aws_pipes_pipe: add test
johnsonaj Nov 21, 2023
c2047ab
add CHANGELOG entry
johnsonaj Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/34487.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_pipes_pipe: Fix error when zero value is sent to `source_parameters` on update
```
78 changes: 78 additions & 0 deletions internal/service/pipes/pipe_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,6 +708,54 @@ func TestAccPipesPipe_kinesisSourceAndTarget(t *testing.T) {
ImportState: true,
ImportStateVerify: true,
},
{
Config: testAccPipeConfig_updateKinesis(rName, 10),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckPipeExists(ctx, resourceName, &pipe),
acctest.MatchResourceAttrRegionalARN(resourceName, "arn", "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))),
resource.TestCheckResourceAttr(resourceName, "description", "Managed by Terraform"),
resource.TestCheckResourceAttr(resourceName, "desired_state", "RUNNING"),
resource.TestCheckResourceAttr(resourceName, "enrichment", ""),
resource.TestCheckResourceAttr(resourceName, "enrichment_parameters.#", "0"),
resource.TestCheckResourceAttr(resourceName, "name", rName),
resource.TestCheckResourceAttrPair(resourceName, "role_arn", "aws_iam_role.test", "arn"),
resource.TestCheckResourceAttrPair(resourceName, "source", "aws_kinesis_stream.source", "arn"),
resource.TestCheckResourceAttr(resourceName, "source_parameters.#", "1"),
resource.TestCheckResourceAttr(resourceName, "source_parameters.0.activemq_broker_parameters.#", "0"),
resource.TestCheckResourceAttr(resourceName, "source_parameters.0.dynamodb_stream_parameters.#", "0"),
resource.TestCheckResourceAttr(resourceName, "source_parameters.0.filter_criteria.#", "0"),
resource.TestCheckResourceAttr(resourceName, "source_parameters.0.kinesis_stream_parameters.#", "1"),
resource.TestCheckResourceAttr(resourceName, "source_parameters.0.kinesis_stream_parameters.0.batch_size", "10"),
resource.TestCheckResourceAttr(resourceName, "source_parameters.0.kinesis_stream_parameters.0.dead_letter_config.#", "0"),
resource.TestCheckResourceAttr(resourceName, "source_parameters.0.kinesis_stream_parameters.0.maximum_batching_window_in_seconds", "0"),
resource.TestCheckResourceAttr(resourceName, "source_parameters.0.kinesis_stream_parameters.0.maximum_record_age_in_seconds", "0"),
resource.TestCheckResourceAttr(resourceName, "source_parameters.0.kinesis_stream_parameters.0.maximum_retry_attempts", "0"),
resource.TestCheckResourceAttr(resourceName, "source_parameters.0.kinesis_stream_parameters.0.on_partial_batch_item_failure", ""),
resource.TestCheckResourceAttr(resourceName, "source_parameters.0.kinesis_stream_parameters.0.parallelization_factor", "0"),
resource.TestCheckResourceAttr(resourceName, "source_parameters.0.kinesis_stream_parameters.0.starting_position", "LATEST"),
resource.TestCheckResourceAttr(resourceName, "source_parameters.0.kinesis_stream_parameters.0.starting_position_timestamp", ""),
resource.TestCheckResourceAttr(resourceName, "source_parameters.0.managed_streaming_kafka_parameters.#", "0"),
resource.TestCheckResourceAttr(resourceName, "source_parameters.0.rabbitmq_broker_parameters.#", "0"),
resource.TestCheckResourceAttr(resourceName, "source_parameters.0.self_managed_kafka_parameters.#", "0"),
resource.TestCheckResourceAttr(resourceName, "source_parameters.0.sqs_queue_parameters.#", "0"),
resource.TestCheckResourceAttr(resourceName, "tags.%", "0"),
resource.TestCheckResourceAttrPair(resourceName, "target", "aws_kinesis_stream.target", "arn"),
resource.TestCheckResourceAttr(resourceName, "target_parameters.#", "1"),
resource.TestCheckResourceAttr(resourceName, "target_parameters.0.batch_job_parameters.#", "0"),
resource.TestCheckResourceAttr(resourceName, "target_parameters.0.cloudwatch_logs_parameters.#", "0"),
resource.TestCheckResourceAttr(resourceName, "target_parameters.0.ecs_task_parameters.#", "0"),
resource.TestCheckResourceAttr(resourceName, "target_parameters.0.eventbridge_event_bus_parameters.#", "0"),
resource.TestCheckResourceAttr(resourceName, "target_parameters.0.http_parameters.#", "0"),
resource.TestCheckResourceAttr(resourceName, "target_parameters.0.input_template", ""),
resource.TestCheckResourceAttr(resourceName, "target_parameters.0.kinesis_stream_parameters.#", "1"),
resource.TestCheckResourceAttr(resourceName, "target_parameters.0.kinesis_stream_parameters.0.partition_key", "test"),
resource.TestCheckResourceAttr(resourceName, "target_parameters.0.lambda_function_parameters.#", "0"),
resource.TestCheckResourceAttr(resourceName, "target_parameters.0.redshift_data_parameters.#", "0"),
resource.TestCheckResourceAttr(resourceName, "target_parameters.0.sagemaker_pipeline_parameters.#", "0"),
resource.TestCheckResourceAttr(resourceName, "target_parameters.0.sqs_queue_parameters.#", "0"),
resource.TestCheckResourceAttr(resourceName, "target_parameters.0.step_function_state_machine_parameters.#", "0"),
),
},
},
})
}
Expand Down Expand Up @@ -2111,6 +2159,36 @@ resource "aws_pipes_pipe" "test" {
`, rName))
}

func testAccPipeConfig_updateKinesis(rName string, batchSize int) string {
return acctest.ConfigCompose(
testAccPipeConfig_base(rName),
testAccPipeConfig_baseKinesisSource(rName),
testAccPipeConfig_baseKinesisTarget(rName),
fmt.Sprintf(`
resource "aws_pipes_pipe" "test" {
depends_on = [aws_iam_role_policy.source, aws_iam_role_policy.target]

name = %[1]q
role_arn = aws_iam_role.test.arn
source = aws_kinesis_stream.source.arn
target = aws_kinesis_stream.target.arn

source_parameters {
kinesis_stream_parameters {
batch_size = %[2]d
starting_position = "LATEST"
}
}

target_parameters {
kinesis_stream_parameters {
partition_key = "test"
}
}
}
`, rName, batchSize))
}

func testAccPipeConfig_basicDynamoDBSourceCloudWatchLogsTarget(rName string) string {
return acctest.ConfigCompose(
testAccPipeConfig_base(rName),
Expand Down
18 changes: 9 additions & 9 deletions internal/service/pipes/source_parameters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ func expandUpdatePipeSourceActiveMQBrokerParameters(tfMap map[string]interface{}

apiObject := &types.UpdatePipeSourceActiveMQBrokerParameters{}

if v, ok := tfMap["batch_size"].(int); ok {
if v, ok := tfMap["batch_size"].(int); ok && v != 0 {
apiObject.BatchSize = aws.Int32(int32(v))
}

Expand Down Expand Up @@ -815,7 +815,7 @@ func expandUpdatePipeSourceDynamoDBStreamParameters(tfMap map[string]interface{}

apiObject := &types.UpdatePipeSourceDynamoDBStreamParameters{}

if v, ok := tfMap["batch_size"].(int); ok {
if v, ok := tfMap["batch_size"].(int); ok && v != 0 {
apiObject.BatchSize = aws.Int32(int32(v))
}

Expand All @@ -841,7 +841,7 @@ func expandUpdatePipeSourceDynamoDBStreamParameters(tfMap map[string]interface{}
apiObject.OnPartialBatchItemFailure = types.OnPartialBatchItemFailureStreams(v)
}

if v, ok := tfMap["parallelization_factor"].(int); ok {
if v, ok := tfMap["parallelization_factor"].(int); ok && v != 0 {
apiObject.ParallelizationFactor = aws.Int32(int32(v))
}

Expand Down Expand Up @@ -917,7 +917,7 @@ func expandUpdatePipeSourceKinesisStreamParameters(tfMap map[string]interface{})

apiObject := &types.UpdatePipeSourceKinesisStreamParameters{}

if v, ok := tfMap["batch_size"].(int); ok {
if v, ok := tfMap["batch_size"].(int); ok && v != 0 {
apiObject.BatchSize = aws.Int32(int32(v))
}

Expand All @@ -931,7 +931,7 @@ func expandUpdatePipeSourceKinesisStreamParameters(tfMap map[string]interface{})
apiObject.MaximumBatchingWindowInSeconds = aws.Int32(int32(v))
}

if v, ok := tfMap["maximum_record_age_in_seconds"].(int); ok {
if v, ok := tfMap["maximum_record_age_in_seconds"].(int); ok && v != 0 {
apiObject.MaximumRecordAgeInSeconds = aws.Int32(int32(v))
}

Expand All @@ -943,7 +943,7 @@ func expandUpdatePipeSourceKinesisStreamParameters(tfMap map[string]interface{})
apiObject.OnPartialBatchItemFailure = types.OnPartialBatchItemFailureStreams(v)
}

if v, ok := tfMap["parallelization_factor"].(int); ok {
if v, ok := tfMap["parallelization_factor"].(int); ok && v != 0 {
apiObject.ParallelizationFactor = aws.Int32(int32(v))
}

Expand Down Expand Up @@ -991,7 +991,7 @@ func expandUpdatePipeSourceManagedStreamingKafkaParameters(tfMap map[string]inte

apiObject := &types.UpdatePipeSourceManagedStreamingKafkaParameters{}

if v, ok := tfMap["batch_size"].(int); ok {
if v, ok := tfMap["batch_size"].(int); ok && v != 0 {
apiObject.BatchSize = aws.Int32(int32(v))
}

Expand Down Expand Up @@ -1067,7 +1067,7 @@ func expandUpdatePipeSourceRabbitMQBrokerParameters(tfMap map[string]interface{}

apiObject := &types.UpdatePipeSourceRabbitMQBrokerParameters{}

if v, ok := tfMap["batch_size"].(int); ok {
if v, ok := tfMap["batch_size"].(int); ok && v != 0 {
apiObject.BatchSize = aws.Int32(int32(v))
}

Expand Down Expand Up @@ -1243,7 +1243,7 @@ func expandUpdatePipeSourceSQSQueueParameters(tfMap map[string]interface{}) *typ

apiObject := &types.UpdatePipeSourceSqsQueueParameters{}

if v, ok := tfMap["batch_size"].(int); ok {
if v, ok := tfMap["batch_size"].(int); ok && v != 0 {
apiObject.BatchSize = aws.Int32(int32(v))
}

Expand Down