Merge pull request #7 from SkyflowFoundry/IE-532

IE-532: added support to update connections

Author: skyflow-srivyshnavi

.github/workflows/update_connection.yml

@@ -0,0 +1,85 @@
+name: update_connection
+
+on:
+  workflow_dispatch:
+    inputs:
+      env_url:
+        description: "Select source and target env's"
+        type: choice
+        default: "Source: SANDBOX, Target: PRODUCTION"
+        options:
+          - "Source: SANDBOX, Target: PRODUCTION"
+          - "Source: SANDBOX, Target: SANDBOX"
+          - "Source: PRODUCTION, Target: PRODUCTION"
+          - "Source: PRODUCTION, Target: SANDBOX"
+      source_connection_id:
+        description: "Source Connection ID"
+        required: false
+      target_connection_id:
+        description: "Target Connection ID"
+        required: true
+      source_account_access_token:
+        description: "Access token of the Source Account"
+        required: false
+      target_account_access_token:
+        description: "Access token of the Target Account"
+        required: true
+      source_account_id:
+        description: "Source Account ID. If not provided, will use the repository variable"
+        required: false
+      target_account_id:
+        description: "Target Account ID. If not provided, will use the repository variable"
+        required: false
+
+
+jobs:
+  execute-update-connection-script:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
+
+      - name: Install dependencies
+        run: pip install requests
+      
+      - name: Parse and map environment URLs
+        id: map_envs
+        shell: bash
+        run: |
+          input="${{ github.event.inputs.env_url }}"
+
+          source_name=$(echo "$input" | sed -n 's/Source: \([^,]*\),.*/\1/p' | xargs)
+          target_name=$(echo "$input" | sed -n 's/.*Target: \(.*\)/\1/p' | xargs)
+
+          get_env_url() {
+            case "$1" in
+              SANDBOX) echo "https://manage.skyflowapis-preview.com" ;;
+              PRODUCTION) echo "https://manage.skyflowapis.com" ;;
+              *) echo "Invalid environment: $1" >&2; exit 1 ;;
+            esac
+          }
+
+          # Resolve URLs
+          source_url=$(get_env_url "$source_name")
+          target_url=$(get_env_url "$target_name")
+
+          echo "source_url=$source_url" >> $GITHUB_OUTPUT
+          echo "target_url=$target_url" >> $GITHUB_OUTPUT
+
+      - name: Run Python script
+        env:
+          SOURCE_CONNECTION_ID: ${{ github.event.inputs.source_connection_id }}
+          TARGET_CONNECTION_ID: ${{ github.event.inputs.target_connection_id }}
+          SOURCE_ACCOUNT_AUTH: ${{ github.event.inputs.source_account_access_token }}
+          TARGET_ACCOUNT_AUTH: ${{ github.event.inputs.target_account_access_token }}
+          SOURCE_ACCOUNT_ID: ${{ github.event.inputs.source_account_id != '' && github.event.inputs.source_account_id || vars.SOURCE_ACCOUNT_ID }}
+          TARGET_ACCOUNT_ID: ${{ github.event.inputs.target_account_id != '' && github.event.inputs.target_account_id || vars.TARGET_ACCOUNT_ID }}
+          SOURCE_ENV_URL: ${{ steps.map_envs.outputs.source_url }}
+          TARGET_ENV_URL: ${{ steps.map_envs.outputs.target_url }}
+        run: python3 update_connection.py

migrate_connections.py

@@ -128,10 +128,10 @@ def main(connection_ids=None):
         print(
             f"-- migrate_connections HTTP error: {http_err.response.content.decode()} --"
         )
-        raise http_err
+        exit(1)
     except Exception as err:
         print(f"-- migrate_connections other error: {err} --")
-        raise err
+        exit(1)
 
 
 if __name__ == "__main__":

migrate_pipelines.py

@@ -219,10 +219,10 @@ def main(pipeline_id: str) -> None:
         print(
             f"-- migrate_pipelines HTTP error: {http_err.response.content.decode()} --"
         )
-        raise http_err
+        exit(1)
     except Exception as err:
         print(f"-- migrate_pipelines other error: {err} --")
-        raise err
+        exit(1)
 
 
 if __name__ == "__main__":

migrate_policies.py

@@ -111,10 +111,10 @@ def main(policy_ids=None):
         return policies_created
     except requests.exceptions.HTTPError as http_err:
         print(f'-- migrate_policies HTTP error: {http_err.response.content.decode()} --')
-        raise http_err
+        exit(1)
     except Exception as err:
         print(f"-- migrate_policies error: {err} --")
-        raise err
+        exit(1)
 
 
 if __name__ == "__main__":

migrate_roles.py

@@ -151,7 +151,7 @@ def main(role_ids=None):
                         roles_created.append({"ID" : role_response["roles"][0]["ID"]})
                     else:
                         print("-- Role does not exist --") 
-                if(should_create_role):
+                if should_create_role:
                     role_payload = transform_role_payload(role_info)
                     print(f"-- Creating role: {role_name} --")
                     new_role = create_role(role_payload)
@@ -160,7 +160,7 @@ def main(role_ids=None):
                     role_policies = get_role_policies(role_id)
                     policy_ids = [policy["ID"] for policy in role_policies["policies"]]
                     no_of_policies = len(policy_ids)
-                    if(no_of_policies == 0):
+                    if no_of_policies == 0:
                         print('-- No policies found for the given role --')
                     else:
                         print(f"-- Working on policies migration. No. of policies found for given role: {no_of_policies} --")
@@ -173,10 +173,10 @@ def main(role_ids=None):
     except requests.exceptions.HTTPError as http_err:
         print(f'-- Role creation failed for {role_name if role_name else ""}, ID: {role_id}. --')
         print(f'-- migrate_roles HTTP error: {http_err.response.content.decode()} --')
-        raise http_err
+        exit(1)
     except Exception as err:
         print(f'-- migrate_roles error: {err} --')
-        raise err
+        exit(1)
 
 if __name__ == "__main__":
     main()

migrate_service_accounts.py

@@ -124,10 +124,10 @@ def main(service_accounts_ids=None):
         print(
             f"-- migrate_service_accounts HTTP error: {http_err.response.content.decode()} --"
         )
-        raise http_err
+        exit(1)
     except Exception as err:
         print(f"-- migrate_service_accounts other error: {err} --")
-        raise err
+        exit(1)
 
 
 if __name__ == "__main__":

pytest.ini

@@ -1,3 +1,3 @@
 [pytest]
-addopts = -q --cov=. --cov-report=term-missing --cov-fail-under=95
+addopts = -q --cov=. --cov-report=term-missing --cov-fail-under=98
 testpaths = tests

tests/test_migrate_connections.py

@@ -104,8 +104,9 @@ def raise_err(*args, **kwargs):
     monkeypatch.setattr(mc, "SOURCE_ENV_URL", "https://s")
     mock_get.side_effect = raise_err
 
-    with pytest.raises(requests.exceptions.HTTPError):
+    with pytest.raises(SystemExit) as excinfo:
         mc.main()
+    assert excinfo.value.code == 1
 
 
 def test_main_migrate_all_with_source_calls_list(monkeypatch):
@@ -132,8 +133,9 @@ def boom(_):
         raise Exception("boom")
 
     monkeypatch.setattr(mc, "get_connection", boom)
-    with pytest.raises(Exception):
+    with pytest.raises(SystemExit) as excinfo:
         mc.main()
+    assert excinfo.value.code == 1
 
 
 def test_run_as_script_config_file(monkeypatch):

tests/test_migrate_pipelines.py

@@ -361,8 +361,9 @@ def raise_http_error(_):
 
     monkeypatch.setattr(module, "get_pipeline", raise_http_error)
 
-    with pytest.raises(requests.exceptions.HTTPError):
+    with pytest.raises(SystemExit) as excinfo:
         module.main("pipeline-http-error")
+    assert excinfo.value.code == 1
 
     stdout = capsys.readouterr().out
     assert "HTTP error" in stdout
@@ -378,8 +379,9 @@ def boom(_payload):
 
     monkeypatch.setattr(module, "create_pipeline", boom)
 
-    with pytest.raises(RuntimeError):
+    with pytest.raises(SystemExit) as excinfo:
         module.main("pipeline-other-error")
+    assert excinfo.value.code == 1
 
     stdout = capsys.readouterr().out
     assert "other error" in stdout

tests/test_migrate_policies.py

@@ -110,8 +110,9 @@ def raise_err(_):
         raise err
 
     monkeypatch.setattr(mp, "get_policy", raise_err)
-    with pytest.raises(requests.exceptions.HTTPError):
+    with pytest.raises(SystemExit) as excinfo:
         mp.main(policy_ids=["p1"])
+    assert excinfo.value.code == 1
 
 
 def test_main_generic_exception(monkeypatch):
@@ -121,8 +122,9 @@ def test_main_generic_exception(monkeypatch):
         "transform_policy_payload",
         lambda _: (_ for _ in ()).throw(Exception("boom")),
     )
-    with pytest.raises(Exception):
+    with pytest.raises(SystemExit) as excinfo:
         mp.main(policy_ids=["p1"])
+    assert excinfo.value.code == 1
 
 
 def test_run_as_script(monkeypatch):