Revert swagger workarounds after service fix (#12853)

Azure · Jul 8, 2020 · f0c446a · f0c446a
1 parent 4395473
commit f0c446a
Show file tree

Hide file tree

Showing 15 changed files with 808 additions and 347 deletions.
diff --git a/...Vault.Administration/src/Generated/Models/RoleAssignmentCreateParameters.Serialization.cs b/...Vault.Administration/src/Generated/Models/RoleAssignmentCreateParameters.Serialization.cs
diff --git a/...e.Security.KeyVault.Administration/src/Generated/Models/RoleAssignmentCreateParameters.cs b/...e.Security.KeyVault.Administration/src/Generated/Models/RoleAssignmentCreateParameters.cs
diff --git a/...eyvault/Azure.Security.KeyVault.Administration/src/Generated/RoleAssignmentsRestClient.cs b/...eyvault/Azure.Security.KeyVault.Administration/src/Generated/RoleAssignmentsRestClient.cs
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Administration/src/KeyVaultAccessControlClient.cs b/sdk/keyvault/Azure.Security.KeyVault.Administration/src/KeyVaultAccessControlClient.cs
@@ -250,7 +250,7 @@ public virtual Response<RoleAssignment> CreateRoleAssignment(RoleAssignmentScope
             try
             {
                 var _name = name == default ? Guid.NewGuid().ToString() : name.ToString();
-                return _assignmentsRestClient.Create(VaultUri.AbsoluteUri, roleScope.ToString(), _name, properties, cancellationToken);
+                return _assignmentsRestClient.Create(VaultUri.AbsoluteUri, roleScope.ToString(), _name, new RoleAssignmentCreateParameters(properties), cancellationToken);
             }
             catch (Exception ex)
             {
@@ -275,7 +275,7 @@ public virtual async Task<Response<RoleAssignment>> CreateRoleAssignmentAsync(Ro
             try
             {
                 var _name = name == default ? Guid.NewGuid().ToString() : name.ToString();
-                return await _assignmentsRestClient.CreateAsync(VaultUri.AbsoluteUri, roleScope.ToString(), _name, properties, cancellationToken)
+                return await _assignmentsRestClient.CreateAsync(VaultUri.AbsoluteUri, roleScope.ToString(), _name, new RoleAssignmentCreateParameters(properties), cancellationToken)
                 .ConfigureAwait(false);
             }
             catch (Exception ex)

diff --git a/sdk/keyvault/Azure.Security.KeyVault.Administration/src/asdf.cs b/sdk/keyvault/Azure.Security.KeyVault.Administration/src/asdf.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+namespace Azure.Security.KeyVault.Administration.Models
+{
+    /// <inheritdoc />
+    internal partial class RoleAssignmentCreateParameters
+    { }
+}
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Administration/src/swagger/rbac.json b/sdk/keyvault/Azure.Security.KeyVault.Administration/src/swagger/rbac.json
@@ -153,7 +153,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/RoleAssignmentProperties"
+              "$ref": "#/definitions/RoleAssignmentCreateParameters"
             },
             "description": "Parameters for the role assignment."
           },
@@ -349,7 +349,6 @@
       "description": "Role assignment list operation result."
     },
     "RoleAssignmentProperties": {
-      "type":"object",
       "properties": {
         "roleDefinitionId": {
           "type": "string",
@@ -366,6 +365,18 @@
       ],
       "description": "Role assignment properties."
     },
+    "RoleAssignmentCreateParameters": {
+      "properties": {
+        "properties": {
+          "$ref": "#/definitions/RoleAssignmentProperties",
+          "description": "Role assignment properties."
+        }
+      },
+      "required": [
+        "properties"
+      ],
+      "description": "Role assignment create parameters."
+    },
     "RoleDefinitionFilter": {
       "properties": {
         "roleName": {

diff --git a/sdk/keyvault/Azure.Security.KeyVault.Administration/tests/AccessControlTestBase.cs b/sdk/keyvault/Azure.Security.KeyVault.Administration/tests/AccessControlTestBase.cs
@@ -39,12 +39,12 @@ internal KeyVaultAccessControlClient GetClient(TestRecording recording = null)
         [SetUp]
         public void ClearChallengeCacheforRecord()
         {
+            Client = GetClient();
+
             // in record mode we reset the challenge cache before each test so that the challenge call
             // is always made.  This allows tests to be replayed independently and in any order
             if (Mode == RecordedTestMode.Record || Mode == RecordedTestMode.Playback)
             {
-                Client = GetClient();
-
                 ChallengeBasedAuthenticationPolicy.AuthenticationChallenge.ClearCache();
             }
         }

diff --git a/...dministration/tests/SessionRecords/AccessControlClientLiveTests/CreateRoleAssignment.json b/...dministration/tests/SessionRecords/AccessControlClientLiveTests/CreateRoleAssignment.json