Make origin a ProxyResource instead of TrackedResource (Azure#10126)

* Make origin a ProxyResource instead of TrackedResource * Fix model validation error * Fix model validation errors * Fix prettier errors * Make origin a proxyresource for all API versions starting from 12-30-2019
test-repo-tih · Jul 17, 2020 · 3657725 · 3657725
1 parent 647194e
commit 3657725
Show file tree

Hide file tree

Showing 15 changed files with 3 additions and 117 deletions.
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2019-12-31/cdn.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2019-12-31/cdn.json
@@ -4332,7 +4332,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "#/definitions/TrackedResource"
+          "$ref": "#/definitions/ProxyResource"
         }
       ],
       "properties": {
@@ -4378,13 +4378,6 @@
       "type": "object",
       "description": "Origin properties needed for origin update.",
       "properties": {
-        "tags": {
-          "description": "Origin tags.",
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
         "properties": {
           "x-ms-client-flatten": true,
           "$ref": "#/definitions/OriginUpdatePropertiesParameters"

diff --git a/...ication/cdn/resource-manager/Microsoft.Cdn/stable/2019-12-31/examples/Origins_Create.json b/...ication/cdn/resource-manager/Microsoft.Cdn/stable/2019-12-31/examples/Origins_Create.json
@@ -7,7 +7,6 @@
     "endpointName": "endpoint1",
     "originName": "www-someDomain-net",
     "origin": {
-      "location": "WestUs",
       "properties": {
         "hostName": "www.someDomain.net",
         "httpPort": 80,
@@ -25,7 +24,6 @@
         "name": "www-someDomain-net",
         "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/origins/www-someDomain-net",
         "type": "Microsoft.Cdn/profiles/endpoints/origins",
-        "location": "WestUs",
         "properties": {
           "provisioningState": "Succeeded",
           "resourceState": "Active",
@@ -44,7 +42,6 @@
         "name": "www-someDomain-net",
         "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/origins/www-someDomain-net",
         "type": "Microsoft.Cdn/profiles/endpoints/origins",
-        "location": "WestUs",
         "properties": {
           "provisioningState": "Succeeded",
           "resourceState": "Active",
@@ -63,7 +60,6 @@
         "name": "www-someDomain-net",
         "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/origins/www-someDomain-net",
         "type": "Microsoft.Cdn/profiles/endpoints/origins",
-        "location": "WestUs",
         "properties": {
           "provisioningState": "Succeeded",
           "resourceState": "Active",

diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2019-12-31/examples/Origins_Get.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2019-12-31/examples/Origins_Get.json
@@ -11,10 +11,6 @@
     "200": {
       "body": {
         "name": "www-someDomain-net",
-        "location": "WestUs",
-        "tags": {
-          "key1": "value1"
-        },
         "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/origins/www-someDomain-net",
         "type": "Microsoft.Cdn/profiles/endpoints/origins",
         "properties": {

diff --git a/...cdn/resource-manager/Microsoft.Cdn/stable/2019-12-31/examples/Origins_ListByEndpoint.json b/...cdn/resource-manager/Microsoft.Cdn/stable/2019-12-31/examples/Origins_ListByEndpoint.json
@@ -12,10 +12,6 @@
         "value": [
           {
             "name": "www-someDomain-net",
-            "location": "WestUs",
-            "tags": {
-              "key1": "value1"
-            },
             "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/origins/www-someDomain-net",
             "type": "Microsoft.Cdn/profiles/endpoints/origins",
             "properties": {

diff --git a/...ication/cdn/resource-manager/Microsoft.Cdn/stable/2019-12-31/examples/Origins_Update.json b/...ication/cdn/resource-manager/Microsoft.Cdn/stable/2019-12-31/examples/Origins_Update.json
@@ -7,9 +7,6 @@
     "endpointName": "endpoint1",
     "originName": "www-someDomain-net",
     "originUpdateProperties": {
-      "tags": {
-        "key1": "value1"
-      },
       "properties": {
         "httpPort": 42,
         "httpsPort": 43,
@@ -24,10 +21,6 @@
     "200": {
       "body": {
         "name": "www-someDomain-net",
-        "location": "WestUs",
-        "tags": {
-          "key1": "value1"
-        },
         "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/origins/www-someDomain-net",
         "type": "Microsoft.Cdn/profiles/endpoints/origins",
         "properties": {
@@ -47,10 +40,6 @@
       "body": {
         "name": "www-someDomain-net",
         "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/origins/www-someDomain-net",
-        "location": "WestUs",
-        "tags": {
-          "key1": "value1"
-        },
         "type": "Microsoft.Cdn/profiles/endpoints/origins",
         "properties": {
           "provisioningState": "Succeeded",

diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-03-31/cdn.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-03-31/cdn.json
@@ -4428,7 +4428,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "#/definitions/TrackedResource"
+          "$ref": "#/definitions/ProxyResource"
         }
       ],
       "properties": {
@@ -4474,13 +4474,6 @@
       "type": "object",
       "description": "Origin properties needed for origin update.",
       "properties": {
-        "tags": {
-          "description": "Origin tags.",
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
         "properties": {
           "x-ms-client-flatten": true,
           "$ref": "#/definitions/OriginUpdatePropertiesParameters"

diff --git a/...ication/cdn/resource-manager/Microsoft.Cdn/stable/2020-03-31/examples/Origins_Create.json b/...ication/cdn/resource-manager/Microsoft.Cdn/stable/2020-03-31/examples/Origins_Create.json
@@ -7,10 +7,6 @@
     "endpointName": "endpoint1",
     "originName": "www-someDomain-net",
     "origin": {
-      "location": "WestUs",
-      "tags": {
-        "key1": "value1"
-      },
       "properties": {
         "hostName": "www.someDomain.net",
         "httpPort": 80,
@@ -26,10 +22,6 @@
     "200": {
       "body": {
         "name": "www-someDomain-net",
-        "location": "WestUs",
-        "tags": {
-          "key1": "value1"
-        },
         "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/origins/www-someDomain-net",
         "type": "Microsoft.Cdn/profiles/endpoints/origins",
         "properties": {
@@ -48,10 +40,6 @@
     "201": {
       "body": {
         "name": "www-someDomain-net",
-        "location": "WestUs",
-        "tags": {
-          "key1": "value1"
-        },
         "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/origins/www-someDomain-net",
         "type": "Microsoft.Cdn/profiles/endpoints/origins",
         "properties": {
@@ -70,10 +58,6 @@
     "202": {
       "body": {
         "name": "www-someDomain-net",
-        "location": "WestUs",
-        "tags": {
-          "key1": "value1"
-        },
         "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/origins/www-someDomain-net",
         "type": "Microsoft.Cdn/profiles/endpoints/origins",
         "properties": {

diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-03-31/examples/Origins_Get.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-03-31/examples/Origins_Get.json
@@ -11,10 +11,6 @@
     "200": {
       "body": {
         "name": "www-someDomain-net",
-        "location": "WestUs",
-        "tags": {
-          "key1": "value1"
-        },
         "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/origins/www-someDomain-net",
         "type": "Microsoft.Cdn/profiles/endpoints/origins",
         "properties": {

diff --git a/...cdn/resource-manager/Microsoft.Cdn/stable/2020-03-31/examples/Origins_ListByEndpoint.json b/...cdn/resource-manager/Microsoft.Cdn/stable/2020-03-31/examples/Origins_ListByEndpoint.json
@@ -12,10 +12,6 @@
         "value": [
           {
             "name": "www-someDomain-net",
-            "location": "WestUs",
-            "tags": {
-              "key1": "value1"
-            },
             "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/origins/www-someDomain-net",
             "type": "Microsoft.Cdn/profiles/endpoints/origins",
             "properties": {

diff --git a/...ication/cdn/resource-manager/Microsoft.Cdn/stable/2020-03-31/examples/Origins_Update.json b/...ication/cdn/resource-manager/Microsoft.Cdn/stable/2020-03-31/examples/Origins_Update.json
@@ -7,9 +7,6 @@
     "endpointName": "endpoint1",
     "originName": "www-someDomain-net",
     "originUpdateProperties": {
-      "tags": {
-        "key1": "value1"
-      },
       "properties": {
         "httpPort": 42,
         "httpsPort": 43,
@@ -24,10 +21,6 @@
     "200": {
       "body": {
         "name": "www-someDomain-net",
-        "location": "WestUs",
-        "tags": {
-          "key1": "value1"
-        },
         "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/origins/www-someDomain-net",
         "type": "Microsoft.Cdn/profiles/endpoints/origins",
         "properties": {
@@ -47,10 +40,6 @@
       "body": {
         "name": "www-someDomain-net",
         "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/origins/www-someDomain-net",
-        "location": "WestUs",
-        "tags": {
-          "key1": "value1"
-        },
         "type": "Microsoft.Cdn/profiles/endpoints/origins",
         "properties": {
           "provisioningState": "Succeeded",

diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/cdn.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/cdn.json
@@ -4452,7 +4452,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "#/definitions/TrackedResource"
+          "$ref": "#/definitions/ProxyResource"
         }
       ],
       "properties": {
@@ -4514,13 +4514,6 @@
       "type": "object",
       "description": "Origin properties needed for origin update.",
       "properties": {
-        "tags": {
-          "description": "Origin tags.",
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
         "properties": {
           "x-ms-client-flatten": true,
           "$ref": "#/definitions/OriginUpdatePropertiesParameters"

diff --git a/...ication/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Origins_Create.json b/...ication/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Origins_Create.json
@@ -7,10 +7,6 @@
     "endpointName": "endpoint1",
     "originName": "www-someDomain-net",
     "origin": {
-      "location": "WestUs",
-      "tags": {
-        "key1": "value1"
-      },
       "properties": {
         "hostName": "www.someDomain.net",
         "httpPort": 80,
@@ -29,10 +25,6 @@
     "200": {
       "body": {
         "name": "www-someDomain-net",
-        "location": "WestUs",
-        "tags": {
-          "key1": "value1"
-        },
         "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/origins/www-someDomain-net",
         "type": "Microsoft.Cdn/profiles/endpoints/origins",
         "properties": {
@@ -55,10 +47,6 @@
     "201": {
       "body": {
         "name": "www-someDomain-net",
-        "location": "WestUs",
-        "tags": {
-          "key1": "value1"
-        },
         "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/origins/www-someDomain-net",
         "type": "Microsoft.Cdn/profiles/endpoints/origins",
         "properties": {
@@ -81,10 +69,6 @@
     "202": {
       "body": {
         "name": "www-someDomain-net",
-        "location": "WestUs",
-        "tags": {
-          "key1": "value1"
-        },
         "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/origins/www-someDomain-net",
         "type": "Microsoft.Cdn/profiles/endpoints/origins",
         "properties": {

diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Origins_Get.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Origins_Get.json
@@ -11,10 +11,6 @@
     "200": {
       "body": {
         "name": "www-someDomain-net",
-        "location": "WestUs",
-        "tags": {
-          "key1": "value1"
-        },
         "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/origins/www-someDomain-net",
         "type": "Microsoft.Cdn/profiles/endpoints/origins",
         "properties": {

diff --git a/...cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Origins_ListByEndpoint.json b/...cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Origins_ListByEndpoint.json
@@ -12,10 +12,6 @@
         "value": [
           {
             "name": "www-someDomain-net",
-            "location": "WestUs",
-            "tags": {
-              "key1": "value1"
-            },
             "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/origins/www-someDomain-net",
             "type": "Microsoft.Cdn/profiles/endpoints/origins",
             "properties": {

diff --git a/...ication/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Origins_Update.json b/...ication/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Origins_Update.json
@@ -7,9 +7,6 @@
     "endpointName": "endpoint1",
     "originName": "www-someDomain-net",
     "originUpdateProperties": {
-      "tags": {
-        "key1": "value1"
-      },
       "properties": {
         "httpPort": 42,
         "httpsPort": 43,
@@ -25,10 +22,6 @@
     "200": {
       "body": {
         "name": "www-someDomain-net",
-        "location": "WestUs",
-        "tags": {
-          "key1": "value1"
-        },
         "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/origins/www-someDomain-net",
         "type": "Microsoft.Cdn/profiles/endpoints/origins",
         "properties": {
@@ -51,10 +44,6 @@
       "body": {
         "name": "www-someDomain-net",
         "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/origins/www-someDomain-net",
-        "location": "WestUs",
-        "tags": {
-          "key1": "value1"
-        },
         "type": "Microsoft.Cdn/profiles/endpoints/origins",
         "properties": {
           "provisioningState": "Succeeded",