remove type from resources

pkg/cli/helpers.go

@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/klothoplatform/klotho/pkg/config"
 	"github.com/klothoplatform/klotho/pkg/core"
 	execunit "github.com/klothoplatform/klotho/pkg/exec_unit"
 	"github.com/klothoplatform/klotho/pkg/infra/kubernetes"
@@ -167,24 +168,20 @@ func OutputResources(result *core.CompilationResult, outDir string) (resourceCou
 	return
 }
 
-func GetLanguagesUsed(result *core.CompilationResult) map[core.ExecutableType]bool {
-	executableLangs := make(map[core.ExecutableType]bool)
+func GetLanguagesUsed(result *core.CompilationResult) []core.ExecutableType {
+	executableLangs := []core.ExecutableType{}
 	for _, res := range result.Resources() {
 		switch r := res.(type) {
 		case *core.ExecutionUnit:
-			executableLangs[r.Executable.Type] = true
+			executableLangs = append(executableLangs, r.Executable.Type)
 		}
 	}
 	return executableLangs
 }
 
-func GetResourceTypeCount(result *core.CompilationResult) (resourceCounts map[string]map[string]int) {
-	resourceCounts = make(map[string]map[string]int)
+func GetResourceTypeCount(result *core.CompilationResult, cfg *config.Application) (resourceCounts []string) {
 	for _, res := range result.Resources() {
-		if _, ok := resourceCounts[res.Key().Kind]; !ok {
-			resourceCounts[res.Key().Kind] = make(map[string]int)
-		}
-		resourceCounts[res.Key().Kind][res.Type()]++
+		resourceCounts = append(resourceCounts, cfg.GetResourceType(res))
 	}
 	return
 }

pkg/cli/klothomain.go

@@ -218,7 +218,7 @@ func (km KlothoMain) run(cmd *cobra.Command, args []string) (err error) {
 	}
 	klothoName := "klotho"
 	if km.VersionQualifier != "" {
-		klothoName += " " + km.VersionQualifier
+		analyticsClient.Properties[km.VersionQualifier] = true
 	}
 
 	// if update is specified do the update in place
@@ -290,7 +290,7 @@ func (km KlothoMain) run(cmd *cobra.Command, args []string) (err error) {
 		"app":      appCfg.AppName,
 	})
 
-	analyticsClient.Info(klothoName + "pre-compile")
+	analyticsClient.Info(klothoName + " pre-compile")
 
 	input, err := input.ReadOSDir(appCfg, cfg.config)
 	if err != nil {
@@ -321,7 +321,7 @@ func (km KlothoMain) run(cmd *cobra.Command, args []string) (err error) {
 		Plugins: plugins.Plugins(),
 	}
 
-	analyticsClient.Info(klothoName + "compiling")
+	analyticsClient.Info(klothoName + " compiling")
 
 	result, err := compiler.Compile(input)
 	if err != nil || hadErrors.Load() {
@@ -330,7 +330,7 @@ func (km KlothoMain) run(cmd *cobra.Command, args []string) (err error) {
 		} else {
 			err = errors.New("Failed run of klotho invocation")
 		}
-		analyticsClient.Error(klothoName + "compiling failed")
+		analyticsClient.Error(klothoName + " compiling failed")
 
 		cmd.SilenceErrors = true
 		cmd.SilenceUsage = true
@@ -347,10 +347,10 @@ func (km KlothoMain) run(cmd *cobra.Command, args []string) (err error) {
 	}
 
 	CloseTreeSitter(result)
-	analyticsClient.AppendProperties(map[string]interface{}{"resource_types": GetResourceTypeCount(result)})
+	analyticsClient.AppendProperties(map[string]interface{}{"resource_types": GetResourceTypeCount(result, &appCfg)})
 	analyticsClient.AppendProperties(map[string]interface{}{"languages": GetLanguagesUsed(result)})
 	analyticsClient.AppendProperties(map[string]interface{}{"resources": resourceCounts})
-	analyticsClient.Info(klothoName + "compile complete")
+	analyticsClient.Info(klothoName + " compile complete")
 
 	return nil
 }

pkg/core/compiler.go

@@ -18,8 +18,6 @@ type (
 	}
 
 	CloudResource interface {
-		// Type returns the provider-specific type (implementation) of the resource's kind (`Key().Kind`)
-		Type() string
 		// Key returns the unique identifier for the resource.
 		Key() ResourceKey
 	}

pkg/core/exec_unit.go

@@ -74,8 +74,6 @@ var (
 	ExecutableTypeGolang = ExecutableType("Golang")
 )
 
-func (unit *ExecutionUnit) Type() string { return unit.ExecType }
-
 func (unit *ExecutionUnit) Key() ResourceKey {
 	return ResourceKey{
 		Name: unit.Name,

pkg/core/gateway.go

@@ -3,7 +3,6 @@ package core
 type (
 	Gateway struct {
 		Name   string
-		GWType string
 		Routes []Route
 		// Map of gateway targets with the exec unit name as the key
 		DefinedIn     string
@@ -41,7 +40,6 @@ var (
 	}
 )
 
-func (gw *Gateway) Type() string { return gw.GWType }
 func NewGateway(name string) *Gateway {
 	return &Gateway{
 		Name: name,

pkg/core/infra_as_code.go

@@ -12,8 +12,6 @@ type InfraFiles struct {
 
 var InfraAsCodeKind = "infra_as_code"
 
-func (*InfraFiles) Type() string { return "" }
-
 func (iac *InfraFiles) Key() ResourceKey {
 	return ResourceKey{
 		Name: iac.Name,

pkg/core/input.go

@@ -6,8 +6,6 @@ type (
 
 var InputFilesKind = "input_files"
 
-func (*InputFiles) Type() string { return "" }
-
 func (*InputFiles) Key() ResourceKey {
 	return ResourceKey{
 		Kind: InputFilesKind,

pkg/core/persist.go

@@ -7,9 +7,8 @@ import (
 
 type (
 	Persist struct {
-		Name        string
-		PersistType string
-		Kind        PersistKind
+		Name string
+		Kind PersistKind
 	}
 	Secrets struct {
 		Persist
@@ -28,8 +27,6 @@ const (
 	PersistRedisClusterKind PersistKind = "persist_redis_cluster"
 )
 
-func (p *Persist) Type() string { return p.PersistType }
-
 func (p *Persist) Key() ResourceKey {
 	return ResourceKey{
 		Name: p.Name,

pkg/core/pubsub.go

@@ -4,7 +4,6 @@ type (
 	PubSub struct {
 		Path   string
 		Name   string
-		PSType string
 		Events map[string]*Event
 	}
 
@@ -22,8 +21,6 @@ type (
 
 const PubSubKind = "pubsub"
 
-func (p PubSub) Type() string { return p.PSType }
-
 func (p PubSub) Key() ResourceKey {
 	return ResourceKey{
 		Name: p.Name,

pkg/core/static_unit.go

@@ -7,7 +7,6 @@ import (
 
 type (
 	StaticUnit struct {
-		StaticType    string
 		Name          string
 		IndexDocument string
 		StaticFiles   ConcurrentMap[string, File]
@@ -17,8 +16,6 @@ type (
 
 var StaticUnitKind = "static_unit"
 
-func (unit *StaticUnit) Type() string { return unit.StaticType }
-
 func (unit *StaticUnit) Key() ResourceKey {
 	return ResourceKey{
 		Name: unit.Name,

pkg/lang/golang/aws_runtime/aws.go

@@ -34,11 +34,12 @@ var dockerfileLambda []byte
 
 func (r *AwsRuntime) AddExecRuntimeFiles(unit *core.ExecutionUnit, result *core.CompilationResult, deps *core.Dependencies) error {
 	var DockerFile []byte
-	switch unit.Type() {
+	unitType := r.Cfg.GetResourceType(unit)
+	switch unitType {
 	case "lambda":
 		DockerFile = dockerfileLambda
 	default:
-		return errors.Errorf("unsupported execution unit type: '%s'", unit.Type())
+		return errors.Errorf("unsupported execution unit type: '%s'", unitType)
 	}
 
 	templateData := TemplateData{

pkg/lang/javascript/aws_runtime/aws.go

@@ -174,6 +174,7 @@ func (r *AwsRuntime) AddPubsubRuntimeFiles(unit *core.ExecutionUnit) error {
 
 func (r *AwsRuntime) AddProxyRuntimeFiles(unit *core.ExecutionUnit, proxyType string) error {
 	var proxyFile []byte
+	unitType := r.Config.GetResourceType(unit)
 	switch proxyType {
 	case "eks":
 		proxyFile = proxyEks
@@ -184,7 +185,7 @@ func (r *AwsRuntime) AddProxyRuntimeFiles(unit *core.ExecutionUnit, proxyType st
 	case "lambda":
 		proxyFile = proxyLambda
 	default:
-		return errors.Errorf("unsupported exceution unit type: '%s'", unit.Type())
+		return errors.Errorf("unsupported exceution unit type: '%s'", unitType)
 	}
 
 	err := r.AddRuntimeFile(unit, proxyType+"_proxy.js.tmpl", proxyFile)
@@ -201,15 +202,16 @@ func (r *AwsRuntime) AddProxyRuntimeFiles(unit *core.ExecutionUnit, proxyType st
 
 func (r *AwsRuntime) AddExecRuntimeFiles(unit *core.ExecutionUnit, result *core.CompilationResult, deps *core.Dependencies) error {
 	var DockerFile, Dispatcher []byte
-	switch unit.Type() {
+	unitType := r.Config.GetResourceType(unit)
+	switch unitType {
 	case "ecs", "eks", "apprunner":
 		DockerFile = dockerfileFargate
 		Dispatcher = dispatcherFargate
 	case "lambda":
 		DockerFile = dockerfileLambda
 		Dispatcher = dispatcherLambda
 	default:
-		return errors.Errorf("unsupported execution unit type: '%s'", unit.Type())
+		return errors.Errorf("unsupported execution unit type: '%s'", unitType)
 	}
 
 	templateData := TemplateData{

pkg/lang/python/aws_runtime/aws.go

@@ -94,7 +94,8 @@ func (r *AwsRuntime) GetAppName() string {
 func (r *AwsRuntime) AddExecRuntimeFiles(unit *core.ExecutionUnit, result *core.CompilationResult, deps *core.Dependencies) error {
 	var dockerFile, dispatcher []byte
 	var requirements string
-	switch unit.Type() {
+	unitType := r.Cfg.GetResourceType(unit)
+	switch unitType {
 	case "lambda":
 		dockerFile = dockerfileLambda
 		dispatcher = dispatcherLambda
@@ -104,7 +105,7 @@ func (r *AwsRuntime) AddExecRuntimeFiles(unit *core.ExecutionUnit, result *core.
 		dispatcher = dispatcherFargate
 		requirements = execRequirementsFargate
 	default:
-		return errors.Errorf("unsupported execution unit type: '%s'", unit.Type())
+		return errors.Errorf("unsupported execution unit type: '%s'", unitType)
 	}
 
 	templateData := TemplateData{
@@ -242,7 +243,7 @@ func (r *AwsRuntime) AddProxyRuntimeFiles(unit *core.ExecutionUnit, proxyType st
 	case "lambda":
 		fileContents = proxyLambdaContents
 	default:
-		return errors.Errorf("unsupported exceution unit type: '%s'", unit.Type())
+		return errors.Errorf("unsupported exceution unit type: '%s'", r.Cfg.GetResourceType(unit))
 	}
 	err := r.AddRuntimeFile(unit, proxyType+"_proxy.py", []byte(fileContents))
 	if err != nil {

pkg/provider/aws/infra_template.go

@@ -29,7 +29,7 @@ func (a *AWS) Transform(result *core.CompilationResult, deps *core.Dependencies)
 			cfg := a.Config.GetExecutionUnit(key.Name)
 			unit := provider.ExecUnit{
 				Name:                 res.Name,
-				Type:                 res.Type(),
+				Type:                 cfg.Type,
 				EnvironmentVariables: res.EnvironmentVariables,
 				NetworkPlacement:     cfg.NetworkPlacement,
 			}
@@ -91,7 +91,7 @@ func (a *AWS) Transform(result *core.CompilationResult, deps *core.Dependencies)
 			cfg := a.Config.GetStaticUnit(key.Name)
 			unit := provider.StaticUnit{
 				Name:                   res.Name,
-				Type:                   res.Type(),
+				Type:                   cfg.Type,
 				IndexDocument:          res.IndexDocument,
 				ContentDeliveryNetwork: cfg.ContentDeliveryNetwork,
 			}

pkg/provider/aws/infra_template_test.go

@@ -23,7 +23,6 @@ func TestInfraTemplateModification(t *testing.T) {
 			name: "simple test",
 			results: []core.CloudResource{&core.Gateway{
 				Name:   "gw",
-				GWType: core.GatewayKind,
 				Routes: []core.Route{{Path: "/"}},
 			},
 				&core.ExecutionUnit{
@@ -145,7 +144,6 @@ func Test_GenerateCloudfrontDistributions(t *testing.T) {
 			results: []core.CloudResource{
 				&core.Gateway{
 					Name:   "gw",
-					GWType: core.GatewayKind,
 					Routes: []core.Route{{Path: "/"}},
 				},
 			},
@@ -251,7 +249,6 @@ func Test_GenerateCloudfrontDistributions(t *testing.T) {
 				},
 				&core.Gateway{
 					Name:   "gw",
-					GWType: core.GatewayKind,
 					Routes: []core.Route{{Path: "/"}},
 				},
 			},

pkg/static_unit/plugin_static_unit.go

@@ -53,8 +53,7 @@ func (p StaticUnitSplit) Transform(result *core.CompilationResult, deps *core.De
 					errs.Append(cause)
 				}
 				newUnit := &core.StaticUnit{
-					StaticType: p.Config.GetStaticUnit(cap.ID).Type,
-					Name:       cap.ID,
+					Name: cap.ID,
 				}
 
 				indexDocument, ok := cap.Directives.String("index_document")

pkg/topology/topology.go

@@ -84,7 +84,7 @@ func generateIconID(resource core.ResourceKey) string {
 	return fmt.Sprintf("%s_%s", resource.Name, resource.Kind)
 }
 func (p Plugin) getImagePath(resource core.CloudResource) string {
-	imgPath, _ := core.DiagramEntityToImgPath.Get(resource.Key().Kind, resource.Type(), p.Config.Provider)
+	imgPath, _ := core.DiagramEntityToImgPath.Get(resource.Key().Kind, p.Config.GetResourceType(resource), p.Config.Provider)
 	return baseIconUrl + imgPath
 }