Merge pull request #28 from jenkinsci/log-error

Do not throw error on credential list exception
jenkinsci · Nov 9, 2020 · b8c75ee · b8c75ee
2 parents 1d0613e + 4c7e4c6
commit b8c75ee
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,4 +1,4 @@
-def recentLTS = "2.222.4"
+def recentLTS = "2.263"
 def configurations = [
         [platform: "linux", jdk: "8", jenkins: recentLTS, javaLevel: "8"],
         [platform: "linux", jdk: "11", jenkins: recentLTS, javaLevel: "8"],

diff --git a/pom.xml b/pom.xml
@@ -47,7 +47,7 @@
     </scm>
 
     <properties>
-        <jenkins.version>2.222.4</jenkins.version>
+        <jenkins.version>2.263</jenkins.version>
         <java.level>8</java.level>
         <jcasc.version>1.35</jcasc.version>
         <spotless.version>2.5.0</spotless.version>
@@ -57,7 +57,7 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.222.x</artifactId>
+                <artifactId>bom-2.263.x</artifactId>
                 <version>16</version>
                 <scope>import</scope>
                 <type>pom</type>

diff --git a/src/main/java/io/jenkins/plugins/credentials/gcp/secretsmanager/CredentialsSupplier.java b/src/main/java/io/jenkins/plugins/credentials/gcp/secretsmanager/CredentialsSupplier.java
@@ -1,6 +1,5 @@
 package io.jenkins.plugins.credentials.gcp.secretsmanager;
 
-import com.cloudbees.plugins.credentials.CredentialsUnavailableException;
 import com.cloudbees.plugins.credentials.common.StandardCredentials;
 import com.google.api.gax.rpc.ApiException;
 import com.google.cloud.secretmanager.v1.ListSecretsRequest;
@@ -16,9 +15,13 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.function.Supplier;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class CredentialsSupplier implements Supplier<Collection<StandardCredentials>> {
 
+  private static final Logger LOGGER = Logger.getLogger(CredentialsSupplier.class.getName());
+
   public static Supplier<Collection<StandardCredentials>> standard() {
     return new CredentialsSupplier();
   }
@@ -77,8 +80,8 @@ public Collection<StandardCredentials> get() {
       return credentials;
 
     } catch (IOException | ApiException e) {
-      throw new CredentialsUnavailableException(
-          "secret", Messages.couldNotRetrieveCredentialError(), e);
+      LOGGER.log(Level.WARNING, Messages.couldNotRetrieveCredentialError(), e);
+      return Collections.emptyList();
     }
   }
 

diff --git a/src/main/java/io/jenkins/plugins/credentials/gcp/secretsmanager/GcpSecretGetter.java b/src/main/java/io/jenkins/plugins/credentials/gcp/secretsmanager/GcpSecretGetter.java
@@ -3,6 +3,7 @@
 import com.cloudbees.plugins.credentials.CredentialsUnavailableException;
 import com.google.api.gax.rpc.ApiException;
 import com.google.cloud.secretmanager.v1.AccessSecretVersionResponse;
+import com.google.cloud.secretmanager.v1.ProjectName;
 import com.google.cloud.secretmanager.v1.SecretManagerServiceClient;
 import com.google.cloud.secretmanager.v1.SecretPayload;
 import com.google.cloud.secretmanager.v1.SecretVersionName;
@@ -32,9 +33,10 @@ public byte[] getSecretBytes(String id) {
 
   private SecretPayload getPayload(String id) {
     try (SecretManagerServiceClient client = SecretManagerServiceClient.create()) {
+      final ProjectName project = ProjectName.of(projectId);
       final SecretVersionName secretVersionName =
           SecretVersionName.newBuilder()
-              .setProject(projectId)
+              .setProject(project.getProject())
               .setSecret(id)
               .setSecretVersion("latest")
               .build();