-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Unhide setting js.interpretation.enabled
#12605
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
Open
winterhazel
wants to merge
2
commits into
apache:4.20
Choose a base branch
from
winterhazel:unhide-js-interpretation-enabled
base: 4.20
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+111
−66
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,7 +18,11 @@ | |
|
|
||
| import java.io.InputStream; | ||
| import java.sql.Connection; | ||
| import java.sql.PreparedStatement; | ||
| import java.sql.ResultSet; | ||
| import java.sql.SQLException; | ||
|
|
||
| import com.cloud.utils.crypt.DBEncryptionUtil; | ||
| import com.cloud.utils.exception.CloudRuntimeException; | ||
|
|
||
| public class Upgrade42020to42030 extends DbUpgradeAbstractImpl implements DbUpgrade, DbUpgradeSystemVmTemplate { | ||
|
|
@@ -51,6 +55,44 @@ public InputStream[] getPrepareScripts() { | |
|
|
||
| @Override | ||
| public void performDataMigration(Connection conn) { | ||
| unhideJsInterpretationEnabled(conn); | ||
| } | ||
|
|
||
| protected void unhideJsInterpretationEnabled(Connection conn) { | ||
| String value = getJsInterpretationEnabled(conn); | ||
| if (value != null) { | ||
| updateJsInterpretationEnabledFields(conn, value); | ||
| } | ||
| } | ||
|
|
||
| protected String getJsInterpretationEnabled(Connection conn) { | ||
| String query = "SELECT value FROM cloud.configuration WHERE name = 'js.interpretation.enabled' AND category = 'Hidden';"; | ||
|
|
||
| try (PreparedStatement pstmt = conn.prepareStatement(query)) { | ||
| ResultSet rs = pstmt.executeQuery(); | ||
| if (rs.next()) { | ||
| return rs.getString("value"); | ||
| } | ||
| logger.debug("Unable to retrieve value of hidden configuration 'js.interpretation.enabled'. The configuration may already be unhidden."); | ||
| return null; | ||
| } catch (SQLException e) { | ||
| throw new CloudRuntimeException("Error while retrieving value of hidden configuration 'js.interpretation.enabled'.", e); | ||
| } | ||
| } | ||
|
|
||
| protected void updateJsInterpretationEnabledFields(Connection conn, String encryptedValue) { | ||
| String query = "UPDATE cloud.configuration SET value = ?, category = 'System' WHERE name = 'js.interpretation.enabled' AND category = 'Hidden';"; | ||
|
|
||
| try (PreparedStatement pstmt = conn.prepareStatement(query)) { | ||
| String decryptedValue = DBEncryptionUtil.decrypt(encryptedValue); | ||
| logger.info("Updating setting 'js.interpretation.enabled' to decrypted value [{}], and category 'System'.", decryptedValue); | ||
| pstmt.setString(1, decryptedValue); | ||
| pstmt.executeUpdate(); | ||
| } catch (SQLException e) { | ||
| throw new CloudRuntimeException("Error while unhiding configuration 'js.interpretation.enabled'.", e); | ||
| } catch (CloudRuntimeException e) { | ||
| logger.warn("Error while decrypting configuration 'js.interpretation.enabled'. The configuration may already be decrypted."); | ||
| } | ||
|
Comment on lines
+93
to
+95
|
||
| } | ||
|
|
||
| @Override | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The SQL UPDATE statement only updates the 'value' and 'category' fields, but according to the PR description and the new ConfigKey definition in JsInterpreterHelper, the 'component' field should also be updated from 'ManagementServer' to 'JsInterpreter', and the 'is_dynamic' field should be updated to 1 (true). The SQL query should be: "UPDATE cloud.configuration SET value = ?, category = 'System', component = 'JsInterpreter', is_dynamic = 1 WHERE name = 'js.interpretation.enabled' AND category = 'Hidden';"