Update ServiceAccount property names (#4165)

* Update property names Update property names - GroupId -> GroupName - DstsName -> AccountName * Update CreateDstsServiceAccount.json * Update DeleteDstsServiceAccount.json * Update GetAllDstsServiceAccount.json * Update GetDstsServiceAccount.json * Update GetDstsServiceAccountUnderResourceGroup.json * Update PatchDstsServiceAccount.json * Update custom-words.txt * Update CreateDstsServiceAccount.json * Update DeleteDstsServiceAccount.json * Update GetDstsServiceAccount.json * Update dstsServiceAccount.json * Update PatchDstsServiceAccount.json * Update GetDstsServiceAccountUnderResourceGroup.json * Update GetDstsServiceAccount.json * Update GetAllDstsServiceAccount.json * Update DeleteDstsServiceAccount.json * Update CreateDstsServiceAccount.json * Update dstsServiceAccount.json * Update dstsServiceAccount.json * Update custom-words.txt * Update CreateDstsServiceAccount.json * Update CreateDstsServiceAccount.json * Update DeleteDstsServiceAccount.json * Update DeleteDstsServiceAccount.json * Update GetAllDstsServiceAccount.json * Update GetDstsServiceAccount.json * Update GetDstsServiceAccountUnderResourceGroup.json * Update PatchDstsServiceAccount.json * Update CreateDstsServiceAccount.json * Update DeleteDstsServiceAccount.json * Update GetAllDstsServiceAccount.json * Update GetDstsServiceAccount.json * Update GetDstsServiceAccountUnderResourceGroup.json * Update PatchDstsServiceAccount.json * Update CreateDstsServiceAccount.json * Update GetAllDstsServiceAccount.json * Update GetDstsServiceAccount.json * Update GetDstsServiceAccountUnderResourceGroup.json * Update PatchDstsServiceAccount.json * Update dstsServiceAccount.json * Update dstsServiceAccount.json * Update CreateDstsServiceAccount.json * Update DeleteDstsServiceAccount.json * Update GetAllDstsServiceAccount.json * Update GetDstsServiceAccount.json * Update GetDstsServiceAccountUnderResourceGroup.json * Update PatchDstsServiceAccount.json * Update GetDstsServiceAccount.json * Update DeleteDstsServiceAccount.json * Update GetDstsServiceAccountUnderResourceGroup.json * Update GetAllDstsServiceAccount.json * Update DeleteDstsServiceAccount.json * Update DeleteDstsServiceAccount.json * Update dstsServiceAccount.json * Prettier check * Update dstsServiceAccount.json * Update CreateDstsServiceAccount.json * Update GetAllDstsServiceAccount.json * Update GetDstsServiceAccount.json * Update GetDstsServiceAccountUnderResourceGroup.json * Update PatchDstsServiceAccount.json * Update dstsServiceAccount.json * Update dstsServiceAccount.json * Update dstsServiceAccount.json Co-authored-by: dnangel026 <30422111+dnangel026@users.noreply.github.com>
Azure · Aug 4, 2021 · d1519f7 · d1519f7
1 parent 98efc61
commit d1519f7
Show file tree

Hide file tree

Showing 8 changed files with 132 additions and 148 deletions.
diff --git a/custom-words.txt b/custom-words.txt
@@ -131,6 +131,7 @@ autoscalesettings
 autoscaling
 Avro
 avrodeflate
+azcis
 azns
 azpkg
 azureaccounts
@@ -420,6 +421,8 @@ domainservices
 DOTALL
 DRMs
 dsmax
+Dsts
+Dscm
 Dtus
 duration'PT
 EAPMSCHA
@@ -1474,6 +1477,7 @@ upsell
 Upsert
 upserting
 usagescenarios
+useast
 userargs
 userdata
 usererror

diff --git a/...n/resources/resource-manager/Microsoft.AzureCIS/stable/2021-02-01/dstsServiceAccount.json b/...n/resources/resource-manager/Microsoft.AzureCIS/stable/2021-02-01/dstsServiceAccount.json
@@ -6,12 +6,20 @@
     "version": "2021-02-01"
   },
   "host": "management.azure.com",
-  "schemes": ["https"],
-  "consumes": ["application/json"],
-  "produces": ["application/json"],
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
   "security": [
     {
-      "azure_auth": ["user_impersonation"]
+      "azure_auth": [
+        "user_impersonation"
+      ]
     }
   ],
   "securityDefinitions": {
@@ -28,9 +36,9 @@
   "paths": {
     "/subscriptions/{subscriptionId}/providers/Microsoft.AzureCIS/dstsServiceAccounts": {
       "get": {
-        "description": "list all the DSTS service accounts in a subscription",
+        "description": "Lists all the DstsServiceAccounts in a subscription.",
         "x-ms-examples": {
-          "Get All DstsServiceAccount": {
+          "Get DstsServiceAccounts in a subscription": {
             "$ref": "./examples/GetAllDstsServiceAccount.json"
           }
         },
@@ -45,7 +53,7 @@
         ],
         "responses": {
           "200": {
-            "description": "Get DstsServiceAccount info.",
+            "description": "List of DstsServiceAccounts.",
             "schema": {
               "$ref": "#/definitions/DstsServiceAccountResult"
             }
@@ -64,9 +72,9 @@
     },
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AzureCIS/dstsServiceAccounts": {
       "get": {
-        "description": "Get DstsServiceAccount Under ResourceGroup",
+        "description": "Lists all the DstsServiceAccounts in a ResourceGroup.",
         "x-ms-examples": {
-          "Get DstsServiceAccount Under ResourceGroup": {
+          "Get DstsServiceAccounts in a ResourceGroup": {
             "$ref": "./examples/GetDstsServiceAccountUnderResourceGroup.json"
           }
         },
@@ -84,7 +92,7 @@
         ],
         "responses": {
           "200": {
-            "description": "Get dstsServiceAccounts info.",
+            "description": "List of DstsServiceAccounts.",
             "schema": {
               "$ref": "#/definitions/DstsServiceAccountResult"
             }
@@ -103,9 +111,9 @@
     },
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AzureCIS/dstsServiceAccounts/{resourceName}": {
       "put": {
-        "description": "Create DstsServiceAccount.",
+        "description": "Create or update DstsServiceAccount.",
         "x-ms-examples": {
-          "Create a DstsServiceAccount": {
+          "Create or update a DstsServiceAccount": {
             "$ref": "./examples/CreateDstsServiceAccount.json"
           }
         },
@@ -135,7 +143,7 @@
         ],
         "responses": {
           "201": {
-            "description": "DstsServiceAccount Resource created first time successfully.",
+            "description": "DstsServiceAccount Resource created successfully.",
             "schema": {
               "$ref": "#/definitions/DstsServiceAccountModel"
             }
@@ -149,13 +157,13 @@
           "default": {
             "description": "Error response describing the reason for operation failure.",
             "schema": {
-            "$ref": "#/definitions/ErrorResponse"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         }
       },
       "patch": {
-        "description": "patch DstsServiceAccount.",
+        "description": "Patch DstsServiceAccount.",
         "x-ms-examples": {
           "Patch DstsServiceAccount": {
             "$ref": "./examples/PatchDstsServiceAccount.json"
@@ -187,21 +195,21 @@
         ],
         "responses": {
           "200": {
-            "description": "DstsServiceAccount Resource create response.",
+            "description": "DstsServiceAccount Resource patch response.",
             "schema": {
               "$ref": "#/definitions/DstsServiceAccountModel"
             }
           },
           "default": {
             "description": "Error response describing the reason for operation failure.",
             "schema": {
-            "$ref": "#/definitions/ErrorResponse"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         }
       },
       "get": {
-        "description": "Returns an DstsServiceAccount info",
+        "description": "Returns a DstsServiceAccount info",
         "x-ms-examples": {
           "Get DstsServiceAccount": {
             "$ref": "./examples/GetDstsServiceAccount.json"
@@ -224,7 +232,7 @@
         ],
         "responses": {
           "200": {
-            "description": "Get DstsServiceAccount info.",
+            "description": "DstsServiceAccount info.",
             "schema": {
               "$ref": "#/definitions/DstsServiceAccountModel"
             }
@@ -261,16 +269,10 @@
         ],
         "responses": {
           "200": {
-            "description": "DstsServiceAccount exists and delete DstsServiceAccount successfully.",
-            "schema": {
-              "$ref": "#/definitions/DstsServiceAccountModel"
-            }
+            "description": "DstsServiceAccount exists and deleted successfully."
           },
           "204": {
-            "description": "DstsServiceAccount not exists but request is well formed.",
-            "schema": {
-              "$ref": "#/definitions/DstsServiceAccountModel"
-            }
+            "description": "DstsServiceAccount does not exist but request is well formed."
           },
           "default": {
             "description": "Error response describing the reason for operation failure.",
@@ -285,28 +287,22 @@
   "definitions": {
     "DstsServiceAccountResource": {
       "required": [
-        "DstsInstance",
-        "ServiceTreeId",
-        "GroupId"     
+        "GroupName"
       ],
       "type": "object",
-      "description": "DscmResource details",
+      "description": "DstsServiceAccount properties",
       "properties": {
-        "DstsInstance": {
+        "GroupName": {
           "type": "string",
-          "description": "DstsInstance"
+          "description": "Name of the ServiceAccountGroup in Dscm to which the ServiceAccount belongs. Example: ProductionGroup"
         },
-        "ServiceTreeId": {
+        "AccountName": {
           "type": "string",
-          "description": "ServiceTreeId"
+          "description": "Name of the ServiceAccount, to be specified optionally if the ServiceAccountGroup does not specify a naming pattern for its member ServiceAccounts. Example: prod-useast.azcis.trafficmanager.net"
         },
-        "DstsName": {
-          "type": "string",
-          "description": "Name"
-        },
-        "GroupId": {
+        "DstsInstance": {
           "type": "string",
-          "description": "GroupId"
+          "description": "Dsts instance on which the ServiceAccount should be created. If not specified, the ServiceAccount is created on the regional dsts instance corresponding to the resource location. Example: useast-dsts.dsts.core.windows.net"
         }
       }
     },

diff --git a/...ource-manager/Microsoft.AzureCIS/stable/2021-02-01/examples/CreateDstsServiceAccount.json b/...ource-manager/Microsoft.AzureCIS/stable/2021-02-01/examples/CreateDstsServiceAccount.json
@@ -1,45 +1,41 @@
 {
   "parameters": {
-    "subscriptionId": "{subscription-id}",
+    "subscriptionId": "mySubscriptionId",
     "resourceGroupName": "myResourceGroup",
-    "resourceName": "myResourceName",
+    "resourceName": "prodUSEastAzcis",
     "api-version": "2021-02-01",
     "DstsServiceAccount": {
-      "location": "useast",
+      "location": "eastus",
       "properties": {
-        "DstsInstance": "DstsInstance",
-        "ServiceTreeId": "ServiceTreeId",
-        "DstsName": "Name",
-        "GroupId": "GroupId"
+        "AccountName": "prod-useast.azcis.trafficmanager.net",
+        "GroupName": "ProductionGroup"
       }
     }
   },
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/subId/resourceGroups/rgId/providers/Microsoft.AzureCIS/dstsServiceAccounts/testAccount",
-        "name": "DstsServiceAccountResponse",
+        "id": "/subscriptions/mySubscriptionId/resourceGroups/myResourceGroup/providers/Microsoft.AzureCIS/dstsServiceAccounts/prodUSEastAzcis",
+        "name": "prodUSEastAzcis",
         "type": "Microsoft.AzureCIS/dstsServiceAccounts",
-        "location": "useast",
+        "location": "eastus",
         "properties": {
-          "DstsInstance": "DstsInstance",
-          "ServiceTreeId": "ServiceTreeId",
-          "DstsName": "Name",
-          "GroupId": "GroupId"
+          "AccountName": "prod-useast.azcis.trafficmanager.net",
+          "DstsInstance": "useast-dsts.dsts.core.windows.net",
+          "GroupName": "ProductionGroup"
         }
       }
     },
     "201": {
       "body": {
-        "id": "/subscriptions/subId/resourceGroups/rgId/providers/Microsoft.AzureCIS/dstsServiceAccounts/testAccount",
-        "name": "DstsServiceAccountResponse",
+        "id": "/subscriptions/mySubscriptionId/resourceGroups/myResourceGroup/providers/Microsoft.AzureCIS/dstsServiceAccounts/prodUSEastAzcis",
+        "name": "prodUSEastAzcis",
         "type": "Microsoft.AzureCIS/dstsServiceAccounts",
-        "location": "useast",
+        "location": "eastus",
         "properties": {
-          "DstsInstance": "DstsInstance",
-          "ServiceTreeId": "ServiceTreeId",
-          "DstsName": "Name",
-          "GroupId": "GroupId"
+          "AccountName": "prod-useast.azcis.trafficmanager.net",
+          "DstsInstance": "useast-dsts.dsts.core.windows.net",
+          "GroupName": "ProductionGroup"
         }
       }
     }

diff --git a/...ource-manager/Microsoft.AzureCIS/stable/2021-02-01/examples/DeleteDstsServiceAccount.json b/...ource-manager/Microsoft.AzureCIS/stable/2021-02-01/examples/DeleteDstsServiceAccount.json
@@ -1,38 +1,12 @@
 {
   "parameters": {
-    "subscriptionId": "{subscription-id}",
+    "subscriptionId": "mySubscriptionId",
     "resourceGroupName": "myResourceGroup",
-    "resourceName": "myResourceName",
+    "resourceName": "prodUSEastAzcis",
     "api-version": "2021-02-01"
   },
   "responses": {
-    "200": {
-      "body": {
-        "id": "/subscriptions/subId/resourceGroups/rgId/providers/Microsoft.AzureCIS/dstsServiceAccounts/testAccount",
-        "name": "DstsServiceAccountResponse",
-        "type": "Microsoft.AzureCIS/dstsServiceAccounts",
-        "location": "useast",
-        "properties": {
-          "DstsInstance": "DstsInstance",
-          "ServiceTreeId": "ServiceTreeId",
-          "DstsName": "Name",
-          "GroupId": "GroupId"
-        }
-      }
-    },
-    "204": {
-      "body": {
-        "id": "/subscriptions/subId/resourceGroups/rgId/providers/Microsoft.AzureCIS/dstsServiceAccounts/testAccount",
-        "name": "DstsServiceAccountResponse",
-        "type": "Microsoft.AzureCIS/dstsServiceAccounts",
-        "location": "useast",
-        "properties": {
-          "DstsInstance": "DstsInstance",
-          "ServiceTreeId": "ServiceTreeId",
-          "DstsName": "Name",
-          "GroupId": "GroupId"
-        }
-      }
-    }
+    "200": {},
+    "204": {}
   }
 }
diff --git a/...ource-manager/Microsoft.AzureCIS/stable/2021-02-01/examples/GetAllDstsServiceAccount.json b/...ource-manager/Microsoft.AzureCIS/stable/2021-02-01/examples/GetAllDstsServiceAccount.json
@@ -1,34 +1,54 @@
 {
   "parameters": {
-    "subscriptionId": "{subscription-id}",
+    "subscriptionId": "mySubscriptionId",
     "api-version": "2021-02-01"
   },
   "responses": {
     "200": {
       "body": {
-        "value":[
+        "value": [
           {
-            "id": "/subscriptions/subId/providers/Microsoft.AzureCIS/dstsServiceAccounts",
-            "name": "DstsServiceAccountResponse",
+            "id": "/subscriptions/mySubscriptionId/resourceGroups/prodResourceGroup/providers/Microsoft.AzureCIS/dstsServiceAccounts/prodUSEastAzcis",
+            "name": "prodUSEastAzcis",
             "type": "Microsoft.AzureCIS/dstsServiceAccounts",
-            "location": "useast",
+            "location": "eastus",
             "properties": {
-              "DstsInstance": "DstsInstance",
-              "ServiceTreeId": "ServiceTreeId",
-              "DstsName": "Name",
-              "GroupId": "GroupId"
+              "AccountName": "prod-useast.azcis.trafficmanager.net",
+              "DstsInstance": "useast-dsts.dsts.core.windows.net",
+              "GroupName": "ProductionGroup"
             }
           },
           {
-            "id": "/subscriptions/subId/providers/Microsoft.AzureCIS/dstsServiceAccounts",
-            "name": "DstsServiceAccountResponse",
+            "id": "/subscriptions/mySubscriptionId/resourceGroups/canaryResourceGroup/providers/Microsoft.AzureCIS/dstsServiceAccounts/canaryUSEastAzcis",
+            "name": "canaryUSEastAzcis",
             "type": "Microsoft.AzureCIS/dstsServiceAccounts",
-            "location": "useast",
+            "location": "eastus",
             "properties": {
-              "DstsInstance": "DstsInstance",
-              "ServiceTreeId": "ServiceTreeId",
-              "DstsName": "Name",
-              "GroupId": "GroupId"
+              "AccountName": "canary-useast.azcis.trafficmanager.net",
+              "DstsInstance": "useast-dsts.dsts.core.windows.net",
+              "GroupName": "CanaryGroup"
+            }
+          },
+          {
+            "id": "/subscriptions/mySubscriptionId/resourceGroups/prodResourceGroup/providers/Microsoft.AzureCIS/dstsServiceAccounts/prodUSWestAzcis",
+            "name": "prodUSWestAzcis",
+            "type": "Microsoft.AzureCIS/dstsServiceAccounts",
+            "location": "westus",
+            "properties": {
+              "AccountName": "prod-uswest.azcis.trafficmanager.net",
+              "DstsInstance": "uswest-dsts.dsts.core.windows.net",
+              "GroupName": "ProductionGroup"
+            }
+          },
+          {
+            "id": "/subscriptions/mySubscriptionId/resourceGroups/canaryResourceGroup/providers/Microsoft.AzureCIS/dstsServiceAccounts/canaryUSWestAzcis",
+            "name": "canaryUSWestAzcis",
+            "type": "Microsoft.AzureCIS/dstsServiceAccounts",
+            "location": "westus",
+            "properties": {
+              "AccountName": "canary-uswest.azcis.trafficmanager.net",
+              "DstsInstance": "uswest-dsts.dsts.core.windows.net",
+              "GroupName": "CanaryGroup"
             }
           }
         ]