remove endpoint url and add locations

shallwefootball · Mar 18, 2020 · 742ee30 · 742ee30
1 parent 8fe800a
commit 742ee30
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 24 deletions.
diff --git a/action.yml b/action.yml
@@ -17,15 +17,11 @@ inputs:
   source_dir:
     required: true
     description: 'directory to upload'
-  s3_endpoint_url:
-    required: true
-    description: 's3 endpoint url'
-  index_document:
-    required: false
-    description: 'default index.html'
 outputs:
-  object_url:
-    description: 'object url'
+  object_key:
+    description: 'object key'
+  object_locations:
+    description: 'object locations'
 runs:
   using: 'node12'
   main: 'dist/index.js'

diff --git a/dist/index.js b/dist/index.js
@@ -2408,9 +2408,6 @@ const SECRET_ACCESS_KEY = core.getInput('aws_secret_access_key', {
 });
 const BUCKET = core.getInput('aws_bucket', { required: true });
 const SOURCE_DIR = core.getInput('source_dir', { required: true });
-const ENDPOINT_URL = core.getInput('s3_endpoint_url', { required: true });
-const INDEX =
-  core.getInput('index_document', { required: false }) || 'index.html';
 
 const s3 = new S3({
   accessKeyId: AWS_KEY_ID,
@@ -2424,7 +2421,8 @@ function upload(params) {
     s3.upload(params, (err, data) => {
       if (err) core.error(err);
       core.info(`uploaded - ${data.Key}`);
-      resolve();
+      core.info(`located - ${data.Location}`);
+      resolve(data.Location);
     });
   });
 }
@@ -2446,10 +2444,11 @@ function run() {
 }
 
 run()
-  .then(() => {
-    const url = path.join(ENDPOINT_URL, objKey, INDEX);
-    core.info(`object url - ${url}`);
-    core.setOutput('object_url', url);
+  .then(locations => {
+    core.info(`object key - ${objKey}`);
+    core.info(`object locations - ${locations}`);
+    core.setOutput('object_key', objKey);
+    core.setOutput('object_locations', locations);
   })
   .catch(err => {
     core.error(err);

diff --git a/index.js b/index.js
@@ -12,9 +12,6 @@ const SECRET_ACCESS_KEY = core.getInput('aws_secret_access_key', {
 });
 const BUCKET = core.getInput('aws_bucket', { required: true });
 const SOURCE_DIR = core.getInput('source_dir', { required: true });
-const ENDPOINT_URL = core.getInput('s3_endpoint_url', { required: true });
-const INDEX =
-  core.getInput('index_document', { required: false }) || 'index.html';
 
 const s3 = new S3({
   accessKeyId: AWS_KEY_ID,
@@ -28,7 +25,8 @@ function upload(params) {
     s3.upload(params, (err, data) => {
       if (err) core.error(err);
       core.info(`uploaded - ${data.Key}`);
-      resolve();
+      core.info(`located - ${data.Location}`);
+      resolve(data.Location);
     });
   });
 }
@@ -50,10 +48,11 @@ function run() {
 }
 
 run()
-  .then(() => {
-    const url = path.join(ENDPOINT_URL, objKey, INDEX);
-    core.info(`object url - ${url}`);
-    core.setOutput('object_url', url);
+  .then(locations => {
+    core.info(`object key - ${objKey}`);
+    core.info(`object locations - ${locations}`);
+    core.setOutput('object_key', objKey);
+    core.setOutput('object_locations', locations);
   })
   .catch(err => {
     core.error(err);