fix graphql request body interpolation and conversion

Author: lmossman

airbyte_cdk/sources/declarative/requesters/request_options/interpolated_request_options_provider.py

@@ -100,7 +100,7 @@ def _resolve_request_body(self) -> None:
             if self.request_body.type == "RequestBodyUrlEncodedForm":
                 self.request_body_data = self.request_body.value
             elif self.request_body.type == "RequestBodyGraphQL":
-                self.request_body_json = {"query": self.request_body.value.query}
+                self.request_body_json = self.request_body.value.dict()
             elif self.request_body.type in ("RequestBodyJsonObject", "RequestBodyPlainText"):
                 self.request_body_json = self.request_body.value
             else:

unit_tests/manifest_migrations/conftest.py

@@ -741,8 +741,7 @@ def manifest_with_request_body_json_and_data_to_migrate_to_request_body() -> Dic
                             # this example holds the GraphQL query object.
                             "request_body_json": {
                                 "query": {
-                                    "field": "{{ config['query_field'] }}",
-                                    "value": "{{ config['query_value'] }}",
+                                    "query { {{ config['query_field'] }} { {{ config['query_value'] }} }}",
                                 }
                             },
                         },
@@ -975,10 +974,7 @@ def expected_manifest_with_migrated_to_request_body() -> Dict[str, Any]:
                             "request_body": {
                                 "type": "RequestBodyGraphQL",
                                 "value": {
-                                    "query": {
-                                        "field": "{{ config['query_field'] }}",
-                                        "value": "{{ config['query_value'] }}",
-                                    }
+                                    "query": "query { {{ config['query_field'] }} { {{ config['query_value'] }} }}",
                                 },
                             },
                         },
@@ -1138,10 +1134,7 @@ def expected_manifest_with_migrated_to_request_body() -> Dict[str, Any]:
                         "request_body": {
                             "type": "RequestBodyGraphQL",
                             "value": {
-                                "query": {
-                                    "field": "{{ config['query_field'] }}",
-                                    "value": "{{ config['query_value'] }}",
-                                }
+                                "query": "query { {{ config['query_field'] }} { {{ config['query_value'] }} }}",
                             },
                         },
                     },

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

@@ -239,10 +239,10 @@ def test_interpolated_request_json(test_name, input_request_json, expected_reque
             RequestBodyGraphQL(
                 type="RequestBodyGraphQL",
                 value=RequestBodyGraphQlQuery(
-                    query={"query_key": "{{ config['option'] }}", "query_key_2": "value"}
+                    query="query { {{ config['option'] }} }"
                 ),
             ),
-            {"query": {"query_key": "OPTION", "query_key_2": "value"}},
+            {"query": "query { OPTION }"},
         ),
     ],
 )