Skip to content

Commit e7c5b32

Browse files
vedharishvedharish
committed
Use BROWSERSTACK_USERNAME and BROWSERSTACK_ACCESS_KEY
1 parent 9cdfffd commit e7c5b32

File tree

6 files changed

+24
-24
lines changed

6 files changed

+24
-24
lines changed

‎browserstack-teamcity-agent/src/main/java/com/browserstack/automate/ci/teamcity/BrowserStackLocalAgent.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ public void beforeRunnerStart(@NotNull BuildRunnerContext runner) {
6464
config.get(BrowserStackParameters.BROWSERSTACK_LOCAL_OPTIONS),
6565
buildLogger);
6666

67-
if (config.containsKey(EnvVars.BROWSERSTACK_ACCESSKEY)) {
67+
if (config.containsKey(EnvVars.BROWSERSTACK_ACCESS_KEY)) {
6868
Map<String, String> localOptions = new HashMap<String, String>();
69-
localOptions.put("key", config.get(EnvVars.BROWSERSTACK_ACCESSKEY));
69+
localOptions.put("key", config.get(EnvVars.BROWSERSTACK_ACCESS_KEY));
7070
buildLogger.message("Starting BrowserStack Local");
7171

7272
try {
@@ -88,7 +88,7 @@ public void beforeRunnerStart(@NotNull BuildRunnerContext runner) {
8888
runner.getBuild().stopBuild(errMessage);
8989
}
9090
} else {
91-
buildLogger.message(EnvVars.BROWSERSTACK_ACCESSKEY + " not configured.");
91+
buildLogger.message(EnvVars.BROWSERSTACK_ACCESS_KEY + " not configured.");
9292
}
9393
}
9494

@@ -141,17 +141,17 @@ private void loadBuildFeature(final AgentRunningBuild build) {
141141
* @param config
142142
*/
143143
private void exportEnvVars(final BuildRunnerContext runner, final Map<String, String> config) {
144-
if (!config.containsKey(EnvVars.BROWSERSTACK_USER) || !config.containsKey(EnvVars.BROWSERSTACK_ACCESSKEY)) {
144+
if (!config.containsKey(EnvVars.BROWSERSTACK_USERNAME) || !config.containsKey(EnvVars.BROWSERSTACK_ACCESS_KEY)) {
145145
return;
146146
}
147147

148-
runner.addEnvironmentVariable(EnvVars.BROWSERSTACK_USER, config.get(EnvVars.BROWSERSTACK_USER));
149-
runner.addEnvironmentVariable(EnvVars.BROWSERSTACK_ACCESSKEY, config.get(EnvVars.BROWSERSTACK_ACCESSKEY));
148+
runner.addEnvironmentVariable(EnvVars.BROWSERSTACK_USERNAME, config.get(EnvVars.BROWSERSTACK_USERNAME));
149+
runner.addEnvironmentVariable(EnvVars.BROWSERSTACK_ACCESS_KEY, config.get(EnvVars.BROWSERSTACK_ACCESS_KEY));
150150
runner.addEnvironmentVariable(EnvVars.BROWSERSTACK_LOCAL, config.get(EnvVars.BROWSERSTACK_LOCAL));
151151

152152
BuildProgressLogger buildLogger = runner.getBuild().getBuildLogger();
153-
buildLogger.message(EnvVars.BROWSERSTACK_USER + "=" + config.get(EnvVars.BROWSERSTACK_USER));
154-
buildLogger.message(EnvVars.BROWSERSTACK_ACCESSKEY + "=" + config.get(EnvVars.BROWSERSTACK_ACCESSKEY));
153+
buildLogger.message(EnvVars.BROWSERSTACK_USERNAME + "=" + config.get(EnvVars.BROWSERSTACK_USERNAME));
154+
buildLogger.message(EnvVars.BROWSERSTACK_ACCESS_KEY + "=" + config.get(EnvVars.BROWSERSTACK_ACCESS_KEY));
155155
buildLogger.message(EnvVars.BROWSERSTACK_LOCAL + "=" + config.get(EnvVars.BROWSERSTACK_LOCAL));
156156

157157
if (localIdentifier != null) {

‎browserstack-teamcity-common/src/main/java/com/browserstack/automate/ci/teamcity/BrowserStackParameters.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
public class BrowserStackParameters {
66

77
public interface EnvVars {
8-
String BROWSERSTACK_USER = "BROWSERSTACK_USER";
9-
String BROWSERSTACK_ACCESSKEY = "BROWSERSTACK_ACCESSKEY";
8+
String BROWSERSTACK_USERNAME = "BROWSERSTACK_USERNAME";
9+
String BROWSERSTACK_ACCESS_KEY = "BROWSERSTACK_ACCESS_KEY";
1010
String BROWSERSTACK_LOCAL = "BROWSERSTACK_LOCAL";
1111
String BROWSERSTACK_LOCAL_IDENTIFIER = "BROWSERSTACK_LOCAL_IDENTIFIER";
1212
String BROWSERSTACK_BUILD = "BROWSERSTACK_BUILD";

‎browserstack-teamcity-server/src/main/java/com/browserstack/automate/ci/teamcity/config/AutomateBuildFeature.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ public boolean isMultipleFeaturesPerBuildTypeAllowed() {
7171
@NotNull
7272
@Override
7373
public String describeParameters(@NotNull Map<String, String> params) {
74-
boolean hasCredentials = params.containsKey(EnvVars.BROWSERSTACK_USER) &&
75-
params.containsKey(EnvVars.BROWSERSTACK_ACCESSKEY);
74+
boolean hasCredentials = params.containsKey(EnvVars.BROWSERSTACK_USERNAME) &&
75+
params.containsKey(EnvVars.BROWSERSTACK_ACCESS_KEY);
7676
if (!hasCredentials) {
7777
return "Requires configuration of credentials.";
7878
}

‎browserstack-teamcity-server/src/main/java/com/browserstack/automate/ci/teamcity/ui/AutomateResultsTab.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ public static AutomateClient newAutomateClient(final SBuild build) {
192192
SBuildFeatureDescriptor featureDescriptor = AutomateBuildFeature.findFeatureDescriptor(build);
193193
if (featureDescriptor != null) {
194194
Map<String, String> params = featureDescriptor.getParameters();
195-
String username = params.get(BrowserStackParameters.EnvVars.BROWSERSTACK_USER);
196-
String accessKey = params.get(BrowserStackParameters.EnvVars.BROWSERSTACK_ACCESSKEY);
195+
String username = params.get(BrowserStackParameters.EnvVars.BROWSERSTACK_USERNAME);
196+
String accessKey = params.get(BrowserStackParameters.EnvVars.BROWSERSTACK_ACCESS_KEY);
197197

198198
if (StringUtils.isNotBlank(username) && StringUtils.isNotBlank(accessKey)) {
199199
return new AutomateClient(username, accessKey);

‎browserstack-teamcity-server/src/main/resources/buildServerResources/automateSettings.jsp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@
77
<%@ page import="com.browserstack.automate.ci.teamcity.BrowserStackParameters" %>
88
<jsp:useBean id="propertiesBean" scope="request" type="jetbrains.buildServer.controllers.BasePropertiesBean"/>
99

10-
<tr id="<%= BrowserStackParameters.EnvVars.BROWSERSTACK_USER %>.container">
11-
<th><label for="<%= BrowserStackParameters.EnvVars.BROWSERSTACK_USER %>">Username:</label></th>
10+
<tr id="<%= BrowserStackParameters.EnvVars.BROWSERSTACK_USERNAME %>.container">
11+
<th><label for="<%= BrowserStackParameters.EnvVars.BROWSERSTACK_USERNAME %>">Username:</label></th>
1212
<td>
13-
<props:textProperty name="<%= BrowserStackParameters.EnvVars.BROWSERSTACK_USER %>"/>
13+
<props:textProperty name="<%= BrowserStackParameters.EnvVars.BROWSERSTACK_USERNAME %>"/>
1414

1515
<span class="smallNote">
1616
Set your BrowserStack username. You can get it from <a href="https://www.browserstack.com/accounts/settings" target="_blank">here</a>.
1717
</span>
18-
<span class="error" id="error_<%= BrowserStackParameters.EnvVars.BROWSERSTACK_USER %>"/>
18+
<span class="error" id="error_<%= BrowserStackParameters.EnvVars.BROWSERSTACK_USERNAME %>"/>
1919
</td>
2020
</tr>
21-
<tr id="<%= BrowserStackParameters.EnvVars.BROWSERSTACK_ACCESSKEY %>.container">
22-
<th><label for="<%= BrowserStackParameters.EnvVars.BROWSERSTACK_ACCESSKEY %>">Access Key:</label></th>
21+
<tr id="<%= BrowserStackParameters.EnvVars.BROWSERSTACK_ACCESS_KEY %>.container">
22+
<th><label for="<%= BrowserStackParameters.EnvVars.BROWSERSTACK_ACCESS_KEY %>">Access Key:</label></th>
2323
<td>
24-
<props:textProperty name="<%= BrowserStackParameters.EnvVars.BROWSERSTACK_ACCESSKEY %>"/>
24+
<props:textProperty name="<%= BrowserStackParameters.EnvVars.BROWSERSTACK_ACCESS_KEY %>"/>
2525

2626
<span class="smallNote">
2727
Set your BrowserStack access key. You can get it from <a href="https://www.browserstack.com/accounts/settings" target="_blank">here</a>.
2828
</span>
29-
<span class="error" id="error_<%= BrowserStackParameters.EnvVars.BROWSERSTACK_ACCESSKEY %>"/>
29+
<span class="error" id="error_<%= BrowserStackParameters.EnvVars.BROWSERSTACK_ACCESS_KEY %>"/>
3030
</td>
3131
</tr>
3232
<tr id="<%= BrowserStackParameters.EnvVars.BROWSERSTACK_LOCAL %>.container">

‎browserstack-teamcity-server/src/test/java/com/browserstack/automate/ci/teamcity/AutomateBuildFeatureTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ public void testDescriptionForLocalFalse() throws Exception {
8989
@NotNull
9090
private Map<String, String> createParams() {
9191
Map<String, String> paramMap = new HashMap<String, String>();
92-
paramMap.put(BrowserStackParameters.EnvVars.BROWSERSTACK_USER, "RandomUser");
93-
paramMap.put(BrowserStackParameters.EnvVars.BROWSERSTACK_ACCESSKEY, "RandomAccess456Key");
92+
paramMap.put(BrowserStackParameters.EnvVars.BROWSERSTACK_USERNAME, "RandomUser");
93+
paramMap.put(BrowserStackParameters.EnvVars.BROWSERSTACK_ACCESS_KEY, "RandomAccess456Key");
9494
return paramMap;
9595
}
9696

0 commit comments

Comments
 (0)