cooler messages

Author: sblack4

.gitignore

@@ -1,10 +1,18 @@
+
+# Java
 *.jar
+target
+.idea
+
+# Python
+*.pyc
 
+# secret stuff
 .oci/config
 *.pem
+.md
 
-target
-
-.idea 
-
-SECRETS.md
+# stuff for building the docker container
+*.rpm
+*.zip
+*.tar.gz

Dockerfile

@@ -67,10 +67,32 @@ WORKDIR /opt/oracle/tools/nodejs/apps
 RUN git clone https://github.com/kbhanush/ATPConnectionTest
 EXPOSE 3050
 
-
+# install Java SDK /opt/oracle/tools/java/sdk
+# lib/ contains libraries & third-party/lib contains dependencies
+WORKDIR /opt/oracle/tools/java/sdk
+ADD https://github.com/oracle/oci-java-sdk/releases/download/v1.2.47/oci-java-sdk.zip .
+RUN unzip oci-java-sdk.zip && \
+    rm oci-java-sdk.zip
+
+# install JDBC /opt/oracle/tools/java
+ENV JDBC_DIR /opt/oracle/tools/java
+WORKDIR ${JDBC_DIR}
+ADD ojdbc8-full.tar.gz .
+RUN tar xvzf ojdbc8-full.tar.gz
+
+# Sample apps - /opt/oracle/apps/<app_name>
+ENV JAVA_APP /opt/oracle/apps/ATP-REST-Java
+WORKDIR ${JAVA_APP}
+ADD https://github.com/sblack4/ATP-REST-Java/releases/download/v0.1/atp-rest-scripts.jar .
+ADD run-java-examples.sh .
+ADD picocli-3.6.1.jar .
+RUN mkdir lib && \
+    mv picocli-3.6.1.jar lib
+ENV PATH $PATH:${JAVA_APP}
 
 # Uninstall packages
 RUN echo "Cleaning up yum packages........................." && \
     yum -y remove unzip && \
     yum -y remove git
 
+CMD ["sh", "run-java-examples.sh"]

README.md

@@ -3,13 +3,13 @@ REST APIs for Oracle Autonomous Transaciton Processing Service written in Java
 
 
 ## Objectives 
-- [x] A base image based on frolvlad/alpine-glibc:alpine-3.8  that includes Oracle instant client 18.3, sqlplus and sqlcl for basic sql connectivity to an oracle ATP database
-https://hub.docker.com/r/frolvlad/alpine-glibc/
-- [x]  A python, **Java** and node.js image each built on the base image and layered with drivers to connect respective language programs to an ATP database seamlessly Oracle Cloud Infrastructure CLI
+- [x] A base image based on Oracle linux
+- [x]  A **python**, **Java** and **node.js** image each built on the base image and layered with drivers to connect respective language programs to an ATP database seamlessly Oracle Cloud Infrastructure CLI
     - [x] instant client
     - [x] SQLcl
     - [x] Java SDK
     - [x] Oracle JDBC driver
+    - [ ] SQL Plus 
 - [x] API language scripts for listing, creating, scaling, backing up an ATP instance
 - [ ] A sample program that can take a mapped ATP credentials .zip file and connect to the database
 

SECRETS.md

@@ -0,0 +1,24 @@
+# Secrets 
+
+
+PFA env details:
+
+Status	  Available
+
+Access End Date	  15-OCT-2018
+
+Login Username	  lisa.jones / john.dunbar / bala.gupta / roland.dubois / cloud.admin
+
+Login Password	  rotuNd@5PIcKuP    
+
+Identity Domain	  gse00014623
+
+Notes	OCI Automation that requires API Keys (example: Terraform, Ansible, Chef Scripts etc), please use this user
+
+username = api.user
+
+password = mAjeStic@1WHig
+
+Direct URL : https://console.us-ashburn-1.oraclecloud.com/#/a/
+
+Note : This user is only available on OCI. Do not use this user to login to the UCM Dashboard.

run-java-examples.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+JDBC_LIB="/opt/oracle/tools/java/ojdbc8-full"
+JAVA_SDK="/opt/oracle/tools/java/sdk"
+CLASSPATH="$JDBC_LIB:$DIR:$JAVA_SDK/lib:$JAVA_SDK/third-party/lib:$DIR/atp-rest-scripts.jar"
+
+java -cp "$CLASSPATH" com.github.sblack4.CLI "$@"

run.sh

@@ -4,8 +4,15 @@
 import picocli.CommandLine.*;
 
 
-@Command(name="CLI", header = "@|red Create, Scale, List, and Delete your ATP - examples in... JAVA!|@",
-    subcommands = { CreateATP.class, ListATP.class, ScaleATP.class, DeleteATP.class, Database.class})
+@Command(name="CLI",
+        sortOptions = false,
+        header = "@|red,bg(white) " +
+                "  _  _     _ _        __                    _               \n" +
+                " | || |___| | |___   / _|_ _ ___ _ __    _ | |__ ___ ____ _ \n" +
+                " | __ / -_) | / _ \\ |  _| '_/ _ \\ '  \\  | || / _` \\ V / _` |\n" +
+                " |_||_\\___|_|_\\___/ |_| |_| \\___/_|_|_|  \\__/\\__,_|\\_/\\__,_||@\n" +
+                "@|red Create, Scale, List, and Delete your ATP - examples in... JAVA!|@",
+        subcommands = { CreateATP.class, ListATP.class, ScaleATP.class, DeleteATP.class, Database.class})
 public class CLI implements Runnable {
     @Option(names = { "-h", "--help" }, usageHelp = true, description = "Displays this help message and quits.")
     private boolean helpRequested = false;
@@ -15,6 +22,10 @@ public void run() {
     }
 
     public static void main(String[] args) {
+        if (args.length < 1) {
+            System.out.println("Incorrect Usage, please give command");
+            CommandLine.usage(new CLI(), System.err);
+        }
         CommandLine.run(new CLI(), args);
     }
 }

src/main/java/com/github/sblack4/CLI.java

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+
+java -cp "target/atp-rest-scripts.jar:lib/*" com.github.sblack4.CLI "$@"
+