Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Small fix for both the post-removal logic & secret-passthru with PSRule #3149

Merged
merged 9 commits into from
Sep 3, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ param namePrefix string = '#_namePrefix_#'

@description('Required. The object id of the Backup Management Service Enterprise Application. This value is tenant-specific and must be stored in the CI Key Vault in a secret named \'CI-BackupManagementServiceEnterpriseApplicationObjectId\'.')
@secure()
param backupManagementServiceEnterpriseApplicationObjectId string
param backupManagementServiceEnterpriseApplicationObjectId string = ''

// ============ //
// Dependencies //
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ param namePrefix string = '#_namePrefix_#'

@description('Required. The object id of the Backup Management Service Enterprise Application. This value is tenant-specific and must be stored in the CI Key Vault in a secret named \'CI-BackupManagementServiceEnterpriseApplicationObjectId\'.')
@secure()
param backupManagementServiceEnterpriseApplicationObjectId string
param backupManagementServiceEnterpriseApplicationObjectId string = ''

// ============ //
// Dependencies //
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ param namePrefix string = '#_namePrefix_#'

@description('Required. The object id of the Backup Management Service Enterprise Application. This value is tenant-specific and must be stored in the CI Key Vault in a secret named \'CI-BackupManagementServiceEnterpriseApplicationObjectId\'.')
@secure()
param backupManagementServiceEnterpriseApplicationObjectId string
param backupManagementServiceEnterpriseApplicationObjectId string = ''

// ============ //
// Dependencies //
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ param namePrefix string = '#_namePrefix_#'

@description('Required. The object id of the AzureDatabricks Enterprise Application. This value is tenant-specific and must be stored in the CI Key Vault in a secret named \'CI-AzureDatabricksEnterpriseApplicationObjectId\'.')
@secure()
param azureDatabricksEnterpriseApplicationObjectId string
param azureDatabricksEnterpriseApplicationObjectId string = ''

// ============ //
// Dependencies //
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ param namePrefix string = '#_namePrefix_#'

@description('Required. The object id of the AzureDatabricks Enterprise Application. This value is tenant-specific and must be stored in the CI Key Vault in a secret named \'CI-AzureDatabricksEnterpriseApplicationObjectId\'.')
@secure()
param azureDatabricksEnterpriseApplicationObjectId string
param azureDatabricksEnterpriseApplicationObjectId string = ''

// ============ //
// Dependencies //
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ param namePrefix string = '#_namePrefix_#'

@description('Required. The tenant Id of the lighthouse tenant. This value is tenant-specific and must be stored in the CI Key Vault in a secret named \'CI-LighthouseManagedByTenantId\'.')
@secure()
param lighthouseManagedByTenantId string
param lighthouseManagedByTenantId string = ''

// ============== //
// Test Execution //
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ param namePrefix string = '#_namePrefix_#'

@description('Required. The tenant Id of the lighthouse tenant. This value is tenant-specific and must be stored in the CI Key Vault in a secret named \'CI-LighthouseManagedByTenantId\'.')
@secure()
param lighthouseManagedByTenantId string
param lighthouseManagedByTenantId string = ''

// ============== //
// Test Execution //
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ param namePrefix string = '#_namePrefix_#'

@description('Required. The tenant Id of the lighthouse tenant. This value is tenant-specific and must be stored in the CI Key Vault in a secret named \'CI-LighthouseManagedByTenantId\'.')
@secure()
param lighthouseManagedByTenantId string
param lighthouseManagedByTenantId string = ''

// ============ //
// Dependencies //
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ param namePrefix string = '#_namePrefix_#'

@description('Required. The tenant Id of the lighthouse tenant. This value is tenant-specific and must be stored in the CI Key Vault in a secret named \'CI-LighthouseManagedByTenantId\'.')
@secure()
param lighthouseManagedByTenantId string
param lighthouseManagedByTenantId string = ''

// ============ //
// Dependencies //
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ function Invoke-ResourcePostRemoval {
[int] $PostRemovalRetryLimit = 3
)

$postRemovalRetryCount = 1
$removalRetryCount = 1
do {
try {
switch ($Type) {
@@ -191,5 +191,5 @@ function Invoke-ResourcePostRemoval {
Write-Warning ('[!] Post-removal operation failed. Reason: [{0}]. Retry [{1}/{2}]' -f $_.Exception.Message, $removalRetryCount, $PostRemovalRetryLimit)
$removalRetryCount++
}
} while ($postRemovalRetryCount -le $PostRemovalRetryLimit)
} while ($removalRetryCount -le $PostRemovalRetryLimit)
}
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ binding:
# Require minimum versions of modules.
requires:
PSRule: "@pre >=2.9.0"
PSRule.Rules.Azure: "@pre >=1.29.0"
PSRule.Rules.Azure: "@pre >=1.38.0"

# Use PSRule for Azure.
include: