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

Updated Postgres Spec for where to find engine version, removed calling calling -ev in edit commands (#14735)

Browse Source 
* Added spec.engine.version, took out calling engine version with edit calls

* Added text wrong place

* missed updates

* PR fix
This commit is contained in:
nasc17
2021-03-16 08:25:16 -07:00
committed by GitHub
parent 7a4852b047
commit 318559dcd7
10 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/arc/src/models/postgresModel.ts
View File

@@ -53,10 +53,7 @@ export class PostgresModel extends ResourceModel {
/** Returns the major version of Postgres */
public get engineVersion(): string | undefined {
const kind = this._config?.kind;
return kind
? kind.substring(kind.lastIndexOf('-') + 1)
: undefined;
return this._config?.spec.engine.version;
}
/** Returns the IP address and port of Postgres */

1
extensions/arc/src/test/mocks/fakeAzdataApi.ts
View File

@@ -49,7 +49,6 @@ export class FakeAzdataApi implements azdataExt.IAzdataApi {
replaceEngineSettings?: boolean,
workers?: number
},
_engineVersion?: string,
_additionalEnvVars?: azdataExt.AdditionalEnvVars
): Promise<azdataExt.AzdataOutput<void>> { throw new Error('Method not implemented.'); }
}

3
extensions/arc/src/test/models/postgresModel.test.ts
View File

@@ -41,7 +41,8 @@ export const FakePostgresServerShowOutput: azdataExt.AzdataOutput<azdataExt.Post
extensions: [{ name: '' }],
settings: {
default: { ['']: '' }
}
},
version: ''
},
scale: {
shards: 0,

2
extensions/arc/src/ui/dashboards/postgres/postgresComputeAndStoragePage.ts
View File

@@ -191,7 +191,6 @@ export class PostgresComputeAndStoragePage extends DashboardPage {
memoryRequest: this.saveArgs.workerMemoryRequest,
memoryLimit: this.saveArgs.workerMemoryLimit
},
this._postgresModel.engineVersion,
this._postgresModel.controllerModel.azdataAdditionalEnvVars,
session
);
@@ -204,7 +203,6 @@ export class PostgresComputeAndStoragePage extends DashboardPage {
memoryRequest: this.saveArgs.coordinatorMemoryRequest,
memoryLimit: this.saveArgs.coordinatorMemoryLimit
},
this._postgresModel.engineVersion,
this._postgresModel.controllerModel.azdataAdditionalEnvVars,
session
);

3
extensions/arc/src/ui/dashboards/postgres/postgresCoordinatorNodeParametersPage.ts
View File

@@ -36,7 +36,6 @@ export class PostgresCoordinatorNodeParametersPage extends PostgresParametersPag
await this._azdataApi.azdata.arc.postgres.server.edit(
this._postgresModel.info.name,
{ engineSettings: engineSettings.toString() },
this._postgresModel.engineVersion,
this._postgresModel.controllerModel.azdataAdditionalEnvVars,
session);
*/
@@ -47,7 +46,6 @@ export class PostgresCoordinatorNodeParametersPage extends PostgresParametersPag
await this._azdataApi.azdata.arc.postgres.server.edit(
this._postgresModel.info.name,
{ engineSettings: `''`, replaceEngineSettings: true },
this._postgresModel.engineVersion,
this._postgresModel.controllerModel.azdataAdditionalEnvVars,
session);
*/
@@ -58,7 +56,6 @@ export class PostgresCoordinatorNodeParametersPage extends PostgresParametersPag
await this._azdataApi.azdata.arc.postgres.server.edit(
this._postgresModel.info.name,
{ engineSettings: parameterName + '=' },
this._postgresModel.engineVersion,
this._postgresModel.controllerModel.azdataAdditionalEnvVars,
session);
*/

1
extensions/arc/src/ui/dashboards/postgres/postgresOverviewPage.ts
View File

@@ -224,7 +224,6 @@ export class PostgresOverviewPage extends DashboardPage {
adminPassword: true,
noWait: true
},
this._postgresModel.engineVersion,
Object.assign({ 'AZDATA_PASSWORD': password }, this._controllerModel.azdataAdditionalEnvVars),
session
);

3
extensions/arc/src/ui/dashboards/postgres/postgresWorkerNodeParametersPage.ts
View File

@@ -39,7 +39,6 @@ export class PostgresWorkerNodeParametersPage extends PostgresParametersPage {
await this._azdataApi.azdata.arc.postgres.server.edit(
this._postgresModel.info.name,
{ engineSettings: engineSettings },
this._postgresModel.engineVersion,
this._postgresModel.controllerModel.azdataAdditionalEnvVars,
session);
@@ -49,7 +48,6 @@ export class PostgresWorkerNodeParametersPage extends PostgresParametersPage {
await this._azdataApi.azdata.arc.postgres.server.edit(
this._postgresModel.info.name,
{ engineSettings: `''`, replaceEngineSettings: true },
this._postgresModel.engineVersion,
this._postgresModel.controllerModel.azdataAdditionalEnvVars,
session);
@@ -59,7 +57,6 @@ export class PostgresWorkerNodeParametersPage extends PostgresParametersPage {
await this._azdataApi.azdata.arc.postgres.server.edit(
this._postgresModel.info.name,
{ engineSettings: parameterName + '=' },
this._postgresModel.engineVersion,
this._postgresModel.controllerModel.azdataAdditionalEnvVars,
session);