Merge branch 'add-flux-oci-edge' into edge

.github/workflows/build-vsix.yml

@@ -81,8 +81,52 @@ jobs:
         with:
           version: v0.12.0
           image: kindest/node:v1.20.7
-      - run: 'wget https://fluxcd.io/install.sh'
-      - run: 'bash install.sh'
+
+      # - run: 'wget https://fluxcd.io/install.sh'
+      # - run: 'bash install.sh'
+
+      - name: Prepare
+        id: prep
+        run: |
+          GIT_TAG=${GITHUB_REF/refs\/tags\/release\//}
+          FLUX_PATH=${GITHUB_WORKSPACE}/bin
+          # FLUX_OCI_SHA=2b1cc62
+          # mkdir flux2 && pushd flux2
+          # git init
+          # git remote add origin https://github.com/fluxcd/flux2
+          git clone --depth 1 https://github.com/fluxcd/flux2 -b oci
+          # git fetch --depth 1 origin $FLUX_OCI_SHA
+          # git checkout FETCH_HEAD
+          pushd flux2
+          FLUX_OCI_SHA=$(git rev-parse --short HEAD)
+          popd
+          mkdir -p "${FLUX_PATH}"
+          echo "${FLUX_PATH}" >> $GITHUB_PATH
+          
+          echo ::set-output name=GIT_TAG::${GIT_TAG}
+          echo ::set-output name=FLUX_PATH::${FLUX_PATH}
+          echo ::set-output name=FLUX_OCI_SHA::${FLUX_OCI_SHA}
+
+      - name: Cache Flux OCI (prerelease)
+        id: cache-flux
+        uses: actions/cache@v3
+        env:
+          cache-name: flux
+        with:
+          path: ${{ steps.prep.outputs.FLUX_PATH }}
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ steps.prep.outputs.FLUX_OCI_SHA }}
+
+      # (if cache is not populated at this point we are not ready to run CI and we should fail)
+
+      - name: Download latest OCI Flux
+        if: steps.cache-flux.outputs.cache-hit != 'true'
+        run: |
+          echo "ERROR: Flux CLI binary cannot be restored from cache"
+          echo " (hint: check out the 'Build Flux OCI Binary (Pre-release)' job which should "
+          echo "  have populated the cache, or just try pushing one more commit)"
+          exit 1
+
+
       - name: Run Tests
         uses: GabrielBB/xvfb-action@v1
         with:

.github/workflows/ci.yml

@@ -21,8 +21,51 @@ jobs:
         with:
           version: v0.12.0
           image: kindest/node:v1.20.7
-      - run: 'wget https://fluxcd.io/install.sh'
-      - run: 'bash install.sh'
+
+      # - run: 'wget https://fluxcd.io/install.sh'
+      # - run: 'bash install.sh'
+
+      - name: Prepare
+        id: prep
+        run: |
+          GIT_TAG=${GITHUB_REF/refs\/tags\/release\//}
+          FLUX_PATH=${GITHUB_WORKSPACE}/bin
+          # FLUX_OCI_SHA=2b1cc62
+          # mkdir flux2 && pushd flux2
+          # git init
+          # git remote add origin https://github.com/fluxcd/flux2
+          git clone --depth 1 https://github.com/fluxcd/flux2 -b oci
+          # git fetch --depth 1 origin $FLUX_OCI_SHA
+          # git checkout FETCH_HEAD
+          pushd flux2
+          FLUX_OCI_SHA=$(git rev-parse --short HEAD)
+          popd
+          mkdir -p "${FLUX_PATH}"
+          echo "${FLUX_PATH}" >> $GITHUB_PATH
+          
+          echo ::set-output name=GIT_TAG::${GIT_TAG}
+          echo ::set-output name=FLUX_PATH::${FLUX_PATH}
+          echo ::set-output name=FLUX_OCI_SHA::${FLUX_OCI_SHA}
+
+      - name: Cache Flux OCI (prerelease)
+        id: cache-flux
+        uses: actions/cache@v3
+        env:
+          cache-name: flux
+        with:
+          path: ${{ steps.prep.outputs.FLUX_PATH }}
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ steps.prep.outputs.FLUX_OCI_SHA }}
+
+      # (if cache is not populated at this point we are not ready to run CI and we should fail)
+
+      - name: Download latest OCI Flux
+        if: steps.cache-flux.outputs.cache-hit != 'true'
+        run: |
+          echo "ERROR: Flux CLI binary cannot be restored from cache"
+          echo " (hint: check out the 'Build Flux OCI Binary (Pre-release)' job which should "
+          echo "  have populated the cache, or just try pushing one more commit)"
+          exit 1
+
       - name: extension test
         uses: GabrielBB/xvfb-action@86d97bde4a65fe9b290c0b3fb92c2c4ed0e5302d # pin@v1
         with:

src/azure/azureTools.ts

@@ -1,4 +1,5 @@
 import { window } from 'vscode';
+import safesh from 'shell-escape-tag';
 import { telemetry } from '../extension';
 import { kubernetesTools } from '../kubernetes/kubernetesTools';
 import { ClusterProvider, ConfigMap } from '../kubernetes/kubernetesTypes';
@@ -40,6 +41,7 @@ class AzureTools {
 		clusterProvider: AzureClusterProvider,
 	): Promise<undefined | ShellResult> {
 
+		contextName = safesh.escape(contextName);
 		let azureMetadata = await this.getAzureMetadata(contextName, clusterProvider);
 		if (!azureMetadata) {
 			azureMetadata = await askUserForAzureMetadata(contextName);

src/commands/fluxCheck.ts

@@ -1,3 +1,4 @@
+import safesh from 'shell-escape-tag';
 import { shell } from '../shell';
 import { ClusterContextNode } from '../views/nodes/clusterContextNode';
 
@@ -6,5 +7,5 @@ import { ClusterContextNode } from '../views/nodes/clusterContextNode';
  * @param clusterNode target cluster node (from tree node context menu)
  */
 export async function fluxCheck(clusterNode: ClusterContextNode) {
-	shell.execWithOutput(`flux check --context ${clusterNode.contextName}`);
+	shell.execWithOutput(safesh`flux check --context ${clusterNode.contextName}`);
 }

src/flux/fluxTools.ts

@@ -1,4 +1,5 @@
 import { window } from 'vscode';
+import safesh from 'shell-escape-tag';
 import { telemetry } from '../extension';
 import { KubernetesObjectKinds } from '../kubernetes/kubernetesTypes';
 import { shell } from '../shell';
@@ -51,7 +52,7 @@ class FluxTools {
 	 * https://github.com/fluxcd/flux2/blob/main/cmd/flux/check.go
 	 */
 	async check(context: string): Promise<{ prerequisites: FluxPrerequisite[]; controllers: FluxController[]; } | undefined> {
-		const result = await shell.execWithOutput(`flux check --context ${context}`, { revealOutputView: false });
+		const result = await shell.execWithOutput(safesh`flux check --context ${context}`, { revealOutputView: false });
 
 		if (result.code !== 0) {
 			telemetry.sendError(TelemetryErrorEventNames.FAILED_TO_RUN_FLUX_CHECK);
@@ -137,7 +138,7 @@ class FluxTools {
 	async install(context: string) {
 		let contextArg = '';
 		if (context) {
-			contextArg = `--context=${context}`;
+			contextArg = safesh`--context=${context}`;
 		}
 		const installShellResult = await shell.execWithOutput(`flux install ${contextArg}`);
 		if (installShellResult.code !== 0) {
@@ -154,7 +155,7 @@ class FluxTools {
 	async uninstall(context = '') {
 		let contextArg = '';
 		if (context) {
-			contextArg = `--context=${context}`;
+			contextArg = safesh`--context=${context}`;
 		}
 		const uninstallShellResult = await shell.execWithOutput(`flux uninstall --silent ${contextArg}`);
 		if (uninstallShellResult.code !== 0) {

src/test/suite/extension.test.ts

@@ -97,6 +97,22 @@ suite('Extension Test Suite', () => {
 		assert.strictEqual(source, undefined, 'Removing a GitSource and refreshing all views should unlist it');
 	});
 
+	test('OCI Sources are listed', async function() {
+		this.timeout(15000);
+
+		await api.shell.execWithOutput('flux create source oci podinfo --url=oci://ghcr.io/kingdonb/podinfo/deploy --tag-semver 6.1.x');
+		await vscode.commands.executeCommand('gitops.views.refreshSourceTreeView');
+
+		let source = await getTreeItem(api.data.sourceTreeViewProvider, 'OCIRepository: podinfo');
+		assert.notStrictEqual(source, undefined, 'Adding a OCI Source and refreshing the view should list it');
+
+		await api.shell.execWithOutput('flux delete source oci podinfo -s');
+		await vscode.commands.executeCommand('gitops.views.refreshAllTreeViews'); // refresh all'
+
+		source = await getTreeItem(api.data.sourceTreeViewProvider, 'OCIRepository: podinfo');
+		assert.strictEqual(source, undefined, 'Removing an OCI Source and refreshing all views should unlist it');
+	});
+
 	test('Kustomizations are listed', async function() {
 		this.timeout(10000);