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

fix bug with routes #816

Merged
merged 1 commit into from
Dec 11, 2023
Merged

fix bug with routes #816

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 pkg/engine2/operational_rule/operational_action.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"sort"

"github.com/dominikbraun/graph"
"github.com/google/uuid"
"github.com/klothoplatform/klotho/pkg/collectionutil"
construct "github.com/klothoplatform/klotho/pkg/construct2"
"github.com/klothoplatform/klotho/pkg/engine2/solution_context"
Expand Down Expand Up @@ -408,13 +409,21 @@ func (action *operationalResourceAction) generateResourceName(resourceToSet *con
if err != nil {
return err
}
matcher := construct.ResourceId{Provider: resourceToSet.Provider, Type: resourceToSet.Type, Namespace: resourceToSet.Namespace}
currNames := make(set.Set[string])
// we cannot consider things only in the namespace because when creating a resource for an operational action
// it likely has not been namespaced yet and we dont know where it will be namespaced to
matcher := construct.ResourceId{Provider: resourceToSet.Provider, Type: resourceToSet.Type}
for _, id := range ids {
if matcher.Matches(id) {
currNames.Add(id.Name)
numResources++
}
}
// check if the current name based on the digit conflicts with an existing name and if so create a random uuid suffix
resourceToSet.Name = fmt.Sprintf("%s-%d", resourceToSet.Type, numResources)

if currNames.Contains(resourceToSet.Name) {
suffix := uuid.NewString()[:8]
resourceToSet.Name = fmt.Sprintf("%s-%s", resourceToSet.Type, suffix)
}
return nil
}
28 changes: 14 additions & 14 deletions pkg/engine2/testdata/2_routes.expect.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ resources:
aws:api_deployment:rest_api_1:api_deployment-0:
RestApi: aws:rest_api:rest_api_1
Triggers:
api_method-0: api_method-0
api_method-1: api_method-1
integ0: integ0
integ0-api_method: integ0-api_method
integ1: integ1
integ1-api_method: integ1-api_method
aws:rest_api:rest_api_1:
BinaryMediaTypes:
- application/octet-stream
Expand All @@ -34,21 +34,21 @@ resources:
ParentResource: aws:api_resource:rest_api_1:lambda1
PathPart: api
RestApi: aws:rest_api:rest_api_1
aws:api_method:rest_api_1:api_method-0:
aws:api_method:rest_api_1:integ0-api_method:
Authorization: NONE
HttpMethod: ANY
RequestParameters: {}
Resource: aws:api_resource:rest_api_1:api_resource-0
RestApi: aws:rest_api:rest_api_1
aws:api_method:rest_api_1:api_method-1:
aws:api_method:rest_api_1:integ1-api_method:
Authorization: NONE
HttpMethod: ANY
RequestParameters: {}
Resource: aws:api_resource:rest_api_1:api_resource-1
RestApi: aws:rest_api:rest_api_1
aws:api_integration:rest_api_1:integ0:
IntegrationHttpMethod: POST
Method: aws:api_method:rest_api_1:api_method-0
Method: aws:api_method:rest_api_1:integ0-api_method
RequestParameters: {}
Resource: aws:api_resource:rest_api_1:api_resource-0
RestApi: aws:rest_api:rest_api_1
Expand All @@ -58,7 +58,7 @@ resources:
Uri: aws:lambda_function:lambda_function_0#LambdaIntegrationUri
aws:api_integration:rest_api_1:integ1:
IntegrationHttpMethod: POST
Method: aws:api_method:rest_api_1:api_method-1
Method: aws:api_method:rest_api_1:integ1-api_method
RequestParameters: {}
Resource: aws:api_resource:rest_api_1:api_resource-1
RestApi: aws:rest_api:rest_api_1
Expand Down Expand Up @@ -134,25 +134,25 @@ edges:
aws:api_stage:rest_api_1:api_stage-0 -> aws:rest_api:rest_api_1:
aws:api_deployment:rest_api_1:api_deployment-0 -> aws:api_integration:rest_api_1:integ0:
aws:api_deployment:rest_api_1:api_deployment-0 -> aws:api_integration:rest_api_1:integ1:
aws:api_deployment:rest_api_1:api_deployment-0 -> aws:api_method:rest_api_1:api_method-0:
aws:api_deployment:rest_api_1:api_deployment-0 -> aws:api_method:rest_api_1:api_method-1:
aws:api_deployment:rest_api_1:api_deployment-0 -> aws:api_method:rest_api_1:integ0-api_method:
aws:api_deployment:rest_api_1:api_deployment-0 -> aws:api_method:rest_api_1:integ1-api_method:
aws:api_deployment:rest_api_1:api_deployment-0 -> aws:rest_api:rest_api_1:
aws:rest_api:rest_api_1 -> aws:api_integration:rest_api_1:integ0:
aws:rest_api:rest_api_1 -> aws:api_integration:rest_api_1:integ1:
aws:rest_api:rest_api_1 -> aws:api_method:rest_api_1:api_method-0:
aws:rest_api:rest_api_1 -> aws:api_method:rest_api_1:api_method-1:
aws:rest_api:rest_api_1 -> aws:api_method:rest_api_1:integ0-api_method:
aws:rest_api:rest_api_1 -> aws:api_method:rest_api_1:integ1-api_method:
aws:rest_api:rest_api_1 -> aws:api_resource:rest_api_1:api_resource-0:
aws:rest_api:rest_api_1 -> aws:api_resource:rest_api_1:api_resource-1:
aws:rest_api:rest_api_1 -> aws:api_resource:rest_api_1:lambda0:
aws:rest_api:rest_api_1 -> aws:api_resource:rest_api_1:lambda1:
aws:api_resource:rest_api_1:lambda0 -> aws:api_resource:rest_api_1:api_resource-0:
aws:api_resource:rest_api_1:lambda1 -> aws:api_resource:rest_api_1:api_resource-1:
aws:api_resource:rest_api_1:api_resource-0 -> aws:api_integration:rest_api_1:integ0:
aws:api_resource:rest_api_1:api_resource-0 -> aws:api_method:rest_api_1:api_method-0:
aws:api_resource:rest_api_1:api_resource-0 -> aws:api_method:rest_api_1:integ0-api_method:
aws:api_resource:rest_api_1:api_resource-1 -> aws:api_integration:rest_api_1:integ1:
aws:api_resource:rest_api_1:api_resource-1 -> aws:api_method:rest_api_1:api_method-1:
aws:api_method:rest_api_1:api_method-0 -> aws:api_integration:rest_api_1:integ0:
aws:api_method:rest_api_1:api_method-1 -> aws:api_integration:rest_api_1:integ1:
aws:api_resource:rest_api_1:api_resource-1 -> aws:api_method:rest_api_1:integ1-api_method:
aws:api_method:rest_api_1:integ0-api_method -> aws:api_integration:rest_api_1:integ0:
aws:api_method:rest_api_1:integ1-api_method -> aws:api_integration:rest_api_1:integ1:
aws:api_integration:rest_api_1:integ0 -> aws:lambda_permission:integ0-lambda_function_0:
aws:api_integration:rest_api_1:integ1 -> aws:lambda_permission:integ1-lambda_function_1:
aws:lambda_permission:integ0-lambda_function_0 -> aws:lambda_function:lambda_function_0:
Expand Down
20 changes: 10 additions & 10 deletions pkg/engine2/testdata/2_routes.iac-viz.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,37 +42,37 @@ resources:
lambda_function/lambda_function_1 -> ecr_image/lambda_function_1-image:
lambda_function/lambda_function_1 -> iam_role/lambda_function_1-executionrole:

aws:api_method:rest_api_1/api_method-0:
aws:api_method:rest_api_1/api_method-0 -> aws:api_resource:rest_api_1/api_resource-0:
aws:api_method:rest_api_1/api_method-0 -> rest_api/rest_api_1:
aws:api_method:rest_api_1/integ0-api_method:
aws:api_method:rest_api_1/integ0-api_method -> aws:api_resource:rest_api_1/api_resource-0:
aws:api_method:rest_api_1/integ0-api_method -> rest_api/rest_api_1:

lambda_permission/integ0-lambda_function_0:
lambda_permission/integ0-lambda_function_0 -> lambda_function/lambda_function_0:

aws:api_method:rest_api_1/api_method-1:
aws:api_method:rest_api_1/api_method-1 -> aws:api_resource:rest_api_1/api_resource-1:
aws:api_method:rest_api_1/api_method-1 -> rest_api/rest_api_1:
aws:api_method:rest_api_1/integ1-api_method:
aws:api_method:rest_api_1/integ1-api_method -> aws:api_resource:rest_api_1/api_resource-1:
aws:api_method:rest_api_1/integ1-api_method -> rest_api/rest_api_1:

lambda_permission/integ1-lambda_function_1:
lambda_permission/integ1-lambda_function_1 -> lambda_function/lambda_function_1:

aws:api_integration:rest_api_1/integ0:
aws:api_integration:rest_api_1/integ0 -> aws:api_method:rest_api_1/api_method-0:
aws:api_integration:rest_api_1/integ0 -> aws:api_method:rest_api_1/integ0-api_method:
aws:api_integration:rest_api_1/integ0 -> aws:api_resource:rest_api_1/api_resource-0:
aws:api_integration:rest_api_1/integ0 -> lambda_permission/integ0-lambda_function_0:
aws:api_integration:rest_api_1/integ0 -> rest_api/rest_api_1:

aws:api_integration:rest_api_1/integ1:
aws:api_integration:rest_api_1/integ1 -> aws:api_method:rest_api_1/api_method-1:
aws:api_integration:rest_api_1/integ1 -> aws:api_method:rest_api_1/integ1-api_method:
aws:api_integration:rest_api_1/integ1 -> aws:api_resource:rest_api_1/api_resource-1:
aws:api_integration:rest_api_1/integ1 -> lambda_permission/integ1-lambda_function_1:
aws:api_integration:rest_api_1/integ1 -> rest_api/rest_api_1:

aws:api_deployment:rest_api_1/api_deployment-0:
aws:api_deployment:rest_api_1/api_deployment-0 -> aws:api_integration:rest_api_1/integ0:
aws:api_deployment:rest_api_1/api_deployment-0 -> aws:api_integration:rest_api_1/integ1:
aws:api_deployment:rest_api_1/api_deployment-0 -> aws:api_method:rest_api_1/api_method-0:
aws:api_deployment:rest_api_1/api_deployment-0 -> aws:api_method:rest_api_1/api_method-1:
aws:api_deployment:rest_api_1/api_deployment-0 -> aws:api_method:rest_api_1/integ0-api_method:
aws:api_deployment:rest_api_1/api_deployment-0 -> aws:api_method:rest_api_1/integ1-api_method:
aws:api_deployment:rest_api_1/api_deployment-0 -> rest_api/rest_api_1:

aws:api_stage:rest_api_1/api_stage-0:
Expand Down
4 changes: 2 additions & 2 deletions pkg/templates/aws/resources/api_integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ properties:
direction: upstream
resources:
- selector: aws:api_method
properties:
properties:
RestApi: '{{ fieldValue "RestApi" .Self }}'
Resource: '{{ fieldValue "Resource" .Self }}'
unique: true # Each Integration must have its own method
RequestParameters:
type: map(string,string)
operational_rule:
Expand Down
Loading