ENH: Remove support for credentials environment variable name

octue · Mar 18, 2022 · e485347 · e485347
1 parent 4a7f5a7
commit e485347
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/tests/test_children.py b/tests/test_children.py
@@ -60,8 +60,7 @@ class TestChildrenValidation(BaseTestCase):
                 "id": "some-id",
                 "backend": {
                     "name": "GCPPubSubBackend",
-                    "project_name": "my-project",
-                    "credentials_environment_variable": "GCP_SERVICE_ACCOUNT"
+                    "project_name": "my-project"
                 }
             }
         ]
@@ -88,13 +87,6 @@ def test_backend_cannot_be_empty(self):
         with self.assertRaises(exceptions.InvalidValuesContents):
             Twine().validate_children(source=single_child_missing_backend)
 
-    def test_backend_credentials_environment_variable_can_be_empty(self):
-        """Test that the backend credentials environment variable of a child can be empty."""
-        children = (
-            """[{"key": "gis", "id": "some-id", "backend": {"name": "GCPPubSubBackend", "project_name": "blah"}}]"""
-        )
-        Twine(source=self.VALID_TWINE_WITH_CHILDREN).validate_children(source=children)
-
     def test_extra_key_validation_on_empty_twine(self):
         """Test that children with extra data will not raise a validation error on an empty twine."""
         children_values_with_extra_data = """
@@ -118,8 +110,7 @@ def test_extra_key_validation_on_valid_twine(self):
                     "id": "some-id",
                     "backend": {
                         "name": "GCPPubSubBackend",
-                        "project_name": "my-project",
-                        "credentials_environment_variable": "GCP_SERVICE_ACCOUNT"
+                        "project_name": "my-project"
                     },
                     "some_extra_property": "should not be a problem if present"
                 }

diff --git a/twined/schema/children_schema.json b/twined/schema/children_schema.json
@@ -27,10 +27,6 @@
                             "project_name": {
                                 "description": "Name of the Google Cloud Platform (GCP) project the child exists in.",
                                 "type": "string"
-                            },
-                            "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"]