|
11 | 11 |
|
12 | 12 | resource "oci_functions_application" "DataSafeAuditDBtoLoggingApp" { |
13 | 13 | compartment_id = var.compartment_ocid |
14 | | - display_name = "${var.FunctionAppNamePrefix}-${var.deployment_name}-${random_id.tag.hex}" |
| 14 | + display_name = local.functionapp_display_name |
15 | 15 | subnet_ids = [var.create_network ? module.setup-network[0].subnet_ocid : var.subnet_ocid] |
16 | 16 | } |
17 | 17 |
|
18 | 18 | resource "oci_functions_function" "postauditlogs" { |
19 | 19 | depends_on = [null_resource.DataSafeAuditDBtoLoggingPush2OCIR] |
20 | 20 | application_id = oci_functions_application.DataSafeAuditDBtoLoggingApp.id |
21 | | - display_name = "${var.FunctionNamePrefix}-${var.deployment_name}" |
| 21 | + display_name = local.function_display_name |
22 | 22 | #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" |
24 | 24 | memory_in_mbs = var.FunctionMemory |
25 | 25 | timeout_in_seconds = var.FunctionTimeoutSec |
26 | 26 | 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 |
30 | 30 | } |
31 | 31 |
|
32 | 32 | } |
33 | 33 |
|
34 | 34 | 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 |
36 | 36 | log_group_id = oci_logging_log_group.log_group.id |
37 | 37 | log_type = "SERVICE" |
38 | 38 |
|
|
0 commit comments