Merge pull request #3075 from Azure/servicelinker-url-update

update swagger of servicelinker
Azure · Feb 26, 2021 · 1667010 · 1667010
2 parents 773430e + 2df68d4
commit 1667010
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 155 deletions.
diff --git a/...anager/Microsoft.ServiceLinker/preview/2021-01-01-privatepreview/examples/DeleteLink.json b/...anager/Microsoft.ServiceLinker/preview/2021-01-01-privatepreview/examples/DeleteLink.json
@@ -1,11 +1,7 @@
 {
   "parameters": {
     "api-version": "2021-01-01-privatepreview",
-    "subscriptionId": "00000000-0000-0000-0000-000000000000",
-    "resourceGroupName": "test-rg",
-    "sourceProvider": "Microsoft.Web",
-    "sourceResourceType": "sites",
-    "sourceResourceName": "test-app",
+    "resourceUri": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Web/sites/test-app",
     "linkerName": "linkName"
   },
   "responses": {

diff --git a/...Microsoft.ServiceLinker/preview/2021-01-01-privatepreview/examples/GetConfigurations.json b/...Microsoft.ServiceLinker/preview/2021-01-01-privatepreview/examples/GetConfigurations.json
@@ -1,11 +1,7 @@
 {
   "parameters": {
     "api-version": "2021-01-01-privatepreview",
-    "subscriptionId": "00000000-0000-0000-0000-000000000000",
-    "resourceGroupName": "test-rg",
-    "sourceProvider": "Microsoft.Web",
-    "sourceResourceType": "sites",
-    "sourceResourceName": "test-app",
+    "resourceUri": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Web/sites/test-app",
     "linkerName": "linkName"
   },
   "responses": {

diff --git a/...urce-manager/Microsoft.ServiceLinker/preview/2021-01-01-privatepreview/examples/Link.json b/...urce-manager/Microsoft.ServiceLinker/preview/2021-01-01-privatepreview/examples/Link.json
@@ -1,11 +1,7 @@
 {
   "parameters": {
     "api-version": "2021-01-01-privatepreview",
-    "subscriptionId": "00000000-0000-0000-0000-000000000000",
-    "resourceGroupName": "test-rg",
-    "sourceProvider": "Microsoft.Web",
-    "sourceResourceType": "sites",
-    "sourceResourceName": "test-app",
+    "resourceUri": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Web/sites/test-app",
     "linkerName": "linkName"
   },
   "responses": {

diff --git a/...-manager/Microsoft.ServiceLinker/preview/2021-01-01-privatepreview/examples/LinkList.json b/...-manager/Microsoft.ServiceLinker/preview/2021-01-01-privatepreview/examples/LinkList.json
@@ -1,11 +1,7 @@
 {
   "parameters": {
     "api-version": "2021-01-01-privatepreview",
-    "subscriptionId": "00000000-0000-0000-0000-000000000000",
-    "resourceGroupName": "test-rg",
-    "sourceProvider": "Microsoft.Web",
-    "sourceResourceType": "sites",
-    "sourceResourceName": "test-app"
+    "resourceUri": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Web/sites/test-app"
   },
   "responses": {
     "200": {

diff --git a/...manager/Microsoft.ServiceLinker/preview/2021-01-01-privatepreview/examples/PatchLink.json b/...manager/Microsoft.ServiceLinker/preview/2021-01-01-privatepreview/examples/PatchLink.json
@@ -1,11 +1,7 @@
 {
   "parameters": {
     "api-version": "2021-01-01-privatepreview",
-    "subscriptionId": "00000000-0000-0000-0000-000000000000",
-    "resourceGroupName": "test-rg",
-    "sourceProvider": "Microsoft.Web",
-    "sourceResourceType": "sites",
-    "sourceResourceName": "test-app",
+    "resourceUri": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Web/sites/test-app",
     "linkerName": "linkName",
     "parameters": {
       "properties": {

diff --git a/...e-manager/Microsoft.ServiceLinker/preview/2021-01-01-privatepreview/examples/PutLink.json b/...e-manager/Microsoft.ServiceLinker/preview/2021-01-01-privatepreview/examples/PutLink.json
@@ -1,11 +1,7 @@
 {
   "parameters": {
     "api-version": "2021-01-01-privatepreview",
-    "subscriptionId": "00000000-0000-0000-0000-000000000000",
-    "resourceGroupName": "test-rg",
-    "sourceProvider": "Microsoft.Web",
-    "sourceResourceType": "sites",
-    "sourceResourceName": "test-app",
+    "resourceUri": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Web/sites/test-app",
     "linkerName": "linkName",
     "parameters": {
       "properties": {

diff --git a/...crosoft.ServiceLinker/preview/2021-01-01-privatepreview/examples/ValidateLinkFailure.json b/...crosoft.ServiceLinker/preview/2021-01-01-privatepreview/examples/ValidateLinkFailure.json
@@ -1,11 +1,7 @@
 {
   "parameters": {
     "api-version": "2021-01-01-privatepreview",
-    "subscriptionId": "00000000-0000-0000-0000-000000000000",
-    "resourceGroupName": "test-rg",
-    "sourceProvider": "Microsoft.Web",
-    "sourceResourceType": "sites",
-    "sourceResourceName": "test-app",
+    "resourceUri": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Web/sites/test-app",
     "linkerName": "linkName"
   },
   "responses": {

diff --git a/...crosoft.ServiceLinker/preview/2021-01-01-privatepreview/examples/ValidateLinkSuccess.json b/...crosoft.ServiceLinker/preview/2021-01-01-privatepreview/examples/ValidateLinkSuccess.json
@@ -1,11 +1,7 @@
 {
   "parameters": {
     "api-version": "2021-01-01-privatepreview",
-    "subscriptionId": "00000000-0000-0000-0000-000000000000",
-    "resourceGroupName": "test-rg",
-    "sourceProvider": "Microsoft.Web",
-    "sourceResourceType": "sites",
-    "sourceResourceName": "test-app",
+    "resourceUri": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Web/sites/test-app",
     "linkerName": "linkName"
   },
   "responses": {

diff --git a/...urce-manager/Microsoft.ServiceLinker/preview/2021-01-01-privatepreview/servicelinker.json b/...urce-manager/Microsoft.ServiceLinker/preview/2021-01-01-privatepreview/servicelinker.json
@@ -34,7 +34,7 @@
     }
   },
   "paths": {
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{sourceProvider}/{sourceResourceType}/{sourceResourceName}/providers/Microsoft.ServiceLinker/linkers": {
+    "/{resourceUri}/providers/Microsoft.ServiceLinker/linkers": {
       "get": {
         "deprecated": false,
         "description": "Returns list of Linkers which connects to the resource.",
@@ -46,22 +46,10 @@
         },
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "#/parameters/ResourceUriParameter"
           },
           {
             "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/SourceProviderParameter"
-          },
-          {
-            "$ref": "#/parameters/SourceResourceTypeParameter"
-          },
-          {
-            "$ref": "#/parameters/SourceResourceNameParameter"
           }
         ],
         "responses": {
@@ -83,7 +71,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{sourceProvider}/{sourceResourceType}/{sourceResourceName}/providers/Microsoft.ServiceLinker/linkers/{linkerName}": {
+    "/{resourceUri}/providers/Microsoft.ServiceLinker/linkers/{linkerName}": {
       "get": {
         "description": "Returns Linker resource for a given name.",
         "operationId": "Linker_Get",
@@ -94,23 +82,11 @@
         },
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "#/parameters/ResourceUriParameter"
           },
           {
             "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
-          {
-            "$ref": "#/parameters/SourceProviderParameter"
-          },
-          {
-            "$ref": "#/parameters/SourceResourceTypeParameter"
-          },
-          {
-            "$ref": "#/parameters/SourceResourceNameParameter"
-          },
           {
             "$ref": "#/parameters/LinkerNameParameter"
           }
@@ -144,23 +120,11 @@
         },
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "#/parameters/ResourceUriParameter"
           },
           {
             "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
-          {
-            "$ref": "#/parameters/SourceProviderParameter"
-          },
-          {
-            "$ref": "#/parameters/SourceResourceTypeParameter"
-          },
-          {
-            "$ref": "#/parameters/SourceResourceNameParameter"
-          },
           {
             "$ref": "#/parameters/LinkerNameParameter"
           },
@@ -208,23 +172,11 @@
         },
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "#/parameters/ResourceUriParameter"
           },
           {
             "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
-          {
-            "$ref": "#/parameters/SourceProviderParameter"
-          },
-          {
-            "$ref": "#/parameters/SourceResourceTypeParameter"
-          },
-          {
-            "$ref": "#/parameters/SourceResourceNameParameter"
-          },
           {
             "$ref": "#/parameters/LinkerNameParameter"
           }
@@ -261,23 +213,11 @@
         },
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "#/parameters/ResourceUriParameter"
           },
           {
             "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
-          {
-            "$ref": "#/parameters/SourceProviderParameter"
-          },
-          {
-            "$ref": "#/parameters/SourceResourceTypeParameter"
-          },
-          {
-            "$ref": "#/parameters/SourceResourceNameParameter"
-          },
           {
             "$ref": "#/parameters/LinkerNameParameter"
           },
@@ -313,7 +253,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{sourceProvider}/{sourceResourceType}/{sourceResourceName}/providers/Microsoft.ServiceLinker/linkers/{linkerName}/validateLinker": {
+    "/{resourceUri}/providers/Microsoft.ServiceLinker/linkers/{linkerName}/validateLinker": {
       "post": {
         "tags": [
           "Links"
@@ -334,25 +274,13 @@
         },
         "parameters": [
           {
-            "$ref": "#/parameters/LinkerNameParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "#/parameters/ResourceUriParameter"
           },
           {
             "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "#/parameters/SourceProviderParameter"
-          },
-          {
-            "$ref": "#/parameters/SourceResourceTypeParameter"
-          },
-          {
-            "$ref": "#/parameters/SourceResourceNameParameter"
+            "$ref": "#/parameters/LinkerNameParameter"
           }
         ],
         "responses": {
@@ -374,7 +302,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{sourceProvider}/{sourceResourceType}/{sourceResourceName}/providers/Microsoft.ServiceLinker/linkers/{linkerName}/listConfigurations": {
+    "/{resourceUri}//providers/Microsoft.ServiceLinker/linkers/{linkerName}/listConfigurations": {
       "post": {
         "tags": [
           "Links"
@@ -388,25 +316,13 @@
         },
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "#/parameters/ResourceUriParameter"
           },
           {
             "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "$ref": "#/parameters/LinkerNameParameter"
-          },
-          {
-            "$ref": "#/parameters/SourceProviderParameter"
-          },
-          {
-            "$ref": "#/parameters/SourceResourceTypeParameter"
-          },
-          {
-            "$ref": "#/parameters/SourceResourceNameParameter"
           }
         ],
         "responses": {
@@ -719,28 +635,13 @@
       "description": "The name Linker resource.",
       "x-ms-parameter-location": "method"
     },
-    "SourceProviderParameter": {
-      "name": "sourceProvider",
-      "in": "path",
-      "required": true,
-      "type": "string",
-      "description": "The Azure resource provider of the source resource to be connected",
-      "x-ms-parameter-location": "method"
-    },
-    "SourceResourceTypeParameter": {
-      "name": "sourceResourceType",
-      "in": "path",
-      "required": true,
-      "type": "string",
-      "description": "The Azure resource type of source resource to be connected",
-      "x-ms-parameter-location": "method"
-    },
-    "SourceResourceNameParameter": {
-      "name": "sourceResourceName",
+    "ResourceUriParameter": {
+      "name": "resourceUri",
       "in": "path",
       "required": true,
       "type": "string",
-      "description": "The Azure resource name of source resource to be connected",
+      "description": "The fully qualified Azure Resource manager identifier of the resource to be connected.",
+      "x-ms-skip-url-encoding": true,
       "x-ms-parameter-location": "method"
     }
   }