Merge pull request #30 from Hubs-Foundation/mozilla-branding-removal

[Mozilla Branding Removal] Removes Mozilla branding

Author: Exairnous

.github/workflows/photomnemonic.yml

@@ -3,18 +3,18 @@ name: photomnemonic
 on:
   push:
     branches:
-    paths-ignore: ["README.md"]
+    paths-ignore: ["README.md", "LICENSE"]
   workflow_dispatch:
 env:
   containerName: photomnemonic
 
 jobs:
   turkeyGitops:
-    uses: mozilla/hubs-ops/.github/workflows/turkeyGitops.yml@master
+    uses: Hubs-Foundation/hubs-ops/.github/workflows/turkeyGitops.yml@master
     with:
-      registry: mozillareality
+      registry: hubsfoundation
       push_gcr: true
       # dockerfile: Dockerfile
     secrets:
       DOCKER_HUB_PWD: ${{ secrets.DOCKER_HUB_PWD }}
-      GCP_TURKEYGITOPS_SA_JSON: ${{ secrets.GCP_TURKEYGITOPS_SA_JSON }}
+      GCP_TURKEYGITOPS_SA_JSON: ${{ secrets.GCP_TURKEYGITOPS_SA_JSON }}

Dockerfile

@@ -1,5 +1,4 @@
-# FROM node:lts-alpine
-FROM node:lts-buster
+FROM node:lts-bullseye
 WORKDIR /app
 
 RUN apt-get update && apt-get -y install libnss3 libexpat1
@@ -11,4 +10,4 @@ RUN npm install express
 
 COPY app.js index.js utils.js /app/
 # user nobody
-CMD AWS_LAMBDA_FUNCTION_NAME="turkey" node app.js
+CMD AWS_LAMBDA_FUNCTION_NAME="turkey" node app.js

README.md

@@ -1 +1,2 @@
-AWS Lambda function for taking screenshots of the web
+A Node.js Express server for taking screenshots of the web.
+(Originally an AWS Lambda function)

index.js

@@ -36,8 +36,8 @@ async function screenshot(url) {
     }
     catch (e){
       console.log(e)
-    } 
-    await sleep(500)   
+    }
+    await sleep(500)
     }
 
   console.log("Error failed to produce screenshot")
@@ -50,8 +50,7 @@ module.exports.handler = async function handler(event, context, callback) {
   t0 = new Date().getTime()
 
   const queryStringParameters = event.queryStringParameters || {};
-  const { url = "https://www.mozilla.org"} =
-    queryStringParameters;
+  const { url = "https://hubsfoundation.org/" } = queryStringParameters;
 
   if (!(await urlAllowed(url))) {
     return callback(null, { statusCode: 403, body: "forbidden" });
@@ -66,7 +65,7 @@ module.exports.handler = async function handler(event, context, callback) {
   try {
     const result = await screenshot(url);
     // console.log( "screenshot(url) took: ", new Date().getTime()-t0, "ms")
-    
+
     data = result.data;
     console.log( "data.length: ", data.length)
 

polycosm-publish.sh

@@ -12,7 +12,7 @@ fi
 if [[ -z "$HUBS_OPS_PATH" ]]; then
   echo -e "To use this deploy script, you need to clone out the hubs-ops repo
 
-git clone git@github.com:mozilla/hubs-ops.git
+git clone https://github.com/Hubs-Foundation/hubs-ops.git
 
 Then set HUBS_OPS_PATH to point to the cloned repo."
   exit 1

run-serverless.sh

@@ -17,7 +17,7 @@ fi
 if [[ -z "$HUBS_OPS_PATH" ]]; then
   echo -e "To use this deploy script, you need to clone out the hubs-ops repo
 
-git clone git@github.com:mozilla/hubs-ops.git
+git clone https://github.com/Hubs-Foundation/hubs-ops.git
 
 Then set HUBS_OPS_PATH to point to the cloned repo."
   exit 1

template.yaml

@@ -6,13 +6,13 @@ Description: >
 Metadata:
   AWS::ServerlessRepo::Application:
     Name: photomnemonic
-    Description: Site screenshotter for Hubs Cloud
-    Author: Mozilla
+    Description: Site screenshotter for Hubs
+    Author: Mozilla (Original Author), Hubs Foundation (Current Maintainer)
     SpdxLicenseId: MPL-2.0
     LicenseUrl: LICENSE
     ReadmeUrl: README.md
     SemanticVersion: 0.2.0
-    SourceCodeUrl: https://github.com/mozilla/photomnemonic
+    SourceCodeUrl: https://github.com/Hubs-Foundation/photomnemonic
 
 Parameters:
   PhotomnemonicRoleArn:

test.js

@@ -1,5 +1,5 @@
 const test = require("ava");
-const { urlAllowed } = require("./url-utils");
+const { urlAllowed } = require("./utils");
 
 test("should disallow invalid and internal urls", async t => {
   t.false(await urlAllowed("invalid url"));