opensearch - removal of duplicate code for OCI Function

basis/bin/auto_env.sh

@@ -145,6 +145,11 @@ else
  export TF_VAR_ad=`oci iam availability-domain list --compartment-id=$TF_VAR_tenancy_ocid | jq -r .data[0].name`
  export TF_VAR_bastion_ad=$TF_VAR_ad
  fi 
+
+ # Base DB - version
+ if [ "$TF_VAR_db_type" == "database" ]; then
+ export TF_VAR_db_version=`oci db version list --compartment-id $TF_VAR_compartment_ocid --db-system-shape VM.Standard.E4.Flex | jq -r ".data | last | .version"`
+ fi
 
  # TLS
  if [ "$TF_VAR_dns_name" != "" ] && [ "$TF_VAR_certificate_ocid" == "" ]; then

basis/bin/done.sh

@@ -24,6 +24,11 @@ if [ ! -z "$UI_URL" ]; then
  kubectl get all
  sleep 5
  fi
+ if [ "$TF_VAR_deploy_type" == "compute" ]; then
+ # Get the compute logs
+ scp -r -o StrictHostKeyChecking=no -i $TF_VAR_ssh_private_path opc@$COMPUTE_IP:/home/opc/*.log target/.
+ scp -r -o StrictHostKeyChecking=no -i $TF_VAR_ssh_private_path opc@$COMPUTE_IP:/home/opc/app/*.log target/.
+ fi 
 
  # Retry several time. Needed for ORDS or Go or Tomcat that takes more time to start
  x=1

basis/src/app/app.j2.yaml

@@ -36,12 +36,12 @@ spec:
  name: {{ prefix }}-db-secret
  key: spring_application_json
 {%- endif %} 
+{%- endif %}
  - name: JDBC_URL
  valueFrom:
  secretKeyRef:
  name: {{ prefix }}-db-secret
  key: jdbc_url
-{%- endif %} 
 {%- else %} 
  - name: DB_URL
  valueFrom:

option/compute/compute_bootstrap.sh

@@ -22,7 +22,7 @@ sudo sed -i s/^SELINUX=.*$/SELINUX=permissive/ /etc/selinux/config
 install_java() {
  # Install the JVM (jdk or graalvm)
  if [ "$TF_VAR_java_vm" == "graalvm" ]; then
- # graalvm
+ # GraalVM
  if [ "$TF_VAR_java_version" == 8 ]; then
  sudo dnf install -y graalvm21-ee-8-jdk 
  sudo update-alternatives --set java /usr/lib64/graalvm/graalvm22-ee-java8/bin/java
@@ -39,7 +39,9 @@ install_java() {
  # sudo update-alternatives --set native-image /usr/lib64/graalvm/graalvm-java21/lib/svm/bin/native-image
  fi 
  else
- # jdk 
+ # JDK 
+ # Needed due to concurrency
+ sudo dnf install -y alsa-lib 
  if [ "$TF_VAR_java_version" == 8 ]; then
  sudo dnf install -y java-1.8.0-openjdk
  elif [ "$TF_VAR_java_version" == 11 ]; then

option/src/app/dotnet/src/Controllers/DeptController.cs → option/src/app/dotnet/src/Controllers/DeptController.cs.orig

@@ -21,8 +21,8 @@ public DeptController(ILogger<DeptController> logger)
  [Route("dept")]
  public IEnumerable<Dept> Get()
  {
- string conStringUser = "User Id=" + user + ";Password=" + pwd + ";Data Source=" + db + ";";
  List<Dept> a = new List<Dept>();
+ string conStringUser = "User Id=" + user + ";Password=" + pwd + ";Data Source=" + db + ";";
 
  using (OracleConnection con = new OracleConnection(conStringUser))
  {

option/src/app/dotnet_none/src/Controllers/DeptController.cs → option/src/app/dotnet/src/Controllers/DeptController.j2.cs

@@ -1,13 +1,18 @@
+{% import "dotnet.j2_macro" as m with context %}
 using System;
 using System.Data;
+using System.Text.Json;
 using Microsoft.AspNetCore.Mvc;
+{{ m.import() }}
 
 namespace starter.Controllers;
 
 public class DeptController : ControllerBase
 {
  private readonly ILogger<DeptController> _logger;
 
+ {{ m.class_def() }}
+
  public DeptController(ILogger<DeptController> logger)
  {
  _logger = logger;
@@ -16,18 +21,13 @@ public DeptController(ILogger<DeptController> logger)
  [Route("dept")]
  public IEnumerable<Dept> Get()
  {
- return new Dept[]
- {
- new Dept { deptno = "10", dname = "ACCOUNTING", loc = "Seoul" },
- new Dept { deptno = "20", dname = "RESEARCH", loc = "Cape Town" },
- new Dept { deptno = "30", dname = "SALES", loc = "Brussels" },
- new Dept { deptno = "40", dname = "OPERATIONS", loc = "San Francisco" }
- };
+ {{ m.dept() }}
+ return a.ToArray();
  }
 
  [Route("info")]
  public String Info()
  {
- return ".NET / No Database";
- }
+ return ".NET - {{ dbName }}";
+ } 
 }

option/src/app/dotnet/src/start.sh

@@ -5,4 +5,4 @@ export PATH=$HOME/.dotnet:$PATH
 export DB_USER="##DB_USER##"
 export DB_PASSWORD="##DB_PASSWORD##"
 export DB_URL="##DB_URL##"
-dotnet run
+dotnet run 2>&1 | tee app.log

option/src/app/dotnet/src/starter.j2.csproj

@@ -1,3 +1,4 @@
+{% import "dotnet.j2_macro" as m with context %}
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
@@ -8,13 +9,7 @@
 
  <ItemGroup>
  <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
- {%- if db_family == "oracle" %}
- <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.90" />
- {%- elif db_family == "mysql" %}
- <PackageReference Include="MySql.Data" Version="8.0.31" />
- {%- elif db_family == "psql" %}
- <PackageReference Include="Npgsql" Version="8.0.1" />
- {%- endif %}
+ {{ m.package() }} 
  </ItemGroup>
 
 </Project>

option/src/app/fn/fn_dotnet/src/Function/Function.j2.csproj

@@ -1,3 +1,4 @@
+{% import "dotnet.j2_macro" as m with context %}
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
@@ -7,12 +8,6 @@
 
  <ItemGroup>
  <PackageReference Include="Fnproject.Fn.Fdk" Version="1.0.7" />
- {%- if db_family == "oracle" %}
- <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.90" />
- {%- elif db_family == "mysql" %}
- <PackageReference Include="MySql.Data" Version="8.0.31" />
- {%- elif db_family == "psql" %}
- <PackageReference Include="Npgsql" Version="8.0.1" />
- {%- endif %}
+ {{ m.package() }} 
  </ItemGroup>
 </Project>

option/src/app/fn/fn_dotnet/src/Function/Program.j2.cs

@@ -0,0 +1,34 @@
+{% import "dotnet.j2_macro" as m with context %}
+using System;
+using System.Net.Http;
+using System.Collections.Generic;
+using System.Net.Http;
+using Fnproject.Fn.Fdk;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+using System.Text.Json;
+{{ m.import() }} 
+
+[assembly: InternalsVisibleTo("Function.Tests")]
+namespace Function { class Starter {
+ public class Dept
+ {
+ public string? deptno { get; set; }
+ public string? dname { get; set; }
+ public string? loc { get; set; }
+ }
+
+ {{ m.class_def() }} 
+
+ public string dept()
+ {
+ {{ m.dept() }} 
+ return JsonSerializer.Serialize(a);
+ }
+
+ static void Main(string[] args) { Fdk.Handle(args[0]); }
+}}
+
+
+
+