foodwinepairing mods and showsetuplogs util

grabdish/frontend-helidon/src/main/resources/web/index.html

@@ -61,8 +61,8 @@ <h1 class="oj-sm-only-hide oj-web-applayout-header-title" title="Application Nam
         </div>
         <div class="oj-flex-bar">
           <div class="oj-flex-bar-middle oj-sm-align-items-baseline">
-            <p class="oj-text-color-secondary oj-typography-subheading-xs">Event-driven Stateful Microservices with
-              Helidon and Autonomous Database on OCI</p>
+            <p class="oj-text-color-secondary oj-typography-subheading-xs">Data-driven Microservices with
+              converged Oracle Database</p>
           </div>
         </div>
       </header>

grabdish/frontend-helidon/src/main/resources/web/spatial.html

@@ -61,8 +61,8 @@ <h1 class="oj-sm-only-hide oj-web-applayout-header-title" title="Application Nam
             </div>
             <div class="oj-flex-bar">
                 <div class="oj-flex-bar-middle oj-sm-align-items-baseline">
-                    <p class="oj-text-color-secondary oj-typography-subheading-xs">Event-driven Stateful Microservices with
-                        Helidon and Autonomous Database on OCI</p>
+                    <p class="oj-text-color-secondary oj-typography-subheading-xs">Data-driven Microservices with
+                        converged Oracle Database</p>
                 </div>
             </div>
         </header>

grabdish/inventory-helidon/deploy.sh

@@ -3,6 +3,12 @@
 ## Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 SCRIPT_DIR=$(dirname $0)
+export IS_SUGGESTIVE_SALE_ENABLED=$1
+
+if [ -z "$IS_SUGGESTIVE_SALE_ENABLED" ]; then
+    echo "No argument for IS_SUGGESTIVE_SALE_ENABLED, defaulting to false..."
+  export IS_SUGGESTIVE_SALE_ENABLED=false
+fi
 
 if [ -z "$DOCKER_REGISTRY" ]; then
     echo "DOCKER_REGISTRY not set. Will get it with state_get"
@@ -40,11 +46,13 @@ sed -e "s|%OCI_REGION%|${OCI_REGION}|g" inventory-helidon-deployment-${CURRENTTI
 mv -- /tmp/inventory-helidon-deployment-$CURRENTTIME.yaml inventory-helidon-deployment-$CURRENTTIME.yaml
 sed -e "s|%VAULT_SECRET_OCID%|${VAULT_SECRET_OCID}|g" inventory-helidon-deployment-${CURRENTTIME}.yaml > /tmp/inventory-helidon-deployment-$CURRENTTIME.yaml
 mv -- /tmp/inventory-helidon-deployment-$CURRENTTIME.yaml inventory-helidon-deployment-$CURRENTTIME.yaml
+sed -e "s|%IS_SUGGESTIVE_SALE_ENABLED%|${IS_SUGGESTIVE_SALE_ENABLED}|g" inventory-helidon-deployment-${CURRENTTIME}.yaml > /tmp/inventory-helidon-deployment-$CURRENTTIME.yaml
+mv -- /tmp/inventory-helidon-deployment-$CURRENTTIME.yaml inventory-helidon-deployment-$CURRENTTIME.yaml
 
-if [ -z "$1" ]; then
-    kubectl apply -f $SCRIPT_DIR/inventory-helidon-deployment-$CURRENTTIME.yaml -n msdataworkshop
-else
-    kubectl apply -f <(istioctl kube-inject -f $SCRIPT_DIR/inventory-helidon-deployment-$CURRENTTIME.yaml) -n msdataworkshop
-fi
+#if [ -z "$1" ]; then
+kubectl apply -f $SCRIPT_DIR/inventory-helidon-deployment-$CURRENTTIME.yaml -n msdataworkshop
+#else
+#    kubectl apply -f <(istioctl kube-inject -f $SCRIPT_DIR/inventory-helidon-deployment-$CURRENTTIME.yaml) -n msdataworkshop
+#fi
 
 kubectl create -f inventory-service.yaml -n msdataworkshop

grabdish/inventory-helidon/inventory-helidon-deployment.yaml

@@ -33,7 +33,7 @@ spec:
         - name: VAULT_SECRET_OCID
           value: "%VAULT_SECRET_OCID%"
         - name: isSuggestiveSaleAIEnabled
-          value: "true"
+          value: "%IS_SUGGESTIVE_SALE_ENABLED%"
         - name: dbpassword
           valueFrom:
             secretKeyRef:

grabdish/inventory-helidon/src/main/java/io/helidon/data/examples/InventoryResource.java

@@ -66,7 +66,7 @@ public InventoryResource() {
     @Inject
     private MetricRegistry metricRegistry;
 
-    public void init(@Observes @Initialized(ApplicationScoped.class) Object init) throws SQLException {
+    public void init(@Observes @Initialized(ApplicationScoped.class) Object init) throws Exception {
         System.out.println("InventoryResource.init " + init);
         String pw;
         if(pwSecretOcid != null && !pwSecretOcid.equals("")) {

grabdish/utils/non-java-builds.sh

@@ -1,40 +1,3 @@
-Skip to content
-Search or jump to…
-Pull requests
-Issues
-Marketplace
-Explore
-
-@praveennhiremath 
-oracle
-/
-microservices-datadriven
-Public
-8
-18
-14
-Code
-Issues
-103
-Pull requests
-Discussions
-Actions
-Projects
-1
-Wiki
-Security
-Insights
-Settings
-microservices-datadriven/grabdish/utils/non-java-builds.sh
-@paulparkinson
-paulparkinson update versions of a jdk, helidon, and oracle jdbc, and add inventory…
-…
-Latest commit c2a8892 4 days ago
- History
- 4 contributors
-@RichardExley@paulparkinson@renagranat@matayal
-Executable File  50 lines (40 sloc)  1.72 KB
-
 #!/bin/bash
 # Copyright (c) 2021 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
@@ -85,16 +48,3 @@ while ! state_done DB_LOG_EXPORTER_BUILD; do
   time ./build.sh &>> $GRABDISH_LOG/build-db-log-exporter.log &
   state_set_done DB_LOG_EXPORTER_BUILD
 done
-© 2021 GitHub, Inc.
-Terms
-Privacy
-Security
-Status
-Docs
-Contact GitHub
-Pricing
-API
-Training
-Blog
-About
-Loading complete

grabdish/utils/showsetuplogs

@@ -0,0 +1,16 @@
+#!/bin/bash
+## Copyright (c) 2021 Oracle and/or its affiliates.
+## Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
+for FILE in $GRABDISH_LOG/*; do echo $FILE; done
+
+for FILE in $GRABDISH_LOG/*; do
+    while true; do
+        read -p "Do you wish to cat $FILE ? y or n or x to exit?" yn
+        case $yn in
+            [Yy]* ) cat $FILE; break;;
+            [Xx]* ) exit;;
+            * ) echo "skipping file..."; break;
+        esac
+    done
+done