Remove MariaDB support

- change configurations to use PostgreSQL as default
- remove extra configurations using mariadb
- updated README for tutorials to use docker compose
from docker repository.

Issue-ID: POLICY-5196
Change-Id: I46abf73e1bc24997c494c0126b5b3a375021411b
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>

8 files changed, 10 insertions, 255 deletions

diff --git a/packages/policy-xacmlpdp-tarball/src/main/resources/apps/guard/xacml.properties b/packages/policy-xacmlpdp-tarball/src/main/resources/apps/guard/xacml.properties
index ede93c70..5282a90e 100644
--- a/packages/policy-xacmlpdp-tarball/src/main/resources/apps/guard/xacml.properties
+++ b/packages/policy-xacmlpdp-tarball/src/main/resources/apps/guard/xacml.properties
@@ -47,8 +47,7 @@ xacml.pip.engines=count-recent-operations,get-operation-outcome
 #
 # JPA Properties
 #
-eclipselink.target-database=MySQL
-jakarta.persistence.jdbc.driver=org.mariadb.jdbc.Driver
-jakarta.persistence.jdbc.url=jdbc:mariadb://mariadb:3306/operationshistory
+jakarta.persistence.jdbc.driver=org.postgresql.jdbc.Driver
+jakarta.persistence.jdbc.url=jdbc:postgresql://postgres:5432/operationshistory
 jakarta.persistence.jdbc.user=policy_user
 jakarta.persistence.jdbc.password=policy_user
diff --git a/tutorials/tutorial-xacml-application/src/main/docker/README.md b/tutorials/tutorial-xacml-application/src/main/docker/README.md
index 33c9166a..8d8e4da3 100644
--- a/tutorials/tutorial-xacml-application/src/main/docker/README.md
+++ b/tutorials/tutorial-xacml-application/src/main/docker/README.md
@@ -22,7 +22,7 @@
  4. Run ```docker image ls```
 	- Take note of the REPOSITORY ```onap/policy/xacml-tutorial``` and its ```TAG```
 	- This refers to the image from our `mvn clean install` from above
- 5. Edit ```docker-compose-all.sh```
+ 5. Edit ```compose.yaml```
 	- Replace xacml-pdp image with the format "REPOSITORY:TAG" as noted in Step 4
 		- ex. image: ```onap/policy-xacml-tutorial:3.1.1-SNAPSHOT```
 
diff --git a/tutorials/tutorial-xacml-application/src/main/docker/config/db/db-pg.sh b/tutorials/tutorial-xacml-application/src/main/docker/config/db/db-pg.sh
deleted file mode 100644
index 41326c61..00000000
--- a/tutorials/tutorial-xacml-application/src/main/docker/config/db/db-pg.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# ============LICENSE_START=======================================================
-# Copyright (C) 2022 Nordix Foundation.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#    http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-#
-
-export PGPASSWORD=${PG_ADMIN_PASSWORD};
-
-for db in policyadmin operationshistory
-do
-    psql -h ${PG_HOST} -p ${PG_PORT} -U postgres --command "CREATE DATABASE ${db};"
-    psql -h ${PG_HOST} -p ${PG_PORT} -U postgres --command "GRANT ALL PRIVILEGES ON DATABASE ${db} TO ${PG_USER};"
-done
\ No newline at end of file
diff --git a/tutorials/tutorial-xacml-application/src/main/docker/config/db/db.conf b/tutorials/tutorial-xacml-application/src/main/docker/config/db/db.conf
deleted file mode 100644
index 42f35844..00000000
--- a/tutorials/tutorial-xacml-application/src/main/docker/config/db/db.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-MYSQL_ROOT_PASSWORD=secret
-MYSQL_USER=policy_user
-MYSQL_PASSWORD=policy_user
\ No newline at end of file
diff --git a/tutorials/tutorial-xacml-application/src/main/docker/config/db/db.sh b/tutorials/tutorial-xacml-application/src/main/docker/config/db/db.sh
deleted file mode 100644
index 499764df..00000000
--- a/tutorials/tutorial-xacml-application/src/main/docker/config/db/db.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash -xv
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-for db in policyadmin operationshistory
-do
-     mysql -uroot -p"${MYSQL_ROOT_PASSWORD}" --execute "CREATE DATABASE IF NOT EXISTS ${db};"
-     mysql -uroot -p"${MYSQL_ROOT_PASSWORD}" --execute "GRANT ALL PRIVILEGES ON \`${db}\`.* TO '${MYSQL_USER}'@'%' ;"
-done
-
-mysql -uroot -p"${MYSQL_ROOT_PASSWORD}" --execute "FLUSH PRIVILEGES;"
diff --git a/tutorials/tutorial-xacml-application/src/main/docker/docker-compose.yml b/tutorials/tutorial-xacml-application/src/main/docker/docker-compose.yml
deleted file mode 100644
index 296f115c..00000000
--- a/tutorials/tutorial-xacml-application/src/main/docker/docker-compose.yml
+++ /dev/null
@@ -1,119 +0,0 @@
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
-#  Modifications Copyright (C) 2022, 2024 Nordix Foundation.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-version: '3'
-services:
-  mariadb:
-    image: nexus3.onap.org:10001/mariadb:${POLICY_MARIADB_VER}
-    container_name: mariadb
-    hostname: mariadb
-    command: [ '--lower-case-table-names=1', '--wait_timeout=28800' ]
-    env_file: config/db/db.conf
-    volumes:
-      - ./config/db:/docker-entrypoint-initdb.d
-    expose:
-      - 3306
-  api:
-    image: ${CONTAINER_LOCATION}onap/policy-api:${POLICY_API_VERSION}
-    container_name: policy-api
-    depends_on:
-      - mariadb
-    hostname: policy-api
-    ports:
-      - "6767:6969"
-    expose:
-      - 6767
-  pap:
-    image: ${CONTAINER_LOCATION}onap/policy-pap:${POLICY_PAP_VERSION}
-    container_name: policy-pap
-    depends_on:
-      - mariadb
-      - kafka
-      - api
-    hostname: policy-pap
-    ports:
-      - "6868:6969"
-    expose:
-      - 6868
-  xacml-pdp:
-    image: onap/policy-xacml-tutorial:${POLICY_XACML_TUTORIAL_VERSION}
-    container_name: policy-xacml-pdp
-    depends_on:
-      - mariadb
-      - pap
-    hostname: policy-xacml-pdp
-    ports:
-      - "6969:6969"
-    expose:
-      - 6969
-  start_dependencies:
-    image: dadarek/wait-for-dependencies
-    environment:
-      TIMEOUT_LENGTH: 60
-    container_name: policy-wait
-    depends_on:
-      - mariadb
-      - kafka
-    hostname: policy-wait
-    command:
-      mariadb:3306
-      kafka:9092
-  start_all:
-    image: dadarek/wait-for-dependencies
-    environment:
-      TIMEOUT_LENGTH: 60
-    container_name: policy-wait-all
-    depends_on:
-      - mariadb
-      - kafka
-      - api
-      - pap
-      - xacml-pdp
-    hostname: policy-wait-all
-    command:
-      mariadb:3306
-      kafka:9092
-      api:6969
-      pap:6969
-      xacml-pdp:6969
-  zookeeper:
-    image: confluentinc/cp-zookeeper:latest
-    environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-      ZOOKEEPER_TICK_TIME: 2000
-    ports:
-      - "2181:2181"
-  kafka:
-    image: confluentinc/cp-kafka:latest
-    container_name: kafka
-    depends_on:
-      - zookeeper
-    networks:
-      default:
-        aliases:
-          - message-router
-    ports:
-      - "29092:29092"
-      - "9092:9092"
-    environment:
-      KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,PLAINTEXT_HOST://localhost:29092
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
-      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
diff --git a/tutorials/tutorial-xacml-application/src/main/docker/run-tutorial.sh b/tutorials/tutorial-xacml-application/src/main/docker/run-tutorial.sh
deleted file mode 100755
index 7b2f31e2..00000000
--- a/tutorials/tutorial-xacml-application/src/main/docker/run-tutorial.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/bash
-
-# ============LICENSE_START====================================================
-#  Copyright 2022, 2024 Nordix Foundation.
-# =============================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END======================================================
-
-if [ -z "$CONTAINER_LOCATION" ]
-then
-    export CONTAINER_LOCATION="nexus3.onap.org:10001/"
-fi
-
-echo "Looking up the XACML tutorial version . . ."
-
-POLICY_XACML_TUTORIAL_VERSION=$(
-    docker images --filter "reference=onap/policy-xacml-tutorial" |
-    grep -v "REPOSITORY" |
-    sort    |
-    head -1 |
-    awk '{print $2}'
-)
-
-if [ -z "$POLICY_XACML_TUTORIAL_VERSION" ]
-then
-    echo "Look up of the XACML tutorial version failed, have you built the tutorial docker image?"
-    exit 1
-else
-    export POLICY_XACML_TUTORIAL_VERSION
-    echo "Look up of the XACML tutorial version completed, version is ${POLICY_XACML_TUTORIAL_VERSION}"
-fi
-
-echo "Looking up latest versions of Policy Framework images . . ."
-GETVERS_SCRIPT=$(mktemp)
-curl -qL --silent "https://raw.githubusercontent.com/onap/policy-docker/master/compose/get-versions.sh" > "$GETVERS_SCRIPT"
-export GERRIT_BRANCH="master"
-chmod +x "$GETVERS_SCRIPT"
-source "$GETVERS_SCRIPT"
-echo "Look up of latest versions of Policy Framework images completed"
-
-
-echo "Running tutorial . . ."
-docker-compose -f docker-compose.yml up
-echo "Tutorial run completed"
-
-echo "Cleaning up . . ."
-rm "$GETVERS_SCRIPT"
-echo "Cleanup completed"
diff --git a/tutorials/tutorial-xacml-application/src/main/docker/xacml.properties b/tutorials/tutorial-xacml-application/src/main/docker/xacml.properties
index 277b098e..a6dea434 100644
--- a/tutorials/tutorial-xacml-application/src/main/docker/xacml.properties
+++ b/tutorials/tutorial-xacml-application/src/main/docker/xacml.properties
@@ -28,4 +28,10 @@ xacml.att.policyFinderFactory.combineRootPolicies=urn:oasis:names:tc:xacml:3.0:p
 # Policies to load
 #
 xacml.rootPolicies=
-xacml.referencedPolicies=
\ No newline at end of file
+xacml.referencedPolicies=
+
+# Database
+jakarta.persistence.jdbc.driver=org.postgresql.jdbc.Driver
+jakarta.persistence.jdbc.url=jdbc:postgresql://postgres:5432/operationshistory
+jakarta.persistence.jdbc.user=policy_user
+jakarta.persistence.jdbc.password=policy_user
\ No newline at end of file