Terraform etc

grabdish/admin-helidon/Dockerfile

@@ -0,0 +1,9 @@
+FROM openjdk:11-jre-slim
+
+ENTRYPOINT ["java", "-jar", "/usr/share/myservice/myservice.jar"]
+
+# Add Maven dependencies
+ADD target/libs           /usr/share/myservice/libs
+# Add the service itself
+ARG JAR_FILE
+ADD target/${JAR_FILE} /usr/share/myservice/myservice.jar

grabdish/admin-helidon/build.sh

@@ -7,19 +7,19 @@ SCRIPT_DIR=$(dirname $0)
 IMAGE_NAME=admin-helidon
 IMAGE_VERSION=0.1
 
+export DOCKER_REGISTRY=$(state_get DOCKER_REGISTRY)
+
 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 install
-mvn package docker:build
+# mvn install
+# mvn package docker:build
+mvn package
 
-if [ $DOCKERBUILD_RETCODE -ne 0 ]; then
-    exit 1
-fi
 docker push $IMAGE
 if [  $? -eq 0 ]; then
     docker rmi ${IMAGE}

grabdish/admin-helidon/deploy.sh

@@ -4,6 +4,12 @@
 
 SCRIPT_DIR=$(dirname $0)
 
+export DOCKER_REGISTRY="$(state_get DOCKER_REGISTRY)"
+export ORDER_PDB_NAME="$(state_get ORDER_DB_NAME)"
+export INVENTORY_PDB_NAME="$(state_get INVENTORY_DB_NAME)"
+export OCI_REGION="$(state_get OCI_REGION)"
+export VAULT_SECRET_OCID=""
+
 echo create admin-helidon deployment and service...
 export CURRENTTIME=$( date '+%F_%H:%M:%S' )
 echo CURRENTTIME is $CURRENTTIME  ...this will be appended to generated deployment yaml

grabdish/admin-helidon/pom.xml

@@ -13,13 +13,14 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>admin-helidon</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>admin-helidon</name>
-    <description>ATP OSB UCP Helidon Microprofile Microservices Demo</description>
+    <name>${project.artifactId}</name>
+    <description>Helidon Microprofile Microservices Demo</description>
 
     <parent>
-        <groupId>io.helidon</groupId>
-        <artifactId>helidon-project</artifactId>
+        <groupId>io.helidon.applications</groupId>
+        <artifactId>helidon-mp</artifactId>
         <version>2.2.0</version>
+        <relativePath/>
     </parent>
 
     <properties>
@@ -36,27 +37,26 @@
             </resource>
         </resources>
         <plugins>
-
             <plugin>
                 <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>1.2.2</version>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>1.4.13</version>
+                <executions>
+                    <execution>
+                        <id>default</id>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
                 <configuration>
-                    <imageName>${docker.image.prefix}/${project.artifactId}</imageName>
-                    <baseImage>openjdk:11</baseImage>
-                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                        </resource>
-                    </resources>
-                    <imageTags>
-                        <imageTag>0.1</imageTag>
-                    </imageTags>
+                    <repository>${env.DOCKER_REGISTRY}/${project.artifactId}</repository>
+                    <tag>0.1</tag>
+                    <buildArgs>
+                        <JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
+                    </buildArgs>
                 </configuration>
             </plugin>
-
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
@@ -103,35 +103,11 @@
             <artifactId>helidon-integrations-cdi-datasource-ucp</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>io.helidon.integrations.cdi</groupId>-->
-            <!--<artifactId>helidon-integrations-cdi-datasource-hikaricp</artifactId>-->
-            <!--<scope>runtime</scope>-->
-        <!--</dependency>-->
-        <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>ojdbc10</artifactId>
-            <version>19.3.0.0</version>
-        </dependency>
         <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>ucp</artifactId>
-            <version>19.3.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>osdt_core</artifactId>
-            <version>19.3.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>osdt_cert</artifactId>
-            <version>19.3.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>oraclepki</artifactId>
-            <version>19.3.0.0</version>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ojdbc8-production</artifactId>
+            <version>19.8.0.0</version>
+            <type>pom</type>
         </dependency>
         <dependency>
             <groupId>com.oracle.database.messaging</groupId>

grabdish/admin-helidon/setupForDBLinksInCloud.sh

@@ -7,22 +7,28 @@
 #echo list existing buckets...
 #oci os bucket list --compartment-id $OCI_COMPARTMENT_ID
 
-echo create msdataworkshop bucket ...ignore BucketAlreadyExists exception if this is not the first time running the script...
-oci os bucket create --name msdataworkshop --compartment-id $OCI_COMPARTMENT_ID
+#cho create msdataworkshop bucket ...ignore BucketAlreadyExists exception if this is not the first time running the script...
+#oci os bucket create --name msdataworkshop --compartment-id $OCI_COMPARTMENT_ID
 
 #echo list existing buckets again...
 #oci os bucket list --compartment-id $OCI_COMPARTMENT_ID
 
-echo delete cwallet.sso in bucket ...ignore ObjectNotFound exception if this is the first time running the script...
+#echo delete cwallet.sso in bucket ...ignore ObjectNotFound exception if this is the first time running the script...
 # Will be prompted "Are you sure you want to delete this resource? [y/N]"
 
-echo put cwallet.sso in bucket ...select "y" when asked to overwrite
-oci os object put --bucket-name msdataworkshop --file $MSDATAWORKSHOP_LOCATION/atp-secrets-setup/wallet/cwallet.sso
+#echo put cwallet.sso in bucket ...select "y" when asked to overwrite
+#oci os object put --bucket-name msdataworkshop --file $MSDATAWORKSHOP_LOCATION/atp-secrets-setup/wallet/cwallet.sso
 
-echo create link to cwallet.sso in objectstorage, save, export, and echo value..
-oci os preauth-request create --access-type ObjectRead --bucket-name msdataworkshop --name msdataworkshopwallet --time-expires 2021-12-21 --object-name cwallet.sso | jq --raw-output '.data | .["access-uri"] ' > preauthlink.txt
-export cwalletobjecturi=$(cat preauthlink.txt)
-export cwalletobjecturi=https://objectstorage.${OCI_REGION}.oraclecloud.com${cwalletobjecturi}
+#echo create link to cwallet.sso in objectstorage, save, export, and echo value..
+#oci os preauth-request create --access-type ObjectRead --bucket-name msdataworkshop --name msdataworkshopwallet --time-expires 2021-12-21 --object-name cwallet.sso | jq --raw-output '.data | .["access-uri"] ' > preauthlink.txt
+#export cwalletobjecturi=$(cat preauthlink.txt)
+
+export DOCKER_REGISTRY="$(state_get DOCKER_REGISTRY)"
+export ORDER_PDB_NAME="$(state_get ORDER_DB_NAME)"
+export INVENTORY_PDB_NAME="$(state_get INVENTORY_DB_NAME)"
+
+
+export cwalletobjecturi=$(state_get CWALLET_SSO_AUTH_URL)
 echo updating admin-helidon-deployment-${CURRENTTIME}.yaml with cwalletobjecturi $cwalletobjecturi
 sed -i "s|%cwalletobjecturi%|${cwalletobjecturi}|g" admin-helidon-deployment-${CURRENTTIME}.yaml
 
@@ -31,7 +37,7 @@ echo cwalletobjecturi is created and added to admin-helidon-deployment-${CURRENT
 echo adding other values in admin-helidon-deployment-${CURRENTTIME}.yaml as parsed from tnsnames.ora s
 
 #echo ____________________________________________________
-export orderdb_tptnsentry=$(grep -i "^${ORDER_PDB_NAME}_tp " $MSDATAWORKSHOP_LOCATION/atp-secrets-setup/wallet/tnsnames.ora)
+export orderdb_tptnsentry=$(grep -i "^${ORDER_PDB_NAME}_tp " $GRABDISH_HOME/atp-secrets-setup/wallet/tnsnames.ora)
 #echo $ORDER_PDB_NAME tp entry... $orderdb_tptnsentry
 echo ____________________________________________________
 # for each variable, string off begin (based on identifier)
@@ -73,7 +79,7 @@ echo $orderssl_server_cert_dn
 
 
 #echo ____________________________________________________
-export inventorydb_tptnsentry=$(grep -i "^${INVENTORY_PDB_NAME}_tp " $MSDATAWORKSHOP_LOCATION/atp-secrets-setup/wallet/tnsnames.ora)
+export inventorydb_tptnsentry=$(grep -i "^${INVENTORY_PDB_NAME}_tp " $GRABDISH_HOME/atp-secrets-setup/wallet/tnsnames.ora)
 #echo $INVENTORY_PDB_NAME tp entry... $inventorydb_tptnsentry
 echo ____________________________________________________
 # for each variable, string off begin (based on identifier)

grabdish/atp-secrets-setup/createAll.sh

@@ -10,7 +10,7 @@ then
   exit
 fi
 
-source ../msdataworkshop.properties
+#source ../msdataworkshop.properties
 export SCRIPT_DIR=$(dirname $0)
 export CURRENTTIME=$( date '+%F_%H:%M:%S' )
 echo CURRENTTIME is $CURRENTTIME  ...this will be appended to generated yamls
@@ -38,7 +38,7 @@ export inventorypdb_README=$(cat README | base64 | tr -d '\n\r' | base64 | tr -d
 export inventorypdb_sqlnet_ora=$(cat sqlnet.ora | base64 | tr -d '\n\r' | base64 | tr -d '\n\r')
 export inventorypdb_tnsnames_ora=$(cat tnsnames.ora | base64 | tr -d '\n\r' | base64 | tr -d '\n\r')
 export inventorypdb_truststore_jks=$(cat truststore.jks | base64 | tr -d '\n\r' | base64 | tr -d '\n\r')
-
+rm -rf wallet
 cd ../
 echo "replace values in order yaml files (files are suffixed with ${CURRENTTIME})..."
 eval "cat <<EOF