Fix support for custom tasks (redhat-developer#517)

* redhat-developer#509 Fix support for custom tasks

Signed-off-by: Yevhen Vydolob <[email protected]>

* Remove unused import

* Fix test

Signed-off-by: Yevhen Vydolob <[email protected]>

* Fix tests

Signed-off-by: Yevhen Vydolob <[email protected]>

Author: evidolob

package-lock.json

@@ -955,7 +955,7 @@
     "@types/string-format": "^2.0.0",
     "@types/tmp": "0.1.0",
     "@types/validator": "^10.11.2",
-    "@types/vscode": "^1.50.0",
+    "@types/vscode": "^1.54.0",
     "@typescript-eslint/eslint-plugin": "^2.12.0",
     "@typescript-eslint/parser": "^2.12.0",
     "base64-inline-loader": "^1.1.1",

package.json

@@ -185,6 +185,10 @@ async function generate(doc: vscode.TextDocument, schemaPath: string): Promise<s
     const templateObj = JSON.parse(template);
     let templateWithSnippets = injectTaskSnippets(templateObj, snippets);
     const tasksRef = snippets.map(value => value.body.taskRef.name);
+    const customTasks = pipelineYaml.getCustomTasks(doc);
+    if (customTasks.length > 0){
+      tasksRef.push(...customTasks);
+    }
     templateWithSnippets = injectTasksName(templateWithSnippets, definedTasks, tasksRef);
     templateWithSnippets = injectResourceName(templateWithSnippets, resNames);
     templateWithSnippets = injectConditionRefs(templateWithSnippets, conditions);

src/yaml-support/tkn-yaml-scheme-generator.ts

@@ -183,6 +183,38 @@ export class PipelineYaml {
     return getTasksSeq(specMap);
   }
 
+  getCustomTasks(vsDocument: vscode.TextDocument): string[]{
+    const result: string[] = [];
+    if (tektonYaml.isTektonYaml(vsDocument) === TektonYamlType.Pipeline) {
+      const yamlDocuments = yamlLocator.getYamlDocuments(vsDocument);
+      for (const doc of yamlDocuments) {
+        const rootMap = tektonYaml.getRootMap(doc);
+        if (rootMap) {
+          const specMap = getSpecMap(rootMap);
+          if (specMap) {
+            const tasksSeq = getTasksSeq(specMap);
+            if (tasksSeq) {
+              for (const taskNode of tasksSeq.items) {
+                if (taskNode.kind === 'MAPPING') {
+                  const taskRef = findNodeByKey<YamlMap>('taskRef', taskNode as YamlMap);
+                  if (taskRef){
+                    const apiVersion = findNodeByKey<YamlNode>('apiVersion', taskRef);
+                    const kind = findNodeByKey<YamlNode>('kind', taskRef);
+                    const nameValue = findNodeByKey<YamlNode>('name', taskRef);
+                    if (nameValue && apiVersion && kind) {
+                      result.push(nameValue.raw.trim());
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    return result;
+  }
+
   getTaskRef(task: YamlMap): YamlMap {
     return findNodeByKey<YamlMap>('taskRef', task);
   }

src/yaml-support/tkn-yaml.ts

@@ -105,12 +105,11 @@ suite('Tekton/Pipeline', () => {
         error: '',
         stdout: JSON.stringify(route)
       });
-      const writeTextStub = sandbox.stub(vscode.env.clipboard, 'writeText').resolves('http://test.openshift.com');
       const infoMsg = sandbox.stub(vscode.window, 'showInformationMessage').resolves('Expose URl successfully copied');
       await TriggerTemplate.copyExposeUrl(triggerTemplateItem);
       expect(exeStub).called;
       expect(infoMsg).is.calledOnce;
-      expect(writeTextStub).called;
+      expect(await vscode.env.clipboard.readText()).equal('http://test.openshift.com');
     });
 
     test('copy expose URL for triggerRef', async () => {
@@ -126,12 +125,12 @@ suite('Tekton/Pipeline', () => {
         error: '',
         stdout: JSON.stringify(route)
       });
-      const writeTextStub = sandbox.stub(vscode.env.clipboard, 'writeText').resolves('http://test.openshift.com');
+    
       const infoMsg = sandbox.stub(vscode.window, 'showInformationMessage').resolves('Expose URl successfully copied');
       await TriggerTemplate.copyExposeUrl(triggerTemplateItem);
       expect(exeStub).called;
       expect(infoMsg).is.calledOnce;
-      expect(writeTextStub).called;
+      expect(await vscode.env.clipboard.readText()).equal('http://test.openshift.com');
     });
 
     test('return null if no EventListener found', async () => {

test/tekton/triggertemplate.test.ts

@@ -90,4 +90,31 @@ suite('Pipeline scheme generator', () => {
       description: 'Foo Result Description'
     });
   });
+
+  test('Generator should add custom task name to tasks ref enum', async () => {
+    const yaml = `
+    apiVersion: tekton.dev/v1beta1
+    kind: Pipeline
+    metadata:
+      name: example
+    spec:
+      params:
+      - name: pipeline-param
+        default: hello
+      tasks:
+      - name: example-task
+        taskRef:
+          apiVersion: example.dev/v0
+          kind: Example
+          name: my-example
+        params:
+        - name: task-param
+          value: "$(params.pipeline-param)"
+        `
+    const doc = new TestTextDocument(vscode.Uri.file(path.join('foo', 'PipelineSchemeGenerator3.yaml')), yaml);
+    const result = await generateScheme(doc, path.resolve(__dirname, '..', '..', '..', 'scheme', 'tekton.dev', 'v1beta1_Pipeline.json'));
+    const scheme = JSON.parse(result);
+    expect(scheme.definitions.TaskRef.properties.name.enum).is.contains('my-example');
+
+  });
 });