Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat : Extensibility for Amplify Api #8954

Merged
merged 33 commits into from
Nov 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
809da8d
feat: api-input-state and JSON schema
akshbhu Oct 15, 2021
04ca311
fix: tsconfig file
akshbhu Oct 15, 2021
510afcd
fix: added appsync cli constants
akshbhu Oct 17, 2021
2cc6b42
fix: api walkthough state done
akshbhu Oct 19, 2021
58b3506
feat: added cli-inputs.json in api
akshbhu Oct 20, 2021
6060280
feat: added overrides
akshbhu Oct 21, 2021
84c892b
feat: added overrides rev1
akshbhu Oct 24, 2021
7f0648e
feat: overrides functionality for appsync api
akshbhu Oct 25, 2021
8e6c5c8
feat: added migration for gqlApi
akshbhu Oct 29, 2021
b7211be
feat: enable overrides for api
akshbhu Oct 29, 2021
36f8a79
feat: gql api migration working
akshbhu Nov 1, 2021
c1328fc
feat: add unit tests and e2e
akshbhu Nov 3, 2021
fef7046
fix: unit tests and removes commented code
akshbhu Nov 3, 2021
a3e0c73
fix: update gitignore to include test files
akshbhu Nov 3, 2021
b54e65b
fix: migration logic
akshbhu Nov 3, 2021
d11d466
fix: merged with extOverrides3
akshbhu Nov 4, 2021
5b34410
fix: rebase with gql release branch
akshbhu Nov 16, 2021
476c9e6
fix: remove unused files
akshbhu Nov 17, 2021
b3cdfac
fix: adds flag to suppress type errors in catch
akshbhu Nov 17, 2021
ca9fe14
fix: address comments
akshbhu Nov 17, 2021
2c52d87
fix: fixed imports
akshbhu Nov 17, 2021
76ae488
chore: remove comments
akshbhu Nov 17, 2021
c71e69e
fix: fix e2e tests
akshbhu Nov 18, 2021
4cd2819
fix: scoped package to public and minor fixes
akshbhu Nov 18, 2021
28c26cd
fix: e2e errors
akshbhu Nov 18, 2021
74991fd
fix: conflict resolution tests
akshbhu Nov 18, 2021
3699399
fix: lgtm errors
akshbhu Nov 18, 2021
0882bf1
chore: rename file due to case insensitive issues
akshbhu Nov 18, 2021
bda30ea
fix: unit test
akshbhu Nov 18, 2021
33e71cc
fix: address initial comments (#8953)
akshbhu Nov 19, 2021
442ec96
chore: old Prs comments
akshbhu Nov 19, 2021
b45370d
fix: changed case of Appsync to AppSync
akshbhu Nov 19, 2021
f256f8e
fix: address comments
akshbhu Nov 19, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
**/.DS_Store
.circleci/generated_config.yml
build
!packages/amplify-graphql-model-transformer/src/__tests__/overrides/build/
!packages/amplify-graphql-function-transformer/src/__tests__/overrides/build/
!packages/amplify-graphql-predictions-transformer/src/__tests__/overrides/build/
!packages/amplify-graphql-http-transformer/src/__tests__/overrides/build/
!packages/amplify-graphql-searchable-transformer/src/__tests__/overrides/build/
node_modules
out
pkg/node_modules
Expand Down Expand Up @@ -70,4 +75,7 @@ test.out.log
*.tsbuildinfo
packages/amplify-graphiql-explorer/.eslintcache
packages/amplify-cli-extensibility-helper/lib
packages/amplify-cli-overrides-helper/lib
!packages/amplify-graphql-model-transformer/src/__tests__/overrides/build/override.js


1 change: 1 addition & 0 deletions packages/amplify-category-api/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
**/__tests__/**
./src
tsconfig.json
!resources/awscloudformation/overrides-resource/AppSync/tsconfig.json
tsconfig.tsbuildinfo
14 changes: 13 additions & 1 deletion packages/amplify-category-api/amplify-plugin.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
{
"name": "api",
"type": "category",
"commands": ["add-graphql-datasource", "add", "console", "gql-compile", "migrate", "push", "rebuild", "remove", "update", "help"],
"commands": [
"add-graphql-datasource",
"add",
"console",
"gql-compile",
"migrate",
"push",
"rebuild",
"remove",
"update",
"help",
"override"
],
"commandAliases": {
"configure": "update"
},
Expand Down
10 changes: 7 additions & 3 deletions packages/amplify-category-api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "amplify-category-api",
"version": "3.3.1",
"name": "@aws-amplify/amplify-category-api",
"version": "1.0.0",
"description": "amplify-cli api plugin",
"repository": {
"type": "git",
Expand All @@ -14,7 +14,11 @@
"build": "tsc",
"watch": "tsc -w",
"clean": "rimraf lib tsconfig.tsbuildinfo",
"test": "jest"
"test": "jest",
"generateSchemas": "ts-node ./scripts/generateApiSchemas.ts"
},
"publishConfig": {
"access": "public"
},
"dependencies": {
"@aws-amplify/graphql-transformer-migrator": "1.2.2",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { AppSyncServiceResourceStack } from '@aws-amplify/cli-extensibility-helper';

export function override(resource: AppSyncServiceResourceStack) {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"name": "overrides",
"version": "1.0.0",
"description": "",
"scripts": {
"build": "tsc",
"watch": "tsc -w"
},
"dependencies": {
"@aws-amplify/cli-extensibility-helper": "2.2.3-gql-ext1.0"
},
"devDependencies": {
"typescript": "^4.2.4"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"compilerOptions": {
"target": "es6",
"module": "commonjs",
"strict": true,
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"outDir": "build"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"compilerOptions": {
"target": "es6",
"module": "commonjs",
"strict": false,
"esModuleInterop": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"outDir": "./",
"rootDir": "../"
},
"include": ["../**/*"]
}
Loading