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

resource/aws_appautoscaling_policy: Support additional predefined metric types in validation #3122

Merged
merged 1 commit into from
Jan 26, 2018
Merged

resource/aws_appautoscaling_policy: Support additional predefined metric types in validation #3122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions aws/validators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"time"

"github.com/aws/aws-sdk-go/service/apigateway"
"github.com/aws/aws-sdk-go/service/applicationautoscaling"
"github.com/aws/aws-sdk-go/service/cognitoidentity"
"github.com/aws/aws-sdk-go/service/cognitoidentityprovider"
"github.com/aws/aws-sdk-go/service/s3"
Expand Down Expand Up @@ -1125,8 +1126,16 @@ func validateAppautoscalingCustomizedMetricSpecificationStatistic(v interface{},

func validateAppautoscalingPredefinedMetricSpecification(v interface{}, k string) (ws []string, errors []error) {
validMetrics := []string{
"DynamoDBReadCapacityUtilization",
"DynamoDBWriteCapacityUtilization",
applicationautoscaling.MetricTypeAlbrequestCountPerTarget,
applicationautoscaling.MetricTypeDynamoDbreadCapacityUtilization,
applicationautoscaling.MetricTypeDynamoDbwriteCapacityUtilization,
applicationautoscaling.MetricTypeEc2spotFleetRequestAverageCpuutilization,
applicationautoscaling.MetricTypeEc2spotFleetRequestAverageNetworkIn,
applicationautoscaling.MetricTypeEc2spotFleetRequestAverageNetworkOut,
applicationautoscaling.MetricTypeEcsserviceAverageCpuutilization,
applicationautoscaling.MetricTypeEcsserviceAverageMemoryUtilization,
applicationautoscaling.MetricTypeRdsreaderAverageCpuutilization,
applicationautoscaling.MetricTypeRdsreaderAverageDatabaseConnections,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something tells me this list is going to continue to grow and we just shouldn't be validating it at all, instead of playing catch up with Amazon... 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with you for the most part. Its a challenge of better user experience (plan-time validation and requiring provider updates) vs development time (SDK not providing a quick way to get the full list of them). Since this PR is approved and we're planning on releasing today, I'll bring this one in as-is to at least fix the current state of the world, then will followup with a PR to remove the validation completely. We'll see if it lands in time for today as well.

As a separate pet project I will likely try to automatically go generate these from the SDK as I personally have found the plan-time validation to helpful and this type of generation would be applicable in a few other places. Then again I also always kept my AWS provider up to date in my environments.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As noted, followup PR to remove validation (if we want to): #3141

}
metric := v.(string)
for _, o := range validMetrics {
Expand Down
59 changes: 59 additions & 0 deletions aws/validators_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2864,6 +2864,65 @@ func TestResourceAWSElastiCacheReplicationGroupAuthTokenValidation(t *testing.T)
}
}

func TestValidateAppautoscalingPredefinedMetricSpecification(t *testing.T) {
cases := []struct {
Value string
ErrCount int
}{
{
Value: "ALBRequestCountPerTarget",
ErrCount: 0,
},
{
Value: "DynamoDBReadCapacityUtilization",
ErrCount: 0,
},
{
Value: "DynamoDBWriteCapacityUtilization",
ErrCount: 0,
},
{
Value: "EC2SpotFleetRequestAverageCPUUtilization",
ErrCount: 0,
},
{
Value: "EC2SpotFleetRequestAverageNetworkIn",
ErrCount: 0,
},
{
Value: "EC2SpotFleetRequestAverageNetworkOut",
ErrCount: 0,
},
{
Value: "ECSServiceAverageCPUUtilization",
ErrCount: 0,
},
{
Value: "ECSServiceAverageMemoryUtilization",
ErrCount: 0,
},
{
Value: "RDSReaderAverageCPUUtilization",
ErrCount: 0,
},
{
Value: "RDSReaderAverageDatabaseConnections",
ErrCount: 0,
},
{
Value: "NotValid",
ErrCount: 1,
},
}
for _, tc := range cases {
_, errors := validateAppautoscalingPredefinedMetricSpecification(tc.Value, "predefined_metric_type")

if len(errors) != tc.ErrCount {
t.Fatalf("Expected %d errors, got %d: %s", tc.ErrCount, len(errors), errors)
}
}
}

func TestValidateCognitoUserPoolDomain(t *testing.T) {
validTypes := []string{
"valid-domain",
Expand Down