ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Arc and Azure CLI extensions GA + bug fix for SQL MIAA update (#18226)

Browse Source 
* Changed instances of sql edit to sql update

* Updated az sql mi-arc edit to be update. Changed the params for indirect and direct mode.

* Removed preview from everywhere in arc and azcli extensions.

* Bumped version numbers for both extensions and removed preview bool in package.jsons
This commit is contained in:
Candice Ye
2022-02-07 10:32:37 -08:00
committed by GitHub
parent c3d8c37ed7
commit 5b3804c607
9 changed files with 67 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
extensions/azcli/src/api.ts
View File

@@ -116,7 +116,7 @@ export function getAzApi(localAzDiscovered: Promise<IAzTool | undefined>, azTool
validateAz(azToolService.localAz);
return azToolService.localAz!.sql.miarc.show(name, namespace, additionalEnvVars);
},
edit: async (
update: async (
name: string,
args: {
coresLimit?: string;
@@ -125,12 +125,17 @@ export function getAzApi(localAzDiscovered: Promise<IAzTool | undefined>, azTool
memoryRequest?: string;
noWait?: boolean;
},
namespace: string,
// Direct mode arguments
resourceGroup?: string,
// Indirect mode arguments
namespace?: string,
usek8s?: boolean,
// Additional arguments
additionalEnvVars?: azExt.AdditionalEnvVars
) => {
await localAzDiscovered;
validateAz(azToolService.localAz);
return azToolService.localAz!.sql.miarc.edit(name, args, namespace, additionalEnvVars);
return azToolService.localAz!.sql.miarc.update(name, args, resourceGroup, namespace, usek8s, additionalEnvVars);
}
},
midbarc: {

14
extensions/azcli/src/az.ts
View File

@@ -154,7 +154,7 @@ export class AzTool implements azExt.IAzApi {
show: (name: string, namespace: string, additionalEnvVars?: azExt.AdditionalEnvVars): Promise<azExt.AzOutput<azExt.SqlMiShowResult>> => {
return this.executeCommand<azExt.SqlMiShowResult>(['sql', 'mi-arc', 'show', '-n', name, '--k8s-namespace', namespace, '--use-k8s'], additionalEnvVars);
},
edit: (
update: (
name: string,
args: {
coresLimit?: string,
@@ -164,16 +164,24 @@ export class AzTool implements azExt.IAzApi {
noWait?: boolean,
retentionDays?: string
},
namespace: string,
// Direct mode arguments
resourceGroup?: string,
// Indirect mode arguments
namespace?: string,
usek8s?: boolean,
// Additional arguments
additionalEnvVars?: azExt.AdditionalEnvVars
): Promise<azExt.AzOutput<void>> => {
const argsArray = ['sql', 'mi-arc', 'edit', '-n', name, '--k8s-namespace', namespace, '--use-k8s'];
const argsArray = ['sql', 'mi-arc', 'update', '-n', name];
if (args.coresLimit) { argsArray.push('--cores-limit', args.coresLimit); }
if (args.coresRequest) { argsArray.push('--cores-request', args.coresRequest); }
if (args.memoryLimit) { argsArray.push('--memory-limit', args.memoryLimit); }
if (args.memoryRequest) { argsArray.push('--memory-request', args.memoryRequest); }
if (args.noWait) { argsArray.push('--no-wait'); }
if (args.retentionDays) { argsArray.push('--retention-days', args.retentionDays); }
if (resourceGroup) { argsArray.push('--resource-group', resourceGroup); }
if (namespace) { argsArray.push('--k8s-namespace', namespace); }
if (usek8s) { argsArray.push('--use-k8s'); }
return this.executeCommand<void>(argsArray, additionalEnvVars);
}
},

7
extensions/azcli/src/typings/az-ext.d.ts vendored
View File

@@ -328,7 +328,7 @@ declare module 'az-ext' {
delete(name: string, namespace?: string, additionalEnvVars?: AdditionalEnvVars): Promise<AzOutput<void>>,
list(namespace?: string, additionalEnvVars?: AdditionalEnvVars): Promise<AzOutput<SqlMiListResult[]>>,
show(name: string, namespace?: string, additionalEnvVars?: AdditionalEnvVars): Promise<AzOutput<SqlMiShowResult>>,
edit(
update(
name: string,
args: {
coresLimit?: string, //2
@@ -338,7 +338,12 @@ declare module 'az-ext' {
noWait?: boolean, //true
retentionDays?: string, //5
},
// Direct mode arguments
resourceGroup?: string,
// Indirect mode arguments
namespace?: string,
usek8s?: boolean,
// Additional arguments
additionalEnvVars?: AdditionalEnvVars
): Promise<AzOutput<void>>
},