Merge branch 'main' into phantompete-patch-3

Author: bobpeulen

app-dev/devops-and-containers/oke/README.md

@@ -55,6 +55,7 @@ Reviewed: 20.12.2023
 # Reusable Assets Overview
 
 - [Cluster Api OCI](https://github.com/oracle-devrel/technology-engineering/tree/main/app-dev/oke/capoci)
+- [Cloud Native QuickStart](https://github.com/alcampag/oci-cn-quickstart)
 
 # License
 

security/security-design/shared-assets/fn-datasafe-dbaudit-to-oci-logging/files/terraform/function/oci-datasafe-audit-to-logging/func.yaml

@@ -2,6 +2,8 @@ schema_version: 20180708
 name: oci-datasafe-audit-to-logging
 version: 0.0.1
 runtime: python
+build_image: fnproject/python:3.9-dev
+run_image: fnproject/python:3.9
 entrypoint: /python/bin/fdk /function/func.py handler
 memory: 1024
 timeout: 300

security/security-design/shared-assets/fn-datasafe-dbaudit-to-oci-logging/files/terraform/function_prep.tf

@@ -33,7 +33,7 @@ resource "null_resource" "functionapp_push2ocir" {
   }
 
   provisioner "local-exec" {
-    command     = "docker push ${local.fn_image}"
+    command     = "docker push ${local.fn_image}" 
     working_dir = "${path.module}/${local.fn_working_dir}"
   }
 

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

@@ -12,6 +12,7 @@
 resource "oci_functions_application" "functionapp" {
   compartment_id = var.compartment_ocid
   display_name   = local.functionapp_display_name
+  shape = var.functionappshape
   subnet_ids     = [var.create_network ? module.setup-network[0].subnet_ocid : var.subnet_ocid] 
 }
 

security/security-design/shared-assets/fn-datasafe-dbaudit-to-oci-logging/files/terraform/variables.tf

@@ -160,6 +160,10 @@ variable "functionname" {
   default = "oci-datasafe-audit-to-logging"
 }
 
+variable "functionappshape" {
+  default = "GENERIC_ARM"
+}
+
 
 ###################################
 # Logging Variables