Include Tags in GetSubscription and Deployment APIs (Azure#8268)

* changes to get subscription * tags for deployments * fixes from another fork * added extension
00Kai0 · Oct 12, 2020 · 29cd182 · 29cd182
1 parent bdf9972
commit 29cd182
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 3 deletions.
diff --git a/...resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtScope.json b/...resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtScope.json
@@ -11,6 +11,10 @@
         },
         "parameters": {},
         "mode": "Incremental"
+      },
+      "tags": {
+        "tagKey1": "tagValue1",
+        "tagKey2": "tagValue2"
       }
     }
   },
@@ -72,6 +76,10 @@
               "resourceName": "location-lock"
             }
           ]
+        },
+        "tags": {
+          "tagKey1": "tagValue1",
+          "tagKey2": "tagValue2"
         }
       }
     },
@@ -132,6 +140,10 @@
               "resourceName": "location-lock"
             }
           ]
+        },
+        "tags": {
+          "tagKey1": "tagValue1",
+          "tagKey2": "tagValue2"
         }
       }
     }

diff --git a/...esource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtTenant.json b/...esource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtTenant.json
@@ -10,6 +10,10 @@
         },
         "parameters": {},
         "mode": "Incremental"
+      },
+      "tags": {
+        "tagKey1": "tagValue1",
+        "tagKey2": "tagValue2"
       }
     }
   },
@@ -71,6 +75,10 @@
               "resourceName": "location-lock"
             }
           ]
+        },
+        "tags": {
+          "tagKey1": "tagValue1",
+          "tagKey2": "tagValue2"
         }
       }
     },
@@ -131,6 +139,10 @@
               "resourceName": "location-lock"
             }
           ]
+        },
+        "tags": {
+          "tagKey1": "tagValue1",
+          "tagKey2": "tagValue2"
         }
       }
     }

diff --git a/...ification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json b/...ification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json
@@ -4291,6 +4291,13 @@
         "properties": {
           "$ref": "#/definitions/DeploymentProperties",
           "description": "The deployment properties."
+        },
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Deployment tags"
         }
       },
       "required": [
@@ -4307,6 +4314,13 @@
         "properties": {
           "$ref": "#/definitions/DeploymentProperties",
           "description": "The deployment properties."
+        },
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Deployment tags"
         }
       },
       "required": [
@@ -4735,6 +4749,13 @@
         "properties": {
           "$ref": "#/definitions/DeploymentPropertiesExtended",
           "description": "Deployment properties."
+        },
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Deployment tags"
         }
       },
       "x-ms-azure-resource": true,
@@ -5139,6 +5160,7 @@
           "description": "The list of tag values."
         }
       },
+      "x-ms-azure-resource": true,
       "description": "Tag details."
     },
     "TagsListResult": {

diff --git a/...rces/resource-manager/Microsoft.Resources/stable/2019-11-01/examples/GetSubscription.json b/...rces/resource-manager/Microsoft.Resources/stable/2019-11-01/examples/GetSubscription.json
@@ -21,7 +21,11 @@
           {
             "tenantId": "8f70baf1-1f6e-46a2-a1ff-238dac1ebfb7"
           }
-        ]
+        ],
+        "tags": {
+          "tagKey1": "tagValue1",
+          "tagKey2": "tagValue2"
+        }
       }
     }
   }

diff --git a/...ces/resource-manager/Microsoft.Resources/stable/2019-11-01/examples/GetSubscriptions.json b/...ces/resource-manager/Microsoft.Resources/stable/2019-11-01/examples/GetSubscriptions.json
@@ -22,7 +22,11 @@
               {
                 "tenantId": "8f70baf1-1f6e-46a2-a1ff-238dac1ebfb7"
               }
-            ]
+            ],
+            "tags": {
+              "tagKey1": "tagValue1",
+              "tagKey2": "tagValue2"
+            }
           },
           {
             "id": "/subscriptions/72ac930a-f34e-42d8-b06d-dc2a9e12ed71",
@@ -43,7 +47,11 @@
               {
                 "tenantId": "f7fb6af2-321d-47c8-9c0f-b0239eaad39a"
               }
-            ]
+            ],
+            "tags": {
+              "tagKey1": "tagValue1",
+              "tagKey2": "tagValue2"
+            }
           }
         ],
         "nextLink": "..."

diff --git a/...ation/resources/resource-manager/Microsoft.Resources/stable/2019-11-01/subscriptions.json b/...ation/resources/resource-manager/Microsoft.Resources/stable/2019-11-01/subscriptions.json
@@ -356,6 +356,14 @@
             "$ref": "#/definitions/ManagedByTenant"
           },
           "description": "An array containing the tenants managing the subscription."
+        },
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string",
+            "description": "The additional properties. "
+          },
+          "description": "The tags attached to the subscription."
         }
       },
       "description": "Subscription information."