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

Remove Default master encryption key from settings. #1851

Merged

Conversation

vmmusings
Copy link
Member

@vmmusings vmmusings commented Jul 11, 2023

Description

Testing

Request:

{
  "name": "aws_prometheus3",
  "connector": "PROMETHEUS",
  "allowedRoles": [],
  "properties": {
    "prometheus.uri": "https://localhost:9090",
    "prometheus.auth.type" : "basicauth",
    "prometheus.auth.username" : "username",
    "prometheus.auth.password" : "password"
  }
}

Response

{
  "status": 400,
  "error": {
    "type": "IllegalStateException",
    "reason": "Invalid Request",
    "details": "Master key is a required config for using datasource APIs. Please set the following config in opensearch.yml in all the cluster nodes. More details can be found here: https://github.com/opensearch-project/sql/blob/main/docs/user/ppl/admin/datasources.rst#master-key-config-for-encrypting-credential-information"
  }
}

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@vmmusings vmmusings force-pushed the remove-default-master-key branch 2 times, most recently from d81fbf3 to 10f5719 Compare July 11, 2023 21:54
@codecov
Copy link

codecov bot commented Jul 11, 2023

Codecov Report

Merging #1851 (42f4ed3) into main (f5031a7) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@            Coverage Diff            @@
##               main    #1851   +/-   ##
=========================================
  Coverage     97.39%   97.39%           
- Complexity     4600     4602    +2     
=========================================
  Files           401      401           
  Lines         11381    11386    +5     
  Branches        843      843           
=========================================
+ Hits          11084    11089    +5     
  Misses          290      290           
  Partials          7        7           
Flag Coverage Δ
sql-engine 97.39% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...ql/datasources/rest/RestDataSourceQueryAction.java 0.00% <ø> (ø)
...rch/sql/opensearch/setting/OpenSearchSettings.java 100.00% <ø> (ø)
...earch/sql/datasources/encryptor/EncryptorImpl.java 100.00% <100.00%> (ø)

@vmmusings vmmusings force-pushed the remove-default-master-key branch from 10f5719 to 449cc17 Compare July 11, 2023 21:59
@vmmusings vmmusings added the bug Something isn't working label Jul 11, 2023
@vmmusings vmmusings self-assigned this Jul 11, 2023
@vmmusings vmmusings force-pushed the remove-default-master-key branch 2 times, most recently from 6efc172 to 39ad8a2 Compare July 11, 2023 22:25
@vmmusings vmmusings marked this pull request as ready for review July 11, 2023 22:27
@vmmusings vmmusings force-pushed the remove-default-master-key branch from 39ad8a2 to 9a73353 Compare July 11, 2023 22:31
@vmmusings vmmusings force-pushed the remove-default-master-key branch from 9a73353 to 208d703 Compare July 11, 2023 22:34
Signed-off-by: Vamsi Manohar <[email protected]>
@vmmusings vmmusings force-pushed the remove-default-master-key branch from 208d703 to 42f4ed3 Compare July 11, 2023 22:36
@vmmusings vmmusings merged commit bc02815 into opensearch-project:main Jul 11, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 11, 2023
Signed-off-by: Vamsi Manohar <[email protected]>
(cherry picked from commit bc02815)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 11, 2023
Signed-off-by: Vamsi Manohar <[email protected]>
(cherry picked from commit bc02815)
vmmusings added a commit that referenced this pull request Jul 12, 2023
…1853)

* Remov:e Default master key (#1851)

Signed-off-by: Vamsi Manohar <[email protected]>
(cherry picked from commit bc02815)

* Fix BWC tests

Signed-off-by: Vamsi Manohar <[email protected]>

---------

Signed-off-by: Vamsi Manohar <[email protected]>
Co-authored-by: Vamsi Manohar <[email protected]>
vmmusings added a commit that referenced this pull request Jul 12, 2023
…1854)

* Remov:e Default master key (#1851)

Signed-off-by: Vamsi Manohar <[email protected]>
(cherry picked from commit bc02815)

* Fix BWC tests

Signed-off-by: Vamsi Manohar <[email protected]>

---------

Signed-off-by: Vamsi Manohar <[email protected]>
Co-authored-by: Vamsi Manohar <[email protected]>
MitchellGale pushed a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Jul 20, 2023
Signed-off-by: Vamsi Manohar <[email protected]>
Signed-off-by: Mitchell Gale <[email protected]>
MitchellGale pushed a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Jul 28, 2023
Signed-off-by: Vamsi Manohar <[email protected]>
Signed-off-by: Mitchell Gale <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport 2.9 bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants