Merge pull request #133 from klothoplatform/skip_pulumi_internal

Fix stage properties to have both InvokeURL and Endpoint

pkg/engine/testdata/cf_distribution.expect.yaml

@@ -31,7 +31,7 @@ resources:
                     - TLSv1
                     - SSLv3
                     - TLSv1.1
-              DomainName: aws:api_stage:rest_api_1:cloudfront_distribution_2-rest_api_1#StageInvokeUrl
+              DomainName: aws:api_stage:rest_api_1:cloudfront_distribution_2-rest_api_1#DomainName
               OriginId: cloudfront_distribution_2-rest_api_1
               OriginPath: /stage
             - DomainName: aws:s3_bucket:s3-bucket-3#BucketRegionalDomainName

pkg/infra/iac/templates/aws/api_stage/factory.ts

@@ -23,7 +23,8 @@ function create(args: Args): aws.apigateway.Stage {
 
 function properties(object: ReturnType<typeof create>, args: Args) {
     return {
-        StageInvokeUrl: object.invokeUrl.apply((d) => d.split('//')[1].split('/')[0]),
+        InvokeUrl: object.invokeUrl,
+        DomainName: object.invokeUrl.apply((d) => d.split('//')[1].split('/')[0]),
     }
 }
 

pkg/infra/state_reader/state_template/mappings/pulumi/load_balancer.yaml

@@ -4,3 +4,4 @@ iac_qualified_type: aws:lb/loadBalancer:LoadBalancer
 property_mappings:
   arn: Arn
   id: Id
+  loadBalancerType: Type

pkg/k2/constructs/templates/aws/api/api.yaml

@@ -17,4 +17,4 @@ resources:
 outputs:
   Endpoint:
     description: The endpoint for the API
-    value: ${resources:APIStage#StageInvokeUrl}
+    value: ${resources:APIStage#InvokeUrl}

pkg/k2/stack/state.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/klothoplatform/klotho/pkg/construct"
@@ -66,6 +67,12 @@ func GetState(ctx context.Context, stack StackInterface) (State, error) {
 
 	resourcesByResourceId := make(map[construct.ResourceId]apitype.ResourceV3)
 	for _, res := range unmarshalledState.Resources {
+		resType := res.URN.QualifiedType()
+		switch {
+		case strings.HasPrefix(string(resType), "pulumi:"), strings.HasPrefix(string(resType), "docker:"):
+			// Skip known non-cloud / Pulumi internal resource (eg: Stack or Provider)
+			continue
+		}
 		id, ok := resourceIdByUrn[string(res.URN)]
 		if !ok {
 			zap.S().Warnf("could not find resource id for urn %s", res.URN)

pkg/k2/testdata/bucket_ro/my-bucket.resources.yaml

@@ -8,9 +8,9 @@ resources:
             RESOURCE_NAME: my-bucket
 edges:
 outputs:
-    Bucket:
-        ref: aws:s3_bucket:my-bucket#Bucket
     BucketArn:
         ref: aws:s3_bucket:my-bucket#Arn
     BucketRegionalDomainName:
         ref: aws:s3_bucket:my-bucket#BucketRegionalDomainName
+    Bucket:
+        ref: aws:s3_bucket:my-bucket#Bucket

pkg/k2/testdata/function/my-api.engine_input.yaml

@@ -37,7 +37,7 @@ constraints:
       data: {}
     - scope: output
       operator: must_exist
-      ref: aws:api_stage:my-api-api:my-api-stage#StageInvokeUrl
+      ref: aws:api_stage:my-api-api:my-api-stage#InvokeUrl
       name: Endpoint
       value: null
 resources:

pkg/k2/testdata/function/my-api.index.ts

@@ -64,7 +64,7 @@ const my_api_stage = new aws.apigateway.Stage("my-api-stage", {
 export const my_api_stage_Url = my_api_stage.invokeUrl
 
 export const $outputs = {
-	Endpoint: my_api_stage.invokeUrl.apply((d) => d.split('//')[1].split('/')[0]),
+	Endpoint: my_api_stage.invokeUrl,
 }
 
 export const $urns = {

pkg/k2/testdata/function/my-api.resources.yaml

@@ -63,4 +63,4 @@ edges:
     aws:lambda_permission:docker-func-docker-func-function -> aws:lambda_function:docker-func-function:
 outputs:
     Endpoint:
-        ref: aws:api_stage:my-api-api:my-api-stage#StageInvokeUrl
+        ref: aws:api_stage:my-api-api:my-api-stage#InvokeUrl

pkg/k2/testdata/simple_api/my-api.engine_input.yaml

@@ -37,7 +37,7 @@ constraints:
       data: {}
     - scope: output
       operator: must_exist
-      ref: aws:api_stage:my-api-api:my-api-stage#StageInvokeUrl
+      ref: aws:api_stage:my-api-api:my-api-stage#InvokeUrl
       name: Endpoint
       value: null
 resources:

pkg/k2/testdata/simple_api/my-api.index.ts

@@ -77,7 +77,7 @@ const my_api_stage = new aws.apigateway.Stage("my-api-stage", {
 export const my_api_stage_Url = my_api_stage.invokeUrl
 
 export const $outputs = {
-	Endpoint: my_api_stage.invokeUrl.apply((d) => d.split('//')[1].split('/')[0]),
+	Endpoint: my_api_stage.invokeUrl,
 }
 
 export const $urns = {

pkg/k2/testdata/simple_api/my-api.resources.yaml

@@ -208,4 +208,4 @@ edges:
     aws:security_group:default-network-vpc:my-container-service-security_group -> aws:vpc:default-network-vpc:
 outputs:
     Endpoint:
-        ref: aws:api_stage:my-api-api:my-api-stage#StageInvokeUrl
+        ref: aws:api_stage:my-api-api:my-api-stage#InvokeUrl

pkg/knowledgebase/properties/resource_property.go

@@ -144,7 +144,7 @@ func (r *ResourceProperty) Validate(resource *construct.Resource, value any, ctx
 	if !ok {
 		return fmt.Errorf("invalid resource value %v", value)
 	}
-	if r.AllowedTypes != nil && len(r.AllowedTypes) > 0 && !r.AllowedTypes.MatchesAny(id) {
+	if len(r.AllowedTypes) > 0 && !r.AllowedTypes.MatchesAny(id) {
 		return fmt.Errorf("resource value %v does not match allowed types %s", value, r.AllowedTypes)
 	}
 	return nil

pkg/knowledgebase/properties/string_property.go

@@ -124,7 +124,7 @@ func (s *StringProperty) Validate(resource *construct.Resource, value any, ctx k
 		}
 	}
 
-	if s.AllowedValues != nil && len(s.AllowedValues) > 0 && !collectionutil.Contains(s.AllowedValues, stringVal) {
+	if len(s.AllowedValues) > 0 && !collectionutil.Contains(s.AllowedValues, stringVal) {
 		return fmt.Errorf("value %s is not allowed. allowed values are %s", stringVal, s.AllowedValues)
 	}
 

pkg/templates/aws/edges/cloudfront_distribution-api_stage.yaml

@@ -16,15 +16,15 @@ operational_rules:
                   - TLSv1
                   - SSLv3
                   - TLSv1.1
-              DomainName: '{{ .Target }}#StageInvokeUrl'
+              DomainName: '{{ .Target }}#DomainName'
               OriginId: '{{ .Target.Name }}'
               OriginPath: '/{{ fieldValue "StageName" .Target }}'
       - resource: '{{ .Source }}'
         configuration:
           field: CacheBehaviors
           value: |
             [
-            
+
             {{ $targetOriginId := .Target.Name }}
             {{ $routes := makeSlice }}
             {{ $integrations := allDownstream "aws:api_integration" .Target }}

pkg/templates/aws/resources/api_stage.yaml

@@ -22,7 +22,11 @@ properties:
           - aws:api_deployment
   aws:tags:
     type: model
-  StageInvokeUrl:
+  InvokeUrl:
+    type: string
+    configuration_disabled: true
+    deploy_time: true
+  DomainName:
     type: string
     configuration_disabled: true
     deploy_time: true
@@ -39,6 +43,6 @@ views:
   dataflow: small
 
 deployment_permissions:
-  deploy: ["apigateway:CreateStage"]
-  tear_down: ["apigateway:DeleteStage"]
-  update: ["apigateway:UpdateStage"]
+  deploy: ['apigateway:CreateStage']
+  tear_down: ['apigateway:DeleteStage']
+  update: ['apigateway:UpdateStage']

pkg/tui/model.go

@@ -224,7 +224,7 @@ type boxLine struct {
 //	├  29.3s DBG > AddEdge ...
 //	├  ...
 //	├ Outputs
-//	└ └ Endpoint: <aws:api_stage:my-api-api:my-api-stage#StageInvokeUrl>
+//	└ └ Endpoint: <aws:api_stage:my-api-api:my-api-stage#InvokeUrl>
 //
 // Long lines are wrapped to fit the console width:
 //