chore: dev cb merge #12744

awsluja · 2023-06-05T22:33:43Z

Description of changes

Strategy:

checkout cb
create branch from cb "dev-cb-merge-jun-3"
merge dev
resolve conflicts

Passing CI run:
https://app.circleci.com/pipelines/github/aws-amplify/amplify-cli/20741/workflows/4eb78493-5e87-49dc-a461-08c55dbaf585

Issue #, if available

Description of how you validated changes

Checklist

PR description included
yarn test passes
Tests are changed or added
Relevant documentation is changed or added (and PR referenced)
New AWS SDK calls or CloudFormation actions have been added to relevant test and service IAM policies
Pull request labels are added

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

…ify#12544)

* API plugin version bump to v5.3.0 (aws-amplify#12642) * chore: update API plugin dependencies to v5.3.0 * chore: re-add codegen in bump script * fix: updated readSchema API * fix: update codegen ui version and add processFile util function (aws-amplify#12670) Co-authored-by: Justin Shih <[email protected]> * fix: version bump (aws-amplify#12680) * fix: version bump (aws-amplify#12684) * chore(release): Publish latest [ci skip] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - [email protected] - @aws-amplify/[email protected] - [email protected] - @aws-amplify/[email protected] - [email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - [email protected] - [email protected] - [email protected] - @aws-amplify/[email protected] - [email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - [email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] * fix: version bump * chore(release): Publish latest [ci skip] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - [email protected] - @aws-amplify/[email protected] - [email protected] - @aws-amplify/[email protected] - [email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - [email protected] - [email protected] - [email protected] - @aws-amplify/[email protected] - [email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - [email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] --------- Co-authored-by: Phani Srikar Edupuganti <[email protected]> Co-authored-by: Justin Shih <[email protected]> Co-authored-by: Justin Shih <[email protected]> Co-authored-by: aws-amplify-bot <[email protected]>

* ci: draft codeowners for codebuild * ci: fix autocorrect * Update .github/CODEOWNERS to include admins Co-authored-by: Kamil Sobol <[email protected]> * ci: use only admins list --------- Co-authored-by: Kamil Sobol <[email protected]>

…ith api calls (aws-amplify#12484)

* chore: migrate to yarn 2 (aws-amplify#12501)

…#12715) * chore: provide better mitigation steps for hosting error * chore: improve error message for publishing apps * chore: improve error messaging * chore: add quotes * chore: address codeql warning * chore: revert

…plify#12623) * feat: throw message when adding lambda function with same name * feat: generalQuestionsWalkthrough test

* feat: display error message instead of object * Update packages/amplify-util-mock/src/func/index.ts Co-authored-by: John Hockett <[email protected]> * feat: update printer and fix tests * fix: api-extract * fix: nested statements --------- Co-authored-by: John Hockett <[email protected]>

…-generation fix: skip automatic form generation when datastore is not enabled

awsluja · 2023-06-05T23:37:53Z

.circleci/publish-codebuild.sh

+    # registy URL update changes .yarnrc.yml file
+    git update-index --assume-unchanged .yarnrc.yml
+  fi
+


I copied this over from the changes made to publish.sh

awsluja · 2023-06-05T23:39:38Z

package.json

-    "cloud-e2e-local": "source ./scripts/cloud-e2e.sh && cloudE2ELocal",
+    "cloud-e2e-cb": "bash -c 'source ./scripts/cloud-e2e.sh && cloudE2E'",
+    "cloud-e2e-cb-beta": "bash -c 'source ./scripts/cloud-e2e.sh && cloudE2EBeta'",
+    "cloud-e2e-cb-local": "bash -c 'source ./scripts/cloud-e2e.sh && cloudE2ELocal'",


I updated this to match the new bash source syntax

awsluja · 2023-06-05T23:41:02Z

package.json

-    "test-ci": "nx run-many --parallel=4 --target=test --all --exclude='@aws-amplify/amplify-provider-awscloudformation' -- --ci --runInBand && nx run-many --target=test --projects='@aws-amplify/amplify-provider-awscloudformation' -- -ci --runInBand",
-    "test": "nx run-many --target=test --all -- --runInBand",
+    "test-changed": "lerna run test --since dev",
+    "test-ci": "lerna run test --concurrency 4 -- --ci -i",


we may need to revisit this and implement the exclusion logic for the amplify-provider-awscloudformation test again, but this time with Lerna

awsluja · 2023-06-05T23:43:04Z

shared-scripts.sh

@@ -421,7 +410,7 @@ function _integrationTest {

    echo "Configuring Amplify CLI"
    yarn rm-dev-link && yarn link-dev && yarn rm-aa-dev-link && yarn link-aa-dev
-    export PATH=$(yarn global bin):$PATH
+    export PATH=$(pwd)/.bin:$PATH


this also might break the integration test and need revisited

codecov-commenter · 2023-06-05T23:46:25Z

Codecov Report

❗ No coverage uploaded for pull request base (cb@c1aeac9). Click here to learn what that means.
The diff coverage is n/a.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

@@          Coverage Diff          @@
##             cb   #12744   +/-   ##
=====================================
  Coverage      ?   48.44%           
=====================================
  Files         ?      841           
  Lines         ?    38062           
  Branches      ?     7749           
=====================================
  Hits          ?    18439           
  Misses        ?    18036           
  Partials      ?     1587

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

jhockett and others added 18 commits May 19, 2023 11:32

fix: remove parameters when resource is deleted or unlinked (aws-ampl…

f78fb68

…ify#12544)

feat: add status acm subcommand (aws-amplify#12190)

a25ec17

chore: update data packages (aws-amplify#12693)

a0c4214

chore: replace local impls for showApiAuthAcm and authNotifications w…

eda51ff

…ith api calls (aws-amplify#12484)

test: fix migration tests (aws-amplify#12699)

5f291cf

fix: skip automatic form generation when datastore is not enabled

e45fcc1

chore: yarn modern (3.5.0) migration feature branch (aws-amplify#12579)

9621788

* chore: migrate to yarn 2 (aws-amplify#12501)

Merge branch 'dev' into fix-studio-form-generation

95ac090

chore: resolve build errors with latest updates from dev branch

966da92

fix: throw message when adding lambda function with same name (aws-am…

0819db4

…plify#12623) * feat: throw message when adding lambda function with same name * feat: generalQuestionsWalkthrough test

Merge pull request aws-amplify#12713 from aws-amplify/fix-studio-form…

cb9b61e

…-generation fix: skip automatic form generation when datastore is not enabled

chore: remove lint section from contributing.md (aws-amplify#12737)

5fe5cb2

fix: lint warnings (aws-amplify#12738)

99026e1

Merge branch 'dev' into dev-cb-merge-jun-3

f2c18e4

awsluja requested review from a team as code owners June 5, 2023 22:33

awsluja added 4 commits June 5, 2023 18:53

ci: fix lint error

ea7e328

Merge remote-tracking branch 'upstream/cb' into dev-cb-merge-jun-3

58fc479

ci: format

ee219f2

ci: fix publish

084984e

awsluja commented Jun 5, 2023

View reviewed changes

ci: add integration test to generated workflow

76087a3

jhockett approved these changes Jun 6, 2023

View reviewed changes

goldbez approved these changes Jun 6, 2023

View reviewed changes

awsluja merged commit fcfebe1 into aws-amplify:cb Jun 6, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: dev cb merge #12744

chore: dev cb merge #12744

awsluja commented Jun 5, 2023 •

edited

Loading

awsluja Jun 5, 2023

awsluja Jun 5, 2023

awsluja Jun 5, 2023

awsluja Jun 5, 2023

codecov-commenter commented Jun 5, 2023 •

edited

Loading

chore: dev cb merge #12744

chore: dev cb merge #12744

Conversation

awsluja commented Jun 5, 2023 • edited Loading

Description of changes

Issue #, if available

Description of how you validated changes

Checklist

awsluja Jun 5, 2023

Choose a reason for hiding this comment

awsluja Jun 5, 2023

Choose a reason for hiding this comment

awsluja Jun 5, 2023

Choose a reason for hiding this comment

awsluja Jun 5, 2023

Choose a reason for hiding this comment

codecov-commenter commented Jun 5, 2023 • edited Loading

Codecov Report

awsluja commented Jun 5, 2023 •

edited

Loading

codecov-commenter commented Jun 5, 2023 •

edited

Loading