mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 18:46:40 -05:00
Added engine version argument to edit command. (#13610)
* Added engine version argument to edit command. Neccessary for not using pg12 * Included for changing password in overview page * Updated fakeazdataapi test
This commit is contained in:
@@ -49,6 +49,7 @@ export class FakeAzdataApi implements azdataExt.IAzdataApi {
|
|||||||
replaceEngineSettings?: boolean,
|
replaceEngineSettings?: boolean,
|
||||||
workers?: number
|
workers?: number
|
||||||
},
|
},
|
||||||
|
_engineVersion?: string,
|
||||||
_additionalEnvVars?: { [key: string]: string }): Promise<azdataExt.AzdataOutput<void>> { throw new Error('Method not implemented.'); }
|
_additionalEnvVars?: { [key: string]: string }): Promise<azdataExt.AzdataOutput<void>> { throw new Error('Method not implemented.'); }
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -157,7 +157,9 @@ export class PostgresComputeAndStoragePage extends DashboardPage {
|
|||||||
async (_progress, _token): Promise<void> => {
|
async (_progress, _token): Promise<void> => {
|
||||||
try {
|
try {
|
||||||
await this._azdataApi.azdata.arc.postgres.server.edit(
|
await this._azdataApi.azdata.arc.postgres.server.edit(
|
||||||
this._postgresModel.info.name, this.saveArgs);
|
this._postgresModel.info.name,
|
||||||
|
this.saveArgs,
|
||||||
|
this._postgresModel.engineVersion);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
// If an error occurs while editing the instance then re-enable the save button since
|
// If an error occurs while editing the instance then re-enable the save button since
|
||||||
// the edit wasn't successfully applied
|
// the edit wasn't successfully applied
|
||||||
|
|||||||
@@ -157,6 +157,7 @@ export class PostgresOverviewPage extends DashboardPage {
|
|||||||
adminPassword: true,
|
adminPassword: true,
|
||||||
noWait: true
|
noWait: true
|
||||||
},
|
},
|
||||||
|
this._postgresModel.engineVersion,
|
||||||
{ 'AZDATA_PASSWORD': password });
|
{ 'AZDATA_PASSWORD': password });
|
||||||
vscode.window.showInformationMessage(loc.passwordReset);
|
vscode.window.showInformationMessage(loc.passwordReset);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -102,10 +102,11 @@ export function getAzdataApi(localAzdataDiscovered: Promise<IAzdataTool | undefi
|
|||||||
replaceEngineSettings?: boolean;
|
replaceEngineSettings?: boolean;
|
||||||
workers?: number;
|
workers?: number;
|
||||||
},
|
},
|
||||||
|
engineVersion?: string,
|
||||||
additionalEnvVars?: { [key: string]: string; }) => {
|
additionalEnvVars?: { [key: string]: string; }) => {
|
||||||
await localAzdataDiscovered;
|
await localAzdataDiscovered;
|
||||||
throwIfNoAzdataOrEulaNotAccepted(azdataToolService.localAzdata, isEulaAccepted(memento));
|
throwIfNoAzdataOrEulaNotAccepted(azdataToolService.localAzdata, isEulaAccepted(memento));
|
||||||
return azdataToolService.localAzdata.arc.postgres.server.edit(name, args, additionalEnvVars);
|
return azdataToolService.localAzdata.arc.postgres.server.edit(name, args, engineVersion, additionalEnvVars);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -118,6 +118,7 @@ export class AzdataTool implements azdataExt.IAzdataApi {
|
|||||||
replaceEngineSettings?: boolean,
|
replaceEngineSettings?: boolean,
|
||||||
workers?: number
|
workers?: number
|
||||||
},
|
},
|
||||||
|
engineVersion?: string,
|
||||||
additionalEnvVars?: { [key: string]: string }): Promise<azdataExt.AzdataOutput<void>> => {
|
additionalEnvVars?: { [key: string]: string }): Promise<azdataExt.AzdataOutput<void>> => {
|
||||||
const argsArray = ['arc', 'postgres', 'server', 'edit', '-n', name];
|
const argsArray = ['arc', 'postgres', 'server', 'edit', '-n', name];
|
||||||
if (args.adminPassword) { argsArray.push('--admin-password'); }
|
if (args.adminPassword) { argsArray.push('--admin-password'); }
|
||||||
@@ -131,6 +132,7 @@ export class AzdataTool implements azdataExt.IAzdataApi {
|
|||||||
if (args.port) { argsArray.push('--port', args.port.toString()); }
|
if (args.port) { argsArray.push('--port', args.port.toString()); }
|
||||||
if (args.replaceEngineSettings) { argsArray.push('--replace-engine-settings'); }
|
if (args.replaceEngineSettings) { argsArray.push('--replace-engine-settings'); }
|
||||||
if (args.workers) { argsArray.push('--workers', args.workers.toString()); }
|
if (args.workers) { argsArray.push('--workers', args.workers.toString()); }
|
||||||
|
if (engineVersion) { argsArray.push('--engine-version', engineVersion); }
|
||||||
return this.executeCommand<void>(argsArray, additionalEnvVars);
|
return this.executeCommand<void>(argsArray, additionalEnvVars);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -262,6 +262,7 @@ declare module 'azdata-ext' {
|
|||||||
replaceEngineSettings?: boolean,
|
replaceEngineSettings?: boolean,
|
||||||
workers?: number
|
workers?: number
|
||||||
},
|
},
|
||||||
|
engineVersion?: string,
|
||||||
additionalEnvVars?: { [key: string]: string }): Promise<AzdataOutput<void>>
|
additionalEnvVars?: { [key: string]: string }): Promise<AzdataOutput<void>>
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user