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

fix(amplify-provider-awscloudformation): don't overwrite team-provider params #6479

Merged
merged 2 commits into from
Jan 26, 2021

Conversation

jhockett
Copy link
Contributor

@jhockett jhockett commented Jan 26, 2021

Description of changes:
Fixes regression from #6358 where team-provider-info parameters would be overwritten

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

@jhockett jhockett requested a review from a team as a code owner January 26, 2021 01:22
@jhockett jhockett requested review from edwardfoyle and removed request for a team January 26, 2021 01:22
@codecov
Copy link

codecov bot commented Jan 26, 2021

Codecov Report

Merging #6479 (b42c01d) into master (75f5ace) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           master    #6479    +/-   ##
========================================
  Coverage   57.34%   57.34%            
========================================
  Files         474      474            
  Lines       21670    21670            
  Branches     4091     4307   +216     
========================================
  Hits        12426    12426            
+ Misses       8383     8363    -20     
- Partials      861      881    +20     
Impacted Files Coverage Δ
packages/amplify-util-mock/src/api/api.ts 0.00% <0.00%> (ø)
packages/graphql-mapping-template/src/print.ts 35.29% <0.00%> (ø)
packages/amplify-util-mock/src/storage/storage.ts 0.00% <0.00%> (ø)
...ges/amplify-util-mock/src/CFNParser/stack/index.ts 0.00% <0.00%> (ø)
...es/amplify-util-mock/src/api/resolver-overrides.ts 0.00% <0.00%> (ø)
...es/graphql-transformer-core/src/stripDirectives.ts 35.29% <0.00%> (ø)
.../amplify-cli-core/src/state-manager/pathManager.ts 67.44% <0.00%> (ø)
.../amplify-util-mock/src/utils/lambda/loadMinimal.ts 0.00% <0.00%> (ø)
...graphql-transformer-core/src/TransformerContext.ts 25.09% <0.00%> (ø)
...mplify-appsync-simulator/src/resolvers/function.ts 15.38% <0.00%> (ø)
... and 9 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 75f5ace...b42c01d. Read the comment docs.

@jhockett jhockett marked this pull request as draft January 26, 2021 02:12
@jhockett jhockett marked this pull request as ready for review January 26, 2021 03:22
@jhockett jhockett changed the title fix: don't overwrite team-provider params fix(amplify-provider-awscloudformation): don't overwrite team-provider params Jan 26, 2021
@jhockett jhockett merged commit 7f36c27 into aws-amplify:master Jan 26, 2021
@jhockett jhockett deleted the funcS3KeyFix branch January 26, 2021 19:04
@github-actions
Copy link

This pull request has been automatically locked since there hasn't been any recent activity after it was closed. Please open a new issue for related bugs.

Looking for a help forum? We recommend joining the Amplify Community Discord server *-help channels for those types of questions.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 27, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants