Allow to use components.reference or components.sha

Author: jrd

src/parser-includes.ts

@@ -73,7 +73,7 @@ export class ParserIncludes {
         // cache the parsed component, because parseIncludeComponent is expensive and we would call it twice otherwise
         const componentParseCache = new Map<number, ParsedComponent>();
 
-        const include = this.expandInclude(gitlabData?.include, opts.variables);
+        const include = this.expandInclude(gitlabData?.include, null, opts.variables);
 
         this.normalizeTriggerInclude(gitlabData, opts);
         // Find files to fetch from remote and place in .gitlab-ci-local/includes
@@ -190,7 +190,7 @@ export class ParserIncludes {
         return includeDatas;
     }
 
-    static expandInclude (i: any, variables: {[key: string]: string}): any[] {
+    static expandInclude (i: any, ref: string | null, variables: {[key: string]: string}): any[] {
         let include = i || [];
         if (include && include.length == null) {
             include = [ i ];
@@ -213,16 +213,32 @@ export class ParserIncludes {
         for (const entry of include) {
             for (const [key, value] of Object.entries(entry)) {
                 if (Array.isArray(value)) {
-                    entry[key] = value.map((v) => Utils.expandText(v, variables));
+                    entry[key] = value.map((v) => Utils.expandText(this.expandWithRef(v, ref), variables));
                 } else {
-                    entry[key] = Utils.expandText(value, variables);
+                    entry[key] = Utils.expandText(this.expandWithRef(value, ref), variables);
                 }
             }
         }
 
         return include;
     }
 
+    static expandWithRef (text: any, ref: string | null): string {
+        if (typeof text !== "string" || ref === null) {
+            return text;
+        }
+        return text.replace(
+            /\$\[\[ *component.([a-z]+) *\]\]/g,
+            (_match: string, name: any) => {
+                if (name === "version" || name === "reference" || name === "sha") {
+                    return ref;
+                } else {
+                    return "";
+                }
+            },
+        );
+    }
+
     static covertTemplateToProjectFile (template: string): {project: string; ref: string; file: string; domain: string} {
         return {
             domain: "gitlab.com",
@@ -279,7 +295,7 @@ export class ParserIncludes {
     // Expand local includes inside to a "project"-like include
     static expandInnerLocalIncludes (fileIncludes: any, projectPath: string, ref: string, opts: ParserIncludesInitOptions) {
         const {argv} = opts;
-        const updatedIncludes = this.expandInclude(fileIncludes, opts.variables);
+        const updatedIncludes = this.expandInclude(fileIncludes, ref, opts.variables);
         updatedIncludes.forEach((inner: any, i: number) => {
             if (!inner["local"]) return;
             if (inner["rules"]) {