Support accepted kitfile names

pkg/cmd/build/cmd.go

@@ -6,10 +6,10 @@ package build
 import (
 	"context"
 	"fmt"
-	"path"
 	"strings"
 
 	"kitops/pkg/lib/constants"
+	"kitops/pkg/lib/filesystem"
 	"kitops/pkg/lib/storage"
 	"kitops/pkg/output"
 
@@ -73,7 +73,7 @@ func (opts *buildOptions) complete(ctx context.Context, flags *buildFlags, args
 
 	opts.modelFile = flags.modelFile
 	if opts.modelFile == "" {
-		opts.modelFile = path.Join(opts.contextDir, constants.DefaultModelFileName)
+		opts.modelFile = filesystem.FindKitfileInPath(opts.contextDir)
 	}
 
 	configHome, ok := ctx.Value(constants.ConfigKey{}).(string)

pkg/cmd/build/cmd_test.go

@@ -28,7 +28,7 @@ func TestBuildOptions_Complete(t *testing.T) {
 
 	assert.NoError(t, err)
 	assert.Equal(t, args[0], options.contextDir)
-	assert.Equal(t, filepath.Join(args[0], constants.DefaultModelFileName), options.modelFile)
+	assert.Equal(t, filepath.Join(args[0], constants.DefaultKitFileName), options.modelFile)
 }
 
 func TestBuildOptions_RunBuild(t *testing.T) {

pkg/cmd/export/export.go

@@ -81,7 +81,7 @@ func exportModel(ctx context.Context, store oras.Target, ref *registry.Reference
 }
 
 func exportConfig(config *artifact.KitFile, exportDir string, overwrite bool) error {
-	configPath := path.Join(exportDir, constants.DefaultModelFileName)
+	configPath := path.Join(exportDir, constants.DefaultKitFileName)
 	if fi, exists := filesystem.PathExists(configPath); exists {
 		if !overwrite {
 			return fmt.Errorf("failed to export config: path %s already exists", configPath)

pkg/lib/constants/consts.go

@@ -3,8 +3,8 @@ package constants
 type ConfigKey struct{}
 
 const (
-	DefaultModelFileName = "Kitfile"
-	DefaultConfigSubdir  = ".kitops"
+	DefaultKitFileName  = "Kitfile"
+	DefaultConfigSubdir = ".kitops"
 
 	// Media type for the model layer
 	ModelLayerMediaType = "application/vnd.kitops.modelkit.model.v1.tar+gzip"

pkg/lib/filesystem/paths.go

@@ -3,6 +3,7 @@ package filesystem
 import (
 	"fmt"
 	"io/fs"
+	"kitops/pkg/lib/constants"
 	"os"
 	"path/filepath"
 	"strings"
@@ -48,3 +49,17 @@ func PathExists(path string) (fs.FileInfo, bool) {
 	}
 	return fi, true
 }
+
+// Searches for a kit file in the given context directory.
+// It checks for accepted kitfile names and returns the path of the first found kitfile.
+// If no kitfile is found, it returns the path (contextDir + kitfile)
+// of the default kitfile.
+func FindKitfileInPath(contextDir string) string {
+	var defaultKitFileNames = []string{"Kitfile", "kitfile", ".kitfile"}
+	for _, fileName := range defaultKitFileNames {
+		if _, exists := PathExists(filepath.Join(contextDir, fileName)); exists {
+			return filepath.Join(contextDir, fileName)
+		}
+	}
+	return filepath.Join(contextDir, constants.DefaultKitFileName)
+}