Skip to content

Commit

Permalink
Merge pull request #2939 from aws-amplify/palpatim.chore.prep-release
Browse files Browse the repository at this point in the history
* chore: update .jsii assembly

* chore: update .jsii assembly

* chore: migrate pg array objects e2e test in gen2 cdk (#2906)

* chore: graphql prep for test migration

* refactor: generic graphql field selection string with fieldmap

* feat: add postgres array objects e2e test

* test: remove bootstrap in test code

* chore: schema cleanup

* chore: final cleanup

* chore: add explanation on FieldMap ans examples

* chore: remove dup test

---------

Signed-off-by: Kevin Shan <siqishan@amazon.com>
Co-authored-by: Tim Schmelter <schmelte@amazon.com>

* fix(model-transformer) IndexName -> index in query list resolver (#2912)

* chore: upgrade cdk library dependency to 2.158.0 (#2876)

* chore: upgrade cdk dependency to 2.158.0

* chore: install and use nvm

* chore: use full version for nvm

* chore: testing linux build with nvm

* chore: fix version in cdk tests

* chore: update jsii files

* update: increase memory size

* add: debug statement

* update: mem size back to 8096, use ps1 file for shell script

* fix: path to Setup-NodeVersion.ps1

* fix: path to codebuild_specs/Setup-NodeVersion.ps1

* add: set runtime version

* update: image

* add: debug statement

* update: use earlier code

* add: debug statements

* update: clean up code

* update: use the correct image

* add: list installed node versions and used nodejs.install

* restart: install nvm using choco

* add: back mem size variable

* add: nvm install and use 18.20.4

* add: env var NVM_HOME and NVM_SYMLINK

* add: spawn powershell as admin

* update: remove all other builds

* add: debug statement

* add: env var path

* update: print env var

* add: commands

* update: env var set up

* add: refresh env var

* update: more debug statement

* update

* revamp: find nvm.exe

* update: install nvm windows directly

* update: launch new shell if current shell does not recognize nvm

* update: install node in buildspec

* add: install and use node in build spec

* update: use single quote to prevent interpreting \

* add: 2 scripts, one for installing nvm, another for using nvm

* fix: path error

* test: which way set env var

* update: set up env var in pre_build

* update: use choco in pre-build

* fix: syntax error

* update: build_windows working, running all tests

* test: remove bootstrap in test code

* debug: _runGqlE2ETests

* update: debug_workflow

* update: debug_workflow

* update: debug_workflow

* update: debug_workflow

* add: debug statement

* add: debug test

* add: debug

* update: use uuid for bucket name

* remove: use of uuid

* add: debug statement

* update: use differrent bucket name

* add: mili second timestamp

* add: debug statement

* remove: debug statement

* remove: redundant code

---------

Co-authored-by: Bobby Yu <bobbyu@amazon.com>
Co-authored-by: Tim Schmelter <schmelte@amazon.com>

* test: fix gen 1 init (#2924)

* fix(conversation): allow changes to systemPrompt, inferenceConfig, aiModel to be hotswapped (#2923)

* feat: auto increment support (#2883)

* chore(graphql-default-value-transformer): tidy tests

* test(graphql-default-value-transformer): add unit tests for auto increment support

* feat: 🎸 utils to detect Postgres datasource

* feat: 🎸 support auto increment

Implements support for auto increment (serial) fields from Postgres
datasources. Such fields are denoted by an empty `@default` applied to
an `Int` field.

* test(graphql-default-value-transformer): pk can be auto increment

* test(graphql-default-value-transformer): auto-increment crud e2e

* chore: describe test purpose

* chore: removing logging

* chore: describe why invalid cases are invalid

* chore: remove unecessary e2e test case

* chore: test messaging clarity

* chore: type safety

* chore: alphabetize list

* chore: type of return value asserts against string

Co-authored-by: Tim Schmelter <schmelte+github@amazon.com>

* chore: test ensures customers can insert to serial fields with custom values

* chore: verify that @default(value) works on mysql

* chore: remove unecessary ssm test case

* chore: update branch from main

* test: value cannot be null on ddb

---------

Co-authored-by: Tim Schmelter <schmelte+github@amazon.com>

* fix(conversation): use functionMap for custom handler IFunction reference (#2922)

* fix(generation): gracefully handle stringified tool_use responses (#2919)

* feat(conversation): per message items and lambda history retrieval pattern (#2914)

* fix: sql default value e2e failures (#2932)

* fix(generation): remove trailing comma in inferenceConfig resolver code (#2933)

* fix: add aws_iam to custom operations when enableIamAuthorization is enabled; fix graphql type utils (#2921)

- test: Add additional tests to fix coverage metrics for unchanged files
- test: Add implicit IAM auth support tests
  - Added a skipped test for custom type support, to be re-enabled once we
    figure out the right strategy for this.

* fix: appsync ttl correct duration time unit in ms (#2928)

Signed-off-by: Kevin Shan <siqishan@amazon.com>

---------

Signed-off-by: Kevin Shan <siqishan@amazon.com>
Co-authored-by: amplify-data-ci <amplify-data-dev+github@amazon.com>
Co-authored-by: Kevin Shan <siqishan@amazon.com>
Co-authored-by: Ian Saultz <52051793+atierian@users.noreply.github.com>
Co-authored-by: Phani Srikar Edupuganti <55896475+phani-srikar@users.noreply.github.com>
Co-authored-by: Bobby Yu <bobbyu@amazon.com>
Co-authored-by: Dane Pilcher <dppilche@amazon.com>
Co-authored-by: Peter V. <98245483+p5quared@users.noreply.github.com>
  • Loading branch information
8 people authored Oct 10, 2024
2 parents 1506c6b + d690bfa commit 8b1c9fe
Show file tree
Hide file tree
Showing 118 changed files with 4,188 additions and 893 deletions.
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ packages/amplify-graphql-api-construct/README.md
packages/amplify-graphql-api-construct/tsconfig.json
packages/amplify-graphql-conversation-transformer/src/__tests__/schemas/*.graphql
packages/amplify-graphql-conversation-transformer/src/resolvers/*.template.js
packages/amplify-graphql-generation-transformer/src/resolvers/*.template.js
packages/amplify-data-construct/README.md
packages/amplify-data-construct/tsconfig.json
packages/amplify-graphql-model-transformer/publish-notification-lambda/lib/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,10 @@ export class AmplifyCLI {
console.log(`Using CLI path '${cliPath}'`);
console.log(`Project root: '${this.projectRoot}'`);
const chain = spawn(cliPath, cliArgs, { cwd: this.projectRoot, env, disableCIDetection: s.disableCIDetection })
.wait('Do you want to continue with Amplify Gen 1?')
.sendConfirmYes()
.wait('Why would you like to use Amplify Gen 1?')
.sendCarriageReturn()
.wait('Enter a name for the project')
.sendLine(s.name)
.wait('Initialize the project with the above configuration?')
Expand Down
2 changes: 2 additions & 0 deletions codebuild_specs/build_linux.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
version: 0.2
env:
shell: bash
variables:
NODE_OPTIONS: --max-old-space-size=8096
phases:
build:
commands:
Expand Down
9 changes: 8 additions & 1 deletion codebuild_specs/build_windows.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
version: 0.2
env:
shell: powershell.exe
variables:
NODE_OPTIONS: --max-old-space-size=8096
phases:
pre_build:
commands:
- choco install -fy nodejs-lts --version=18.20.4
- |
$nodeVersion = node -v
Write-Host "Node version: $nodeVersion"
build:
commands:
- yarn run production-build
- yarn build-tests

artifacts:
files:
- 'shared-scripts.sh'
Loading

0 comments on commit 8b1c9fe

Please sign in to comment.