Skip to content

Commit 0e4394d

Browse files
committed
Fixed the build error
1 parent 817bb03 commit 0e4394d

16 files changed

+56
-56
lines changed

src/CosmosDB/CosmosDB/Cassandra/NewAzCosmosDBCassandraRoleDefinition.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,21 @@ public override void ExecuteCmdlet()
8484
AccountName = resourceIdentifier.ResourceName;
8585
}
8686

87-
List<PermissionAutoGenerated> permissions;
87+
List<PermissionAutoGenerated3> permissions;
8888
if (ParameterSetName.Equals(FieldsDataActionsParameterSet, StringComparison.Ordinal)
8989
|| ParameterSetName.Equals(ParentObjectDataActionsParameterSet, StringComparison.Ordinal))
9090
{
91-
permissions = new List<PermissionAutoGenerated>
91+
permissions = new List<PermissionAutoGenerated3>
9292
{
93-
new PermissionAutoGenerated
93+
new PermissionAutoGenerated3
9494
{
9595
DataActions = DataAction
9696
}
9797
};
9898
}
9999
else
100100
{
101-
permissions = new List<PermissionAutoGenerated>(Permission.Select(p => new PermissionAutoGenerated(dataActions: p.DataActions)));
101+
permissions = new List<PermissionAutoGenerated3>(Permission.Select(p => new PermissionAutoGenerated3(dataActions: p.DataActions)));
102102
}
103103

104104
Id = string.IsNullOrWhiteSpace(Id) ? Guid.NewGuid().ToString() : CassandraRoleHelper.ParseToRoleDefinitionId(Id);

src/CosmosDB/CosmosDB/Cassandra/UpdateAzCosmosDBCassandraRoleDefinition.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public class UpdateAzCosmosDBCassandraRoleDefinition : AzureCosmosDBCmdletBase
8181

8282
public override void ExecuteCmdlet()
8383
{
84-
List<PermissionAutoGenerated> permissions = null;
84+
List<PermissionAutoGenerated3> permissions = null;
8585
if (ParameterSetName.Equals(ParentObjectParameterSet, StringComparison.Ordinal))
8686
{
8787
ResourceIdentifier resourceIdentifier = new ResourceIdentifier(ParentObject.Id);
@@ -94,7 +94,7 @@ public override void ExecuteCmdlet()
9494
Type = InputObject.Type;
9595
AssignableScope = new List<String>(InputObject.AssignableScopes);
9696
Id = InputObject.Id;
97-
permissions = new List<PermissionAutoGenerated>(InputObject.Permissions);
97+
permissions = new List<PermissionAutoGenerated3>(InputObject.Permissions);
9898

9999
ResourceIdentifier resourceIdentifier = new ResourceIdentifier(InputObject.Id);
100100
ResourceGroupName = resourceIdentifier.ResourceGroupName;
@@ -108,17 +108,17 @@ public override void ExecuteCmdlet()
108108

109109
if (DataAction != null)
110110
{
111-
permissions = new List<PermissionAutoGenerated>
111+
permissions = new List<PermissionAutoGenerated3>
112112
{
113-
new PermissionAutoGenerated
113+
new PermissionAutoGenerated3
114114
{
115115
DataActions = DataAction
116116
}
117117
};
118118
}
119119
else if (Permission != null)
120120
{
121-
permissions = new List<PermissionAutoGenerated>(Permission.Select(p => new PermissionAutoGenerated(dataActions: p.DataActions)));
121+
permissions = new List<PermissionAutoGenerated3>(Permission.Select(p => new PermissionAutoGenerated3(dataActions: p.DataActions)));
122122
}
123123

124124
Id = CassandraRoleHelper.ParseToRoleDefinitionId(Id);

src/CosmosDB/CosmosDB/Gremlin/NewAzCosmosDBGremlinRoleDefinition.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,21 @@ public override void ExecuteCmdlet()
8484
AccountName = resourceIdentifier.ResourceName;
8585
}
8686

87-
List<PermissionAutoGenerated> permissions;
87+
List<PermissionAutoGenerated2> permissions;
8888
if (ParameterSetName.Equals(FieldsDataActionsParameterSet, StringComparison.Ordinal)
8989
|| ParameterSetName.Equals(ParentObjectDataActionsParameterSet, StringComparison.Ordinal))
9090
{
91-
permissions = new List<PermissionAutoGenerated>
91+
permissions = new List<PermissionAutoGenerated2>
9292
{
93-
new PermissionAutoGenerated
93+
new PermissionAutoGenerated2
9494
{
9595
DataActions = DataAction
9696
}
9797
};
9898
}
9999
else
100100
{
101-
permissions = new List<PermissionAutoGenerated>(Permission.Select(p => new PermissionAutoGenerated(dataActions: p.DataActions)));
101+
permissions = new List<PermissionAutoGenerated2>(Permission.Select(p => new PermissionAutoGenerated2(dataActions: p.DataActions)));
102102
}
103103

104104
Id = string.IsNullOrWhiteSpace(Id) ? Guid.NewGuid().ToString() : GremlinRoleHelper.ParseToRoleDefinitionId(Id);

src/CosmosDB/CosmosDB/Gremlin/UpdateAzCosmosDBGremlinRoleDefinition.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public class UpdateAzCosmosDBGremlinRoleDefinition : AzureCosmosDBCmdletBase
8181

8282
public override void ExecuteCmdlet()
8383
{
84-
List<PermissionAutoGenerated> permissions = null;
84+
List<PermissionAutoGenerated2> permissions = null;
8585
if (ParameterSetName.Equals(ParentObjectParameterSet, StringComparison.Ordinal))
8686
{
8787
ResourceIdentifier resourceIdentifier = new ResourceIdentifier(ParentObject.Id);
@@ -94,7 +94,7 @@ public override void ExecuteCmdlet()
9494
Type = InputObject.Type;
9595
AssignableScope = new List<String>(InputObject.AssignableScopes);
9696
Id = InputObject.Id;
97-
permissions = new List<PermissionAutoGenerated>(InputObject.Permissions);
97+
permissions = new List<PermissionAutoGenerated2>(InputObject.Permissions);
9898

9999
ResourceIdentifier resourceIdentifier = new ResourceIdentifier(InputObject.Id);
100100
ResourceGroupName = resourceIdentifier.ResourceGroupName;
@@ -108,17 +108,17 @@ public override void ExecuteCmdlet()
108108

109109
if (DataAction != null)
110110
{
111-
permissions = new List<PermissionAutoGenerated>
111+
permissions = new List<PermissionAutoGenerated2>
112112
{
113-
new PermissionAutoGenerated
113+
new PermissionAutoGenerated2
114114
{
115115
DataActions = DataAction
116116
}
117117
};
118118
}
119119
else if (Permission != null)
120120
{
121-
permissions = new List<PermissionAutoGenerated>(Permission.Select(p => new PermissionAutoGenerated(dataActions: p.DataActions)));
121+
permissions = new List<PermissionAutoGenerated2>(Permission.Select(p => new PermissionAutoGenerated2(dataActions: p.DataActions)));
122122
}
123123

124124
Id = GremlinRoleHelper.ParseToRoleDefinitionId(Id);

src/CosmosDB/CosmosDB/Helpers/CassandraRoleHelper.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121

2222
namespace Microsoft.Azure.Commands.CosmosDB.Helpers
2323
{
24-
public static class GremlinRoleHelper
24+
public static class CassandraRoleHelper
2525
{
26-
private static Regex roleDefinitionPrefix = new Regex("/subscriptions/(?<Subscription>.*)/resourceGroups/(?<ResourceGroup>.*)/providers/Microsoft.DocumentDB/databaseAccounts/(?<DatabaseAccount>.*)/gremlinRoleDefinitions/(?<RoleDefinitionId>.*)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
26+
private static Regex roleDefinitionPrefix = new Regex("/subscriptions/(?<Subscription>.*)/resourceGroups/(?<ResourceGroup>.*)/providers/Microsoft.DocumentDB/databaseAccounts/(?<DatabaseAccount>.*)/cassandraRoleDefinitions/(?<RoleDefinitionId>.*)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
2727

28-
private static Regex roleAssignmentPrefix = new Regex("/subscriptions/(?<Subscription>.*)/resourceGroups/(?<ResourceGroup>.*)/providers/Microsoft.DocumentDB/databaseAccounts/(?<DatabaseAccount>.*)/gremlinRoleAssignments/(?<RoleAssignmentId>.*)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
28+
private static Regex roleAssignmentPrefix = new Regex("/subscriptions/(?<Subscription>.*)/resourceGroups/(?<ResourceGroup>.*)/providers/Microsoft.DocumentDB/databaseAccounts/(?<DatabaseAccount>.*)/cassandraRoleAssignments/(?<RoleAssignmentId>.*)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
2929

3030
private static Regex scopePrefix = new Regex("/subscriptions/(?<Subscription>.*)/resourceGroups/(?<ResourceGroup>.*)/providers/Microsoft.DocumentDB/databaseAccounts/(?<DatabaseAccount>.*)/?(?<Scope>.*)?", RegexOptions.Compiled | RegexOptions.IgnoreCase);
3131

@@ -51,7 +51,7 @@ public static string ParseToFullyQualifiedRoleDefinitionId(string id, string sub
5151
}
5252
else
5353
{
54-
return $"/subscriptions/{subscription}/resourceGroups/{resourceGroup}/providers/Microsoft.DocumentDB/databaseAccounts/{databaseAccount}/gremlinRoleDefinitions/{id}";
54+
return $"/subscriptions/{subscription}/resourceGroups/{resourceGroup}/providers/Microsoft.DocumentDB/databaseAccounts/{databaseAccount}/cassandraRoleDefinitions/{id}";
5555
}
5656
}
5757

src/CosmosDB/CosmosDB/Models/Cassandra/PSCassandraRoleDefinitionGetResults.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public PSCassandraRoleDefinitionGetResults(CassandraRoleDefinitionResource cassa
3636
RoleName = cassandraRoleDefinitionGetResults.RoleName;
3737
Id = cassandraRoleDefinitionGetResults.Id;
3838
Type = cassandraRoleDefinitionGetResults.PropertiesType.ToString();
39-
Permissions = new List<PermissionAutoGenerated>(cassandraRoleDefinitionGetResults.Permissions.ToList());
39+
Permissions = new List<PermissionAutoGenerated3>(cassandraRoleDefinitionGetResults.Permissions.ToList());
4040
AssignableScopes = new List<string>(cassandraRoleDefinitionGetResults.AssignableScopes);
4141
}
4242

@@ -69,6 +69,6 @@ public PSCassandraRoleDefinitionGetResults(CassandraRoleDefinitionResource cassa
6969
/// </summary>
7070
[Ps1Xml(Label = "Permissions.DataActions", Target = ViewControl.List, ScriptBlock = "$_.Permissions.DataActions")]
7171
[Ps1Xml(Label = "Permissions.NotDataActions", Target = ViewControl.List, ScriptBlock = "$_.Permissions.NotDataActions")]
72-
public IList<PermissionAutoGenerated> Permissions { get; set; }
72+
public IList<PermissionAutoGenerated3> Permissions { get; set; }
7373
}
7474
}

src/CosmosDB/CosmosDB/Models/Gremlin/PSGremlinRoleDefinitionGetResults.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public PSGremlinRoleDefinitionGetResults(GremlinRoleDefinitionResource gremlinRo
3636
RoleName = gremlinRoleDefinitionGetResults.RoleName;
3737
Id = gremlinRoleDefinitionGetResults.Id;
3838
Type = gremlinRoleDefinitionGetResults.PropertiesType.ToString();
39-
Permissions = new List<PermissionAutoGenerated>(gremlinRoleDefinitionGetResults.Permissions.ToList());
39+
Permissions = new List<PermissionAutoGenerated2>(gremlinRoleDefinitionGetResults.Permissions.ToList());
4040
AssignableScopes = new List<string>(gremlinRoleDefinitionGetResults.AssignableScopes);
4141
}
4242

@@ -69,6 +69,6 @@ public PSGremlinRoleDefinitionGetResults(GremlinRoleDefinitionResource gremlinRo
6969
/// </summary>
7070
[Ps1Xml(Label = "Permissions.DataActions", Target = ViewControl.List, ScriptBlock = "$_.Permissions.DataActions")]
7171
[Ps1Xml(Label = "Permissions.NotDataActions", Target = ViewControl.List, ScriptBlock = "$_.Permissions.NotDataActions")]
72-
public IList<PermissionAutoGenerated> Permissions { get; set; }
72+
public IList<PermissionAutoGenerated2> Permissions { get; set; }
7373
}
7474
}

src/CosmosDB/CosmosDB/Models/MongoDB/PSMongoMIRoleDefinitionGetResults.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919

2020
namespace Microsoft.Azure.Commands.CosmosDB.Models
2121
{
22-
public class PSCassandraRoleDefinitionGetResults
22+
public class PSMongoMIRoleDefinitionGetResults
2323
{
2424

25-
public PSCassandraRoleDefinitionGetResults()
25+
public PSMongoMIRoleDefinitionGetResults()
2626
{
2727
}
2828

29-
public PSCassandraRoleDefinitionGetResults(CassandraRoleDefinitionResource cassandraRoleDefinitionGetResults)
29+
public PSMongoMIRoleDefinitionGetResults(MongoMIRoleDefinitionResource cassandraRoleDefinitionGetResults)
3030
{
3131
if (cassandraRoleDefinitionGetResults == null)
3232
{
@@ -36,7 +36,7 @@ public PSCassandraRoleDefinitionGetResults(CassandraRoleDefinitionResource cassa
3636
RoleName = cassandraRoleDefinitionGetResults.RoleName;
3737
Id = cassandraRoleDefinitionGetResults.Id;
3838
Type = cassandraRoleDefinitionGetResults.PropertiesType.ToString();
39-
Permissions = new List<PermissionAutoGenerated>(cassandraRoleDefinitionGetResults.Permissions.ToList());
39+
Permissions = new List<PermissionAutoGenerated4>(cassandraRoleDefinitionGetResults.Permissions.ToList());
4040
AssignableScopes = new List<string>(cassandraRoleDefinitionGetResults.AssignableScopes);
4141
}
4242

@@ -69,6 +69,6 @@ public PSCassandraRoleDefinitionGetResults(CassandraRoleDefinitionResource cassa
6969
/// </summary>
7070
[Ps1Xml(Label = "Permissions.DataActions", Target = ViewControl.List, ScriptBlock = "$_.Permissions.DataActions")]
7171
[Ps1Xml(Label = "Permissions.NotDataActions", Target = ViewControl.List, ScriptBlock = "$_.Permissions.NotDataActions")]
72-
public IList<PermissionAutoGenerated> Permissions { get; set; }
72+
public IList<PermissionAutoGenerated4> Permissions { get; set; }
7373
}
7474
}

src/CosmosDB/CosmosDB/MongoDB/GetAzCosmosDBMongoMIRoleAssignment.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ public override void ExecuteCmdlet()
5454

5555
if (!string.IsNullOrEmpty(Id))
5656
{
57-
MongoMIRoleAssignmentResource mongoMIRoleAssignmentGetResults = CosmosDBManagementClient.MongoMIResources.GetMongoMIRoleAssignmentWithHttpMessagesAsync(ResourceGroupName, AccountName, MongoMIRoleHelper.ParseToRoleAssignmentId(Id)).GetAwaiter().GetResult().Body;
57+
MongoMIRoleAssignmentResource mongoMIRoleAssignmentGetResults = CosmosDBManagementClient.MongoMiResources.GetMongoMIRoleAssignmentWithHttpMessagesAsync(ResourceGroupName, AccountName, MongoMIRoleHelper.ParseToRoleAssignmentId(Id)).GetAwaiter().GetResult().Body;
5858
WriteObject(new PSMongoMIRoleAssignmentGetResults(mongoMIRoleAssignmentGetResults));
5959
}
6060
else
6161
{
62-
IEnumerable<MongoMIRoleAssignmentResource> mongoMIRoleAssignments = CosmosDBManagementClient.MongoMIResources.ListMongoMIRoleAssignmentsWithHttpMessagesAsync(ResourceGroupName, AccountName).GetAwaiter().GetResult().Body;
62+
IEnumerable<MongoMIRoleAssignmentResource> mongoMIRoleAssignments = CosmosDBManagementClient.MongoMiResources.ListMongoMIRoleAssignmentsWithHttpMessagesAsync(ResourceGroupName, AccountName).GetAwaiter().GetResult().Body;
6363

6464
foreach (MongoMIRoleAssignmentResource mongoMIRoleAssignment in mongoMIRoleAssignments)
6565
{

src/CosmosDB/CosmosDB/MongoDB/GetAzCosmosDBMongoMIRoleDefinition.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ public override void ExecuteCmdlet()
5454

5555
if (!string.IsNullOrEmpty(Id))
5656
{
57-
MongoMIRoleDefinitionResource mongoMIRoleDefinitionGetResults = CosmosDBManagementClient.MongoMIResources.GetMongoMIRoleDefinitionWithHttpMessagesAsync(ResourceGroupName, AccountName, MongoMIRoleHelper.ParseToRoleDefinitionId(Id)).GetAwaiter().GetResult().Body;
57+
MongoMIRoleDefinitionResource mongoMIRoleDefinitionGetResults = CosmosDBManagementClient.MongoMiResources.GetMongoMIRoleDefinitionWithHttpMessagesAsync(ResourceGroupName, AccountName, MongoMIRoleHelper.ParseToRoleDefinitionId(Id)).GetAwaiter().GetResult().Body;
5858
WriteObject(new PSMongoMIRoleDefinitionGetResults(mongoMIRoleDefinitionGetResults));
5959
}
6060
else
6161
{
62-
IEnumerable<MongoMIRoleDefinitionResource> mongoMIRoleDefinitions = CosmosDBManagementClient.MongoMIResources.ListMongoMIRoleDefinitionsWithHttpMessagesAsync(ResourceGroupName, AccountName).GetAwaiter().GetResult().Body;
62+
IEnumerable<MongoMIRoleDefinitionResource> mongoMIRoleDefinitions = CosmosDBManagementClient.MongoMiResources.ListMongoMIRoleDefinitionsWithHttpMessagesAsync(ResourceGroupName, AccountName).GetAwaiter().GetResult().Body;
6363

6464
foreach (MongoMIRoleDefinitionResource mongoMIRoleDefinition in mongoMIRoleDefinitions)
6565
{

0 commit comments

Comments
 (0)