Merge pull request #196 from teaxyz/bugfix-new-image-loading-strategy

#195 rely completely in packages.json data for images

.github/sync-thumb-images.sh

@@ -1,9 +1,12 @@
 #!/bin/bash
+# update packages.json data with relative thumb image url path
+# rebuild pages
+# download images from www.tea.xyz/Images/packages to 
+
 # cmd: $ ./prepare-thumb-images.sh srcJson targetPath
 # sample:  $ .github/prepare-thumb-images.sh src/data/packages.json src/static/Images/packages/
 
 # create packages folder: where airtable images will be DLd
-mkdir -p ./packages_thumbs_images
 packages="cat $1"
 temp_packages="./src/data/temp.json"
 cp $1 $temp_packages
@@ -11,16 +14,15 @@ for row in $($packages | jq -r '.[] | @base64'); do
     _jq() {
       echo ${row} | base64 --decode | jq -r ${1}
     }
-
     dl_url=$(_jq '.thumb_image_url')
-    if [[ $dl_url == *"airtable"* ]]; then
+    if [[ $dl_url == *"tea.xyz"* ]]; then
         filename=$(basename -- "$dl_url")
         extension="${filename##*.}"
         filename="${filename%.*}"
         slug=$(_jq '.slug')
-        outputPath=$2/$(_jq '.slug').$extension
-        new_thumb_image_url="https://tea.xyz/Images/packages/$slug.jpg"
-        curl $dl_url -o ./packages_thumbs_images/$slug.jpg
+
+        new_thumb_image_url="/Images/packages/$filename.$extension"
+
         updated_packages=$(jq '(.[] | select(.slug == "'$slug'") | .thumb_image_url) |= "'$new_thumb_image_url'"' ./src/data/temp.json)
         echo $updated_packages > $temp_packages
         echo "update $slug"

.github/workflows/cd.yml

@@ -39,21 +39,6 @@ jobs:
       with:
         cmd: '.github/build-package-pages.sh src/data/packages.json src/content'
 
-    - name: Download package thumbnails from Airtable
-      uses: getneil/jq-action@v1
-      with:
-        cmd: '.github/prepare-thumb-images.sh src/data/packages.json'
-
-    - name: Upload package thumbnails to AWS S3
-      uses: jakejarvis/s3-sync-action@master
-      env:
-        AWS_S3_BUCKET: www.tea.xyz
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        AWS_REGION: 'us-east-1'
-        SOURCE_DIR: 'packages_thumbs_images'
-        DEST_DIR: 'Images/packages'
-
     - run: .github/mk-pantry-accessible.sh ${{ secrets.TEMP_JACOBS_GITHUB_PAT }}
     - uses: teaxyz/setup@v0
       with:
@@ -76,8 +61,6 @@ jobs:
         aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         aws-region: us-east-1
   
-    - run: cp -R packages_thumbs_images public/Images/packages
-  
     # cache-control of 10 mins because we *need* to be able to update
     # this and have people see the results can be fixed well with a static site builder
     - run: |
@@ -85,6 +68,7 @@ jobs:
           --metadata-directive REPLACE \
           --cache-control max-age=600 \
           --exclude '.git/*' --exclude '.github/*' \
+          --exclude 'Images/packages/*' \
           --exclude 'pour.sh' \
           --exclude 'tea.white-paper*.pdf' \
           --exclude '*.md' \

.github/workflows/staging.yml

@@ -47,21 +47,6 @@ jobs:
       with:
         cmd: '.github/build-package-pages.sh src/data/packages.json src/content'
 
-    - name: Download package thumbnails from Airtable
-      uses: getneil/jq-action@v1
-      with:
-        cmd: '.github/prepare-thumb-images.sh src/data/packages.json'
-
-    - name: Upload package thumbnails to AWS S3
-      uses: jakejarvis/s3-sync-action@master
-      env:
-        AWS_S3_BUCKET: www.tea.xyz
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        AWS_REGION: 'us-east-1'
-        SOURCE_DIR: 'packages_thumbs_images'
-        DEST_DIR: 'Images/packages'
-
     - run: .github/mk-pantry-accessible.sh ${{ secrets.TEMP_JACOBS_GITHUB_PAT }}
 
     - uses: teaxyz/setup@v0
@@ -76,6 +61,18 @@ jobs:
       env:
         GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
+    # update packages json data and rebuild again
+    - name: make images relative path to preview site
+      uses: getneil/jq-action@v1
+      with:
+        cmd: '.github/sync-thumb-images.sh src/data/packages.json'
+
+    # intentional to rebuild packages again with relative image data
+    # the first one to test it against prod resources via lychee
+    - uses: teaxyz/setup@v0
+      with:
+        target: build    
+
     - uses: actions/setup-node@v3
       with:
         node-version: 14
@@ -94,6 +91,20 @@ jobs:
       run: yarn deploy
       working-directory: .cdk
 
+    - name: get cdk bucket
+      id: DEPLOY_BUCKET
+      run: |
+        BUCKET=$(aws s3 ls | grep $(echo teaxyz-pr-$GITHUB_REF_SLUG_URL | sed "s/-merge//") | grep -o '[^ ]*$')
+        echo "bucket=$BUCKET" >> $GITHUB_OUTPUT
+
+    - name: cp package images from prod to preview bucket
+      run: |
+        aws s3 cp s3://www.tea.xyz/Images/packages \
+          s3://$NEW_BUCKET/Images/packages \
+          --recursive
+      env:
+        NEW_BUCKET: ${{ steps.DEPLOY_BUCKET.outputs.bucket }}
+
     - name: Seal Deployment
       uses: bobheadxi/deployments@v1
       if: always()