Skip to content

Commit cf1d103

Browse files
paulparkinsonpaulparkinson
authored
foodwinepairing mods and showsetuplogs util (#245)
* 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 * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * TEQ setup and tracing * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * grafana work * grafana work * grafana work * grafana work * grafana work * grafana work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * dotnet work * dotnet work * dotnet work * dotnet work * dotnet work * observability, dotnet, go, etc. work - move kafka etc. build to nonjava * observability, dotnet, go, etc. work - move kafka etc. build to nonjava * observability, dotnet, go, etc. work - move kafka etc. build to nonjava * 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 * 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
1 parent 636322b commit cf1d103

File tree

10 files changed

+35
-61
lines changed

10 files changed

+35
-61
lines changed

‎grabdish/foodwinepairing-python/build.sh‎

100644100755
File mode changed.

‎grabdish/foodwinepairing-python/deploy.sh‎

100644100755
File mode changed.

‎grabdish/foodwinepairing-python/undeploy.sh‎

100644100755
File mode changed.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ <h1 class="oj-sm-only-hide oj-web-applayout-header-title" title="Application Nam
6161
</div>
6262
<div class="oj-flex-bar">
6363
<div class="oj-flex-bar-middle oj-sm-align-items-baseline">
64-
<p class="oj-text-color-secondary oj-typography-subheading-xs">Event-driven Stateful Microservices with
65-
Helidon and Autonomous Database on OCI</p>
64+
<p class="oj-text-color-secondary oj-typography-subheading-xs">Data-driven Microservices with
65+
converged Oracle Database</p>
6666
</div>
6767
</div>
6868
</header>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ <h1 class="oj-sm-only-hide oj-web-applayout-header-title" title="Application Nam
6161
</div>
6262
<div class="oj-flex-bar">
6363
<div class="oj-flex-bar-middle oj-sm-align-items-baseline">
64-
<p class="oj-text-color-secondary oj-typography-subheading-xs">Event-driven Stateful Microservices with
65-
Helidon and Autonomous Database on OCI</p>
64+
<p class="oj-text-color-secondary oj-typography-subheading-xs">Data-driven Microservices with
65+
converged Oracle Database</p>
6666
</div>
6767
</div>
6868
</header>

‎grabdish/inventory-helidon/deploy.sh‎

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

55
SCRIPT_DIR=$(dirname $0)
6+
export IS_SUGGESTIVE_SALE_ENABLED=$1
7+
8+
if [ -z "$IS_SUGGESTIVE_SALE_ENABLED" ]; then
9+
echo "No argument for IS_SUGGESTIVE_SALE_ENABLED, defaulting to false..."
10+
export IS_SUGGESTIVE_SALE_ENABLED=false
11+
fi
612

713
if [ -z "$DOCKER_REGISTRY" ]; then
814
echo "DOCKER_REGISTRY not set. Will get it with state_get"
@@ -40,11 +46,13 @@ sed -e "s|%OCI_REGION%|${OCI_REGION}|g" inventory-helidon-deployment-${CURRENTTI
4046
mv -- /tmp/inventory-helidon-deployment-$CURRENTTIME.yaml inventory-helidon-deployment-$CURRENTTIME.yaml
4147
sed -e "s|%VAULT_SECRET_OCID%|${VAULT_SECRET_OCID}|g" inventory-helidon-deployment-${CURRENTTIME}.yaml > /tmp/inventory-helidon-deployment-$CURRENTTIME.yaml
4248
mv -- /tmp/inventory-helidon-deployment-$CURRENTTIME.yaml inventory-helidon-deployment-$CURRENTTIME.yaml
49+
sed -e "s|%IS_SUGGESTIVE_SALE_ENABLED%|${IS_SUGGESTIVE_SALE_ENABLED}|g" inventory-helidon-deployment-${CURRENTTIME}.yaml > /tmp/inventory-helidon-deployment-$CURRENTTIME.yaml
50+
mv -- /tmp/inventory-helidon-deployment-$CURRENTTIME.yaml inventory-helidon-deployment-$CURRENTTIME.yaml
4351

44-
if [ -z "$1" ]; then
45-
kubectl apply -f $SCRIPT_DIR/inventory-helidon-deployment-$CURRENTTIME.yaml -n msdataworkshop
46-
else
47-
kubectl apply -f <(istioctl kube-inject -f $SCRIPT_DIR/inventory-helidon-deployment-$CURRENTTIME.yaml) -n msdataworkshop
48-
fi
52+
#if [ -z "$1" ]; then
53+
kubectl apply -f $SCRIPT_DIR/inventory-helidon-deployment-$CURRENTTIME.yaml -n msdataworkshop
54+
#else
55+
# kubectl apply -f <(istioctl kube-inject -f $SCRIPT_DIR/inventory-helidon-deployment-$CURRENTTIME.yaml) -n msdataworkshop
56+
#fi
4957

5058
kubectl create -f inventory-service.yaml -n msdataworkshop

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
- name: VAULT_SECRET_OCID
3434
value: "%VAULT_SECRET_OCID%"
3535
- name: isSuggestiveSaleAIEnabled
36-
value: "true"
36+
value: "%IS_SUGGESTIVE_SALE_ENABLED%"
3737
- name: dbpassword
3838
valueFrom:
3939
secretKeyRef:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public InventoryResource() {
6666
@Inject
6767
private MetricRegistry metricRegistry;
6868

69-
public void init(@Observes @Initialized(ApplicationScoped.class) Object init) throws SQLException {
69+
public void init(@Observes @Initialized(ApplicationScoped.class) Object init) throws Exception {
7070
System.out.println("InventoryResource.init " + init);
7171
String pw;
7272
if(pwSecretOcid != null && !pwSecretOcid.equals("")) {

‎grabdish/utils/non-java-builds.sh‎

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,3 @@
1-
Skip to content
2-
Search or jump to…
3-
Pull requests
4-
Issues
5-
Marketplace
6-
Explore
7-
8-
@praveennhiremath
9-
oracle
10-
/
11-
microservices-datadriven
12-
Public
13-
8
14-
18
15-
14
16-
Code
17-
Issues
18-
103
19-
Pull requests
20-
Discussions
21-
Actions
22-
Projects
23-
1
24-
Wiki
25-
Security
26-
Insights
27-
Settings
28-
microservices-datadriven/grabdish/utils/non-java-builds.sh
29-
@paulparkinson
30-
paulparkinson update versions of a jdk, helidon, and oracle jdbc, and add inventory…
31-
…
32-
Latest commit c2a8892 4 days ago
33-
History
34-
4 contributors
35-
@RichardExley@paulparkinson@renagranat@matayal
36-
Executable File 50 lines (40 sloc) 1.72 KB
37-
381
#!/bin/bash
392
# Copyright (c) 2021 Oracle and/or its affiliates.
403
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
@@ -85,16 +48,3 @@ while ! state_done DB_LOG_EXPORTER_BUILD; do
8548
time ./build.sh &>> $GRABDISH_LOG/build-db-log-exporter.log &
8649
state_set_done DB_LOG_EXPORTER_BUILD
8750
done
88-
© 2021 GitHub, Inc.
89-
Terms
90-
Privacy
91-
Security
92-
Status
93-
Docs
94-
Contact GitHub
95-
Pricing
96-
API
97-
Training
98-
Blog
99-
About
100-
Loading complete

‎grabdish/utils/showsetuplogs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/bash
2+
## Copyright (c) 2021 Oracle and/or its affiliates.
3+
## Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
4+
5+
for FILE in $GRABDISH_LOG/*; do echo $FILE; done
6+
7+
for FILE in $GRABDISH_LOG/*; do
8+
while true; do
9+
read -p "Do you wish to cat $FILE ? y or n or x to exit?" yn
10+
case $yn in
11+
[Yy]* ) cat $FILE; break;;
12+
[Xx]* ) exit;;
13+
* ) echo "skipping file..."; break;
14+
esac
15+
done
16+
done

0 commit comments

Comments
 (0)