fix(bitrisescript): Use proper config key for artifact_dir and access token

Author: ahal

bitrisescript/docker.d/worker.yml

@@ -1,4 +1,5 @@
 work_dir: { "$eval": "WORK_DIR" }
+artifact_dir: { "$eval": "ARTIFACTS_DIR" }
 verbose: { "$eval": "VERBOSE == 'true'" }
 bitrise:
   access_token: { "$eval": "BITRISE_ACCESS_TOKEN" }

bitrisescript/src/bitrisescript/script.py

@@ -13,8 +13,6 @@
 
 
 async def async_main(config, task):
-    artifact_dir = os.path.join(config["work_dir"], "artifacts")
-
     app = get_bitrise_app(config, task)
     log.info(f"Bitrise app: '{app}'")
 
@@ -23,12 +21,12 @@ async def async_main(config, task):
     futures = []
     for workflow in get_bitrise_workflows(config, task):
         build_params["workflow_id"] = workflow
-        futures.append(run_build(artifact_dir, **build_params))
+        futures.append(run_build(config["artifact_dir"], **build_params))
 
     client = None
     try:
         client = BitriseClient()
-        client.set_auth(config["bitrise"]["token"])
+        client.set_auth(config["bitrise"]["access_token"])
         await client.set_app_prefix(app)
         await asyncio.gather(*futures)
     finally:

bitrisescript/tests/conftest.py

@@ -10,4 +10,4 @@ def responses():
 
 @pytest.fixture
 def config():
-    return {"bitrise": {"token": "abc"}, "taskcluster_scope_prefixes": ["test:prefix:"], "work_dir": "work"}
+    return {"bitrise": {"access_token": "abc"}, "taskcluster_scope_prefixes": ["test:prefix:"], "artifact_dir": "work/artifacts", "work_dir": "work"}

bitrisescript/tests/test_bitrise.py

@@ -99,7 +99,7 @@ async def test_bitrise_client_set_app_prefix(mocker, client, app, response, expe
 )
 async def test_bitrise_client_request(config, mocker, client, prefix, endpoint, method, kwargs, raises, expected_args, expected_kwargs):
     expected_kwargs.setdefault("headers", {}).update(
-        {"Authorization": config["bitrise"]["token"]},
+        {"Authorization": config["bitrise"]["access_token"]},
     )
 
     m = mocker.patch.object(client._client, "request", return_value=Future())

bitrisescript/tests/test_integration.py

@@ -1,3 +1,4 @@
+from pathlib import Path
 import pytest
 
 from bitrisescript.bitrise import BITRISE_API_URL
@@ -8,7 +9,10 @@
 async def test_main_run_workflow(responses, tmp_path, config):
     work_dir = tmp_path / "work"
     work_dir.mkdir()
+
+    artifact_dir = work_dir / "artifacts"
     config["work_dir"] = str(work_dir)
+    config["artifact_dir"] = str(artifact_dir)
 
     app = "project"
     app_slug = "abc"
@@ -49,10 +53,10 @@ async def test_main_run_workflow(responses, tmp_path, config):
     await async_main(config, task)
 
     for workflow in workflows:
-        artifact = work_dir / "artifacts" / workflow / f"{workflow}.zip"
+        artifact = artifact_dir / workflow / f"{workflow}.zip"
         assert artifact.is_file()
         assert artifact.read_text() == workflow
 
-        log = work_dir / "artifacts" / workflow / "bitrise.log"
+        log = artifact_dir / workflow / "bitrise.log"
         assert log.is_file()
         assert log.read_text() == "log"