fix: fixing api tests for database connections

superset/databases/schemas.py

@@ -342,7 +342,7 @@ class Meta:  # pylint: disable=too-few-public-methods
     configuration_method = EnumField(
         ConfigurationMethod,
         by_value=True,
-        allow_none=True,
+        required=True,
         description=configuration_method_description,
     )
 

superset/db_engine_specs/bigquery.py

@@ -49,7 +49,7 @@
 
 class BigQueryParametersSchema(Schema):
     credentials_info = EncryptedField(
-        description="Contents of BigQuery JSON credentials.",
+        required=True, description="Contents of BigQuery JSON credentials.",
     )
 
 

tests/databases/api_tests.py

@@ -278,36 +278,33 @@ def test_create_database_invalid_configuration_method(self):
         }
         assert rv.status_code == 400
 
-    # add this test back in when config method becomes required for creation.
-    # def test_create_database_no_configuration_method(self):
-    #     """
-    #     Database API: Test create with no config method.
-    #     """
-    #     extra = {
-    #         "metadata_params": {},
-    #         "engine_params": {},
-    #         "metadata_cache_timeout": {},
-    #         "schemas_allowed_for_csv_upload": [],
-    #     }
-
-    #     self.login(username="admin")
-    #     example_db = get_example_database()
-    #     if example_db.backend == "sqlite":
-    #         return
-    #     database_data = {
-    #         "database_name": "test-create-database",
-    #         "sqlalchemy_uri": example_db.sqlalchemy_uri_decrypted,
-    #         "server_cert": None,
-    #         "extra": json.dumps(extra),
-    #     }
-
-    #     uri = "api/v1/database/"
-    #     rv = self.client.post(uri, json=database_data)
-    #     response = json.loads(rv.data.decode("utf-8"))
-    #     assert response == {
-    #         "message": {"configuration_method": ["Missing data for required field."]}
-    #     }
-    #     assert rv.status_code == 400
+    def test_create_database_no_configuration_method(self):
+        """
+        Database API: Test create with no config method.
+        """
+        extra = {
+            "metadata_params": {},
+            "engine_params": {},
+            "metadata_cache_timeout": {},
+            "schemas_allowed_for_csv_upload": [],
+        }
+
+        self.login(username="admin")
+        example_db = get_example_database()
+        if example_db.backend == "sqlite":
+            return
+        database_data = {
+            "database_name": "test-create-database",
+            "sqlalchemy_uri": example_db.sqlalchemy_uri_decrypted,
+            "server_cert": None,
+            "extra": json.dumps(extra),
+        }
+
+        uri = "api/v1/database/"
+        rv = self.client.post(uri, json=database_data)
+        response = json.loads(rv.data.decode("utf-8"))
+        assert rv.status_code == 201
+        self.assertIn("sqlalchemy_form", response["result"]["configuration_method"])
 
     def test_create_database_server_cert_validate(self):
         """
@@ -1678,7 +1675,12 @@ def test_validate_parameters_invalid_payload_schema(self):
                     "error_type": "INVALID_PAYLOAD_SCHEMA_ERROR",
                     "level": "error",
                     "extra": {
-                        "messages": {"engine": ["Missing data for required field."],},
+                        "messages": {
+                            "configuration_method": [
+                                "Missing data for required field."
+                            ],
+                            "engine": ["Missing data for required field."],
+                        },
                         "issue_codes": [
                             {
                                 "code": 1020,
@@ -1694,6 +1696,7 @@ def test_validate_parameters_missing_fields(self):
         self.login(username="admin")
         url = "api/v1/database/validate_parameters"
         payload = {
+            "configuration_method": ConfigurationMethod.SQLALCHEMY_FORM,
             "engine": "postgresql",
             "parameters": defaultdict(dict),
         }
@@ -1739,6 +1742,7 @@ def test_validate_parameters_invalid_host(self, is_hostname_valid):
         payload = {
             "engine": "postgresql",
             "parameters": defaultdict(dict),
+            "configuration_method": ConfigurationMethod.SQLALCHEMY_FORM,
         }
         payload["parameters"].update(
             {