Skip to content

Commit

Permalink
Merge main and resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@tyler-mairose-sp
tyler-mairose-sp committed Apr 23, 2024
2 parents 8c47f4c + a32cb0d commit 9bc2cbd
Show file tree
Hide file tree
Showing 42 changed files with 5,872 additions and 219 deletions.
2 changes: 1 addition & 1 deletion PSSailpoint/Build.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ $Manifest = @{
CompanyName = 'SailPoint Technologies'
Description = 'PSSailpoint - the PowerShell module for IdentityNow'

ModuleVersion = '1.2.3'
ModuleVersion = '1.3.0'

RootModule = 'PSSailpoint.psm1'
Guid = '7A197170-97E8-4DCD-A171-271D4AEC2F36' # Has to be static, otherwise each new build will be considered different module
Expand Down
64 changes: 0 additions & 64 deletions PSSailpoint/Configuration.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,64 +256,6 @@ function Get-IDNAccessToken {
}
}


function Get-HomeConfig {

$Configuration = $Script:Configuration

if (Test-Path -Path "$HOME/.sailpoint/config.yaml" -PathType leaf) {

$ConfigObject = Get-Content -Path "$HOME/.sailpoint/config.yaml" -Raw | ConvertFrom-YAML

Write-Host $ConfigObject

if ($null -ne $ConfigObject.environments) {
$Environments = $ConfigObject.environments
$ActiveEnvironment = $ConfigObject.activeenvironment
if (![string]::IsNullOrEmpty($ActiveEnvironment)) {
if ($null -ne $Environments.Item($ActiveEnvironment).baseurl) {
$Configuration["BaseUrl"] = $Environments.Item($ActiveEnvironment).baseurl + "/"
$Configuration["TokenUrl"] = $Environments.Item($ActiveEnvironment).baseurl + "/oauth/token"
}
else {
Write-Host "No baseurl set for environment: $ActiveEnvironment" -ForegroundColor Red
}

if ($null -ne $Environments.Item($ActiveEnvironment).pat.clientid) {
$Configuration["ClientId"] = $Environments.Item($ActiveEnvironment).pat.clientid
}
else {
Write-Host "No clientid set for environment: $ActiveEnvironment" -ForegroundColor Red
}

if ($null -ne $Environments.Item($ActiveEnvironment).pat.clientsecret) {
$Configuration["ClientSecret"] = $Environments.Item($ActiveEnvironment).pat.clientsecret
}
else {
Write-Host "No clientsecret set for environment: $ActiveEnvironment" -ForegroundColor Red
}

if ($null -ne $Configuration["Environment"]) {
if ($Configuration["Environment"] -ne $ActiveEnvironment) {
Write-Debug "Environment has switched, resetting token."
$Configuration["Token"] = ""
}
}

$Configuration["Environment"] = $ActiveEnvironment
}
else {
Write-Host "No active environment is set" -ForegroundColor Red
}
}
else {
Write-Host "No environments specified in config file" -ForegroundColor Red
}
}

return $Configuration
}

function Get-EnvConfig {
$Configuration = $Script:Configuration

Expand Down Expand Up @@ -362,11 +304,5 @@ function Get-Config {
return $LocalConfig
}

$HomeConfiguration = Get-HomeConfig
if ($HomeConfiguration.clientId) {
Write-Host "Configuration file found in home directory, this approach of loading configuration will be deprecated in future releases, please upgrade the CLI and use the new 'sail sdk init config' command to create a local configuration file"
return $HomeConfiguration
}

return $Configuration
}
63 changes: 57 additions & 6 deletions PSSailpoint/PSSailpoint.psd1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Generated by: Sailpoint Developer Relations
#
# Generated on: 03/20/2024
# Generated on: 04/22/2024
#

@{
Expand All @@ -12,7 +12,11 @@
RootModule = 'PSSailpoint.psm1'

# Version number of this module.
<<<<<<< HEAD
ModuleVersion = '1.2.3'
=======
ModuleVersion = '1.3.0'
>>>>>>> main

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down Expand Up @@ -103,8 +107,16 @@ FunctionsToExport = 'New-AccessProfile', 'Remove-AccessProfile',
'Select-IdentityDecision', 'Invoke-ReassignIdentityCertifications',
'Invoke-SignOffIdentityCertification', 'Submit-ReassignCertsAsync',
'Get-IdentityAccessSummaries', 'Get-IdentityDecisionSummary',
<<<<<<< HEAD
'Get-IdentitySummaries', 'Get-IdentitySummary', 'New-CustomConnector',
'Remove-CustomConnector', 'Get-Connector',
=======
'Get-IdentitySummaries', 'Get-IdentitySummary', 'New-ObjectMapping',
'New-ObjectMappings', 'Remove-ObjectMapping', 'Remove-UploadedBackup',
'Get-ObjectMappings', 'Get-UploadedBackup', 'Get-UploadedBackups',
'Import-UploadedBackup', 'Update-ObjectMappings',
'New-CustomConnector', 'Remove-CustomConnector', 'Get-Connector',
>>>>>>> main
'Get-ConnectorCorrelationConfig', 'Get-ConnectorSourceConfig',
'Get-ConnectorSourceTemplate', 'Get-ConnectorTranslations',
'Send-CorrelationConfig', 'Send-SourceConfig', 'Send-SourceTemplate',
Expand Down Expand Up @@ -534,6 +546,8 @@ FunctionsToExport = 'New-AccessProfile', 'Remove-AccessProfile',
'Initialize-ImportNonEmployeeRecordsInBulkRequest',
'ConvertFrom-JsonToImportNonEmployeeRecordsInBulkRequest',
'Initialize-ImportObject', 'ConvertFrom-JsonToImportObject',
'Initialize-ImportUploadedBackupRequest',
'ConvertFrom-JsonToImportUploadedBackupRequest',
'Initialize-IndexOf', 'ConvertFrom-JsonToIndexOf',
'Initialize-InnerHit', 'ConvertFrom-JsonToInnerHit',
'Initialize-ISO3166', 'ConvertFrom-JsonToISO3166',
Expand Down Expand Up @@ -887,6 +901,8 @@ FunctionsToExport = 'New-AccessProfile', 'Remove-AccessProfile',
'Initialize-TypeAheadQuery', 'ConvertFrom-JsonToTypeAheadQuery',
'Initialize-TypedReference', 'ConvertFrom-JsonToTypedReference',
'Initialize-UpdateDetail', 'ConvertFrom-JsonToUpdateDetail',
'Initialize-UploadsRequest', 'ConvertFrom-JsonToUploadsRequest',
'Initialize-UploadsResponse', 'ConvertFrom-JsonToUploadsResponse',
'Initialize-Upper', 'ConvertFrom-JsonToUpper',
'Initialize-UUIDGenerator', 'ConvertFrom-JsonToUUIDGenerator',
'Initialize-V3ConnectorDto', 'ConvertFrom-JsonToV3ConnectorDto',
Expand Down Expand Up @@ -1061,6 +1077,7 @@ FunctionsToExport = 'New-AccessProfile', 'Remove-AccessProfile',
'Update-BetaLifecycleStates', 'Get-BetaManagedClientStatus',
'Update-BetaManagedClientStatus', 'Get-BetaClientLogConfiguration',
'Get-BetaManagedCluster', 'Get-BetaManagedClusters',
<<<<<<< HEAD
'Send-BetaClientLogConfiguration', 'Remove-BetaMFAConfig',
'Get-BetaMFADuoConfig', 'Get-BetaMFAOktaConfig',
'Set-BetaMFADuoConfig', 'Set-BetaMFAOktaConfig', 'Test-BetaMFAConfig',
Expand All @@ -1069,6 +1086,20 @@ FunctionsToExport = 'New-AccessProfile', 'Remove-AccessProfile',
'Send-BetaOktaVerifyRequest', 'Send-BetaTokenAuthRequest',
'Approve-BetaNonEmployeeRequest', 'New-BetaNonEmployeeRecord',
'New-BetaNonEmployeeRequest', 'New-BetaNonEmployeeSource',
=======
'Send-BetaClientLogConfiguration',
'Send-BetaManualDiscoverApplicationsCsvTemplate',
'Get-BetaManualDiscoverApplicationsCsvTemplate',
'Remove-BetaMFAConfig', 'Get-BetaMFADuoConfig',
'Get-BetaMFAKbaConfig', 'Get-BetaMFAOktaConfig',
'Set-BetaMFADuoConfig', 'Set-BetaMFAKBAConfig',
'Set-BetaMFAOktaConfig', 'Test-BetaMFAConfig', 'New-BetaSendToken',
'Ping-BetaVerificationStatus', 'Send-BetaDuoVerifyRequest',
'Send-BetaKbaAnswers', 'Send-BetaOktaVerifyRequest',
'Send-BetaTokenAuthRequest', 'Approve-BetaNonEmployeeRequest',
'New-BetaNonEmployeeRecord', 'New-BetaNonEmployeeRequest',
'New-BetaNonEmployeeSource',
>>>>>>> main
'New-BetaNonEmployeeSourceSchemaAttributes',
'Remove-BetaNonEmployeeRecord',
'Remove-BetaNonEmployeeRecordInBulk',
Expand Down Expand Up @@ -1140,11 +1171,16 @@ FunctionsToExport = 'New-AccessProfile', 'Remove-AccessProfile',
'Get-BetaDefaultViolationReport', 'Get-BetaSodAllReportRunStatus',
'Get-BetaSodPolicy', 'Get-BetaSodPolicySchedule',
'Get-BetaSodViolationReportRunStatus',
<<<<<<< HEAD
'Get-BetaSodViolationReportStatus', 'Get-BetaSodPolicies',
'Update-BetaSodPolicy', 'Send-BetaPolicySchedule',
'Send-BetaSodPolicy', 'Start-BetaSodAllPoliciesForOrg',
'Start-BetaSodPolicy', 'Start-BetaPredictSodViolations',
'New-BetaProvisioningPolicy', 'New-BetaSource',
=======
'Start-BetaSodAllPoliciesForOrg', 'Start-BetaPredictSodViolations',
'Import-BetaAccounts', 'New-BetaProvisioningPolicy', 'New-BetaSource',
>>>>>>> main
'New-BetaSourceSchema', 'Remove-Beta',
'Remove-BetaNativeChangeDetectionConfig',
'Remove-BetaProvisioningPolicy', 'Remove-BetaSourceSchema',
Expand Down Expand Up @@ -1857,8 +1893,15 @@ FunctionsToExport = 'New-AccessProfile', 'Remove-AccessProfile',
'ConvertFrom-BetaJsonToIdentityWithNewAccess',
'Initialize-BetaIdentityWithNewAccessAccessRefsInner',
'ConvertFrom-BetaJsonToIdentityWithNewAccessAccessRefsInner',
<<<<<<< HEAD
'Initialize-BetaImportEntitlementCsvRequest',
'ConvertFrom-BetaJsonToImportEntitlementCsvRequest',
=======
'Initialize-BetaImportAccountsRequest',
'ConvertFrom-BetaJsonToImportAccountsRequest',
'Initialize-BetaImportEntitlementsRequest',
'ConvertFrom-BetaJsonToImportEntitlementsRequest',
>>>>>>> main
'Initialize-BetaImportFormDefinitions202Response',
'ConvertFrom-BetaJsonToImportFormDefinitions202Response',
'Initialize-BetaImportFormDefinitions202ResponseErrorsInner',
Expand All @@ -1879,14 +1922,15 @@ FunctionsToExport = 'New-AccessProfile', 'Remove-AccessProfile',
'Initialize-BetaJsonPatchOperation',
'ConvertFrom-BetaJsonToJsonPatchOperation',
'ConvertFrom-BetaJsonToJsonPatchOperationValue',
'Initialize-BetaKbaAnswerRequest',
'ConvertFrom-BetaJsonToKbaAnswerRequest',
'Initialize-BetaKbaAnswerRequestItem',
'ConvertFrom-BetaJsonToKbaAnswerRequestItem',
'Initialize-BetaKbaAnswerResponseItem',
'ConvertFrom-BetaJsonToKbaAnswerResponseItem',
'Initialize-BetaKbaAuthResponse',
'ConvertFrom-BetaJsonToKbaAuthResponse',
'Initialize-BetaKbaAuthResponseItem',
'ConvertFrom-BetaJsonToKbaAuthResponseItem',
'Initialize-BetaKbaQuestion', 'ConvertFrom-BetaJsonToKbaQuestion',
'Initialize-BetaLatestOutlierSummary',
'ConvertFrom-BetaJsonToLatestOutlierSummary',
'Initialize-BetaLeftPad', 'ConvertFrom-BetaJsonToLeftPad',
Expand All @@ -1911,6 +1955,14 @@ FunctionsToExport = 'New-AccessProfile', 'Remove-AccessProfile',
'ConvertFrom-BetaJsonToListPredefinedSelectOptionsResponse',
'Initialize-BetaListWorkgroupMembers200ResponseInner',
'ConvertFrom-BetaJsonToListWorkgroupMembers200ResponseInner',
'Initialize-BetaLoadAccountsTask',
'ConvertFrom-BetaJsonToLoadAccountsTask',
'Initialize-BetaLoadAccountsTaskTask',
'ConvertFrom-BetaJsonToLoadAccountsTaskTask',
'Initialize-BetaLoadAccountsTaskTaskAttributes',
'ConvertFrom-BetaJsonToLoadAccountsTaskTaskAttributes',
'Initialize-BetaLoadAccountsTaskTaskMessagesInner',
'ConvertFrom-BetaJsonToLoadAccountsTaskTaskMessagesInner',
'Initialize-BetaLoadEntitlementTask',
'ConvertFrom-BetaJsonToLoadEntitlementTask',
'Initialize-BetaLocalizedMessage',
Expand Down Expand Up @@ -2570,9 +2622,8 @@ FunctionsToExport = 'New-AccessProfile', 'Remove-AccessProfile',
'Get-BetaUrlFromHostSetting', 'Set-BetaConfigurationHttpSigning',
'Get-BetaConfigurationHttpSigning', 'Get-FunctionsToExport',
'Get-DefaultConfiguration', 'Set-DefaultConfiguration',
'Get-IDNAccessToken', 'Get-HomeConfig', 'Get-EnvConfig',
'Get-LocalConfig', 'Get-Config', 'Invoke-Paginate',
'Invoke-PaginateSearch'
'Get-IDNAccessToken', 'Get-EnvConfig', 'Get-LocalConfig', 'Get-Config',
'Invoke-Paginate', 'Invoke-PaginateSearch'

# 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.
CmdletsToExport = @()
Expand Down
2 changes: 0 additions & 2 deletions PSSailpoint/PSSailpoint.psm1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,4 @@ Foreach ($import in @($V3API + $V3Client + $V3Model + $V3Private + $BetaAPI + $B
. $PSScriptRoot\Configuration.ps1
. $PSScriptRoot\Pagination.ps1

Install-Module -Name PSYaml -RequiredVersion 1.0.2

#endregion
Loading

0 comments on commit 9bc2cbd

Please sign in to comment.