Thanks to visit codestin.com
Credit goes to github.com

Skip to content

JIT output #65

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

Merged
merged 5 commits into from
Feb 28, 2024
Merged

JIT output #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9a8a3d7
JIT output
sihbher Feb 16, 2024
b421010
JIT output
sihbher Feb 16, 2024
2ce8e7c
JIT Test 1
sihbher Feb 16, 2024
7090528
JIT Test 2
sihbher Feb 16, 2024
b6c38a3
Changes for SI and DG
sihbher Feb 27, 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
40 changes: 29 additions & 11 deletions terraform/bootstrap/data_guard/jit_rule.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ data "azurerm_virtual_machine" "oracle_primary_vm" {
name = module.vm_primary.vm[0].name
resource_group_name = module.common_infrastructure.resource_group.name

depends_on = [module.vm_primary
depends_on = [module.vm_primary,
module.storage_primary.data_disks_resource
, module.storage_primary.asm_disks_resource
, module.storage_primary.redo_disks_resource
]
}

Expand All @@ -16,6 +19,29 @@ data "azurerm_virtual_machine" "oracle_secondary_vm" {
resource_group_name = module.common_infrastructure.resource_group.name

depends_on = [module.vm_secondary
, module.storage_secondary.data_disks_resource
, module.storage_secondary.asm_disks_resource
, module.storage_secondary.redo_disks_resource
]
}

resource "time_sleep" "wait_for_primary_vm_creation" {
create_duration = "120s"

depends_on = [data.azurerm_virtual_machine.oracle_primary_vm,
module.storage_primary.data_disks_resource
, module.storage_primary.asm_disks_resource
, module.storage_primary.redo_disks_resource
]
}

resource "time_sleep" "wait_for_secondary_vm_creation" {
create_duration = "120s"

depends_on = [data.azurerm_virtual_machine.oracle_secondary_vm
, module.storage_secondary.data_disks_resource
, module.storage_secondary.asm_disks_resource
, module.storage_secondary.redo_disks_resource
]
}

Expand Down Expand Up @@ -43,11 +69,7 @@ resource "azapi_resource" "jit_ssh_policy_primary" {
}
})

depends_on = [data.azurerm_virtual_machine.oracle_primary_vm
, module.storage_primary.data_disks_resource
, module.storage_primary.asm_disks_resource
, module.storage_primary.redo_disks_resource
]
depends_on = [time_sleep.wait_for_primary_vm_creation]
}

resource "azapi_resource" "jit_ssh_policy_secondary" {
Expand All @@ -73,9 +95,5 @@ resource "azapi_resource" "jit_ssh_policy_secondary" {
}
})

depends_on = [data.azurerm_virtual_machine.oracle_secondary_vm
, module.storage_secondary.data_disks_resource
, module.storage_secondary.asm_disks_resource
, module.storage_secondary.redo_disks_resource
]
depends_on = [time_sleep.wait_for_secondary_vm_creation]
}
23 changes: 11 additions & 12 deletions terraform/bootstrap/single_instance/jit_rule.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,19 @@ data "azurerm_virtual_machine" "oracle_vm" {
]
}

# resource "time_sleep" "wait" {
# create_duration = "200s"
resource "time_sleep" "wait_for_vm_creation" {
create_duration = "120s"

# depends_on = [
# module.storage.data_disks_resource,
# module.storage.asm_disks_resource,
# module.storage.redo_disks_resource
# ]
# }
depends_on = [data.azurerm_virtual_machine.oracle_vm,
module.storage.data_disks_resource,
module.storage.asm_disks_resource,
module.storage.redo_disks_resource
]
}

resource "azapi_resource" "jit_ssh_policy" {
count = module.vm.database_server_count
provider = azapi
name = "JIT-SSH-Policy"
parent_id = "${module.common_infrastructure.resource_group.id}/providers/Microsoft.Security/locations/${module.common_infrastructure.resource_group.location}"
type = "Microsoft.Security/locations/jitNetworkAccessPolicies@2020-01-01"
Expand All @@ -44,9 +45,7 @@ resource "azapi_resource" "jit_ssh_policy" {
}
})

depends_on = [data.azurerm_virtual_machine.oracle_vm
, module.storage.data_disks_resource
, module.storage.asm_disks_resource
, module.storage.redo_disks_resource
depends_on = [
time_sleep.wait_for_vm_creation
]
}
8 changes: 8 additions & 0 deletions terraform/bootstrap/single_instance/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,11 @@ output "vm_public_ip_address" {
value = module.network.db_server_puplic_ip
}

###############################################################################
# J I T Rules #
###############################################################################

output "si_jit_ssh_policy" {
value = jsondecode(azapi_resource.jit_ssh_policy[0].output)
}

1 change: 0 additions & 1 deletion terraform/bootstrap/single_instance/providers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ terraform {
}
azapi = {
source = "Azure/azapi"
version = "=1.8.0"
}
}
}
Expand Down