Apply dir overrides from agent config

_tests/integration/agent-config.yml

@@ -0,0 +1,12 @@
+bitrise_dirs:
+  BITRISE_DATA_HOME_DIR: $INTEGRATION_TEST_BINARY_PATH/../agent
+  BITRISE_SOURCE_DIR: $INTEGRATION_TEST_BINARY_PATH/../agent/workspace/$BITRISE_APP_SLUG
+  BITRISE_DEPLOY_DIR: $INTEGRATION_TEST_BINARY_PATH/../agent/$BITRISE_APP_SLUG/$BITRISE_BUILD_SLUG/artifacts
+  BITRISE_TEST_DEPLOY_DIR: $INTEGRATION_TEST_BINARY_PATH/../agent/$BITRISE_APP_SLUG/$BITRISE_BUILD_SLUG/test_results
+
+hooks:
+  cleanup_on_workflow_start:
+  - $BITRISE_DEPLOY_DIR
+
+  cleanup_on_workflow_end:
+  - $BITRISE_TEST_DEPLOY_DIR

_tests/integration/agent_config_test.go

@@ -0,0 +1,31 @@
+package integration
+
+import (
+	"os"
+	"testing"
+
+	"github.com/bitrise-io/go-utils/command"
+	"github.com/bitrise-io/go-utils/pathutil"
+	"github.com/stretchr/testify/require"
+)
+
+func Test_AgentConfigTest(t *testing.T) {
+	cfg, err := os.ReadFile("agent-config.yml")
+	require.NoError(t, err)
+
+	absPath, err := pathutil.AbsPath("$HOME/.bitrise/agent-config.yml")
+	require.NoError(t, err)
+
+	err = os.WriteFile(absPath, cfg, 0644)
+	require.NoError(t, err)
+	defer func ()  {
+		os.Remove(absPath)
+	}()
+
+	t.Setenv("BITRISE_APP_SLUG", "ef7a9665e8b6408b")
+	t.Setenv("BITRISE_BUILD_SLUG", "80b66786-d011-430f-9c68-00e9416a7325")
+
+	cmd := command.New(binPath(), "run", "test", "--config", "agent_config_test_bitrise.yml")
+	out, err := cmd.RunAndReturnTrimmedCombinedOutput()
+	require.NoError(t, err, out)
+}

_tests/integration/agent_config_test_bitrise.yml

@@ -0,0 +1,37 @@
+format_version: 13
+default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git
+
+workflows:
+  test:
+    steps:
+    - script:
+        inputs:
+        - content: |
+            set -ex
+            if [[ "$BITRISE_DATA_HOME_DIR" != $(dirname $INTEGRATION_TEST_BINARY_PATH)/agent ]]; then
+              echo "BITRISE_DATA_HOME_DIR does not point to the expected directory"
+              exit 1
+            fi
+
+            ls $BITRISE_DATA_HOME_DIR
+
+            if [[ "$BITRISE_SOURCE_DIR" != $(dirname $INTEGRATION_TEST_BINARY_PATH)/agent/workspace/$BITRISE_APP_SLUG ]]; then
+              echo "BITRISE_SOURCE_DIR does not point to the expected directory"
+              exit 1
+            fi
+
+            ls $BITRISE_SOURCE_DIR
+
+            if [[ "$BITRISE_DEPLOY_DIR" != $(dirname $INTEGRATION_TEST_BINARY_PATH)/agent/$BITRISE_APP_SLUG/$BITRISE_BUILD_SLUG/artifacts ]]; then
+              echo "BITRISE_DEPLOY_DIR does not point to the expected directory"
+              exit 1
+            fi
+
+            ls $BITRISE_DEPLOY_DIR
+
+            if [[ "$BITRISE_TEST_DEPLOY_DIR" != $(dirname $INTEGRATION_TEST_BINARY_PATH)/agent/$BITRISE_APP_SLUG/$BITRISE_BUILD_SLUG/test_results ]]; then
+              echo "BITRISE_TEST_DEPLOY_DIR does not point to the expected directory"
+              exit 1
+            fi
+
+            ls $BITRISE_TEST_DEPLOY_DIR

_tests/integration/log_format_test.go

@@ -8,6 +8,7 @@ import (
 	"regexp"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/bitrise-io/bitrise/log"
 	"github.com/bitrise-io/bitrise/models"
@@ -133,7 +134,7 @@ func convertBitriseStartedEventLog(line []byte) (string, error) {
 	}
 
 	var buf bytes.Buffer
-	logger := log.NewLogger(log.LoggerOpts{LoggerType: log.ConsoleLogger, Writer: &buf})
+	logger := log.NewLogger(log.LoggerOpts{LoggerType: log.ConsoleLogger, Writer: &buf, TimeProvider: time.Now})
 	logger.PrintBitriseStartedEvent(eventLog.Content)
 
 	return buf.String(), nil
@@ -260,5 +261,8 @@ func replaceVariableParts(line string) string {
 	totalRunTimeRegexp := regexp.MustCompile(`(\| Total runtime: .+ \|)`)
 	line = totalRunTimeRegexp.ReplaceAllString(line, "[REPLACED]")
 
+	invocationStartRegexp := regexp.MustCompile(`Invocation started at .+`)
+	line = invocationStartRegexp.ReplaceAllString(line, "[REPLACED]")
+
 	return line
 }

cli/run.go

@@ -222,6 +222,10 @@ func (r WorkflowRunner) runWorkflows(tracker analytics.Tracker) (models.BuildRun
 
 	buildIDProperties := coreanalytics.Properties{analytics.BuildExecutionID: uuid.Must(uuid.NewV4()).String()}
 
+	if err := configs.RegisterAgentOverrides(); err != nil {
+		return models.BuildRunResultsModel{}, fmt.Errorf("apply agent config: %s", err)
+	}
+
 	log.PrintBitriseStartedEvent(plan)
 
 	// Run workflows

cli/setup.go

@@ -31,8 +31,6 @@ var setupCommand = cli.Command{
 }
 
 func setup(c *cli.Context) error {
-	log.PrintBitriseASCIIArt()
-
 	fullMode := c.Bool("full")
 	cleanMode := c.Bool("clean")
 

configs/agent_config.go

@@ -5,10 +5,12 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/bitrise-io/bitrise/log"
 	"github.com/bitrise-io/go-utils/pathutil"
 	"gopkg.in/yaml.v2"
 )
 
+const agentConfigFileName = "agent-config.yml"
 const defaultSourceDir = "workspace"
 const defaultDeployDir = "$BITRISE_APP_SLUG/$BITRISE_BUILD_SLUG/artifacts"
 const defaultTestDeployDir = "$BITRISE_APP_SLUG/$BITRISE_BUILD_SLUG/test_results"
@@ -53,6 +55,72 @@ type AgentHooks struct {
 	DoOnWorkflowEnd   string `yaml:"do_on_workflow_end"`
 }
 
+func RegisterAgentOverrides() error {
+	if !hasAgentConfigFile() {
+		return nil
+	}
+
+	file := filepath.Join(GetBitriseHomeDirPath(), agentConfigFileName)
+
+	log.Print("")
+	log.Info("Running in agent mode")
+	log.Printf("Config file: %s", file)
+
+	config, err := readAgentConfig(file)
+	if err != nil {
+		return fmt.Errorf("agent config file: %w", err)
+	}
+	log.Printf("env: %s", os.Getenv(BitriseDataHomeDirEnvKey))
+
+	// BITRISE_DATA_HOME_DIR
+	err = pathutil.EnsureDirExist(config.BitriseDirs.BitriseDataHomeDir)
+	if err != nil {
+		return fmt.Errorf("can't create BITRISE_DATA_HOME_DIR: %w", err)
+	}
+	err = os.Setenv(BitriseDataHomeDirEnvKey, config.BitriseDirs.BitriseDataHomeDir)
+	if err != nil {
+		return fmt.Errorf("set BITRISE_DATA_HOME_DIR: %w", err)
+	}
+
+
+	// BITRISE_SOURCE_DIR
+	err = pathutil.EnsureDirExist(config.BitriseDirs.SourceDir)
+	if err != nil {
+		return fmt.Errorf("can't create BITRISE_SOURCE_DIR: %w", err)
+	}
+	err = os.Setenv(BitriseSourceDirEnvKey, config.BitriseDirs.SourceDir)
+	if err != nil {
+		return fmt.Errorf("set BITRISE_SOURCE_DIR: %w", err)
+	}
+
+	// BITRISE_DEPLOY_DIR
+	err = pathutil.EnsureDirExist(config.BitriseDirs.DeployDir)
+	if err != nil {
+		return fmt.Errorf("can't create BITRISE_DEPLOY_DIR: %w", err)
+	}
+	os.Setenv(BitriseDeployDirEnvKey, config.BitriseDirs.DeployDir)
+	if err != nil {
+		return fmt.Errorf("set BITRISE_DEPLOY_DIR: %w", err)
+	}
+
+	// BITRISE_TEST_DEPLOY_DIR
+	err = pathutil.EnsureDirExist(config.BitriseDirs.TestDeployDir)
+	if err != nil {
+		return fmt.Errorf("can't create BITRISE_TEST_DEPLOY_DIR: %w", err)
+	}
+	os.Setenv(BitriseTestDeployDirEnvKey, config.BitriseDirs.TestDeployDir)
+	if err != nil {
+		return fmt.Errorf("set BITRISE_TEST_DEPLOY_DIR: %w", err)
+	}
+
+	return nil
+}
+
+func hasAgentConfigFile() bool {
+	exists, _ := pathutil.IsPathExists(filepath.Join(GetBitriseHomeDirPath(), agentConfigFileName))
+	return exists
+}
+
 func readAgentConfig(configFile string) (AgentConfig, error) {
 	fileContent, err := os.ReadFile(configFile)
 	if err != nil {
@@ -65,76 +133,80 @@ func readAgentConfig(configFile string) (AgentConfig, error) {
 		return AgentConfig{}, err
 	}
 
-	expandedBitriseDataHomeDir, err := expandPath(config.BitriseDirs.BitriseDataHomeDir)
+	dataHomeDir, err := normalizePath(config.BitriseDirs.BitriseDataHomeDir)
 	if err != nil {
 		return AgentConfig{}, fmt.Errorf("expand BITRISE_DATA_HOME_DIR value: %s", err)
 	}
-	config.BitriseDirs.BitriseDataHomeDir = expandedBitriseDataHomeDir
+	config.BitriseDirs.BitriseDataHomeDir = dataHomeDir
 
 	// BITRISE_SOURCE_DIR
 	if config.BitriseDirs.SourceDir == "" {
 		config.BitriseDirs.SourceDir = filepath.Join(config.BitriseDirs.BitriseDataHomeDir, defaultSourceDir)
 	}
-	expandedSourceDir, err := expandPath(config.BitriseDirs.SourceDir)
+	sourceDir, err := normalizePath(config.BitriseDirs.SourceDir)
 	if err != nil {
 		return AgentConfig{}, fmt.Errorf("expand BITRISE_SOURCE_DIR value: %s", err)
 	}
-	config.BitriseDirs.SourceDir = expandedSourceDir
+	config.BitriseDirs.SourceDir = sourceDir
 
 	// BITRISE_DEPLOY_DIR
 	if config.BitriseDirs.DeployDir == "" {
 		config.BitriseDirs.DeployDir = filepath.Join(config.BitriseDirs.BitriseDataHomeDir, defaultDeployDir)
 	}
-	expandedDeployDir, err := expandPath(config.BitriseDirs.DeployDir)
+	deployDir, err := normalizePath(config.BitriseDirs.DeployDir)
 	if err != nil {
 		return AgentConfig{}, fmt.Errorf("expand BITRISE_DEPLOY_DIR value: %s", err)
 	}
-	config.BitriseDirs.DeployDir = expandedDeployDir
+	config.BitriseDirs.DeployDir = deployDir
 
 	// BITRISE_TEST_DEPLOY_DIR
 	if config.BitriseDirs.TestDeployDir == "" {
 		config.BitriseDirs.TestDeployDir = filepath.Join(config.BitriseDirs.BitriseDataHomeDir, defaultTestDeployDir)
 	}
-	expandedTestDeployDir, err := expandPath(config.BitriseDirs.TestDeployDir)
+	testDeployDir, err := normalizePath(config.BitriseDirs.TestDeployDir)
 	if err != nil {
 		return AgentConfig{}, fmt.Errorf("expand BITRISE_TEST_DEPLOY_DIR value: %s", err)
 	}
-	config.BitriseDirs.TestDeployDir = expandedTestDeployDir
+	config.BitriseDirs.TestDeployDir = testDeployDir
 
 	// Hooks
 	if config.Hooks.DoOnWorkflowStart != "" {
-		expandedDoOnWorkflowStart, err := expandPath(config.Hooks.DoOnWorkflowStart)
+		doOnWorkflowStart, err := normalizePath(config.Hooks.DoOnWorkflowStart)
 		if err != nil {
 			return AgentConfig{}, fmt.Errorf("expand do_on_workflow_start value: %s", err)
 		}
-		doOnWorkflowStartExists, err := pathutil.IsPathExists(expandedDoOnWorkflowStart)
+		doOnWorkflowStartExists, err := pathutil.IsPathExists(doOnWorkflowStart)
 		if err != nil {
 			return AgentConfig{}, err
 		}
 		if !doOnWorkflowStartExists {
-			return AgentConfig{}, fmt.Errorf("do_on_workflow_start path does not exist: %s", expandedDoOnWorkflowStart)
+			return AgentConfig{}, fmt.Errorf("do_on_workflow_start path does not exist: %s", doOnWorkflowStart)
 		}
-		config.Hooks.DoOnWorkflowStart = expandedDoOnWorkflowStart
+		config.Hooks.DoOnWorkflowStart = doOnWorkflowStart
 	}
 
 	if config.Hooks.DoOnWorkflowEnd != "" {
-		expandedDoOnWorkflowEnd, err := expandPath(config.Hooks.DoOnWorkflowEnd)
+		doOnWorkflowEnd, err := normalizePath(config.Hooks.DoOnWorkflowEnd)
 		if err != nil {
 			return AgentConfig{}, fmt.Errorf("expand do_on_workflow_end value: %s", err)
 		}
-		doOnWorkflowEndExists, err := pathutil.IsPathExists(expandedDoOnWorkflowEnd)
+		doOnWorkflowEndExists, err := pathutil.IsPathExists(doOnWorkflowEnd)
 		if err != nil {
 			return AgentConfig{}, err
 		}
 		if !doOnWorkflowEndExists {
-			return AgentConfig{}, fmt.Errorf("do_on_workflow_end path does not exist: %s", expandedDoOnWorkflowEnd)
+			return AgentConfig{}, fmt.Errorf("do_on_workflow_end path does not exist: %s", doOnWorkflowEnd)
 		}
-		config.Hooks.DoOnWorkflowEnd = expandedDoOnWorkflowEnd
+		config.Hooks.DoOnWorkflowEnd = doOnWorkflowEnd
 	}
 
 	return config, nil
 }
 
-func expandPath(path string) (string, error) {
-	return pathutil.ExpandTilde(os.ExpandEnv(path))
+func normalizePath(path string) (string, error) {
+	expanded, err := pathutil.ExpandTilde(os.ExpandEnv(path))
+	if err != nil {
+		return "", err
+	}
+	return pathutil.AbsPath(expanded)
 }

configs/configs.go

@@ -108,19 +108,16 @@ func saveBitriseConfig(config ConfigModel) error {
 	return fileutil.WriteBytesToFile(configPth, bytes)
 }
 
-// DeleteBitriseConfigDir ...
 func DeleteBitriseConfigDir() error {
 	confDirPth := GetBitriseHomeDirPath()
 	return os.RemoveAll(confDirPth)
 }
 
-// EnsureBitriseConfigDirExists ...
 func EnsureBitriseConfigDirExists() error {
 	confDirPth := GetBitriseHomeDirPath()
 	return pathutil.EnsureDirExist(confDirPth)
 }
 
-// CheckIsCLIUpdateCheckRequired ...
 func CheckIsCLIUpdateCheckRequired() bool {
 	config, err := loadBitriseConfig()
 	if err != nil {
@@ -135,7 +132,6 @@ func CheckIsCLIUpdateCheckRequired() bool {
 	return false
 }
 
-// SaveCLIUpdateCheck ...
 func SaveCLIUpdateCheck() error {
 	config, err := loadBitriseConfig()
 	if err != nil {
@@ -147,7 +143,6 @@ func SaveCLIUpdateCheck() error {
 	return saveBitriseConfig(config)
 }
 
-// CheckIsPluginUpdateCheckRequired ...
 func CheckIsPluginUpdateCheckRequired(plugin string) bool {
 	config, err := loadBitriseConfig()
 	if err != nil {
@@ -162,7 +157,6 @@ func CheckIsPluginUpdateCheckRequired(plugin string) bool {
 	return false
 }
 
-// SavePluginUpdateCheck ...
 func SavePluginUpdateCheck(plugin string) error {
 	config, err := loadBitriseConfig()
 	if err != nil {
@@ -178,7 +172,6 @@ func SavePluginUpdateCheck(plugin string) error {
 	return saveBitriseConfig(config)
 }
 
-// CheckIsSetupWasDoneForVersion ...
 func CheckIsSetupWasDoneForVersion(ver string) bool {
 	config, err := loadBitriseConfig()
 	if err != nil {
@@ -187,7 +180,6 @@ func CheckIsSetupWasDoneForVersion(ver string) bool {
 	return (config.SetupVersion == ver)
 }
 
-// SaveSetupSuccessForVersion ...
 func SaveSetupSuccessForVersion(ver string) error {
 	config, err := loadBitriseConfig()
 	if err != nil {