MongoDB/kafka/postgres version of order inventory and other multi cloud etc changes

grabdish/destroy-multicloud.sh

@@ -7,5 +7,8 @@
 echo Deleting the Verrazzano custom resource....
 kubectl delete verrazzano example-verrazzano
 
+echo Set verrazzano-managed=false istio-injection=disabled ...
+kubectl label namespace msdataworkshop verrazzano-managed=false istio-injection=disabled --overwrite
+
 echo Viewing the uninstall logs...
 kubectl logs -f $(kubectl get pod -l job-name=uninstall-example-verrazzano -o jsonpath="{.items[0].metadata.name}")

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

@@ -144,6 +144,13 @@ <h1 class="oj-sm-only-hide oj-web-applayout-header-title" title="Application Nam
                   <oj-button disabled="[[inProgress]]" on-oj-action="[[lab9AddInventoryAction]]">Add Inventory</oj-button>
                   <oj-button disabled="[[inProgress]]" on-oj-action="[[lab9RemoveInventoryAction]]">Remove Inventory</oj-button>
                   <oj-button disabled="[[inProgress]]" on-oj-action="[[lab9GetInventoryAction]]">Get Inventory</oj-button>
+                  <br><br>
+                  <br>Transactional Exactly-Once Message Delivery Tests...
+                  <br>
+                  <oj-button disabled="[[inProgress]]" on-oj-action="[[lab11CrashAfterInsertAction]]">Crash order service after Order is inserted (before Order message is sent to Inventory service)</oj-button>
+                  <br><oj-button disabled="[[inProgress]]" on-oj-action="[[lab11CrashAfterOrderMessageReceivedAction]]">Crash Inventory service after Order message is received (before inventory for order is checked)</oj-button>
+                  <br><oj-button disabled="[[inProgress]]" on-oj-action="[[lab11CrashAfterOrderMessageProcessedAction]]">Crash Inventory service after inventory for order is checked (before Inventory status message is sent)</oj-button>
+                  <br><oj-button disabled="[[inProgress]]" on-oj-action="[[lab11CrashAfterOrderMessageProcessedAction]]">Crash Inventory service after inventory for order is checked (before Inventory status message is sent)</oj-button>
                 </div>
                 <!-- lab10 -->
                 <div slot="lab10">
@@ -799,6 +806,82 @@ <h1 class="oj-sm-only-hide oj-web-applayout-header-title" title="Application Nam
           };
 
 
+          // Lab 11. ---------Transaction crash tests including MongoDB, Kafka, Postgres version---- //
+
+
+          this.lab11CrashAfterInsertAction = function (event, vm) {
+            vm.inProgress(true);
+            var order = {
+              serviceName: 'order',
+              commandName: 'crashAfterInsert',
+              orderId: -1,
+              orderItem: '',
+              deliverTo: ''
+            };
+            var fetchOptions = {
+              method: 'POST',
+              headers: { 'Content-Type': 'application/json' },
+              body: JSON.stringify(order)
+            };
+
+            fetch('/command', fetchOptions).then(fetchResult => {
+              vm.httpCode(fetchResult.status);
+              fetchResult.text().then(payload => {
+                vm.labResult(payload);
+                vm.inProgress(false);
+              });
+            });
+          };
+
+          this.lab11CrashAfterOrderMessageReceivedAction = function (event, vm) {
+            vm.inProgress(true);
+            var order = {
+              serviceName: 'inventory',
+              commandName: 'crashAfterOrderMessageReceived',
+              orderId: -1,
+              orderItem: '',
+              deliverTo: ''
+            };
+            var fetchOptions = {
+              method: 'POST',
+              headers: { 'Content-Type': 'application/json' },
+              body: JSON.stringify(order)
+            };
+
+            fetch('/command', fetchOptions).then(fetchResult => {
+              vm.httpCode(fetchResult.status);
+              fetchResult.text().then(payload => {
+                vm.labResult(payload);
+                vm.inProgress(false);
+              });
+            });
+          };
+
+          this.lab11CrashAfterOrderMessageProcessedAction = function (event, vm) {
+            vm.inProgress(true);
+            var order = {
+              serviceName: 'inventory',
+              commandName: 'crashAfterOrderMessageProcessed',
+              orderId: -1,
+              orderItem: '',
+              deliverTo: ''
+            };
+            var fetchOptions = {
+              method: 'POST',
+              headers: { 'Content-Type': 'application/json' },
+              body: JSON.stringify(order)
+            };
+
+            fetch('/command', fetchOptions).then(fetchResult => {
+              vm.httpCode(fetchResult.status);
+              fetchResult.text().then(payload => {
+                vm.labResult(payload);
+                vm.inProgress(false);
+              });
+            });
+          };
+
+
           // Footer
           this.footerLinks = [
             { name: 'About Oracle', linkId: 'aboutOracle', linkTarget: 'http://www.oracle.com/us/corporate/index.html#menu-about' },

grabdish/inventory-helidon/deploy.sh

@@ -26,3 +26,5 @@ if [ -z "$1" ]; then
 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

@@ -1,5 +1,3 @@
-
-##
 ## 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/
 apiVersion: apps/v1

grabdish/inventory-helidon/undeploy.sh

@@ -6,3 +6,5 @@
 echo delete inventory-helidon deployment...
 
 kubectl delete deployment inventory-helidon -n msdataworkshop
+
+kubectl delete service inventory -n msdataworkshop

grabdish/inventory-postgres-kafka/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/inventory-postgres-kafka/build.sh

@@ -0,0 +1,25 @@
+#!/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/
+
+
+IMAGE_NAME=inventory-postgres-kafka
+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 package
+
+docker push $IMAGE
+if [  $? -eq 0 ]; then
+    docker rmi ${IMAGE}
+fi

grabdish/inventory-postgres-kafka/deploy-verrazzano.sh

@@ -0,0 +1,31 @@
+#!/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/
+
+
+SCRIPT_DIR=$(dirname $0)
+
+export DOCKER_REGISTRY="$(state_get DOCKER_REGISTRY)"
+export INVENTORY_PDB_NAME="$(state_get INVENTORY_DB_NAME)"
+export OCI_REGION="$(state_get OCI_REGION)"
+export VAULT_SECRET_OCID=""
+
+echo create inventory-postgres-kafka OAM Component and ApplicationConfiguration
+export CURRENTTIME=$( date '+%F_%H:%M:%S' )
+echo CURRENTTIME is $CURRENTTIME  ...this will be appended to generated deployment yaml
+
+cp inventory-postgres-kafka-comp.yaml inventory-postgres-kafka-comp-$CURRENTTIME.yaml
+
+#may hit sed incompat issue with mac
+sed -i "s|%DOCKER_REGISTRY%|${DOCKER_REGISTRY}|g" inventory-postgres-kafka-comp-$CURRENTTIME.yaml
+sed -i "s|%INVENTORY_PDB_NAME%|${INVENTORY_PDB_NAME}|g" inventory-postgres-kafka-comp-${CURRENTTIME}.yaml
+sed -i "s|%OCI_REGION%|${OCI_REGION}|g" inventory-postgres-kafka-comp-${CURRENTTIME}.yaml
+sed -i "s|%VAULT_SECRET_OCID%|${VAULT_SECRET_OCID}|g" inventory-postgres-kafka-comp-${CURRENTTIME}.yaml
+
+if [ -z "$1" ]; then
+    kubectl apply -f $SCRIPT_DIR/inventory-postgres-kafka-comp-$CURRENTTIME.yaml
+    kubectl apply -f $SCRIPT_DIR/inventory-postgres-kafka-app.yaml
+else
+    kubectl apply -f <(istioctl kube-inject -f $SCRIPT_DIR/inventory-postgres-kafka-comp-$CURRENTTIME.yaml) -n msdataworkshop
+fi
+

grabdish/inventory-postgres-kafka/deploy.sh

@@ -0,0 +1,28 @@
+#!/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/
+
+SCRIPT_DIR=$(dirname $0)
+
+export DOCKER_REGISTRY="$(state_get DOCKER_REGISTRY)"
+export INVENTORY_PDB_NAME="$(state_get INVENTORY_DB_NAME)"
+export OCI_REGION="$(state_get OCI_REGION)"
+export VAULT_SECRET_OCID=""
+
+echo create inventory-postgres-kafka deployment and service...
+
+export CURRENTTIME=$( date '+%F_%H:%M:%S' )
+echo CURRENTTIME is $CURRENTTIME  ...this will be appended to generated deployment yaml
+cp inventory-postgres-kafka-deployment.yaml inventory-postgres-kafka-deployment-$CURRENTTIME.yaml
+
+#may hit sed incompat issue with mac
+sed -i "s|%DOCKER_REGISTRY%|${DOCKER_REGISTRY}|g" inventory-postgres-kafka-deployment-$CURRENTTIME.yaml
+sed -i "s|%INVENTORY_PDB_NAME%|${INVENTORY_PDB_NAME}|g" inventory-postgres-kafka-deployment-$CURRENTTIME.yaml
+sed -i "s|%OCI_REGION%|${OCI_REGION}|g" inventory-postgres-kafka-deployment-${CURRENTTIME}.yaml
+sed -i "s|%VAULT_SECRET_OCID%|${VAULT_SECRET_OCID}|g" inventory-postgres-kafka-deployment-${CURRENTTIME}.yaml
+
+if [ -z "$1" ]; then
+    kubectl apply -f $SCRIPT_DIR/inventory-postgres-kafka-deployment-$CURRENTTIME.yaml -n msdataworkshop
+else
+    kubectl apply -f <(istioctl kube-inject -f $SCRIPT_DIR/inventory-postgres-kafka-deployment-$CURRENTTIME.yaml) -n msdataworkshop
+fi

grabdish/inventory-postgres-kafka/inventory-postgres-kafka-app.yaml

@@ -0,0 +1,29 @@
+# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+apiVersion: core.oam.dev/v1alpha2
+kind: ApplicationConfiguration
+metadata:
+  name: inventory-postgres-kafka-appconf
+  namespace: msdataworkshop
+  annotations:
+    version: v1.0.0
+    description: "Inventory Helidon application"
+spec:
+  components:
+    - componentName: inventory-postgres-kafka-component
+      traits:
+        - trait:
+            apiVersion: oam.verrazzano.io/v1alpha1
+            kind: MetricsTrait
+            spec:
+              scraper: verrazzano-system/vmi-system-prometheus-0
+#        - trait:
+#            apiVersion: oam.verrazzano.io/v1alpha1
+#            kind: IngressTrait
+#            metadata:
+#              name: inventory-postgres-kafka-ingress
+#            spec:
+#              rules:
+#                - paths:
+#                    - path: "/"
+#                      pathType: Prefix

grabdish/inventory-postgres-kafka/inventory-postgres-kafka-comp.yaml

@@ -0,0 +1,51 @@
+# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+apiVersion: core.oam.dev/v1alpha2
+kind: Component
+metadata:
+  name: inventory-postgres-kafka-component
+  namespace: msdataworkshop
+spec:
+  workload:
+    apiVersion: oam.verrazzano.io/v1alpha1
+    kind: VerrazzanoHelidonWorkload
+    metadata:
+      name: inventory-postgres-kafka-workload
+      labels:
+        app: inventory-postgres-kafka
+    spec:
+      deploymentTemplate:
+        metadata:
+          name: inventory-postgres-kafka-deployment
+        podSpec:
+          containers:
+            - name: inventory
+              image: %DOCKER_REGISTRY%/inventory-postgres-kafka:0.1
+              imagePullPolicy: Always
+              env:
+                - name: oracle.ucp.jdbc.PoolDataSource.inventorypdb.user
+                  value: "inventoryuser"
+                - name: oracle.ucp.jdbc.PoolDataSource.inventorypdb.URL
+                  value: "jdbc:oracle:thin:@%INVENTORY_PDB_NAME%_tp?TNS_ADMIN=/msdataworkshop/creds"
+                - name: inventoryqueuename
+                  value: "inventoryqueue"
+                - name: OCI_REGION
+                  value: "%OCI_REGION%"
+                - name: VAULT_SECRET_OCID
+                  value: "%VAULT_SECRET_OCID%"
+                - name: dbpassword
+                  valueFrom:
+                    secretKeyRef:
+                      name: dbuser
+                      key: dbpassword
+                      optional: true #not needed/used if using VAULT_SECRET_OCID exists
+              volumeMounts:
+                - name: creds
+                  mountPath: /msdataworkshop/creds
+              ports:
+                - containerPort: 8080
+          restartPolicy: Always
+          volumes:
+            - name: creds
+              secret:
+                secretName: db-wallet-secret

grabdish/inventory-postgres-kafka/inventory-postgres-kafka-deployment.yaml

@@ -0,0 +1,48 @@
+## 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/
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: inventory-postgres-kafka
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: inventory
+  template:
+    metadata:
+      labels:
+        app: inventory
+        version: helidon
+    spec:
+      containers:
+      - name: inventory
+        image: %DOCKER_REGISTRY%/inventory-postgres-kafka:0.1
+        imagePullPolicy: Always
+        env:
+        - name: oracle.ucp.jdbc.PoolDataSource.inventorypdb.user
+          value: "inventoryuser"
+        - name: oracle.ucp.jdbc.PoolDataSource.inventorypdb.URL
+          value: "jdbc:oracle:thin:@%INVENTORY_PDB_NAME%_tp?TNS_ADMIN=/msdataworkshop/creds"
+        - name: inventoryqueuename
+          value: "inventoryqueue"
+        - name: OCI_REGION
+          value: "%OCI_REGION%"
+        - name: VAULT_SECRET_OCID
+          value: "%VAULT_SECRET_OCID%"
+        - name: dbpassword
+          valueFrom:
+            secretKeyRef:
+              name: dbuser
+              key: dbpassword
+              optional: true #not needed/used if using VAULT_SECRET_OCID exists
+        volumeMounts:
+        - name: creds
+          mountPath: /msdataworkshop/creds
+        ports:
+        - containerPort: 8080
+      restartPolicy: Always
+      volumes:
+      - name: creds
+        secret:
+          secretName: db-wallet-secret

grabdish/inventory-postgres-kafka/inventory-service.yaml

@@ -0,0 +1,17 @@
+
+##
+## 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/
+apiVersion: v1
+kind: Service
+metadata:
+  name: supplier # note that this is called supplier service as the inventory implementation services as inventory and supplier
+  labels:
+    app: inventory
+spec:
+  type: NodePort
+  ports:
+  - port: 8080
+    name: http
+  selector:
+    app: inventory