Skip to content

Commit 2853c11

Browse files
peombwapeombwa
committed
Apply rename directives to AADPIM and AccessReview
1 parent 718d7f6 commit 2853c11

File tree

5 files changed

+84
-52
lines changed

5 files changed

+84
-52
lines changed

‎src/Identity.AccessReview/Identity.AccessReview/Microsoft.Graph.Identity.AccessReview.psd1‎

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 6/30/2020
6+
# Generated on: 8/5/2020
77
#
88

99
@{
@@ -12,13 +12,13 @@
1212
RootModule = './Microsoft.Graph.Identity.AccessReview.psm1'
1313

1414
# Version number of this module.
15-
ModuleVersion = '0.5.1'
15+
ModuleVersion = '0.9.0'
1616

1717
# Supported PSEditions
1818
CompatiblePSEditions = 'Core', 'Desktop'
1919

2020
# ID used to uniquely identify this module
21-
GUID = 'efdd658a-6c79-4cdf-bef8-f645d6caed70'
21+
GUID = '31c09a82-6511-4b87-9e82-63e0c9f18257'
2222

2323
# Author of this module
2424
Author = 'Microsoft Corporation'
@@ -51,7 +51,7 @@ DotNetFrameworkVersion = '4.7.2'
5151
# ProcessorArchitecture = ''
5252

5353
# Modules that must be imported into the global environment prior to importing this module
54-
RequiredModules = @(@{ModuleName = 'Microsoft.Graph.Authentication'; ModuleVersion = '0.7.0'; })
54+
RequiredModules = @(@{ModuleName = 'Microsoft.Graph.Authentication'; ModuleVersion = '0.7.1'; })
5555

5656
# Assemblies that must be loaded prior to importing this module
5757
RequiredAssemblies = './bin/Microsoft.Graph.Identity.AccessReview.private.dll'
@@ -70,36 +70,23 @@ FormatsToProcess = './Microsoft.Graph.Identity.AccessReview.format.ps1xml'
7070

7171
# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
7272
FunctionsToExport = 'Add-MgAccessReviewDecision', 'Get-MgAccessReview',
73-
'Get-MgAccessReviewDecision',
74-
'Get-MgAccessReviewDecisionAccessReviewDecisionAccessReviewDecision',
75-
'Get-MgAccessReviewInstance', 'Get-MgAccessReviewMyDecision',
76-
'Get-MgAccessReviewReviewer',
77-
'Get-MgBusinessFlowTemplateBusinessFlowTemplateBusinessFlowTemplate',
78-
'Get-MgProgram', 'Get-MgProgramControl',
79-
'Get-MgProgramControlProgram',
80-
'Get-MgProgramControlTypeProgramControlTypeProgramControlType',
73+
'Get-MgAccessReviewDecision', 'Get-MgAccessReviewInstance',
74+
'Get-MgAccessReviewMyDecision', 'Get-MgAccessReviewReviewer',
75+
'Get-MgBusinessFlowTemplate', 'Get-MgProgram', 'Get-MgProgramControl',
76+
'Get-MgProgramControlProgram', 'Get-MgProgramControlType',
8177
'New-MgAccessReview', 'New-MgAccessReviewDecision',
82-
'New-MgAccessReviewDecisionAccessReviewDecisionAccessReviewDecision',
8378
'New-MgAccessReviewInstance', 'New-MgAccessReviewMyDecision',
84-
'New-MgAccessReviewReviewer',
85-
'New-MgBusinessFlowTemplateBusinessFlowTemplateBusinessFlowTemplate',
86-
'New-MgProgram', 'New-MgProgramControl',
87-
'New-MgProgramControlTypeProgramControlTypeProgramControlType',
88-
'Remove-MgAccessReview',
89-
'Remove-MgAccessReviewDecisionAccessReviewDecisionAccessReviewDecision',
90-
'Remove-MgBusinessFlowTemplateBusinessFlowTemplateBusinessFlowTemplate',
79+
'New-MgAccessReviewReviewer', 'New-MgBusinessFlowTemplate',
80+
'New-MgProgram', 'New-MgProgramControl', 'New-MgProgramControlType',
81+
'Remove-MgAccessReview', 'Remove-MgBusinessFlowTemplate',
9182
'Remove-MgProgram', 'Remove-MgProgramControl',
92-
'Remove-MgProgramControlTypeProgramControlTypeProgramControlType',
93-
'Reset-MgAccessReviewDecision', 'Send-MgAccessReviewReminder',
94-
'Stop-MgAccessReview', 'Update-MgAccessReview',
95-
'Update-MgAccessReviewDecision',
96-
'Update-MgAccessReviewDecisionAccessReviewDecisionAccessReviewDecision',
83+
'Remove-MgProgramControlType', 'Reset-MgAccessReviewDecision',
84+
'Send-MgAccessReviewReminder', 'Stop-MgAccessReview',
85+
'Update-MgAccessReview', 'Update-MgAccessReviewDecision',
9786
'Update-MgAccessReviewInstance', 'Update-MgAccessReviewMyDecision',
98-
'Update-MgAccessReviewReviewer',
99-
'Update-MgBusinessFlowTemplateBusinessFlowTemplateBusinessFlowTemplate',
87+
'Update-MgAccessReviewReviewer', 'Update-MgBusinessFlowTemplate',
10088
'Update-MgProgram', 'Update-MgProgramControl',
101-
'Update-MgProgramControlProgram',
102-
'Update-MgProgramControlTypeProgramControlTypeProgramControlType'
89+
'Update-MgProgramControlProgram', 'Update-MgProgramControlType'
10390

10491
# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
10592
CmdletsToExport = @()

‎src/Identity.AccessReview/Identity.AccessReview/readme.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,24 @@ title: $(service-name)
3232
subject-prefix: ''
3333

3434
```
35+
36+
### Directives
37+
38+
> see https://github.com/Azure/autorest/blob/master/docs/powershell/directives.md
39+
40+
``` yaml
41+
directive:
42+
# Rename cmdlets with duplicates in their name.
43+
- where:
44+
subject: ^(BusinessFlowTemplate)(\1)+
45+
set:
46+
subject: $1
47+
- where:
48+
subject: ^(ProgramControlType)(\1)+
49+
set:
50+
subject: $1
51+
```
52+
3553
### Versioning
3654
3755
``` yaml

‎src/Identity.AzureADPIM/Identity.AzureADPIM/Microsoft.Graph.Identity.AzureADPIM.psd1‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 6/30/2020
6+
# Generated on: 8/5/2020
77
#
88

99
@{
@@ -12,13 +12,13 @@
1212
RootModule = './Microsoft.Graph.Identity.AzureADPIM.psm1'
1313

1414
# Version number of this module.
15-
ModuleVersion = '0.5.1'
15+
ModuleVersion = '0.9.0'
1616

1717
# Supported PSEditions
1818
CompatiblePSEditions = 'Core', 'Desktop'
1919

2020
# ID used to uniquely identify this module
21-
GUID = 'abe3f8e7-b029-4853-b746-383c6d661a53'
21+
GUID = '33a4e2f0-2382-4a0d-bb31-8dba9b7b7c22'
2222

2323
# Author of this module
2424
Author = 'Microsoft Corporation'
@@ -51,7 +51,7 @@ DotNetFrameworkVersion = '4.7.2'
5151
# ProcessorArchitecture = ''
5252

5353
# Modules that must be imported into the global environment prior to importing this module
54-
RequiredModules = @(@{ModuleName = 'Microsoft.Graph.Authentication'; ModuleVersion = '0.7.0'; })
54+
RequiredModules = @(@{ModuleName = 'Microsoft.Graph.Authentication'; ModuleVersion = '0.7.1'; })
5555

5656
# Assemblies that must be loaded prior to importing this module
5757
RequiredAssemblies = './bin/Microsoft.Graph.Identity.AzureADPIM.private.dll'
@@ -71,35 +71,32 @@ FormatsToProcess = './Microsoft.Graph.Identity.AzureADPIM.format.ps1xml'
7171
# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
7272
FunctionsToExport = 'Get-MgPrivilegedApproval', 'Get-MgPrivilegedApprovalRequest',
7373
'Get-MgPrivilegedApprovalRoleInfo',
74-
'Get-MgPrivilegedOperationEventPrivilegedOperationEventPrivilegedOperationEvent',
75-
'Get-MgPrivilegedRole', 'Get-MgPrivilegedRoleAssignment',
76-
'Get-MgPrivilegedRoleAssignmentPrivilegedRoleAssignmentPrivilegedRoleAssignment',
77-
'Get-MgPrivilegedRoleAssignmentRequestPrivilegedRoleAssignmentRequestPrivilegedRoleAssignmentRequest',
74+
'Get-MgPrivilegedOperationEvent', 'Get-MgPrivilegedRole',
75+
'Get-MgPrivilegedRoleAssignment',
76+
'Get-MgPrivilegedRoleAssignmentRequest',
7877
'Get-MgPrivilegedRoleAssignmentRequestRoleInfo',
7978
'Get-MgPrivilegedRoleAssignmentRoleInfo',
8079
'Get-MgPrivilegedRoleSetting', 'Get-MgPrivilegedRoleSummary',
80+
'Get-MgRolePrivilegedRoleAssignment',
8181
'Invoke-MgMyPrivilegedApprovalRequest',
8282
'Invoke-MgMyPrivilegedRoleAssignment',
8383
'Invoke-MgMyPrivilegedRoleAssignmentRequest',
8484
'Invoke-MgSelfPrivilegedRoleActivate',
8585
'Invoke-MgSelfPrivilegedRoleDeactivate', 'New-MgPrivilegedApproval',
86-
'New-MgPrivilegedOperationEventPrivilegedOperationEventPrivilegedOperationEvent',
87-
'New-MgPrivilegedRole', 'New-MgPrivilegedRoleAssignmentEligible',
86+
'New-MgPrivilegedOperationEvent', 'New-MgPrivilegedRole',
87+
'New-MgPrivilegedRoleAssignment',
88+
'New-MgPrivilegedRoleAssignmentEligible',
8889
'New-MgPrivilegedRoleAssignmentPermanent',
89-
'New-MgPrivilegedRoleAssignmentPrivilegedRoleAssignmentPrivilegedRoleAssignment',
90-
'New-MgPrivilegedRoleAssignmentRequestPrivilegedRoleAssignmentRequestPrivilegedRoleAssignmentRequest',
91-
'Remove-MgPrivilegedApproval',
92-
'Remove-MgPrivilegedOperationEventPrivilegedOperationEventPrivilegedOperationEvent',
93-
'Remove-MgPrivilegedRole',
94-
'Remove-MgPrivilegedRoleAssignmentPrivilegedRoleAssignmentPrivilegedRoleAssignment',
95-
'Remove-MgPrivilegedRoleAssignmentRequestPrivilegedRoleAssignmentRequestPrivilegedRoleAssignmentRequest',
90+
'New-MgPrivilegedRoleAssignmentRequest',
91+
'Remove-MgPrivilegedApproval', 'Remove-MgPrivilegedOperationEvent',
92+
'Remove-MgPrivilegedRole', 'Remove-MgPrivilegedRoleAssignment',
93+
'Remove-MgPrivilegedRoleAssignmentRequest',
9694
'Stop-MgPrivilegedRoleAssignmentRequest',
9795
'Update-MgPrivilegedApproval',
9896
'Update-MgPrivilegedApprovalRoleInfo',
99-
'Update-MgPrivilegedOperationEventPrivilegedOperationEventPrivilegedOperationEvent',
100-
'Update-MgPrivilegedRole',
101-
'Update-MgPrivilegedRoleAssignmentPrivilegedRoleAssignmentPrivilegedRoleAssignment',
102-
'Update-MgPrivilegedRoleAssignmentRequestPrivilegedRoleAssignmentRequestPrivilegedRoleAssignmentRequest',
97+
'Update-MgPrivilegedOperationEvent', 'Update-MgPrivilegedRole',
98+
'Update-MgPrivilegedRoleAssignment',
99+
'Update-MgPrivilegedRoleAssignmentRequest',
103100
'Update-MgPrivilegedRoleAssignmentRequestRoleInfo',
104101
'Update-MgPrivilegedRoleAssignmentRoleInfo',
105102
'Update-MgPrivilegedRoleSetting', 'Update-MgPrivilegedRoleSummary'

‎src/Identity.AzureADPIM/Identity.AzureADPIM/readme.md‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,34 @@ title: $(service-name)
3232
subject-prefix: ''
3333

3434
```
35+
36+
### Directives
37+
38+
> see https://github.com/Azure/autorest/blob/master/docs/powershell/directives.md
39+
40+
``` yaml
41+
directive:
42+
# Rename cmdlets
43+
- where:
44+
verb: Get
45+
subject: ^(PrivilegedRoleAssignment)$
46+
set:
47+
subject: Role$1
48+
# Rename cmdlets with duplicates in their name.
49+
- where:
50+
subject: ^(PrivilegedRoleAssignment)(\1)+
51+
set:
52+
subject: $1
53+
- where:
54+
subject: ^(PrivilegedRoleAssignmentRequest)(\1)+
55+
set:
56+
subject: $1
57+
- where:
58+
subject: ^(PrivilegedOperationEvent)(\1)+
59+
set:
60+
subject: $1
61+
```
62+
3563
### Versioning
3664
3765
``` yaml

‎tools/GenerateModules.ps1‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@ if (-not (Test-Path $ModuleMappingConfigPath)) {
4848
}
4949
# Install module locally in order to specify it as a dependency for other modules down the generation pipeline.
5050
# https://stackoverflow.com/questions/46216038/how-do-i-define-requiredmodules-in-a-powershell-module-manifest-psd1.
51-
$ExistingAuthModule = Find-Module "Microsoft.Graph.Authentication"
52-
Install-Module $ExistingAuthModule.Name -Repository $RepositoryName -AllowPrerelease -Force
51+
$ExistingAuthModule = Find-Module "Microsoft.Graph.Authentication" -Repository $RepositoryName
52+
if (!(Get-Module -Name $ExistingAuthModule.Name -ListAvailable)) {
53+
Install-Module $ExistingAuthModule.Name -Repository $RepositoryName -AllowPrerelease -Force
54+
}
5355
$RequiredGraphModules += @{ ModuleName = $ExistingAuthModule.Name ; ModuleVersion = $ExistingAuthModule.Version }
5456
if ($UpdateAutoRest) {
5557
# Update AutoRest.

0 commit comments

Comments
 (0)