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

Rename name field of resourceSubType to resourceName (#14103)

Browse Source 
* Rename name field of resourceSubType to resourceName

* update comment

* bump arc version
This commit is contained in:
Charles Gagnon
2021-02-01 13:04:05 -08:00
committed by GitHub
parent 8f5dc1526a
commit 2f49513bae
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/arc/package.json
View File

@@ -2,14 +2,14 @@
"name": "arc", "name": "arc",
"displayName": "%arc.displayName%", "displayName": "%arc.displayName%",
"description": "%arc.description%", "description": "%arc.description%",
"version": "0.7.1", "version": "0.7.2",
"publisher": "Microsoft", "publisher": "Microsoft",
"preview": true, "preview": true,
"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt", "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt",
"icon": "images/extension.png", "icon": "images/extension.png",
"engines": { "engines": {
"vscode": "*", "vscode": "*",
"azdata": ">=1.25.0" "azdata": ">=1.26.0"
}, },
"activationEvents": [ "activationEvents": [
"onCommand:arc.connectToController", "onCommand:arc.connectToController",
@@ -895,7 +895,7 @@
], ],
"resourceDeploymentSubTypes": [ "resourceDeploymentSubTypes": [
{ {
"name": "azure-sql-mi", "resourceName": "azure-sql-mi",
"options": [ "options": [
{ {
"name": "mi-type", "name": "mi-type",

2
extensions/azdata/package.json
View File

@@ -9,7 +9,7 @@
"icon": "images/extension.png", "icon": "images/extension.png",
"engines": { "engines": {
"vscode": "*", "vscode": "*",
"azdata": ">=1.25.0" "azdata": ">=1.26.0"
}, },
"activationEvents": [ "activationEvents": [
"*" "*"

4
extensions/resource-deployment/src/interfaces.ts
View File

@@ -30,9 +30,9 @@ export interface ResourceType {
export interface ResourceSubType { export interface ResourceSubType {
/** /**
* The name should match the name in Resource Type * The name of the Resource Type this subtype is extending
*/ */
name: string; resourceName: string;
/** /**
* The option name should have a matching name in ResourceType.options * The option name should have a matching name in ResourceType.options
*/ */

2
extensions/resource-deployment/src/services/resourceTypeService.ts
View File

@@ -131,7 +131,7 @@ export class ResourceTypeService implements IResourceTypeService {
const extensionResourceSubTypes = extension.packageJSON.contributes?.resourceDeploymentSubTypes as ResourceSubType[]; const extensionResourceSubTypes = extension.packageJSON.contributes?.resourceDeploymentSubTypes as ResourceSubType[];
extensionResourceSubTypes?.forEach((extensionResourceSubType: ResourceSubType) => { extensionResourceSubTypes?.forEach((extensionResourceSubType: ResourceSubType) => {
const resourceSubType = deepClone(extensionResourceSubType); const resourceSubType = deepClone(extensionResourceSubType);
if (resourceSubType.name === resourceType.name) { if (resourceSubType.resourceName === resourceType.name) {
this.updateProviderPathProperties(resourceSubType.provider, extension.extensionPath); this.updateProviderPathProperties(resourceSubType.provider, extension.extensionPath);
resourceSubTypes.push(resourceSubType); resourceSubTypes.push(resourceSubType);
const tagSet = new Set(resourceType.tags); const tagSet = new Set(resourceType.tags);