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.

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

closes #12923 - provisioned concurrency config for lambda alias #19868

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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/19868.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_lambda_provisioned_concurrency_config: Fix split of ARN:Qualifier
```
15 changes: 11 additions & 4 deletions aws/resource_aws_lambda_provisioned_concurrency_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,20 @@ func resourceAwsLambdaProvisionedConcurrencyConfigDelete(d *schema.ResourceData,
}

func resourceAwsLambdaProvisionedConcurrencyConfigParseId(id string) (string, string, error) {
parts := strings.SplitN(id, ":", 2)
parts := strings.SplitN(id, ":", 8)

if len(parts) != 2 || parts[0] == "" || parts[1] == "" {
return "", "", fmt.Errorf("unexpected format of ID (%s), expected FUNCTION_NAME:QUALIFIER", id)
// functionname with qualifier
if len(parts) == 2 && parts[0] != "" && parts[1] != "" {
return parts[0], parts[1], nil
}

return parts[0], parts[1], nil
// arn with qualifier
if len(parts) == 8 && parts[0] == "arn" && parts[1] == "aws" && parts[2] == "lambda" && parts[5] == "function" &&
parts[6] != "" && parts[7] != "" {
return strings.Join(parts[0:7], ":"), parts[7], nil
}

return "", "", fmt.Errorf("unexpected format of ID (%s), expected FUNCTION_NAME:QUALIFIER or ARN:QUALIFIER", id)
}

func refreshLambdaProvisionedConcurrencyConfigStatus(conn *lambda.Lambda, functionName, qualifier string) resource.StateRefreshFunc {
Expand Down
33 changes: 33 additions & 0 deletions aws/resource_aws_lambda_provisioned_concurrency_config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,39 @@ func TestAccAWSLambdaProvisionedConcurrencyConfig_Qualifier_AliasName(t *testing
})
}

func Test_resourceAwsLambdaProvisionedConcurrencyConfigParseId(t *testing.T) {
type args struct {
id string
}
tests := []struct {
name string
args args
want string
want1 string
wantErr bool
}{
{ "function with qualifier", args{ "my-function:alias" }, "my-function", "alias", false },
{ "function w/o qualifier", args{ "my-function" }, "", "", true },
{ "ARN with qualifier", args{ "arn:aws:lambda:nice-region:1234567890:function:my-function:alias" }, "arn:aws:lambda:nice-region:1234567890:function:my-function", "alias", false },
{ "ARN w/o qualifier", args{ "arn:aws:lambda:nice-region:1234567890:function:my-function" }, "", "", true },
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got, got1, err := resourceAwsLambdaProvisionedConcurrencyConfigParseId(tt.args.id)
if (err != nil) != tt.wantErr {
t.Errorf("resourceAwsLambdaProvisionedConcurrencyConfigParseId() error = %v, wantErr %v", err, tt.wantErr)
return
}
if got != tt.want {
t.Errorf("resourceAwsLambdaProvisionedConcurrencyConfigParseId() got = %v, want %v", got, tt.want)
}
if got1 != tt.want1 {
t.Errorf("resourceAwsLambdaProvisionedConcurrencyConfigParseId() got1 = %v, want %v", got1, tt.want1)
}
})
}
}

func testAccCheckLambdaProvisionedConcurrencyConfigDestroy(s *terraform.State) error {
conn := testAccProvider.Meta().(*AWSClient).lambdaconn

Expand Down