Merge remote-tracking branch 'origin/next' into feature/update-workfl…

…ow-management
HugoByte · Nov 8, 2023 · 88a3f09 · 88a3f09
2 parents f48adf2 + e1ebe7a
commit 88a3f09
Show file tree

Hide file tree

Showing 27 changed files with 88 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,11 +7,11 @@ members = [
     "actions/push-notification",
     "actions/event-receiver",
     "actions/substrate-event-processor",
-    "actions/user_registration",
-    "actions/user_login",
+    "actions/user-registration",
+    "actions/user-login",
     "actions/workflow-invoker",
-    "actions/workflow_management",
-    "actions/workflow_registration",
+    "actions/workflow-management",
+    "actions/workflow-registration",
     "workflow/openwhisk_macro",
     "workflow/workflow_macro",
     "workflow/polkadot_macro",

diff --git a/actions/push-notification/deploy.sh b/actions/push-notification/deploy.sh
@@ -26,5 +26,8 @@ build
 $WSK_CLI -i --apihost "$openwhiskApiHost" action update ${ACTION} "$TEMP_DIR/main.zip" --docker "$DOCKER_IMAGE" \
 --auth "$openwhiskApiKey" --param api_key "$FIREBASE_API_KEY"
 
+$WSK_CLI -i --apihost "$openwhiskApiHost" action update "push_notification" "$TEMP_DIR/main.zip" --docker "$DOCKER_IMAGE" \
+--auth "$openwhiskApiKey" --param api_key "$FIREBASE_API_KEY"
+
 $WSK_CLI -i --apihost "$openwhiskApiHost" trigger update "send-${ACTION}" --auth "$openwhiskApiKey"
 $WSK_CLI -i --apihost "$openwhiskApiHost" rule update "${ACTION}-rule" "send-${ACTION}" ${ACTION} --auth "$openwhiskApiKey"
diff --git a/actions/user_login/Cargo.toml → actions/user-login/Cargo.toml b/actions/user_login/Cargo.toml → actions/user-login/Cargo.toml
diff --git a/actions/user-login/deploy.sh b/actions/user-login/deploy.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# To run this command
+# ./deploy.sh --openwhiskApiHost <openwhiskApiHost> --openwhiskApiKey <openwhiskApiKey> --openwhiskNamespace <openwhiskNamespace>
+
+openwhiskApiHost=${openwhiskApiHost:-https://localhost:31001}
+openwhiskApiKey=${openwhiskApiKey:-23bc46b1-71f6-4ed5-8c54-816aa4f8c502:123zO3xZCLrMN6v2BKK1dXYFpXlPkccOFqm12CdAsMgRU4VrNZ9lyGVCGuMDGIwP}
+openwhiskNamespace=${openwhiskNamespace:-guest}
+actionHome=${actionHome:-actions/user-login}
+
+ACTION="user-login"
+ACTION_TYPE="rust"
+SCRIPTS_DIR="$PWD/scripts"
+SRC_DIR="$PWD/${actionHome}"
+TEMP_DIR="$PWD/${actionHome}/temp"
+
+source "$SCRIPTS_DIR/accept_params.sh"
+source "$SCRIPTS_DIR/check_dependencies.sh"
+source "$SCRIPTS_DIR/build_action.sh"
+
+check wsk
+
+build
+
+$WSK_CLI -i --apihost "$openwhiskApiHost" action update ${ACTION} "$TEMP_DIR/main.zip" --docker "$DOCKER_IMAGE" \
+--auth "$openwhiskApiKey" --timeout 300000 --web true --param db_url "http://admin:p@[email protected]:5984" --param db_name "user_registration_db"
diff --git a/actions/user_login/src/lib.rs → actions/user-login/src/lib.rs b/actions/user_login/src/lib.rs → actions/user-login/src/lib.rs
diff --git a/actions/user_login/src/types/mod.rs → actions/user-login/src/types/mod.rs b/actions/user_login/src/types/mod.rs → actions/user-login/src/types/mod.rs
diff --git a/actions/user_login/src/types/user.rs → actions/user-login/src/types/user.rs b/actions/user_login/src/types/user.rs → actions/user-login/src/types/user.rs
diff --git a/actions/user_registration/Cargo.toml → actions/user-registration/Cargo.toml b/actions/user_registration/Cargo.toml → actions/user-registration/Cargo.toml
diff --git a/actions/user-registration/deploy.sh b/actions/user-registration/deploy.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# To run this command
+# ./deploy.sh --openwhiskApiHost <openwhiskApiHost> --openwhiskApiKey <openwhiskApiKey> --openwhiskNamespace <openwhiskNamespace>
+
+openwhiskApiHost=${openwhiskApiHost:-https://localhost:31001}
+openwhiskApiKey=${openwhiskApiKey:-23bc46b1-71f6-4ed5-8c54-816aa4f8c502:123zO3xZCLrMN6v2BKK1dXYFpXlPkccOFqm12CdAsMgRU4VrNZ9lyGVCGuMDGIwP}
+openwhiskNamespace=${openwhiskNamespace:-guest}
+actionHome=${actionHome:-actions/user-registration}
+
+ACTION="user-registration"
+ACTION_TYPE="rust"
+SCRIPTS_DIR="$PWD/scripts"
+SRC_DIR="$PWD/${actionHome}"
+TEMP_DIR="$PWD/${actionHome}/temp"
+
+source "$SCRIPTS_DIR/accept_params.sh"
+source "$SCRIPTS_DIR/check_dependencies.sh"
+source "$SCRIPTS_DIR/build_action.sh"
+
+check wsk
+
+build
+
+$WSK_CLI -i --apihost "$openwhiskApiHost" action update ${ACTION} "$TEMP_DIR/main.zip" --docker "$DOCKER_IMAGE" \
+--auth "$openwhiskApiKey" --timeout 300000 --web true --param db_url "http://admin:p@[email protected]:5984" --param db_name "user_registration_db"
diff --git a/actions/user_registration/src/lib.rs → actions/user-registration/src/lib.rs b/actions/user_registration/src/lib.rs → actions/user-registration/src/lib.rs
diff --git a/actions/user_registration/src/types/mod.rs → actions/user-registration/src/types/mod.rs b/actions/user_registration/src/types/mod.rs → actions/user-registration/src/types/mod.rs
diff --git a/actions/user_registration/src/types/user.rs → actions/user-registration/src/types/user.rs b/actions/user_registration/src/types/user.rs → actions/user-registration/src/types/user.rs
diff --git a/actions/workflow-invoker/deploy.sh b/actions/workflow-invoker/deploy.sh
@@ -6,7 +6,7 @@
 openwhiskApiHost=${openwhiskApiHost:-https://localhost:31001}
 openwhiskApiKey=${openwhiskApiKey:-23bc46b1-71f6-4ed5-8c54-816aa4f8c502:123zO3xZCLrMN6v2BKK1dXYFpXlPkccOFqm12CdAsMgRU4VrNZ9lyGVCGuMDGIwP}
 openwhiskNamespace=${openwhiskNamespace:-guest}
-actionHome=${actionHome:-actions/balance-filter}
+actionHome=${actionHome:-actions/workflow-invoker}
 
 ACTION="workflow-invoker"
 ACTION_TYPE="rust"

diff --git a/actions/workflow_management/Cargo.toml → actions/workflow-management/Cargo.toml b/actions/workflow_management/Cargo.toml → actions/workflow-management/Cargo.toml
diff --git a/actions/workflow_management/deploy.sh → actions/workflow-management/deploy.sh b/actions/workflow_management/deploy.sh → actions/workflow-management/deploy.sh
@@ -6,7 +6,7 @@
 openwhiskApiHost=${openwhiskApiHost:-https://localhost:31001}
 openwhiskApiKey=${openwhiskApiKey:-23bc46b1-71f6-4ed5-8c54-816aa4f8c502:123zO3xZCLrMN6v2BKK1dXYFpXlPkccOFqm12CdAsMgRU4VrNZ9lyGVCGuMDGIwP}
 openwhiskNamespace=${openwhiskNamespace:-guest}
-actionHome=${actionHome:-actions/balance-notification-registration}
+actionHome=${actionHome:-actions/workflow-management}
 
 ACTION="workflow-management"
 ACTION_TYPE="rust"

diff --git a/actions/workflow_management/src/lib.rs → actions/workflow-management/src/lib.rs b/actions/workflow_management/src/lib.rs → actions/workflow-management/src/lib.rs
diff --git a/...ons/workflow_management/src/types/body.rs → ...ons/workflow-management/src/types/body.rs b/...ons/workflow_management/src/types/body.rs → ...ons/workflow-management/src/types/body.rs
diff --git a/actions/workflow_management/src/types/mod.rs → actions/workflow-management/src/types/mod.rs b/actions/workflow_management/src/types/mod.rs → actions/workflow-management/src/types/mod.rs
diff --git a/...workflow_management/src/types/response.rs → ...workflow-management/src/types/response.rs b/...workflow_management/src/types/response.rs → ...workflow-management/src/types/response.rs
diff --git a/...ns/workflow_management/src/types/topic.rs → ...ns/workflow-management/src/types/topic.rs b/...ns/workflow_management/src/types/topic.rs → ...ns/workflow-management/src/types/topic.rs
diff --git a/actions/workflow_registration/Cargo.toml → actions/workflow-registration/Cargo.toml b/actions/workflow_registration/Cargo.toml → actions/workflow-registration/Cargo.toml
diff --git a/actions/workflow_registration/deploy.sh → actions/workflow-registration/deploy.sh b/actions/workflow_registration/deploy.sh → actions/workflow-registration/deploy.sh
@@ -6,9 +6,9 @@
 openwhiskApiHost=${openwhiskApiHost:-https://localhost:31001}
 openwhiskApiKey=${openwhiskApiKey:-23bc46b1-71f6-4ed5-8c54-816aa4f8c502:123zO3xZCLrMN6v2BKK1dXYFpXlPkccOFqm12CdAsMgRU4VrNZ9lyGVCGuMDGIwP}
 openwhiskNamespace=${openwhiskNamespace:-guest}
-actionHome=${actionHome:-actions/balance-notification-registration}
+actionHome=${actionHome:-actions/workflow-registration}
 
-ACTION="workflow-registration
+ACTION="workflow-registration"
 ACTION_TYPE="rust"
 SCRIPTS_DIR="$PWD/scripts"
 SRC_DIR="$PWD/${actionHome}"

diff --git a/actions/workflow_registration/src/lib.rs → actions/workflow-registration/src/lib.rs b/actions/workflow_registration/src/lib.rs → actions/workflow-registration/src/lib.rs
@@ -135,7 +135,7 @@ impl Action {
                     }
                 }
 
-                serde_json::to_value(x)
+                Ok(serde_json::json!({"action_name" : x.name}))
             }
             Err(e) => return Err(e).map_err(serde::de::Error::custom),
         }

diff --git a/...ns/workflow_registration/src/types/mod.rs → ...ns/workflow-registration/src/types/mod.rs b/...ns/workflow_registration/src/types/mod.rs → ...ns/workflow-registration/src/types/mod.rs
diff --git a/...s/workflow_registration/src/types/user.rs → ...s/workflow-registration/src/types/user.rs b/...s/workflow_registration/src/types/user.rs → ...s/workflow-registration/src/types/user.rs
diff --git a/deploy.sh b/deploy.sh
@@ -6,10 +6,10 @@
 openwhiskApiHost=${openwhiskApiHost:-https://localhost:31001}
 openwhiskApiKey=${openwhiskApiKey:-23bc46b1-71f6-4ed5-8c54-816aa4f8c502:123zO3xZCLrMN6v2BKK1dXYFpXlPkccOFqm12CdAsMgRU4VrNZ9lyGVCGuMDGIwP}
 openwhiskNamespace=${openwhiskNamespace:-guest}
-build=${build:-push-notification,balance-filter,event-receiver,event-registration,balance-notification-registration,event-producer,kafka-provider-feed,kafka-provider-web,substrate-event-processor}
+build=${build:-push-notification,balance-filter,event-receiver,event-registration,balance-notification-registration,event-producer,kafka-provider-feed,kafka-provider-web,substrate-event-processor,user-registration,user-login,workflow-invoker,workflow-registration,workflow-management}
 skip=${skip:-}
 
-actions=("actions/push-notification" "actions/balance-filter" "actions/event-receiver" "actions/event-registration" "actions/balance-notification-registration" "actions/event-producer" "actions/kafka-provider-feed" "actions/kafka-provider-web" "actions/substrate-event-processor")
+actions=("actions/push-notification" "actions/balance-filter" "actions/event-receiver" "actions/event-registration" "actions/balance-notification-registration" "actions/event-producer" "actions/kafka-provider-feed" "actions/kafka-provider-web" "actions/substrate-event-processor" "actions/user-registration" "actions/user-login" "actions/workflow-invoker" "actions/workflow-registration" "actions/workflow-management")
 
 source ./scripts/accept_params.sh
 source ./scripts/util.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -135,7 +135,7 @@ impl Action { @@
                         }
                     }
-                    serde_json::to_value(x)
+                    Ok(serde_json::json!({"action_name" : x.name}))
                 }
                 Err(e) => return Err(e).map_err(serde::de::Error::custom),
             }
@@ Expand Down @@