-
Notifications
You must be signed in to change notification settings - Fork 9.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #19429 from hashicorp/f-cloudwatch_metric_stream
r/aws_cloudwatch_metric_stream: New resource
- Loading branch information
Showing
7 changed files
with
1,108 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
```release-note:new-resource | ||
aws_cloudwatch_metric_stream | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
package waiter | ||
|
||
import ( | ||
"context" | ||
|
||
"github.com/aws/aws-sdk-go/aws" | ||
"github.com/aws/aws-sdk-go/service/cloudwatch" | ||
"github.com/hashicorp/aws-sdk-go-base/tfawserr" | ||
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" | ||
) | ||
|
||
func MetricStreamState(ctx context.Context, conn *cloudwatch.CloudWatch, name string) resource.StateRefreshFunc { | ||
return func() (interface{}, string, error) { | ||
input := cloudwatch.GetMetricStreamInput{ | ||
Name: aws.String(name), | ||
} | ||
|
||
metricStream, err := conn.GetMetricStreamWithContext(ctx, &input) | ||
if err != nil { | ||
if tfawserr.ErrCodeEquals(err, cloudwatch.ErrCodeResourceNotFoundException) { | ||
return nil, "", nil | ||
} | ||
return nil, "", err | ||
} | ||
|
||
return metricStream, aws.StringValue(metricStream.State), err | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
package waiter | ||
|
||
import ( | ||
"context" | ||
"time" | ||
|
||
"github.com/aws/aws-sdk-go/service/cloudwatch" | ||
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" | ||
) | ||
|
||
const ( | ||
MetricStreamDeleteTimeout = 2 * time.Minute | ||
MetricStreamReadyTimeout = 1 * time.Minute | ||
|
||
StateRunning = "running" | ||
StateStopped = "stopped" | ||
) | ||
|
||
func MetricStreamDeleted(ctx context.Context, conn *cloudwatch.CloudWatch, name string) (*cloudwatch.GetMetricStreamOutput, error) { | ||
stateConf := &resource.StateChangeConf{ | ||
Pending: []string{ | ||
StateRunning, | ||
StateStopped, | ||
}, | ||
Target: []string{}, | ||
Refresh: MetricStreamState(ctx, conn, name), | ||
Timeout: MetricStreamDeleteTimeout, | ||
} | ||
|
||
outputRaw, err := stateConf.WaitForStateContext(ctx) | ||
|
||
if v, ok := outputRaw.(*cloudwatch.GetMetricStreamOutput); ok { | ||
return v, err | ||
} | ||
|
||
return nil, err | ||
} | ||
|
||
func MetricStreamReady(ctx context.Context, conn *cloudwatch.CloudWatch, name string) (*cloudwatch.GetMetricStreamOutput, error) { | ||
stateConf := &resource.StateChangeConf{ | ||
Pending: []string{ | ||
StateStopped, | ||
}, | ||
Target: []string{ | ||
StateRunning, | ||
}, | ||
Refresh: MetricStreamState(ctx, conn, name), | ||
Timeout: MetricStreamReadyTimeout, | ||
} | ||
|
||
outputRaw, err := stateConf.WaitForStateContext(ctx) | ||
|
||
if v, ok := outputRaw.(*cloudwatch.GetMetricStreamOutput); ok { | ||
return v, err | ||
} | ||
|
||
return nil, err | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,279 @@ | ||
package aws | ||
|
||
import ( | ||
"context" | ||
"fmt" | ||
"log" | ||
"regexp" | ||
"time" | ||
|
||
"github.com/aws/aws-sdk-go/aws" | ||
"github.com/aws/aws-sdk-go/service/cloudwatch" | ||
"github.com/hashicorp/aws-sdk-go-base/tfawserr" | ||
"github.com/hashicorp/terraform-plugin-sdk/v2/diag" | ||
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" | ||
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" | ||
"github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" | ||
"github.com/terraform-providers/terraform-provider-aws/aws/internal/naming" | ||
"github.com/terraform-providers/terraform-provider-aws/aws/internal/service/cloudwatch/waiter" | ||
) | ||
|
||
func resourceAwsCloudWatchMetricStream() *schema.Resource { | ||
return &schema.Resource{ | ||
CreateContext: resourceAwsCloudWatchMetricStreamCreate, | ||
ReadContext: resourceAwsCloudWatchMetricStreamRead, | ||
UpdateContext: resourceAwsCloudWatchMetricStreamCreate, | ||
DeleteContext: resourceAwsCloudWatchMetricStreamDelete, | ||
|
||
Importer: &schema.ResourceImporter{ | ||
StateContext: schema.ImportStatePassthroughContext, | ||
}, | ||
|
||
Timeouts: &schema.ResourceTimeout{ | ||
Create: schema.DefaultTimeout(waiter.MetricStreamReadyTimeout), | ||
Delete: schema.DefaultTimeout(waiter.MetricStreamDeleteTimeout), | ||
}, | ||
|
||
CustomizeDiff: SetTagsDiff, | ||
|
||
Schema: map[string]*schema.Schema{ | ||
"arn": { | ||
Type: schema.TypeString, | ||
Computed: true, | ||
}, | ||
"creation_date": { | ||
Type: schema.TypeString, | ||
Computed: true, | ||
}, | ||
"exclude_filter": { | ||
Type: schema.TypeSet, | ||
Optional: true, | ||
ConflictsWith: []string{"include_filter"}, | ||
Elem: &schema.Resource{ | ||
Schema: map[string]*schema.Schema{ | ||
"namespace": { | ||
Type: schema.TypeString, | ||
Required: true, | ||
ValidateFunc: validation.StringLenBetween(1, 255), | ||
}, | ||
}, | ||
}, | ||
}, | ||
"firehose_arn": { | ||
Type: schema.TypeString, | ||
Required: true, | ||
ValidateFunc: validateArn, | ||
}, | ||
"include_filter": { | ||
Type: schema.TypeSet, | ||
Optional: true, | ||
ConflictsWith: []string{"exclude_filter"}, | ||
Elem: &schema.Resource{ | ||
Schema: map[string]*schema.Schema{ | ||
"namespace": { | ||
Type: schema.TypeString, | ||
Required: true, | ||
ValidateFunc: validation.StringLenBetween(1, 255), | ||
}, | ||
}, | ||
}, | ||
}, | ||
"last_update_date": { | ||
Type: schema.TypeString, | ||
Computed: true, | ||
}, | ||
"name": { | ||
Type: schema.TypeString, | ||
Optional: true, | ||
Computed: true, | ||
ForceNew: true, | ||
ConflictsWith: []string{"name_prefix"}, | ||
ValidateFunc: validateCloudWatchMetricStreamName, | ||
}, | ||
"name_prefix": { | ||
Type: schema.TypeString, | ||
Optional: true, | ||
Computed: true, | ||
ForceNew: true, | ||
ConflictsWith: []string{"name"}, | ||
ValidateFunc: validateCloudWatchMetricStreamName, | ||
}, | ||
"output_format": { | ||
Type: schema.TypeString, | ||
Required: true, | ||
ValidateFunc: validation.StringLenBetween(1, 255), | ||
}, | ||
"role_arn": { | ||
Type: schema.TypeString, | ||
Required: true, | ||
ValidateFunc: validateArn, | ||
}, | ||
"state": { | ||
Type: schema.TypeString, | ||
Computed: true, | ||
}, | ||
"tags": tagsSchema(), | ||
"tags_all": tagsSchemaComputed(), | ||
}, | ||
} | ||
} | ||
|
||
func resourceAwsCloudWatchMetricStreamCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { | ||
conn := meta.(*AWSClient).cloudwatchconn | ||
defaultTagsConfig := meta.(*AWSClient).DefaultTagsConfig | ||
tags := defaultTagsConfig.MergeTags(keyvaluetags.New(d.Get("tags").(map[string]interface{}))) | ||
|
||
name := naming.Generate(d.Get("name").(string), d.Get("name_prefix").(string)) | ||
|
||
params := cloudwatch.PutMetricStreamInput{ | ||
Name: aws.String(name), | ||
FirehoseArn: aws.String(d.Get("firehose_arn").(string)), | ||
RoleArn: aws.String(d.Get("role_arn").(string)), | ||
OutputFormat: aws.String(d.Get("output_format").(string)), | ||
Tags: tags.IgnoreAws().CloudwatchTags(), | ||
} | ||
|
||
if v, ok := d.GetOk("include_filter"); ok && v.(*schema.Set).Len() > 0 { | ||
params.IncludeFilters = expandCloudWatchMetricStreamFilters(v.(*schema.Set)) | ||
} | ||
|
||
if v, ok := d.GetOk("exclude_filter"); ok && v.(*schema.Set).Len() > 0 { | ||
params.ExcludeFilters = expandCloudWatchMetricStreamFilters(v.(*schema.Set)) | ||
} | ||
|
||
log.Printf("[DEBUG] Putting CloudWatch MetricStream: %#v", params) | ||
_, err := conn.PutMetricStreamWithContext(ctx, ¶ms) | ||
if err != nil { | ||
return diag.FromErr(fmt.Errorf("putting metric_stream failed: %s", err)) | ||
} | ||
d.SetId(name) | ||
log.Println("[INFO] CloudWatch MetricStream put finished") | ||
|
||
return resourceAwsCloudWatchMetricStreamRead(ctx, d, meta) | ||
} | ||
|
||
func resourceAwsCloudWatchMetricStreamRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { | ||
conn := meta.(*AWSClient).cloudwatchconn | ||
defaultTagsConfig := meta.(*AWSClient).DefaultTagsConfig | ||
ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig | ||
|
||
output, err := waiter.MetricStreamReady(ctx, conn, d.Id()) | ||
|
||
if !d.IsNewResource() && tfawserr.ErrCodeEquals(err, cloudwatch.ErrCodeResourceNotFoundException) { | ||
log.Printf("[WARN] CloudWatch Metric Stream (%s) not found, removing from state", d.Id()) | ||
d.SetId("") | ||
return nil | ||
} | ||
|
||
if err != nil { | ||
return diag.FromErr(fmt.Errorf("error getting CloudWatch Metric Stream (%s): %w", d.Id(), err)) | ||
} | ||
|
||
if output == nil { | ||
return diag.FromErr(fmt.Errorf("error getting CloudWatch Metric Stream (%s): empty response", d.Id())) | ||
} | ||
|
||
d.Set("arn", output.Arn) | ||
d.Set("creation_date", output.CreationDate.Format(time.RFC3339)) | ||
d.Set("firehose_arn", output.FirehoseArn) | ||
d.Set("last_update_date", output.CreationDate.Format(time.RFC3339)) | ||
d.Set("name", output.Name) | ||
d.Set("name_prefix", naming.NamePrefixFromName(aws.StringValue(output.Name))) | ||
d.Set("output_format", output.OutputFormat) | ||
d.Set("role_arn", output.RoleArn) | ||
d.Set("state", output.State) | ||
|
||
if output.IncludeFilters != nil { | ||
if err := d.Set("include_filter", flattenCloudWatchMetricStreamFilters(output.IncludeFilters)); err != nil { | ||
return diag.FromErr(fmt.Errorf("error setting include_filter error: %w", err)) | ||
} | ||
} | ||
|
||
if output.ExcludeFilters != nil { | ||
if err := d.Set("exclude_filter", flattenCloudWatchMetricStreamFilters(output.ExcludeFilters)); err != nil { | ||
return diag.FromErr(fmt.Errorf("error setting exclude_filter error: %w", err)) | ||
} | ||
} | ||
|
||
tags, err := keyvaluetags.CloudwatchListTags(conn, aws.StringValue(output.Arn)) | ||
|
||
if err != nil { | ||
return diag.FromErr(fmt.Errorf("error listing tags for CloudWatch Metric Stream (%s): %w", d.Id(), err)) | ||
} | ||
|
||
tags = tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig) | ||
|
||
//lintignore:AWSR002 | ||
if err := d.Set("tags", tags.RemoveDefaultConfig(defaultTagsConfig).Map()); err != nil { | ||
return diag.FromErr(fmt.Errorf("error setting tags: %w", err)) | ||
} | ||
|
||
if err := d.Set("tags_all", tags.Map()); err != nil { | ||
return diag.FromErr(fmt.Errorf("error setting tags_all: %w", err)) | ||
} | ||
|
||
return nil | ||
} | ||
|
||
func resourceAwsCloudWatchMetricStreamDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { | ||
log.Printf("[INFO] Deleting CloudWatch MetricStream %s", d.Id()) | ||
conn := meta.(*AWSClient).cloudwatchconn | ||
params := cloudwatch.DeleteMetricStreamInput{ | ||
Name: aws.String(d.Id()), | ||
} | ||
|
||
if _, err := conn.DeleteMetricStreamWithContext(ctx, ¶ms); err != nil { | ||
return diag.FromErr(fmt.Errorf("error deleting CloudWatch MetricStream: %s", err)) | ||
} | ||
|
||
if _, err := waiter.MetricStreamDeleted(ctx, conn, d.Id()); err != nil { | ||
return diag.FromErr(fmt.Errorf("error while waiting for CloudWatch Metric Stream (%s) to become deleted: %w", d.Id(), err)) | ||
} | ||
|
||
log.Printf("[INFO] CloudWatch MetricStream %s deleted", d.Id()) | ||
|
||
return nil | ||
} | ||
|
||
func validateCloudWatchMetricStreamName(v interface{}, k string) (ws []string, errors []error) { | ||
return validation.All( | ||
validation.StringLenBetween(1, 255), | ||
validation.StringMatch(regexp.MustCompile(`^[\-_A-Za-z0-9]*$`), "must match [\\-_A-Za-z0-9]"), | ||
)(v, k) | ||
} | ||
|
||
func expandCloudWatchMetricStreamFilters(s *schema.Set) []*cloudwatch.MetricStreamFilter { | ||
var filters []*cloudwatch.MetricStreamFilter | ||
|
||
for _, filterRaw := range s.List() { | ||
filter := &cloudwatch.MetricStreamFilter{} | ||
mFilter := filterRaw.(map[string]interface{}) | ||
|
||
if v, ok := mFilter["namespace"].(string); ok && v != "" { | ||
filter.Namespace = aws.String(v) | ||
} | ||
|
||
filters = append(filters, filter) | ||
} | ||
|
||
return filters | ||
} | ||
|
||
func flattenCloudWatchMetricStreamFilters(s []*cloudwatch.MetricStreamFilter) []map[string]interface{} { | ||
filters := make([]map[string]interface{}, 0) | ||
|
||
for _, bd := range s { | ||
if bd.Namespace != nil { | ||
stage := make(map[string]interface{}) | ||
stage["namespace"] = aws.StringValue(bd.Namespace) | ||
|
||
filters = append(filters, stage) | ||
} | ||
} | ||
|
||
if len(filters) > 0 { | ||
return filters | ||
} | ||
|
||
return nil | ||
} |
Oops, something went wrong.