Skip to content

Commit e8f3a6a

Browse files
phani-srikarphani-srikar
authored
Merge pull request #183 from aws-amplify/master
Amplify Codegen @ 2.25.1
2 parents ca25ab1 + aa0dbb3 commit e8f3a6a

File tree

10 files changed

+440
-46
lines changed

10 files changed

+440
-46
lines changed

‎.circleci/config.base.yml‎

Lines changed: 39 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,46 @@ jobs:
175175
executor: << parameters.os >>
176176
steps:
177177
- run: echo 'Done with Node CLI E2E Tests'
178+
179+
cleanup_resources:
180+
<<: *defaults
181+
executor: << parameters.os >>
182+
steps:
183+
- attach_workspace:
184+
at: ./
185+
- restore_cache:
186+
key: amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
187+
- run:
188+
name: 'Run cleanup script'
189+
command: |
190+
cd packages/amplify-codegen-e2e-tests
191+
yarn clean-e2e-resources
192+
no_output_timeout: 20m
193+
- store_artifacts:
194+
path: ~/repo/packages/amplify-e2e-tests/amplify-e2e-reports
195+
working_directory: ~/repo
196+
178197
workflows:
179198
version: 2
199+
e2e_resource_cleanup:
200+
triggers:
201+
- schedule:
202+
cron: '0 0 * * *'
203+
filters:
204+
branches:
205+
only:
206+
- master
207+
- e2e-testing
208+
jobs:
209+
- build:
210+
os: linux_node12
211+
- cleanup_resources:
212+
context:
213+
- cleanup-resources
214+
os: linux_node12
215+
requires:
216+
- build
217+
180218
build_test_deploy:
181219
jobs:
182220
- build:
@@ -197,16 +235,12 @@ workflows:
197235
only:
198236
- master
199237
- e2e-testing
200-
- approval_for_e2e_test:
201-
type: approval
202-
requires:
203-
- publish_to_local_registry
204238
- e2e-test:
205239
context:
206240
- cleanup-resources
207241
os: linux_node12
208242
requires:
209-
- approval_for_e2e_test
243+
- publish_to_local_registry
210244
post-steps:
211245
- run: *cleanup_e2e
212246
filters:

‎.circleci/config.yml‎

Lines changed: 57 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,23 @@ jobs:
183183
executor: << parameters.os >>
184184
steps:
185185
- run: echo 'Done with Node CLI E2E Tests'
186+
cleanup_resources:
187+
working_directory: ~/repo
188+
parameters: *ref_0
189+
executor: << parameters.os >>
190+
steps:
191+
- attach_workspace:
192+
at: ./
193+
- restore_cache:
194+
key: 'amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}'
195+
- run:
196+
name: Run cleanup script
197+
command: |
198+
cd packages/amplify-codegen-e2e-tests
199+
yarn clean-e2e-resources
200+
no_output_timeout: 20m
201+
- store_artifacts:
202+
path: ~/repo/packages/amplify-e2e-tests/amplify-e2e-reports
186203
push-codegen-ios-e2e-test:
187204
working_directory: ~/repo
188205
parameters: *ref_0
@@ -361,6 +378,24 @@ jobs:
361378
CLI_REGION: us-east-2
362379
workflows:
363380
version: 2
381+
e2e_resource_cleanup:
382+
triggers:
383+
- schedule:
384+
cron: 0 0 * * *
385+
filters:
386+
branches:
387+
only:
388+
- master
389+
- e2e-testing
390+
jobs:
391+
- build:
392+
os: linux_node12
393+
- cleanup_resources:
394+
context:
395+
- cleanup-resources
396+
os: linux_node12
397+
requires:
398+
- build
364399
build_test_deploy:
365400
jobs:
366401
- build:
@@ -385,10 +420,6 @@ workflows:
385420
only:
386421
- master
387422
- e2e-testing
388-
- approval_for_e2e_test:
389-
type: approval
390-
requires:
391-
- publish_to_local_registry
392423
- deploy:
393424
os: linux_node12
394425
requires:
@@ -430,7 +461,7 @@ workflows:
430461
- cleanup-resources
431462
os: linux_node12
432463
requires:
433-
- approval_for_e2e_test
464+
- publish_to_local_registry
434465
post-steps: &ref_9
435466
- run: *ref_7
436467
filters: &ref_10
@@ -442,146 +473,146 @@ workflows:
442473
context: *ref_8
443474
os: linux_node12
444475
requires:
445-
- approval_for_e2e_test
476+
- publish_to_local_registry
446477
post-steps: *ref_9
447478
filters: *ref_10
448479
- remove-codegen-js-e2e-test:
449480
context: *ref_8
450481
os: linux_node12
451482
requires:
452-
- approval_for_e2e_test
483+
- publish_to_local_registry
453484
post-steps: *ref_9
454485
filters: *ref_10
455486
- graphql-codegen-ios-e2e-test:
456487
context: *ref_8
457488
os: linux_node12
458489
requires:
459-
- approval_for_e2e_test
490+
- publish_to_local_registry
460491
post-steps: *ref_9
461492
filters: *ref_10
462493
- push-codegen-android-e2e-test:
463494
context: *ref_8
464495
os: linux_node12
465496
requires:
466-
- approval_for_e2e_test
497+
- publish_to_local_registry
467498
post-steps: *ref_9
468499
filters: *ref_10
469500
- datastore-modelgen-flutter-e2e-test:
470501
context: *ref_8
471502
os: linux_node12
472503
requires:
473-
- approval_for_e2e_test
504+
- publish_to_local_registry
474505
post-steps: *ref_9
475506
filters: *ref_10
476507
- feature-flags-e2e-test:
477508
context: *ref_8
478509
os: linux_node12
479510
requires:
480-
- approval_for_e2e_test
511+
- publish_to_local_registry
481512
post-steps: *ref_9
482513
filters: *ref_10
483514
- push-codegen-js-e2e-test:
484515
context: *ref_8
485516
os: linux_node12
486517
requires:
487-
- approval_for_e2e_test
518+
- publish_to_local_registry
488519
post-steps: *ref_9
489520
filters: *ref_10
490521
- datastore-modelgen-ios-e2e-test:
491522
context: *ref_8
492523
os: linux_node12
493524
requires:
494-
- approval_for_e2e_test
525+
- publish_to_local_registry
495526
post-steps: *ref_9
496527
filters: *ref_10
497528
- configure-codegen-ios-e2e-test:
498529
context: *ref_8
499530
os: linux_node12
500531
requires:
501-
- approval_for_e2e_test
532+
- publish_to_local_registry
502533
post-steps: *ref_9
503534
filters: *ref_10
504535
- pull-codegen-e2e-test:
505536
context: *ref_8
506537
os: linux_node12
507538
requires:
508-
- approval_for_e2e_test
539+
- publish_to_local_registry
509540
post-steps: *ref_9
510541
filters: *ref_10
511542
- datastore-modelgen-android-e2e-test:
512543
context: *ref_8
513544
os: linux_node12
514545
requires:
515-
- approval_for_e2e_test
546+
- publish_to_local_registry
516547
post-steps: *ref_9
517548
filters: *ref_10
518549
- configure-codegen-android-e2e-test:
519550
context: *ref_8
520551
os: linux_node12
521552
requires:
522-
- approval_for_e2e_test
553+
- publish_to_local_registry
523554
post-steps: *ref_9
524555
filters: *ref_10
525556
- env-codegen-e2e-test:
526557
context: *ref_8
527558
os: linux_node12
528559
requires:
529-
- approval_for_e2e_test
560+
- publish_to_local_registry
530561
post-steps: *ref_9
531562
filters: *ref_10
532563
- datastore-modelgen-js-e2e-test:
533564
context: *ref_8
534565
os: linux_node12
535566
requires:
536-
- approval_for_e2e_test
567+
- publish_to_local_registry
537568
post-steps: *ref_9
538569
filters: *ref_10
539570
- configure-codegen-js-e2e-test:
540571
context: *ref_8
541572
os: linux_node12
542573
requires:
543-
- approval_for_e2e_test
574+
- publish_to_local_registry
544575
post-steps: *ref_9
545576
filters: *ref_10
546577
- add-codegen-js-e2e-test:
547578
context: *ref_8
548579
os: linux_node12
549580
requires:
550-
- approval_for_e2e_test
581+
- publish_to_local_registry
551582
post-steps: *ref_9
552583
filters: *ref_10
553584
- remove-codegen-android-e2e-test:
554585
context: *ref_8
555586
os: linux_node12
556587
requires:
557-
- approval_for_e2e_test
588+
- publish_to_local_registry
558589
post-steps: *ref_9
559590
filters: *ref_10
560591
- graphql-codegen-android-e2e-test:
561592
context: *ref_8
562593
os: linux_node12
563594
requires:
564-
- approval_for_e2e_test
595+
- publish_to_local_registry
565596
post-steps: *ref_9
566597
filters: *ref_10
567598
- add-codegen-ios-e2e-test:
568599
context: *ref_8
569600
os: linux_node12
570601
requires:
571-
- approval_for_e2e_test
602+
- publish_to_local_registry
572603
post-steps: *ref_9
573604
filters: *ref_10
574605
- remove-codegen-ios-e2e-test:
575606
context: *ref_8
576607
os: linux_node12
577608
requires:
578-
- approval_for_e2e_test
609+
- publish_to_local_registry
579610
post-steps: *ref_9
580611
filters: *ref_10
581612
- graphql-codegen-js-e2e-test:
582613
context: *ref_8
583614
os: linux_node12
584615
requires:
585-
- approval_for_e2e_test
616+
- publish_to_local_registry
586617
post-steps: *ref_9
587618
filters: *ref_10

‎packages/amplify-codegen-e2e-tests/src/cleanup-e2e-resources.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { deleteS3Bucket } from 'amplify-codegen-e2e-core';
1010
// Ensure to update scripts/split-e2e-tests.ts is also updated this gets updated
1111
const AWS_REGIONS_TO_RUN_TESTS = [
1212
'us-east-2',
13-
'us-west-2',
13+
'us-west-1',
1414
'eu-west-2',
1515
'eu-central-1',
1616
'ap-northeast-1',

‎packages/amplify-codegen/src/commands/models.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ async function generateModels(context) {
9393

9494
generateEslintIgnore(context);
9595

96-
context.print.info(`Successfully generated models... Generated models can be found in ${outputPath}`);
96+
context.print.info(`Successfully generated models. Generated models can be found in ${outputPath}`);
9797
}
9898

9999
async function validateSchema(context) {

0 commit comments

Comments
 (0)