ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix resource group parameter, name (#19471)

Browse Source
This commit is contained in:
brian-harris
2022-05-20 13:07:22 -07:00
committed by GitHub
parent a241b511c6
commit 529296110b
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/sql-migration/src/api/azure.ts
View File

@@ -200,11 +200,13 @@ export async function createSqlMigrationService(account: azdata.Account, subscri
if (response.errors.length > 0) { if (response.errors.length > 0) {
throw new Error(response.errors.toString()); throw new Error(response.errors.toString());
} }
const asyncUrl = response.response.headers['azure-asyncoperation']; const asyncUrl = response.response.headers['azure-asyncoperation']
.replace('https://management.azure.com/', '');
const maxRetry = 24; const maxRetry = 24;
let i = 0; let i = 0;
for (i = 0; i < maxRetry; i++) { for (i = 0; i < maxRetry; i++) {
const asyncResponse = await api.makeAzureRestRequest(account, subscription, asyncUrl.replace('https://management.azure.com/', ''), azurecore.HttpRequestMethod.GET, undefined, true); const asyncResponse = await api.makeAzureRestRequest(account, subscription, asyncUrl, azurecore.HttpRequestMethod.GET, undefined, true);
const creationStatus = asyncResponse.response.data.status; const creationStatus = asyncResponse.response.data.status;
if (creationStatus === ProvisioningState.Succeeded) { if (creationStatus === ProvisioningState.Succeeded) {
break; break;

8
extensions/sql-migration/src/dialog/createSqlMigrationService/createSqlMigrationServiceDialog.ts
View File

@@ -5,7 +5,7 @@
import * as azdata from 'azdata'; import * as azdata from 'azdata';
import * as vscode from 'vscode'; import * as vscode from 'vscode';
import { createSqlMigrationService, getSqlMigrationService, getSqlMigrationServiceAuthKeys, getSqlMigrationServiceMonitoringData, SqlMigrationService } from '../../api/azure'; import { createSqlMigrationService, getResourceName, getSqlMigrationService, getSqlMigrationServiceAuthKeys, getSqlMigrationServiceMonitoringData, SqlMigrationService } from '../../api/azure';
import { MigrationStateModel, NetworkContainerType } from '../../models/stateMachine'; import { MigrationStateModel, NetworkContainerType } from '../../models/stateMachine';
import { logError, TelemetryViews } from '../../telemtery'; import { logError, TelemetryViews } from '../../telemtery';
import * as constants from '../../constants/strings'; import * as constants from '../../constants/strings';
@@ -499,7 +499,8 @@ export class CreateSqlMigrationServiceDialog {
private async refreshStatus(): Promise<void> { private async refreshStatus(): Promise<void> {
const subscription = this._model._targetSubscription; const subscription = this._model._targetSubscription;
const resourceGroup = (this.migrationServiceResourceGroupDropdown.value as azdata.CategoryValue).name; const resourceGroupId = (this.migrationServiceResourceGroupDropdown.value as azdata.CategoryValue).name;
const resourceGroup = getResourceName(resourceGroupId);
const location = this._model._targetServerInstance.location; const location = this._model._targetServerInstance.location;
const maxRetries = 5; const maxRetries = 5;
@@ -562,7 +563,8 @@ export class CreateSqlMigrationServiceDialog {
} }
private async refreshAuthTable(): Promise<void> { private async refreshAuthTable(): Promise<void> {
const subscription = this._model._targetSubscription; const subscription = this._model._targetSubscription;
const resourceGroup = (this.migrationServiceResourceGroupDropdown.value as azdata.CategoryValue).name; const resourceGroupId = (this.migrationServiceResourceGroupDropdown.value as azdata.CategoryValue).name;
const resourceGroup = getResourceName(resourceGroupId);
const location = this._model._targetServerInstance.location; const location = this._model._targetServerInstance.location;
const keys = await getSqlMigrationServiceAuthKeys( const keys = await getSqlMigrationServiceAuthKeys(
this._model._azureAccount, this._model._azureAccount,