FUSETOOLS2-2163 - upgrade default runtime to Camel K 2.0.0

.github/workflows/insider.yml

@@ -67,7 +67,7 @@ jobs:
       - name: Configure Kamel (ubuntu)
         if: matrix.os == 'ubuntu-latest'
         run: |
-          curl -Lo kamel.tar.gz https://github.com/apache/camel-k/releases/download/v1.12.1/camel-k-client-1.12.1-linux-64bit.tar.gz
+          curl -Lo kamel.tar.gz https://github.com/apache/camel-k/releases/download/v2.0.0/camel-k-client-2.0.0-linux-amd64.tar.gz
           tar -zxvf kamel.tar.gz
           chmod +x kamel
           sudo mv kamel /usr/local/bin/

.github/workflows/main.yml

@@ -69,7 +69,7 @@ jobs:
       - name: Configure Kamel (ubuntu)
         if: matrix.os == 'ubuntu-latest'
         run: |
-          curl -Lo kamel.tar.gz https://github.com/apache/camel-k/releases/download/v1.12.1/camel-k-client-1.12.1-linux-64bit.tar.gz
+          curl -Lo kamel.tar.gz https://github.com/apache/camel-k/releases/download/v2.0.0/camel-k-client-2.0.0-linux-amd64.tar.gz
           tar -zxvf kamel.tar.gz
           chmod +x kamel
           sudo mv kamel /usr/local/bin/

CHANGELOG.md

@@ -5,6 +5,7 @@ All notable changes to the "vscode-camelk" extension will be documented in this
 ## 0.0.36
 
 - Requires jbang for java standalone completion. It allows also to get rid of internal dependency to `kamel local` which is removed from kamel 2.x.
+- Update default runtime version to v2.0.0
 
 ## 0.0.35
 

src/test/suite/versionUtils.test.ts

@@ -94,12 +94,16 @@ suite("VersionUtils check", () => {
 			await validateVersion('1.12.1', Platform.LINUX, 'https://github.com/apache/camel-k/releases/download/v1.12.1/camel-k-client-1.12.1-linux-64bit.tar.gz');
 		});
 
-		test("validate url for existing 1.12.1 windows version", async () => {
-			await validateVersion('1.12.1', Platform.WINDOWS, 'https://github.com/apache/camel-k/releases/download/v1.12.1/camel-k-client-1.12.1-windows-64bit.tar.gz');
+		test("validate url for existing 2.0.0 version", async () => {
+			await validateVersion('2.0.0', Platform.LINUX, 'https://github.com/apache/camel-k/releases/download/v2.0.0/camel-k-client-2.0.0-linux-amd64.tar.gz');
 		});
 
-		test("validate url for existing 1.12.1 MacOS version", async () => {
-			await validateVersion('1.12.1', Platform.MACOS, 'https://github.com/apache/camel-k/releases/download/v1.12.1/camel-k-client-1.12.1-mac-64bit.tar.gz');
+		test("validate url for existing 2.0.0 windows version", async () => {
+			await validateVersion('2.0.0', Platform.WINDOWS, 'https://github.com/apache/camel-k/releases/download/v2.0.0/camel-k-client-2.0.0-windows-amd64.tar.gz');
+		});
+
+		test("validate url for existing 2.0.0 MacOS version", async () => {
+			await validateVersion('2.0.0', Platform.MACOS, 'https://github.com/apache/camel-k/releases/download/v2.0.0/camel-k-client-2.0.0-darwin-amd64.tar.gz');
 		});
 
 		test("validate invalid url for xyz1 version", async () => {

src/versionUtils.ts

@@ -25,13 +25,13 @@ import { platform } from './installer';
 import fetch from 'cross-fetch';
 import { Platform } from './shell';
 
-export const version = '1.12.1'; //need to retrieve this if possible, but have a default
+export const version = '2.0.0'; //need to retrieve this if possible, but have a default
 
 /*
  * Can be retrieved using `curl -i https://api.github.com/repos/apache/camel-k/releases/latest | grep last-modified`
  * To be updated when updating the default "version" attribute
  */
-const LAST_MODIFIED_DATE_OF_DEFAULT_VERSION = 'Mon, 12 Jun 2023 08:34:33 GMT';
+const LAST_MODIFIED_DATE_OF_DEFAULT_VERSION = 'Mon, 24 Jul 2023 07:56:50 GMT';
 let latestVersionFromOnline: string;
 
 export async function testVersionAvailable(versionToUse: string): Promise<boolean> {
@@ -203,7 +203,7 @@ function setVersionAndTellUser(msg: string, newVersion: string) {
 	extension.setRuntimeVersionSetting(newVersion);
 }
 
-function toKamelOsString(platform: Platform | undefined): string | undefined {
+function toKamel1xOsString(platform: Platform | undefined): string | undefined {
 	switch (platform) {
 		case Platform.WINDOWS:
 			return 'windows';
@@ -215,8 +215,21 @@ function toKamelOsString(platform: Platform | undefined): string | undefined {
 	return undefined;
 }
 
+function toKamel2xOsString(platform: Platform | undefined): string | undefined {
+	switch (platform) {
+		case Platform.WINDOWS:
+			return 'windows';
+		case Platform.LINUX:
+			return 'linux';
+		case Platform.MACOS:
+			return 'darwin';
+	}
+	return undefined;
+}
+
 export async function getDownloadURLForCamelKTag(camelKVersion: string, platform: Platform): Promise<string> {
-	const platformStr = toKamelOsString(platform);
+	const platformStr1x = toKamel1xOsString(platform);
+	const platformStr2x = toKamel2xOsString(platform);
 	const tagName: string = isOldTagNaming(camelKVersion) ? camelKVersion : `v${camelKVersion}`;
 	const tagURL = `https://api.github.com/repos/apache/camel-k/releases/tags/${tagName}`;
 	const headers: [string, string][] = [];
@@ -230,7 +243,10 @@ export async function getDownloadURLForCamelKTag(camelKVersion: string, platform
 		const assetsJSON: any = await latestJSON.assets;
 		for (const asset of assetsJSON) {
 			const aUrl: string = asset.browser_download_url;
-			if (aUrl.includes(`-${platformStr}-`)) {
+			if (aUrl.includes('camel-k-client-1') && aUrl.includes(`-${platformStr1x}-`)) {
+				return aUrl;
+			}
+			if (aUrl.includes('camel-k-client-2') && aUrl.includes('amd64') && aUrl.includes(`-${platformStr2x}-`)) {
 				return aUrl;
 			}
 		}