refactor: remove hacky workaround for hiding FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR (#1382)

Author: ANGkeith

src/job.ts

@@ -151,11 +151,6 @@ export class Job {
         this.rules = jobData.rules || null;
         this.environment = typeof jobData.environment === "string" ? {name: jobData.environment} : jobData.environment;
 
-        // HACK: So that this won't show up in the preview variables
-        if (! argv.preview) {
-            globalVariables["FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR"] = argv.umask ? "false" : "true";
-        }
-
         const matrixVariables = opt.matrixVariables ?? {};
         const fileVariables = Utils.findEnvMatchedVariables(variablesFromFiles, this.fileVariablesDir);
         this._variables = {...globalVariables, ...jobVariables, ...matrixVariables, ...predefinedVariables, ...fileVariables, ...argvVariables};
@@ -494,7 +489,7 @@ export class Job {
 
             let chownOpt = "0:0";
             let chmodOpt = "a+rw";
-            if (expanded["FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR"] === "true") {
+            if (this.argv.umask === false) {
                 const {stdout} = await Utils.spawn(["docker", "run", "--rm", "--entrypoint", "sh", imageName, "-c", "echo \"$(id -u):$(id -g)\""]);
                 chownOpt = stdout;
                 if (chownOpt == "0:0") {
@@ -705,7 +700,7 @@ export class Job {
                 dockerCmd += `--ulimit nofile=${this.argv.ulimit} `;
             }
 
-            if (expanded["FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR"] === "false") {
+            if (this.argv.umask === true) {
                 dockerCmd += "--user 0:0 ";
             }
 
@@ -1204,7 +1199,7 @@ export class Job {
         let dockerCmd = `${this.argv.containerExecutable} create --interactive `;
         this.refreshLongRunningSilentTimeout(writeStreams);
 
-        if (expanded["FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR"] === "false") {
+        if (this.argv.umask === true) {
             dockerCmd += "--user 0:0 ";
         }
 

src/predefined-variables.ts

@@ -1,12 +1,10 @@
 import camelCase from "camelcase";
 import {GitData} from "./git-data.js";
+import {Argv} from "./argv.js";
 
 type PredefinedVariablesOpts = {
     gitData: GitData;
-    argv: {
-        unsetVariables: string[];
-        variable: {[key: string]: string};
-    };
+    argv: Argv;
     envMatchedVariables: {[key: string]: string};
 };
 
@@ -79,6 +77,7 @@ export function init ({gitData, argv, envMatchedVariables}: PredefinedVariablesO
         CI_PROJECT_URL: `${CI_SERVER_URL}/${gitData.remote.group}/${gitData.remote.project}`,
         CI_TEMPLATE_REGISTRY_HOST: "registry.gitlab.com",
         GITLAB_CI: "false",
+        FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: argv.umask ? "false" : "true",
     };
 
     // Delete variables the user intentionally wants unset