Skip to content

Commit 2a44ab0

Browse files
Merge pull request #51 from iamcharankumar/fb_secrets
Created github secrets.
2 parents 650c657 + 1ed7659 commit 2a44ab0

2 files changed

Lines changed: 41 additions & 3 deletions

File tree

.github/workflows/ci.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ jobs:
5555
uses: browser-actions/setup-edge@v1
5656

5757
- name: Run Unit Tests
58+
env:
59+
# Inject secret as environment variable
60+
SWAGLABS_URL: ${{ secrets.SWAGLABS_URL }}
61+
SWAGLABS_USERNAME: ${{ secrets.SWAGLABS_USERNAME }}
62+
SWAGLABS_PASSWORD: ${{ secrets.SWAGLABS_PASSWORD }}
5863
run: |
5964
mvn clean test -Drunmode=headless -Dbrowser=${{ matrix.browser }} \
6065
-Dgroups=SWAG_LABS_UNIT \
@@ -103,6 +108,10 @@ jobs:
103108
name: target-${{ matrix.browser }} # Match the unique artifact name
104109

105110
- name: Run Tests for ${{ matrix.browser }}
111+
env:
112+
SWAGLABS_URL: ${{ secrets.SWAGLABS_URL }}
113+
SWAGLABS_USERNAME: ${{ secrets.SWAGLABS_USERNAME }}
114+
SWAGLABS_PASSWORD: ${{ secrets.SWAGLABS_PASSWORD }}
106115
run: |
107116
mvn clean test -Drunmode=headless -Dbrowser=${{ matrix.browser }} \
108117
-Dgroups=SWAG_LABS_SMOKE \
@@ -172,6 +181,10 @@ jobs:
172181
name: target-${{ matrix.browser }} # Match the unique artifact name
173182

174183
- name: Run Tests for ${{ matrix.browser }}
184+
env:
185+
SWAGLABS_URL: ${{ secrets.SWAGLABS_URL }}
186+
SWAGLABS_USERNAME: ${{ secrets.SWAGLABS_USERNAME }}
187+
SWAGLABS_PASSWORD: ${{ secrets.SWAGLABS_PASSWORD }}
175188
run: |
176189
mvn clean test -Drunmode=headless -Dbrowser=${{ matrix.browser }} \
177190
-Dgroups=SWAG_LABS_REGRESSION \
@@ -243,6 +256,10 @@ jobs:
243256
name: target-${{ matrix.browser }} # Match the unique artifact name
244257

245258
- name: Run Tests for ${{ matrix.browser }}
259+
env:
260+
SWAGLABS_URL: ${{ secrets.SWAGLABS_URL }}
261+
SWAGLABS_USERNAME: ${{ secrets.SWAGLABS_USERNAME }}
262+
SWAGLABS_PASSWORD: ${{ secrets.SWAGLABS_PASSWORD }}
246263
run: |
247264
mvn clean test -Drunmode=headless -Dbrowser=${{ matrix.browser }} \
248265
-Dgroups=SWAG_LABS_E2E \

src/main/java/io/swaglabs/portal/qa/utils/WebConfigLoader.java

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
package io.swaglabs.portal.qa.utils;
22

3+
import lombok.extern.slf4j.Slf4j;
4+
35
import java.util.Objects;
46
import java.util.Properties;
57

8+
@Slf4j
69
public class WebConfigLoader {
710

811
private static WebConfigLoader instance;
@@ -24,15 +27,33 @@ public static WebConfigLoader getInstance() {
2427
}
2528

2629
public String getSwagLabsUrl() {
27-
return getPropertyValue("swaglabs.url");
30+
String url = System.getenv("SWAGLABS_URL");
31+
if (url == null || url.isEmpty()) {
32+
log.info("Environment variable SWAGLABS_URL is not set, falling back to properties file.");
33+
url = getPropertyValue("swaglabs.url");
34+
}
35+
log.info("SwagLabs URL picked from github secrets.");
36+
return url;
2837
}
2938

3039
public String getSwagLabsUserName() {
31-
return getPropertyValue("swaglabs.username");
40+
String username = System.getenv("SWAGLABS_USERNAME");
41+
if (username == null || username.isEmpty()) {
42+
log.info("Environment variable SWAGLABS_USERNAME is not set, falling back to properties file.");
43+
username = getPropertyValue("swaglabs.username");
44+
}
45+
log.info("SwagLabs Username picked from github secrets.");
46+
return username;
3247
}
3348

3449
public String getSwagLabsPassword() {
35-
return getPropertyValue("swaglabs.password");
50+
String password = System.getenv("SWAGLABS_PASSWORD");
51+
if (password == null || password.isEmpty()) {
52+
log.info("Environment variable SWAGLABS_PASSWORD is not set, falling back to properties file.");
53+
password = getPropertyValue("swaglabs.password");
54+
}
55+
log.info("SwagLabs Password picked from github secrets.");
56+
return password;
3657
}
3758

3859
private String getPropertyValue(String propertyKey) {

0 commit comments

Comments
 (0)