This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
commit a89215cd0e367920aebb0fed4b78f423146a7a95 Author: Dmitriy Pavlov <[email protected]> AuthorDate: Wed Sep 12 18:55:22 2018 +0300 IGNITE-9377 One more setup step was made --- .../src/main/java/org/apache/ignite/ci/HelperConfig.java | 8 ++++---- .../main/java/org/apache/ignite/ci/IgniteTeamcityHelper.java | 3 ++- .../main/java/org/apache/ignite/ci/conf/PasswordEncoder.java | 10 +++++++++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/HelperConfig.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/HelperConfig.java index 14660e7..10aaba4 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/HelperConfig.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/HelperConfig.java @@ -132,14 +132,14 @@ public class HelperConfig { * @return Null or decoded auth token for Github. */ @Nullable static String prepareGithubHttpAuthToken(Properties props) { - String pwd = props.getProperty(GITHUB_AUTH_TOKEN); + String tok = props.getProperty(GITHUB_AUTH_TOKEN); - if (isNullOrEmpty(pwd)) + if (isNullOrEmpty(tok)) return null; - pwd = PasswordEncoder.decode(pwd); + tok = PasswordEncoder.decode(tok); - return pwd; + return tok; } /** diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgniteTeamcityHelper.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgniteTeamcityHelper.java index 3bbc78e..9ecc792 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgniteTeamcityHelper.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgniteTeamcityHelper.java @@ -205,7 +205,8 @@ public class IgniteTeamcityHelper implements ITeamcity { } } - String pr = "https://api.github.com/repos/"; + serverId() + "/ignite/pulls/" + id; + //todo github address can be probably associated with server + String pr = "https://api.github.com/repos/apache/ignite/pulls/"; + id; try (InputStream is = HttpUtil.sendGetToGit(gitAuthTok, pr)) { InputStreamReader reader = new InputStreamReader(is); diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/PasswordEncoder.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/PasswordEncoder.java index 0e489f1..d7b9f9f 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/PasswordEncoder.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/PasswordEncoder.java @@ -89,6 +89,14 @@ public class PasswordEncoder { return parseHexBinary(Strings.padStart(Integer.toHexString(length), 2, '0')); } + public static void main(String[] args) { + String pass = "ddd"; + String encode = encode(pass); + System.err.println("Encoded: " + HelperConfig.GITHUB_AUTH_TOKEN + "=" + encode); + String decode = decode(encode); + Preconditions.checkState(decode.equals(pass)); + } + public static void main1(String[] args) { String pass = "mmm"; String encode = encode(pass); @@ -97,7 +105,7 @@ public class PasswordEncoder { Preconditions.checkState(decode.equals(pass)); } - public static void main(String[] args) { + public static void main2(String[] args) { String tok = HelperConfig.userPwdToToken("ignitetcbot", "mmm"); String encode = encode(tok); System.err.println("Encoded: " + HelperConfig.JIRA_AUTH_TOKEN + "=" + encode);
