fix: requested changes

.github/workflows/onbranch.yaml

@@ -24,4 +24,3 @@ jobs:
           INITIUM_APP_NAME: initium-cli
           INITIUM_REGISTRY_USER: ${{ github.actor }}
           INITIUM_REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-          INITIUM_PROJECT_LANGUAGE: go

.github/workflows/onmain.yaml

@@ -22,4 +22,3 @@ jobs:
           INITIUM_APP_NAME: initium-cli
           INITIUM_REGISTRY_USER: ${{ github.actor }}
           INITIUM_REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-          INITIUM_PROJECT_LANGUAGE: go

src/cli/cli.go

@@ -64,7 +64,7 @@ func (c icli) baseBeforeFunc(ctx *cli.Context) error {
 func (c *icli) init(cCtx *cli.Context) error {
 	appName := cCtx.String(appNameFlag)
 	version := cCtx.String(appVersionFlag)
-	projectLanguage := cCtx.String(projectLanguageFlag)
+	projectType := cCtx.String(projectTypeFlag)
 	projectDirectory := cCtx.String(projectDirectoryFlag)
 	absProjectDirectory, err := filepath.Abs(cCtx.String(projectDirectoryFlag))
 	registry := cCtx.String(repoNameFlag)
@@ -82,7 +82,7 @@ func (c *icli) init(cCtx *cli.Context) error {
 
 	project := project.New(
 		appName,
-		projectLanguage,
+		project.ProjectType(projectType),
 		projectDirectory,
 		cCtx.String(runtimeVersionFlag),
 		version,

src/cli/flags.go

@@ -38,7 +38,7 @@ const (
 	appNameFlag           string = "app-name"
 	appVersionFlag        string = "app-version"
 	projectDirectoryFlag  string = "project-directory"
-	projectLanguageFlag   string = "project-language"
+	projectTypeFlag       string = "project-type"
 	repoNameFlag          string = "container-registry"
 	dockerFileNameFlag    string = "dockerfile-name"
 	configFileFlag        string = "config-file"
@@ -152,10 +152,10 @@ func InitFlags() flags {
 					EnvVars: []string{"INITIUM_PROJECT_DIRECTORY"},
 				},
 				&cli.StringFlag{
-					Name:    projectLanguageFlag,
-					Usage:   "The project language (node, go)",
-					Value:   defaults.ProjectLanguage,
-					EnvVars: []string{"INITIUM_PROJECT_LANGUAGE"},
+					Name:    projectTypeFlag,
+					Usage:   "The project type (node, go)",
+					Value:   defaults.ProjectType,
+					EnvVars: []string{"INITIUM_PROJECT_TYPE"},
 				},
 				&cli.StringFlag{
 					Name:    configFileFlag,

src/cli/init.go

@@ -48,7 +48,7 @@ func excludedFlagsFromConfig() []string {
 		appVersionFlag,
 		namespaceFlag,
 		configFileFlag,
-		projectLanguageFlag,
+		projectTypeFlag,
 		projectDirectoryFlag,
 		destinationFolderFlag,
 		tokenFlag,

src/cli/template_test.go

@@ -62,11 +62,10 @@ func TestShouldRenderDockerTemplate(t *testing.T) {
 
 		cCtx := cli.Context{}
 		instance := icli{
-			project: project.Project{
+			project: &project.Project{
 				Name:      string(projectType),
 				Directory: path.Join(root, props["directory"]),
 				Resources: os.DirFS(root),
-				Language:  "auto",
 			},
 			Writer: &buffer,
 		}

src/services/project/project.go

@@ -22,7 +22,7 @@ const (
 type Project struct {
 	Name                  string
 	Version               string
-	Language              string
+	Type                  ProjectType
 	Directory             string
 	RuntimeVersion        string
 	DefaultRuntimeVersion string
@@ -45,58 +45,60 @@ func GuessAppName() *string {
 	return &name
 }
 
-func New(name string, language string, directory string, runtimeVersion string, version string, imagePullSecrets []string, resources fs.FS) Project {
+func New(name string, projectType ProjectType, directory string, runtimeVersion string, version string, imagePullSecrets []string, resources fs.FS) Project {
 	return Project{
-		Name:           name,
-		Language:       language,
-		Directory:      directory,
-		RuntimeVersion: runtimeVersion,
-    ImagePullSecrets: imagePullSecrets,
-		Resources:      resources,
-		Version:        version,
+		Name:             name,
+		Type:             projectType,
+		Directory:        directory,
+		RuntimeVersion:   runtimeVersion,
+		ImagePullSecrets: imagePullSecrets,
+		Resources:        resources,
+		Version:          version,
 	}
 }
 
 func (proj *Project) detectType() (ProjectType, error) {
-	detectedRuntimes := 0
+	var detectedRuntimes []ProjectType
 	var projectType ProjectType
 	if _, err := os.Stat(path.Join(proj.Directory, "package.json")); err == nil {
 		proj.DefaultRuntimeVersion = defaults.DefaultNodeRuntimeVersion
-		detectedRuntimes++
+		detectedRuntimes = append(detectedRuntimes, NodeProject)
 		projectType = NodeProject
-	} else if _, err := os.Stat(path.Join(proj.Directory, "go.mod")); err == nil {
+	}
+	if _, err := os.Stat(path.Join(proj.Directory, "go.mod")); err == nil {
 		proj.DefaultRuntimeVersion = defaults.DefaultGoRuntimeVersion
-		detectedRuntimes++
+		detectedRuntimes = append(detectedRuntimes, GoProject)
 		projectType = GoProject
-	} else {
-		return "", fmt.Errorf("cannot detect project type %v", err)
 	}
-	if detectedRuntimes > 1 {
-		return "", fmt.Errorf("more than one project runtime detected, use --project-language flag or the INITIUM_PROJECT_LANGUAGE env variable to set the desired runtime")
+	if len(detectedRuntimes) == 0 {
+		return "", fmt.Errorf("cannot detect project type")
+	}
+	if len(detectedRuntimes) > 1 {
+		return "", fmt.Errorf("more than one project runtimes detected (%v), use --project-type flag or the INITIUM_PROJECT_TYPE env variable to set the desired runtime", detectedRuntimes)
 	}
 	return projectType, nil
 }
 
 func (proj *Project) matchType() (ProjectType, error) {
-	switch proj.Language {
+	switch proj.Type {
 	case "node":
 		proj.DefaultRuntimeVersion = defaults.DefaultNodeRuntimeVersion
 		return NodeProject, nil
 	case "go":
 		proj.DefaultRuntimeVersion = defaults.DefaultGoRuntimeVersion
 		return GoProject, nil
 	default:
-		return "", fmt.Errorf("cannot detect project type %s", proj.Language)
+		return "", fmt.Errorf("cannot detect project type %s", proj.Type)
 	}
 }
 
 func (proj Project) loadDockerfile() ([]byte, error) {
 	var projectType ProjectType
 	var err error
-	if proj.Language == "auto" {
-		projectType, err = proj.detectType()
-	} else {
+	if proj.Type != "" {
 		projectType, err = proj.matchType()
+	} else {
+		projectType, err = proj.detectType()
 	}
 	if err != nil {
 		return []byte{}, err

src/services/project/project_test.go

@@ -22,12 +22,11 @@ func TestDetectType(t *testing.T) {
 
 	for project_type, props := range projects {
 		test_proj_type := Project{Name: string(project_type),
-			Directory: path.Join(root, props["directory"]),
-			Language:  "auto"}
+			Directory: path.Join(root, props["directory"])}
 
 		var proj_type ProjectType
 		var err error
-		if test_proj_type.Language == "auto" {
+		if test_proj_type.Type == "" {
 			proj_type, err = test_proj_type.detectType()
 		} else {
 			proj_type, err = test_proj_type.matchType()
@@ -52,7 +51,6 @@ func TestLoadDockerfile(t *testing.T) {
 	for project_type, props := range projects {
 		proj_dockerfile := Project{Name: string(project_type),
 			Directory: path.Join(root, props["directory"]),
-			Language:  "auto",
 			Resources: os.DirFS(root),
 		}
 		_, err := proj_dockerfile.loadDockerfile()
@@ -73,7 +71,6 @@ func TestCorrectRuntime(t *testing.T) {
 	proj_runtime := Project{
 		Name:           "test",
 		Directory:      path.Join(root, projects["node"]["directory"]),
-		Language:       "auto",
 		Resources:      os.DirFS(root),
 		RuntimeVersion: "30",
 	}

src/utils/defaults/defaults.go

@@ -2,7 +2,7 @@ package defaults
 
 const (
 	ProjectDirectory    string = "."
-	ProjectLanguage     string = "auto"
+	ProjectType         string = ""
 	RepoName            string = "ghcr.io/nearform"
 	GithubActionFolder  string = ".github/workflows"
 	GithubDefaultBranch string = "main"