MRG: Merge pull request #67 from octue/feature/allow-environment-vari…

…able-for-gcp-credentials-file Feature: Require environment variable for children credentials
octue · Feb 1, 2021 · 49e5a0b · 49e5a0b
2 parents c3bc556 + 86a106e
commit 49e5a0b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/tests/test_children.py b/tests/test_children.py
@@ -64,7 +64,7 @@ class TestChildrenValidation(BaseTestCase):
                 "backend": {
                     "name": "GCPPubSubBackend",
                     "project_name": "my-project",
-                    "credentials_filename": "hello.json"
+                    "credentials_environment_variable": "GCP_SERVICE_ACCOUNT"
                 }
             }
         ]
@@ -119,7 +119,7 @@ def test_extra_key_validation_on_valid_twine(self):
                     "backend": {
                         "name": "GCPPubSubBackend",
                         "project_name": "my-project",
-                        "credentials_filename": "hello.json"
+                        "credentials_environment_variable": "GCP_SERVICE_ACCOUNT"
                     },
                     "some_extra_property": "should not be a problem if present"
                 }

diff --git a/twined/schema/children_schema.json b/twined/schema/children_schema.json
@@ -28,12 +28,12 @@
                                 "description": "Name of the Google Cloud Platform (GCP) project the child exists in.",
                                 "type": "string"
                             },
-                            "credentials_filename": {
-                                "description": "Absolute path to Google Cloud Platform credentials JSON file.",
+                            "credentials_environment_variable": {
+                                "description": "Name of environment variable containing either the absolute path to a Google Cloud Platform credentials JSON file or the JSON itself as a string.",
                                 "type": "string"
                             }
                         },
-                        "required": ["name", "project_name", "credentials_filename"]
+                        "required": ["name", "project_name", "credentials_environment_variable"]
                     }
                 ]
             }