Refactored path.

Added service account configuration through settings

Author: gkatzioura

GoogleStorageWagon/src/main/java/com/gkatzioura/maven/cloud/gcs/GoogleStorageRepository.java renamed to GoogleStorageWagon/src/main/java/com/gkatzioura/maven/cloud/gcs/wagon/GoogleStorageRepository.java

@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package com.gkatzioura.maven.cloud.gcs;
+package com.gkatzioura.maven.cloud.gcs.wagon;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -34,34 +35,43 @@
 import com.google.cloud.storage.Blob;
 import com.google.cloud.storage.BlobInfo;
 import com.google.cloud.storage.Storage;
-import com.google.cloud.storage.StorageOptions;
 
 public class GoogleStorageRepository {
 
     private final String bucket;
     private final String baseDirectory;
-    private final KeyResolver keyResolver;
+    private final KeyResolver keyResolver = new KeyResolver();
+    private final StorageFactory storageFactory = new StorageFactory();
+    private final Optional<String> keyPath;
+
     private Storage storage;
 
     private static final Logger LOGGER = Logger.getLogger(GoogleStorageRepository.class.getName());
 
-    public GoogleStorageRepository(String bucket, String directory) {
-        this.keyResolver = new KeyResolver();
+    public GoogleStorageRepository(Optional<String> keyPath,String bucket, String directory) {
+        this.keyPath = keyPath;
         this.bucket = bucket;
         this.baseDirectory = directory;
     }
 
     public void connect() throws AuthenticationException {
-
         try {
-            storage = StorageOptions.getDefaultInstance().getService();
+            storage = createStorage();
             storage.list(bucket, Storage.BlobListOption.pageSize(1));
         } catch (Exception e) {
             LOGGER.log(Level.SEVERE,"Could not establish connection with google cloud",e);
             throw new AuthenticationException("Please configure you google cloud account by logging using gcloud and specify a default project");
         }
     }
 
+    private final Storage createStorage() throws IOException {
+        if(keyPath.isPresent()) {
+            return storageFactory.createWithKeyFile(keyPath.get());
+        } else {
+            return storageFactory.createDefault();
+        }
+    }
+
     public void copy(String resourceName, File destination) throws ResourceDoesNotExistException {
 
         final String key = resolveKey(resourceName);

GoogleStorageWagon/src/main/java/com/gkatzioura/maven/cloud/gcs/GoogleStorageWagon.java renamed to GoogleStorageWagon/src/main/java/com/gkatzioura/maven/cloud/gcs/wagon/GoogleStorageWagon.java

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package com.gkatzioura.maven.cloud.gcs;
+package com.gkatzioura.maven.cloud.gcs.wagon;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
+import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -43,6 +44,7 @@
 public class GoogleStorageWagon extends AbstractStorageWagon {
 
     private GoogleStorageRepository googleStorageRepository;
+    private Optional<String> keyPath;
 
     private static final Logger LOGGER = Logger.getLogger(GoogleStorageWagon.class.getName());
 
@@ -131,7 +133,7 @@ public void connect(Repository repository, AuthenticationInfo authenticationInfo
 
             LOGGER.log(Level.FINER,String.format("Opening connection for bucket %s and directory %s",bucket,directory));
 
-            googleStorageRepository = new GoogleStorageRepository(bucket, directory);
+            googleStorageRepository = new GoogleStorageRepository(keyPath ,bucket, directory);
             googleStorageRepository.connect();
             sessionListenerContainer.fireSessionLoggedIn();
             sessionListenerContainer.fireSessionOpened();
@@ -149,4 +151,11 @@ public void disconnect() throws ConnectionException {
         sessionListenerContainer.fireSessionDisconnected();
     }
 
+    public String getKeyPath() {
+        return keyPath.get();
+    }
+
+    public void setKeyPath(String keyPath) {
+        this.keyPath = Optional.of(keyPath);
+    }
 }

GoogleStorageWagon/src/main/java/com/gkatzioura/maven/cloud/gcs/wagon/StorageFactory.java

@@ -0,0 +1,32 @@
+package com.gkatzioura.maven.cloud.gcs.wagon;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import com.google.auth.oauth2.GoogleCredentials;
+import com.google.auth.oauth2.ServiceAccountCredentials;
+import com.google.cloud.storage.Storage;
+import com.google.cloud.storage.StorageOptions;
+
+class StorageFactory {
+
+    private static final Logger LOGGER = Logger.getLogger(StorageFactory.class.getName());
+
+    Storage createWithKeyFile(String keyPath) throws IOException {
+        File credentialsPath = new File(keyPath);
+        try(FileInputStream serviceAccountStream = new FileInputStream(credentialsPath)) {
+            GoogleCredentials googleCredentials = ServiceAccountCredentials.fromStream(serviceAccountStream);
+            return StorageOptions.newBuilder().setCredentials(googleCredentials).build().getService();
+        } catch (IOException e) {
+            LOGGER.log(Level.SEVERE, "Could not parse properly service account key file", e);
+            throw e;
+        }
+    }
+
+    Storage createDefault() {
+        return StorageOptions.getDefaultInstance().getService();
+    }
+}

GoogleStorageWagon/src/main/resources/META-INF/plexus/components.xml

@@ -18,7 +18,7 @@
         <component>
             <role>org.apache.maven.wagon.Wagon</role>
             <role-hint>gs</role-hint>
-            <implementation>com.gkatzioura.maven.cloud.gcs.GoogleStorageWagon</implementation>
+            <implementation>com.gkatzioura.maven.cloud.gcs.wagon.GoogleStorageWagon</implementation>
             <instantiation-strategy>per-lookup</instantiation-strategy>
         </component>
     </components>