From 6e36da2be27b7f1300f381444219cdebdd78a68c Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Wed, 28 Feb 2024 13:31:37 -0600 Subject: [PATCH 01/34] Flex Shape --- MtdrSpring/terraform/containerengine.tf | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/MtdrSpring/terraform/containerengine.tf b/MtdrSpring/terraform/containerengine.tf index cdb76138c..847150c97 100644 --- a/MtdrSpring/terraform/containerengine.tf +++ b/MtdrSpring/terraform/containerengine.tf @@ -38,10 +38,11 @@ resource "oci_containerengine_node_pool" "oke_node_pool" { compartment_id = var.ociCompartmentOcid kubernetes_version = "v1.28.2" name = "Pool" - # node_shape="VM.Standard2.4" - # node_shape = "VM.Standard.B2.1" - node_shape = "VM.Standard.E2.1" - # node_shape = "VM.Standard2.2" + node_shape = "VM.Standard.A1.Flex" + node_shape_config { + memory_in_gbs = 6 + ocpus = 2 + } #subnet_ids = [oci_core_subnet.nodePool_Subnet_1.id] #Optional node_config_details { From 9e88f9f4364c616d8ff277cca3996b936f547723 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Thu, 29 Feb 2024 16:48:40 -0600 Subject: [PATCH 02/34] Flex OL 8 --- MtdrSpring/terraform/containerengine.tf | 2 +- MtdrSpring/utils/main-setup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MtdrSpring/terraform/containerengine.tf b/MtdrSpring/terraform/containerengine.tf index 847150c97..bc9a80996 100644 --- a/MtdrSpring/terraform/containerengine.tf +++ b/MtdrSpring/terraform/containerengine.tf @@ -80,5 +80,5 @@ data "oci_containerengine_node_pool_option" "mtdrworkshop_node_pool_option" { } locals { all_sources = data.oci_containerengine_node_pool_option.mtdrworkshop_node_pool_option.sources - oracle_linux_images = [for source in local.all_sources : source.image_id if length(regexall("Oracle-Linux-[0-9]*.[0-9]*-20[0-9]*",source.source_name)) > 0] + oracle_linux_images = [for source in local.all_sources : source.image_id if length(regexall("Oracle-Linux-[0-9]*.[0-9]*-aarch64-20[0-9]*",source.source_name)) > 0] } \ No newline at end of file diff --git a/MtdrSpring/utils/main-setup.sh b/MtdrSpring/utils/main-setup.sh index 0f1c521ca..1a9307dd4 100755 --- a/MtdrSpring/utils/main-setup.sh +++ b/MtdrSpring/utils/main-setup.sh @@ -125,7 +125,7 @@ while ! state_done COMPARTMENT_OCID; do fi while ! test `oci iam compartment get --compartment-id "$COMPARTMENT_OCID" --query 'data."lifecycle-state"' --raw-output 2>/dev/null`"" == 'ACTIVE'; do echo "Waiting for the compartment to become ACTIVE" - sleep 2 + sleep 60 done state_set COMPARTMENT_OCID "$COMPARTMENT_OCID" done From 433966c264446f07da0906cded6cae479f75eea8 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Thu, 29 Feb 2024 20:50:15 -0600 Subject: [PATCH 03/34] aarch64 for graalvm --- MtdrSpring/utils/java-builds.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MtdrSpring/utils/java-builds.sh b/MtdrSpring/utils/java-builds.sh index b191c0e09..eab679757 100755 --- a/MtdrSpring/utils/java-builds.sh +++ b/MtdrSpring/utils/java-builds.sh @@ -21,7 +21,7 @@ BUILDS="todolistapp-springboot" while ! state_done GRAAL; do if ! test -d ~/graalvm-ce-java11-20.1.0; then echo "downloading graalVM" - curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java11-linux-amd64-20.1.0.tar.gz | tar xz + curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java11-linux-aarch64-20.1.0.tar.gz | tar xz mv graalvm-ce-java11-20.1.0 ~/ fi state_set_done GRAAL From 3badff6428c35ee2413d6438cfc0c0777742cb62 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Tue, 5 Mar 2024 19:37:24 -0600 Subject: [PATCH 04/34] DB free tier --- MtdrSpring/terraform/database.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MtdrSpring/terraform/database.tf b/MtdrSpring/terraform/database.tf index 8fb6e97a8..6c062b8ed 100644 --- a/MtdrSpring/terraform/database.tf +++ b/MtdrSpring/terraform/database.tf @@ -25,7 +25,7 @@ resource "oci_database_autonomous_database" "autonomous_database_atp" { data_storage_size_in_tbs = "1" db_name = var.mtdrDbName # is_free_tier = true , if there exists sufficient service limit - is_free_tier = false + is_free_tier = true #Optional #db_workload = "${var.autonomous_database_db_workload}" db_workload = var.autonomous_database_db_workload display_name ="MTDRDB" From b9822d344c36fee4fd61852727dd3fe8bafd2196 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Wed, 6 Mar 2024 15:30:09 -0600 Subject: [PATCH 05/34] Token Cretaion wait --- MtdrSpring/utils/main-setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/MtdrSpring/utils/main-setup.sh b/MtdrSpring/utils/main-setup.sh index 1a9307dd4..e63470ce6 100755 --- a/MtdrSpring/utils/main-setup.sh +++ b/MtdrSpring/utils/main-setup.sh @@ -172,6 +172,7 @@ while ! state_done DOCKER_REGISTRY; do cat $MTDRWORKSHOP_LOG/docker_registry_err exit fi + sleep 5 fi else read -s -r -p "Please generate an Auth Token and enter the value: " TOKEN From 838795c0b4ced0ce12a356006d1fa528966a9542 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Wed, 13 Mar 2024 11:41:13 -0600 Subject: [PATCH 06/34] Deploy pwd --- MtdrSpring/backend/deploy.sh | 2 +- MtdrSpring/terraform/containerengine.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MtdrSpring/backend/deploy.sh b/MtdrSpring/backend/deploy.sh index 74dd5c710..40ade7916 100755 --- a/MtdrSpring/backend/deploy.sh +++ b/MtdrSpring/backend/deploy.sh @@ -1,5 +1,5 @@ #!/bin/bash -SCRIPT_DIR=$(dirname $0) +SCRIPT_DIR=$(pwd) if [ -z "$TODO_PDB_NAME" ]; then echo "TODO_PDB_NAME not set. Will get it with state_get" export TODO_PDB_NAME=$(state_get MTDR_DB_NAME) diff --git a/MtdrSpring/terraform/containerengine.tf b/MtdrSpring/terraform/containerengine.tf index bc9a80996..80a8f3ad2 100644 --- a/MtdrSpring/terraform/containerengine.tf +++ b/MtdrSpring/terraform/containerengine.tf @@ -69,7 +69,7 @@ resource "oci_containerengine_node_pool" "oke_node_pool" { #boot_volume_size_in_gbs = "60" } //quantity_per_subnet = 1 - //ssh_public_key = var.node_pool_ssh_public_key + ssh_public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsXyGATqdTnvEDe0aYHGL+QQDjUXf6EIBlKiNLYR4gZhStp4yfn/MEWmCMGg3cbne04HlaeO3zGrUnrtfAQE90XccW9Dc4WkhLYf2vucja9NezAVQZE2qBYiwdZSF9G/FwPI1DzfbXF2UAAN3ix/IwJSWN3KZnd1FOcHOA052QMa7jGOIbi8+skKqkys3gcTaor7eXe/wONimkpPevF30FTQZpsQFU7ZzYcFM3C+XVZ2/UVtZ/MaDf73ub6mYNMpDtDCTMo9FyujzK84EKWIytAKofNwJ/Og3Wqr+CKAeLgCMtWp0926w+ff8dJRDuOxlxgJB48YaFSvjIr4lAv/aX rafael_a_g@6ab23190fb98" //ssh_public_key = var.resUserPublicKey } data "oci_containerengine_cluster_option" "mtdrworkshop_cluster_option" { From da52425ca7144336062e4cfb051ec566c81444e4 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Wed, 13 Mar 2024 19:46:36 -0600 Subject: [PATCH 07/34] Destroy mv folders --- MtdrSpring/destroy.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/MtdrSpring/destroy.sh b/MtdrSpring/destroy.sh index f543f9e28..38f070648 100755 --- a/MtdrSpring/destroy.sh +++ b/MtdrSpring/destroy.sh @@ -11,4 +11,8 @@ fi $MTDRWORKSHOP_LOCATION/utils/main-destroy.sh -cd \ No newline at end of file +deleteDir=toDelete_$(date +%Y%m%d_%H%M%S) +mkdir $deleteDir +mv state $deleteDir +mv tls $deleteDir +mv wallet $deleteDir From e6964223339f70f58fd71d9df2ee9c78c97d930a Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Wed, 13 Mar 2024 19:47:12 -0600 Subject: [PATCH 08/34] Destroy mv log files --- MtdrSpring/destroy.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/MtdrSpring/destroy.sh b/MtdrSpring/destroy.sh index 38f070648..ccf7e5567 100755 --- a/MtdrSpring/destroy.sh +++ b/MtdrSpring/destroy.sh @@ -16,3 +16,4 @@ mkdir $deleteDir mv state $deleteDir mv tls $deleteDir mv wallet $deleteDir +mv log $deleteDir From 8c058980b20bec59290591565e8a585794037ab1 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Wed, 13 Mar 2024 19:51:36 -0600 Subject: [PATCH 09/34] Destroy Rec. --- MtdrSpring/destroy.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/MtdrSpring/destroy.sh b/MtdrSpring/destroy.sh index ccf7e5567..2fbcbdebd 100755 --- a/MtdrSpring/destroy.sh +++ b/MtdrSpring/destroy.sh @@ -17,3 +17,11 @@ mv state $deleteDir mv tls $deleteDir mv wallet $deleteDir mv log $deleteDir + +echo 'Recommendations:' +echo ' 1. Manually rename compartment' +echo ' 2. Manually check/remove OKE cluster from compartment' +echo ' 3. Manually check/remove Auth Tokens' +echo ' 4. Manually check/remove Buckets from compartment' +echo ' 5. Manually check/remove Compute Instances from compartment' +echo ' 6. Manually check/remove ATP DB from compartment' From 030b95a355dc74172c22769c2639b9b0fba3dc01 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Wed, 13 Mar 2024 19:54:56 -0600 Subject: [PATCH 10/34] Compartment Removal msg --- MtdrSpring/destroy.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/MtdrSpring/destroy.sh b/MtdrSpring/destroy.sh index 2fbcbdebd..48512b0a0 100755 --- a/MtdrSpring/destroy.sh +++ b/MtdrSpring/destroy.sh @@ -25,3 +25,4 @@ echo ' 3. Manually check/remove Auth Tokens' echo ' 4. Manually check/remove Buckets from compartment' echo ' 5. Manually check/remove Compute Instances from compartment' echo ' 6. Manually check/remove ATP DB from compartment' +echo ' 7. Try remove renamed compartment' From 279050d1436cd0a19a2f34352659310ca6508993 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Thu, 11 Apr 2024 15:20:37 -0600 Subject: [PATCH 11/34] kubernetes version --- MtdrSpring/terraform/containerengine.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MtdrSpring/terraform/containerengine.tf b/MtdrSpring/terraform/containerengine.tf index 80a8f3ad2..36a267366 100644 --- a/MtdrSpring/terraform/containerengine.tf +++ b/MtdrSpring/terraform/containerengine.tf @@ -8,7 +8,7 @@ resource "oci_containerengine_cluster" "mtdrworkshop_cluster" { ] subnet_id = oci_core_subnet.endpoint.id } - kubernetes_version = "v1.28.2" + kubernetes_version = "v1.29.1" name = "mtdrworkshopcluster-${var.mtdrKey}" vcn_id = oci_core_vcn.okevcn.id #optional From 7f7d2b0a8e2d18d853773ab28291ef590390af97 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Thu, 11 Apr 2024 15:42:54 -0600 Subject: [PATCH 12/34] nodepool version --- MtdrSpring/terraform/containerengine.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MtdrSpring/terraform/containerengine.tf b/MtdrSpring/terraform/containerengine.tf index 36a267366..0d3ff1a51 100644 --- a/MtdrSpring/terraform/containerengine.tf +++ b/MtdrSpring/terraform/containerengine.tf @@ -36,7 +36,7 @@ resource "oci_containerengine_node_pool" "oke_node_pool" { #Required cluster_id = oci_containerengine_cluster.mtdrworkshop_cluster.id compartment_id = var.ociCompartmentOcid - kubernetes_version = "v1.28.2" + kubernetes_version = "v1.29.1" name = "Pool" node_shape = "VM.Standard.A1.Flex" node_shape_config { From 5fc1f1557e9dc7866d548639fa89c2308b965502 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Wed, 5 Jun 2024 15:06:31 -0600 Subject: [PATCH 13/34] state example --- MtdrSpring/state/COMPARTMENT_OCID | 1 + MtdrSpring/state/CWALLET_SSO_AUTH_URL | 1 + MtdrSpring/state/CWALLET_SSO_OBJECT | 0 MtdrSpring/state/DB_PASSWORD | 0 MtdrSpring/state/DB_SETUP | 0 MtdrSpring/state/DB_WALLET_SECRET | 0 MtdrSpring/state/DOCKER_REGISTRY | 1 + MtdrSpring/state/GRAAL | 0 MtdrSpring/state/GRAAL_IMAGE | 0 MtdrSpring/state/HOME_REGION | 1 + MtdrSpring/state/JAVA_BUILDS | 0 MtdrSpring/state/K8S_PROVISIONING | 0 MtdrSpring/state/KUBECTL | 0 MtdrSpring/state/MTDR_DB_NAME | 1 + MtdrSpring/state/MTDR_DB_OCID | 1 + MtdrSpring/state/MTDR_DB_PASSWORD_SET | 0 MtdrSpring/state/MTDR_KEY | 1 + MtdrSpring/state/NAMESPACE | 1 + MtdrSpring/state/OBJECT_STORE_BUCKET | 0 MtdrSpring/state/OKE_NAMESPACE | 0 MtdrSpring/state/OKE_OCID | 1 + MtdrSpring/state/OKE_SETUP | 0 MtdrSpring/state/PROVISIONING | 0 MtdrSpring/state/REGION | 1 + MtdrSpring/state/RUN_NAME | 1 + MtdrSpring/state/RUN_TYPE | 1 + MtdrSpring/state/SETUP_VERIFIED | 0 MtdrSpring/state/SSL | 0 MtdrSpring/state/TENANCY_OCID | 1 + MtdrSpring/state/TODO_USER | 0 MtdrSpring/state/UI_PASSWORD | 0 MtdrSpring/state/UI_USERNAME | 1 + MtdrSpring/state/USER_NAME | 1 + MtdrSpring/state/USER_OCID | 1 + MtdrSpring/state/WALLET_GET | 0 35 files changed, 16 insertions(+) create mode 100644 MtdrSpring/state/COMPARTMENT_OCID create mode 100644 MtdrSpring/state/CWALLET_SSO_AUTH_URL create mode 100644 MtdrSpring/state/CWALLET_SSO_OBJECT create mode 100644 MtdrSpring/state/DB_PASSWORD create mode 100644 MtdrSpring/state/DB_SETUP create mode 100644 MtdrSpring/state/DB_WALLET_SECRET create mode 100644 MtdrSpring/state/DOCKER_REGISTRY create mode 100644 MtdrSpring/state/GRAAL create mode 100644 MtdrSpring/state/GRAAL_IMAGE create mode 100644 MtdrSpring/state/HOME_REGION create mode 100644 MtdrSpring/state/JAVA_BUILDS create mode 100644 MtdrSpring/state/K8S_PROVISIONING create mode 100644 MtdrSpring/state/KUBECTL create mode 100644 MtdrSpring/state/MTDR_DB_NAME create mode 100644 MtdrSpring/state/MTDR_DB_OCID create mode 100644 MtdrSpring/state/MTDR_DB_PASSWORD_SET create mode 100644 MtdrSpring/state/MTDR_KEY create mode 100644 MtdrSpring/state/NAMESPACE create mode 100644 MtdrSpring/state/OBJECT_STORE_BUCKET create mode 100644 MtdrSpring/state/OKE_NAMESPACE create mode 100644 MtdrSpring/state/OKE_OCID create mode 100644 MtdrSpring/state/OKE_SETUP create mode 100644 MtdrSpring/state/PROVISIONING create mode 100644 MtdrSpring/state/REGION create mode 100644 MtdrSpring/state/RUN_NAME create mode 100644 MtdrSpring/state/RUN_TYPE create mode 100644 MtdrSpring/state/SETUP_VERIFIED create mode 100644 MtdrSpring/state/SSL create mode 100644 MtdrSpring/state/TENANCY_OCID create mode 100644 MtdrSpring/state/TODO_USER create mode 100644 MtdrSpring/state/UI_PASSWORD create mode 100644 MtdrSpring/state/UI_USERNAME create mode 100644 MtdrSpring/state/USER_NAME create mode 100644 MtdrSpring/state/USER_OCID create mode 100644 MtdrSpring/state/WALLET_GET diff --git a/MtdrSpring/state/COMPARTMENT_OCID b/MtdrSpring/state/COMPARTMENT_OCID new file mode 100644 index 000000000..9f7a10406 --- /dev/null +++ b/MtdrSpring/state/COMPARTMENT_OCID @@ -0,0 +1 @@ +ocid1.compartment.oc1..aaaaaaaaoeqxnq3via3vubgivqun52cgbnvf55wq74bao5boavokti4djsea diff --git a/MtdrSpring/state/CWALLET_SSO_AUTH_URL b/MtdrSpring/state/CWALLET_SSO_AUTH_URL new file mode 100644 index 000000000..119c4aa0d --- /dev/null +++ b/MtdrSpring/state/CWALLET_SSO_AUTH_URL @@ -0,0 +1 @@ +https://objectstorage.mx-queretaro-1.oraclecloud.com/p/4NsEkHTcrHUbr6O7km2iE_lgRuBU5vOD5wI-Dg6f3Roux5evEhpNCnsfETcm7D5l/n/axzmghqes1gn/b/reacttodo-rolax/o/cwallet.sso diff --git a/MtdrSpring/state/CWALLET_SSO_OBJECT b/MtdrSpring/state/CWALLET_SSO_OBJECT new file mode 100644 index 000000000..e69de29bb diff --git a/MtdrSpring/state/DB_PASSWORD b/MtdrSpring/state/DB_PASSWORD new file mode 100644 index 000000000..e69de29bb diff --git a/MtdrSpring/state/DB_SETUP b/MtdrSpring/state/DB_SETUP new file mode 100644 index 000000000..e69de29bb diff --git a/MtdrSpring/state/DB_WALLET_SECRET b/MtdrSpring/state/DB_WALLET_SECRET new file mode 100644 index 000000000..e69de29bb diff --git a/MtdrSpring/state/DOCKER_REGISTRY b/MtdrSpring/state/DOCKER_REGISTRY new file mode 100644 index 000000000..9e6b4874f --- /dev/null +++ b/MtdrSpring/state/DOCKER_REGISTRY @@ -0,0 +1 @@ +mx-queretaro-1.ocir.io/axzmghqes1gn/reacttodo/rolax diff --git a/MtdrSpring/state/GRAAL b/MtdrSpring/state/GRAAL new file mode 100644 index 000000000..e69de29bb diff --git a/MtdrSpring/state/GRAAL_IMAGE b/MtdrSpring/state/GRAAL_IMAGE new file mode 100644 index 000000000..e69de29bb diff --git a/MtdrSpring/state/HOME_REGION b/MtdrSpring/state/HOME_REGION new file mode 100644 index 000000000..1849cad09 --- /dev/null +++ b/MtdrSpring/state/HOME_REGION @@ -0,0 +1 @@ +mx-queretaro-1 diff --git a/MtdrSpring/state/JAVA_BUILDS b/MtdrSpring/state/JAVA_BUILDS new file mode 100644 index 000000000..e69de29bb diff --git a/MtdrSpring/state/K8S_PROVISIONING b/MtdrSpring/state/K8S_PROVISIONING new file mode 100644 index 000000000..e69de29bb diff --git a/MtdrSpring/state/KUBECTL b/MtdrSpring/state/KUBECTL new file mode 100644 index 000000000..e69de29bb diff --git a/MtdrSpring/state/MTDR_DB_NAME b/MtdrSpring/state/MTDR_DB_NAME new file mode 100644 index 000000000..973cf2417 --- /dev/null +++ b/MtdrSpring/state/MTDR_DB_NAME @@ -0,0 +1 @@ +reacttodorolax diff --git a/MtdrSpring/state/MTDR_DB_OCID b/MtdrSpring/state/MTDR_DB_OCID new file mode 100644 index 000000000..24cdd1e70 --- /dev/null +++ b/MtdrSpring/state/MTDR_DB_OCID @@ -0,0 +1 @@ +ocid1.autonomousdatabase.oc1.mx-queretaro-1.anyxeljr747kqnaahtqfa6m3kuduo6uh6yrwkuudrnxtaz5aelicsc3km3kq diff --git a/MtdrSpring/state/MTDR_DB_PASSWORD_SET b/MtdrSpring/state/MTDR_DB_PASSWORD_SET new file mode 100644 index 000000000..e69de29bb diff --git a/MtdrSpring/state/MTDR_KEY b/MtdrSpring/state/MTDR_KEY new file mode 100644 index 000000000..0f6dcfae2 --- /dev/null +++ b/MtdrSpring/state/MTDR_KEY @@ -0,0 +1 @@ +rolax diff --git a/MtdrSpring/state/NAMESPACE b/MtdrSpring/state/NAMESPACE new file mode 100644 index 000000000..62926a881 --- /dev/null +++ b/MtdrSpring/state/NAMESPACE @@ -0,0 +1 @@ +axzmghqes1gn diff --git a/MtdrSpring/state/OBJECT_STORE_BUCKET b/MtdrSpring/state/OBJECT_STORE_BUCKET new file mode 100644 index 000000000..e69de29bb diff --git a/MtdrSpring/state/OKE_NAMESPACE b/MtdrSpring/state/OKE_NAMESPACE new file mode 100644 index 000000000..e69de29bb diff --git a/MtdrSpring/state/OKE_OCID b/MtdrSpring/state/OKE_OCID new file mode 100644 index 000000000..5621b6b7f --- /dev/null +++ b/MtdrSpring/state/OKE_OCID @@ -0,0 +1 @@ +ocid1.cluster.oc1.mx-queretaro-1.aaaaaaaauklpe5idnv3upvntljdcikzgwgu3gqcaahxbenoctcf5oyg7677a diff --git a/MtdrSpring/state/OKE_SETUP b/MtdrSpring/state/OKE_SETUP new file mode 100644 index 000000000..e69de29bb diff --git a/MtdrSpring/state/PROVISIONING b/MtdrSpring/state/PROVISIONING new file mode 100644 index 000000000..e69de29bb diff --git a/MtdrSpring/state/REGION b/MtdrSpring/state/REGION new file mode 100644 index 000000000..1849cad09 --- /dev/null +++ b/MtdrSpring/state/REGION @@ -0,0 +1 @@ +mx-queretaro-1 diff --git a/MtdrSpring/state/RUN_NAME b/MtdrSpring/state/RUN_NAME new file mode 100644 index 000000000..5bb0f2bdd --- /dev/null +++ b/MtdrSpring/state/RUN_NAME @@ -0,0 +1 @@ +reacttodo diff --git a/MtdrSpring/state/RUN_TYPE b/MtdrSpring/state/RUN_TYPE new file mode 100644 index 000000000..d00491fd7 --- /dev/null +++ b/MtdrSpring/state/RUN_TYPE @@ -0,0 +1 @@ +1 diff --git a/MtdrSpring/state/SETUP_VERIFIED b/MtdrSpring/state/SETUP_VERIFIED new file mode 100644 index 000000000..e69de29bb diff --git a/MtdrSpring/state/SSL b/MtdrSpring/state/SSL new file mode 100644 index 000000000..e69de29bb diff --git a/MtdrSpring/state/TENANCY_OCID b/MtdrSpring/state/TENANCY_OCID new file mode 100644 index 000000000..23f5fcce6 --- /dev/null +++ b/MtdrSpring/state/TENANCY_OCID @@ -0,0 +1 @@ +ocid1.tenancy.oc1..aaaaaaaastii663ojysbkcmmv6fgjghnktpdqne4oymk6iafim6jojielvqa diff --git a/MtdrSpring/state/TODO_USER b/MtdrSpring/state/TODO_USER new file mode 100644 index 000000000..e69de29bb diff --git a/MtdrSpring/state/UI_PASSWORD b/MtdrSpring/state/UI_PASSWORD new file mode 100644 index 000000000..e69de29bb diff --git a/MtdrSpring/state/UI_USERNAME b/MtdrSpring/state/UI_USERNAME new file mode 100644 index 000000000..039796b51 --- /dev/null +++ b/MtdrSpring/state/UI_USERNAME @@ -0,0 +1 @@ +TODOUSER2 diff --git a/MtdrSpring/state/USER_NAME b/MtdrSpring/state/USER_NAME new file mode 100644 index 000000000..9f3a52557 --- /dev/null +++ b/MtdrSpring/state/USER_NAME @@ -0,0 +1 @@ +adan.ruiz@tec.mx diff --git a/MtdrSpring/state/USER_OCID b/MtdrSpring/state/USER_OCID new file mode 100644 index 000000000..c9d49d472 --- /dev/null +++ b/MtdrSpring/state/USER_OCID @@ -0,0 +1 @@ +ocid1.user.oc1..aaaaaaaagx6ch57cautfv2in7ufxqvzxcuexpqc3rvedk3q3c5z2lczy4hqa diff --git a/MtdrSpring/state/WALLET_GET b/MtdrSpring/state/WALLET_GET new file mode 100644 index 000000000..e69de29bb From 93aac512c756a0ea2a05625097d387d5097daa72 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Wed, 5 Jun 2024 15:11:53 -0600 Subject: [PATCH 14/34] devops --- oci_devops.yml | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 oci_devops.yml diff --git a/oci_devops.yml b/oci_devops.yml new file mode 100644 index 000000000..2f703967c --- /dev/null +++ b/oci_devops.yml @@ -0,0 +1,41 @@ +version: 0.1 +component: build +timeoutInSeconds: 100 +shell: bash + +env: + variables: + JAVA_HOME: /usr/lib64/graalvm/graalvm22-ee-java17 + + exportedVariables: + - BuildServiceDemoVersion + +steps: + - type: Command + name: "Install GraalVM Enterprise 22.x Native Image for Java17" + command: yum -y install graalvm22-ee-17-native-image + + - type: Command + name: "Set PATH Variable" + command: export PATH=$JAVA_HOME/bin:$PATH + + - type: Command + name: test01 + command: pwd + + - type: Command + name: test02 + command: ls + + - type: Command + name: compile + command: (source MtdrSpring/env.sh;source MtdrSpring/backend/build.sh) + + - type: Command + name: test + command: ls MtdrSpring/backend/ + + - type: Command + name: test2 + command: ls MtdrSpring + From e7468674ab9042e9c630dbd5c2bda86e38a1726e Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Thu, 6 Jun 2024 16:39:38 -0600 Subject: [PATCH 15/34] DevOps1 --- MtdrSpring/env.sh | 18 ++++++++++-------- oci_devops.yml | 6 +++--- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/MtdrSpring/env.sh b/MtdrSpring/env.sh index 2d03c03b5..8546e5575 100644 --- a/MtdrSpring/env.sh +++ b/MtdrSpring/env.sh @@ -27,14 +27,16 @@ echo "MTDRWORKSHOP_LOCATION: $MTDRWORKSHOP_LOCATION" # Java Home # -d true if file is a directory, so it's testing if this directory exists, if it does # we are on Mac doing local dev -if test -d ~/graalvm-ce-java11-20.1.0/Contents/Home/bin; then - # We are on Mac doing local dev - export JAVA_HOME=~/graalvm-ce-java11-20.1.0/Contents/Home; -else - # Assume linux - export JAVA_HOME=~/graalvm-ce-java11-20.1.0 -fi -export PATH=$JAVA_HOME/bin:$PATH +function javahome(){ + if test -d ~/graalvm-ce-java11-20.1.0/Contents/Home/bin; then + # We are on Mac doing local dev + export JAVA_HOME=~/graalvm-ce-java11-20.1.0/Contents/Home; + else + # Assume linux + export JAVA_HOME=~/graalvm-ce-java11-20.1.0 + fi + export PATH=$JAVA_HOME/bin:$PATH +} #state directory if test -d ~/mtdrworkshop-state; then diff --git a/oci_devops.yml b/oci_devops.yml index 2f703967c..d8627ec1d 100644 --- a/oci_devops.yml +++ b/oci_devops.yml @@ -21,15 +21,15 @@ steps: - type: Command name: test01 - command: pwd + command: (echo "Vars: $JAVA_HOME") - type: Command name: test02 - command: ls + command: source MtdrSpring/env.sh - type: Command name: compile - command: (source MtdrSpring/env.sh;source MtdrSpring/backend/build.sh) + command: (source MtdrSpring/env.sh;cd backend;source build.sh) - type: Command name: test From 36bd38a9b305e91dbf6c5e5e87fc0b83e44ea3e2 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Thu, 6 Jun 2024 16:46:03 -0600 Subject: [PATCH 16/34] devops2 --- oci_devops.yml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/oci_devops.yml b/oci_devops.yml index d8627ec1d..7da95d3fe 100644 --- a/oci_devops.yml +++ b/oci_devops.yml @@ -19,23 +19,13 @@ steps: name: "Set PATH Variable" command: export PATH=$JAVA_HOME/bin:$PATH - - type: Command - name: test01 - command: (echo "Vars: $JAVA_HOME") - - - type: Command - name: test02 - command: source MtdrSpring/env.sh - - type: Command name: compile command: (source MtdrSpring/env.sh;cd backend;source build.sh) - type: Command name: test - command: ls MtdrSpring/backend/ + command: find / -name kubectl + - - type: Command - name: test2 - command: ls MtdrSpring From b731f40d07b6baf28c0d7126de00332e43e82add Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Wed, 12 Jun 2024 12:35:21 -0600 Subject: [PATCH 17/34] devops 2 --- MtdrSpring/env.sh | 22 ++++++++++++++-------- MtdrSpring/state/COMPARTMENT_OCID | 1 - MtdrSpring/state/CWALLET_SSO_AUTH_URL | 1 - MtdrSpring/state/CWALLET_SSO_OBJECT | 0 MtdrSpring/state/DB_PASSWORD | 0 MtdrSpring/state/DB_SETUP | 0 MtdrSpring/state/DB_WALLET_SECRET | 0 MtdrSpring/state/DOCKER_REGISTRY | 1 - MtdrSpring/state/GRAAL | 0 MtdrSpring/state/GRAAL_IMAGE | 0 MtdrSpring/state/HOME_REGION | 1 - MtdrSpring/state/JAVA_BUILDS | 0 MtdrSpring/state/K8S_PROVISIONING | 0 MtdrSpring/state/KUBECTL | 0 MtdrSpring/state/MTDR_DB_NAME | 1 - MtdrSpring/state/MTDR_DB_OCID | 1 - MtdrSpring/state/MTDR_DB_PASSWORD_SET | 0 MtdrSpring/state/MTDR_KEY | 1 - MtdrSpring/state/NAMESPACE | 1 - MtdrSpring/state/OBJECT_STORE_BUCKET | 0 MtdrSpring/state/OKE_NAMESPACE | 0 MtdrSpring/state/OKE_OCID | 1 - MtdrSpring/state/OKE_SETUP | 0 MtdrSpring/state/PROVISIONING | 0 MtdrSpring/state/REGION | 1 - MtdrSpring/state/RUN_NAME | 1 - MtdrSpring/state/RUN_TYPE | 1 - MtdrSpring/state/SETUP_VERIFIED | 0 MtdrSpring/state/SSL | 0 MtdrSpring/state/TENANCY_OCID | 1 - MtdrSpring/state/TODO_USER | 0 MtdrSpring/state/UI_PASSWORD | 0 MtdrSpring/state/UI_USERNAME | 1 - MtdrSpring/state/USER_NAME | 1 - MtdrSpring/state/USER_OCID | 1 - MtdrSpring/state/WALLET_GET | 0 oci_devops.yml | 4 +--- 37 files changed, 15 insertions(+), 27 deletions(-) delete mode 100644 MtdrSpring/state/COMPARTMENT_OCID delete mode 100644 MtdrSpring/state/CWALLET_SSO_AUTH_URL delete mode 100644 MtdrSpring/state/CWALLET_SSO_OBJECT delete mode 100644 MtdrSpring/state/DB_PASSWORD delete mode 100644 MtdrSpring/state/DB_SETUP delete mode 100644 MtdrSpring/state/DB_WALLET_SECRET delete mode 100644 MtdrSpring/state/DOCKER_REGISTRY delete mode 100644 MtdrSpring/state/GRAAL delete mode 100644 MtdrSpring/state/GRAAL_IMAGE delete mode 100644 MtdrSpring/state/HOME_REGION delete mode 100644 MtdrSpring/state/JAVA_BUILDS delete mode 100644 MtdrSpring/state/K8S_PROVISIONING delete mode 100644 MtdrSpring/state/KUBECTL delete mode 100644 MtdrSpring/state/MTDR_DB_NAME delete mode 100644 MtdrSpring/state/MTDR_DB_OCID delete mode 100644 MtdrSpring/state/MTDR_DB_PASSWORD_SET delete mode 100644 MtdrSpring/state/MTDR_KEY delete mode 100644 MtdrSpring/state/NAMESPACE delete mode 100644 MtdrSpring/state/OBJECT_STORE_BUCKET delete mode 100644 MtdrSpring/state/OKE_NAMESPACE delete mode 100644 MtdrSpring/state/OKE_OCID delete mode 100644 MtdrSpring/state/OKE_SETUP delete mode 100644 MtdrSpring/state/PROVISIONING delete mode 100644 MtdrSpring/state/REGION delete mode 100644 MtdrSpring/state/RUN_NAME delete mode 100644 MtdrSpring/state/RUN_TYPE delete mode 100644 MtdrSpring/state/SETUP_VERIFIED delete mode 100644 MtdrSpring/state/SSL delete mode 100644 MtdrSpring/state/TENANCY_OCID delete mode 100644 MtdrSpring/state/TODO_USER delete mode 100644 MtdrSpring/state/UI_PASSWORD delete mode 100644 MtdrSpring/state/UI_USERNAME delete mode 100644 MtdrSpring/state/USER_NAME delete mode 100644 MtdrSpring/state/USER_OCID delete mode 100644 MtdrSpring/state/WALLET_GET diff --git a/MtdrSpring/env.sh b/MtdrSpring/env.sh index 8546e5575..cbd04dec0 100644 --- a/MtdrSpring/env.sh +++ b/MtdrSpring/env.sh @@ -17,17 +17,10 @@ function sed_i(){ } export -f sed_i - -#set mtdrworkshop_location -export MTDRWORKSHOP_LOCATION="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" -cd $MTDRWORKSHOP_LOCATION -echo "MTDRWORKSHOP_LOCATION: $MTDRWORKSHOP_LOCATION" - - # Java Home # -d true if file is a directory, so it's testing if this directory exists, if it does # we are on Mac doing local dev -function javahome(){ +function set_javahome(){ if test -d ~/graalvm-ce-java11-20.1.0/Contents/Home/bin; then # We are on Mac doing local dev export JAVA_HOME=~/graalvm-ce-java11-20.1.0/Contents/Home; @@ -38,6 +31,19 @@ function javahome(){ export PATH=$JAVA_HOME/bin:$PATH } +#set mtdrworkshop_location +export MTDRWORKSHOP_LOCATION="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +cd $MTDRWORKSHOP_LOCATION +echo "MTDRWORKSHOP_LOCATION: $MTDRWORKSHOP_LOCATION" + + +JAVA_TEST=`which java` +if [ -n $JAVA_TEST ]; then + echo "JAVA Found: $JAVA_TEST" +else + set_javahome +fi + #state directory if test -d ~/mtdrworkshop-state; then export MTDRWORKSHOP_STATE_HOME=~/mtdrworkshop-state diff --git a/MtdrSpring/state/COMPARTMENT_OCID b/MtdrSpring/state/COMPARTMENT_OCID deleted file mode 100644 index 9f7a10406..000000000 --- a/MtdrSpring/state/COMPARTMENT_OCID +++ /dev/null @@ -1 +0,0 @@ -ocid1.compartment.oc1..aaaaaaaaoeqxnq3via3vubgivqun52cgbnvf55wq74bao5boavokti4djsea diff --git a/MtdrSpring/state/CWALLET_SSO_AUTH_URL b/MtdrSpring/state/CWALLET_SSO_AUTH_URL deleted file mode 100644 index 119c4aa0d..000000000 --- a/MtdrSpring/state/CWALLET_SSO_AUTH_URL +++ /dev/null @@ -1 +0,0 @@ -https://objectstorage.mx-queretaro-1.oraclecloud.com/p/4NsEkHTcrHUbr6O7km2iE_lgRuBU5vOD5wI-Dg6f3Roux5evEhpNCnsfETcm7D5l/n/axzmghqes1gn/b/reacttodo-rolax/o/cwallet.sso diff --git a/MtdrSpring/state/CWALLET_SSO_OBJECT b/MtdrSpring/state/CWALLET_SSO_OBJECT deleted file mode 100644 index e69de29bb..000000000 diff --git a/MtdrSpring/state/DB_PASSWORD b/MtdrSpring/state/DB_PASSWORD deleted file mode 100644 index e69de29bb..000000000 diff --git a/MtdrSpring/state/DB_SETUP b/MtdrSpring/state/DB_SETUP deleted file mode 100644 index e69de29bb..000000000 diff --git a/MtdrSpring/state/DB_WALLET_SECRET b/MtdrSpring/state/DB_WALLET_SECRET deleted file mode 100644 index e69de29bb..000000000 diff --git a/MtdrSpring/state/DOCKER_REGISTRY b/MtdrSpring/state/DOCKER_REGISTRY deleted file mode 100644 index 9e6b4874f..000000000 --- a/MtdrSpring/state/DOCKER_REGISTRY +++ /dev/null @@ -1 +0,0 @@ -mx-queretaro-1.ocir.io/axzmghqes1gn/reacttodo/rolax diff --git a/MtdrSpring/state/GRAAL b/MtdrSpring/state/GRAAL deleted file mode 100644 index e69de29bb..000000000 diff --git a/MtdrSpring/state/GRAAL_IMAGE b/MtdrSpring/state/GRAAL_IMAGE deleted file mode 100644 index e69de29bb..000000000 diff --git a/MtdrSpring/state/HOME_REGION b/MtdrSpring/state/HOME_REGION deleted file mode 100644 index 1849cad09..000000000 --- a/MtdrSpring/state/HOME_REGION +++ /dev/null @@ -1 +0,0 @@ -mx-queretaro-1 diff --git a/MtdrSpring/state/JAVA_BUILDS b/MtdrSpring/state/JAVA_BUILDS deleted file mode 100644 index e69de29bb..000000000 diff --git a/MtdrSpring/state/K8S_PROVISIONING b/MtdrSpring/state/K8S_PROVISIONING deleted file mode 100644 index e69de29bb..000000000 diff --git a/MtdrSpring/state/KUBECTL b/MtdrSpring/state/KUBECTL deleted file mode 100644 index e69de29bb..000000000 diff --git a/MtdrSpring/state/MTDR_DB_NAME b/MtdrSpring/state/MTDR_DB_NAME deleted file mode 100644 index 973cf2417..000000000 --- a/MtdrSpring/state/MTDR_DB_NAME +++ /dev/null @@ -1 +0,0 @@ -reacttodorolax diff --git a/MtdrSpring/state/MTDR_DB_OCID b/MtdrSpring/state/MTDR_DB_OCID deleted file mode 100644 index 24cdd1e70..000000000 --- a/MtdrSpring/state/MTDR_DB_OCID +++ /dev/null @@ -1 +0,0 @@ -ocid1.autonomousdatabase.oc1.mx-queretaro-1.anyxeljr747kqnaahtqfa6m3kuduo6uh6yrwkuudrnxtaz5aelicsc3km3kq diff --git a/MtdrSpring/state/MTDR_DB_PASSWORD_SET b/MtdrSpring/state/MTDR_DB_PASSWORD_SET deleted file mode 100644 index e69de29bb..000000000 diff --git a/MtdrSpring/state/MTDR_KEY b/MtdrSpring/state/MTDR_KEY deleted file mode 100644 index 0f6dcfae2..000000000 --- a/MtdrSpring/state/MTDR_KEY +++ /dev/null @@ -1 +0,0 @@ -rolax diff --git a/MtdrSpring/state/NAMESPACE b/MtdrSpring/state/NAMESPACE deleted file mode 100644 index 62926a881..000000000 --- a/MtdrSpring/state/NAMESPACE +++ /dev/null @@ -1 +0,0 @@ -axzmghqes1gn diff --git a/MtdrSpring/state/OBJECT_STORE_BUCKET b/MtdrSpring/state/OBJECT_STORE_BUCKET deleted file mode 100644 index e69de29bb..000000000 diff --git a/MtdrSpring/state/OKE_NAMESPACE b/MtdrSpring/state/OKE_NAMESPACE deleted file mode 100644 index e69de29bb..000000000 diff --git a/MtdrSpring/state/OKE_OCID b/MtdrSpring/state/OKE_OCID deleted file mode 100644 index 5621b6b7f..000000000 --- a/MtdrSpring/state/OKE_OCID +++ /dev/null @@ -1 +0,0 @@ -ocid1.cluster.oc1.mx-queretaro-1.aaaaaaaauklpe5idnv3upvntljdcikzgwgu3gqcaahxbenoctcf5oyg7677a diff --git a/MtdrSpring/state/OKE_SETUP b/MtdrSpring/state/OKE_SETUP deleted file mode 100644 index e69de29bb..000000000 diff --git a/MtdrSpring/state/PROVISIONING b/MtdrSpring/state/PROVISIONING deleted file mode 100644 index e69de29bb..000000000 diff --git a/MtdrSpring/state/REGION b/MtdrSpring/state/REGION deleted file mode 100644 index 1849cad09..000000000 --- a/MtdrSpring/state/REGION +++ /dev/null @@ -1 +0,0 @@ -mx-queretaro-1 diff --git a/MtdrSpring/state/RUN_NAME b/MtdrSpring/state/RUN_NAME deleted file mode 100644 index 5bb0f2bdd..000000000 --- a/MtdrSpring/state/RUN_NAME +++ /dev/null @@ -1 +0,0 @@ -reacttodo diff --git a/MtdrSpring/state/RUN_TYPE b/MtdrSpring/state/RUN_TYPE deleted file mode 100644 index d00491fd7..000000000 --- a/MtdrSpring/state/RUN_TYPE +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/MtdrSpring/state/SETUP_VERIFIED b/MtdrSpring/state/SETUP_VERIFIED deleted file mode 100644 index e69de29bb..000000000 diff --git a/MtdrSpring/state/SSL b/MtdrSpring/state/SSL deleted file mode 100644 index e69de29bb..000000000 diff --git a/MtdrSpring/state/TENANCY_OCID b/MtdrSpring/state/TENANCY_OCID deleted file mode 100644 index 23f5fcce6..000000000 --- a/MtdrSpring/state/TENANCY_OCID +++ /dev/null @@ -1 +0,0 @@ -ocid1.tenancy.oc1..aaaaaaaastii663ojysbkcmmv6fgjghnktpdqne4oymk6iafim6jojielvqa diff --git a/MtdrSpring/state/TODO_USER b/MtdrSpring/state/TODO_USER deleted file mode 100644 index e69de29bb..000000000 diff --git a/MtdrSpring/state/UI_PASSWORD b/MtdrSpring/state/UI_PASSWORD deleted file mode 100644 index e69de29bb..000000000 diff --git a/MtdrSpring/state/UI_USERNAME b/MtdrSpring/state/UI_USERNAME deleted file mode 100644 index 039796b51..000000000 --- a/MtdrSpring/state/UI_USERNAME +++ /dev/null @@ -1 +0,0 @@ -TODOUSER2 diff --git a/MtdrSpring/state/USER_NAME b/MtdrSpring/state/USER_NAME deleted file mode 100644 index 9f3a52557..000000000 --- a/MtdrSpring/state/USER_NAME +++ /dev/null @@ -1 +0,0 @@ -adan.ruiz@tec.mx diff --git a/MtdrSpring/state/USER_OCID b/MtdrSpring/state/USER_OCID deleted file mode 100644 index c9d49d472..000000000 --- a/MtdrSpring/state/USER_OCID +++ /dev/null @@ -1 +0,0 @@ -ocid1.user.oc1..aaaaaaaagx6ch57cautfv2in7ufxqvzxcuexpqc3rvedk3q3c5z2lczy4hqa diff --git a/MtdrSpring/state/WALLET_GET b/MtdrSpring/state/WALLET_GET deleted file mode 100644 index e69de29bb..000000000 diff --git a/oci_devops.yml b/oci_devops.yml index 7da95d3fe..90f46493f 100644 --- a/oci_devops.yml +++ b/oci_devops.yml @@ -23,9 +23,7 @@ steps: name: compile command: (source MtdrSpring/env.sh;cd backend;source build.sh) - - type: Command - name: test - command: find / -name kubectl + From 104aa60795076beb966d2d60be9446df978c88a4 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Wed, 12 Jun 2024 13:41:09 -0600 Subject: [PATCH 18/34] DevOps 3 --- oci_devops.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/oci_devops.yml b/oci_devops.yml index 90f46493f..303039ca7 100644 --- a/oci_devops.yml +++ b/oci_devops.yml @@ -21,7 +21,12 @@ steps: - type: Command name: compile - command: (source MtdrSpring/env.sh;cd backend;source build.sh) + command: cd MtdrSpring; + oci os object get --bucket-name reacttodo-rolax --name deployment_config.tgz --file deployment_config.tgz; + tar -xzvf deployment_config.tgz; + ls; + source env.sh; + (source MtdrSpring/env.sh;cd backend;source build.sh) From a7adeec7f1316700407fd125831c6a9af0354aae Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Wed, 12 Jun 2024 13:43:48 -0600 Subject: [PATCH 19/34] DevOps4 --- oci_devops.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oci_devops.yml b/oci_devops.yml index 303039ca7..e16f54126 100644 --- a/oci_devops.yml +++ b/oci_devops.yml @@ -1,6 +1,6 @@ version: 0.1 component: build -timeoutInSeconds: 100 +timeoutInSeconds: 300 shell: bash env: From aa53e6887758d44ee3f27551b0740b0ad37db737 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Wed, 12 Jun 2024 14:30:35 -0600 Subject: [PATCH 20/34] Docker Login Support --- oci_devops.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/oci_devops.yml b/oci_devops.yml index e16f54126..6b700370b 100644 --- a/oci_devops.yml +++ b/oci_devops.yml @@ -1,6 +1,6 @@ version: 0.1 component: build -timeoutInSeconds: 300 +timeoutInSeconds: 600 shell: bash env: @@ -20,13 +20,13 @@ steps: command: export PATH=$JAVA_HOME/bin:$PATH - type: Command - name: compile + name: "Compile and Push" command: cd MtdrSpring; oci os object get --bucket-name reacttodo-rolax --name deployment_config.tgz --file deployment_config.tgz; tar -xzvf deployment_config.tgz; - ls; source env.sh; - (source MtdrSpring/env.sh;cd backend;source build.sh) + cat at.cfg | docker login -u "axzmghqes1gn/adan.ruiz@tec.mx" --password-stdin mx-queretaro-1.ocir.io + (cd backend;source build.sh) From 373585c88254e036546b0ac6dceda9d83a3e8944 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Wed, 12 Jun 2024 15:17:47 -0600 Subject: [PATCH 21/34] DevOps 5 --- oci_devops.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/oci_devops.yml b/oci_devops.yml index 6b700370b..9d88e452a 100644 --- a/oci_devops.yml +++ b/oci_devops.yml @@ -20,7 +20,7 @@ steps: command: export PATH=$JAVA_HOME/bin:$PATH - type: Command - name: "Compile and Push" + name: "Docker Login" command: cd MtdrSpring; oci os object get --bucket-name reacttodo-rolax --name deployment_config.tgz --file deployment_config.tgz; tar -xzvf deployment_config.tgz; @@ -28,7 +28,11 @@ steps: cat at.cfg | docker login -u "axzmghqes1gn/adan.ruiz@tec.mx" --password-stdin mx-queretaro-1.ocir.io (cd backend;source build.sh) - + - type: Command + name: "Build" + command: cd MtdrSpring; + source env.sh; + (cd backend;source build.sh) From 4cd07b23169c12a1a618ae04150467032cdf6a56 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Wed, 12 Jun 2024 15:34:11 -0600 Subject: [PATCH 22/34] DevOps6 --- oci_devops.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/oci_devops.yml b/oci_devops.yml index 9d88e452a..bb533e533 100644 --- a/oci_devops.yml +++ b/oci_devops.yml @@ -26,7 +26,6 @@ steps: tar -xzvf deployment_config.tgz; source env.sh; cat at.cfg | docker login -u "axzmghqes1gn/adan.ruiz@tec.mx" --password-stdin mx-queretaro-1.ocir.io - (cd backend;source build.sh) - type: Command name: "Build" From 7014b74a501e427b9fa0d32978829a4a4fa3d781 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Tue, 13 Aug 2024 12:12:42 -0600 Subject: [PATCH 23/34] k8s version --- MtdrSpring/terraform/containerengine.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MtdrSpring/terraform/containerengine.tf b/MtdrSpring/terraform/containerengine.tf index 0d3ff1a51..e960bf959 100644 --- a/MtdrSpring/terraform/containerengine.tf +++ b/MtdrSpring/terraform/containerengine.tf @@ -8,7 +8,7 @@ resource "oci_containerengine_cluster" "mtdrworkshop_cluster" { ] subnet_id = oci_core_subnet.endpoint.id } - kubernetes_version = "v1.29.1" + kubernetes_version = "v1.30.1" name = "mtdrworkshopcluster-${var.mtdrKey}" vcn_id = oci_core_vcn.okevcn.id #optional From 1e025893cb52f85b92ceab4a0f13e3c26b700cf7 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Tue, 13 Aug 2024 12:41:06 -0600 Subject: [PATCH 24/34] k8s version --- MtdrSpring/terraform/containerengine.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MtdrSpring/terraform/containerengine.tf b/MtdrSpring/terraform/containerengine.tf index e960bf959..3318bb056 100644 --- a/MtdrSpring/terraform/containerengine.tf +++ b/MtdrSpring/terraform/containerengine.tf @@ -36,7 +36,7 @@ resource "oci_containerengine_node_pool" "oke_node_pool" { #Required cluster_id = oci_containerengine_cluster.mtdrworkshop_cluster.id compartment_id = var.ociCompartmentOcid - kubernetes_version = "v1.29.1" + kubernetes_version = "v1.30.1" name = "Pool" node_shape = "VM.Standard.A1.Flex" node_shape_config { From 638953fd2788209b849e2e60ae8f39fb2040f159 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Thu, 22 Aug 2024 11:38:24 -0600 Subject: [PATCH 25/34] node shape --- MtdrSpring/terraform/containerengine.tf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MtdrSpring/terraform/containerengine.tf b/MtdrSpring/terraform/containerengine.tf index 3318bb056..da9966c32 100644 --- a/MtdrSpring/terraform/containerengine.tf +++ b/MtdrSpring/terraform/containerengine.tf @@ -38,7 +38,8 @@ resource "oci_containerengine_node_pool" "oke_node_pool" { compartment_id = var.ociCompartmentOcid kubernetes_version = "v1.30.1" name = "Pool" - node_shape = "VM.Standard.A1.Flex" + #node_shape = "VM.Standard.A1.Flex" + node_shape = "VM.Standard.E2.1" node_shape_config { memory_in_gbs = 6 ocpus = 2 From af3050d32365ddb7c20dd923edbd483eb5da8584 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Thu, 22 Aug 2024 11:59:16 -0600 Subject: [PATCH 26/34] Image - Shape Compatibility --- MtdrSpring/terraform/containerengine.tf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/MtdrSpring/terraform/containerengine.tf b/MtdrSpring/terraform/containerengine.tf index da9966c32..5fee48896 100644 --- a/MtdrSpring/terraform/containerengine.tf +++ b/MtdrSpring/terraform/containerengine.tf @@ -38,8 +38,7 @@ resource "oci_containerengine_node_pool" "oke_node_pool" { compartment_id = var.ociCompartmentOcid kubernetes_version = "v1.30.1" name = "Pool" - #node_shape = "VM.Standard.A1.Flex" - node_shape = "VM.Standard.E2.1" + #node_shape = "VM.Standard.A1.Flex" #Always Free Option node_shape_config { memory_in_gbs = 6 ocpus = 2 @@ -81,5 +80,7 @@ data "oci_containerengine_node_pool_option" "mtdrworkshop_node_pool_option" { } locals { all_sources = data.oci_containerengine_node_pool_option.mtdrworkshop_node_pool_option.sources - oracle_linux_images = [for source in local.all_sources : source.image_id if length(regexall("Oracle-Linux-[0-9]*.[0-9]*-aarch64-20[0-9]*",source.source_name)) > 0] + #oracle_linux_images = [for source in local.all_sources : source.image_id if length(regexall("Oracle-Linux-[0-9]*.[0-9]*-aarch64-20[0-9]*",source.source_name)) > 0] #ARM Option + oracle_linux_images = [for source in local.all_sources : source.image_id if length(regexall("Oracle-Linux-[0-9]*.[0-9]*-20[0-9]*",source.source_name)) > 0] + } \ No newline at end of file From ad7fece6fef5116de41f89597ad5c5b800dd2fde Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Thu, 22 Aug 2024 12:04:32 -0600 Subject: [PATCH 27/34] Bug NS --- MtdrSpring/terraform/containerengine.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/MtdrSpring/terraform/containerengine.tf b/MtdrSpring/terraform/containerengine.tf index 5fee48896..fb1ea1a4f 100644 --- a/MtdrSpring/terraform/containerengine.tf +++ b/MtdrSpring/terraform/containerengine.tf @@ -39,6 +39,7 @@ resource "oci_containerengine_node_pool" "oke_node_pool" { kubernetes_version = "v1.30.1" name = "Pool" #node_shape = "VM.Standard.A1.Flex" #Always Free Option + node_shape = "VM.Standard.E2.1" node_shape_config { memory_in_gbs = 6 ocpus = 2 From b4a7a5f18a4fe2f1f7514aa3b7fb912e04080b04 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Thu, 22 Aug 2024 12:23:07 -0600 Subject: [PATCH 28/34] shape --- MtdrSpring/terraform/containerengine.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MtdrSpring/terraform/containerengine.tf b/MtdrSpring/terraform/containerengine.tf index fb1ea1a4f..fb8cf402a 100644 --- a/MtdrSpring/terraform/containerengine.tf +++ b/MtdrSpring/terraform/containerengine.tf @@ -38,8 +38,8 @@ resource "oci_containerengine_node_pool" "oke_node_pool" { compartment_id = var.ociCompartmentOcid kubernetes_version = "v1.30.1" name = "Pool" - #node_shape = "VM.Standard.A1.Flex" #Always Free Option - node_shape = "VM.Standard.E2.1" + #node_shape = "VM.Standard.A1.Flex" #Always Free Option + node_shape = "VM.Standard.E3.Flex" node_shape_config { memory_in_gbs = 6 ocpus = 2 From 1b29e3b2bad640dd6be6a1febcdf784f9b577396 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Mon, 26 Aug 2024 11:50:22 -0600 Subject: [PATCH 29/34] namespace bug --- MtdrSpring/terraform/object_storage.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MtdrSpring/terraform/object_storage.tf b/MtdrSpring/terraform/object_storage.tf index 41b642471..4f171cda6 100644 --- a/MtdrSpring/terraform/object_storage.tf +++ b/MtdrSpring/terraform/object_storage.tf @@ -5,7 +5,7 @@ data oci_objectstorage_namespace namespace { resource "oci_objectstorage_bucket" dbbucket { #Required + namespace = data.oci_objectstorage_namespace.namespace.namespace compartment_id = var.ociCompartmentOcid name = "${var.runName}-${var.mtdrKey}" - namespace = data.oci_objectstorage_namespace.namespace.namespace } \ No newline at end of file From 2bccee48c99340615493bbc8b8075bc6fd31f759 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Tue, 27 Aug 2024 12:29:27 -0600 Subject: [PATCH 30/34] x86 --- MtdrSpring/backend/Dockerfile | 6 +++--- MtdrSpring/backend/build.sh | 2 +- MtdrSpring/utils/java-builds.sh | 3 ++- MtdrSpring/utils/main-setup.sh | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/MtdrSpring/backend/Dockerfile b/MtdrSpring/backend/Dockerfile index 0347aabd3..45fb3d930 100644 --- a/MtdrSpring/backend/Dockerfile +++ b/MtdrSpring/backend/Dockerfile @@ -1,6 +1,6 @@ -FROM openjdk:11 -COPY pom.xml /tmp/ -COPY src /tmp/src/ +FROM openjdk:22 +#COPY pom.xml /tmp/ +#COPY src /tmp/src/ WORKDIR /tmp/ EXPOSE 8080 COPY target/MyTodoList-0.0.1-SNAPSHOT.jar MyTodoList.jar diff --git a/MtdrSpring/backend/build.sh b/MtdrSpring/backend/build.sh index b7019a3d3..e2bbf6e68 100755 --- a/MtdrSpring/backend/build.sh +++ b/MtdrSpring/backend/build.sh @@ -20,5 +20,5 @@ docker build -f Dockerfile -t $IMAGE . docker push $IMAGE if [ $? -eq 0 ]; then - docker rmi "$IMAGE" + docker rmi "$IMAGE" #local fi \ No newline at end of file diff --git a/MtdrSpring/utils/java-builds.sh b/MtdrSpring/utils/java-builds.sh index eab679757..5c0a97f85 100755 --- a/MtdrSpring/utils/java-builds.sh +++ b/MtdrSpring/utils/java-builds.sh @@ -21,7 +21,8 @@ BUILDS="todolistapp-springboot" while ! state_done GRAAL; do if ! test -d ~/graalvm-ce-java11-20.1.0; then echo "downloading graalVM" - curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java11-linux-aarch64-20.1.0.tar.gz | tar xz + curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java11-linux-amd64-20.1.0.tar.gz | tar xz + #curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java11-linux-aarch64-20.1.0.tar.gz | tar xz mv graalvm-ce-java11-20.1.0 ~/ fi state_set_done GRAAL diff --git a/MtdrSpring/utils/main-setup.sh b/MtdrSpring/utils/main-setup.sh index e63470ce6..3b7f5920d 100755 --- a/MtdrSpring/utils/main-setup.sh +++ b/MtdrSpring/utils/main-setup.sh @@ -162,6 +162,7 @@ while ! state_done DOCKER_REGISTRY; do if test $(state_get RUN_TYPE) -ne 3; then ##export OCI_CLI_PROFILE=$(state_get HOME_REGION) ## have to get rid of this for non instance_principal based stuff if ! TOKEN=`oci iam auth-token create --user-id "$(state_get USER_OCID)" --description 'mtdr docker login' --query 'data.token' --raw-output 2>$MTDRWORKSHOP_LOG/docker_registry_err`; then + sleep 60 if grep UserCapacityExceeded $MTDRWORKSHOP_LOG/docker_registry_err >/dev/null; then # The key already exists echo 'ERROR: Failed to create auth token. Please delete an old token from the OCI Console (Profile -> User Settings -> Auth Tokens).' From 31f5a2716090707aca10c7de6de79848b31939f8 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Tue, 27 Aug 2024 13:31:39 -0600 Subject: [PATCH 31/34] Extra Validations --- MtdrSpring/backend/build.sh | 6 +++--- MtdrSpring/backend/deploy.sh | 20 ++++++++++++++++---- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/MtdrSpring/backend/build.sh b/MtdrSpring/backend/build.sh index e2bbf6e68..9599b18a4 100755 --- a/MtdrSpring/backend/build.sh +++ b/MtdrSpring/backend/build.sh @@ -5,14 +5,14 @@ export IMAGE_VERSION=0.1 if [ -z "$DOCKER_REGISTRY" ]; then - echo "DOCKER_REGISTRY not set. Will get it with state_get" - export DOCKER_REGISTRY=$(state_get DOCKER_REGISTRY) + export DOCKER_REGISTRY=$(state_get DOCKER_REGISTRY) + echo "DOCKER_REGISTRY set." fi - if [ -z "$DOCKER_REGISTRY" ]; then echo "Error: DOCKER_REGISTRY env variable needs to be set!" exit 1 fi + export IMAGE=${DOCKER_REGISTRY}/${IMAGE_NAME}:${IMAGE_VERSION} mvn clean package spring-boot:repackage diff --git a/MtdrSpring/backend/deploy.sh b/MtdrSpring/backend/deploy.sh index 40ade7916..f0ac7ee05 100755 --- a/MtdrSpring/backend/deploy.sh +++ b/MtdrSpring/backend/deploy.sh @@ -1,13 +1,26 @@ #!/bin/bash SCRIPT_DIR=$(pwd) + +function + +if [ -z "$DOCKER_REGISTRY" ]; then + export DOCKER_REGISTRY=$(state_get DOCKER_REGISTRY) + echo "DOCKER_REGISTRY set." +fi +if [ -z "$DOCKER_REGISTRY" ]; then + echo "Error: DOCKER_REGISTRY env variable needs to be set!" + exit 1 +fi + if [ -z "$TODO_PDB_NAME" ]; then - echo "TODO_PDB_NAME not set. Will get it with state_get" - export TODO_PDB_NAME=$(state_get MTDR_DB_NAME) + export TODO_PDB_NAME=$(state_get MTDR_DB_NAME) + echo "TODO_PDB_NAME set." fi if [ -z "$TODO_PDB_NAME" ]; then echo "Error: TODO_PDB_NAME env variable needs to be set!" exit 1 fi + if [ -z "$OCI_REGION" ]; then echo "OCI_REGION not set. Will get it with state_get" export OCI_REGION=$(state_get REGION) @@ -19,9 +32,8 @@ fi if [ -z "$UI_USERNAME" ]; then echo "UI_USERNAME not set. Will get it with state_get" - export UI_USERNAME=$(state_get UI_USERNAME) + export UI_USERNAME=$(state_get UI_USERNAME) fi - if [ -z "$UI_USERNAME" ]; then echo "Error: UI_USERNAME env variable needs to be set!" exit 1 From c4b2e419c60b38801505f208ff04570aa63e588c Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Tue, 27 Aug 2024 13:38:09 -0600 Subject: [PATCH 32/34] Destroy advise --- MtdrSpring/backend/deploy.sh | 3 +-- MtdrSpring/destroy.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/MtdrSpring/backend/deploy.sh b/MtdrSpring/backend/deploy.sh index f0ac7ee05..dcfad063b 100755 --- a/MtdrSpring/backend/deploy.sh +++ b/MtdrSpring/backend/deploy.sh @@ -1,8 +1,7 @@ #!/bin/bash SCRIPT_DIR=$(pwd) -function - +#Validation if [ -z "$DOCKER_REGISTRY" ]; then export DOCKER_REGISTRY=$(state_get DOCKER_REGISTRY) echo "DOCKER_REGISTRY set." diff --git a/MtdrSpring/destroy.sh b/MtdrSpring/destroy.sh index 48512b0a0..661586fa9 100755 --- a/MtdrSpring/destroy.sh +++ b/MtdrSpring/destroy.sh @@ -25,4 +25,4 @@ echo ' 3. Manually check/remove Auth Tokens' echo ' 4. Manually check/remove Buckets from compartment' echo ' 5. Manually check/remove Compute Instances from compartment' echo ' 6. Manually check/remove ATP DB from compartment' -echo ' 7. Try remove renamed compartment' +echo ' 7. Try remove compartment elements through Tenancy Explorer' From 9a2d93f4807b5852cb31178a09c6138b942e6cb4 Mon Sep 17 00:00:00 2001 From: Adan Ruiz Date: Tue, 3 Sep 2024 11:59:43 -0600 Subject: [PATCH 33/34] image regex --- MtdrSpring/terraform/containerengine.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MtdrSpring/terraform/containerengine.tf b/MtdrSpring/terraform/containerengine.tf index fb8cf402a..69f09318b 100644 --- a/MtdrSpring/terraform/containerengine.tf +++ b/MtdrSpring/terraform/containerengine.tf @@ -70,7 +70,7 @@ resource "oci_containerengine_node_pool" "oke_node_pool" { #boot_volume_size_in_gbs = "60" } //quantity_per_subnet = 1 - ssh_public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsXyGATqdTnvEDe0aYHGL+QQDjUXf6EIBlKiNLYR4gZhStp4yfn/MEWmCMGg3cbne04HlaeO3zGrUnrtfAQE90XccW9Dc4WkhLYf2vucja9NezAVQZE2qBYiwdZSF9G/FwPI1DzfbXF2UAAN3ix/IwJSWN3KZnd1FOcHOA052QMa7jGOIbi8+skKqkys3gcTaor7eXe/wONimkpPevF30FTQZpsQFU7ZzYcFM3C+XVZ2/UVtZ/MaDf73ub6mYNMpDtDCTMo9FyujzK84EKWIytAKofNwJ/Og3Wqr+CKAeLgCMtWp0926w+ff8dJRDuOxlxgJB48YaFSvjIr4lAv/aX rafael_a_g@6ab23190fb98" + //ssh_public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsXyGATqdTnvEDe0aYHGL+QQDjUXf6EIBlKiNLYR4gZhStp4yfn/MEWmCMGg3cbne04HlaeO3zGrUnrtfAQE90XccW9Dc4WkhLYf2vucja9NezAVQZE2qBYiwdZSF9G/FwPI1DzfbXF2UAAN3ix/IwJSWN3KZnd1FOcHOA052QMa7jGOIbi8+skKqkys3gcTaor7eXe/wONimkpPevF30FTQZpsQFU7ZzYcFM3C+XVZ2/UVtZ/MaDf73ub6mYNMpDtDCTMo9FyujzK84EKWIytAKofNwJ/Og3Wqr+CKAeLgCMtWp0926w+ff8dJRDuOxlxgJB48YaFSvjIr4lAv/aX rafael_a_g@6ab23190fb98" //ssh_public_key = var.resUserPublicKey } data "oci_containerengine_cluster_option" "mtdrworkshop_cluster_option" { @@ -82,6 +82,6 @@ data "oci_containerengine_node_pool_option" "mtdrworkshop_node_pool_option" { locals { all_sources = data.oci_containerengine_node_pool_option.mtdrworkshop_node_pool_option.sources #oracle_linux_images = [for source in local.all_sources : source.image_id if length(regexall("Oracle-Linux-[0-9]*.[0-9]*-aarch64-20[0-9]*",source.source_name)) > 0] #ARM Option - oracle_linux_images = [for source in local.all_sources : source.image_id if length(regexall("Oracle-Linux-[0-9]*.[0-9]*-20[0-9]*",source.source_name)) > 0] + oracle_linux_images = [for source in local.all_sources : source.image_id if length(regexall("Oracle-Linux-[0-9]*.[0-9]*-20[0-9]*.*1.30.1",source.source_name)) > 0] } \ No newline at end of file From 61cb8830eec901220277f53a8ae32191e778b73c Mon Sep 17 00:00:00 2001 From: Gabo8912 <128503197+Gabo8912@users.noreply.github.com> Date: Wed, 5 Mar 2025 10:55:54 -0600 Subject: [PATCH 34/34] Cambios a archivos para run local, presenta error con DB --- .../config/OracleConfiguration.java | 18 ++-- .../controller/ToDoItemController.java | 2 +- .../security/WebSecurityConfiguration.java | 8 +- .../src/main/resources/application.properties | 18 ++-- wallet/README | 43 ++++++++ wallet/cwallet.sso | Bin 0 -> 5349 bytes wallet/ewallet.p12 | Bin 0 -> 5304 bytes wallet/ewallet.pem | 94 ++++++++++++++++++ wallet/keystore.jks | Bin 0 -> 3192 bytes wallet/ojdbc.properties | 11 ++ wallet/sqlnet.ora | 2 + wallet/tnsnames.ora | 12 +++ wallet/truststore.jks | Bin 0 -> 2056 bytes 13 files changed, 187 insertions(+), 21 deletions(-) create mode 100644 wallet/README create mode 100644 wallet/cwallet.sso create mode 100644 wallet/ewallet.p12 create mode 100644 wallet/ewallet.pem create mode 100644 wallet/keystore.jks create mode 100644 wallet/ojdbc.properties create mode 100644 wallet/sqlnet.ora create mode 100644 wallet/tnsnames.ora create mode 100644 wallet/truststore.jks diff --git a/MtdrSpring/backend/src/main/java/com/springboot/MyTodoList/config/OracleConfiguration.java b/MtdrSpring/backend/src/main/java/com/springboot/MyTodoList/config/OracleConfiguration.java index b672e55f3..f7367f0e5 100644 --- a/MtdrSpring/backend/src/main/java/com/springboot/MyTodoList/config/OracleConfiguration.java +++ b/MtdrSpring/backend/src/main/java/com/springboot/MyTodoList/config/OracleConfiguration.java @@ -30,21 +30,21 @@ public class OracleConfiguration { @Bean public DataSource dataSource() throws SQLException{ OracleDataSource ds = new OracleDataSource(); - ds.setDriverType(env.getProperty("driver_class_name")); + /* ds.setDriverType(env.getProperty("driver_class_name")); logger.info("Using Driver " + env.getProperty("driver_class_name")); ds.setURL(env.getProperty("db_url")); logger.info("Using URL: " + env.getProperty("db_url")); ds.setUser(env.getProperty("db_user")); logger.info("Using Username " + env.getProperty("db_user")); - ds.setPassword(env.getProperty("dbpassword")); + ds.setPassword(env.getProperty("dbpassword")); */ // For local testing -// ds.setDriverType(dbSettings.getDriver_class_name()); -// logger.info("Using Driver " + dbSettings.getDriver_class_name()); -// ds.setURL(dbSettings.getUrl()); -// logger.info("Using URL: " + dbSettings.getUrl()); -// ds.setUser(dbSettings.getUsername()); -// logger.info("Using Username: " + dbSettings.getUsername()); -// ds.setPassword(dbSettings.getPassword()); + ds.setDriverType(dbSettings.getDriver_class_name()); + logger.info("Using Driver " + dbSettings.getDriver_class_name()); + ds.setURL(dbSettings.getUrl()); + logger.info("Using URL: " + dbSettings.getUrl()); + ds.setUser(dbSettings.getUsername()); + logger.info("Using Username: " + dbSettings.getUsername()); + ds.setPassword(dbSettings.getPassword()); return ds; } } diff --git a/MtdrSpring/backend/src/main/java/com/springboot/MyTodoList/controller/ToDoItemController.java b/MtdrSpring/backend/src/main/java/com/springboot/MyTodoList/controller/ToDoItemController.java index dfaacf4d4..dfd3f9f59 100644 --- a/MtdrSpring/backend/src/main/java/com/springboot/MyTodoList/controller/ToDoItemController.java +++ b/MtdrSpring/backend/src/main/java/com/springboot/MyTodoList/controller/ToDoItemController.java @@ -20,7 +20,7 @@ public class ToDoItemController { public List getAllToDoItems(){ return toDoItemService.findAll(); } - //@CrossOrigin + //@CrossOriginFailed to load resource: the server responded with a status of 500 () @GetMapping(value = "/todolist/{id}") public ResponseEntity getToDoItemById(@PathVariable int id){ try{ diff --git a/MtdrSpring/backend/src/main/java/com/springboot/MyTodoList/security/WebSecurityConfiguration.java b/MtdrSpring/backend/src/main/java/com/springboot/MyTodoList/security/WebSecurityConfiguration.java index 91d3c5107..fd607a16a 100644 --- a/MtdrSpring/backend/src/main/java/com/springboot/MyTodoList/security/WebSecurityConfiguration.java +++ b/MtdrSpring/backend/src/main/java/com/springboot/MyTodoList/security/WebSecurityConfiguration.java @@ -1,6 +1,5 @@ package com.springboot.MyTodoList.security; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; @@ -12,8 +11,9 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity httpSecurity) throws Exception { - httpSecurity.csrf().disable(); - httpSecurity.authorizeRequests().anyRequest().authenticated().and(). - formLogin().and().logout().permitAll(); + httpSecurity + .csrf(csrf -> csrf.disable()) + .authorizeRequests(requests -> requests + .antMatchers("/**").permitAll()); } } diff --git a/MtdrSpring/backend/src/main/resources/application.properties b/MtdrSpring/backend/src/main/resources/application.properties index ba4259b1a..5d6f35a49 100644 --- a/MtdrSpring/backend/src/main/resources/application.properties +++ b/MtdrSpring/backend/src/main/resources/application.properties @@ -1,9 +1,9 @@ #spring.jpa.database-platform=org.hibernate.dialect.Oracle12cDialect #oracle.jdbc.fanEnabled=false ##this is not used when deployed in kubernetes. Just for local testing -#spring.datasource.url=jdbc:oracle:thin:@adbps_medium?TNS_ADMIN=/Users/psong/Downloads/Wallet_ADBPS -#spring.datasource.username=admin -#spring.datasource.password=WELcome__12345 +spring.datasource.url=jdbc:oracle:thin:@oraclebotdbteam16_high?TNS_ADMIN=D:/TECMTY/SEMESTRE_7(6)/Oracle_(Oswaldo)/RETO/oci-react-samples/wallet +spring.datasource.username=TODOUSER +spring.datasource.password=VizcaBarca10$ ##Properties of UCP spring.datasource.driver-class-name=oracle.jdbc.OracleDriver @@ -16,12 +16,16 @@ spring.datasource.oracleucp.min-pool-size=10 spring.datasource.oracleucp.max-pool-size=30 ##Logging properties for UCP -logging.level.root=trace +#logging.level.root=trace logging.file.name=logs.log -logging.level.oracle.ucp=trace +#logging.level.oracle.ucp=trace #spring.security.user.name=psong #spring.security.user.password=WELcome__12345 -#telegram.bot.token= -#telegram.bot.name= \ No newline at end of file +telegram.bot.token=7259037295:AAH8hLPfs8Q5ISfgb7mqGrenKPb_aWYMMOQ +telegram.bot.name=team_16_java_bot + +# optional, this changes the port of the development server +# set to whatever you need +server.port=8081 \ No newline at end of file diff --git a/wallet/README b/wallet/README new file mode 100644 index 000000000..29fc82f03 --- /dev/null +++ b/wallet/README @@ -0,0 +1,43 @@ +Wallet Expiry Date +----------------------- +This wallet was downloaded on 2025-03-05 14:17:31.319639 UTC. +The SSL certificates provided in this wallet will expire on 2030-03-04 14:07:49.171551 UTC. +In order to avoid any service interruptions due to an expired SSL certificate, you must re-download the wallet before this date. + +Autonomous Database Tools and Resources +--------------------------------------- + +Database Actions +---------------- +Load, explore, transform, model, and catalog your data. Use an SQL worksheet, build REST interfaces and low-code apps, manage users and connections, build and apply machine learning models. +Access Link: + +https://G10F2E5DFC4E325-ORACLEBOTDBTEAM16.adb.mx-queretaro-1.oraclecloudapps.com/ords/sql-developer + +Graph Studio +------------ +Oracle Graph Studio lets you create scalable property graph databases. Graph Studio automates the creation of graph models and in-memory graphs from database tables. It includes notebooks and developer APIs that allow you to execute graph queries using PGQL (an SQL-like graph query language) and over 50 built-in graph algorithms. Graph Studio also offers dozens of visualization, including native graph visualization. +Access Link: + +https://G10F2E5DFC4E325-ORACLEBOTDBTEAM16.adb.mx-queretaro-1.oraclecloudapps.com/graphstudio/ + +Oracle Application Express +-------------------------- +Oracle Application Express (APEX) is a low-code development platform that enables you to build scalable, secure enterprise apps that can be deployed anywhere. +Access Link: + +https://G10F2E5DFC4E325-ORACLEBOTDBTEAM16.adb.mx-queretaro-1.oraclecloudapps.com/ords/apex + +Oracle Machine Learning User Interface +-------------------------------------- +The Oracle Machine Learning User Interface provides immediate access to the Oracle Machine Learning components and functionality on Autonomous Database, including OML Notebooks, OML AutoML UI, OML Models, and template example notebooks. Through OML Notebooks, users can develop notebooks comprised of SQL, PL/SQL, R, Python, and markdown paragraphs and use OML4SQL, OML4R, and OML4Py APIs.These APIs provide access to over 30 parallelized, scalable in-database machine learningalgorithms, supporting classification, regression, anomaly detection, clustering, associations, attribute importance, feature extraction, and times series forecasting, among others. Through OML4Py and OML4R, users can invoke user-defined Python and R functions in engines spawned and controlled by the database environment, with optional data-parallel and task-parallel invocation, as well as deploy those user-defined functions from SQL and REST APIs. +Access Link: + +https://G10F2E5DFC4E325-ORACLEBOTDBTEAM16.adb.mx-queretaro-1.oraclecloudapps.com/oml/ + +SODA Drivers +------------ +Simple Oracle Document Access (SODA) is a set of APIs that let you work with JSON documents managed by the Oracle Database without needing to use SQL. SODA drivers are available for REST, Java, Node.js, Python, PL/SQL, and C. +Access Link: + +https://www.oracle.com/database/technologies/appdev/json.html#sodadrivers \ No newline at end of file diff --git a/wallet/cwallet.sso b/wallet/cwallet.sso new file mode 100644 index 0000000000000000000000000000000000000000..3f02c6ec1a30ece7626d9a94f88bc933bc0d56cc GIT binary patch literal 5349 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�qp-XgZ;`R|*FFFB>*Jf>#c=8)P6$#f^SaEhaj_o3fQzXF=tDNb4^mep zk(JV5+&Zvy`Q9#bJU9_M&l`caNy<2Ly&7u3hx_9)0!fdK`+^8FOYPNsrTEiN@gVz6 zK9(g63M#6q)k2uUqKmollDZ^Um*d%K%N$1C@BLjoA0ii_*e)m-D4b&7aU{k6>~E*7 zTBNWm6&@J?5QPPJ)M7k)VvcgZ%Ff)h*M}M^3gHL(qsHw?Z6rvL+AGu5O=(;LDs$3E z1&r2+H|m*+H|KQ#rg=$*p&eikht0;yi-!?hZkI1bDQ^-ybN?!LD^HX2rabjWTic}? zfiJ{yxd;D9UykMUdgvDwJRO)u7U(Rl`37Z!T;_KO%9_73OOq5FN!Gq17+Oilr$>dT zb|fIFify#%ZRRILXU29#`O5KuOqNGZ$xVFzSCFqp<`MtXS4kPbqH+e|!r7QKz*h9O zAlE*wL-hiFul765WZ~b-_TZ6VtkT~j&2`*s($*BSTOUuA8<q;TH+y=CMei;Ub$+3OC6$BsXXm_@I*F=BT z-}|o*{>w30Io5eMQ@34dsTiS5_1m`m&dBvP^${k7xGC+Db3Z5`_e;tTIlrZEDW9a4 z+$AUJ_%p$LelE37eP`~sTJ2{8y&^?1mN@z;@^yii!5Sc)+OyZwd3uPgUT64|@FyK38n%!E4f{>sO2tAxM zSL$$@;+%4lJGfCchpKn%qafq6jrb?n9x+HN=}iT>HHmLrBZ!ZCHltQB$tbZt%0Mp_ zt56+PoFkp-G2Mt;zLrL+Mev@v2s_Q&beFokzEu7gk2+5-Pf1`B6ZzY|heTv2CJOk^ zACM*W&ZO`$)Rih{BXwJUu?$^G{wt%ua*MC5`L=`Wvn}xrUi=F9`5iGQ>2|A#V zcV*JyZh}AC6=jI_(K5@G8DUbTLD_e7-YgTes4!8t>mA!;tRYrhGb`2#BhI=}8~^gZ z_m>gcwcgByDJ5ilF3k89NQG*1P)F>F)Mm0)fqjrNX`A09aNDejBRjXl)h}5-b<)3L zYmy*dFI9geFflM8FbM_)D-Ht!8U+9Z6pHZn+czE>%U-_MMXF)c!tU{5&;$sKh&`-b K{v#Ix0w)lABN|Nr literal 0 HcmV?d00001 diff --git a/wallet/ewallet.pem b/wallet/ewallet.pem new file mode 100644 index 000000000..72be9637a --- /dev/null +++ b/wallet/ewallet.pem @@ -0,0 +1,94 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIE6jAcBgoqhkiG9w0BDAEDMA4ECLFHBNLRhvLZAgInEASCBMiWIIZOJ3kW1Zc6 +prTqTMd+ZZKoum7YwisjO+erLg8k+LtAaL+nPstVRG2NICB9ngWhhr0dHqmt2mbi +10gyThQdB+xglShur306LEnHPN7w8IK7Z/5M6kgpG070ZXHCOwzg1WnB+d5rYF+V +y9JxGx7BnDnTj5waMzF2kzIN1EMScI69PHcaHccKZ2uxY0mrrlrOUXZintcXlDti +UAELDvqEAzbAQsphcuhhCzbt5tl+RRSOD7RN3MjdmmD+vZupSasCkAFrLz9t5L8e +Ohpj1OlbfYE4bLIZ3fIDgGydhjsDcYx/l4/Vw54KFR1KpXPbpKVRFtenlb6BvWeE ++W70qfbhXICLlcyELM40vTU9gtqMSfH+qcF81Wmgw5nV3zbzZTRS4JDGHTjnLl7t +SR4HXws6gX3V1JYyHGk2eI9pk9z1d77bbs5I2bZOSD4FZiPEGnHei4X/bQr3z8go +v1EHHlmFoRyX7Z/brUt1DOHvjT5IeVIrkLzUOU70c34C/8JE7kEPXeETU4cCbpXS +rG9j923N06UXoMh99C86cpWWv1neJkxFReDbOm0k6WsD4pQTqrpp+coQHo1gA/0u +S7gceNwsSylJqDq2G6C9wITCWUmcARJryF0gFX++o8uOfgdLk24qKBg5ewfyTWez +JlXuap+CEZwY165wJ6/ddQsr0GzLSXoS2RzeXzuxjgRQBMAf/ewrEm7ZGLsndibC +6z6o5Q5qWM1CNx2aNelZ8JOaPiSgpwrmeiXzxn57OEZWRnFaXuSOAPeuv/2GEB67 +NLfyrdZ4ksTJSCnux7GObQk9I52rODgSvPkn8jSoxVC3GMeduUHZ+jIWiS/8eDnW +OBz7R4KCStH6pigLfzxdguFcrzuBb+gjq2oFkvODd76tCvck1oqAEYmoW8QA91Ku +HW1kMsdQ7c54/kL3Dq48PeqBqt3clkz2BV4q7c28tCfiIVib8tJWeH+gFPS2lyvX +v9gTTF9r0Fwc8EjYRcTwSQ//+bWzFmRKxCvGDELcJkZE6B94+Y2h3qgZD4pg9dIr +limtd2gm2/Ro1PeQtYT2UXaCRaHouH6m4JenhhUwmNg1QxtzNHvicoMnOMANJUce +MdnBYA+2BuzMoQW2xWSkbW1oBVwebeWd4KuRQ0RmU+OXfKgrcetedd+h9HducrW2 +vN2SluVj4euE9dIDLZDwCXGdwLgYbILpkJqWyqzJhkLlAktYO/mv+9nGt4E27GoL +SsGMnWT39NosZYOqgQoAPR4B7DWS/4ConWNn1J5Gwr1kC4czs5GVyi4TO6EkuO3M +Vw5EVz/e7JRYvfzJd681kU/elaFV0dP4sMX/5Ujqsi9yBgIRx+NOMwlDx8lwxnSi +g3x+B7x1Yat/5lC8zcSAqZmW9CGABRKn6bCB5vuPfpmtVs5rg2M7lDDRRt1/yLRL +dCn0BR8fHWaNzM4af1GQ690GYSRzKyKaj9t6i23eTXAwe35xds84k3baCL90MQ3S +SnD61Zc8VSU+Kx6/M7WjMbQhu9xmxOVrqsCA43DZiYXywv3W751CY4uYpM9Y2Ojv +C0GYVRQlid+IbpbehdjOTakqj8ySIEBIknJ6gOxBzEWDEA1fwR/CuB2+KUWlCwRZ +WnaLOuDFNtnXlZLVZZo= +-----END ENCRYPTED PRIVATE KEY----- +-----BEGIN CERTIFICATE----- +MIIDUDCCAjgCAQAwDQYJKoZIhvcNAQELBQAwgaMxHzAdBgNVBAMTFkF1dG9ub21v +dXMgRGF0YWJhc2UgQ0ExRTBDBgNVBAoTPE9yYWNsZSBDb3Jwb3JhdGlvbiBBdXRv +bm9tb3VzIERhdGFiYXNlIEdsb2JhbCBTZWxmLXNpZ25lZCBDQTEXMBUGA1UEBxMO +UmVkd29vZCBTaG9yZXMxEzARBgNVBAgTCkNhbGlmb3JuaWExCzAJBgNVBAYTAlVT +MB4XDTI1MDMwNTE0MDc0MloXDTMwMDMwNDE0MDc0MlowODELMAkGA1UELhMCVjEx +KTAnBgNVBAMTIEJCNjgxNjI3OEVGOTRENjRCOTUwN0JGQzA0MzZBMTg4MIIBIjAN +BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiCQTXx7p3Oes1f0iKmKvReBQhJU1 +HfQpCkB0UKmrmdXze3pz/RZWDIenRLyn3d0kVf2keg6yNNM9I3jffNJXp1ybJGyU +IeXhNCc8vQQxLLiTCrDUpVlPYB9c1s3iEGPCM24/H7ICxhAhIfCAugDdtySSaIDC +v8FZH2/BNUevZbOWB8mETkDR2oc/fHOtkekRiLaRIbDSw8U1X+I6NjNSi+4++CzN +FJG3wtQ1M7PqtJYeSyTHY7IbZhYMheQz6zigQqAu25Yle69M0jWvn6HIPChcBpZ5 +5WDBcTJnuucaZ1v7WkoaAxMdwdGIB5N988EXgcXPGmwf0V1xkN/bpQxZOQIDAQAB +MA0GCSqGSIb3DQEBCwUAA4IBAQBHcKrZJ2Dl2dOxNoTBjCg+Cr5Ovyq5hkJ5NmeM +RV7qi0mnNPjP3HpmCenvPGSIqUstB/4zvVNsZYfpErU9yrb077IlmFlcw6S069NL +umew2+OOjiNeSU0HA/Ils8KqVsoAZnYwyHQLvz0xJhz//L98IvJiU0OqdDE/Hi4O +94i2eaU67CfKtp9YjH0ozTcDFfe/ON3nC52Q1rPt0MLsRLXwK6c+FyFSj+pH76f4 +NdYPUpgZIwvT6c2nc1YIJ8x0LPx359RRtEZ627nis7futq2caojZXQ2cfwzWIEPA +qooY1nAH9Li/Rgw4vA2ry7ldp+4suGDfj5zIPIWmRnnQZGge +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDzDCCArQCEQDg4paeOhv8mQnLbBRFJWrxMA0GCSqGSIb3DQEBCwUAMIGjMR8w +HQYDVQQDExZBdXRvbm9tb3VzIERhdGFiYXNlIENBMUUwQwYDVQQKEzxPcmFjbGUg +Q29ycG9yYXRpb24gQXV0b25vbW91cyBEYXRhYmFzZSBHbG9iYWwgU2VsZi1zaWdu +ZWQgQ0ExFzAVBgNVBAcTDlJlZHdvb2QgU2hvcmVzMRMwEQYDVQQIEwpDYWxpZm9y +bmlhMQswCQYDVQQGEwJVUzAeFw0yMTA3MDIwMzE0NDhaFw00MTA2MjcwMzE0NDha +MIGjMR8wHQYDVQQDExZBdXRvbm9tb3VzIERhdGFiYXNlIENBMUUwQwYDVQQKEzxP +cmFjbGUgQ29ycG9yYXRpb24gQXV0b25vbW91cyBEYXRhYmFzZSBHbG9iYWwgU2Vs +Zi1zaWduZWQgQ0ExFzAVBgNVBAcTDlJlZHdvb2QgU2hvcmVzMRMwEQYDVQQIEwpD +YWxpZm9ybmlhMQswCQYDVQQGEwJVUzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBAKTzW/27+ACu4dgGz69Jnymt4dMpqUm7DQz2YSEfnoXhPZcXmCy+iXd/ +YmZT5iAkuhI1XUoAg8nekPPztKTUp9+GmPzoLe40ICZePLCO1BnBoOsPeg5a6bME +6sI10X5Ckj/9IHV5ik/sO5TgGIjR36VZyG9j5sG5St25YqVAPN0/7YiiUpOwikDO +69ZQyhqCTBdsHihE1nYiF0tD4wXQ7oraW+9w9FexT7ZSGIr1588PFHHHZF1kiMGy ++OKamIZvglim9W7Eu5m+8SIL5W5vwOBVs/GbAcRZYnZFI27YjWWQxAdH4d2g4MxJ +0i+Y9mJqGTwvxHfPdULkmjE0GJpv+SMCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA +EOSJYJA4q/hIqDPhhdp6LATegA/lu7Z5K/WE/ymrVW0nMXG5Lrs2HXejmhF/0yh/ +zQ8ACNxjScLEi5f8g9Qw1l+SY2yK5phb8fCWn/MgjUw+1sYMtDViYM9UdF+SX9py ++ozpNrb/iMD88BRNHuSZb/Byrwsoe9Q7F2kda8dLhz2sdR03KR117qlhBas13y34 +SQ6JuGpY6Drv7vzvifjWxsvwlx102lljhY0pu3dZoZpMHDyXXXokMkWWAgPLxG/Z +Ynbf2V9Pmy70SDS4RGCPr8Twa7vCSvzmWRBH8qMEMtJ3BM2cKw4MvrjRmFLsK17z +U11qcDwuIRTsjiu1LMnrVg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD +QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT +MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j +b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB +CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97 +nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt +43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P +T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4 +gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO +BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR +TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw +DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr +hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg +06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF +PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls +YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk +CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4= +-----END CERTIFICATE----- diff --git a/wallet/keystore.jks b/wallet/keystore.jks new file mode 100644 index 0000000000000000000000000000000000000000..dbab82f89f25503d2858ccb4e7a7a25b5e1922bd GIT binary patch literal 3192 zcmdUwc{J4j8pmg`?^`GtV=4Ri4l`pPj4df-`x%U77<5&+gOrhx%!>oz2|rCx%b?^?;p<}@8|P8&pDs>`MjRb-qPL@2n2#01o+Qj zBZqkgk|Gb}b)PErJ`ji%0#I4@06sP@Wi~JiSP3Es2D5@#s4QP)LXSSW;(~pmuzvCI zX;pjC#VmK*$vy&W4^`@fu?vB5pY4gL=E&58j~DW6#qo?nGm0k4*r`BO#EE!s_+vKF zD|GX?T5+(%OXn$x9GCE!3hsiv@sbIlht&N|rBW59)v#al+xFT=8}cdRM-rDXBD9y1 zHosS!>iEq}jJcXxs`<;@4O}9)kp$d_d+4a5q*tKlS7>g`&X+a^fy)xh4{Q zeO@T?ZHA7V?ssmN_57c4ZN87-nF}YbM(%Q+R`~HS*}?xywxjN+`r2#m`m=)^vL8M% zcLW4YE`qK4=e1=W&uSMLo6`zirPbQJwoN8ZbkPkOMjg9(ot1Bu)5N!X)M2cVpy zYyBK%=4n#1lKntL+`?z&$*rpa_e?xk}6dp z>CEE;nICa6&5d|2!v~!RH>RCywnJwermieFy8frkQ*(-{GxoadK>Mi=8G*4QnyT7{ zfrs85ez#(cJBGwoVslAmPAE}6Yr!RCyUcMWc(?miS%BGXw!ZP1bX6(#{o&6z zU&Xnq%nW;MEk8Ya zfQ%~T?7^U0(iguc$=$J^wmv@L1?|ds);ZSFcPBJ90E0^Fc<{Mg)l${HZD9P|HqX=P zh%G(=`W@*tSkq1~hKuKFrkX=ZAf{c$f$vG1Cazmv(*AY~ToNm|eza1-?EO3fF1Py| ze$d9`o8+U0oRGejvN5|#=9y>T)%%-X%V?Mpnd?CTFt5BM$9Tm?w((*^DQ58KKz{p? zPTJ0ylum-#8UJ)>PPfDcIWCR8xt4Jjeb0aDyx*tsY;Tl9k;UYu*+@?#&dAFxWZ#&1 z_p@r=;+yRAL-s{KiuH~;Ei8W_QucNc&0K@cS;Ar;pyC?ds<$Y#(cDQ+y&{q4+V6C8 zZ_{5W*uIZdl8g07OQXW(b9+wGQ&YBB?GvO5G?v2ZN_KAWII)Jc2{OwgfYUkaU3CMO zC1x0s_Y*&a_;V_7E=6X)@egPl8B1*??326bi@E4aoh2TL?B)hl0&JaGy`tHmn%P4+ zSi@^~(Qny)QU(qovW%2r3-!0+kyz3Vp8|EYXD?5zB~=_QejELw8b38~d-Buy3)F7o zKQ|<+69NrrgFsMwfC{w%s1Pj(7zFULaVjOANc_$V26MB5fY?%`6d=h4bzp%CiyEDy zkb}u*$>+l1CY}^eqGvb>Zft}!1&n_ca0%;Khk1Gh9puPiAqQ)h;!h5S|EC`FATrT2 z2yRCT@=*=<_YEd_{~99(9QrkeU6{|7#q%a`(>wrU;%h)r>--jF) z?C*)>1~`8u*@Phub^uI_R~-##0B9r%&_t;_i}7jz2NLy{1hoEHju3`8B9V%K{I6c9 zFdT=&XdyA`np&o2+9(qY3a5<*G;wCe07?U6gw)aks9>4DTXOJIK&fDU&_SLHLIs0C z$#TN(Fvi&2gFkjdRi3xHRxvg=?W)P_FdM6iQz2ISW#yA&0A$UXHi+ka8XBo)++G(+D<@qCwsW zNJ}$gnn2@E<+A-^+FDxiQsh>&c@61t9(!lJm0|yAlEJ0$hgl54+JRTE(eBea z7!BL2%h)ZIZjr2~ZFIE882tCp7s^3_l9m~hNzACF*7_@Bit^N2pJzdt#;xs#S?bzeC z`;J{8pYuQmg}X%`dHm@9PRk{kHKLvIeG1Y5hT!|2TpwAkvnbzHU+k22S)p4KdgyzL z*7zLvt<0gvOMPvNCQq2k6<9H8+l;T~D-~PlA%5HZ!?N6ijP8nXM-KV-6qTKbIr^D8 zv#5`a(~qAn*FP)@NFE{Z7De+6!Hr+uPZb{uVc%$IG2_vC##{BSkx;R$(%>O1>L_`yP>}KI|O+skGNl;wpr_A;Bx-xpjL}LEVyy`Lve%wv3Hl2RBwPb-miqDzx znB{95y8j9;+h7-dE;7}6Q8#x|Jh^|O9N$6qnr&@7Io?PtH`E(9SW3QYn^T)=*t0NX z({+S;N-PMbU@~-GM$FRqGi%>+>Zr>~$i{Dvtm|#XQ@_pi@{5GN^(J^Hx6-zz3-S}m zRHu92g4>&KzF3vvo(U$uoOF1+S_p2(6VIE<27kCl%4}yhpBgWjd~Y$JmcL01IIO4E z9?^Ra_oV=d5-%YCko~V{3w%lO$keLZI`O;4RKjSK3d^S${+Z_bNab(w`-)W#XXTNh zjfiH9WJGC!VDz9ubT>bUW6aBhg&lgsQ->yc z^x9M0v)xC-w$m7x`u*gWJ4}(&urD{s%&;16g^P4uF@MRxx0Xrz56($yDoUPPuJmNB zLQkk}S@5Ma1USv>tSs-Wq-+hndB?mVNg2g^C0tW%j= +#javax.net.ssl.keyStore=${TNS_ADMIN}/keystore.jks +#javax.net.ssl.keyStorePassword= \ No newline at end of file diff --git a/wallet/sqlnet.ora b/wallet/sqlnet.ora new file mode 100644 index 000000000..260f677fc --- /dev/null +++ b/wallet/sqlnet.ora @@ -0,0 +1,2 @@ +WALLET_LOCATION = (SOURCE = (METHOD = file) (METHOD_DATA = (DIRECTORY="?/network/admin"))) +SSL_SERVER_DN_MATCH=yes \ No newline at end of file diff --git a/wallet/tnsnames.ora b/wallet/tnsnames.ora new file mode 100644 index 000000000..590391853 --- /dev/null +++ b/wallet/tnsnames.ora @@ -0,0 +1,12 @@ +oraclebotdbteam16_high = (description= (retry_count=20)(retry_delay=3)(address=(protocol=tcps)(port=1522)(host=adb.mx-queretaro-1.oraclecloud.com))(connect_data=(service_name=g10f2e5dfc4e325_oraclebotdbteam16_high.adb.oraclecloud.com))(security=(ssl_server_dn_match=yes))) + +oraclebotdbteam16_low = (description= (retry_count=20)(retry_delay=3)(address=(protocol=tcps)(port=1522)(host=adb.mx-queretaro-1.oraclecloud.com))(connect_data=(service_name=g10f2e5dfc4e325_oraclebotdbteam16_low.adb.oraclecloud.com))(security=(ssl_server_dn_match=yes))) + +oraclebotdbteam16_medium = (description= (retry_count=20)(retry_delay=3)(address=(protocol=tcps)(port=1522)(host=adb.mx-queretaro-1.oraclecloud.com))(connect_data=(service_name=g10f2e5dfc4e325_oraclebotdbteam16_medium.adb.oraclecloud.com))(security=(ssl_server_dn_match=yes))) + +oraclebotdbteam16_tp = (description= (retry_count=20)(retry_delay=3)(address=(protocol=tcps)(port=1522)(host=adb.mx-queretaro-1.oraclecloud.com))(connect_data=(service_name=g10f2e5dfc4e325_oraclebotdbteam16_tp.adb.oraclecloud.com))(security=(ssl_server_dn_match=yes))) + +oraclebotdbteam16_tpurgent = (description= (retry_count=20)(retry_delay=3)(address=(protocol=tcps)(port=1522)(host=adb.mx-queretaro-1.oraclecloud.com))(connect_data=(service_name=g10f2e5dfc4e325_oraclebotdbteam16_tpurgent.adb.oraclecloud.com))(security=(ssl_server_dn_match=yes))) + + + diff --git a/wallet/truststore.jks b/wallet/truststore.jks new file mode 100644 index 0000000000000000000000000000000000000000..5a28e43318312f395ba7c7d26aafa32e6617a939 GIT binary patch literal 2056 zcmezO_TO6u1_mZLmP*dEP038pOinE-QAp3pPfE;DD9X<-QAkc?U|^h@w%XK{fi*(U z)WDK~fqAn*6Z3k5CZ_2Nn3))vm;^YiAB0VCa@)ADH0xyK#N%EDylk9WZ60mkc^Mg5 zSs4rx4Y>_C*_cCF*o2uvgAGLugh3oGVICKtjm{t&J@b+cB@M(u!ra0F<>lpiFvsX6 z=jR$K7|4O7n1#jRI@}>{3<9~)+0j5woY%n2(9qBT0;0ruje$HkmmW@NVpKx*I3p_q za}y&!gFzD`7gG}>Bf}%>hk`}-RxG)^IDA#WqJHl32`3jVeJ6BoS~Mf4!WqWN%l!b_fF$_Nqtqt%*fV^yclI8@BMxUUPR?SF4$i#u>TL^x7M30 zTm&MFR+dU!y|`$f`y=(NFSCq)cyc6kUy0vh)v|x#DleZ}yYv3>Ic0GRyv--hyQB0h z_ne4SU)Je=XE%$ah#!yEoM*KE)4N}nxt*@8-tK60i|5MwAB|Uc_eR)nm44x=v8dpd zA4ZG;GJMF{bN7B-Vr*E>o7-}F7l2&GsFc53Nt^hUt z0i%JD;q)ByRUX1ZT)*zR%<&J}@a6tGmamnS9E(*X{&;J*9MIi)_4vOp2jwG9@5r4~ zRq}j>=4!#Mj|&zoJnPdjb8^qbf=8?QW%f;8`9JyU6ZVA5i}%ls=KOfI?{V;#zT{u_ z%WrQ~)Ac`PXSr&)!2xNN#SibiyzgGKb&CoItHB%Hz1;g<_Xq4;`T6w>MxnJQ zI*!dSiSOmIIrj4E)Tz1mz&TwKn9CDOOY-ybbMs4!6;cvQ5|a{(Q?X|93&2c%2AIjW zFbOg|crx4a^OU42%s;Oe}z9go&Yn znUOh^J4AdzsF+#uIr{JJ9}Mdr-e5bw-gCa@+J~1lS989Mtq z%j=WUf}bg<>=H7K^iTi0@{(%Rfn?KHGJQA5y=Bk``qc?TJ5q9^7cNaW3<9SJc z#yPCp3E{dk(ibLQyE;$pe0an2_W#KGhu?o>K`5}j32h%s?uS(*TDaD z_qIyyuPy&ISBK`R8y4==+ifOWzIc{k{bh~%v-}Jkcal919qFF_r}>J(wfITNIbF|Y zM1TA+ZT@G4ULU(_$9T4wCMBE?DT$vHf2-(M&r7py|2q!+`5@ve_he@Nhobe|8r4^< z#WQ8Ik9)VAvY zS95oHmdYUp!29xFqziKk^}a_aU!8&mslf zKP_f4x>U|`c8)e5&%PZOX9T^`j{6)On^j<=rzrBKPkXD*$=6}(#Z8`%?KaPEQHs{S MCEfW{=;VrD0N%(Ovj6}9 literal 0 HcmV?d00001