From 3b83c6837bbe3d1d6f83074076a80604258ddb23 Mon Sep 17 00:00:00 2001
From: Everaldo Canuto <everaldo.canuto@gmail.com>
Date: Mon, 19 Apr 2021 14:02:08 -0300
Subject: [PATCH 1/4] Add aws-amplify-deployment action

---
 aws-amplify-deployment/action.sh  |  3 +++
 aws-amplify-deployment/action.yml | 31 +++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100755 aws-amplify-deployment/action.sh
 create mode 100644 aws-amplify-deployment/action.yml

diff --git a/aws-amplify-deployment/action.sh b/aws-amplify-deployment/action.sh
new file mode 100755
index 0000000..ad40c95
--- /dev/null
+++ b/aws-amplify-deployment/action.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+env
diff --git a/aws-amplify-deployment/action.yml b/aws-amplify-deployment/action.yml
new file mode 100644
index 0000000..22d8eb1
--- /dev/null
+++ b/aws-amplify-deployment/action.yml
@@ -0,0 +1,31 @@
+name: 'aws-amplify-deployment'
+description: 'Deploys your AWS Amplify project using GitHub Actions.'
+branding:
+  icon: 'cloud'
+  color: 'orange'
+inputs:
+  amplify-app-id:
+    description: 'The unique ID for an Amplify app.'
+    required: true
+  amplify-dist-path:
+    description: 'Application build path.'
+    required: true
+  amplify-artifacts:
+    description: >-
+      The source URL for this deployment, used when calling start deployment without create deployment.
+      The source URL can be any HTTP GET URL that is publicly accessible and downloads a single .zip file.
+    required: true
+  amplify-branch:
+    description: 'The name for the branch, for the job.'
+    required: false
+    default: 'us-east-1'
+runs:
+  using: "composite"
+  steps:
+    - run: ${{ github.action_path }}/action.sh
+      shell: bash
+      env:
+        AMPLIFY_APP_ID: ${{ inputs.amplify-app-id }}
+        AMPLIFY_DIST_PATH: ${{ inputs.amplify-dist-path }}
+        AMPLIFY_ARTIFACTS: ${{ inputs.amplify-artifacts }}
+        AMPLIFY_BRANCH: ${{ inputs.amplify-branch }}

From fd948b72aa54823002b978b70a920716f5ed52d5 Mon Sep 17 00:00:00 2001
From: Everaldo Canuto <everaldo.canuto@gmail.com>
Date: Mon, 19 Apr 2021 14:49:55 -0300
Subject: [PATCH 2/4] Some fixes

---
 aws-amplify-deployment/action.sh  | 21 +++++++++++++++++++++
 aws-amplify-deployment/action.yml |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/aws-amplify-deployment/action.sh b/aws-amplify-deployment/action.sh
index ad40c95..dccf7fe 100755
--- a/aws-amplify-deployment/action.sh
+++ b/aws-amplify-deployment/action.sh
@@ -1,3 +1,24 @@
 #!/bin/bash
 
+# set amplify branch from git branch if not defined
+if [ -z "$AMPLIFY_BRANCH" ]; then
+    AMPLIFY_BRANCH=$(basename $GITHUB_REF)
+fi
+
+# source url 
+if [ -z "$AMPLIFY_SOURCE_URL" ]; then
+    AMPLIFY_SOURCE_URL="$AMPLIFY_ARTIFACTS/$GITHUB_REPOSITORY/$GITHUB_SHA.zip"
+fi
+
+cd $AMPLIFY_DIST_PATH
+zip -r $GITHUB_SHA.zip *
+aws s3 cp $GITHUB_SHA.zip $AMPLIFY_SOURCE_URL
+
+#aws amplify start-deployment --app-id $AMPLIFY_APP_ID --branch-name $AMPLIFY_BRANCH --source-url $AMPLIFY_SOURCE_URL 
+
 env
+echo $AMPLIFY_APP_ID
+echo $AMPLIFY_DIST_PATH
+echo $AMPLIFY_ARTIFACTS
+echo $AMPLIFY_BRANCH
+echo $AMPLIFY_SOURCE_URL
diff --git a/aws-amplify-deployment/action.yml b/aws-amplify-deployment/action.yml
index 22d8eb1..d471727 100644
--- a/aws-amplify-deployment/action.yml
+++ b/aws-amplify-deployment/action.yml
@@ -10,6 +10,7 @@ inputs:
   amplify-dist-path:
     description: 'Application build path.'
     required: true
+    default: './public'
   amplify-artifacts:
     description: >-
       The source URL for this deployment, used when calling start deployment without create deployment.
@@ -18,7 +19,6 @@ inputs:
   amplify-branch:
     description: 'The name for the branch, for the job.'
     required: false
-    default: 'us-east-1'
 runs:
   using: "composite"
   steps:

From 68668732b56f2c6efe2729e27f5bb0752c2635eb Mon Sep 17 00:00:00 2001
From: Everaldo Canuto <everaldo.canuto@gmail.com>
Date: Wed, 21 Apr 2021 10:36:49 -0300
Subject: [PATCH 3/4] Update action

---
 aws-amplify-deployment/action.sh  | 2 +-
 aws-amplify-deployment/action.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/aws-amplify-deployment/action.sh b/aws-amplify-deployment/action.sh
index dccf7fe..a837a8a 100755
--- a/aws-amplify-deployment/action.sh
+++ b/aws-amplify-deployment/action.sh
@@ -14,7 +14,7 @@ cd $AMPLIFY_DIST_PATH
 zip -r $GITHUB_SHA.zip *
 aws s3 cp $GITHUB_SHA.zip $AMPLIFY_SOURCE_URL
 
-#aws amplify start-deployment --app-id $AMPLIFY_APP_ID --branch-name $AMPLIFY_BRANCH --source-url $AMPLIFY_SOURCE_URL 
+aws amplify start-deployment --app-id $AMPLIFY_APP_ID --branch-name $AMPLIFY_BRANCH --source-url $AMPLIFY_SOURCE_URL 
 
 env
 echo $AMPLIFY_APP_ID
diff --git a/aws-amplify-deployment/action.yml b/aws-amplify-deployment/action.yml
index d471727..8f4775e 100644
--- a/aws-amplify-deployment/action.yml
+++ b/aws-amplify-deployment/action.yml
@@ -9,7 +9,7 @@ inputs:
     required: true
   amplify-dist-path:
     description: 'Application build path.'
-    required: true
+    required: false
     default: './public'
   amplify-artifacts:
     description: >-

From c06dbea639f7654641302061b3973259486f9304 Mon Sep 17 00:00:00 2001
From: Everaldo Canuto <everaldo.canuto@gmail.com>
Date: Tue, 11 May 2021 13:46:40 -0300
Subject: [PATCH 4/4] Code cleanup

---
 aws-amplify-deployment/action.sh  |  9 +--------
 aws-amplify-deployment/action.yml | 18 ++++++++----------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/aws-amplify-deployment/action.sh b/aws-amplify-deployment/action.sh
index a837a8a..7119f73 100755
--- a/aws-amplify-deployment/action.sh
+++ b/aws-amplify-deployment/action.sh
@@ -7,7 +7,7 @@ fi
 
 # source url 
 if [ -z "$AMPLIFY_SOURCE_URL" ]; then
-    AMPLIFY_SOURCE_URL="$AMPLIFY_ARTIFACTS/$GITHUB_REPOSITORY/$GITHUB_SHA.zip"
+    AMPLIFY_SOURCE_URL="$AMPLIFY_BUCKET/$GITHUB_REPOSITORY/$AMPLIFY_BRANCH/$GITHUB_SHA.zip"
 fi
 
 cd $AMPLIFY_DIST_PATH
@@ -15,10 +15,3 @@ zip -r $GITHUB_SHA.zip *
 aws s3 cp $GITHUB_SHA.zip $AMPLIFY_SOURCE_URL
 
 aws amplify start-deployment --app-id $AMPLIFY_APP_ID --branch-name $AMPLIFY_BRANCH --source-url $AMPLIFY_SOURCE_URL 
-
-env
-echo $AMPLIFY_APP_ID
-echo $AMPLIFY_DIST_PATH
-echo $AMPLIFY_ARTIFACTS
-echo $AMPLIFY_BRANCH
-echo $AMPLIFY_SOURCE_URL
diff --git a/aws-amplify-deployment/action.yml b/aws-amplify-deployment/action.yml
index 8f4775e..e2e0eda 100644
--- a/aws-amplify-deployment/action.yml
+++ b/aws-amplify-deployment/action.yml
@@ -7,18 +7,16 @@ inputs:
   amplify-app-id:
     description: 'The unique ID for an Amplify app.'
     required: true
-  amplify-dist-path:
-    description: 'Application build path.'
-    required: false
-    default: './public'
-  amplify-artifacts:
-    description: >-
-      The source URL for this deployment, used when calling start deployment without create deployment.
-      The source URL can be any HTTP GET URL that is publicly accessible and downloads a single .zip file.
+  amplify-bucket:
+    description: 'The artifacts S3 bucket.'
     required: true
   amplify-branch:
     description: 'The name for the branch, for the job.'
     required: false
+  amplify-dist-path:
+    description: 'Application build path.'
+    required: false
+    default: './public'
 runs:
   using: "composite"
   steps:
@@ -26,6 +24,6 @@ runs:
       shell: bash
       env:
         AMPLIFY_APP_ID: ${{ inputs.amplify-app-id }}
-        AMPLIFY_DIST_PATH: ${{ inputs.amplify-dist-path }}
-        AMPLIFY_ARTIFACTS: ${{ inputs.amplify-artifacts }}
+        AMPLIFY_BUCKET: ${{ inputs.amplify-bucket }}
         AMPLIFY_BRANCH: ${{ inputs.amplify-branch }}
+        AMPLIFY_DIST_PATH: ${{ inputs.amplify-dist-path }}