Merge commit '6ebee99aaef570d48c53c5fa48df7b92c537389a'

.gitignore

@@ -30,8 +30,17 @@ keyvalue.js.tmpl
 
 node_modules/
 /*.yaml
+/_samples/
+
+go.work
+go.work.sum
+
 
-# binaries
 /engine
 /iac
 /klotho
+
+*.gv
+*.gv.svg
+
+*.log

.vscode/settings.json

@@ -3,5 +3,19 @@
     "editor.rulers": [
       120
     ]
+  },
+  "files.exclude": {
+    "**/.git": true,
+    "**/.svn": true,
+    "**/.hg": true,
+    "**/CVS": true,
+    "**/.DS_Store": true,
+    "**/Thumbs.db": true,
+    "pkg/infra/iac2": true,
+    "pkg/provider": true,
+    "pkg/construct": true,
+    "pkg/engine": true,
+    "pkg/knowledge_base": true,
+    "**/node_modules": true
   }
 }

Makefile

@@ -1,14 +1,16 @@
-GO_FILES := $(wildcard pkg/**/*.go) go.sum go.mod
+GO_FILES := $(shell find . -type f -name '*.go') go.mod go.sum
+ENGINE_TEMPLATES := $(shell find . -type f -path pkg/templates)
+IAC_TEMPLATES := $(shell find . -type f -path pkg/infra/iac3/templates -and -not -path */node_modules/*)
 
-engine: $(GO_FILES)
+engine: $(GO_FILES) $(ENGINE_TEMPLATES)
 	CGO_ENABLED=1 \
 	GOOS=linux \
 	GOARCH=amd64 \
 	CC="zig cc -target x86_64-linux-musl" \
 	CXX="zig c++ -target x86_64-linux-musl" \
 	go build --tags extended -o engine -ldflags="-s -w" ./cmd/engine
 
-iac: $(GO_FILES)
+iac: $(GO_FILES) $(IAC_TEMPLATES)
 	CGO_ENABLED=1 \
 	GOOS=linux \
 	GOARCH=amd64 \

cmd/engine/.gitignore

@@ -0,0 +1 @@
+property_deps*

cmd/engine/main.go

@@ -1,19 +1,20 @@
 package main
 
 import (
-	"github.com/klothoplatform/klotho/pkg/engine"
+	"fmt"
+	"os"
+
+	engine "github.com/klothoplatform/klotho/pkg/engine2"
 	"github.com/spf13/cobra"
 )
 
 func main() {
 	em := &engine.EngineMain{}
 	var root = &cobra.Command{}
-	err := em.AddEngineCli(root)
-	if err != nil {
-		panic(err)
-	}
-	err = root.Execute()
+	em.AddEngineCli(root)
+	err := root.Execute()
 	if err != nil {
-		panic(err)
+		fmt.Printf("Error: %v\n", err)
+		os.Exit(1)
 	}
 }

cmd/iac/main.go

@@ -6,9 +6,10 @@ import (
 )
 
 func main() {
-	iac := &infra.IacCli{}
 	var root = &cobra.Command{}
-	err := iac.AddIacCli(root)
+	// iac := &infra.IacCli{}
+	// err := iac.AddIacCli(root)
+	err := infra.AddIacCli(root)
 	if err != nil {
 		panic(err)
 	}

go.mod

@@ -13,7 +13,9 @@ require (
 	github.com/fatih/color v1.13.0
 	github.com/gojek/heimdall/v7 v7.0.2
 	github.com/golang-jwt/jwt/v4 v4.4.3
+	github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5
 	github.com/google/uuid v1.3.0
+	github.com/iancoleman/strcase v0.3.0
 	github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf
 	github.com/kopoli/go-terminal-size v0.0.0-20170219200355-5c97524c8b54
 	github.com/lithammer/dedent v1.1.0
@@ -29,6 +31,7 @@ require (
 	go.uber.org/atomic v1.9.0
 	go.uber.org/zap v1.19.1
 	golang.org/x/tools v0.7.0
+	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
 	helm.sh/helm/v3 v3.11.1
 	k8s.io/api v0.26.0
@@ -46,11 +49,13 @@ require (
 	github.com/rivo/uniseg v0.4.4 // indirect
 	golang.org/x/mod v0.9.0 // indirect
 	golang.org/x/oauth2 v0.4.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	k8s.io/client-go v0.26.0 // indirect
 )
 
 replace (
+	github.com/dominikbraun/graph => github.com/klothoplatform/graph v0.24.5
+
+	// github.com/dominikbraun/graph => github.com/klothoplatform/graph v0.24.3
 	github.com/smacker/go-tree-sitter => github.com/klothoplatform/go-tree-sitter v0.1.1
 
 	// yaml fork is the same (as of 2023/07/28) except with the PR merged:
@@ -167,7 +172,7 @@ require (
 	k8s.io/klog/v2 v2.80.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596 // indirect
 	k8s.io/kubectl v0.26.0 // indirect
-	k8s.io/utils v0.0.0-20230115233650-391b47cb4029
+	k8s.io/utils v0.0.0-20230115233650-391b47cb4029 // indirect
 	oras.land/oras-go v1.2.2 // indirect
 	sigs.k8s.io/controller-runtime v0.12.3 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect