Skip to content

Commit f4628c4

Browse files
paulparkinsonpaulparkinson
authored
test and obs ws mods (#387)
* 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
1 parent b4d0eeb commit f4628c4

File tree

7 files changed

+43
-35
lines changed

7 files changed

+43
-35
lines changed

‎grabdish/config/db/common/apply/admin-inventory-create-schema.sql‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@ GRANT aq_user_role TO $INVENTORY_USER;
99
GRANT EXECUTE ON sys.dbms_aq TO $INVENTORY_USER;
1010
-- For inventory-plsql deployment
1111
GRANT CREATE JOB to $INVENTORY_USER;
12-
GRANT EXECUTE ON sys.DBMS_SCHEDULER TO $INVENTORY_USER;
12+
GRANT EXECUTE ON sys.DBMS_SCHEDULER TO $INVENTORY_USER;
13+
--This is all we want but table hasn't been created yet... GRANT select on AQ.inventoryqueuetable to $INVENTORY_USER;
14+
GRANT SELECT ANY TABLE TO $INVENTORY_USER;
15+
GRANT select on gv\$session to $INVENTORY_USER;
16+
GRANT select on DBA_QUEUE_SCHEDULES to $INVENTORY_USER;

‎grabdish/config/db/common/apply/admin-order-create-schema.sql‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,8 @@ GRANT unlimited tablespace to $ORDER_USER;
77
GRANT connect, resource TO $ORDER_USER;
88
GRANT aq_user_role TO $ORDER_USER;
99
GRANT EXECUTE ON sys.dbms_aq TO $ORDER_USER;
10-
GRANT SODA_APP to $ORDER_USER;
10+
GRANT SODA_APP to $ORDER_USER;
11+
--This is all we want but table hasn't been created yet... GRANT select on AQ.orderqueuetable to $ORDER_USER;
12+
GRANT SELECT ANY TABLE TO $ORDER_USER;
13+
GRANT select on gv\$session to $ORDER_USER;
14+
GRANT select on DBA_QUEUE_SCHEDULES to $ORDER_USER;

‎grabdish/inventory-springboot/pom.xml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

77
<parent>
@@ -166,21 +166,21 @@
166166
<artifactId>dockerfile-maven-plugin</artifactId>
167167
<version>1.4.13</version>
168168
</dependency>
169-
170-
<dependency>
171-
<groupId>org.apache.axis2</groupId>
172-
<artifactId>axis2-jaxws</artifactId>
173-
<version>1.8.0</version>
174-
<scope>runtime</scope>
175-
<exclusions>
176-
<!-- Causes java.lang.NoSuchMethodError: javax.ws.rs.core.Response$Status$Family.familyOf(I)Ljavax/ws/rs/core/Response$Status$Family; -->
177-
<exclusion>
178-
<groupId>javax.ws.rs</groupId>
179-
<artifactId>jsr311-api</artifactId>
180-
</exclusion>
181-
</exclusions>
182-
</dependency>
169+
170+
<dependency>
171+
<groupId>org.apache.axis2</groupId>
172+
<artifactId>axis2-jaxws</artifactId>
173+
<version>1.8.0</version>
174+
<scope>runtime</scope>
175+
<exclusions>
176+
<!-- Causes java.lang.NoSuchMethodError: javax.ws.rs.core.Response$Status$Family.familyOf(I)Ljavax/ws/rs/core/Response$Status$Family; -->
177+
<exclusion>
178+
<groupId>javax.ws.rs</groupId>
179+
<artifactId>jsr311-api</artifactId>
180+
</exclusion>
181+
</exclusions>
182+
</dependency>
183183

184184
</dependencies>
185185

186-
</project>
186+
</project>

‎grabdish/observability/install/prom_rbac.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: ServiceAccount
33
metadata:
44
name: prometheus
55
---
6-
apiVersion: rbac.authorization.k8s.io/v1beta1
6+
apiVersion: rbac.authorization.k8s.io/v1
77
kind: ClusterRole
88
metadata:
99
name: prometheus
@@ -28,7 +28,7 @@ rules:
2828
- nonResourceURLs: ["/metrics"]
2929
verbs: ["get"]
3030
---
31-
apiVersion: rbac.authorization.k8s.io/v1beta1
31+
apiVersion: rbac.authorization.k8s.io/v1
3232
kind: ClusterRoleBinding
3333
metadata:
3434
name: prometheus

‎infra/oci-iaas/grabdish-adapter/k8s/jaeger-production-template.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
apiVersion: v1
1616
kind: List
1717
items:
18-
- apiVersion: extensions/v1beta1
18+
- apiVersion: extensions/v1
1919
kind: Deployment
2020
metadata:
2121
name: jaeger-collector
@@ -112,7 +112,7 @@ items:
112112
app.kubernetes.io/name: jaeger
113113
app.kubernetes.io/component: collector
114114
type: ClusterIP
115-
- apiVersion: extensions/v1beta1
115+
- apiVersion: extensions/v1
116116
kind: Deployment
117117
metadata:
118118
name: jaeger-query
@@ -179,7 +179,7 @@ items:
179179
app.kubernetes.io/name: jaeger
180180
app.kubernetes.io/component: query
181181
type: LoadBalancer
182-
- apiVersion: extensions/v1beta1
182+
- apiVersion: extensions/v1
183183
kind: DaemonSet
184184
metadata:
185185
name: jaeger-agent

‎tests/src/test/java/oracle/modernappdev/WalkThroughTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import static org.hamcrest.MatcherAssert.assertThat;
1111
import static org.hamcrest.Matchers.*;
1212

13-
public class WalkThroughTest extends TransactionalTests { // estBase {
13+
public class WalkThroughTest extends TestBase {
1414

1515
@Test
1616
void testWalkThroughNoInventory() throws Exception {

‎tests/testIncludingPolyglot.sh‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,61 +3,61 @@
33
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44

55
echo TESTING inventory-helidon
6-
mvn clean test
6+
mvn surefire:test -Dtest=oracle.modernappdev.WalkThroughTest
77
$GRABDISH_HOME/inventory-helidon/undeploy.sh
88

99
$GRABDISH_HOME/inventory-dotnet/deploy.sh
1010
inventory-dotnet
1111
echo TESTING inventory-dotnet
12-
mvn clean test
12+
mvn surefire:test -Dtest=oracle.modernappdev.WalkThroughTest
1313
$GRABDISH_HOME/inventory-dotnet/undeploy.sh
1414

1515
$GRABDISH_HOME/inventory-go/deploy.sh
1616
inventory-go
1717
echo TESTING inventory-go
18-
mvn clean test
18+
mvn surefire:test -Dtest=oracle.modernappdev.WalkThroughTest
1919
$GRABDISH_HOME/inventory-go/undeploy.sh
2020

2121
$GRABDISH_HOME/inventory-helidon-se/deploy.sh
2222
inventory-helidon-se
2323
echo TESTING inventory-helidon-se
24-
mvn clean test
24+
mvn surefire:test -Dtest=oracle.modernappdev.WalkThroughTest
2525
$GRABDISH_HOME/inventory-helidon-se/undeploy.sh
2626

2727
$GRABDISH_HOME/inventory-micronaut/deploy.sh
2828
inventory-micronaut
2929
echo TESTING inventory-micronaut
30-
mvn clean test
30+
mvn surefire:test -Dtest=oracle.modernappdev.WalkThroughTest
3131
$GRABDISH_HOME/inventory-micronaut/undeploy.sh
3232

3333
$GRABDISH_HOME/inventory-nodejs/deploy.sh
3434
inventory-nodejs
3535
echo TESTING inventory-nodejs
36-
mvn clean test
36+
mvn surefire:test -Dtest=oracle.modernappdev.WalkThroughTest
3737
$GRABDISH_HOME/inventory-nodejs/undeploy.sh
3838

3939
$GRABDISH_HOME/inventory-plsql/deploy.sh
4040
inventory-plsql
4141
echo TESTING inventory-plsql
42-
mvn clean test
42+
mvn surefire:test -Dtest=oracle.modernappdev.WalkThroughTest
4343
$GRABDISH_HOME/inventory-plsql/undeploy.sh
4444

4545
$GRABDISH_HOME/inventory-python/deploy.sh
4646
inventory-python
4747
echo TESTING inventory-python
48-
mvn clean test
48+
mvn surefire:test -Dtest=oracle.modernappdev.WalkThroughTest
4949
$GRABDISH_HOME/inventory-python/undeploy.sh
5050

5151
$GRABDISH_HOME/inventory-quarkus/deploy.sh
5252
inventory-quarkus
5353
echo TESTING inventory-quarkus
54-
mvn clean test
54+
mvn surefire:test -Dtest=oracle.modernappdev.WalkThroughTest
5555
$GRABDISH_HOME/inventory-quarkus/undeploy.sh
5656

5757
$GRABDISH_HOME/inventory-springboot/deploy.sh
5858
inventory-springboot
5959
echo TESTING inventory-springboot
60-
mvn clean test
60+
mvn surefire:test -Dtest=oracle.modernappdev.WalkThroughTest
6161
$GRABDISH_HOME/inventory-springboot/undeploy.sh
6262

6363
echo TESTING complete, redeploying inventory-helidon

0 commit comments

Comments
 (0)