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.

Sign up for GitHub

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

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
24ee878
Fixed post-removal condition
AlexanderSehr Sep 2, 2024
8a66056
Added default to required secret parameter
AlexanderSehr Sep 2, 2024
48d4d9c
Added more defaults
AlexanderSehr Sep 2, 2024
532d328
Moved defaults
AlexanderSehr Sep 2, 2024
bd248c9
Another test
AlexanderSehr Sep 2, 2024
3858a6f
Update to latest
AlexanderSehr Sep 2, 2024
bda873f
Changed AzurePSRule versino
AlexanderSehr Sep 2, 2024
4cbd9c2
Update to latest
AlexanderSehr Sep 2, 2024
ccc5bc0
Added defaults
AlexanderSehr Sep 3, 2024
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
2 changes: 1 addition & 1 deletion avm/res/compute/virtual-machine/tests/e2e/linux.max/main.test.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 //
Expand Down
2 changes: 1 addition & 1 deletion avm/res/compute/virtual-machine/tests/e2e/waf-aligned/main.test.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 //
Expand Down
2 changes: 1 addition & 1 deletion avm/res/compute/virtual-machine/tests/e2e/windows.max/main.test.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 //
Expand Down
2 changes: 1 addition & 1 deletion avm/res/databricks/workspace/tests/e2e/max/main.test.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 //
Expand Down
2 changes: 1 addition & 1 deletion avm/res/databricks/workspace/tests/e2e/waf-aligned/main.test.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 //
Expand Down
2 changes: 1 addition & 1 deletion avm/res/managed-services/registration-definition/tests/e2e/defaults/main.test.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 //
Expand Down
2 changes: 1 addition & 1 deletion avm/res/managed-services/registration-definition/tests/e2e/max/main.test.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 //
Expand Down
2 changes: 1 addition & 1 deletion avm/res/managed-services/registration-definition/tests/e2e/rg/main.test.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 //
Expand Down
2 changes: 1 addition & 1 deletion avm/res/managed-services/registration-definition/tests/e2e/waf-aligned/main.test.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 //
Expand Down
4 changes: 2 additions & 2 deletions avm/utilities/pipelines/e2eValidation/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function Invoke-ResourcePostRemoval {
[int] $PostRemovalRetryLimit = 3
)

$postRemovalRetryCount = 1
$removalRetryCount = 1
do {
try {
switch ($Type) {
Expand Down Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion avm/utilities/pipelines/staticValidation/psrule/ps-rule.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading