Skip to content

Commit 409682f

Browse files
paulparkinsonRichardExleyrenagranat
authored
MongoDB, Postgres, Kafka work #57 , save mservice logs from test.sh runs #115, and remove the need to edit sqlnet.ora #88 work (#124)
* Update oke-setup.sh * fixes * Boost Node CPU and Memory * Rename states for clarity * Update containerengine.tf * Update main-setup.sh * Build perf and main-setup.sh restart * fix * compute shape and docker login enhancements * Update main-setup.sh * build perf tuning * build fixes * Update build-all.sh * Update oci-cli-cs-key-auth.sh * terraform 3 AD * Update oci-cli-cs-key-auth.sh * Update core.tf * fixes * Update core.tf * fixes Uncomment Internet Gateway Comment DHCP settings Move SSL creation to earlier Add wait for OKE to warm up * fixes PropSetup Back to single domain Wait for OKE nodes msdataworkshop alias cwallet.sso name change remove terraform-orig * fixes wallet.zip VM.Standard.B1.1 image Prune terraform status to 60 characters * fixes add cwallet.sso link rm wallet folder (for security) * fixes Destroy new object atp secrets wait for OKE improved logging and setup handling * minor fixes * Fixes Remove RUN_TYPE for now Execute JAVA_BUILD and NON_JAVA_BUILD from main-setup * Fixes No Key Generated messages Improve end of setup * Update containerengine.tf Change image shape * Fixes Hardening oke-setup Different Shape * Update oke-setup.sh Hardening * Parallel Destroy Make destroy run in parallel * chmod * Update main-setup.sh More hardening * Update main-setup.sh * Update oke-setup.sh More defensive code * Typo * SODA build + cleanup Replace SODA jar with maven dependency Remove old scripts Fix global deploy/undeploy scripts * Reorg Jaeger * Jaeger Fixes * DB Prep in Setup and DB Name Changes Moved DB Setup from Java to Shell Change DB Name to o and i * Fixes and Start of GB Integration * DB Name Changes * Update db-setup.sh Fixes * dotnet inventorylocation query * Update main-setup.sh * dotnet inventorylocation query * Update db-setup.sh * GB Integration and Prop Fixes * fixes * Update oci-cli-cs-key-auth.sh * Removed DB Setup from UI * Update oci-cli-cs-key-auth.sh * Dot Net and Go * Fixes * Update main-setup.sh * Manage Non-Java Builds Better * inventory-go work * Update main-destroy.sh * inventory-go work * inventory-go aq dequeue added * Build Reorg * Update main-setup.sh Reorg password collection * Update main-setup.sh Minor fixes * Minor Fixes * Binding Changes * Fixes * Remove Legacy Code Removed admin-helidon, atp-setup, Removed initContainers from deployment yamls * inventory-go working with pl/sql * Fixed inventory-helidon-se * Minor fixes * Update main-setup.sh * Update main-setup.sh * Update main-setup.sh * Update db-setup.sh * Update main-setup.sh * Update main-setup.sh * Update db-setup.sh * Update main-setup.sh * Update main-setup.sh * Update main-setup.sh * Update db-setup.sh * Fixes go build.sh fix * Update java-builds.sh * Update non-java-builds.sh * Update oke-setup.sh * Update oke-setup.sh * Update db-setup.sh * Update non-java-builds.sh * Update java-builds.sh * Update non-java-builds.sh * Update java-builds.sh * Update db-setup.sh * Update oke-setup.sh * Update java-builds.sh * Update non-java-builds.sh * Update java-builds.sh * Update non-java-builds.sh * Update oke-setup.sh * Simpler Approach * Update main-setup.sh * Update main-setup.sh * Update main-setup.sh * Update main-setup.sh * Update main-setup.sh * Update main-setup.sh * Update main-setup.sh Remove API Key based authentication as bug is fixed * Update main-destroy.sh Complete API Key removal * Update destroy.sh * Fix Inventory DotNet and Go * Update logback.xml Fixed inventory-helidon-se * Update db-setup.sh Protect password in it contains case special characters * dotnet and go services: switch to polling for msgs * Update main-setup.sh * Update main-setup.sh * Update main-setup.sh * verrazzano/multi-cloud work * verrazzano comp files * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * polyglot inventory service mods * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * inventory-springboot * inventory-helidon fix * mongodb install * mongodm * mongodb install * mongodm * mongodm * mongo-kafka-postgres work * mongodb-kafka-postgres work * mongo * postgres work * mongodm * mongodm * mongodm * mongodm * mongodm * mongodm * mongodm * mongodm * mongodm * mongodm * mongodm * mongodm * mongodm * mongo etc work * mongo kafka postgres work * mongo kafka postgres work * mongo kafka postgres work * removed sqlnet.ora edit * removed sqlnet.ora edit * removed sqlnet.ora edit * dotnet docker work and password/url fix * dotnet docker work and password/url fix * dotnet docker work and password/url fix * dotnet docker work and password/url fix * dotnet docker work and password/url fix * dotnet docker work and password/url fix * dotnet docker work and password/url fix * dotnet docker work and password/url fix * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * recovery test work * recovery test work * recovery test work * recovery test work * replace postgres configmap with secret * replace postgres configmap with secret Co-authored-by: RichardExley <[email protected]> Co-authored-by: irina granat <[email protected]>
1 parent bb944b7 commit 409682f

File tree

27 files changed

+128
-51
lines changed

27 files changed

+128
-51
lines changed

‎grabdish/docs/AutoTest.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ _Copyright (c) 2019, 2020, 2021 Oracle and/or its affiliates The Universal Permi
44

55
Here is how to run an automated test in your free tier tenancy or with a Live Labs reserved tenancy.
66

7-
1. (Free Tier Only) Clean up your existing tenancy so thet you have disk space and the docker cache is empty:
7+
1. (Free Tier Only) Clean up your existing tenancy so that you have disk space and the docker cache is empty:
88
```
99
docker image prune -a -f
1010
csreset -a
@@ -25,17 +25,17 @@ cd $TEST_DIRECTORY
2525
export TEST_USER_OCID='ocid1.user.oc1..xxxxx'
2626
```
2727

28-
5. Register which branch you wish to test and the passwords to be used:
28+
5. Export the fork/GITHUB_USER (and branch/GITHUB_BRANCH if necessary) you wish to test and the passwords to be used:
2929
```
30-
export GITHUB_BRANCH='1.4'
31-
export GITHUB_USER='oracle'
30+
export GITHUB_BRANCH='main'
31+
export GITHUB_USER='myghuser'
3232
export TEST_DB_PASSWORD='Welcome12345;#!:'
3333
export TEST_UI_PASSWORD='Welcome1;#!"'
3434
```
3535

3636
6. Clone the code
3737
```
38-
git clone -b "$BRANCH" --single-branch "https://github.com/${GITHUB_USER}/microservices-datadriven.git"
38+
git clone -b "$GITHUB_BRANCH" --single-branch "https://github.com/${GITHUB_USER}/microservices-datadriven.git"
3939
```
4040

4141
7. Execute the setup. Note in the Live Labs case, the setup will prompt for the compartment OCID and an auth token.

‎grabdish/docs/LocalDev.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ mkdir ~/grabdish_state
5353
cd ~/grabdish_state
5454
```
5555

56-
2. Using the download feature of cloud shell (hamburger menu about cloud shell window), download the ./grabdish_state.tgz file to your machine. This file is generated when the workshop setup completes.
56+
2. Using the download feature of cloud shell (hamburger menu about cloud shell window), download the ~/grabdish_state.tgz file to your machine. This file is generated when the workshop setup completes.
5757

5858
3. Copy the _grabdish_state.tgz_ file to the _~/grabdish_state_ folder.
5959

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ public Response pizza() {
151151
@GET
152152
@Produces("image/svg+xml")
153153
public Response burger() {
154-
System.out.println("Getting Burger...");
155154
try {
156155
return Response.ok(Resource.create("web/images/burger.svg").stream()).build();
157156
} catch (Exception e) {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ <h1 class="oj-sm-only-hide oj-web-applayout-header-title" title="Application Nam
150150
<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>
151151
<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>
152152
<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>
153-
<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>
154153
</div>
155154
<!-- lab10 -->
156155
<div slot="lab10">

‎grabdish/inventory-dotnet/Dockerfile‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim-amd64 AS build
1+
FROM mcr.microsoft.com/dotnet/sdk:5.0.300-alpine3.13-amd64 AS build
2+
#FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim-amd64 AS build
23
# FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
34
# FROM mcr.microsoft.com/dotnet/sdk:5.0-focal AS build-env
5+
46
WORKDIR /src
57
COPY inventory-dotnet.csproj .
68
RUN dotnet restore
@@ -12,3 +14,7 @@ WORKDIR /app
1214
COPY --from=build /app .
1315
ENTRYPOINT ["dotnet", "inventory-dotnet.dll"]
1416

17+
#FROM mcr.microsoft.com/dotnet/aspnet:5.0
18+
#WORKDIR /app
19+
#COPY /app /app
20+
#ENTRYPOINT ["dotnet", "inventory-dotnet.dll"]

‎grabdish/inventory-go/Dockerfile‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,13 @@ RUN ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2
2222

2323
COPY --from=builder /go/bin/inventory-go /usr/lib/inventory-go
2424
ENTRYPOINT ["/usr/lib/inventory-go"]
25+
26+
27+
#ARG release=19
28+
#ARG update=9
29+
#RUN wget https://download.oracle.com/otn_software/linux/instantclient/${release}${update}000/instantclient-basic-linux.x64-${release}.${update}.0.0.0dbru.zip && \
30+
# unzip instantclient-basic-linux.x64-${release}.${update}.0.0.0dbru.zip && \
31+
# cp -r instantclient_${release}_${update}/* /lib && \
32+
# rm -rf instantclient-basic-linux.x64-${release}.${update}.0.0.0dbru.zip && \
33+
# apk add libaio && \
34+
# apk add libaio libnsl libc6-compat

‎grabdish/inventory-go/inventory-go-comp.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
- name: user
2727
value: "inventoryuser"
2828
- name: TNS_ADMIN
29-
value: "/msdataworkshop/creds"
29+
value: "/lib/oracle/19.10/client64/lib/network/admin"
3030
- name: INVENTORY_PDB_NAME
3131
value: "%INVENTORY_PDB_NAME%_tp"
3232
- name: OCI_REGION
@@ -43,7 +43,7 @@ spec:
4343
optional: true #not needed/used if using VAULT_SECRET_OCID exists
4444
volumeMounts:
4545
- name: creds
46-
mountPath: /msdataworkshop/creds
46+
mountPath: /lib/oracle/19.10/client64/lib/network/admin
4747
ports:
4848
- containerPort: 8080
4949
restartPolicy: Always

‎grabdish/inventory-go/inventory-go-deployment.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ spec:
2626
value: "inventoryuser"
2727
- name: TNS_ADMIN
2828
value: "/msdataworkshop/creds"
29+
# value: "/lib/oracle/instantclient_19_3/client64/lib/network/admin"
2930
- name: INVENTORY_PDB_NAME
3031
value: "%INVENTORY_PDB_NAME%_tp"
3132
- name: OCI_REGION
@@ -43,6 +44,7 @@ spec:
4344
volumeMounts:
4445
- name: creds
4546
mountPath: /msdataworkshop/creds
47+
# mountPath: /lib/oracle/instantclient_19_3/client64/lib/network/admin # 19.10
4648
ports:
4749
- containerPort: 8080
4850
restartPolicy: Always

‎grabdish/inventory-helidon/inventory-service.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
## Copyright (c) 2021 Oracle and/or its affiliates.
2+
## Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
3+
apiVersion: v1
4+
kind: Service
5+
metadata:
6+
name: inventory
7+
labels:
8+
app: inventory
9+
spec:
10+
type: NodePort
11+
ports:
12+
- port: 8080
13+
name: http
14+
selector:
15+
app: inventory

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ public class InventoryResource {
3434
static String inventorypw;
3535
static String inventoryQueueName = "inventoryqueue";
3636
static String orderQueueName = "orderqueue";
37+
static boolean crashAfterOrderMessageReceived;
38+
static boolean crashAfterOrderMessageProcessed;
3739

3840
static {
3941
System.setProperty("oracle.jdbc.fanEnabled", "false");
@@ -68,4 +70,24 @@ public Response listenForMessages() {
6870
return returnValue;
6971
}
7072

73+
@Path("/crashAfterOrderMessageReceived")
74+
@GET
75+
@Produces(MediaType.TEXT_PLAIN)
76+
public Response crashAfterOrderMessageReceived() {
77+
crashAfterOrderMessageReceived = true;
78+
return Response.ok()
79+
.entity("inventory crashAfterOrderMessageReceived set")
80+
.build();
81+
}
82+
83+
@Path("/crashAfterOrderMessageProcessed")
84+
@GET
85+
@Produces(MediaType.TEXT_PLAIN)
86+
public Response crashAfterOrderMessageProcessed() {
87+
crashAfterOrderMessageProcessed = true;
88+
return Response.ok()
89+
.entity("inventory crashAfterOrderMessageProcessed set")
90+
.build();
91+
}
92+
7193
}

0 commit comments

Comments
 (0)