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..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 @@ -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/backend/deploy.sh b/MtdrSpring/backend/deploy.sh index 74dd5c710..dcfad063b 100755 --- a/MtdrSpring/backend/deploy.sh +++ b/MtdrSpring/backend/deploy.sh @@ -1,13 +1,25 @@ #!/bin/bash -SCRIPT_DIR=$(dirname $0) +SCRIPT_DIR=$(pwd) + +#Validation +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 +31,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 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/MtdrSpring/destroy.sh b/MtdrSpring/destroy.sh index f543f9e28..661586fa9 100755 --- a/MtdrSpring/destroy.sh +++ b/MtdrSpring/destroy.sh @@ -11,4 +11,18 @@ 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 +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' +echo ' 7. Try remove compartment elements through Tenancy Explorer' diff --git a/MtdrSpring/env.sh b/MtdrSpring/env.sh index 2d03c03b5..cbd04dec0 100644 --- a/MtdrSpring/env.sh +++ b/MtdrSpring/env.sh @@ -17,6 +17,19 @@ function sed_i(){ } export -f sed_i +# 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 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; + else + # Assume linux + export JAVA_HOME=~/graalvm-ce-java11-20.1.0 + fi + export PATH=$JAVA_HOME/bin:$PATH +} #set mtdrworkshop_location export MTDRWORKSHOP_LOCATION="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" @@ -24,17 +37,12 @@ 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 -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; +JAVA_TEST=`which java` +if [ -n $JAVA_TEST ]; then + echo "JAVA Found: $JAVA_TEST" else - # Assume linux - export JAVA_HOME=~/graalvm-ce-java11-20.1.0 + set_javahome fi -export PATH=$JAVA_HOME/bin:$PATH #state directory if test -d ~/mtdrworkshop-state; then diff --git a/MtdrSpring/terraform/containerengine.tf b/MtdrSpring/terraform/containerengine.tf index cdb76138c..69f09318b 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.30.1" name = "mtdrworkshopcluster-${var.mtdrKey}" vcn_id = oci_core_vcn.okevcn.id #optional @@ -36,12 +36,14 @@ 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.30.1" 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" #Always Free Option + node_shape = "VM.Standard.E3.Flex" + node_shape_config { + memory_in_gbs = 6 + ocpus = 2 + } #subnet_ids = [oci_core_subnet.nodePool_Subnet_1.id] #Optional node_config_details { @@ -68,7 +70,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" { @@ -79,5 +81,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]*-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]*.*1.30.1",source.source_name)) > 0] + } \ No newline at end of file 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" 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 diff --git a/MtdrSpring/utils/java-builds.sh b/MtdrSpring/utils/java-builds.sh index b191c0e09..5c0a97f85 100755 --- a/MtdrSpring/utils/java-builds.sh +++ b/MtdrSpring/utils/java-builds.sh @@ -22,6 +22,7 @@ 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 diff --git a/MtdrSpring/utils/main-setup.sh b/MtdrSpring/utils/main-setup.sh index 0f1c521ca..3b7f5920d 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 @@ -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).' @@ -172,6 +173,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 diff --git a/oci_devops.yml b/oci_devops.yml new file mode 100644 index 000000000..bb533e533 --- /dev/null +++ b/oci_devops.yml @@ -0,0 +1,37 @@ +version: 0.1 +component: build +timeoutInSeconds: 600 +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: "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; + source env.sh; + cat at.cfg | docker login -u "axzmghqes1gn/adan.ruiz@tec.mx" --password-stdin mx-queretaro-1.ocir.io + + - type: Command + name: "Build" + command: cd MtdrSpring; + source env.sh; + (cd backend;source build.sh) + + + 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 000000000..3f02c6ec1 Binary files /dev/null and b/wallet/cwallet.sso differ diff --git a/wallet/ewallet.p12 b/wallet/ewallet.p12 new file mode 100644 index 000000000..235a3c7c8 Binary files /dev/null and b/wallet/ewallet.p12 differ 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 000000000..dbab82f89 Binary files /dev/null and b/wallet/keystore.jks differ diff --git a/wallet/ojdbc.properties b/wallet/ojdbc.properties new file mode 100644 index 000000000..a9b214910 --- /dev/null +++ b/wallet/ojdbc.properties @@ -0,0 +1,11 @@ +# Connection property while using Oracle wallets. +oracle.net.wallet_location=(SOURCE=(METHOD=FILE)(METHOD_DATA=(DIRECTORY=${TNS_ADMIN}))) +# FOLLOW THESE STEPS FOR USING JKS +# (1) Uncomment the following properties to use JKS. +# (2) Comment out the oracle.net.wallet_location property above +# (3) Set the correct password for both trustStorePassword and keyStorePassword. +# It's the password you specified when downloading the wallet from OCI Console or the Service Console. +#javax.net.ssl.trustStore=${TNS_ADMIN}/truststore.jks +#javax.net.ssl.trustStorePassword= +#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 000000000..5a28e4331 Binary files /dev/null and b/wallet/truststore.jks differ