From 0110a978909f0469ccd0dc1d9c7f2ad5daf7c75d Mon Sep 17 00:00:00 2001
From: Julian Waller <git@julusian.co.uk>
Date: Wed, 30 Mar 2022 00:04:16 +0100
Subject: [PATCH] fix: input names

---
 .github/actions/upload-and-notify/action.yaml | 20 ++++-----
 .github/workflows/node.yaml                   | 44 +++++++++----------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/.github/actions/upload-and-notify/action.yaml b/.github/actions/upload-and-notify/action.yaml
index 786155e..f6325fe 100644
--- a/.github/actions/upload-and-notify/action.yaml
+++ b/.github/actions/upload-and-notify/action.yaml
@@ -22,28 +22,28 @@ inputs:
     description: 'Target filename in s3'
     required: true
     default: ''
-  host:
+  s3-host:
     description: 'Server endpoint'
     required: true
     default: 's3.bitfocus.io'
-  bucket:
+  s3-bucket:
     description: 'Bucket to upload to'
     required: true
     default: ''
-  access-key:
+  s3-access-key:
     description: 'Access Key'
     required: true
     default: ''
-  secret-key:
+  s3-secret-key:
     description: 'Secret Key'
     required: true
     default: ''
 
-  product:
+  api-product:
     description: 'Name of the product'
     required: true
     default: ''
-  target:
+  api-target:
     description: 'Build target (linux-img/linux-deb/linux-tgz/mac-intel/mac-arm/win-x86/win-x64)'
     required: true
     default: ''
@@ -103,22 +103,22 @@ runs:
       if: ${{ steps.versions.outputs.version }} && ${{ steps.versions.outputs.branch }}
       shell: bash
       run: |
-        ./mc alias set remote/ https://${{ inputs.host }} ${{ inputs.access-key }} ${{ inputs.secret-key }}
+        ./mc alias set remote/ https://${{ inputs.s3-host }} ${{ inputs.s3-access-key }} ${{ inputs.s3-secret-key }}
 
-        ./mc cp "${{ inputs.source-filename }}" "remote/${{ inputs.bucket }}/${{ inputs.destination-filename }}"
+        ./mc cp "${{ inputs.source-filename }}" "remote/${{ inputs.s3-bucket }}/${{ inputs.destination-filename }}"
 
     - name: Notify API Server
       if: ${{ steps.versions.outputs.version }} && ${{ steps.versions.outputs.branch }}
       shell: bash
       run: |
         curl -X 'POST' \
-          'https://api.bitfocus.io/v1/product/${{ inputs.product }}/package' \
+          'https://api.bitfocus.io/v1/product/${{ inputs.api-product }}/package' \
           -H 'accept: application/json' \
           -H 'Content-Type: application/json' \
           -d '{
           "branch": "${{ steps.versions.outputs.branch }}",
           "version": "${{ steps.versions.outputs.version }}",
-          "target": "${{ inputs.target }}",
+          "target": "${{ inputs.api-target }}",
           "filename": "${{ inputs.destination-filename }}",
           "secret": "${{ inputs.api-secret }}"
         }'
diff --git a/.github/workflows/node.yaml b/.github/workflows/node.yaml
index a6bfccd..ec46d9e 100644
--- a/.github/workflows/node.yaml
+++ b/.github/workflows/node.yaml
@@ -47,14 +47,14 @@ jobs:
 
           source-filename: ${{ steps.filenames.outputs.sourcename }}
           destination-filename: ${{ steps.filenames.outputs.targetname }}
-          host: ${{ secrets.S3_HOST }}
-          bucket: ${{ secrets.S3_BUCKET }}/companion-satellite
-          access-key: ${{ secrets.S3_KEY }}
-          secret-key: ${{ secrets.S3_SECRET }}
+          s3-host: ${{ secrets.S3_HOST }}
+          s3-bucket: ${{ secrets.S3_BUCKET }}/companion-satellite
+          s3-access-key: ${{ secrets.S3_KEY }}
+          s3-secret-key: ${{ secrets.S3_SECRET }}
 
-          product: companion-satellite
-          target: 'linux-tgz'
-          secret: ${{ secrets.BITFOCUS_API_PROJECT_SECRET }}
+          api-product: companion-satellite
+          api-target: 'linux-tgz'
+          api-secret: ${{ secrets.BITFOCUS_API_PROJECT_SECRET }}
 
   Windows-x64:
     runs-on: windows-latest
@@ -95,14 +95,14 @@ jobs:
 
           source-filename: ${{ steps.filenames.outputs.sourcename }}
           destination-filename: ${{ steps.filenames.outputs.targetname }}
-          host: ${{ secrets.S3_HOST }}
-          bucket: ${{ secrets.S3_BUCKET }}/companion-satellite
-          access-key: ${{ secrets.S3_KEY }}
-          secret-key: ${{ secrets.S3_SECRET }}
+          s3-host: ${{ secrets.S3_HOST }}
+          s3-bucket: ${{ secrets.S3_BUCKET }}/companion-satellite
+          s3-access-key: ${{ secrets.S3_KEY }}
+          s3-secret-key: ${{ secrets.S3_SECRET }}
 
-          product: companion-satellite
-          target: 'win-x64'
-          secret: ${{ secrets.BITFOCUS_API_PROJECT_SECRET }}
+          api-product: companion-satellite
+          api-target: 'win-x64'
+          api-secret: ${{ secrets.BITFOCUS_API_PROJECT_SECRET }}
 
   Mac-x64:
     runs-on: macos-latest
@@ -148,11 +148,11 @@ jobs:
 
           source-filename: ${{ steps.filenames.outputs.sourcename }}
           destination-filename: ${{ steps.filenames.outputs.targetname }}
-          host: ${{ secrets.S3_HOST }}
-          bucket: ${{ secrets.S3_BUCKET }}/companion-satellite
-          access-key: ${{ secrets.S3_KEY }}
-          secret-key: ${{ secrets.S3_SECRET }}
-
-          product: companion-satellite
-          target: 'mac-x64'
-          secret: ${{ secrets.BITFOCUS_API_PROJECT_SECRET }}
+          s3-host: ${{ secrets.S3_HOST }}
+          s3-bucket: ${{ secrets.S3_BUCKET }}/companion-satellite
+          s3-access-key: ${{ secrets.S3_KEY }}
+          s3-secret-key: ${{ secrets.S3_SECRET }}
+
+          api-product: companion-satellite
+          api-target: 'mac-x64'
+          api-secret: ${{ secrets.BITFOCUS_API_PROJECT_SECRET }}