maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Cleanup APIGateway ARN parsing

Browse source
This commit is contained in:
Luke Hoban 2017-06-04 14:58:50 -07:00
parent 318bcf9542
commit 6710b919ea
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/aws/provider/apigateway/deployment.go
View file

@ -38,10 +38,10 @@ func ParseDeploymentID(id resource.ID) (string, string, error) {
return "", "", err
}
parts := strings.Split(res, "/")
if len(parts) != 5 || parts[0] != "" || parts[1] != "restapis" || parts[3] != "deployments" {
return "", "", fmt.Errorf("execpted Deployment ARN of the form arn:aws:apigateway:region::/restapis/api-id/deployments/deployment-id")
if len(parts) != 4 || parts[0] != "restapis" || parts[2] != "deployments" {
return "", "", fmt.Errorf("expected Deployment ARN of the form arn:aws:apigateway:region::/restapis/api-id/deployments/deployment-id: %v", id)
}
return parts[2], parts[4], nil
return parts[1], parts[3], nil
}
// NewDeploymentProvider creates a provider that handles APIGateway Deployment operations.

6
lib/aws/provider/apigateway/restapi.go
View file

@ -40,10 +40,10 @@ func ParseRestAPIID(id resource.ID) (string, error) {
return "", err
}
parts := strings.Split(res, "/")
if len(parts) != 3 || parts[0] != "" || parts[1] != "restapis" {
return "", fmt.Errorf("execpted RestAPI ARN of the form arn:aws:apigateway:region::/restapis/api-id")
if len(parts) != 2 || parts[0] != "restapis" {
return "", fmt.Errorf("expected RestAPI ARN of the form arn:aws:apigateway:region::/restapis/api-id: %v", id)
}
return parts[2], nil
return parts[1], nil
}
// NewRestAPIProvider creates a provider that handles APIGateway RestAPI operations.

6
lib/aws/provider/apigateway/stage.go
View file

@ -38,10 +38,10 @@ func ParseStageID(id resource.ID) (string, string, error) {
return "", "", err
}
parts := strings.Split(res, "/")
if len(parts) != 5 || parts[0] != "" || parts[1] != "restapis" || parts[3] != "stages" {
return "", "", fmt.Errorf("execpted Stage ARN of the form arn:aws:apigateway:region::/restapis/api-id/stages/stage-id")
if len(parts) != 4 || parts[0] != "restapis" || parts[2] != "stages" {
return "", "", fmt.Errorf("expected Stage ARN of the form arn:aws:apigateway:region::/restapis/api-id/stages/stage-id: %v", id)
}
return parts[2], parts[4], nil
return parts[1], parts[3], nil
}
// NewStageProvider creates a provider that handles APIGateway Stage operations.