Resolved merge conflicts, updated the model for the token to take cer…

…tificates
Azure · May 6, 2019 · 3256b5c · 3256b5c
1 parent dfd0249
commit 3256b5c
Show file tree

Hide file tree

Showing 15 changed files with 386 additions and 198 deletions.
diff --git a/...er/Microsoft.ContainerRegistry/preview/2019-05-01-preview/containerregistry_scopemap.json b/...er/Microsoft.ContainerRegistry/preview/2019-05-01-preview/containerregistry_scopemap.json
diff --git a/...inerRegistry/preview/2019-05-01-preview/examples/RegistryGenerateCredentials.WithPEM.json b/...inerRegistry/preview/2019-05-01-preview/examples/RegistryGenerateCredentials.WithPEM.json
diff --git a/...ft.ContainerRegistry/preview/2019-05-01-preview/examples/RegistryGenerateCredentials.json b/...ft.ContainerRegistry/preview/2019-05-01-preview/examples/RegistryGenerateCredentials.json
@@ -16,7 +16,7 @@
                 "passwords": [
                     {
                         "expiry": "2020-12-31T15:59:59.0707808Z",
-                        "name": "password",
+                        "name": "password1",
                         "value": "00000000000000000000000000000000"
                     },
                     {

diff --git a/...nager/Microsoft.ContainerRegistry/preview/2019-05-01-preview/examples/ScopeMapCreate.json b/...nager/Microsoft.ContainerRegistry/preview/2019-05-01-preview/examples/ScopeMapCreate.json
@@ -9,7 +9,7 @@
             "properties": {
                 "description": "Developer Scopes",
                 "actions": [
-                    "repositories/myrepository/push",
+                    "repositories/myrepository/contentWrite",
                     "repositories/myrepository/delete"
                 ]
             }
@@ -25,7 +25,7 @@
                     "creationDate": "2017-03-01T23:14:37.0707808Z",
                     "type": "IsUserDefined",
                     "actions": [
-                        "repositories/myrepository/push",
+                        "repositories/myrepository/contentWrite",
                         "repositories/myrepository/delete"
                     ],
                     "provisioningState": "Succeeded"
@@ -41,7 +41,7 @@
                     "creationDate": "2017-03-01T23:14:37.0707808Z",
                     "type": "IsUserDefined",
                     "actions": [
-                        "repositories/myrepository/push",
+                        "repositories/myrepository/contentWrite",
                         "repositories/myrepository/delete"
                     ],
                     "provisioningState": "Succeeded"

diff --git a/...-manager/Microsoft.ContainerRegistry/preview/2019-05-01-preview/examples/ScopeMapGet.json b/...-manager/Microsoft.ContainerRegistry/preview/2019-05-01-preview/examples/ScopeMapGet.json
@@ -16,7 +16,7 @@
                     "creationDate": "2017-03-01T23:14:37.0707808Z",
                     "type": "IsUserDefined",
                     "actions": [
-                        "repositories/myrepository/push",
+                        "repositories/myrepository/contentWrite",
                         "repositories/myrepository/delete"
                     ],
                     "provisioningState": "Succeeded"

diff --git a/...manager/Microsoft.ContainerRegistry/preview/2019-05-01-preview/examples/ScopeMapList.json b/...manager/Microsoft.ContainerRegistry/preview/2019-05-01-preview/examples/ScopeMapList.json
@@ -17,7 +17,7 @@
                             "creationDate": "2017-03-01T23:14:37.0707808Z",
                             "type": "IsUserDefined",
                             "actions": [
-                                "repositories/myrepository/push",
+                                "repositories/myrepository/contentWrite",
                                 "repositories/myrepository/delete"
                             ],
                             "provisioningState": "Succeeded"

diff --git a/...nager/Microsoft.ContainerRegistry/preview/2019-05-01-preview/examples/ScopeMapUpdate.json b/...nager/Microsoft.ContainerRegistry/preview/2019-05-01-preview/examples/ScopeMapUpdate.json
@@ -9,8 +9,8 @@
             "properties": {
                 "description": "Developer Scopes",
                 "actions": [
-                    "repositories/myrepository/push",
-                    "repositories/myrepository/pull"
+                    "repositories/myrepository/contentWrite",
+                    "repositories/myrepository/contentRead"
                 ]
             }
         }
@@ -25,8 +25,8 @@
                     "creationDate": "2017-03-01T23:14:37.0707808Z",
                     "type": "IsUserDefined",
                     "actions": [
-                        "repositories/myrepository/push",
-                        "repositories/myrepository/pull"
+                        "repositories/myrepository/contentWrite",
+                        "repositories/myrepository/contentRead"
                     ],
                     "provisioningState": "Succeeded"
                 }
@@ -41,8 +41,8 @@
                     "creationDate": "2017-03-01T23:14:37.0707808Z",
                     "type": "IsUserDefined",
                     "actions": [
-                        "repositories/myrepository/push",
-                        "repositories/myrepository/pull"
+                        "repositories/myrepository/contentWrite",
+                        "repositories/myrepository/contentRead"
                     ],
                     "provisioningState": "Succeeded"
                 }

diff --git a/...-manager/Microsoft.ContainerRegistry/preview/2019-05-01-preview/examples/TokenCreate.json b/...-manager/Microsoft.ContainerRegistry/preview/2019-05-01-preview/examples/TokenCreate.json
@@ -7,7 +7,8 @@
         "tokenName": "myToken",
         "tokenCreateParameters": {
             "properties": {
-                "scopeMapId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/scopeMaps/myScopeMap"
+                "scopeMapId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/scopeMaps/myScopeMap",
+                "status": "disabled"
             }
         }
     },
@@ -20,7 +21,8 @@
                 "properties": {
                     "creationDate": "2017-03-01T23:14:37.0707808Z",
                     "scopeMapId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/scopeMaps/myScopeMap",
-                    "provisioningState": "Succeeded"
+                    "provisioningState": "Succeeded",
+                    "status": "disabled"
                 }
             }
         },
@@ -32,7 +34,8 @@
                 "properties": {
                     "creationDate": "2017-03-01T23:14:37.0707808Z",
                     "scopeMapId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/scopeMaps/myScopeMap",
-                    "provisioningState": "Succeeded"
+                    "provisioningState": "Succeeded",
+                    "status": "disabled"
                 }
             }
         }

diff --git a/...t.ContainerRegistry/preview/2019-05-01-preview/examples/TokenCreate_WithCertificates.json b/...t.ContainerRegistry/preview/2019-05-01-preview/examples/TokenCreate_WithCertificates.json
@@ -0,0 +1,68 @@
+{
+    "parameters": {
+        "api-version": "2019-05-01-preview",
+        "subscriptionId": "00000000-0000-0000-0000-000000000000",
+        "resourceGroupName": "myResourceGroup",
+        "registryName": "myRegistry",
+        "tokenName": "myToken",
+        "tokenCreateParameters": {
+            "properties": {
+                "scopeMapId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/scopeMaps/myScopeMap",
+                "credentials": {
+                    "certificates": [
+                        {
+                            "name": "certificate1",
+                            "encodedPEMCertificate": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUc3akNDQk5hZ0F3SUJBZ0lURmdBQlR3UVpyZGdmdmhxdzBnQUFBQUZQQkRBTkJna3Foa2lHOXcwQkFRc0YKQURDQml6RUxNQWtHQTFVRUJoTUNWVk14RXpBUkJnTlZCQWdUQ2xkaGMyaHBibWQwYjI0eEVEQU9CZ05WQkFjVApCMUpsWkcxdmJtUXhIakFjQmdOVkJBb1RGVTFwWTNKdmMyOW1kQ0JEYjNKd2IzSmhkR2x2YmpFVk1CTUdBMVVFCkN4TU1UV2xqY205emIyWjBJRWxVTVI0d0hBWURWUVFERXhWTmFXTnliM052Wm5RZ1NWUWdWRXhUSUVOQklEUXcKSGhjTk1UZ3dOREV5TWpJek1qUTRXaGNOTWpBd05ERXlNakl6TWpRNFdqQTVNVGN3TlFZRFZRUURFeTV6WlhKMgphV05sWTJ4cFpXNTBZMlZ5ZEMxd1lYSjBibVZ5TG0xaGJtRm5aVzFsYm5RdVlYcDFjbVV1WTI5dE1JSUJJakFOCkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQTBSYjdJcHpxMmR4emhhbVpyS1ZDakMzeTQyYlYKUnNIY2pCUTFuSDBHZ1puUDhXeDZDSE1mWThybkVJQzRLeVRRYkJXVzhnNXlmc3NSQ0ZXbFpxYjR6SkRXS0pmTgpGSmNMUm9LNnhwTktZYVZVTkVlT25IdUxHYTM0ZlA0VjBFRjZybzdvbkRLME5zanhjY1dZVzRNVXVzc0xrQS94CkUrM2RwU1REdk1KcjJoWUpsVnFDcVR6blQvbmZaVUZzQUVEQnp5MUpOOHZiZDlIR2czc2Myd0x4dk95cFJOc0gKT1V3V2pmN2xzWWZleEVlcWkzY29EeHc2alpLVWEyVkdsUnBpTkowMjhBQitYSi9TU1FVNVBsd0JBbU9TT3ovRApGY0NKdGpPZlBqU1NKckFIQVV3SHU3RzlSV05JTFBwYU9zQ1J5eitETE5zNGpvNlEvUUg4d1lManJRSURBUUFCCm80SUNtakNDQXBZd0N3WURWUjBQQkFRREFnU3dNQjBHQTFVZEpRUVdNQlFHQ0NzR0FRVUZCd01DQmdnckJnRUYKQlFjREFUQWRCZ05WSFE0RUZnUVVlbEdkVVJrZzJoSFFOWEQ4WUc4L3drdjJVT0F3SHdZRFZSMGpCQmd3Rm9BVQplbnVNd2Mvbm9Nb2MxR3Y2KytFend3OGFvcDB3Z2F3R0ExVWRId1NCcERDQm9UQ0JucUNCbTZDQm1JWkxhSFIwCmNEb3ZMMjF6WTNKc0xtMXBZM0p2YzI5bWRDNWpiMjB2Y0d0cEwyMXpZMjl5Y0M5amNtd3ZUV2xqY205emIyWjAKSlRJd1NWUWxNakJVVEZNbE1qQkRRU1V5TURRdVkzSnNoa2xvZEhSd09pOHZZM0pzTG0xcFkzSnZjMjltZEM1agpiMjB2Y0d0cEwyMXpZMjl5Y0M5amNtd3ZUV2xqY205emIyWjBKVEl3U1ZRbE1qQlVURk1sTWpCRFFTVXlNRFF1ClkzSnNNSUdGQmdnckJnRUZCUWNCQVFSNU1IY3dVUVlJS3dZQkJRVUhNQUtHUldoMGRIQTZMeTkzZDNjdWJXbGoKY205emIyWjBMbU52YlM5d2Eya3ZiWE5qYjNKd0wwMXBZM0p2YzI5bWRDVXlNRWxVSlRJd1ZFeFRKVEl3UTBFbApNakEwTG1OeWREQWlCZ2dyQmdFRkJRY3dBWVlXYUhSMGNEb3ZMMjlqYzNBdWJYTnZZM053TG1OdmJUQStCZ2tyCkJnRUVBWUkzRlFjRU1UQXZCaWNyQmdFRUFZSTNGUWlIMm9aMWcrN1pBWUxKaFJ1QnRaNWhoZlRyWUlGZGhOTGYKUW9Mbmszb0NBV1FDQVIwd1RRWURWUjBnQkVZd1JEQkNCZ2tyQmdFRUFZSTNLZ0V3TlRBekJnZ3JCZ0VGQlFjQwpBUlluYUhSMGNEb3ZMM2QzZHk1dGFXTnliM052Wm5RdVkyOXRMM0JyYVM5dGMyTnZjbkF2WTNCek1DY0dDU3NHCkFRUUJnamNWQ2dRYU1CZ3dDZ1lJS3dZQkJRVUhBd0l3Q2dZSUt3WUJCUVVIQXdFd09RWURWUjBSQkRJd01JSXUKYzJWeWRtbGpaV05zYVdWdWRHTmxjblF0Y0dGeWRHNWxjaTV0WVc1aFoyVnRaVzUwTG1GNmRYSmxMbU52YlRBTgpCZ2txaGtpRzl3MEJBUXNGQUFPQ0FnRUFIVXIzbk1vdUI5WWdDUlRWYndUTllIS2RkWGJkSW1GUXNDYys4T1g1CjE5c0N6dFFSR05iSXEwVW1Ba01MbFVvWTIxckh4ZXdxU2hWczFhL2RwaFh5Tk1pcUdaU2QzU1BtYzZscitqUFQKNXVEREs0MUlWeXN0K2VUNlpyazFvcCtMVmdkeS9EU2lyNzVqcWZFY016bS82bU8rNnFNeWRLTWtVYmM5K3JHVwphUkpUcjRWUUdIRmEwNEIwZVZpNUd4MG9pL2RpZDNSaXg2aXJMMjFJSGEwYjN6c1hzZHpHU0R2K3hqL2Q2S0l4Ckdrd2FhYmZvU1NoQnFqaFNlQ0VyZXFlb1RpYjljdGw0MGRVdUp3THl4bjhHS2N6K3AvMEJUOEIxU3lYK01OQ2wKY0pkMjVtMjhLajY2TGUxOEVyeFlJYXZJVGVGa3Y2eGZjdkEvcHladDdPaU41QTlGQk1IUmpQK1kyZ2tvdjMrcQpISFRUZG4xNnlRajduNit3YlFHNGVleXc0YisyQkRLcUxNVFU2ZmlSQ3ZPM2FPZVBLSFVNN3R4b1FidWl6Z3NzCkNiMzl3QnJOTEZsMkJLQ1RkSCtkSU9oZVJiSkZvbmlwOGRPOUVFZWdSSG9lQW54ZUlYTFBrdXMzTzEvZjRhNkIKWHQ3RG5BUm8xSzJmeEp3VXRaU2MvR3dFSjU5NzlnRXlEa3pDZEVsLzdpWE9QZXVjTXhlM2xVM2pweUtsNERUaApjSkJqQytqNGpLWTFrK1U4b040aGdqYnJISUx6Vnd2eU15OU5KS290U3BMSjQxeHdPOHlGangxalFTT3Bxc0N1ClFhUFUvTjhSZ0hxWjBGTkFzS3dNUmZ6WmdXanRCNzRzYUVEdk5jVmNuNFhCQnFNSG0ydHo2Uzk3d3kxZGt0cTgKSE5BPQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg=="
+                        }
+                    ]
+                }
+            }
+        }
+    },
+    "responses": {
+        "200": {
+            "body": {
+                "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/tokens/myToken",
+                "name": "myToken",
+                "type": "Microsoft.ContainerRegistry/registries/tokens",
+                "properties": {
+                    "creationDate": "2017-03-01T23:14:37.0707808Z",
+                    "scopeMapId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/scopeMaps/myScopeMap",
+                    "provisioningState": "Succeeded",
+                    "status": "enabled",
+                    "credentials": {
+                        "certificates": [
+                            {
+                                "name": "certificate1",
+                                "thumbprint":"feeb79a888bf1415f8e17c4965a2a5bb5c8a2ff7",
+                                "expiry":"2020-12-04T15:32:48.0707808Z"
+                            }
+                        ]
+                    }
+                }
+            }
+        },
+        "201": {
+            "body": {
+                "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/tokens/myToken",
+                "name": "myToken",
+                "type": "Microsoft.ContainerRegistry/registries/tokens",
+                "properties": {
+                    "creationDate": "2017-03-01T23:14:37.0707808Z",
+                    "scopeMapId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/scopeMaps/myScopeMap",
+                    "provisioningState": "Succeeded",
+                    "status": "enabled",
+                    "credentials": {
+                        "certificates": [
+                            {
+                                "name": "certificate1",
+                                "thumbprint":"feeb79a888bf1415f8e17c4965a2a5bb5c8a2ff7",
+                                "expiry":"2020-12-04T15:32:48.0707808Z"
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/...rce-manager/Microsoft.ContainerRegistry/preview/2019-05-01-preview/examples/TokenGet.json b/...rce-manager/Microsoft.ContainerRegistry/preview/2019-05-01-preview/examples/TokenGet.json
@@ -15,7 +15,8 @@
                 "properties": {
                     "creationDate": "2017-03-01T23:14:37.0707808Z",
                     "scopeMapId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/scopeMaps/myScopeMap",
-                    "provisioningState": "Succeeded"
+                    "provisioningState": "Succeeded",
+                    "status": "enabled"
                 }
             }
         }

diff --git a/...ce-manager/Microsoft.ContainerRegistry/preview/2019-05-01-preview/examples/TokenList.json b/...ce-manager/Microsoft.ContainerRegistry/preview/2019-05-01-preview/examples/TokenList.json
@@ -16,7 +16,8 @@
                         "properties": {
                             "creationDate": "2017-03-01T23:14:37.0707808Z",
                             "scopeMapId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/scopeMaps/myScopeMap",
-                            "provisioningState": "Succeeded"
+                            "provisioningState": "Succeeded",
+                            "status": "enabled"
                         }
                     }
                 ]

diff --git a/...-manager/Microsoft.ContainerRegistry/preview/2019-05-01-preview/examples/TokenUpdate.json b/...-manager/Microsoft.ContainerRegistry/preview/2019-05-01-preview/examples/TokenUpdate.json
@@ -20,7 +20,8 @@
                 "properties": {
                     "creationDate": "2017-03-01T23:14:37.0707808Z",
                     "scopeMapId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/scopeMaps/myNewScopeMap",
-                    "provisioningState": "Succeeded"
+                    "provisioningState": "Succeeded",
+                    "status": "enabled"
                 }
             }
         },
@@ -32,7 +33,8 @@
                 "properties": {
                     "creationDate": "2017-03-01T23:14:37.0707808Z",
                     "scopeMapId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/scopeMaps/myNewScopeMap",
-                    "provisioningState": "Succeeded"
+                    "provisioningState": "Succeeded",
+                    "status": "enabled"
                 }
             }
         }