Merge pull request #10 from jenkinsci/register-provider

Need to explicitly register JClouds provider
jenkinsci · Apr 9, 2018 · eb8aaed · eb8aaed
2 parents 4327ac8 + 04c7ef8
commit eb8aaed
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/src/main/java/io/jenkins/plugins/artifact_manager_s3/JCloudsApiExtensionPoint.java b/src/main/java/io/jenkins/plugins/artifact_manager_s3/JCloudsApiExtensionPoint.java
@@ -32,6 +32,7 @@
 import org.jclouds.blobstore.BlobStoreContext;
 import org.jclouds.blobstore.domain.Blob;
 import org.jclouds.domain.Credentials;
+import org.jclouds.providers.ProviderMetadata;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.Beta;
 
@@ -52,6 +53,9 @@ public enum HttpMethod {
     @NonNull
     public abstract String id();
 
+    @NonNull
+    public abstract ProviderMetadata getProvider();
+
     @NonNull
     public abstract BlobStoreContext getContext() throws IOException;
 

diff --git a/src/main/java/io/jenkins/plugins/artifact_manager_s3/JCloudsArtifactManager.java b/src/main/java/io/jenkins/plugins/artifact_manager_s3/JCloudsArtifactManager.java
@@ -49,6 +49,7 @@
 import org.jclouds.blobstore.options.CopyOptions;
 import org.jclouds.blobstore.options.ListContainerOptions;
 import org.jclouds.domain.Credentials;
+import org.jclouds.osgi.ProviderRegistry;
 import org.jenkinsci.plugins.workflow.flow.StashManager;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -309,6 +310,9 @@ private static JCloudsApiExtensionPoint getExtension(String providerOrApi) {
 
     private static BlobStoreContext getContext(Supplier<Credentials> credentialsSupplier) throws IOException {
         try {
+            // for some reason it won't find it at runtime otherwise
+            ProviderRegistry.registerProvider(getExtension(PROVIDER).getProvider());
+
             return ContextBuilder.newBuilder(PROVIDER)
                     .credentialsSupplier(credentialsSupplier)
                     .buildView(BlobStoreContext.class);

diff --git a/src/main/java/io/jenkins/plugins/artifact_manager_s3/S3BlobStore.java b/src/main/java/io/jenkins/plugins/artifact_manager_s3/S3BlobStore.java
@@ -45,6 +45,7 @@
 import org.jclouds.blobstore.domain.Blob;
 import org.jclouds.domain.Credentials;
 import org.jclouds.osgi.ProviderRegistry;
+import org.jclouds.providers.ProviderMetadata;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
@@ -72,6 +73,11 @@ public String id() {
         return "aws-s3";
     }
 
+    @Override
+    public ProviderMetadata getProvider() {
+        return AWSS3ProviderMetadata.builder().build();
+    }
+
     public BlobStoreContext getContext() throws IOException {
         LOGGER.log(Level.FINEST, "Building context for {0}", id());
         ProviderRegistry.registerProvider(AWSS3ProviderMetadata.builder().build());