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

Add encryptionKey to src/options/index.js #6999

Merged
merged 1 commit into from
Nov 10, 2020

Conversation

dblythy
Copy link
Member

@dblythy dblythy commented Nov 9, 2020

encryptionKey is defined manually in src/Options/Definitions.js, but not in src/options/index.js. This PR fixes that.

@codecov
Copy link

codecov bot commented Nov 9, 2020

Codecov Report

Merging #6999 (64becbd) into master (dbf04f3) will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6999      +/-   ##
==========================================
- Coverage   93.85%   93.84%   -0.02%     
==========================================
  Files         169      169              
  Lines       12405    12405              
==========================================
- Hits        11643    11641       -2     
- Misses        762      764       +2     
Impacted Files Coverage Δ
src/Options/index.js 100.00% <ø> (ø)
src/Adapters/Files/GridFSBucketAdapter.js 79.50% <0.00%> (-0.82%) ⬇️
src/RestWrite.js 93.82% <0.00%> (-0.17%) ⬇️

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 dbf04f3...64becbd. Read the comment docs.

Copy link
Member

@davimacedo davimacedo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@davimacedo davimacedo merged commit b4ec63e into parse-community:master Nov 10, 2020
@dblythy dblythy deleted the fileEncryption branch November 10, 2020 03:16
mtrezza added a commit to mtrezza/parse-server that referenced this pull request Dec 4, 2020
* commit 'ccb045b68c5b4d983a90fa125513fc476e4e2387':
  fix: upgrade @graphql-tools/links from 6.2.4 to 6.2.5 (parse-community#7007)
  fix: upgrade pg-promise from 10.7.0 to 10.7.1 (parse-community#7009)
  fix: upgrade jwks-rsa from 1.10.1 to 1.11.0 (parse-community#7008)
  fix: upgrade graphql from 15.3.0 to 15.4.0 (parse-community#7011)
  update stale bot (parse-community#6998)
  fix(beforeSave/afterSave): Return value instead of Parse.Op for nested fields (parse-community#7005)
  fix(beforeSave): Skip Sanitizing Database results (parse-community#7003)
  Fix includeAll for querying a Pointer and Pointer array (parse-community#7002)
  Init (parse-community#6999)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants