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

fix when importing a msk storage app autoscaling policy #34934

Merged
merged 8 commits into from
Mar 18, 2024
Merged

fix when importing a msk storage app autoscaling policy #34934

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a16e249
fix when importing a msk storage app autoscaling policy
trentbitterman Dec 14, 2023
308c878
add a new changelog file
trentbitterman Dec 14, 2023
876204b
Merge branch 'main' into HEAD
ewbankkit Mar 18, 2024
244bcbb
r/aws_appautoscaling_policy: Tidy up.
ewbankkit Mar 18, 2024
6301fc6
Tweak CHANGELOG entry.
ewbankkit Mar 18, 2024
2eb44f5
Fix providerlint 'AWSAT003' and 'AWSAT005'.
ewbankkit Mar 18, 2024
8a4837e
Fix 'TestAccAppAutoScalingPolicy_DynamoDB_table'.
ewbankkit Mar 18, 2024
793a816
providerlint fixes.
ewbankkit Mar 18, 2024
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/34934.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_appautoscaling_policy: Fix failing imports when importing a MSK storage autoscaling policy
```
8 changes: 8 additions & 0 deletions internal/service/appautoscaling/policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,14 @@ func ValidPolicyImportInput(id string) ([]string, error) {
dimensionIx = 5
}

resourceId = strings.Join(idParts[1:dimensionIx], "/")
scalableDimension = idParts[dimensionIx]
policyName = strings.Join(idParts[dimensionIx+1:], "/")
case "kafka":
serviceNamespace = idParts[0]
// MSK resource ID contains three sections, separated by '/', so scalableDimension is at index 4
dimensionIx := 4

resourceId = strings.Join(idParts[1:dimensionIx], "/")
scalableDimension = idParts[dimensionIx]
policyName = strings.Join(idParts[dimensionIx+1:], "/")
Expand Down
14 changes: 14 additions & 0 deletions internal/service/appautoscaling/policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,20 @@ func TestValidatePolicyImportInput(t *testing.T) {
input: "dynamodb/missing/parts",
errorExpected: true,
},
{
input: "kafka/arn:aws:kafka:us-west-2:123456789012:cluster/example/279c0212-d057-4dba-9aa9-1c4e5a25bfc7-3/kafka:broker-storage:VolumeSize/KafkaBrokerStorageUtilization-scaling-policy:arn:aws:kafka:us-west-2:123456789012:cluster/example/279c0212-d057-4dba-9aa9-1c4e5a25bfc7-3",
expected: []string{"kafka", "arn:aws:kafka:us-west-2:123456789012:cluster/example/279c0212-d057-4dba-9aa9-1c4e5a25bfc7-3", "kafka:broker-storage:VolumeSize", "KafkaBrokerStorageUtilization-scaling-policy:arn:aws:kafka:us-west-2:123456789012:cluster/example/279c0212-d057-4dba-9aa9-1c4e5a25bfc7-3"},
errorExpected: false,
},
{
input: "kafka/arn:aws:kafka:us-west-2:123456789012:cluster/example/279c0212-d057-4dba-9aa9-1c4e5a25bfc7-3/kafka:broker-storage:VolumeSize/some-autoscaler-name",
expected: []string{"kafka", "arn:aws:kafka:us-west-2:123456789012:cluster/example/279c0212-d057-4dba-9aa9-1c4e5a25bfc7-3", "kafka:broker-storage:VolumeSize", "some-autoscaler-name"},
errorExpected: false,
},
{
input: "kafka/missing/parts",
errorExpected: true,
},
}

for _, tc := range testCases {
Expand Down