Login to docker and try to fix virustotal curl commands (stripe#606)

NEMRAKA · Mar 12, 2021 · bdcc8d0 · bdcc8d0
1 parent dbc4d53
commit bdcc8d0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -32,6 +32,13 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
+      -
+        name: Docker Login
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: |
+          echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
@@ -43,8 +50,6 @@ jobs:
           args: release -f .goreleaser/linux.yml --rm-dist
         env:
           GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
       - name: Upload to Bintray
         run: |
           scripts/publish-deb-to-bintray.sh

diff --git a/.goreleaser/linux.yml b/.goreleaser/linux.yml
@@ -48,9 +48,8 @@ nfpms:
 dockers:
   - goos: linux
     goarch: amd64
-    binaries:
+    ids:
       - stripe
-    builds:
       - stripe-linux
     image_templates:
       - "stripe/stripe-cli:latest"

diff --git a/scripts/upload-zip-to-virustotal.sh b/scripts/upload-zip-to-virustotal.sh
@@ -29,7 +29,7 @@ setVersion () {
 
 downloadWindowsArtifacts() {
   echo "Dowloading Windows artifacts..."
-  FILES=$(curl -s https://api.github.com/repos/stripe/stripe-cli/releases/latest -u $GITHUB_TOKEN: \
+  FILES=$(curl -s "https://api.github.com/repos/stripe/stripe-cli/releases/latest" -u $GITHUB_TOKEN: \
 | jq -r ".assets[].browser_download_url" \
 | grep "windows")
   echo "$FILES"
@@ -55,7 +55,7 @@ virustotalUpload () {
 
     echo "Uploading to VirusTotal..."
 
-    RESPONSE=$(curl -s https://www.virustotal.com/vtapi/v2/file/scan -X POST -F "apikey=$VIRUSTOTAL_API_KEY" -F "file=@./stripe.exe" -w "HTTPSTATUS:%{http_code}")
+    RESPONSE=$(curl -s "https://www.virustotal.com/vtapi/v2/file/scan" -X POST -F "apikey=$VIRUSTOTAL_API_KEY" -F "file=@./stripe.exe" -w "HTTPSTATUS:%{http_code}")
     BODY=$(echo $RESPONSE | sed -e 's/HTTPSTATUS\:.*//g')
     RESPONSE_CODE=$(echo $RESPONSE | tr -d '\n' | sed -e 's/.*HTTPSTATUS://')
 
@@ -69,7 +69,7 @@ virustotalUpload () {
     echo "Adding comment..."
 
     SHA256=$(echo $BODY | jq -r ".sha256")
-    RESPONSE_CODE=$(curl https://www.virustotal.com/vtapi/v2/comments/put -X POST -d "apikey=$VIRUSTOTAL_API_KEY" -d "resource=$SHA256" -d "comment=Stripe CLI $VERSION, uncompressed from $i" -o /dev/null -w "%{http_code}")
+    RESPONSE_CODE=$(curl "https://www.virustotal.com/vtapi/v2/comments/put" -X POST -d "apikey=$VIRUSTOTAL_API_KEY" -d "resource=$SHA256" -d "comment=Stripe CLI $VERSION, uncompressed from $i" -o /dev/null -w "%{http_code}")
 
     if [[ "$(echo $RESPONSE_CODE | head -c2)" != "20" ]]; then
       echo "Unable to add comment, HTTP response code: $RESPONSE_CODE"