rudimentary s3 upload tools in rust. Needs lots of work

mayo · Sep 2, 2024 · 4b60bb5 · 4b60bb5
1 parent ac5f1e8
commit 4b60bb5
Show file tree

Hide file tree

Showing 13 changed files with 2,757 additions and 27 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,15 +22,24 @@ jobs:
         with:
           tool: zola
 
+      - name: Build site tools
+        run: cd tools/deploy_aws_s3 && cargo build --verbose
+
       - name: Build site
         run: make build
 
-      - name: Save artifact
+      - name: Save website artifact
         uses: actions/upload-artifact@v4
         with:
           name: website-${{ github.ref_name }}
           path: public/
 
+      - name: Save tools artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: deploy_aws_s3
+        path: tools/deploy_aws_s3/target/*/deploy_aws_s3
+
   call-deploy-workflow:
     uses: ./.github/workflows/deploy.yml
     needs: build

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -25,21 +25,30 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - name: Download the build artifact
+      - name: Download website artifact
         uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.artifact-name }}
           path: public
 
+      - name: Download tools artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: deploy_aws_s3
+          path: tools/deploy_aws_s3
+
       - uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.AWS_IAM_ROLE_GITHUB }}
           role-session-name: GitHub-Action-Role
           aws-region: ${{ env.AWS_REGION }}
 
-      - name: Upload Artifact to s3
-        run: aws s3 sync --acl public-read --delete public/ s3://${{ env.S3_BUCKET }}/
+      - name: Upload website to S3
+        #run: aws s3 sync --acl public-read --delete public/ s3://${{ env.S3_BUCKET }}/
+        run: tools/deploy_aws_s3 --bucket ${{ env.S3_BUCKET }} public/ -v -a public-read -d
 
-
-#  invalidate-cache:
-#    runs-on: ubuntu-latest
+  invalidate-cache:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Foo
+        uses: foo
diff --git a/templates/_nav_extra.html b/templates/_nav_extra.html
@@ -4,10 +4,7 @@
     <li><a href="/#slide{{ loop.index0 }}">{{ slide.title }}</a></li>
     {% endfor %}
 </ul>
-<ul class="nav-group about">
-    <li>{{ config.extra.author.name }}</li>
-    <li><i class="fa inline icon fa-globe-americas" title="Location"></i><span class="sr-only">Location</span><span class="p-locality">Vancouver</span>, <span class="p-region">BC</span>, <span class="p-country-name">Canada</span></li>
-    <li><i class="fa inline icon fa-envelope" title="Email"></i><span class="sr-only">Email</span><a href="mailto:{{ config.extra.author.email }}" class="u-email">{{ config.extra.author.email | safe }}</a></li>
-    <li><i class="fa inline icon fa-broadcast-tower" title="Callsign"></i><span class="sr-only">Callsign</span><span>{{ config.extra.author.callsign }}</span></li>
-    <li><i class="fa inline icon fa-key" title="GPG fingerprint"></i><span class="sr-only">GPG fingerprint</span><a rel="me" href="{{ get_url(path="@/pubkey.md") | safe }}" class="hex-string">{{ macros::render_hex(value=config.extra.pubkey.fingerprint | slice(start=-4)) }}</a></li>
-</ul>
+<div class="nav-group about">
+    <span>{{ config.extra.author.name }}</span>
+    {% include "_personal_meta.html" %}
+  </div>
diff --git a/templates/_personal_meta.html b/templates/_personal_meta.html
@@ -0,0 +1,13 @@
+<dl class="key-value-table">
+    <dt><i class="fa inline icon fa-globe-americas" title="Location"></i><span class="sr-only">Location</span></dt>
+    <dd><span class="p-locality">Vancouver</span>, <span class="p-region">BC</span>, <span class="p-country-name">Canada</span></dd>
+
+    <dt><i class="fa inline icon fa-envelope" title="Email"></i><span class="sr-only">Email</span></dt>
+    <dd><a href="mailto:mayo@oyam.ca" class="u-email">{{ config.extra.author.email | safe}}</a></dd>
+
+    <dt><i class="fa inline icon fa-broadcast-tower" title="Callsign"></i><span class="sr-only">Callsign</span></dt>
+    <dd><span>{{ config.extra.author.callsign }}</span></dd>
+
+    <dt><i class="fa inline icon fa-key" title="GPG fingerprint"></i><span class="sr-only">GPG fingerprint</span></dt>
+    <dd><a rel="me" href="{{ get_url(path="@/pubkey.md") | safe }}" class="hex-string">{{ macros::render_hex(value=config.extra.pubkey.fingerprint | slice(start=-4)) }}</a></dd>
+</dl>
diff --git a/templates/about.html b/templates/about.html
@@ -6,19 +6,7 @@
     <li class="main"><a href="{{ config.extra.base_url | safe }}{{ get_url(path='@/about/index.md') }}" class="name p-name u-url">Mayo Jordanov</a><br/><span class="tag p-note">Creative Solutions</a></li>
   </ul>
 
-  <dl class="key-value-table">
-    <dt><i class="fa inline icon fa-globe-americas" title="Location"></i><span class="sr-only">Location</span></dt>
-    <dd><span class="p-locality">Vancouver</span>, <span class="p-region">BC</span>, <span class="p-country-name">Canada</span></dd>
-
-    <dt><i class="fa inline icon fa-envelope" title="Email"></i><span class="sr-only">Email</span></dt>
-    <dd><a href="mailto:mayo@oyam.ca" class="u-email">{{ config.extra.author.email | safe}}</a></dd>
-
-    <dt><i class="fa inline icon fa-broadcast-tower" title="Callsign"></i><span class="sr-only">Callsign</span></dt>
-    <dd><span>{{ config.extra.author.callsign }}</span></dd>
-
-    <dt><i class="fa inline icon fa-key" title="GPG fingerprint"></i><span class="sr-only">GPG fingerprint</span></dt>
-    <dd><a rel="me" href="{{ get_url(path="@/pubkey.md") | safe }}" class="hex-string">{{ macros::render_hex(value=config.extra.pubkey.fingerprint | slice(start=-4)) }}</a></dd>
-  </dl>
+  {% include "_personal_meta.html" %}
 </p>
 
 <p class="social">