Merge pull request #518 from bf2fc6cc711aee1a0c2a/env-var-removal-git…

…hub-token removal of environment variable GITHUB_TOKEN, as it is no longer needed
bf2fc6cc711aee1a0c2a · Mar 30, 2023 · 2f4de17 · 2f4de17
2 parents 63b14a9 + feb3e25
commit 2f4de17
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/src/main/java/io/managed/services/test/Environment.java b/src/main/java/io/managed/services/test/Environment.java
@@ -74,8 +74,6 @@ public class Environment {
     private static final String CLI_PLATFORM_ENV = "CLI_PLATFORM";
     private static final String CLI_ARCH_ENV = "CLI_ARCH";
     private static final String CLI_EXCLUDE_VERSIONS_ENV = "CLI_EXCLUDE_VERSIONS";
-    private static final String GITHUB_TOKEN_ENV = "GITHUB_TOKEN";
-
     private static final String LAUNCH_KEY_ENV = "LAUNCH_KEY";
 
     private static final String SKIP_TEARDOWN_ENV = "SKIP_TEARDOWN";
@@ -146,7 +144,6 @@ public class Environment {
     // identity.api.openshift.com OAuth ENVs
     // getOrDefault(OPENSHIFT_IDENTITY_URI_ENV, "https://identity.api.stage.openshift.com") -> REDHAT_SSO_URI
     public static final String OPENSHIFT_IDENTITY_URI = getOrDefault(OPENSHIFT_IDENTITY_URI_ENV, REDHAT_SSO_URI);
-    //public static final String OPENSHIFT_IDENTITY_URI = getOrDefault(REDHAT_SSO_URI_ENV, REDHAT_SSO_URI);
     // "rhoas" -> REDHAT_SSO_REALM
     public static final String OPENSHIFT_IDENTITY_REALM = getOrDefault(OPENSHIFT_IDENTITY_REALM_ENV, REDHAT_SSO_REALM);
     // "strimzi-ui"
@@ -170,7 +167,6 @@ public class Environment {
     public static final String CLI_PLATFORM = getOrDefault(CLI_PLATFORM_ENV, Platform.getArch().toString());
     public static final String CLI_ARCH = getOrDefault(CLI_ARCH_ENV, "amd64");
     public static final String CLI_EXCLUDE_VERSIONS = getOrDefault(CLI_EXCLUDE_VERSIONS_ENV, "alpha");
-    public static final String GITHUB_TOKEN = getOrDefault(GITHUB_TOKEN_ENV, null);
 
     public static final String LAUNCH_KEY = getOrDefault(LAUNCH_KEY_ENV, "change-me");
     public static final String LAUNCH_SUFFIX = LAUNCH_KEY + "-" + CLOUD_PROVIDER;

diff --git a/src/main/java/io/managed/services/test/cli/CLIDownloader.java b/src/main/java/io/managed/services/test/cli/CLIDownloader.java
@@ -35,15 +35,14 @@ public class CLIDownloader {
     private final String excludeVersions;
 
     public CLIDownloader(
-        String token,
         String organization,
         String repository,
         String version,
         String platform,
         String arch,
         String excludeVersions) {
 
-        this.github = new GitHub(token);
+        this.github = new GitHub();
         this.organization = organization;
         this.repository = repository;
         this.version = version;
@@ -55,7 +54,6 @@ public CLIDownloader(
 
     public static CLIDownloader defaultDownloader() {
         return new CLIDownloader(
-            Environment.GITHUB_TOKEN,
             Environment.CLI_DOWNLOAD_ORG,
             Environment.CLI_DOWNLOAD_REPO,
             Environment.CLI_VERSION,

diff --git a/src/main/java/io/managed/services/test/client/github/GitHub.java b/src/main/java/io/managed/services/test/client/github/GitHub.java
@@ -19,14 +19,9 @@ public class GitHub implements AutoCloseable {
     private final Client client;
     private final WebTarget github;
 
-    public GitHub(String token) {
+    public GitHub() {
         this.client = ClientBuilder.newClient();
-
-        var t = client.target(GITHUB_URL);
-        if (token != null) {
-            t = t.register(new BearerAuthFilter(token));
-        }
-        this.github = t;
+        this.github = client.target(GITHUB_URL);
     }
 
     private List<Release> getReleases(String org, String repo) {