Merge branch 'main' into devops-nodejs-vm-fix

Author: martatolosa

data-platform/core-converged-db/database-23c/json-relational-duality-views/demo/SBS.JSON_DUALITY.OE.sql

@@ -1,4 +1,5 @@
-[opc@rdbmsfree ~]$ docker exec -it my23free sqlplus OE/Oracle_4U@localhost:1521/freepdb1
+PLEASE CHANGE YOUR_PASSWORD  TO A REAL PASSWORD!
+[opc@rdbmsfree ~]$ docker exec -it my23free sqlplus OE/YOUR_PASSWORD@localhost:1521/freepdb1
 
 SQL*Plus: Release 23.0.0.0.0 - Developer-Release on Tue Apr 11 11:59:22 2023
 Version 23.2.0.0.0
@@ -219,7 +220,7 @@ JSON_SERIALIZE(DATAPRETTY)
   "CUST_FIRST_NAME" : "Ron",
   "CUST_LAST_NAME" : "Wood",
   "CREDIT_LIMIT" : 2000,
-  "CUST_EMAIL" : "ron.wood@beggarsbanquet.com",
+  "CUST_EMAIL" : "test@example.com",
   "orders" :
   [
     {
@@ -248,7 +249,7 @@ set data = '{
   "CUST_FIRST_NAME" : "Ron",
   "CUST_LAST_NAME" : "Wood",
   "CREDIT_LIMIT" : 2000,
-  "CUST_EMAIL" : "ron.wood@beggarsbanquet.com",
+  "CUST_EMAIL" : "test@example.com",
   "orders" :
   [
     {
@@ -300,7 +301,7 @@ set data = JSON_MERGEPATCH (data,'{
   "CUST_FIRST_NAME" : "Ron",
   "CUST_LAST_NAME" : "Wood",
   "CREDIT_LIMIT" : 2000,
-  "CUST_EMAIL" : "ron.wood@beggarsbanquet.com",
+  "CUST_EMAIL" : "test@example.com",
   "orders" :
   [
     {
@@ -374,7 +375,7 @@ values (
   "CUST_FIRST_NAME" : "Ron",
   "CUST_LAST_NAME" : "Wood",
   "CREDIT_LIMIT" : 2000,
-  "CUST_EMAIL" : "ron.wood@beggarsbanquet.com",
+  "CUST_EMAIL" : "test@example.com",
   "orders" :
   [
     {
@@ -411,7 +412,7 @@ set data = JSON_MERGEPATCH (data,'{
   "CUST_FIRST_NAME" : "Ron",
   "CUST_LAST_NAME" : "Wood",
   "CREDIT_LIMIT" : 2000,
-  "CUST_EMAIL" : "ron.wood@beggarsbanquet.com",
+  "CUST_EMAIL" : "test@example.com",
   "orders" :
   [
     {
@@ -458,7 +459,7 @@ values ('{
   "CUST_FIRST_NAME" : "Keith",
   "CUST_LAST_NAME" : "Richards",
   "CREDIT_LIMIT" : 2000,
-  "CUST_EMAIL" : "keith.richards@beggarsbanquet.com",
+  "CUST_EMAIL" : "test@example.com",
   "orders" :
   [
     {
@@ -560,7 +561,7 @@ values ('{
   "CUST_FIRST_NAME" : "Keith",
   "CUST_LAST_NAME" : "Richards",
   "CREDIT_LIMIT" : 2000,
-  "CUST_EMAIL" : "keith.richards@beggarsbanquet.com",
+  "CUST_EMAIL" : "test@example.com",
   "orders" :
   [
     {
@@ -627,7 +628,7 @@ set data = JSON_MERGEPATCH (data,'{
   "CUST_FIRST_NAME" : "Ron",
   "CUST_LAST_NAME" : "Wood",
   "CREDIT_LIMIT" : 2000,
-  "CUST_EMAIL" : "ron.wood@beggarsbanquet.com",
+  "CUST_EMAIL" : "test@example.com",
   "orders" :
   [
     {
@@ -671,7 +672,7 @@ set data = JSON_MERGEPATCH (data,'{
   "CUST_FIRST_NAME" : "Ron",
   "CUST_LAST_NAME" : "Wood",
   "CREDIT_LIMIT" : 2000,
-  "CUST_EMAIL" : "ron.wood@beggarsbanquet.com",
+  "CUST_EMAIL" : "test@example.com",
   "orders" :
   [
     {
@@ -883,4 +884,4 @@ DATE_OF_B MARITAL_STATUS       G INCOME_LEVEL
 --------- -------------------- - --------------------
 
 
-SQL>
+SQL>

security/security-design/shared-assets/bastion-session-script/files/bastion-session.sh

@@ -11,7 +11,7 @@
 ###############################################################################
 
 # Set default values.
-version="1.0.2"
+version="1.0.3"
 oci_profile="DEFAULT"
 session_name="Bastion-Session"
 session_check_counter=15  # times 10 seconds for maximum time while checking session creation status.
@@ -153,7 +153,7 @@ oci_create_bastion_session() {
    cmd="oci bastion session get --session-id ${session_id} ${oci_options}"
    until [ $session_check_counter == 0 ]
    do
-      sleep 10
+      sleep 5
       if ! run_oci_cmd; then
          echo "*** Problem retrieving OCI Bastion session status: ${session_id}"
          exit 1
@@ -165,6 +165,7 @@ oci_create_bastion_session() {
       else
          session_check_counter=0
       fi
+      sleep 5
    done
    if [ "${session_status}" != "ACTIVE" ]; then
       echo "*** Problem creating OCI Bastion session. Failed on status: ${session_status}"

security/security-design/shared-assets/bastion-session-script/release-notes.md

@@ -1,5 +1,9 @@
 # Release Notes
 
+## Feb 20, 2024 Release Notes - v1.0.3
+
+- Fixed an issue where sometimes the bastion session resource was used before it was fully ready.
+
 ## Jul 4, 2023 Release Notes - v1.0.2
 
 - Documentation and textual improvements.