Skip to content

Commit d64f8d5

Browse files
TatsinnitCopilot
andauthored
Quick Refactor: Moving DiagnosticSetting function to common place Cluster.ts. (#1295)
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Tatsinnit <tatsatmishra@gmail.com> --------- Signed-off-by: Tatsinnit <tatsatmishra@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent 77123fc commit d64f8d5

File tree

3 files changed

+26
-20
lines changed

3 files changed

+26
-20
lines changed

src/commands/periscope/helpers/periscopehelper.ts

+1-17
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,9 @@ import { ContainerServiceClient } from "@azure/arm-containerservice";
1717
import { getWindowsNodePoolKubernetesVersions } from "../../utils/clusters";
1818
import { BlobServiceClient, StorageSharedKeyCredential } from "@azure/storage-blob";
1919
import { dirSync } from "tmp";
20-
import { getMonitorClient, getStorageManagementClient } from "../../utils/arm";
20+
import { getStorageManagementClient } from "../../utils/arm";
2121
import { ReadyAzureSessionProvider } from "../../../auth/types";
2222

23-
export async function getClusterDiagnosticSettings(
24-
sessionProvider: ReadyAzureSessionProvider,
25-
clusterNode: AksClusterTreeNode,
26-
): Promise<DiagnosticSettingsResourceCollection | undefined> {
27-
try {
28-
// Get diagnostic setting via diagnostic monitor
29-
const client = getMonitorClient(sessionProvider, clusterNode.subscriptionId);
30-
const diagnosticSettings = await client.diagnosticSettings.list(clusterNode.armId);
31-
32-
return diagnosticSettings;
33-
} catch (e) {
34-
vscode.window.showErrorMessage(`Error fetching cluster diagnostic monitor: ${e}`);
35-
return undefined;
36-
}
37-
}
38-
3923
export async function chooseStorageAccount(
4024
diagnosticSettings: DiagnosticSettingsResourceCollection,
4125
): Promise<string | void> {

src/commands/periscope/periscope.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@ import * as vscode from "vscode";
22
import * as k8s from "vscode-kubernetes-tools-api";
33
import { IActionContext } from "@microsoft/vscode-azext-utils";
44
import * as tmpfile from "../utils/tempfile";
5-
import { getAksClusterTreeNode, getKubeconfigYaml, getManagedCluster } from "../utils/clusters";
5+
import {
6+
getAksClusterTreeNode,
7+
getClusterDiagnosticSettings,
8+
getKubeconfigYaml,
9+
getManagedCluster,
10+
} from "../utils/clusters";
611
import { getKustomizeConfig } from "../utils/config";
712
import { getExtension, longRunning } from "../utils/host";
813
import {
9-
getClusterDiagnosticSettings,
1014
chooseStorageAccount,
1115
getStorageInfo,
1216
prepareAKSPeriscopeKustomizeOverlay,

src/commands/utils/clusters.ts

+19-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import * as yaml from "js-yaml";
44
import * as path from "path";
55
import { dirSync } from "tmp";
66
import { AuthenticationSession, QuickPickItem, authentication, window } from "vscode";
7+
import * as vscode from "vscode";
78
import {
89
API,
910
APIAvailable,
@@ -17,14 +18,15 @@ import { getTokenInfo } from "../../auth/azureAuth";
1718
import { ReadyAzureSessionProvider, TokenInfo } from "../../auth/types";
1819
import { AksClusterTreeNode } from "../../tree/aksClusterTreeItem";
1920
import { SubscriptionTreeNode, isSubscriptionTreeNode } from "../../tree/subscriptionTreeItem";
20-
import { getAksClient } from "./arm";
21+
import { getAksClient, getMonitorClient } from "./arm";
2122
import { Errorable, map as errmap, failed, getErrorMessage, succeeded } from "./errorable";
2223
import { getKubeloginBinaryPath } from "./helper/kubeloginDownload";
2324
import { longRunning } from "./host";
2425
import { invokeKubectlCommand } from "./kubectl";
2526
import { withOptionalTempFile } from "./tempfile";
2627
import { getResources } from "./azureResources";
2728
import { ClusterFilter } from "./config";
29+
import { DiagnosticSettingsResourceCollection } from "@azure/arm-monitor";
2830

2931
export interface KubernetesClusterInfo {
3032
readonly name: string;
@@ -678,3 +680,19 @@ export async function getClusters(
678680
};
679681
});
680682
}
683+
684+
export async function getClusterDiagnosticSettings(
685+
sessionProvider: ReadyAzureSessionProvider,
686+
clusterNode: AksClusterTreeNode,
687+
): Promise<DiagnosticSettingsResourceCollection | undefined> {
688+
try {
689+
// Get diagnostic setting via diagnostic monitor
690+
const client = getMonitorClient(sessionProvider, clusterNode.subscriptionId);
691+
const diagnosticSettings = await client.diagnosticSettings.list(clusterNode.armId);
692+
693+
return diagnosticSettings;
694+
} catch (e) {
695+
vscode.window.showErrorMessage(`Error fetching cluster diagnostic settings: ${e}`);
696+
return undefined;
697+
}
698+
}

0 commit comments

Comments
 (0)