fix: codegen --apiId broken state #689
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 tasks
dpilch
force-pushed
the
codegen-apiid-broken-state
branch
from
71bba57 to
d40c094
Compare
4 tasks
alharris-at
reviewed
Sep 11, 2023
Comment on lines
36
to
40
| } else if (project.amplifyExtension.apiId && project.amplifyExtension.region) { | ||
| const { | ||
| amplifyExtension: { apiId, region }, | ||
| } = project; | ||
| apis = [await getAppSyncAPIInfo(context, apiId, region)]; |
There was a problem hiding this comment.
You could probably refactor this check, destructuring statement, and retrieval into a single utility where given a project you return an optional api or something like that, since it's nearly identical to the code in statements.ts
Comment on lines
26
to
30
| } else if (projects[0].amplifyExtension.apiId && projects[0].amplifyExtension.region) { | ||
| const { | ||
| amplifyExtension: { apiId, region }, | ||
| } = projects[0]; | ||
| apis = [await getAppSyncAPIInfo(context, apiId, region)]; |
There was a problem hiding this comment.
See prior comment on this shared code.
|
|
||
| for (const cfg of projects) { | ||
| const includeFiles = path.join(projectPath, cfg.includes[0]); | ||
| const opsGenDirectory = cfg.amplifyExtension.docsFilePath | ||
| ? path.join(projectPath, cfg.amplifyExtension.docsFilePath) | ||
| : path.dirname(path.dirname(includeFiles)); | ||
| const schemaPath = path.join(projectPath, cfg.schema); | ||
| let region; | ||
| let frontend; |
There was a problem hiding this comment.
Is this reassigned at all, or can this be converted into a ternary const assignment?
const frontend = withoutInit ? cfg.amplifyExtension.frontend : getFrontEndHandler(context);
Comment on lines
32
to
36
| } else if (projects[0].amplifyExtension.apiId && projects[0].amplifyExtension.region) { | ||
| const { | ||
| amplifyExtension: { apiId, region }, | ||
| } = projects[0]; | ||
| apis = [await getAppSyncAPIInfo(context, apiId, region)]; |
There was a problem hiding this comment.
Similar utility here I think.
| @@ -4,9 +4,15 @@ const generateIntrospectionSchema = require('./generateIntrospectionSchema'); | |||
| const downloadIntrospectionSchemaWithProgress = require('./generateIntrospectionSchemaWithProgress'); | |||
|
|
|||
| async function ensureIntrospectionSchema(context, schemaPath, apiConfig, region, forceDownloadSchema) { | |||
| const meta = context.amplify.getProjectMeta(); | |||
| let meta; | |||
| let withoutInit = false; | |||
There was a problem hiding this comment.
This seems to be unused, unless I'm missing something.
alharris-at
approved these changes
Sep 12, 2023
AaronZyLee
approved these changes
Sep 12, 2023
dpilch
force-pushed
the
codegen-apiid
branch
from
f6ce898 to
6424b01
Compare
dpilch
force-pushed
the
codegen-apiid-broken-state
branch
from
f2dc0a8 to
5325040
Compare
alharris-at
pushed a commit
that referenced
this pull request
Sep 14, 2023
This was referenced Sep 18, 2023
alharris-at
added a commit
that referenced
this pull request
Sep 19, 2023
…set up locally. (#702) * feat: codegen add --region (#683) * fix: download introspection schema when apiId is passed (#684) * fix: codegen --apiId broken state (#689) * chore: get existing e2e tests passing (#704) * feat: add e2e tests for codegen add when in a non-amplify project (#705) * feat: add e2e tests for codegen add when in a non-amplify project * chore: add some additional test cases * noinit codegen from graphqlconfig (#706) * fix: add missing awaits * chore: fail typegen if no queries are found --------- Co-authored-by: Dane Pilcher <dppilche@amazon.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
The customer can end in a broken state if:
amplify codegen add --apiId <api-id>rm -rf schema.jsonamplify codegenThere is no way the customer can use the codegen CLI to download the introspection schema.
amplify codegen,amplify codegen types, andamplify codegen statementsnow download the introspection schema ifapiIdis set in.graphqlconfig.ymland the project is without amplify init.Issue #, if available
N/A
Description of how you validated changes
Checklist
yarn testpassesBy submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.