fix migration and unit tests, and add variables to unit tests

Author: lmossman

airbyte_cdk/manifest_migrations/migrations/http_requester_request_body_json_data_to_request_body.py

@@ -54,7 +54,7 @@ def _migrate_body_json(self, manifest: ManifestType, key: str) -> None:
         if isinstance(manifest[key], str):
             self._migrate_value(manifest, key, text_type)
         elif isinstance(manifest[key], dict):
-            if manifest[key].get(query_key) is not None:
+            if isinstance(manifest[key].get(query_key), str):
                 self._migrate_value(manifest, key, graph_ql_type)
             else:
                 self._migrate_value(manifest, key, json_object_type)

unit_tests/manifest_migrations/conftest.py

@@ -740,9 +740,8 @@ def manifest_with_request_body_json_and_data_to_migrate_to_request_body() -> Dic
                             # the `request_body_json` is expected to be migrated to the `request_body` key,
                             # this example holds the GraphQL query object.
                             "request_body_json": {
-                                "query": {
-                                    "query { {{ config['query_field'] }} { {{ config['query_value'] }} }}",
-                                }
+                                "query": "query { {{ config['query_field'] }} { {{ config['query_value'] }} }}",
+                                "variables": {"arg1": "test"}
                             },
                         },
                         "record_selector": {
@@ -975,6 +974,7 @@ def expected_manifest_with_migrated_to_request_body() -> Dict[str, Any]:
                                 "type": "RequestBodyGraphQL",
                                 "value": {
                                     "query": "query { {{ config['query_field'] }} { {{ config['query_value'] }} }}",
+                                    "variables": {"arg1": "test"},
                                 },
                             },
                         },
@@ -1135,6 +1135,7 @@ def expected_manifest_with_migrated_to_request_body() -> Dict[str, Any]:
                             "type": "RequestBodyGraphQL",
                             "value": {
                                 "query": "query { {{ config['query_field'] }} { {{ config['query_value'] }} }}",
+                                "variables": {"arg1": "test"},
                             },
                         },
                     },

unit_tests/sources/declarative/requesters/request_options/test_interpolated_request_options_provider.py

@@ -239,10 +239,11 @@ def test_interpolated_request_json(test_name, input_request_json, expected_reque
             RequestBodyGraphQL(
                 type="RequestBodyGraphQL",
                 value=RequestBodyGraphQlQuery(
-                    query="query { {{ config['option'] }} }"
+                    query="query { {{ config['option'] }} }",
+                    variables={"startDate": "{{ stream_interval['start_date'] }}"},
                 ),
             ),
-            {"query": "query { OPTION }"},
+            {"query": "query { OPTION }", "variables": {"startDate": "2020-01-01"}},
         ),
     ],
 )