Skip to content

Commit 8fe8993

Browse files
committed
Use locals in terraform
1 parent 90880a2 commit 8fe8993

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed

security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/buckets.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ data "oci_objectstorage_namespace" "bucket_namespace" {
1414

1515
resource "oci_objectstorage_bucket" "tracker-bucket" {
1616
compartment_id = var.compartment_ocid
17-
name = "${var.tracker-bucket}-${var.deployment_name}-${random_id.tag.hex}"
17+
name = local.tracker_bucket_name
1818
namespace = data.oci_objectstorage_namespace.bucket_namespace.namespace
1919

2020
}

security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/container_repository.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
resource "oci_artifacts_container_repository" "fn_container_repository" {
1515

1616
compartment_id = var.compartment_ocid
17-
display_name = "${var.ocir_repo_name}-${var.deployment_name}-${random_id.tag.hex}"
17+
display_name = local.oci_repo_displayname
1818
}

security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/functions.tf

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,28 @@
1111

1212
resource "oci_functions_application" "DataSafeAuditDBtoLoggingApp" {
1313
compartment_id = var.compartment_ocid
14-
display_name = "${var.FunctionAppNamePrefix}-${var.deployment_name}-${random_id.tag.hex}"
14+
display_name = local.functionapp_display_name
1515
subnet_ids = [var.create_network ? module.setup-network[0].subnet_ocid : var.subnet_ocid]
1616
}
1717

1818
resource "oci_functions_function" "postauditlogs" {
1919
depends_on = [null_resource.DataSafeAuditDBtoLoggingPush2OCIR]
2020
application_id = oci_functions_application.DataSafeAuditDBtoLoggingApp.id
21-
display_name = "${var.FunctionNamePrefix}-${var.deployment_name}"
21+
display_name = local.function_display_name
2222
#image = "${local.ocir_docker_repository}/${local.namespace}/${var.ocir_repo_name}/${var.FunctionNamePrefix}:0.0.1"
23-
image = "${local.ocir_docker_repository}/${local.namespace}/${oci_artifacts_container_repository.fn_container_repository.display_name}/${var.FunctionNamePrefix}:0.0.1"
23+
image = "${local.ocir_docker_repository}/${local.namespace}/${oci_artifacts_container_repository.fn_container_repository.display_name}/${local.function_display_name}:0.0.1"
2424
memory_in_mbs = var.FunctionMemory
2525
timeout_in_seconds = var.FunctionTimeoutSec
2626
config = {
27-
"ociDataSafeCompartmentOCID" : "${var.tenancy_ocid}"
28-
"ociOSTrackerBucketName" : "${oci_objectstorage_bucket.tracker-bucket.name}",
29-
"ociLoggingLogOCID" : "${oci_logging_log.log_datadafe_auditdb.id}"
27+
"ociDataSafeCompartmentOCID" : var.tenancy_ocid
28+
"ociOSTrackerBucketName" : local.tracker_bucket_name
29+
"ociLoggingLogOCID" : oci_logging_log.log_datadafe_auditdb.id
3030
}
3131

3232
}
3333

3434
resource "oci_logging_log" "log_on_fn_invoke" {
35-
display_name = "${var.FunctionInvokeOCILoggingName}-${var.deployment_name}-${random_id.tag.hex}"
35+
display_name = local.function_invoke_oci_logging_displayname
3636
log_group_id = oci_logging_log_group.log_group.id
3737
log_type = "SERVICE"
3838

security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/locals.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,9 @@ locals {
1616
resource_nc = "-${var.deployment_name}-${var.region}-${var.purpose}-${random_id.tag.hex}"
1717
policy_displayname = "${var.PolicyNamePrefix}${local.resource_nc}"
1818
dynamicgroup_displayname = "${var.DynamicGroupNamePrefix}${local.resource_nc}"
19+
tracker_bucket_name = "${var.tracker-bucket}${local.resource_nc}"
20+
oci_repo_displayname = "${var.ocir_repo_name}${local.resource_nc}"
21+
functionapp_display_name = "${var.FunctionAppNamePrefix}${local.resource_nc}"
22+
function_display_name = "${var.FunctionNamePrefix}${local.resource_nc}"
23+
function_invoke_oci_logging_displayname = "${var.FunctionInvokeOCILoggingName}${local.resource_nc}"
1924
}

0 commit comments

Comments
 (0)