fix(worker): find key by name

ovh · Jan 17, 2020 · 9512ea2 · 9512ea2
1 parent 48218c9
commit 9512ea2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/engine/worker/internal/action/builtin_gitclone.go b/engine/worker/internal/action/builtin_gitclone.go
@@ -37,10 +37,10 @@ func RunGitClone(ctx context.Context, wk workerruntime.Runtime, a sdk.Action, se
 	if privateKey != nil && privateKey.Value != "" {
 		// The private key parameter, contains the name of the private key to use.
 		// Let's look up in the secret list to find the content of the private key
-		privateKeyContent := sdk.VariableFind(secrets, privateKey.Value)
+		privateKeyContent := sdk.VariableFind(secrets, privateKey.Name)
 
 		if privateKeyContent == nil {
-			return sdk.Result{}, fmt.Errorf("unknown key \"%s\"", privateKey.Value)
+			return sdk.Result{}, fmt.Errorf("unknown key \"%s\"", privateKey.Name)
 		}
 
 		installedKey, err := wk.InstallKey(sdk.Variable{

diff --git a/engine/worker/internal/run.go b/engine/worker/internal/run.go
@@ -318,7 +318,13 @@ func setupWorkingDirectory(ctx context.Context, fs afero.Fs, wd string) (afero.F
 		}
 	}
 
-	if err := os.Setenv("HOME", wd); err != nil {
+	var absWD string
+	if x, ok := fs.(*afero.BasePathFs); ok {
+		absWD, _ = x.RealPath(wd)
+	} else {
+		absWD = wd
+	}
+	if err := os.Setenv("HOME", absWD); err != nil {
 		return nil, err
 	}