Merge pull request #2 from shipyardapp/bugfix-sync-status

Bugfix sync status. Updating issue so that the `check_sync_status` works properly whether the connector-id is provided or not
shipyardapp · Nov 2, 2022 · 29c2790 · 29c2790
2 parents d0c0559 + 21d91d4
commit 29c2790
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -131,3 +131,9 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+
+# local testing
+.vscode
+*.sh
+
+wespoulsen-artifacts
diff --git a/fivetran_blueprints/check_sync_status.py b/fivetran_blueprints/check_sync_status.py
@@ -1,3 +1,4 @@
+from genericpath import isfile
 from httprequest_blueprints import execute_request
 import argparse
 import os
@@ -125,27 +126,39 @@ def main():
         f'{base_folder_name}/variables')
     execute_request.create_folder_if_dne(pickle_folder_name)
 
-    connector_id = None
+    # connector_id = None
+    connector_id = args.connector_id
     execution_time = None
-    if args.connector_id:
-        connector_id = args.connector_id
-    elif shipyard_upstream_vessels:
+    ## if there are upstream vessels
+    ## if the connector id is not provided then we don't care about the other 
+    if shipyard_upstream_vessels:
         shipyard_upstream_vessels = shipyard_upstream_vessels.split(',')
         for vessel_id in shipyard_upstream_vessels:
             full_pickle_path = working_pickle_file(
                 pickle_folder_name,
                 f'{vessel_id}_force_sync.pickle')
             if full_pickle_path:
-                connector_id, execution_time = load_pickle_variables(
-                    full_pickle_path)
+                ## grab variables from the pickle file only if the connector id from the pickle matches the one provided
+                temp_con_id, temp_execution_time = load_pickle_variables(full_pickle_path)
+                if connector_id:
+                    if temp_con_id == connector_id:
+                        execution_time = temp_execution_time
+                else:
+                    connector_id = temp_con_id 
+                    execution_time = temp_execution_time
+    ## if just the connector is provided
+    elif connector_id:
+        full_pickle_path = working_pickle_file(pickle_folder_name,f'force_sync.pickle')
+        if full_pickle_path:
+            temp_con_id, temp_execution_time = load_pickle_variables(full_pickle_path)
+            if temp_con_id == connector_id:
+                execution_time = temp_execution_time
 
-    if not connector_id and not execution_time:
-        full_pickle_path = working_pickle_file(
-            pickle_folder_name,
-            f'force_sync.pickle')
+    ## if the connetor id is not provided
+    elif not connector_id and not execution_time:
+        full_pickle_path = working_pickle_file(pickle_folder_name,f'force_sync.pickle')
         if full_pickle_path:
-            connector_id, execution_time = load_pickle_variables(
-                full_pickle_path)
+            connector_id, execution_time = load_pickle_variables(full_pickle_path)
 
     connector_details_response = get_connector_details(
         connector_id,
@@ -161,5 +174,6 @@ def main():
         sys.exit(1)
 
 
+
 if __name__ == '__main__':
     main()