Remove Watcher Account "unsecure" settings #36736
There are no files selected for viewing
This file contains 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 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 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 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 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 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 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 |
|---|---|---|
|
|
@@ -6,7 +6,6 @@ | |
| package org.elasticsearch.xpack.watcher.notification.jira; | ||
|
|
||
| import org.elasticsearch.common.Booleans; | ||
| import org.elasticsearch.common.bytes.BytesReference; | ||
| import org.elasticsearch.common.settings.SecureSetting; | ||
| import org.elasticsearch.common.settings.SecureString; | ||
|
|
@@ -42,15 +41,12 @@ public class JiraAccount { | |
| **/ | ||
| public static final String DEFAULT_PATH = "/rest/api/2/issue"; | ||
|
|
||
| static final String ISSUE_DEFAULTS_SETTING = "issue_defaults"; | ||
| static final String ALLOW_HTTP_SETTING = "allow_http"; | ||
|
|
||
| public static final Setting<SecureString> SECURE_USER_SETTING = SecureSetting.secureString("secure_user", null); | ||
| public static final Setting<SecureString> SECURE_PASSWORD_SETTING = SecureSetting.secureString("secure_password", null); | ||
| public static final Setting<SecureString> SECURE_URL_SETTING = SecureSetting.secureString("secure_url", null); | ||
|
|
||
| private final HttpClient httpClient; | ||
| private final String name; | ||
|
|
@@ -62,7 +58,7 @@ public class JiraAccount { | |
| public JiraAccount(String name, Settings settings, HttpClient httpClient) { | ||
| this.httpClient = httpClient; | ||
| this.name = name; | ||
| String url = getSetting(name, settings, SECURE_URL_SETTING); | ||
| try { | ||
| URI uri = new URI(url); | ||
| Scheme protocol = Scheme.parse(uri.getScheme()); | ||
|
|
@@ -71,16 +67,11 @@ public JiraAccount(String name, Settings settings, HttpClient httpClient) { | |
| } | ||
| this.url = uri; | ||
| } catch (URISyntaxException | IllegalArgumentException e) { | ||
| throw new SettingsException( | ||
| "invalid jira [" + name + "] account settings. invalid [" + SECURE_URL_SETTING.getKey() + "] setting", e); | ||
| } | ||
| this.user = getSetting(name, settings, SECURE_USER_SETTING); | ||
| this.password = getSetting(name, settings, SECURE_PASSWORD_SETTING); | ||
| try (XContentBuilder builder = XContentBuilder.builder(XContentType.JSON.xContent())) { | ||
| builder.startObject(); | ||
| settings.getAsSettings(ISSUE_DEFAULTS_SETTING).toXContent(builder, ToXContent.EMPTY_PARAMS); | ||
|
|
@@ -95,17 +86,12 @@ public JiraAccount(String name, Settings settings, HttpClient httpClient) { | |
| } | ||
| } | ||
|
|
||
| private static String getSetting(String accountName, Settings settings, Setting<SecureString> secureSetting) { | ||
|
There was a problem hiding this comment. This seems like something we could put in Account There was a problem hiding this comment. Agreed, but I think that's a job for another PR (see prev comment) |
||
| SecureString secureString = secureSetting.get(settings); | ||
| if (secureString == null || secureString.length() < 1) { | ||
| throw requiredSettingException(accountName, secureSetting.getKey()); | ||
| } | ||
| return secureString.toString(); | ||
| } | ||
|
|
||
| public String getName() { | ||
|
|
||
This file contains 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.
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.
this seems a bit different from the other getSecureSettings that are in the other *Account classes, and somewhat trappy. Why would we be returning null instead of throwing up like we do in the others? I ask because I hope we can consolidate the functionality into only Account, if thats at all possible, instead of having a method that does this validation in every *Account class.
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.
@hub-cap There is no Account base class. Also I tried to touch as less as possible to make reviewing easier. IMO we should be using the
SecureSettingfrom the correspondingService(EmailServicein this case). But I prefer to leave this for another time. WDYT?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.
Sounds great to me