Skip to content

Commit fff1bcb

Browse files
RichardExleyrenagranat
RichardExley
and
renagranat
authored
Minor Fixes (#30)
* first-round * second-set * third-push * push4 * push5 * push6 * push * push * push * push * fixes * fixes * fixes * fixes * fixes * fixes * fixes * terra optimizations * terra fixes * env.sh and fixes * docker login fix * take out vaults for now * fixes * fixes * fixes * fixes * fixes * fixes * fixes * Deploy fixes and new terraform * terraform reorg and fixes * oci_core_services fix * Update core.tf * Update core.tf * Update main-destroy.sh * fixes * Update core.tf * fixes * 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 * Update main-setup.sh * 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 * Update main-destroy.sh * 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 * 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 Co-authored-by: irina granat <irina.granat@oracle.com>
1 parent b99dd63 commit fff1bcb

File tree

7 files changed

+20
-22
lines changed

7 files changed

+20
-22
lines changed

‎grabdish/inventory-dotnet/Startup.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,12 @@ public String ListenForMessages()
8282
String tnsAdmin = Environment.GetEnvironmentVariable("TNS_ADMIN");
8383
OracleConfiguration.WalletLocation = tnsAdmin;
8484
string connString =
85-
"User Id=INVENTORYUSER;Password=" +
86-
Environment.GetEnvironmentVariable("dbpassword") +
85+
"User Id=" +
86+
Environment.GetEnvironmentVariable("DB_USER") +
87+
";Password=" +
88+
Environment.GetEnvironmentVariable("DB_PASSWORD") +
8789
";Data Source=" +
88-
Environment.GetEnvironmentVariable("INVENTORY_PDB_NAME") +
90+
Environment.GetEnvironmentVariable("DB_CONNECT_STRING") +
8991
";";
9092
Console
9193
.WriteLine("tnsAdmin:" +

‎grabdish/inventory-dotnet/deploy.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
SCRIPT_DIR=$(dirname $0)
77

88
export DOCKER_REGISTRY="$(state_get DOCKER_REGISTRY)"
9-
export INVENTORY_PDB_NAME="$(state_get RUN_NAME)X2"
10-
export OCI_REGION="$(state_get OCI_REGION)"
9+
export INVENTORY_PDB_NAME="$(state_get INVENTORY_DB_NAME)"
10+
export OCI_REGION="$(state_get REGION)"
1111
export VAULT_SECRET_OCID=""
1212

1313
echo create inventory-dotnet deployment and service...
@@ -30,4 +30,4 @@ if [ -z "$1" ]; then
3030
kubectl apply -f $SCRIPT_DIR/inventory-dotnet-deployment-$CURRENTTIME.yaml -n msdataworkshop
3131
else
3232
kubectl apply -f <(istioctl kube-inject -f $SCRIPT_DIR/inventory-dotnet-deployment-$CURRENTTIME.yaml) -n msdataworkshop
33-
fi
33+
fi

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,17 @@ spec:
2222
image: %DOCKER_REGISTRY%/inventory-dotnet:0.1
2323
imagePullPolicy: Always
2424
env:
25-
- name: user
25+
- name: DB_USER
2626
value: "inventoryuser"
2727
- name: TNS_ADMIN
2828
value: "/msdataworkshop/creds"
29-
- name: INVENTORY_PDB_NAME
29+
- name: DB_CONNECT_STRING
3030
value: "%INVENTORY_PDB_NAME%_tp"
3131
- name: OCI_REGION
3232
value: "%OCI_REGION%"
33-
- name: OCI_REGION
34-
value: "%OCI_REGION%"
3533
- name: VAULT_SECRET_OCID
3634
value: "%VAULT_SECRET_OCID%"
37-
- name: dbpassword
35+
- name: DB_PASSWORD
3836
valueFrom:
3937
secretKeyRef:
4038
name: dbuser
@@ -49,4 +47,4 @@ spec:
4947
volumes:
5048
- name: creds
5149
secret:
52-
secretName: db-wallet-secret
50+
secretName: db-wallet-secret

‎grabdish/inventory-go/deploy.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
SCRIPT_DIR=$(dirname $0)
77

88
export DOCKER_REGISTRY="$(state_get DOCKER_REGISTRY)"
9-
export INVENTORY_PDB_NAME="$(state_get RUN_NAME)X2"
10-
export OCI_REGION="$(state_get OCI_REGION)"
9+
export INVENTORY_PDB_NAME="$(state_get INVENTORY_DB_NAME)"
10+
export OCI_REGION="$(state_get REGION)"
1111
export VAULT_SECRET_OCID=""
1212

1313
echo create inventory-go deployment and service...
@@ -30,4 +30,4 @@ if [ -z "$1" ]; then
3030
kubectl apply -f $SCRIPT_DIR/inventory-go-deployment-$CURRENTTIME.yaml -n msdataworkshop
3131
else
3232
kubectl apply -f <(istioctl kube-inject -f $SCRIPT_DIR/inventory-go-deployment-$CURRENTTIME.yaml) -n msdataworkshop
33-
fi
33+
fi

‎grabdish/inventory-helidon-se/src/main/resources/logback.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
12
<!--
23
34
@@ -7,7 +8,6 @@
78
89
910
-->
10-
<?xml version="1.0" encoding="UTF-8" ?>
1111
<configuration>
1212
<variable name="LOG_LEVEL" value="${LOG_LEVEL:-INFO}"/>
1313
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
@@ -32,4 +32,4 @@
3232
<appender-ref ref="STDOUT" />
3333
</logger>
3434

35-
</configuration>
35+
</configuration>

‎grabdish/inventory-python/common/dbmgr.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
db_user = env.get('DB_USER').strip()
1717
region_id = env.get('OCI_REGION').strip()
1818
vault_secret_ocid = env.get('VAULT_SECRET_OCID').strip()
19-
k8s_secret_dbpassword = env.get('dbpassword').strip()
19+
k8s_secret_dbpassword = env.get('DB_PASSWORD').strip()
2020
db_connect_string = env.get('DB_CONNECT_STRING')
21-
region_id = env.get('OCI_REGION').strip()
2221

2322
readyfile = ""
2423
logger = None
@@ -138,4 +137,3 @@ def reportUp():
138137
class DatabaseDown(Exception):
139138
def __init__(self):
140139
pass
141-

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ spec:
4848
value: "%OCI_REGION%"
4949
- name: VAULT_SECRET_OCID
5050
value: "%VAULT_SECRET_OCID%"
51-
- name: dbpassword
51+
- name: DB_PASSWORD
5252
valueFrom:
5353
secretKeyRef:
5454
name: dbuser
@@ -71,4 +71,4 @@ spec:
7171
volumes:
7272
- name: creds
7373
secret:
74-
secretName: db-wallet-secret
74+
secretName: db-wallet-secret

0 commit comments

Comments
 (0)