From d0cb147aa2da61b68be026d2058bb0963dde371e Mon Sep 17 00:00:00 2001
From: kavskalyan <kakhandr@microsoft.com>
Date: Thu, 9 Jul 2020 23:51:28 -0700
Subject: [PATCH] [CosmosDB] Unflattening DatabaseAccountCreateUpdateParameters
 in 2020-06-01-Preview version (#10047)

* First draft changes for adding PITR workflow APIs

* Adding examples

* Minor changes to examples

* Fixing the example and restore params

* Fixing format and readme

* Adding the restorable database account API

* Adding default responses for new APIs

* Fixing error response format

* Add Managed Service Identity(MSI) support for ARM Template for Cosmos DB

* Fixing format

* Adding databases to restore and PR suggestions

* Fixing the type at incorrect location

* Fix ManagedServiceIdentityType as suggested

* Adding the restorable database api without the location input

* Managed Service Identity Fix

* Renaming restoreParams to restoreParameters

* Addressing PR suggestions

* Fixing the error response

* msi comment fix

* fix msi enum type

* Unflattening the database create update parameters

Co-authored-by: xujin-zhang <xujin_zhang@outlook.com>
---
 .../preview/2020-06-01-preview/cosmos-db.json                   | 2 --
 specification/cosmos-db/resource-manager/readme.md              | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json
index a73db2e85162..978944c453d6 100644
--- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json
+++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json
@@ -4485,7 +4485,6 @@
     },
     "ErrorResponseUpdatedFormat": {
       "description": "An error response from the service.",
-      "x-ms-external": true,
       "properties": {
         "error": {
           "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse"
@@ -5500,7 +5499,6 @@
           }
         },
         "properties": {
-          "x-ms-client-flatten": true,
           "$ref": "#/definitions/DatabaseAccountCreateUpdateProperties"
         }
       },
diff --git a/specification/cosmos-db/resource-manager/readme.md b/specification/cosmos-db/resource-manager/readme.md
index 49a88ce16881..4d1ab2248832 100644
--- a/specification/cosmos-db/resource-manager/readme.md
+++ b/specification/cosmos-db/resource-manager/readme.md
@@ -27,7 +27,7 @@ These are the global settings for the Cosmos-DB API.
 ``` yaml
 title: CosmosDBManagementClient
 openapi-type: arm
-tag: package-2020-04
+tag: package-2020-06-preview
 ```
 
 ### Tag: package-2020-06-preview