python vault and openapi (#17)

* data_pump_dir constant typo fix.

* dotnet gitignore

* inventory-dotnet init

* dotnet gitignore

* nodejs vault support

* dotnet temp remove

* python vault support and openapi

Author: paulparkinson

grabdish/frontend-helidon/src/main/java/io/helidon/data/examples/FrontEndResource.java

@@ -262,6 +262,24 @@ public String getMetrics(Command command) {
         }
     }
 
+    @POST
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.TEXT_PLAIN)
+    @Traced(operationName = "FrontEnd.openAPI")
+    @Path("/openAPI")
+    public String openAPI(Command command) {
+        String urlString = "http://" + command.serviceName + ".msdataworkshop:8080/" + command.commandName;
+        System.out.println("FrontEndResource.openAPI url:" + urlString);
+        try {
+            String response = makeRequest(urlString);
+            System.out.println("FrontEndResource.openAPI url:" + urlString + "  returnString:" + response);
+            return response;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return asJSONMessage(e);
+        }
+    }
+
     private String asJSONMessage(Object e) {
         FrontEndResponse frontEndResponse = new FrontEndResponse();
         frontEndResponse.message = e.toString();

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

@@ -146,6 +146,8 @@
                 </div>
                 <!-- lab10 -->
                 <div slot="lab10">
+                  <oj-button disabled="[[inProgress]]" on-oj-action="[[lab10ShowOpenAPIAction]]">Show OpenAPI/Swagger</oj-button>
+                  <br><br>
                   <oj-button disabled="[[inProgress]]" on-oj-action="[[lab10ShowMetricsAction]]">Show Metrics</oj-button>
                   <br><br>
                   <oj-button disabled="[[inProgress]]" on-oj-action="[[lab10healthliveAction]]">Show Health: Liveness</oj-button>
@@ -274,7 +276,7 @@
           this.menuTasks.set('lab7', { label: 'Datasources', title: 'Datasources', description: 'Verify that the Datasources are all working' });
           this.menuTasks.set('lab8', { label: 'Setup (and Tear Down) Data and Messaging', title: 'Setup (and Tear Down) Data and Messaging', description: 'This lab sets up data and messaging in the database' });
           this.menuTasks.set('lab9', { label: 'Transactional', title: 'Transactional', description: 'JSON and relational data types, AQ transactional event-driven communication, saga, event sourcing, and CQRS' });
-          this.menuTasks.set('lab10', { label: 'Tracing, Metrics, and Health', title: 'Tracing, Metrics, and Health', description: 'Use Helidon features to provide tracing, metrics, and health checks' });
+          this.menuTasks.set('lab10', { label: 'OpenAPI, Tracing, Metrics, and Health', title: 'OpenAPI, Tracing, Metrics, and Health', description: 'Use Helidon features to provide OpenAPI, tracing, metrics, and health checks' });
 
           //Drives the navigation list itself
           this.tasks = new ArrayDataProvider(Array.from(this.menuTasks.entries()).map(entry => { entry[1].id = entry[0]; return entry[1]; }), { keyAttributes: 'id' });
@@ -632,6 +634,30 @@
 
           // Lab 10. ----------------------------------------------------------- //
 
+          this.lab10ShowOpenAPIAction = function (event, vm) {
+            vm.inProgress(true);
+            var order = {
+              serviceName: 'order',
+              commandName: 'openapi',
+              orderId: -1,
+              orderItem: '',
+              deliverTo: ''
+            };
+            var fetchOptions = {
+              method: 'POST',
+              headers: { 'Content-Type': 'application/json' },
+              body: JSON.stringify(order)
+            };
+
+            fetch('/openAPI', fetchOptions).then(fetchResult => {
+              vm.httpCode(fetchResult.status);
+              fetchResult.text().then(payload => {
+                vm.labResult(payload);
+                vm.inProgress(false);
+              });
+            });
+          };
+
           this.lab10ShowMetricsAction = function (event, vm) {
             vm.inProgress(true);
             var order = {

grabdish/inventory-nodejs/undeploy.sh

@@ -1,6 +1,6 @@
 #!/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/
+## 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/
 
 echo delete inventory-nodejs deployment...
 

grabdish/inventory-python/common/dbmgr.py

@@ -9,25 +9,17 @@
 import cx_Oracle
 import threading
 import time
-
-#for vault
 import oci
-import sys
-from datetime import datetime
-from datetime import timedelta
-
+import base64
 # Parameters
 db_connection_count = int(env.get("DB_CONNECTION_COUNT", "1"))
 db_user =             env.get('DB_USER').strip()
-region_id =             env.get('REGION_ID').strip()
+region_id =             env.get('OCI_REGION').strip()
 vault_secret_ocid =             env.get('VAULT_SECRET_OCID').strip()
 # db_password =         env.get('DB_PASSWORD').strip()
 db_connect_string =   env.get('DB_CONNECT_STRING')
-
-kms_vault_client = oci.key_management.KmsVaultClient()
-kms_vault_client_composite = oci.key_management.KmsVaultClientCompositeOperations(
-    kms_vault_client)
-db_password = get_secret(vaults_management_client_composite, region_id, vault_secret_ocid).data
+region_id =             env.get('OCI_REGION').strip()
+vault_secret_ocid =             env.get('VAULT_SECRET_OCID').strip()
 
 readyfile = ""
 logger = None
@@ -86,6 +78,13 @@ def run():
 
         logger.debug("Create Connection Pool Started")
         try:
+            signer = oci.auth.signers.InstancePrincipalsSecurityTokenSigner()
+            secrets_client = oci.secrets.SecretsClient(config={'region': region_id}, signer=signer)
+            secret_bundle = secrets_client.get_secret_bundle(secret_id = vault_secret_ocid)
+            logger.debug(secret_bundle)
+            base64_bytes = secret_bundle.data.secret_bundle_content.content.encode('ascii')
+            message_bytes = base64.b64decode(base64_bytes)
+            db_password = message_bytes.decode('ascii')
             pool = cx_Oracle.SessionPool(
                 db_user,
                 db_password,

grabdish/inventory-python/inventory/app.py

@@ -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/
 import traceback

grabdish/inventory-python/inventory/requirements.txt

@@ -1,11 +1,6 @@
-/*
-
- **
- ** 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/
- */
- Flask_restful
+Flask_restful
 gunicorn
 cx_Oracle
 simplejson
+oci
 

grabdish/order-helidon/src/main/java/io/helidon/data/examples/OrderResource.java

@@ -183,7 +183,7 @@ public Response placeOrder(
     @Path("/showorder")
     @GET
     @Produces(MediaType.APPLICATION_JSON)
-    public Response showordernocache(
+    public Response showorder(
             @Parameter(description = "The order ID for the order",
                     required = true,
                     example = "1",
@@ -193,7 +193,7 @@ public Response showordernocache(
         try {
             Order order = orderServiceEventProducer.getOrderViaSODA(atpOrderPdb, orderId);
             String returnJSON = JsonUtils.writeValueAsString(order);
-            System.out.println("OrderResource.showordernocache returnJSON:" + returnJSON);
+            System.out.println("OrderResource.showorder returnJSON:" + returnJSON);
             return Response.ok()
                     .entity(returnJSON)
                     .build();