version 1.1.0 (#577)

* Created initial s3 step

* Fixing some syntax issues
Remove subfolder in S3 bucket for build ID
Adding IMAGE NAME and VERSION for easier testing
Make script executable
Make non public
Add parameter for integration name

Signed-off-by: Laurent Rochette <[email protected]>

* fixed aws export commands, output url, cf api key

* updated working Dir and script

* updated steps.yaml for public

* upated steps.yaml to rquire sourcedir

* adding test for directory

Signed-off-by: Laurent Rochette <[email protected]>

* Reduced image size, update step, updaet script

* updated steps.yaml with corrections

* updated URL to image

* version 1.1.0
Adding SA support
Catching error when upload fails so step errors out

* if instead of fi

---------

Signed-off-by: Laurent Rochette <[email protected]>
Co-authored-by: Luke Goodfellow <[email protected]>

Author: lrochette

incubating/aws-s3/Dockerfile

@@ -6,4 +6,3 @@ RUN yum install -y tar gzip jq && \
     yum clean all && rm -rf /var/cache/yum
 
 COPY ./src/start.sh /
-

incubating/aws-s3/src/start.sh

@@ -1,5 +1,19 @@
-export AWS_ACCESS_KEY_ID=$(codefresh get context ${S3_INTEGRATION} --decrypt -o json |jq --raw-output '.spec.data.auth.jsonConfig.accessKeyId')
-export AWS_SECRET_ACCESS_KEY=$(codefresh get context ${S3_INTEGRATION} --decrypt -o json |jq --raw-output '.spec.data.auth.jsonConfig.secretAccessKey')
+#!/bin/bash
+
+# Test for SA being set
+if [ -z ${AWS_ROLE_ARN+x} ];
+then
+  if [ -z ${S3_INTEGRATION+x} ] ;then
+    echo "You must set S3_INEGRATION or associate a Service Account to your pipeline"
+    exit 1
+  else
+    export AWS_ACCESS_KEY_ID=$(codefresh get context ${S3_INTEGRATION} --decrypt -o json |jq --raw-output '.spec.data.auth.jsonConfig.accessKeyId')
+    export AWS_SECRET_ACCESS_KEY=$(codefresh get context ${S3_INTEGRATION} --decrypt -o json |jq --raw-output '.spec.data.auth.jsonConfig.secretAccessKey')
+  fi
+else
+  echo "Service Account is set. Ignoring S3_INTEGRATION if defined."  
+fi
+
 export AWS_DEFAULT_REGION=$(echo "${REGION,,}")
 export AWS_PAGER=""
 
@@ -13,8 +27,13 @@ else
   aws s3 cp $SOURCE s3://$BUCKET/$S3_PREFIX
 fi
 
+if [ $? -ne 0 ] ; then
+  echo "Error uploading $SOURCE to s3://$BUCKET/$S3_PREFIX"
+  exit 1
+fi
+
 echo ""
-echo "Finished uplaoding files to S3"
+echo "Finished uploading files to S3"
 echo ""
 
 export uploadToS3_CF_OUTPUT_URL="https://s3.console.aws.amazon.com/s3/buckets/$BUCKET?region=$AWS_DEFAULT_REGION&prefix=$S3_PREFIX/"

incubating/aws-s3/step.yaml

@@ -2,7 +2,7 @@ kind: step-type
 version: '1.0'
 metadata:
   name: aws-s3
-  version: 1.0.0
+  version: 1.1.0
   isPublic: true
   description: Integration that uploads files to S3
   sources:
@@ -20,7 +20,7 @@ metadata:
     url: https://raw.githubusercontent.com/codefresh-io/steps/master/incubating/aws-s3/image/s3-logo.svg
     background: "#f4f4f4"
   examples:
-    - description: aws-s3
+    - description: aws-s3-with-integration
       workflow:
         uploadToS3:
           title: Uploading to S3
@@ -32,6 +32,17 @@ metadata:
             S3_PREFIX: myDirectory/subdirectory
             S3_INTEGRATION: amazon
             SOURCE: ${{CF_REPO_NAME}}/myDirectory
+    - description: aws-s3-with-SA
+      workflow:
+        uploadToS3:
+          title: Uploading to S3
+          type: aws-s3
+          stage: cleanup
+          arguments:
+            REGION: us-east-1
+            BUCKET: my-s3-bucket
+            S3_PREFIX: myDirectory/subdirectory
+            SOURCE: ${{CF_REPO_NAME}}/myDirectory
 spec:
   arguments: |-
     {
@@ -40,21 +51,21 @@ spec:
       "type": "object",
       "additionalProperties": true,
       "patterns": [],
-      "required": ["BUCKET", "S3_PREFIX", "S3_INTEGRATION", "SOURCE"],
+      "required": ["BUCKET", "S3_PREFIX", "SOURCE"],
       "properties":
         {
           "S3_INTEGRATION": {
             "type": "string",
-            "description": "The name of the S3 storage integration"
+            "description": "The name of the S3 storage integration if you do not use a Service Account. if a SA exists, it will be used instead"
             },
           "AWS_IMAGE": {
             "type": "string",
             "default": "quay.io/codefreshplugins/aws-s3",
-            "description": "The AWS S3 container image registry/image for the step."
+            "description": "The AWS S3 container registry/image for the step."
             },
           "AWS_IMAGE_VERSION": {
             "type": "string",
-            "default": "1.0.0",
+            "default": "1.1.0",
             "description": "Version of the AWS S3 image to use, Docker image tag."
             },
           "REGION": {
@@ -69,17 +80,17 @@ spec:
           "S3_PREFIX":
             {
               "type": "string",
-              "description": "The prefix or path you want the files to be uploaded to.  If a single file, this will be the object key unless you add a / at the end"
+              "description": "The prefix or path you want the files to be uploaded to. If a single file, this will be the object key unless you add a / at the end."
             },
           "SOURCE":
             {
               "type": "string",
-              "description": "The name of the directory or file you want to upload. Path from /codefresh/volume/ "
+              "description": "The name of the directory or file you want to upload. Path from /codefresh/volume/"
             },
           "working_directory":
             {
               "type": "string",
-              "description": "The directory where you want to be in. The default value is '/codefresh/volume/",
+              "description": "The directory where you want to be in. The default value is '/codefresh/volume/'",
               "default": "/codefresh/volume/"
             }
         }