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

Jump to bottom

[SSPROD-47709] Fixed for VM Workload Scanning component #66

Merged
merged 2 commits into from
Oct 8, 2024
+11 −11
Merged

[SSPROD-47709] Fixed for VM Workload Scanning component #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e61d917
Fixed for VM Workload Scanning component
miguelpais Oct 7, 2024
a85f11a
Merge branch 'main' into ssprod-47709-fixes-for-vm-workload-scanning-…
miguelpais Oct 8, 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
18 changes: 9 additions & 9 deletions modules/vm-workload-scanning/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ resource "azurerm_role_assignment" "sysdig_vm_workload_scanning_func_app_config_
count = var.is_organizational ? 0 : 1

scope = data.azurerm_subscription.primary.id
role_definition_id = azurerm_role_definition.sysdig_vm_workload_scanning_func_app_config_role.role_definition_resource_id
role_definition_id = azurerm_role_definition.sysdig_vm_workload_scanning_func_app_config_role[0].role_definition_resource_id
principal_id = azuread_service_principal.sysdig_vm_workload_scanning_sp.object_id
}

Expand Down Expand Up @@ -125,13 +125,13 @@ resource "sysdig_secure_cloud_auth_account_component" "azure_workload_scanning_c
})

depends_on = [
sysdig_vm_workload_scanning_func_app_config_role_assignment,
sysdig_vm_workload_scanning_file_reader_role_assignment,
sysdig_vm_workload_scanning_blob_reader_role_assignment,
sysdig_vm_workload_scanning_acrpull_assignment,
sysdig_vm_workload_scanning_func_app_config_role_assignment_for_tenant,
sysdig_vm_workload_scanning_file_reader_role_assignment_for_tenant,
sysdig_vm_workload_scanning_blob_reader_role_assignment_for_tenant,
sysdig_vm_workload_scanning_acrpull_for_tenant
azurerm_role_assignment.sysdig_vm_workload_scanning_func_app_config_role_assignment,
azurerm_role_assignment.sysdig_vm_workload_scanning_file_reader_role_assignment,
azurerm_role_assignment.sysdig_vm_workload_scanning_blob_reader_role_assignment,
azurerm_role_assignment.sysdig_vm_workload_scanning_acrpull_assignment,
azurerm_role_assignment.sysdig_vm_workload_scanning_func_app_config_role_assignment_for_tenant,
azurerm_role_assignment.sysdig_vm_workload_scanning_file_reader_role_assignment_for_tenant,
azurerm_role_assignment.sysdig_vm_workload_scanning_blob_reader_role_assignment_for_tenant,
azurerm_role_assignment.sysdig_vm_workload_scanning_acrpull_for_tenant
]
}
2 changes: 1 addition & 1 deletion test/examples/modular_organization/workload-scanning-containers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#---------------------------------------------------------------------------------------------

module "vm-workload-scanning" {
source = "../../../modules/vm-workload-scanning"
source = "sysdiglabs/secure/azurerm//modules/vm-workload-scanning"
subscription_id = module.onboarding.subscription_id
sysdig_secure_account_id = module.onboarding.sysdig_secure_account_id
is_organizational = module.onboarding.is_organizational
Expand Down
2 changes: 1 addition & 1 deletion test/examples/modular_single_subscription/workload-scanning-containers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#---------------------------------------------------------------------------------------------

module "vm-workload-scanning" {
source = "../../../modules/vm-workload-scanning"
source = "sysdiglabs/secure/azurerm//modules/vm-workload-scanning"
subscription_id = module.onboarding.subscription_id
sysdig_secure_account_id = module.onboarding.sysdig_secure_account_id
is_organizational = module.onboarding.is_organizational
Expand Down