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

Jump to bottom

Tech debt: Reduce tags boilerplate code - Plugin SDK resources f* (Phase 3c) #30534

Merged
merged 13 commits into from
Apr 10, 2023
Merged

Tech debt: Reduce tags boilerplate code - Plugin SDK resources f* (Phase 3c) #30534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1523e5d
Remove tagging boilerplate for Plugin SDK resources - firehose.
ewbankkit Apr 7, 2023
af75023
Remove tagging boilerplate for Plugin SDK resources - fis.
ewbankkit Apr 7, 2023
6b96153
Remove tagging boilerplate for Plugin SDK resources - fms.
ewbankkit Apr 7, 2023
9415472
Remove tagging boilerplate for Plugin SDK resources - fsx.
ewbankkit Apr 7, 2023
b93de28
Missed one.
ewbankkit Apr 7, 2023
d75b65e
Fix typo.
ewbankkit Apr 7, 2023
c187e43
r/aws_kinesis_firehose_delivery_stream: Remove 'aws_s3_bucket_acl' re…
ewbankkit Apr 7, 2023
0d17b20
'TestAccFirehoseDeliveryStream_s3basicWithTags' -> TestAccFirehoseDel…
ewbankkit Apr 7, 2023
d1874a7
Fix golangci-lint 'ineffassign'.
ewbankkit Apr 7, 2023
0ccbb42
Revert "Fix golangci-lint 'ineffassign'."
ewbankkit Apr 7, 2023
1a37340
Ignore error returned from 'findDataRepositoryAssociationsByIDs'.
ewbankkit Apr 7, 2023
d5d519d
r/aws_fsx_data_repository_association: Remove 'aws_s3_bucket_acl' res…
ewbankkit Apr 7, 2023
40f679a
r/aws_fsx_file_cache: Correct acceptance test names.
ewbankkit Apr 7, 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
67 changes: 18 additions & 49 deletions internal/service/firehose/delivery_stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
"github.com/hashicorp/terraform-provider-aws/internal/verify"
"github.com/hashicorp/terraform-provider-aws/names"
)

const (
Expand Down Expand Up @@ -842,7 +843,8 @@ func flattenHTTPEndpointConfiguration(description *firehose.HttpEndpointDestinat
return []map[string]interface{}{m}
}

// @SDKResource("aws_kinesis_firehose_delivery_stream")
// @SDKResource("aws_kinesis_firehose_delivery_stream", name="Delivery Stream")
// @Tags(identifierAttribute="name")
func ResourceDeliveryStream() *schema.Resource {
//lintignore:R011
return &schema.Resource{
Expand Down Expand Up @@ -885,9 +887,8 @@ func ResourceDeliveryStream() *schema.Resource {
ValidateFunc: validation.StringLenBetween(1, 64),
},

"tags": tftags.TagsSchema(),

"tags_all": tftags.TagsSchemaComputed(),
names.AttrTags: tftags.TagsSchema(),
names.AttrTagsAll: tftags.TagsSchemaComputed(),

"server_side_encryption": {
Type: schema.TypeList,
Expand Down Expand Up @@ -2575,62 +2576,56 @@ func resourceDeliveryStreamCreate(ctx context.Context, d *schema.ResourceData, m
}

conn := meta.(*conns.AWSClient).FirehoseConn()
defaultTagsConfig := meta.(*conns.AWSClient).DefaultTagsConfig
tags := defaultTagsConfig.MergeTags(tftags.New(ctx, d.Get("tags").(map[string]interface{})))

createInput := &firehose.CreateDeliveryStreamInput{
input := &firehose.CreateDeliveryStreamInput{
DeliveryStreamName: aws.String(sn),
Tags: GetTagsIn(ctx),
}

if v, ok := d.GetOk("kinesis_source_configuration"); ok {
sourceConfig := createSourceConfig(v.([]interface{})[0].(map[string]interface{}))
createInput.KinesisStreamSourceConfiguration = sourceConfig
createInput.DeliveryStreamType = aws.String(firehose.DeliveryStreamTypeKinesisStreamAsSource)
input.KinesisStreamSourceConfiguration = sourceConfig
input.DeliveryStreamType = aws.String(firehose.DeliveryStreamTypeKinesisStreamAsSource)
} else {
createInput.DeliveryStreamType = aws.String(firehose.DeliveryStreamTypeDirectPut)
input.DeliveryStreamType = aws.String(firehose.DeliveryStreamTypeDirectPut)
}

if d.Get("destination").(string) == destinationTypeExtendedS3 {
extendedS3Config := createExtendedS3Config(d)
createInput.ExtendedS3DestinationConfiguration = extendedS3Config
input.ExtendedS3DestinationConfiguration = extendedS3Config
} else {
s3Config := createS3Config(d)

if d.Get("destination").(string) == destinationTypeS3 {
createInput.S3DestinationConfiguration = s3Config
input.S3DestinationConfiguration = s3Config
} else if d.Get("destination").(string) == destinationTypeElasticsearch {
esConfig, err := createElasticsearchConfig(d, s3Config)
if err != nil {
return sdkdiag.AppendErrorf(diags, "creating Kinesis Firehose Delivery Stream (%s): %s", sn, err)
}
createInput.ElasticsearchDestinationConfiguration = esConfig
input.ElasticsearchDestinationConfiguration = esConfig
} else if d.Get("destination").(string) == destinationTypeRedshift {
rc, err := createRedshiftConfig(d, s3Config)
if err != nil {
return sdkdiag.AppendErrorf(diags, "creating Kinesis Firehose Delivery Stream (%s): %s", sn, err)
}
createInput.RedshiftDestinationConfiguration = rc
input.RedshiftDestinationConfiguration = rc
} else if d.Get("destination").(string) == destinationTypeSplunk {
rc, err := createSplunkConfig(d, s3Config)
if err != nil {
return sdkdiag.AppendErrorf(diags, "creating Kinesis Firehose Delivery Stream (%s): %s", sn, err)
}
createInput.SplunkDestinationConfiguration = rc
input.SplunkDestinationConfiguration = rc
} else if d.Get("destination").(string) == destinationTypeHTTPEndpoint {
rc, err := createHTTPEndpointConfig(d, s3Config)
if err != nil {
return sdkdiag.AppendErrorf(diags, "creating Kinesis Firehose Delivery Stream (%s): %s", sn, err)
}
createInput.HttpEndpointDestinationConfiguration = rc
input.HttpEndpointDestinationConfiguration = rc
}
}

if len(tags) > 0 {
createInput.Tags = Tags(tags.IgnoreAWS())
}

err := retry.RetryContext(ctx, propagationTimeout, func() *retry.RetryError {
_, err := conn.CreateDeliveryStreamWithContext(ctx, createInput)
_, err := conn.CreateDeliveryStreamWithContext(ctx, input)
if err != nil {
// Access was denied when calling Glue. Please ensure that the role specified in the data format conversion configuration has the necessary permissions.
if tfawserr.ErrMessageContains(err, firehose.ErrCodeInvalidArgumentException, "Access was denied") {
Expand Down Expand Up @@ -2660,7 +2655,7 @@ func resourceDeliveryStreamCreate(ctx context.Context, d *schema.ResourceData, m
return nil
})
if tfresource.TimedOut(err) {
_, err = conn.CreateDeliveryStreamWithContext(ctx, createInput)
_, err = conn.CreateDeliveryStreamWithContext(ctx, input)
}
if err != nil {
return sdkdiag.AppendErrorf(diags, "creating Kinesis Firehose Delivery Stream (%s): %s", sn, err)
Expand Down Expand Up @@ -2824,14 +2819,6 @@ func resourceDeliveryStreamUpdate(ctx context.Context, d *schema.ResourceData, m
}
}

if d.HasChange("tags_all") {
o, n := d.GetChange("tags_all")

if err := UpdateTags(ctx, conn, sn, o, n); err != nil {
return sdkdiag.AppendErrorf(diags, "updating Kinesis Firehose Delivery Stream (%s): updating tags: %s", sn, err)
}
}

if d.HasChange("server_side_encryption") {
_, n := d.GetChange("server_side_encryption")
if isDeliveryStreamOptionDisabled(n) {
Expand Down Expand Up @@ -2870,8 +2857,6 @@ func resourceDeliveryStreamUpdate(ctx context.Context, d *schema.ResourceData, m
func resourceDeliveryStreamRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
var diags diag.Diagnostics
conn := meta.(*conns.AWSClient).FirehoseConn()
defaultTagsConfig := meta.(*conns.AWSClient).DefaultTagsConfig
ignoreTagsConfig := meta.(*conns.AWSClient).IgnoreTagsConfig

sn := d.Get("name").(string)
s, err := FindDeliveryStreamByName(ctx, conn, sn)
Expand All @@ -2890,22 +2875,6 @@ func resourceDeliveryStreamRead(ctx context.Context, d *schema.ResourceData, met
return sdkdiag.AppendErrorf(diags, "reading Kinesis Firehose Delivery Stream (%s): %s", sn, err)
}

tags, err := ListTags(ctx, conn, sn)
if err != nil {
return sdkdiag.AppendErrorf(diags, "reading Kinesis Firehose Delivery Stream (%s): listing tags: %s", sn, err)
}

tags = tags.IgnoreAWS().IgnoreConfig(ignoreTagsConfig)

//lintignore:AWSR002
if err := d.Set("tags", tags.RemoveDefaultConfig(defaultTagsConfig).Map()); err != nil {
return sdkdiag.AppendErrorf(diags, "setting tags: %s", err)
}

if err := d.Set("tags_all", tags.Map()); err != nil {
return sdkdiag.AppendErrorf(diags, "setting tags_all: %s", err)
}

return diags
}

Expand Down
Loading