keeping subscriptionId parameter in both specs (by renaming it in v2)

Azure · Sep 27, 2021 · fa22043 · fa22043
1 parent 9a45f2c
commit fa22043
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 25 deletions.
diff --git a/...on/resource-manager/Microsoft.DataMigration/preview/2021-10-30-preview/datamigration.json b/...on/resource-manager/Microsoft.DataMigration/preview/2021-10-30-preview/datamigration.json
@@ -54,7 +54,7 @@
         },
         "parameters": [
           {
-            "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+            "$ref": "#/parameters/subscriptionId"
           },
           {
             "$ref": "#/parameters/apiVersion"
@@ -82,7 +82,7 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}": {
       "parameters": [
         {
-          "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+          "$ref": "#/parameters/subscriptionId"
         },
         {
           "$ref": "#/parameters/groupName"
@@ -261,7 +261,7 @@
         },
         "parameters": [
           {
-            "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+            "$ref": "#/parameters/subscriptionId"
           },
           {
             "$ref": "#/parameters/groupName"
@@ -306,7 +306,7 @@
         },
         "parameters": [
           {
-            "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+            "$ref": "#/parameters/subscriptionId"
           },
           {
             "$ref": "#/parameters/groupName"
@@ -352,7 +352,7 @@
         },
         "parameters": [
           {
-            "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+            "$ref": "#/parameters/subscriptionId"
           },
           {
             "$ref": "#/parameters/groupName"
@@ -398,7 +398,7 @@
         },
         "parameters": [
           {
-            "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+            "$ref": "#/parameters/subscriptionId"
           },
           {
             "$ref": "#/parameters/groupName"
@@ -446,7 +446,7 @@
         },
         "parameters": [
           {
-            "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+            "$ref": "#/parameters/subscriptionId"
           },
           {
             "$ref": "#/parameters/groupName"
@@ -500,7 +500,7 @@
         },
         "parameters": [
           {
-            "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+            "$ref": "#/parameters/subscriptionId"
           },
           {
             "$ref": "#/parameters/groupName"
@@ -550,7 +550,7 @@
         },
         "parameters": [
           {
-            "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+            "$ref": "#/parameters/subscriptionId"
           },
           {
             "$ref": "#/parameters/groupName"
@@ -598,7 +598,7 @@
         },
         "parameters": [
           {
-            "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+            "$ref": "#/parameters/subscriptionId"
           },
           {
             "$ref": "#/parameters/groupName"
@@ -643,7 +643,7 @@
         },
         "parameters": [
           {
-            "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+            "$ref": "#/parameters/subscriptionId"
           },
           {
             "$ref": "#/parameters/apiVersion"
@@ -671,7 +671,7 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/projects/{projectName}/tasks/{taskName}": {
       "parameters": [
         {
-          "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+          "$ref": "#/parameters/subscriptionId"
         },
         {
           "$ref": "#/parameters/groupName"
@@ -839,7 +839,7 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/serviceTasks/{taskName}": {
       "parameters": [
         {
-          "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+          "$ref": "#/parameters/subscriptionId"
         },
         {
           "$ref": "#/parameters/groupName"
@@ -1018,7 +1018,7 @@
         },
         "parameters": [
           {
-            "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+            "$ref": "#/parameters/subscriptionId"
           },
           {
             "$ref": "#/parameters/groupName"
@@ -1069,7 +1069,7 @@
         },
         "parameters": [
           {
-            "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+            "$ref": "#/parameters/subscriptionId"
           },
           {
             "$ref": "#/parameters/groupName"
@@ -1117,7 +1117,7 @@
         },
         "parameters": [
           {
-            "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+            "$ref": "#/parameters/subscriptionId"
           },
           {
             "$ref": "#/parameters/groupName"
@@ -1171,7 +1171,7 @@
         },
         "parameters": [
           {
-            "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+            "$ref": "#/parameters/subscriptionId"
           },
           {
             "$ref": "#/parameters/groupName"
@@ -1205,7 +1205,7 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/projects/{projectName}": {
       "parameters": [
         {
-          "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+          "$ref": "#/parameters/subscriptionId"
         },
         {
           "$ref": "#/parameters/groupName"
@@ -1374,7 +1374,7 @@
         },
         "parameters": [
           {
-            "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+            "$ref": "#/parameters/subscriptionId"
           },
           {
             "$ref": "#/parameters/location"
@@ -1418,7 +1418,7 @@
         },
         "parameters": [
           {
-            "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+            "$ref": "#/parameters/subscriptionId"
           },
           {
             "$ref": "#/parameters/location"
@@ -1463,7 +1463,7 @@
         },
         "parameters": [
           {
-            "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+            "$ref": "#/parameters/subscriptionId"
           },
           {
             "$ref": "#/parameters/groupName"
@@ -1500,7 +1500,7 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/projects/{projectName}/files/{fileName}": {
       "parameters": [
         {
-          "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+          "$ref": "#/parameters/subscriptionId"
         },
         {
           "$ref": "#/parameters/groupName"
@@ -1668,7 +1668,7 @@
         },
         "parameters": [
           {
-            "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+            "$ref": "#/parameters/subscriptionId"
           },
           {
             "$ref": "#/parameters/groupName"
@@ -1719,7 +1719,7 @@
         },
         "parameters": [
           {
-            "$ref": "./sqlmigration.json#/parameters/SubscriptionIdParameter"
+            "$ref": "#/parameters/subscriptionId"
           },
           {
             "$ref": "#/parameters/groupName"
@@ -1848,6 +1848,13 @@
       "type": "string",
       "x-ms-parameter-location": "method"
     },
+    "subscriptionId": {
+      "name": "subscriptionId",
+      "description": "Identifier of the subscription",
+      "in": "path",
+      "required": true,
+      "type": "string"
+    },
     "projectTask": {
       "name": "parameters",
       "description": "Information about the task",

diff --git a/...ion/resource-manager/Microsoft.DataMigration/preview/2021-10-30-preview/sqlmigration.json b/...ion/resource-manager/Microsoft.DataMigration/preview/2021-10-30-preview/sqlmigration.json
@@ -1648,7 +1648,7 @@
   },
   "parameters": {
     "SubscriptionIdParameter": {
-      "name": "subscriptionId",
+      "name": "subscriptionIdParameter",
       "in": "path",
       "description": "Subscription ID that identifies an Azure subscription.",
       "required": true,