ENH: Use name-based service ID

octue.yaml

@@ -1,5 +1,6 @@
 services:
   - name: turbsim-service
+    organisation: aerosense
     app_configuration_path: app_configuration.json
     project_name: aerosense-twined
     region: europe-west1

setup.py

@@ -8,6 +8,6 @@
     py_modules=["app"],
     install_requires=[
         "coolname>=1.1,<2",
-        "octue==0.23.5",
+        "octue==0.26.0",
     ],
 )

tests/test_app.py

@@ -24,9 +24,7 @@ def test_app(self):
         """Test that the app takes input and produces an output manifest with a dataset containing a single `.bts` file."""
         runner = Runner(app_src=REPOSITORY_ROOT, twine=TWINE_PATH, output_location=OUTPUT_LOCATION)
 
-        input_manifest = Manifest(
-            datasets={"turbsim": storage.path.generate_gs_path("openfast-data", "testing", "turbsim")}
-        )
+        input_manifest = Manifest(datasets={"turbsim": "gs://openfast-data/testing/turbsim"})
 
         # Mock running an OpenFAST analysis by creating an empty output file.
         with patch("app.run_subprocess_and_log_stdout_and_stderr", self._create_mock_output_file):

tests/test_deployment.py

@@ -1,7 +1,6 @@
 import os
 import unittest
 
-from octue.cloud import storage
 from octue.log_handlers import apply_log_handler
 from octue.resources import Child, Manifest
 
@@ -22,11 +21,9 @@ def test_cloud_run_integration(self):
         responses. An input dataset from Google Cloud Storage is used for this test.
         """
         project_name = os.environ["TEST_PROJECT_NAME"]
-        service_id = "octue.services.c3b47b47-cdfa-433d-b5a8-47a58f3bf7cb"
+        service_id = "aerosense/turbsim-service"
 
-        input_manifest = Manifest(
-            datasets={"turbsim": storage.path.generate_gs_path("openfast-data", "testing", "turbsim")}
-        )
+        input_manifest = Manifest(datasets={"turbsim": "gs://openfast-data/testing/turbsim"})
 
         child = Child(
             name="turbsim-service",