From fa2aa4ee227f899247cd5377e53e5f9cea2d2f28 Mon Sep 17 00:00:00 2001
From: Eldad Assis <eldada@users.noreply.github.com>
Date: Tue, 10 Dec 2024 17:03:14 +0200
Subject: [PATCH] Fix metadata DB connection error (#12)

---
 6.artifactory-aws-install/artifactory-values.yaml | 4 ----
 6.artifactory-aws-install/artifactory.tf          | 2 +-
 7.jfrog-platform-aws-install/jfrog-platform.tf    | 4 ++--
 7.jfrog-platform-aws-install/jfrog-values.yaml    | 4 ----
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/6.artifactory-aws-install/artifactory-values.yaml b/6.artifactory-aws-install/artifactory-values.yaml
index f6294cd..8dee1c7 100644
--- a/6.artifactory-aws-install/artifactory-values.yaml
+++ b/6.artifactory-aws-install/artifactory-values.yaml
@@ -31,10 +31,6 @@ artifactory:
   nodeSelector:
     group: "artifactory"
 
-## Disable metadata until issue fixed
-metadata:
-  enabled: false
-
 ## Nginx
 nginx:
   disableProxyBuffering: true
diff --git a/6.artifactory-aws-install/artifactory.tf b/6.artifactory-aws-install/artifactory.tf
index 36fa8ef..96cce04 100644
--- a/6.artifactory-aws-install/artifactory.tf
+++ b/6.artifactory-aws-install/artifactory.tf
@@ -48,7 +48,7 @@ resource "local_file" "artifactory_values" {
 
   database:
     # Get the DB endpoint from the RDS console
-    url: "jdbc:postgresql://${aws_db_instance.artifactory_db.endpoint}/${var.db_name}"
+    url: "jdbc:postgresql://${aws_db_instance.artifactory_db.endpoint}/${var.db_name}?sslmode=require"
     user: "${var.db_username}"
     password: "${var.db_password}"
   EOT
diff --git a/7.jfrog-platform-aws-install/jfrog-platform.tf b/7.jfrog-platform-aws-install/jfrog-platform.tf
index 1a58d44..952e974 100644
--- a/7.jfrog-platform-aws-install/jfrog-platform.tf
+++ b/7.jfrog-platform-aws-install/jfrog-platform.tf
@@ -112,13 +112,13 @@ resource "local_file" "jfrog_platform_values" {
           bucketName: "artifactory-${var.region}-${var.s3_bucket_name_suffix}"
 
     database:
-      url: "jdbc:postgresql://${aws_db_instance.artifactory_db.endpoint}/${var.artifactory_db_name}"
+      url: "jdbc:postgresql://${aws_db_instance.artifactory_db.endpoint}/${var.artifactory_db_name}?sslmode=require"
       user: "${var.artifactory_db_username}"
       password: "${var.artifactory_db_password}"
 
   xray:
     database:
-      url: "postgres://${aws_db_instance.xray_db.endpoint}/${var.xray_db_name}?sslmode="
+      url: "postgres://${aws_db_instance.xray_db.endpoint}/${var.xray_db_name}?sslmode=require"
       user: "${var.xray_db_username}"
       password: "${var.xray_db_password}"
 
diff --git a/7.jfrog-platform-aws-install/jfrog-values.yaml b/7.jfrog-platform-aws-install/jfrog-values.yaml
index 1e80144..773f0d3 100644
--- a/7.jfrog-platform-aws-install/jfrog-values.yaml
+++ b/7.jfrog-platform-aws-install/jfrog-values.yaml
@@ -41,10 +41,6 @@ artifactory:
     nodeSelector:
       group: "artifactory"
 
-  ## Disable metadata until issue fixed
-  metadata:
-    enabled: false
-
   ## Nginx
   nginx:
     disableProxyBuffering: true