From 1eeb2fa6c63f1df16569551029e2bc6e4f468b50 Mon Sep 17 00:00:00 2001
From: Tosin Adewale <oladewal@microsoft.com>
Date: Mon, 23 Mar 2020 23:00:40 -0700
Subject: [PATCH] [acr] update default package tag and
 PrivateEndpointConnection resource for containerregistry (#8646)

* update default package tag

* Update typescript autorest config file.

* PrivateEndpointConnection should inherit proxyresource

Update spec

Co-authored-by: Oluwatosin Adewale <oluwatosin.adewale@microsoft.com>
---
 .../2019-12-01-preview/containerregistry.json | 39 ++++++++++++-------
 .../resource-manager/readme.md                |  2 +-
 .../resource-manager/readme.typescript.md     |  2 +-
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-12-01-preview/containerregistry.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-12-01-preview/containerregistry.json
index fee5e737d941..b866df98cda1 100644
--- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-12-01-preview/containerregistry.json
+++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-12-01-preview/containerregistry.json
@@ -1520,20 +1520,12 @@
     "PrivateEndpointConnection": {
       "description": "An object that represents a private endpoint connection for a container registry.",
       "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/ProxyResource"
+        }
+      ],
       "properties": {
-        "type": {
-          "description": "The resource type is private endpoint connection.",
-          "type": "string",
-          "readOnly": true
-        },
-        "id": {
-          "description": "The resource ID.",
-          "type": "string"
-        },
-        "name": {
-          "description": "The name of the resource.",
-          "type": "string"
-        },
         "properties": {
           "$ref": "#/definitions/PrivateEndpointConnectionProperties",
           "description": "The properties of a private endpoint connection.",
@@ -2897,6 +2889,27 @@
         }
       }
     },
+    "ProxyResource": {
+      "description": "The resource model definition for a ARM proxy resource. It will have everything other than required location and tags.",
+      "properties": {
+        "id": {
+          "description": "The resource ID.",
+          "type": "string",
+          "readOnly": true
+        },
+        "name": {
+          "description": "The name of the resource.",
+          "type": "string",
+          "readOnly": true
+        },
+        "type": {
+          "description": "The type of the resource.",
+          "type": "string",
+          "readOnly": true
+        }
+      },
+      "x-ms-azure-resource": true
+    },
     "Resource": {
       "description": "An Azure resource.",
       "required": [
diff --git a/specification/containerregistry/resource-manager/readme.md b/specification/containerregistry/resource-manager/readme.md
index d4d66a50652f..dc042e35dca0 100644
--- a/specification/containerregistry/resource-manager/readme.md
+++ b/specification/containerregistry/resource-manager/readme.md
@@ -26,7 +26,7 @@ These are the global settings for the ContainerRegistry API.
 
 ``` yaml
 openapi-type: arm
-tag: package-2019-06-preview
+tag: package-2019-12-preview
 ```
 
 
diff --git a/specification/containerregistry/resource-manager/readme.typescript.md b/specification/containerregistry/resource-manager/readme.typescript.md
index 8fc2768ada95..db34cc240a6d 100644
--- a/specification/containerregistry/resource-manager/readme.typescript.md
+++ b/specification/containerregistry/resource-manager/readme.typescript.md
@@ -5,7 +5,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 
 ``` yaml $(typescript)
 input-file:
-  - Microsoft.ContainerRegistry/stable/2019-05-01/containerregistry.json
+  - Microsoft.ContainerRegistry/preview/2019-12-01-preview/containerregistry.json
   - Microsoft.ContainerRegistry/preview/2019-06-01-preview/containerregistry_build.json
   - Microsoft.ContainerRegistry/preview/2019-05-01-preview/containerregistry_scopemap.json
 typescript: