Revert "Remove hasura secret in integration tests"

This reverts commit d81bbb2.
NASA-AMMOS · Aug 3, 2023 · dddea1f · dddea1f
1 parent 7ed1e98
commit dddea1f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,6 +12,7 @@ on:
 env:
   AERIE_USERNAME: "${{secrets.AERIE_USERNAME}}"
   AERIE_PASSWORD: "${{secrets.AERIE_PASSWORD}}"
+  HASURA_GRAPHQL_ADMIN_SECRET: "${{secrets.HASURA_GRAPHQL_ADMIN_SECRET}}"
   HASURA_GRAPHQL_JWT_SECRET: "${{secrets.HASURA_GRAPHQL_JWT_SECRET}}"
   POSTGRES_USER: "${{secrets.POSTGRES_USER}}"
   POSTGRES_PASSWORD: "${{secrets.POSTGRES_PASSWORD}}"

diff --git a/docker-compose-test.yml b/docker-compose-test.yml
@@ -69,6 +69,7 @@ services:
     container_name: aerie_scheduler
     depends_on: ['aerie_merlin', 'postgres']
     environment:
+      HASURA_GRAPHQL_ADMIN_SECRET: '${HASURA_GRAPHQL_ADMIN_SECRET}'
       MERLIN_GRAPHQL_URL: http://hasura:8080/v1/graphql
       SCHEDULER_DB: 'aerie_scheduler'
       SCHEDULER_DB_PASSWORD: '${AERIE_PASSWORD}'
@@ -89,6 +90,7 @@ services:
     container_name: aerie_scheduler_worker
     depends_on: ['postgres']
     environment:
+      HASURA_GRAPHQL_ADMIN_SECRET: '${HASURA_GRAPHQL_ADMIN_SECRET}'
       MERLIN_GRAPHQL_URL: http://hasura:8080/v1/graphql
       MERLIN_LOCAL_STORE: /usr/src/app/merlin_file_store
       SCHEDULER_OUTPUT_MODE: UpdateInputPlanWithNewActivities
@@ -110,6 +112,7 @@ services:
     container_name: aerie_sequencing
     depends_on: ['postgres']
     environment:
+      HASURA_GRAPHQL_ADMIN_SECRET: '${HASURA_GRAPHQL_ADMIN_SECRET}'
       LOG_FILE: console
       LOG_LEVEL: debug
       MERLIN_GRAPHQL_URL: http://hasura:8080/v1/graphql
@@ -136,6 +139,7 @@ services:
       AERIE_SEQUENCING_DATABASE_URL: 'postgres://${AERIE_USERNAME}:${AERIE_PASSWORD}@postgres:5432/aerie_sequencing'
       AERIE_SEQUENCING_URL: 'http://aerie_sequencing:27184'
       AERIE_UI_DATABASE_URL: 'postgres://${AERIE_USERNAME}:${AERIE_PASSWORD}@postgres:5432/aerie_ui'
+      HASURA_GRAPHQL_ADMIN_SECRET: '${HASURA_GRAPHQL_ADMIN_SECRET}'
       HASURA_GRAPHQL_DEV_MODE: 'true'
       HASURA_GRAPHQL_ENABLE_CONSOLE: 'true'
       HASURA_GRAPHQL_ENABLED_LOG_TYPES: startup, http-log, webhook-log, websocket-log, query-log

diff --git a/tests/integration_tests/test_cli.py b/tests/integration_tests/test_cli.py
@@ -24,6 +24,7 @@
 AUTH_METHOD = AuthMethod.AERIE_NATIVE
 USERNAME = ""
 PASSWORD = ""
+HASURA_ADMIN_SECRET = os.environ.get("HASURA_GRAPHQL_ADMIN_SECRET")
 
 session = AerieHostSession.session_helper(
     AUTH_METHOD,
@@ -69,7 +70,7 @@ def set_up_environment(request):
         "Aerie instances are mismatched. Ensure test URLs are the same."
 
 def test_model_clean():
-    result = runner.invoke(app, ["-c", "localhost", "models", "clean"])
+    result = runner.invoke(app, ["-c", "localhost", "--hasura-admin-secret", HASURA_ADMIN_SECRET, "models", "clean"])
     assert result.exit_code == 0, \
     f"\nOutput was: \n\n{result.stdout}"\
     f"\nError was: \n\n {result.stderr}"
@@ -81,7 +82,7 @@ def test_model_clean():
 def cli_upload_banana_model():
     return runner.invoke(
         app,
-        ["-c", "localhost", "models", "upload", "--time-tag-version"],
+        ["-c", "localhost", "--hasura-admin-secret", HASURA_ADMIN_SECRET, "models", "upload", "--time-tag-version"],
         input=model_jar 
         + "\n"
         + model_name
@@ -92,6 +93,7 @@ def cli_upload_banana_model():
     )
 
 def test_model_upload():
+    print(f"<<{HASURA_ADMIN_SECRET}>>")
     result = cli_upload_banana_model()
 
     # Get model_id of uploaded mission model
@@ -109,7 +111,7 @@ def test_model_upload():
     )
 
 def test_model_list():
-    result = runner.invoke(app, ["-c", "localhost", "models", "list"])
+    result = runner.invoke(app, ["-c", "localhost", "--hasura-admin-secret", HASURA_ADMIN_SECRET, "models", "list"])
     assert result.exit_code == 0, \
     f"\nOutput was: \n\n{result.stdout}"\
     f"\nError was: \n\n {result.stderr}"
@@ -130,7 +132,7 @@ def test_plan_upload():
     # Test plan upload
     result = runner.invoke(
         app,
-        ["-c", "localhost", "plans", "upload", "--time-tag"],
+        ["-c", "localhost", "--hasura-admin-secret", HASURA_ADMIN_SECRET, "plans", "upload", "--time-tag"],
         input=plan_json + "\n" + str(model_id) + "\n",
     )
     assert result.exit_code == 0, \
@@ -151,7 +153,7 @@ def test_plan_upload():
 def test_plan_duplicate():
     result = runner.invoke(
         app,
-        ["-c", "localhost", "plans", "duplicate"],
+        ["-c", "localhost", "--hasura-admin-secret", HASURA_ADMIN_SECRET, "plans", "duplicate"],
         input=str(plan_id) + "\n" + dup_plan_name + "\n",
     )
     assert result.exit_code == 0, \
@@ -167,7 +169,7 @@ def test_plan_duplicate():
 
 
 def test_plan_list():
-    result = runner.invoke(app, ["-c", "localhost", "plans", "list"])
+    result = runner.invoke(app, ["-c", "localhost", "--hasura-admin-secret", HASURA_ADMIN_SECRET, "plans", "list"])
     assert result.exit_code == 0, \
     f"\nOutput was: \n\n{result.stdout}"\
     f"\nError was: \n\n {result.stderr}"
@@ -177,7 +179,7 @@ def test_plan_list():
 def test_plan_simulate():
     result = runner.invoke(
         app,
-        ["-c", "localhost", "plans", "simulate", "--output", "temp.json"],
+        ["-c", "localhost", "--hasura-admin-secret", HASURA_ADMIN_SECRET, "plans", "simulate", "--output", "temp.json"],
         input=str(plan_id) + "\n",
         catch_exceptions=False
     )
@@ -190,7 +192,7 @@ def test_plan_simulate():
 def test_plan_create_config():
     result = runner.invoke(
         app,
-        ["-c", "localhost", "plans", "create-config"],
+        ["-c", "localhost", "--hasura-admin-secret", HASURA_ADMIN_SECRET, "plans", "create-config"],
         input=str(plan_id) + "\n" + args_init + "\n",
     )
     assert result.exit_code == 0, \
@@ -204,7 +206,7 @@ def test_plan_create_config():
 def test_plan_update_config():
     result = runner.invoke(
         app,
-        ["-c", "localhost", "plans", "update-config"],
+        ["-c", "localhost", "--hasura-admin-secret", HASURA_ADMIN_SECRET, "plans", "update-config"],
         input=str(plan_id) + "\n" + args_update + "\n",
     )
     assert result.exit_code == 0, \
@@ -216,15 +218,15 @@ def test_plan_update_config():
 
 
 def test_plan_delete():
-    result = runner.invoke(app, ["-c", "localhost", "plans", "delete"], input=str(plan_id) + "\n")
+    result = runner.invoke(app, ["-c", "localhost", "--hasura-admin-secret", HASURA_ADMIN_SECRET, "plans", "delete"], input=str(plan_id) + "\n")
     assert result.exit_code == 0, \
     f"\nOutput was: \n\n{result.stdout}"\
     f"\nError was: \n\n {result.stderr}"
     assert f"ID: {plan_id} has been removed." in result.stdout
 
 
 def test_plan_clean():
-    result = runner.invoke(app, ["-c", "localhost", "plans", "clean"])
+    result = runner.invoke(app, ["-c", "localhost", "--hasura-admin-secret", HASURA_ADMIN_SECRET, "plans", "clean"])
     assert result.exit_code == 0, \
     f"\nOutput was: \n\n{result.stdout}"\
     f"\nError was: \n\n {result.stderr}"
@@ -234,7 +236,7 @@ def test_plan_clean():
     )
 
 def test_model_delete():
-    result = runner.invoke(app, ["-c", "localhost", "models", "delete"], input=str(model_id))
+    result = runner.invoke(app, ["-c", "localhost", "--hasura-admin-secret", HASURA_ADMIN_SECRET, "models", "delete"], input=str(model_id))
     assert result.exit_code == 0, \
     f"\nOutput was: \n\n{result.stdout}"\
     f"\nError was: \n\n {result.stderr}"