Skip to content

Commit 0257f67

Browse files
authored
Revert swagger workarounds after service fix (Azure#12853)
1 parent abed52c commit 0257f67

15 files changed

+808
-347
lines changed

sdk/keyvault/Azure.Security.KeyVault.Administration/src/Generated/Models/RoleAssignmentCreateParameters.Serialization.cs

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/keyvault/Azure.Security.KeyVault.Administration/src/Generated/Models/RoleAssignmentCreateParameters.cs

Lines changed: 30 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/keyvault/Azure.Security.KeyVault.Administration/src/Generated/RoleAssignmentsRestClient.cs

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/keyvault/Azure.Security.KeyVault.Administration/src/KeyVaultAccessControlClient.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ public virtual Response<RoleAssignment> CreateRoleAssignment(RoleAssignmentScope
250250
try
251251
{
252252
var _name = name == default ? Guid.NewGuid().ToString() : name.ToString();
253-
return _assignmentsRestClient.Create(VaultUri.AbsoluteUri, roleScope.ToString(), _name, properties, cancellationToken);
253+
return _assignmentsRestClient.Create(VaultUri.AbsoluteUri, roleScope.ToString(), _name, new RoleAssignmentCreateParameters(properties), cancellationToken);
254254
}
255255
catch (Exception ex)
256256
{
@@ -275,7 +275,7 @@ public virtual async Task<Response<RoleAssignment>> CreateRoleAssignmentAsync(Ro
275275
try
276276
{
277277
var _name = name == default ? Guid.NewGuid().ToString() : name.ToString();
278-
return await _assignmentsRestClient.CreateAsync(VaultUri.AbsoluteUri, roleScope.ToString(), _name, properties, cancellationToken)
278+
return await _assignmentsRestClient.CreateAsync(VaultUri.AbsoluteUri, roleScope.ToString(), _name, new RoleAssignmentCreateParameters(properties), cancellationToken)
279279
.ConfigureAwait(false);
280280
}
281281
catch (Exception ex)
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License.
3+
4+
namespace Azure.Security.KeyVault.Administration.Models
5+
{
6+
/// <inheritdoc />
7+
internal partial class RoleAssignmentCreateParameters
8+
{ }
9+
}

sdk/keyvault/Azure.Security.KeyVault.Administration/src/swagger/rbac.json

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
"in": "body",
154154
"required": true,
155155
"schema": {
156-
"$ref": "#/definitions/RoleAssignmentProperties"
156+
"$ref": "#/definitions/RoleAssignmentCreateParameters"
157157
},
158158
"description": "Parameters for the role assignment."
159159
},
@@ -349,7 +349,6 @@
349349
"description": "Role assignment list operation result."
350350
},
351351
"RoleAssignmentProperties": {
352-
"type":"object",
353352
"properties": {
354353
"roleDefinitionId": {
355354
"type": "string",
@@ -366,6 +365,18 @@
366365
],
367366
"description": "Role assignment properties."
368367
},
368+
"RoleAssignmentCreateParameters": {
369+
"properties": {
370+
"properties": {
371+
"$ref": "#/definitions/RoleAssignmentProperties",
372+
"description": "Role assignment properties."
373+
}
374+
},
375+
"required": [
376+
"properties"
377+
],
378+
"description": "Role assignment create parameters."
379+
},
369380
"RoleDefinitionFilter": {
370381
"properties": {
371382
"roleName": {

sdk/keyvault/Azure.Security.KeyVault.Administration/tests/AccessControlTestBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ internal KeyVaultAccessControlClient GetClient(TestRecording recording = null)
3939
[SetUp]
4040
public void ClearChallengeCacheforRecord()
4141
{
42+
Client = GetClient();
43+
4244
// in record mode we reset the challenge cache before each test so that the challenge call
4345
// is always made. This allows tests to be replayed independently and in any order
4446
if (Mode == RecordedTestMode.Record || Mode == RecordedTestMode.Playback)
4547
{
46-
Client = GetClient();
47-
4848
ChallengeBasedAuthenticationPolicy.AuthenticationChallenge.ClearCache();
4949
}
5050
}

sdk/keyvault/Azure.Security.KeyVault.Administration/tests/SessionRecords/AccessControlClientLiveTests/CreateRoleAssignment.json

Lines changed: 91 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)