From 2f49513bae9226112731f8fd584f910833cd2816 Mon Sep 17 00:00:00 2001
From: Charles Gagnon <chgagnon@microsoft.com>
Date: Mon, 1 Feb 2021 13:04:05 -0800
Subject: [PATCH] Rename name field of resourceSubType to resourceName (#14103)

* Rename name field of resourceSubType to resourceName

* update comment

* bump arc version
---
 extensions/arc/package.json                                 | 6 +++---
 extensions/azdata/package.json                              | 2 +-
 extensions/resource-deployment/src/interfaces.ts            | 4 ++--
 .../resource-deployment/src/services/resourceTypeService.ts | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/extensions/arc/package.json b/extensions/arc/package.json
index 3873dbb027..c9a8b03d43 100644
--- a/extensions/arc/package.json
+++ b/extensions/arc/package.json
@@ -2,14 +2,14 @@
   "name": "arc",
   "displayName": "%arc.displayName%",
   "description": "%arc.description%",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "publisher": "Microsoft",
   "preview": true,
   "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt",
   "icon": "images/extension.png",
   "engines": {
     "vscode": "*",
-    "azdata": ">=1.25.0"
+    "azdata": ">=1.26.0"
   },
   "activationEvents": [
     "onCommand:arc.connectToController",
@@ -895,7 +895,7 @@
     ],
     "resourceDeploymentSubTypes": [
       {
-        "name": "azure-sql-mi",
+        "resourceName": "azure-sql-mi",
         "options": [
           {
             "name": "mi-type",
diff --git a/extensions/azdata/package.json b/extensions/azdata/package.json
index c1c3eabb53..7d5240e4d7 100644
--- a/extensions/azdata/package.json
+++ b/extensions/azdata/package.json
@@ -9,7 +9,7 @@
   "icon": "images/extension.png",
   "engines": {
     "vscode": "*",
-    "azdata": ">=1.25.0"
+    "azdata": ">=1.26.0"
   },
   "activationEvents": [
     "*"
diff --git a/extensions/resource-deployment/src/interfaces.ts b/extensions/resource-deployment/src/interfaces.ts
index 0efca4018c..2b86c2114d 100644
--- a/extensions/resource-deployment/src/interfaces.ts
+++ b/extensions/resource-deployment/src/interfaces.ts
@@ -30,9 +30,9 @@ export interface ResourceType {
 
 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
 	 */
diff --git a/extensions/resource-deployment/src/services/resourceTypeService.ts b/extensions/resource-deployment/src/services/resourceTypeService.ts
index dfbedf02eb..8a91975c17 100644
--- a/extensions/resource-deployment/src/services/resourceTypeService.ts
+++ b/extensions/resource-deployment/src/services/resourceTypeService.ts
@@ -131,7 +131,7 @@ export class ResourceTypeService implements IResourceTypeService {
 			const extensionResourceSubTypes = extension.packageJSON.contributes?.resourceDeploymentSubTypes as ResourceSubType[];
 			extensionResourceSubTypes?.forEach((extensionResourceSubType: ResourceSubType) => {
 				const resourceSubType = deepClone(extensionResourceSubType);
-				if (resourceSubType.name === resourceType.name) {
+				if (resourceSubType.resourceName === resourceType.name) {
 					this.updateProviderPathProperties(resourceSubType.provider, extension.extensionPath);
 					resourceSubTypes.push(resourceSubType);
 					const tagSet = new Set(resourceType.tags);