Merge branch 'main' into dep5

Signed-off-by: Tejhan Diallo <82427254+tejhan@users.noreply.github.com>

Author: tejhan

.github/workflows/codeql-analysis.yml

@@ -54,7 +54,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+      uses: github/codeql-action/init@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -68,7 +68,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+      uses: github/codeql-action/autobuild@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -81,6 +81,6 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+      uses: github/codeql-action/analyze@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/scorecards.yml

@@ -73,6 +73,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+        uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
         with:
           sarif_file: results.sarif

package-lock.json

@@ -663,8 +663,8 @@
         "@types/tmp": "^0.2.6",
         "@types/uuid": "^10.0.0",
         "@types/vscode": "^1.96.0",
-        "@typescript-eslint/eslint-plugin": "^8.26.0",
-        "@typescript-eslint/parser": "^8.26.0",
+        "@typescript-eslint/eslint-plugin": "^8.26.1",
+        "@typescript-eslint/parser": "^8.26.1",
         "@vscode/test-electron": "^2.4.1",
         "@vscode/vsce": "^3.2.2",
         "chai": "^5.2.0",
@@ -693,7 +693,7 @@
         "@azure/arm-resourcegraph": "^4.2.1",
         "@azure/arm-resources": "^5.2.0",
         "@azure/arm-resources-subscriptions": "^2.1.0",
-        "@azure/arm-storage": "^18.3.0",
+        "@azure/arm-storage": "^18.4.0",
         "@azure/arm-subscriptions": "^5.1.0",
         "@azure/container-registry": "^1.1.0",
         "@azure/core-auth": "^1.8.0",
@@ -703,7 +703,7 @@
         "@eslint/compat": "^1.2.7",
         "@microsoft/microsoft-graph-client": "^3.0.7",
         "@microsoft/vscode-azext-utils": "^2.5.14",
-        "@octokit/rest": "^21.1.0",
+        "@octokit/rest": "^21.1.1",
         "@vscode/extension-telemetry": "^0.9.8",
         "decompress": "^4.2.1",
         "js-yaml": "^4.1.0",
@@ -713,7 +713,7 @@
         "semver": "^7.6.3",
         "sinon": "^19.0.2",
         "tmp": "^0.2.3",
-        "uuid": "^11.0.4",
+        "uuid": "^11.1.0",
         "vscode-kubernetes-tools-api": "^1.0.0"
     },
     "repository": {

package.json

@@ -17,25 +17,9 @@ import { ContainerServiceClient } from "@azure/arm-containerservice";
 import { getWindowsNodePoolKubernetesVersions } from "../../utils/clusters";
 import { BlobServiceClient, StorageSharedKeyCredential } from "@azure/storage-blob";
 import { dirSync } from "tmp";
-import { getMonitorClient, getStorageManagementClient } from "../../utils/arm";
+import { getStorageManagementClient } from "../../utils/arm";
 import { ReadyAzureSessionProvider } from "../../../auth/types";
 
-export async function getClusterDiagnosticSettings(
-    sessionProvider: ReadyAzureSessionProvider,
-    clusterNode: AksClusterTreeNode,
-): Promise<DiagnosticSettingsResourceCollection | undefined> {
-    try {
-        // Get diagnostic setting via diagnostic monitor
-        const client = getMonitorClient(sessionProvider, clusterNode.subscriptionId);
-        const diagnosticSettings = await client.diagnosticSettings.list(clusterNode.armId);
-
-        return diagnosticSettings;
-    } catch (e) {
-        vscode.window.showErrorMessage(`Error fetching cluster diagnostic monitor: ${e}`);
-        return undefined;
-    }
-}
-
 export async function chooseStorageAccount(
     diagnosticSettings: DiagnosticSettingsResourceCollection,
 ): Promise<string | void> {

src/commands/periscope/helpers/periscopehelper.ts

@@ -2,11 +2,15 @@ import * as vscode from "vscode";
 import * as k8s from "vscode-kubernetes-tools-api";
 import { IActionContext } from "@microsoft/vscode-azext-utils";
 import * as tmpfile from "../utils/tempfile";
-import { getAksClusterTreeNode, getKubeconfigYaml, getManagedCluster } from "../utils/clusters";
+import {
+    getAksClusterTreeNode,
+    getClusterDiagnosticSettings,
+    getKubeconfigYaml,
+    getManagedCluster,
+} from "../utils/clusters";
 import { getKustomizeConfig } from "../utils/config";
 import { getExtension, longRunning } from "../utils/host";
 import {
-    getClusterDiagnosticSettings,
     chooseStorageAccount,
     getStorageInfo,
     prepareAKSPeriscopeKustomizeOverlay,

src/commands/periscope/periscope.ts

@@ -4,6 +4,7 @@ import * as yaml from "js-yaml";
 import * as path from "path";
 import { dirSync } from "tmp";
 import { AuthenticationSession, QuickPickItem, authentication, window } from "vscode";
+import * as vscode from "vscode";
 import {
     API,
     APIAvailable,
@@ -17,14 +18,15 @@ import { getTokenInfo } from "../../auth/azureAuth";
 import { ReadyAzureSessionProvider, TokenInfo } from "../../auth/types";
 import { AksClusterTreeNode } from "../../tree/aksClusterTreeItem";
 import { SubscriptionTreeNode, isSubscriptionTreeNode } from "../../tree/subscriptionTreeItem";
-import { getAksClient } from "./arm";
+import { getAksClient, getMonitorClient } from "./arm";
 import { Errorable, map as errmap, failed, getErrorMessage, succeeded } from "./errorable";
 import { getKubeloginBinaryPath } from "./helper/kubeloginDownload";
 import { longRunning } from "./host";
 import { invokeKubectlCommand } from "./kubectl";
 import { withOptionalTempFile } from "./tempfile";
 import { getResources } from "./azureResources";
 import { ClusterFilter } from "./config";
+import { DiagnosticSettingsResourceCollection } from "@azure/arm-monitor";
 
 export interface KubernetesClusterInfo {
     readonly name: string;
@@ -678,3 +680,19 @@ export async function getClusters(
         };
     });
 }
+
+export async function getClusterDiagnosticSettings(
+    sessionProvider: ReadyAzureSessionProvider,
+    clusterNode: AksClusterTreeNode,
+): Promise<DiagnosticSettingsResourceCollection | undefined> {
+    try {
+        // Get diagnostic setting via diagnostic monitor
+        const client = getMonitorClient(sessionProvider, clusterNode.subscriptionId);
+        const diagnosticSettings = await client.diagnosticSettings.list(clusterNode.armId);
+
+        return diagnosticSettings;
+    } catch (e) {
+        vscode.window.showErrorMessage(`Error fetching cluster diagnostic settings: ${e}`);
+        return undefined;
+    }
+}

src/commands/utils/clusters.ts

@@ -419,6 +419,14 @@ spec:
         });
 
         if (!localCaptureUri) {
+            //  Reset download state with error message if no file path was selected
+            webview.postDownloadCaptureFileResponse({
+                node,
+                captureName,
+                localCapturePath: "",
+                succeeded: false,
+                errorMessage: `Failed to download capture '${captureName}'. No file path was selected, please try again.`,
+            });
             return;
         }