Add 'hub.tekton.dev/catalog' label to task yaml while installing it f…

…rom TektonHub (#494)
redhat-developer · Jan 27, 2021 · fec0756 · fec0756
1 parent 37178b5
commit fec0756
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/src/hub/install-common.ts b/src/hub/install-common.ts
@@ -9,4 +9,5 @@ export interface HubTaskInstallation {
   tknVersion?: string;
   minPipelinesVersion?: string;
   asClusterTask: boolean;
+  taskVersion?: string;
 }
diff --git a/src/hub/install-task.ts b/src/hub/install-task.ts
@@ -54,7 +54,7 @@ function doInstallTask(task: HubTaskInstallation): void {
           }
         }
       }
-      const result = await tkn.execute(Command.updateYaml(task.url));
+      const result = await tkn.execute(Command.hubInstall(task.name, task.taskVersion));
       if (result.error){
         vscode.window.showWarningMessage(`Task installation failed: ${getStderrString(result.error)}`);
       } else {

diff --git a/src/tkn.ts b/src/tkn.ts
@@ -383,6 +383,9 @@ export class Command {
   static updateYaml(fsPath: string): CliCommand {
     return newK8sCommand('apply', '-f', fsPath);
   }
+  static hubInstall(name: string, version: string): CliCommand {
+    return newTknCommand('hub', 'install', 'task', name, '--version', version);
+  }
   static listTaskRun(): CliCommand {
     return newK8sCommand('get', 'taskrun', '-o', 'json');
   }

diff --git a/src/webview/hub/task-view.ts b/src/webview/hub/task-view.ts
@@ -144,7 +144,8 @@ export class TaskItem extends BaseWidget {
       url: this.task.latestVersion.rawURL,
       name: this.task.name,
       minPipelinesVersion: this.task.latestVersion.minPipelinesVersion,
-      tknVersion: this.tknVersion
+      tknVersion: this.tknVersion,
+      taskVersion: this.task.latestVersion.version
     } as HubTaskInstallation});
   }
 

diff --git a/src/webview/task-page/task-widget.ts b/src/webview/task-page/task-widget.ts
@@ -204,7 +204,8 @@ export class TaskWidget extends BaseWidget {
       name: this.task.name,
       minPipelinesVersion: this.currentVersion.minPipelinesVersion,
       tknVersion: this.tknVersion,
-      asClusterTask: asCluster
+      asClusterTask: asCluster,
+      taskVersion: this.currentVersion.version
     } as HubTaskInstallation});
   }
 

diff --git a/test/hub/install-task.test.ts b/test/hub/install-task.test.ts
@@ -47,10 +47,11 @@ suite('Install Task', () => {
     await installTask({
       name: 'foo',
       url: 'https://some/path/task.yaml',
-      asClusterTask: false
+      asClusterTask: false,
+      taskVersion: '1.0'
     });
 
-    expect(executeStub).calledOnceWith(Command.updateYaml('https://some/path/task.yaml'));
+    expect(executeStub).calledOnceWith(Command.hubInstall('foo', '1.0'));
     expect(showInformationMessageStub).calledOnceWith('Task foo installed.');
   });