test and obs ws mods (#387)

paulparkinson · web-flow · commit f4628c4e0c74 · 2022-04-19T07:04:34.000+05:30
* enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * observability * enable teq * enable teq * enable teq * enable teq * enable teq * observability work * observability work * enable teq * enable teq * enable teq * observ * enable teq * observability dash * observability * osbservability * enable teq * enable teq * enable teq * obs * obs * enable teq * obs * enable teq * observ * obs * converged wording change * fix k6 command * correct workshop link * update workshop link * modifiy python impl to conn.autocommit = False * enable teq * various including security fix in inventory-nodejs * various including security fix in inventory-nodejs * various including security fix in inventory-nodejs * enable teq * inventory-micronaut * inventory-micronaut * inventory-quarkus * inventory-micronaut-native-image * upgrade helidon and db versions * mn and quarkus build wrappers * mn native-image build and deploy fixes * mn native-image build and deploy fixes * mn native-image use JsonObject instead of Jackson * dotnet vault work, etc. * vault work, various languages * Go OCI Vault/Secrets client * displaysetuplogs util script * displaysetuplogs util script * displaysetuplogs util script * displaysetuplogs util script * createsecretfromwallet * createsecretfromwallet * createsecretfromwallet * set order and inventory helidon versions back to 2.4.0 * travelagency readme * createsecretfromwallet * temp eventmesh and osaga java api * travelagencysaga * observability workshop and various fixes * travelagency saga ws work * saga ws work * saga ws * saga ws * saga ws * saga ws * saga ws * osaga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * obs ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * obs ws * saga ws * obs ws * foodwinepairing scripts were not chmoded properly * fix inventory-helidon/deploy.sh to renable IS_SUGGESTIVE_SALE_ENABLED functionality * ws fixes * revert unrelated changes * revert unwanted changes * saga ws * ws fixes * fix typo * remove extraneous deploy-order-metrics-exporter.sh * fix typo * jackson databind version change to address https://github.com/oracle/microservices-datadriven/security/dependabot/5 * remove verrazzano yaml etc * add back privs for observability * add back db-log-exporter deploy * add back privs for observability * add back privs for observability * add back privs for observability * add back privs for observability * add back privs for observability * add back privs for observability * add back privs for observability * cloudbank and observability dirs and readmes, inventory-helidon fix, fanEnabled flag in travel app * tx tests * tests * tests * tests * obs mods * obs mods * obs mods
diff --git a/grabdish/config/db/common/apply/admin-inventory-create-schema.sql b/grabdish/config/db/common/apply/admin-inventory-create-schema.sql
@@ -9,4 +9,8 @@ GRANT aq_user_role TO $INVENTORY_USER;
 GRANT EXECUTE ON sys.dbms_aq TO $INVENTORY_USER;
 -- For inventory-plsql deployment
 GRANT CREATE JOB to $INVENTORY_USER; 
-GRANT EXECUTE ON sys.DBMS_SCHEDULER TO $INVENTORY_USER;
+GRANT EXECUTE ON sys.DBMS_SCHEDULER TO $INVENTORY_USER;
+--This is all we want but table hasn't been created yet... GRANT select on AQ.inventoryqueuetable to $INVENTORY_USER;
+GRANT SELECT ANY TABLE TO $INVENTORY_USER;
+GRANT select on gv\$session to $INVENTORY_USER;
+GRANT select on DBA_QUEUE_SCHEDULES to $INVENTORY_USER;
diff --git a/grabdish/config/db/common/apply/admin-order-create-schema.sql b/grabdish/config/db/common/apply/admin-order-create-schema.sql
@@ -7,4 +7,8 @@ GRANT unlimited tablespace to $ORDER_USER;
 GRANT connect, resource TO $ORDER_USER;
 GRANT aq_user_role TO $ORDER_USER;
 GRANT EXECUTE ON sys.dbms_aq TO $ORDER_USER;
-GRANT SODA_APP to $ORDER_USER;
+GRANT SODA_APP to $ORDER_USER;
+--This is all we want but table hasn't been created yet... GRANT select on AQ.orderqueuetable to $ORDER_USER;
+GRANT SELECT ANY TABLE TO $ORDER_USER;
+GRANT select on gv\$session to $ORDER_USER;
+GRANT select on DBA_QUEUE_SCHEDULES to $ORDER_USER;
diff --git a/grabdish/inventory-springboot/pom.xml b/grabdish/inventory-springboot/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -166,21 +166,21 @@
 			<artifactId>dockerfile-maven-plugin</artifactId>
 			<version>1.4.13</version>
 		</dependency>
-		
-	<dependency>
-    <groupId>org.apache.axis2</groupId>
-    <artifactId>axis2-jaxws</artifactId>
-    <version>1.8.0</version>
-     <scope>runtime</scope>
-        <exclusions>
-            <!-- Causes java.lang.NoSuchMethodError: javax.ws.rs.core.Response$Status$Family.familyOf(I)Ljavax/ws/rs/core/Response$Status$Family; -->
-            <exclusion>
-                <groupId>javax.ws.rs</groupId>
-                <artifactId>jsr311-api</artifactId>
-            </exclusion>
-        </exclusions>
-    </dependency>
+
+		<dependency>
+			<groupId>org.apache.axis2</groupId>
+			<artifactId>axis2-jaxws</artifactId>
+			<version>1.8.0</version>
+			<scope>runtime</scope>
+			<exclusions>
+				<!-- Causes java.lang.NoSuchMethodError: javax.ws.rs.core.Response$Status$Family.familyOf(I)Ljavax/ws/rs/core/Response$Status$Family; -->
+				<exclusion>
+					<groupId>javax.ws.rs</groupId>
+					<artifactId>jsr311-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 
 	</dependencies>
 
-</project>
+</project>
diff --git a/grabdish/observability/install/prom_rbac.yaml b/grabdish/observability/install/prom_rbac.yaml
@@ -3,7 +3,7 @@ kind: ServiceAccount
 metadata:
   name: prometheus
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: prometheus
@@ -28,7 +28,7 @@ rules:
   - nonResourceURLs: ["/metrics"]
     verbs: ["get"]
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: prometheus
diff --git a/infra/oci-iaas/grabdish-adapter/k8s/jaeger-production-template.yml b/infra/oci-iaas/grabdish-adapter/k8s/jaeger-production-template.yml
@@ -15,7 +15,7 @@
 apiVersion: v1
 kind: List
 items:
-- apiVersion: extensions/v1beta1
+- apiVersion: extensions/v1
   kind: Deployment
   metadata:
     name: jaeger-collector
@@ -112,7 +112,7 @@ items:
       app.kubernetes.io/name: jaeger
       app.kubernetes.io/component: collector
     type: ClusterIP
-- apiVersion: extensions/v1beta1
+- apiVersion: extensions/v1
   kind: Deployment
   metadata:
     name: jaeger-query
@@ -179,7 +179,7 @@ items:
       app.kubernetes.io/name: jaeger
       app.kubernetes.io/component: query
     type: LoadBalancer
-- apiVersion: extensions/v1beta1
+- apiVersion: extensions/v1
   kind: DaemonSet
   metadata:
     name: jaeger-agent
diff --git a/tests/src/test/java/oracle/modernappdev/WalkThroughTest.java b/tests/src/test/java/oracle/modernappdev/WalkThroughTest.java
@@ -10,7 +10,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 
-public class WalkThroughTest extends TransactionalTests { // estBase {
+public class WalkThroughTest extends TestBase {
 
     @Test
     void testWalkThroughNoInventory() throws Exception {
diff --git a/tests/testIncludingPolyglot.sh b/tests/testIncludingPolyglot.sh
@@ -3,61 +3,61 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 echo TESTING inventory-helidon
-mvn clean test
+mvn surefire:test -Dtest=oracle.modernappdev.WalkThroughTest
 $GRABDISH_HOME/inventory-helidon/undeploy.sh
 
 $GRABDISH_HOME/inventory-dotnet/deploy.sh
 inventory-dotnet
 echo TESTING inventory-dotnet
-mvn clean test
+mvn surefire:test -Dtest=oracle.modernappdev.WalkThroughTest
 $GRABDISH_HOME/inventory-dotnet/undeploy.sh
 
 $GRABDISH_HOME/inventory-go/deploy.sh
 inventory-go
 echo TESTING inventory-go
-mvn clean test
+mvn surefire:test -Dtest=oracle.modernappdev.WalkThroughTest
 $GRABDISH_HOME/inventory-go/undeploy.sh
 
 $GRABDISH_HOME/inventory-helidon-se/deploy.sh
 inventory-helidon-se
 echo TESTING inventory-helidon-se
-mvn clean test
+mvn surefire:test -Dtest=oracle.modernappdev.WalkThroughTest
 $GRABDISH_HOME/inventory-helidon-se/undeploy.sh
 
 $GRABDISH_HOME/inventory-micronaut/deploy.sh
 inventory-micronaut
 echo TESTING inventory-micronaut
-mvn clean test
+mvn surefire:test -Dtest=oracle.modernappdev.WalkThroughTest
 $GRABDISH_HOME/inventory-micronaut/undeploy.sh
 
 $GRABDISH_HOME/inventory-nodejs/deploy.sh
 inventory-nodejs
 echo TESTING inventory-nodejs
-mvn clean test
+mvn surefire:test -Dtest=oracle.modernappdev.WalkThroughTest
 $GRABDISH_HOME/inventory-nodejs/undeploy.sh
 
 $GRABDISH_HOME/inventory-plsql/deploy.sh
 inventory-plsql
 echo TESTING inventory-plsql
-mvn clean test
+mvn surefire:test -Dtest=oracle.modernappdev.WalkThroughTest
 $GRABDISH_HOME/inventory-plsql/undeploy.sh
 
 $GRABDISH_HOME/inventory-python/deploy.sh
 inventory-python
 echo TESTING inventory-python
-mvn clean test
+mvn surefire:test -Dtest=oracle.modernappdev.WalkThroughTest
 $GRABDISH_HOME/inventory-python/undeploy.sh
 
 $GRABDISH_HOME/inventory-quarkus/deploy.sh
 inventory-quarkus
 echo TESTING inventory-quarkus
-mvn clean test
+mvn surefire:test -Dtest=oracle.modernappdev.WalkThroughTest
 $GRABDISH_HOME/inventory-quarkus/undeploy.sh
 
 $GRABDISH_HOME/inventory-springboot/deploy.sh
 inventory-springboot
 echo TESTING inventory-springboot
-mvn clean test
+mvn surefire:test -Dtest=oracle.modernappdev.WalkThroughTest
 $GRABDISH_HOME/inventory-springboot/undeploy.sh
 
 echo TESTING complete, redeploying inventory-helidon
