Added public repo functionality to google cloud

Author: gkatzioura

S3StorageWagon/src/main/java/com/gkatzioura/maven/cloud/s3/PublicReadProperty.java renamed to CloudStorageCore/src/main/java/com/gkatzioura/maven/cloud/wagon/PublicReadProperty.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.gkatzioura.maven.cloud.s3;
+package com.gkatzioura.maven.cloud.wagon;
 
 public class PublicReadProperty {
 

GoogleStorageWagon/deploy/README.md

@@ -0,0 +1,9 @@
+By executing this file certain resources on google cloud are going to be created.
+
+A bucket in order to use as a repository
+
+A in order to read, write to the bucket and list the files available
+
+A role in order to attach it to your ec2-instance or ci/cd jobs
+
+A group to attach to the users in order to be able to execute requests

GoogleStorageWagon/deploy/gcs_repository_bucket.tf

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2018 Emmanouil Gkatziouras
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 variable "bucket_name" {
 }
 
@@ -23,18 +39,18 @@ resource "google_project_iam_custom_role" "cloud_storage_maven_role" {
   role_id     = "${replace(var.bucket_name,"-","_")}Role"
   title       = "${var.bucket_name}Role"
   description = "Cloud Storage Maven Repository Bucket Role"
-  permissions = ["storage.objects.create","storage.objects.get","storage.objects.list"]
+  permissions = ["storage.objects.create","storage.objects.get","storage.objects.list","storage.objects.delete"]
 }
 
 resource "google_service_account" "cloud_storage_service_account" {
   account_id    = "${var.bucket_name}-sa"
   display_name  = "${var.bucket_name}ServiceAccount"
 }
 
-resource "google_service_account_iam_binding" "cloud_storage_maven_service_account_iam_policy" {
-  service_account_id = "${google_service_account.cloud_storage_service_account.id}"
-  role = "${google_project_iam_custom_role.cloud_storage_maven_role.id}"
+resource "google_storage_bucket_iam_binding" "cloud_storage_bucket_service_account_iam_binding" {
+  bucket = "${google_storage_bucket.cloud_storage_maven_repo.id}"
   members = [
     "serviceAccount:${google_service_account.cloud_storage_service_account.email}"
   ]
-}
+  role = "${google_project_iam_custom_role.cloud_storage_maven_role.id}"
+}

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

@@ -21,6 +21,7 @@
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.logging.Level;
@@ -30,8 +31,10 @@
 import org.apache.maven.wagon.authentication.AuthenticationException;
 
 import com.gkatzioura.maven.cloud.resolver.KeyResolver;
+import com.gkatzioura.maven.cloud.wagon.PublicReadProperty;
 import com.google.api.gax.paging.Page;
 import com.google.cloud.WriteChannel;
+import com.google.cloud.storage.Acl;
 import com.google.cloud.storage.Blob;
 import com.google.cloud.storage.BlobInfo;
 import com.google.cloud.storage.Storage;
@@ -43,15 +46,17 @@ public class GoogleStorageRepository {
     private final KeyResolver keyResolver = new KeyResolver();
     private final StorageFactory storageFactory = new StorageFactory();
     private final Optional<String> keyPath;
+    private final PublicReadProperty publicReadProperty;
 
     private Storage storage;
 
     private static final Logger LOGGER = Logger.getLogger(GoogleStorageRepository.class.getName());
 
-    public GoogleStorageRepository(Optional<String> keyPath,String bucket, String directory) {
+    public GoogleStorageRepository(Optional<String> keyPath,String bucket, String directory, PublicReadProperty publicReadProperty) {
         this.keyPath = keyPath;
         this.bucket = bucket;
         this.baseDirectory = directory;
+        this.publicReadProperty = publicReadProperty;
     }
 
     public void connect() throws AuthenticationException {
@@ -108,7 +113,7 @@ public void put(InputStream inputStream,String destination) throws IOException {
 
         LOGGER.log(Level.FINER,String.format("Uploading key %s ",key));
 
-        BlobInfo blobInfo = BlobInfo.newBuilder(bucket,key).build();
+        BlobInfo blobInfo = applyPublicRead(BlobInfo.newBuilder(bucket,key)).build();
 
         try(WriteChannel writeChannel = storage.writer(blobInfo)) {
 
@@ -121,6 +126,17 @@ public void put(InputStream inputStream,String destination) throws IOException {
         }
     }
 
+    private BlobInfo.Builder applyPublicRead(BlobInfo.Builder builder) {
+        if(publicReadProperty.get()) {
+            Acl acl = Acl.newBuilder(Acl.User.ofAllUsers(), Acl.Role.READER).build();
+            LOGGER.info("Public read was set to true");
+            return builder.setAcl(Collections.singletonList(acl));
+
+        } else {
+            return builder;
+        }
+    }
+
     public List<String> list(String path) {
 
         String key = resolveKey(path);

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

@@ -40,11 +40,13 @@
 import com.gkatzioura.maven.cloud.transfer.TransferProgressFileInputStream;
 import com.gkatzioura.maven.cloud.transfer.TransferProgressImpl;
 import com.gkatzioura.maven.cloud.wagon.AbstractStorageWagon;
+import com.gkatzioura.maven.cloud.wagon.PublicReadProperty;
 
 public class GoogleStorageWagon extends AbstractStorageWagon {
 
     private GoogleStorageRepository googleStorageRepository;
     private Optional<String> keyPath;
+    private Boolean publicRepository;
 
     private static final Logger LOGGER = Logger.getLogger(GoogleStorageWagon.class.getName());
 
@@ -133,7 +135,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(keyPath ,bucket, directory);
+            googleStorageRepository = new GoogleStorageRepository(keyPath ,bucket, directory, new PublicReadProperty(publicRepository));
             googleStorageRepository.connect();
             sessionListenerContainer.fireSessionLoggedIn();
             sessionListenerContainer.fireSessionOpened();
@@ -158,4 +160,13 @@ public String getKeyPath() {
     public void setKeyPath(String keyPath) {
         this.keyPath = Optional.of(keyPath);
     }
+
+    public Boolean getPublicRepository() {
+        return publicRepository;
+    }
+
+    public void setPublicRepository(Boolean publicRepository) {
+        this.publicRepository = publicRepository;
+    }
+
 }

S3StorageWagon/deploy/s3_repository_bucket.tf

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2018 Emmanouil Gkatziouras
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 variable "bucket_name" {
 }
 

S3StorageWagon/src/main/java/com/gkatzioura/maven/cloud/s3/S3StorageRepository.java

@@ -44,6 +44,7 @@
 import com.gkatzioura.maven.cloud.transfer.TransferProgress;
 import com.gkatzioura.maven.cloud.transfer.TransferProgressFileInputStream;
 import com.gkatzioura.maven.cloud.transfer.TransferProgressFileOutputStream;
+import com.gkatzioura.maven.cloud.wagon.PublicReadProperty;
 
 public class S3StorageRepository {
 

S3StorageWagon/src/main/java/com/gkatzioura/maven/cloud/s3/S3StorageWagon.java

@@ -17,9 +17,6 @@
 package com.gkatzioura.maven.cloud.s3;
 
 import java.io.File;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
@@ -46,13 +43,13 @@
 import com.gkatzioura.maven.cloud.transfer.TransferProgress;
 import com.gkatzioura.maven.cloud.transfer.TransferProgressImpl;
 import com.gkatzioura.maven.cloud.wagon.AbstractStorageWagon;
+import com.gkatzioura.maven.cloud.wagon.PublicReadProperty;
 
 public class S3StorageWagon extends AbstractStorageWagon {
 
     private S3StorageRepository s3StorageRepository;
     private final KeyResolver keyResolver = new KeyResolver();
 
-
     private String region;
     private Boolean publicRepository;