Added support for fetching branch name from app definition

Author: akclace

internal/app/apptype/builtins.go

@@ -444,19 +444,36 @@ func createAPIBuiltin(_ *starlark.Thread, _ *starlark.Builtin, args starlark.Tup
 }
 
 func CreateConfigBuiltin(nodeConfig types.NodeConfig, allowedEnv []string) func(_ *starlark.Thread, _ *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) {
-	return func(_ *starlark.Thread, _ *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) {
-		var input starlark.String
+	return func(thread *starlark.Thread, _ *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) {
+		var key starlark.String
 		var defaultVal starlark.Value
-		if err := starlark.UnpackArgs(CONFIG, args, kwargs, "input", &input, "default?", &defaultVal); err != nil {
+		if err := starlark.UnpackArgs(CONFIG, args, kwargs, "key", &key, "default", &defaultVal); err != nil {
 			return nil, fmt.Errorf("error unpacking config args: %w", err)
 		}
 		var err error
 		var outVal starlark.Value = defaultVal
-		localVal, ok := nodeConfig[string(input)]
+
+		if key == "_branch" {
+			// _branch is a special input that returns the current branch name
+			branch := thread.Local(types.TL_BRANCH)
+			if branch == nil {
+				return defaultVal, nil
+			}
+			branchStr, ok := branch.(string)
+			if !ok {
+				return nil, fmt.Errorf("branch is not a string %v", branch)
+			}
+			if branchStr == "" {
+				return defaultVal, nil
+			}
+			return starlark.String(branchStr), nil
+		}
+
+		localVal, ok := nodeConfig[string(key)]
 		if ok {
 			outVal, err = starlark_type.MarshalStarlark(localVal)
 			if err != nil {
-				return nil, fmt.Errorf("error marshalling config value for %s: %w", input, err)
+				return nil, fmt.Errorf("error marshalling config value for %s: %w", key, err)
 			}
 		}
 		if strVal, ok := outVal.(starlark.String); ok {

internal/server/apply.go

@@ -29,7 +29,7 @@ const (
 	APP = "app"
 )
 
-func (s *Server) loadApplyInfo(fileName string, data []byte) ([]*types.CreateAppRequest, error) {
+func (s *Server) loadApplyInfo(fileName string, data []byte, branch string) ([]*types.CreateAppRequest, error) {
 	appDefs := make([]*starlarkstruct.Struct, 0)
 
 	createAppBuiltin := func(_ *starlark.Thread, _ *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) {
@@ -81,6 +81,8 @@ func (s *Server) loadApplyInfo(fileName string, data []byte) ([]*types.CreateApp
 		Print: func(_ *starlark.Thread, msg string) { s.Info().Msg(msg) },
 	}
 
+	thread.SetLocal(types.TL_BRANCH, branch)
+
 	options := syntax.FileOptions{}
 	_, err := starlark.ExecFileOptions(&options, thread, fileName, data, builtins)
 	if err != nil {
@@ -273,6 +275,10 @@ func (s *Server) Apply(ctx context.Context, inputTx types.Transaction, applyPath
 		return nil, nil, err
 	}
 
+	if !system.IsGit(applyPath) {
+		branch = ""
+	}
+
 	if len(globFiles) == 0 {
 		return nil, nil, fmt.Errorf("no matching files found in %s", applyPath)
 	}
@@ -283,7 +289,7 @@ func (s *Server) Apply(ctx context.Context, inputTx types.Transaction, applyPath
 			return nil, nil, fmt.Errorf("error reading file %s: %w", f, err)
 		}
 
-		fileConfig, err := s.loadApplyInfo(f, fileBytes)
+		fileConfig, err := s.loadApplyInfo(f, fileBytes, branch)
 		if err != nil {
 			return nil, nil, err
 		}

internal/types/types.go

@@ -49,6 +49,7 @@ const (
 	TL_AUDIT_TARGET             = "TL_audit_target"
 	TL_AUDIT_DETAIL             = "TL_audit_detail"
 	TL_CONTAINER_MANAGER        = "TL_container_manager"
+	TL_BRANCH                   = "TL_branch"
 )
 
 const (

tests/commander/test_apply_git.yaml

@@ -44,3 +44,17 @@ tests:
     command: ../clace apply github.com/claceio/clace/tests/apply_files/apply_invalid.ace /applytest/test2
     stderr: "no matching files found in"
     exit-code: 1
+
+  apply_git0060: ## create apps without branch
+    command: ../clace apply github.com/claceio/clace/tests/apply_files/apply_git_config.ace
+    stdout: "1 app(s) created, 0 app(s) updated, 0 app(s) reloaded, 0 app(s) skipped, 0 app(s) approved, 0 app(s) promoted."
+  apply_git0061: ## create apps with branch
+    command: ../clace apply --branch main github.com/claceio/clace/tests/apply_files/apply_git_config.ace
+    stdout: "0 app(s) created, 0 app(s) updated, 0 app(s) reloaded, 1 app(s) skipped, 0 app(s) approved, 0 app(s) promoted."
+  apply_git0062: ## create apps with branch which is invalid for app
+    command: ../clace apply --branch test github.com/claceio/clace/tests/apply_files/apply_git_config.ace
+    stderr: "error checking out branch test"
+    exit-code: 1
+  apply_git0063: ## create apps without git
+    command: ../clace apply ./apply_files/apply_git_config.ace
+    stdout: "0 app(s) created, 0 app(s) updated, 0 app(s) reloaded, 1 app(s) skipped, 0 app(s) approved, 0 app(s) promoted."