Remove dependency on apollo CLI for fetching schema #1935

calvincestari · 2021-09-10T23:18:49Z

This change removes a dependency on the Apollo CLI for schema downloading. Schema downloads are now Swift-based and maintainable/extensible within apollo-ios.

Notable changes:

Abstracted URLDownloader from CLIDownloader; used in both CLI and schema downloading. CLI downloading will be removed along with the Swift codegen implementation.
Registry schema requests are done via UntypedGraphQLRequestBodyCreator - a non-type-safe request creator to facilitate sending requests not using code generation.
Refactored ApolloSchemaOptions
- Renamed to ApolloSchemaDownloadConfiguration for a more specific naming context.
- Schema output is always SDL.
- Defaults to the current registry variant.
Renamed ApolloSchemaDownloader APIs
- fetch(with:) is more expressive than run(options:).

Closes #1823

…r than using the JS CLI

…request" This reverts commit 9aac6367a611260ffea12e3b0ae965b999d9b9d3.

I tried pulling some of this stuff into Core but you have to pull so much into core to make it work since by default it uses a bunch of `Apollo` only types that it kind of defeats the point of keeping core small, and realistically the only place where we even *should* be using untyped queries is in grabbing the schema.

…ause the JSON is so damned huge

…🤦‍♀️

…o an actual schema rather than just being json

…a schema

…ownloaded Introspection file.

…bally installed it

* renamed for better context * improved initializer

…pport target

Tests/ApolloServerIntegrationTests/SchemaRegistryApolloSchemaDownloaderTests.swift

AnthonyMDev

Great job on this! So glad to have this finished, and it looks great. Just a couple of suggestions.

One question: Do you know why the bundled ApolloCodegenFrontend.bundle.js changed? Did we need to make changes to the js library?

Sources/ApolloCodegenLib/ApolloCLI.swift

Sources/ApolloCodegenLib/ApolloSchemaDownloadConfiguration.swift

Sources/ApolloCodegenLib/UntypedGraphQLRequestBodyCreator.swift

designatednerd · 2021-09-15T18:01:10Z

Do you know why the bundled ApolloCodegenFrontend.bundle.js changed? Did we need to make changes to the js library?

Yeah there was one method I had to expose for moving between JSON and SDL - I'm not quite seeing where the actual code went, though. Not sure if it got eaten in a merge or what

calvincestari · 2021-09-15T18:49:38Z

Do you know why the bundled ApolloCodegenFrontend.bundle.js changed? Did we need to make changes to the js library?

Yeah there was one method I had to expose for moving between JSON and SDL - I'm not quite seeing where the actual code went, though. Not sure if it got eaten in a merge or what

This is the exact diff - e.printSchema=function e(t){return e()},. Goes together with this and this.

AnthonyMDev

LGTM!

designatednerd

One question re testing, otherwise this is

Sources/ApolloCodegenTestSupport/MockNetworkSession.swift

designatednerd and others added 30 commits September 10, 2021 16:19

Pull downloader into its own file

1de9881

Use URL downloader in CLI downloader

3610cfa

Update headers to take both key and value

93ec2e1

Add Apollo-Use-Only method to create a non-type safe GraphQL request

d277334

Add methods for direct download from registry and introspection rathe…

6a7a606

…r than using the JS CLI

Revert "Add Apollo-Use-Only method to create a non-type safe GraphQL …

2e546a5

…request" This reverts commit 9aac6367a611260ffea12e3b0ae965b999d9b9d3.

update types on codegen tests

b314b97

Pull out usage of the typescript CLI 🎉

95744c6

Make sure URL request headers are properly set

b465bbb

don't try to import all of apollo 🤦‍♀️

153a3c2

Make sure keys are sorted

5bff0ef

Make sure folder is created before trying to write to it

8439a0a

Update tests

f791135

Update that we should really only be getting SDL files, not JSON, bec…

af8a782

…ause the JSON is so damned huge

start adding and testing downloading the schema from the graph registry

812d12a

Turns out variant is actually required

e8c4faf

fix expected file name

815a718

get rid of arguments parameter, update custom debug strings

5c7769f

Turns out you have to _throw_ the error rather than just creating it …

59dde6b

…🤦‍♀️

Check that downloaded info from introspection query can be loaded int…

2600a93

…o an actual schema rather than just being json

test that downloaded SDL schema from the Registry can be turned into …

9fe96ee

…a schema

Clarify where we're converting from a downloaded Registry file vs a d…

83c1e57

…ownloaded Introspection file.

first swipe at adding SDL printing for introspection

3c5e177

Updated JS bundle

3c36ebc

add tslib to the package.json so it gets pulled in if you haven't glo…

3771b2d

…bally installed it

actual, successful swipe at getting introspection JSON converted to SDL.

2426893

Update integration tests for new schema downloader

07f440d

Organize code by section

8a77f00

Fix spelling mistake

6e9aee8

hwillson removed this from the Release 1.0 milestone Sep 13, 2021

calvincestari added 10 commits September 13, 2021 13:28

Remove comment about public use of UntypedGraphQLRequestBodyCreator

a185a04

Improve test names and operation

c185d48

Refactored ApolloSchemaDownloadConfiguration

ed9bc43

* renamed for better context * improved initializer

Refactor ApolloSchemaDownloader

676882c

Update schema download script for changed API

e99e052

Remove irrelevant schema download integration test

67dddc0

Move linked library from ApolloPerformanceTest target to ApolloTestSu…

ce93e15

…pport target

Move MockNetworkSession to ApolloCodegenTestSupport target

436d1eb

Add SDL validation to StarWarsApolloSchemaDownloaderTests

c524531

Add registry-based ApolloSchemaDownloader integration test

062225c

designatednerd reviewed Sep 14, 2021

View reviewed changes

Tests/ApolloServerIntegrationTests/SchemaRegistryApolloSchemaDownloaderTests.swift Show resolved Hide resolved

Finish unit tests for ApolloSchemaDownloader

6e5e1dc

calvincestari force-pushed the update/direct-schema-fetch branch from 75b7278 to 6e5e1dc Compare September 15, 2021 04:36

calvincestari marked this pull request as ready for review September 15, 2021 04:37

calvincestari changed the title ~~Update/direct schema fetch~~ Remove dependency on apollo CLI for fetching schema Sep 15, 2021

calvincestari requested a review from AnthonyMDev September 15, 2021 14:36

AnthonyMDev approved these changes Sep 15, 2021

View reviewed changes

calvincestari added 3 commits September 15, 2021 12:17

Add Apollo prefix to 'registry' usage in schema downloader

7b0c777

Add documentation to ApolloSchemaDownloadConfiguration

7fffa63

Fix ApolloServerIntegrationTests for enum value renaming

6216e33

AnthonyMDev approved these changes Sep 15, 2021

View reviewed changes

designatednerd approved these changes Sep 16, 2021

View reviewed changes

Sources/ApolloCodegenTestSupport/MockNetworkSession.swift Show resolved Hide resolved

calvincestari merged commit 22e2097 into main Sep 16, 2021

calvincestari deleted the update/direct-schema-fetch branch September 16, 2021 04:18

hwillson added this to the Release 0.49.0 milestone Sep 16, 2021

calvincestari mentioned this pull request Sep 20, 2021

Release - 0.49.0 #1940

Merged

13 tasks

calvincestari mentioned this pull request Feb 11, 2022

Allow output of schema.json from ApolloCodegenLib #2155

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove dependency on apollo CLI for fetching schema #1935

Remove dependency on apollo CLI for fetching schema #1935

calvincestari commented Sep 10, 2021 •

edited

Loading

AnthonyMDev left a comment

designatednerd commented Sep 15, 2021 •

edited

Loading

calvincestari commented Sep 15, 2021

AnthonyMDev left a comment

designatednerd left a comment

Remove dependency on apollo CLI for fetching schema #1935

Remove dependency on apollo CLI for fetching schema #1935

Conversation

calvincestari commented Sep 10, 2021 • edited Loading

Notable changes:

AnthonyMDev left a comment

Choose a reason for hiding this comment

designatednerd commented Sep 15, 2021 • edited Loading

calvincestari commented Sep 15, 2021

AnthonyMDev left a comment

Choose a reason for hiding this comment

designatednerd left a comment

Choose a reason for hiding this comment

calvincestari commented Sep 10, 2021 •

edited

Loading

designatednerd commented Sep 15, 2021 •

edited

Loading