update code

fzarrioracle · fzarrioracle · commit 3fb3398bf044 · 2023-08-01T15:37:15.000+02:00
diff --git a/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/function/oci-datasafe-audit-to-logging/func.py b/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/function/oci-datasafe-audit-to-logging/func.py
diff --git a/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/function/oci-datasafe-audit-to-logging/set-fn-config.sh b/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/function/oci-datasafe-audit-to-logging/set-fn-config.sh
diff --git a/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/function/oci-datasafe-audit-to-logging/set-local-vars.conf_sample b/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/function/oci-datasafe-audit-to-logging/set-local-vars.conf_sample
diff --git a/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/function_invoke.tf b/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/function_invoke.tf
@@ -10,6 +10,6 @@
 
 
 
-resource "oci_functions_invoke_function" "FunctionInvoke" {
+resource "oci_functions_invoke_function" "functioninvoke" {
     function_id = oci_functions_function.fun1.id
 }
diff --git a/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/function_prep.tf b/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/function_prep.tf
@@ -11,14 +11,14 @@
 
 
 resource "null_resource" "FunctionAppPush2OCIR" {
-  depends_on = [module.setup-network, oci_objectstorage_bucket.tracker-bucket, oci_identity_policy.FunctionPolicy,
-    oci_artifacts_container_repository.fn_container_repository, oci_functions_application.FunctionApp]
+  depends_on = [module.setup-network, oci_objectstorage_bucket.tracker-bucket, oci_identity_policy.functionpolicy,
+    oci_artifacts_container_repository.fn_container_repository, oci_functions_application.functionapp]
   
   provisioner "local-exec" {
     command = "echo '${var.ocir_user_password}' |  docker login ${local.ocir_docker_repository} --username '${local.namespace}/${var.ocir_user_name}' --password-stdin"
   }
   provisioner "local-exec" {
-    command     = "image=$(docker images | grep ${var.FunctionName} | awk -F ' ' '{print $3}') ; docker rmi -f $image &> /dev/null ; echo $image"
+    command     = "image=$(docker images | grep ${var.functionname} | awk -F ' ' '{print $3}') ; docker rmi -f $image &> /dev/null ; echo $image"
     working_dir = "${path.module}/${local.fn_working_dir}"
   }
 
@@ -28,7 +28,7 @@ resource "null_resource" "FunctionAppPush2OCIR" {
   }
 
   provisioner "local-exec" {
-    command     = "image=$(docker images | grep ${var.FunctionName} | awk -F ' ' '{print $3}') ; docker tag $image ${local.fn_image}"
+    command     = "image=$(docker images | grep ${var.functionname} | awk -F ' ' '{print $3}') ; docker tag $image ${local.fn_image}"
     working_dir = "${path.module}/${local.fn_working_dir}"
   }
 
diff --git a/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/functions.tf b/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/functions.tf
@@ -9,20 +9,19 @@
 ################################################################################
 
 
-resource "oci_functions_application" "FunctionApp" {
+resource "oci_functions_application" "functionapp" {
   compartment_id = var.compartment_ocid
   display_name   = local.functionapp_display_name
   subnet_ids     = [var.create_network ? module.setup-network[0].subnet_ocid : var.subnet_ocid] 
 }
 
 resource "oci_functions_function" "fun1" {
-  depends_on     = [null_resource.FunctionAppPush2OCIR]
-  application_id = oci_functions_application.FunctionApp.id
+  depends_on     = [null_resource.functionapp_push2ocir]
+  application_id = oci_functions_application.functionapp.id
   display_name   = local.function_display_name
-  #image          = "${local.ocir_docker_repository}/${local.namespace}/${var.ocir_repo_name}/${var.FunctionNamePrefix}:0.0.1"
   image          = local.fn_image
-  memory_in_mbs  =  var.FunctionMemory
-  timeout_in_seconds = var.FunctionTimeoutSec
+  memory_in_mbs  =  var.functionmemory
+  timeout_in_seconds = var.functiontimeoutsec
   config = {
     "ociDataSafeCompartmentOCID" : var.tenancy_ocid
     "ociOSTrackerBucketName" : local.tracker_bucket_name
@@ -42,7 +41,7 @@ resource "oci_logging_log" "log_on_fn_invoke" {
   configuration {
     source {
       category    = "invoke"
-      resource    = oci_functions_application.FunctionApp.id
+      resource    = oci_functions_application.functionapp.id
       service     = "functions"
       source_type = "OCISERVICE"
     }
diff --git a/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/locals.tf b/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/locals.tf
@@ -15,18 +15,18 @@ locals {
   namespace = lookup(data.oci_objectstorage_namespace.namespace, "namespace")
   compartment_name = lookup(data.oci_identity_compartment.compartment, "name")
   resource_nc = "-${var.deployment_name}-${var.region}-${var.purpose}-${random_id.tag.hex}"
-  policy_displayname = "${var.PolicyNamePrefix}${local.resource_nc}"
-  dynamicgroup_displayname = "${var.DynamicGroupNamePrefix}${local.resource_nc}"
+  policy_displayname = "${var.policynameprefix}${local.resource_nc}"
+  dynamicgroup_displayname = "${var.dynamicgroupnameprefix}${local.resource_nc}"
   tracker_bucket_name = "${var.tracker-bucket}${local.resource_nc}"
-  oci_repo_displayname = "${var.ocir_repo_name}${local.resource_nc}/${var.FunctionName}"
-  functionapp_display_name = "${var.FunctionAppNamePrefix}${local.resource_nc}"
-  function_display_name = "${var.FunctionNamePrefix}${local.resource_nc}"
-  function_invoke_oci_logging_displayname = "${var.FunctionInvokeOCILoggingName}${local.resource_nc}"
-  ocilogging_group_displayname="${var.LogGroupPrefix}${local.resource_nc}"
-  ocilogging_dslog_displayname="${var.LogDataSafeAuditDBNamePrefix}${local.resource_nc}"
-  notificationtopic_name = "${var.NotificationTopicNamePrefix}${local.resource_nc}"
-  alarm_displayname = "${var.AlarmNamePrefix}${local.resource_nc}"
-  fn_working_dir = "function/${var.FunctionName}"
+  oci_repo_displayname = "${var.ocir_repo_name}${local.resource_nc}/${var.functionname}"
+  functionapp_display_name = "${var.functionappnameprefix}${local.resource_nc}"
+  function_display_name = "${var.functionnameprefix}${local.resource_nc}"
+  function_invoke_oci_logging_displayname = "${var.functionInvokeociloggingname}${local.resource_nc}"
+  ocilogging_group_displayname="${var.loggrouprefix}${local.resource_nc}"
+  ocilogging_dslog_displayname="${var.log_datafafeauditdbnameprefix}${local.resource_nc}"
+  notificationtopic_name = "${var.notificationtopicnameprefix}${local.resource_nc}"
+  alarm_displayname = "${var.alarmnameprefix}${local.resource_nc}"
+  fn_working_dir = "function/${var.functionname}"
   fn_repository= "${local.ocir_docker_repository}/${local.namespace}/${oci_artifacts_container_repository.fn_container_repository.display_name}"
   fn_image = "${local.fn_repository}:0.0.1"
 }
diff --git a/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/main.tf b/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/main.tf
@@ -14,8 +14,8 @@ module "setup-network" {
   source = "./modules/network"
   count  = var.create_network ? 1 : 0
   compartment_ocid = var.compartment_ocid
-  VCN-CIDR = var.VCN-CIDR
-  subnet-CIDR = var.subnet-CIDR
+  vcn_cidr = var.vcn_cidr
+  subnet_cidr = var.subnet_cidr
   vcndnslabelprefix = var.vcndnslabelprefix
   vcnnameprefix = var.vcnnameprefix
   vcnnameroutingtableprefix = var.vcnnameroutingtableprefix
diff --git a/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/modules/network/main.tf b/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/modules/network/main.tf
@@ -10,7 +10,7 @@
 
 
 resource "oci_core_virtual_network" "vcn" {
-  cidr_block     = var.VCN-CIDR
+  cidr_block     = var.vcn_cidr
   dns_label      = local.vcn_dns_label
   compartment_id = var.compartment_ocid
   display_name   = local.vcn_displayname
@@ -101,7 +101,7 @@ resource "oci_core_security_list" "vcn_security_list"{
   
   ingress_security_rules { 
       stateless = false
-      source = "10.0.0.0/16"
+      source = var.vcn_cidr
       source_type = "CIDR_BLOCK"
       # Get protocol numbers from https://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml ICMP is 1  
       protocol = "1"
diff --git a/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/modules/network/variables.tf b/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/modules/network/variables.tf
@@ -22,19 +22,19 @@ variable "compartment_ocid" {
   description = "the OCID of the compartment where the environment will be created."
 }
 
-variable "VCN-CIDR" {
-  description = "The CIDR block of VCN"
+variable "vcn_cidr" {
+  description = "The cidr block of VCN"
 }
 
-variable "subnet-CIDR" {
-  description = "The CIDR block of Subnet"
+variable "subnet_cidr" {
+  description = "The cidr block of Subnet"
 }
 
 variable "vcndnslabelprefix" {
 }
 
 variable "vcnnameprefix" {
-  description = "The prefix display name of VCN"
+  description = "The prefix display name of vcn"
 }
 
 variable "vcnnameroutingtableprefix" {
diff --git a/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/policies.tf b/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/policies.tf
@@ -11,29 +11,29 @@
 
 #  Policies
 
-resource "oci_identity_policy" "FunctionPolicy" {
+resource "oci_identity_policy" "functionpolicy" {
   provider = oci.homeregion
-  depends_on     = [oci_identity_dynamic_group.FunctionsServiceDynamicGroup]
+  depends_on     = [oci_identity_dynamic_group.functionsservicedynamicgroup]
   name = local.policy_displayname
   description = var.PolicyDescription
   compartment_id = var.tenancy_ocid
   count = var.setup_policies ? 1 : 0
-  statements = ["Allow dynamic-group ${oci_identity_dynamic_group.FunctionsServiceDynamicGroup[0].name} to use log-content in compartment id ${var.compartment_ocid}", 
-        "Allow dynamic-group ${oci_identity_dynamic_group.FunctionsServiceDynamicGroup[0].name} to manage objects in compartment id ${var.compartment_ocid}",
-        "Allow dynamic-group ${oci_identity_dynamic_group.FunctionsServiceDynamicGroup[0].name} to read objectstorage-namespaces in compartment id ${var.compartment_ocid}", 
-        "allow dynamic-group ${oci_identity_dynamic_group.FunctionsServiceDynamicGroup[0].name} to read buckets in compartment id ${var.compartment_ocid}",
-        "Allow dynamic-group ${oci_identity_dynamic_group.FunctionsServiceDynamicGroup[0].name} to read data-safe-audit-events in tenancy"
+  statements = ["Allow dynamic-group ${oci_identity_dynamic_group.functionsservicedynamicgroup[0].name} to use log-content in compartment id ${var.compartment_ocid}", 
+        "Allow dynamic-group ${oci_identity_dynamic_group.functionsservicedynamicgroup[0].name} to manage objects in compartment id ${var.compartment_ocid}",
+        "Allow dynamic-group ${oci_identity_dynamic_group.functionsservicedynamicgroup[0].name} to read objectstorage-namespaces in compartment id ${var.compartment_ocid}", 
+        "allow dynamic-group ${oci_identity_dynamic_group.functionsservicedynamicgroup[0].name} to read buckets in compartment id ${var.compartment_ocid}",
+        "Allow dynamic-group ${oci_identity_dynamic_group.functionsservicedynamicgroup[0].name} to read data-safe-audit-events in tenancy"
         ]
 
   provisioner "local-exec" {
        command = "sleep 5"
   }
 }
 
-resource "oci_identity_dynamic_group" "FunctionsServiceDynamicGroup" {
+resource "oci_identity_dynamic_group" "functionsservicedynamicgroup" {
   provider = oci.homeregion
   name           = local.dynamicgroup_displayname
-  description    =  var.DynamicGroupDescription
+  description    =  var.dynamicgroupdescription
   compartment_id = var.tenancy_ocid
   count = var.setup_policies ? 1 : 0
   matching_rule  = "ALL {resource.type = 'fnfunc', resource.compartment.id = '${var.compartment_ocid}'}"
diff --git a/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/schema.yaml b/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/schema.yaml
@@ -49,8 +49,8 @@ variableGroups:
         - create_network
         - show_advanced_collection
   variables:
-  - VCN-CIDR
-  - fnsubnet-CIDR
+  - vcn_cidr
+  - fnsubnet_cidr
 
 - title: Optional Collection Details
   visible:
@@ -128,15 +128,15 @@ variables:
 
   # Optional Configuration
 
-  VCN-CIDR:
+  vcn_cidr:
     type: string
     required: false
     default: "10.0.0.0/16"
     pattern: "^(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]).(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]).(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]).(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\\/(3[0-2]|[1-2]?[0-9])$"
     title: "VCN CIDR"
     description: "Choose VCN's CIDR block where Fn App will be deployed."
 
-  subnet-CIDR:
+  subnet_cidr:
     type: string
     required: false
     default: "10.0.2.0/24"
diff --git a/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/terraform.tfvars.sample b/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/terraform.tfvars.sample
@@ -19,7 +19,6 @@ private_key_path="<key_path>"
 ocir_user_name="<user_name>"
 ocir_user_password="<auth_token>"
 
-#OCI Region Identifier (see: https://docs.oracle.com/en-us/iaas/Content/General/Concepts/regions.htm)
 region="<OCI Region Identifier>"
 
 # Deployment name is used in resource names (test, prod, etc..)
diff --git a/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/variables.tf b/security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/variables.tf
@@ -68,12 +68,12 @@ variable "subnet_ocid" {
 variable "create_network" {
   default = true
 }
-variable "VCN-CIDR" {
+variable "vcn_cidr" {
   default = "10.0.0.0/22"
-  description = "The CIDR block of VCN"
+  description = "The cidr block of VCN"
 }
 
-variable "subnet-CIDR" {
+variable "subnet_cidr" {
   default = "10.0.1.0/24"
 }
 
@@ -118,15 +118,15 @@ variable "vcnnameservicegatewayprefix" {
 ###################################
 # Policies Variables
 ###################################
-variable "PolicyNamePrefix" {
+variable "policynameprefix" {
   default = "pcy"
 }
 
-variable "PolicyDescription" {
+variable "policydescription" {
   default = "Data Safe to Logging Function Policy"
 }
 
-variable "DynamicGroupNamePrefix" {
+variable "dynamicgroupnameprefix" {
   default = "dgp"
 }
 variable "DynamicGroupDescription" {
@@ -136,49 +136,49 @@ variable "DynamicGroupDescription" {
 ###################################
 # Functions Variables
 ###################################
-variable "FunctionAppNamePrefix" {
+variable "functionappnameprefix" {
   default = "funApp"
 }
 
-variable "FunctionNamePrefix" {
+variable "functionnameprefix" {
   default = "fun"
 }
 
-variable "FunctionMemory" {
+variable "functionmemory" {
   default = "1024"
 }
 
-variable "FunctionInvokeOCILoggingName" {
+variable "functioninvokeociloggingname" {
   default = "fn-datasafe-dbaudit"
 }
 
-variable "FunctionTimeoutSec" {
+variable "functiontimeoutsec" {
   default = "300"
 }
 
-variable "FunctionName" {
+variable "functionname" {
   default = "oci-datasafe-audit-to-logging"
 }
 
 
 ###################################
 # Logging Variables
 ###################################
-variable "LogGroupPrefix" {
+variable "loggrouprefix" {
   default = "loggr"
 }
 
-variable "LogDataSafeAuditDBNamePrefix" {
+variable "log_datafafeauditdbnameprefix" {
   default = "log"
 }
 
 ###################################
 # Notification Variables
 ###################################
-variable "NotificationTopicNamePrefix" {
+variable "notificationtopicnameprefix" {
   default = "not"
 }
 
-variable "AlarmNamePrefix" {
+variable "alarmnameprefix" {
   default = "alm"
 }

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@`
`10`	`10`
`11`	`11`
`12`	`12`
`13`		`-resource "oci_functions_invoke_function" "FunctionInvoke" {`
	`13`	`+resource "oci_functions_invoke_function" "functioninvoke" {`
`14`	`14`	`function_id = oci_functions_function.fun1.id`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,14 @@`
`11`	`11`
`12`	`12`
`13`	`13`	`resource "null_resource" "FunctionAppPush2OCIR" {`
`14`		`- depends_on = [module.setup-network, oci_objectstorage_bucket.tracker-bucket, oci_identity_policy.FunctionPolicy,`
`15`		`- oci_artifacts_container_repository.fn_container_repository, oci_functions_application.FunctionApp]`
	`14`	`+ depends_on = [module.setup-network, oci_objectstorage_bucket.tracker-bucket, oci_identity_policy.functionpolicy,`
	`15`	`+ oci_artifacts_container_repository.fn_container_repository, oci_functions_application.functionapp]`
`16`	`16`
`17`	`17`	`provisioner "local-exec" {`
`18`	`18`	`command = "echo '${var.ocir_user_password}' \| docker login ${local.ocir_docker_repository} --username '${local.namespace}/${var.ocir_user_name}' --password-stdin"`
`19`	`19`	`}`
`20`	`20`	`provisioner "local-exec" {`
`21`		`- command = "image=$(docker images \| grep ${var.FunctionName} \| awk -F ' ' '{print $3}') ; docker rmi -f $image &> /dev/null ; echo $image"`
	`21`	`+ command = "image=$(docker images \| grep ${var.functionname} \| awk -F ' ' '{print $3}') ; docker rmi -f $image &> /dev/null ; echo $image"`
`22`	`22`	`working_dir = "${path.module}/${local.fn_working_dir}"`
`23`	`23`	`}`
`24`	`24`
`@@ -28,7 +28,7 @@ resource "null_resource" "FunctionAppPush2OCIR" {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`provisioner "local-exec" {`
`31`		`- command = "image=$(docker images \| grep ${var.FunctionName} \| awk -F ' ' '{print $3}') ; docker tag $image ${local.fn_image}"`
	`31`	`+ command = "image=$(docker images \| grep ${var.functionname} \| awk -F ' ' '{print $3}') ; docker tag $image ${local.fn_image}"`
`32`	`32`	`working_dir = "${path.module}/${local.fn_working_dir}"`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -22,19 +22,19 @@ variable "compartment_ocid" {`
`22`	`22`	`description = "the OCID of the compartment where the environment will be created."`
`23`	`23`	`}`
`24`	`24`
`25`		`-variable "VCN-CIDR" {`
`26`		`- description = "The CIDR block of VCN"`
	`25`	`+variable "vcn_cidr" {`
	`26`	`+ description = "The cidr block of VCN"`
`27`	`27`	`}`
`28`	`28`
`29`		`-variable "subnet-CIDR" {`
`30`		`- description = "The CIDR block of Subnet"`
	`29`	`+variable "subnet_cidr" {`
	`30`	`+ description = "The cidr block of Subnet"`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`variable "vcndnslabelprefix" {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`variable "vcnnameprefix" {`
`37`		`- description = "The prefix display name of VCN"`
	`37`	`+ description = "The prefix display name of vcn"`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`variable "vcnnameroutingtableprefix" {`