Skip to content

Commit 4ca3fc3

Browse files
committed
Use locals in terraform
1 parent 5c89cdf commit 4ca3fc3

File tree

6 files changed

+16
-23
lines changed

6 files changed

+16
-23
lines changed

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
@@ -11,6 +11,7 @@
1111
locals {
1212
ocir_docker_repository = join("", [lower(lookup(data.oci_identity_regions.oci_regions.regions[0], "key")), ".ocir.io"])
1313
ocir_namespace = lookup(data.oci_objectstorage_namespace.namespace, "namespace")
14+
working_dir = "function/oci-datasafe-audit-to-logging"
1415
namespace = lookup(data.oci_objectstorage_namespace.namespace, "namespace")
1516
compartment_name = lookup(data.oci_identity_compartment.compartment, "name")
1617
resource_nc = "-${var.deployment_name}-${var.region}-${var.purpose}-${random_id.tag.hex}"
@@ -21,4 +22,8 @@ locals {
2122
functionapp_display_name = "${var.FunctionAppNamePrefix}${local.resource_nc}"
2223
function_display_name = "${var.FunctionNamePrefix}${local.resource_nc}"
2324
function_invoke_oci_logging_displayname = "${var.FunctionInvokeOCILoggingName}${local.resource_nc}"
25+
ocilogging_group_displayname="${var.LogGroupPrefix}${local.resource_nc}"
26+
ocilogging_dslog_displayname="${var.LogDataSafeAuditDBNamePrefix}${local.resource_nc}"
27+
notificationtopic_name = "${var.NotificationTopicNamePrefix}${local.resource_nc}"
28+
alarm_displayname = "${var.AlarmNamePrefix}${local.resource_nc}"
2429
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010

1111
resource "oci_logging_log_group" "log_group" {
1212
compartment_id = var.compartment_ocid
13-
display_name = "${var.LogGroupPrefix}-${random_id.tag.hex}"
13+
display_name = local.ocilogging_group_displayname
1414
}
1515

1616
resource "oci_logging_log" "log_datadafe_auditdb" {
17-
display_name = "${var.LogDataSafeAuditDBNamePrefix}-${var.deployment_name}-${random_id.tag.hex}"
17+
display_name = local.ocilogging_dslog_displayname
1818
log_group_id = oci_logging_log_group.log_group.id
1919
log_type = "CUSTOM"
2020
is_enabled = true

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,22 @@ resource "null_resource" "DataSafeAuditDBtoLoggingPush2OCIR" {
2323

2424
provisioner "local-exec" {
2525
command = "image=$(docker images | grep oci-datasafe-audit-to-logging | awk -F ' ' '{print $3}') ; docker rmi -f $image &> /dev/null ; echo $image"
26-
working_dir = "function/oci-datasafe-audit-to-logging"
26+
working_dir = local.working_dir
2727
}
2828

2929
provisioner "local-exec" {
3030
command = "fn build --verbose"
31-
working_dir = "function/oci-datasafe-audit-to-logging"
31+
working_dir = local.working_dir
3232
}
3333

3434
provisioner "local-exec" {
35-
command = "image=$(docker images | grep oci-datasafe-audit-to-logging | awk -F ' ' '{print $3}') ; docker tag $image ${local.ocir_docker_repository}/${local.namespace}/${oci_artifacts_container_repository.fn_container_repository.display_name}/oci-datasafe-audit-to-logging:0.0.1"
36-
working_dir = "function/oci-datasafe-audit-to-logging"
35+
command = "image=$(docker images | grep oci-datasafe-audit-to-logging | awk -F ' ' '{print $3}') ; docker tag $image ${local.ocir_docker_repository}/${local.namespace}/${oci_artifacts_container_repository.fn_container_repository.display_name}/${local.function_display_name}:0.0.1"
36+
working_dir = local.working_dir
3737
}
3838

3939
provisioner "local-exec" {
40-
command = "docker push ${local.ocir_docker_repository}/${local.namespace}/${oci_artifacts_container_repository.fn_container_repository.display_name}/oci-datasafe-audit-to-logging:0.0.1"
41-
working_dir = "function/oci-datasafe-audit-to-logging"
40+
command = "docker push ${local.ocir_docker_repository}/${local.namespace}/${oci_artifacts_container_repository.fn_container_repository.display_name}/${local.function_display_name}:0.0.1"
41+
working_dir = local.working_dir
4242
}
4343
}
4444

security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/modules/network/main.tf

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,6 @@
99
################################################################################
1010

1111

12-
locals {
13-
resource_nc = "-${var.deployment_name}-${var.region}-${var.purpose}-${random_id.tag.hex}"
14-
vcn_dns_label = "${var.vcndnslabelprefix}${local.resource_nc}"
15-
vcn_displayname = "${var.vcnnameprefix}${local.resource_nc}"
16-
service_gw_displayname = "${var.vcnnameservicegatewayprefix}${local.resource_nc}"
17-
vcnnameroutingtable_displayname = "${var.vcnnameroutingtableprefix}${local.resource_nc}"
18-
dhcpoptions_displayname = "${var.vcnnamedhcpopitonsprefix}${local.resource_nc}"
19-
subnet_displayname = "${var.subnetnameprefix}${local.resource_nc}"
20-
subnet_dns_label = "${var.subnetdnslabelprefix}${local.resource_nc}"
21-
vcn_securitylist_displayname = "${var.vcnnamesecuritylistprefix}${local.resource_nc}"
22-
}
23-
2412
resource "oci_core_virtual_network" "vcn" {
2513
cidr_block = var.VCN-CIDR
2614
dns_label = local.vcn_dns_label

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
resource "oci_ons_notification_topic" "schedule_ds_ocilogging_notification_topic" {
1414
#Required
1515
compartment_id = var.compartment_ocid
16-
name = "${var.NotificationTopicNamePrefix}-${var.deployment_name}-${random_id.tag.hex}"
16+
name = local.notificationtopic_name
1717
}
1818

1919
resource "oci_ons_subscription" "schedule_ds_ocilogging_notification_subscription" {
@@ -28,7 +28,7 @@ resource "oci_monitoring_alarm" "schedule_ds_ocilogging_alarm" {
2828
#Required
2929
compartment_id = var.compartment_ocid
3030
destinations = [oci_ons_notification_topic.schedule_ds_ocilogging_notification_topic.id]
31-
display_name = "${var.AlarmNamePrefix}-${var.deployment_name}-${random_id.tag.hex}"
31+
display_name = local.alarm_displayname
3232
is_enabled = "true"
3333
metric_compartment_id = var.compartment_ocid
3434
namespace = "oci_faas"

security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/schema.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ variables:
136136
title: "VCN CIDR"
137137
description: "Choose VCN's CIDR block where Fn App will be deployed."
138138

139-
fnsubnet-CIDR:
139+
subnet-CIDR:
140140
type: string
141141
required: false
142142
default: "10.0.2.0/24"

0 commit comments

Comments
 (0)