- Change any invalid/flagged feed code to use supabase

.github/workflows/docker-build-and-push.yml

@@ -47,6 +47,11 @@ on:
         required: false
         default: 'https://dev.api.telescope.cdot.systems/v1/status'
         type: string
+      dependency_discovery_url:
+        description: 'The feed-discovery microservice URL (defaults to staging)'
+        required: false
+        default: 'https://dev.api.telescope.cdot.systems/v1/dependency-discovery'
+        type: string
       supabase_url:
         description: 'The Supabase URL'
         required: false
@@ -93,6 +98,7 @@ jobs:
               GIT_COMMIT=${{ github.sha }}
               SUPABASE_URL=${{ inputs.supabase_url }}
               ANON_KEY=${{ inputs.anon_key }}
+              DEPENDENCY_DISCOVERY_URL=${{ inputs.dependency_discovery_url }}
           - context: src/api/planet
             image: planet
           - context: src/api/posts

.github/workflows/eslint-ci.yml

@@ -27,4 +27,4 @@ jobs:
       - name: Install dependencies and run eslint
         run: |
           pnpm install
-          pnpm turbo run lint --api="http://127.0.0.1:9080" --token="${{ env.SERVER_TOKEN }}"
+          pnpm turbo run lint --api="http://127.0.0.1:9080" --token="${{ env.SERVER_TOKEN }}" --team="telescope-admins"

.github/workflows/release.yml

@@ -22,6 +22,7 @@ jobs:
       search_url: 'https://api.telescope.cdot.systems/v1/search'
       feed_discovery_url: 'https://api.telescope.cdot.systems/v1/feed-discovery'
       status_url: 'https://api.telescope.cdot.systems/v1/status'
+      dependency_discovery_url: 'https://api.telescope.cdot.systems/v1/dependency-discovery'
       supabase_url: 'https://api.telescope.cdot.systems/v1/supabase'
       anon_key: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyAgCiAgICAicm9sZSI6ICJhbm9uIiwKICAgICJpc3MiOiAic3VwYWJhc2UiLAogICAgImlhdCI6IDE2NDg2MTI4MDAsCiAgICAiZXhwIjogMTgwNjM3OTIwMAp9.YMOYR_8pZqqDRJkoAFuEWp-FaQfvmHXTOXKncBlRjdE'
     secrets:

.github/workflows/unit-tests-ci.yml

@@ -31,4 +31,4 @@ jobs:
       - name: Install dependencies and run tests with default env
         run: |
           pnpm install
-          pnpm turbo run test --api="http://127.0.0.1:9080" --token="${{ env.SERVER_TOKEN }}"
+          pnpm turbo run test --api="http://127.0.0.1:9080" --token="${{ env.SERVER_TOKEN }}" --team="telescope-admins"

config/ec2-template.yml

@@ -0,0 +1,89 @@
+AWSTemplateFormatVersion: 2010-09-09
+
+# https://telescope.cdot.systems/docs/getting-started/vscode-ssh
+Description: Telescope EC2 VSCode SSH Development Environment
+
+Parameters:
+  ImageId:
+    Type: AWS::EC2::Image::Id
+    Default: ami-0c02fb55956c7d316
+    Description: EC2 Image ID, defaults to Amazon Linux 2 AMI (HVM) - Kernel 5.10, SSD Volume Type - ami-0c02fb55956c7d316 (64-bit x86)
+
+  KeyName:
+    Type: AWS::EC2::KeyPair::KeyName
+    Default: vockey # Default key in Vocareum
+
+  MyIp:
+    Type: String
+    Description: Your home IP address (use http://checkip.amazonaws.com/ to check)`
+
+  StorageSize:
+    Type: Number
+    Default: 40
+    Description: Amount of storage (GiB) attached to instance
+
+Resources:
+  Ec2Instance:
+    Type: AWS::EC2::Instance
+    Properties:
+      InstanceType: r5.large
+      ImageId: !Ref ImageId
+      IamInstanceProfile: LabInstanceProfile
+      KeyName: !Ref KeyName
+      SecurityGroups:
+        - !Ref SecurityGroup
+      BlockDeviceMappings:
+        - DeviceName: /dev/xvda
+          Ebs:
+            VolumeSize: !Ref StorageSize
+      # TODO: could also pass a file via `--user-data file://script.sh`
+      UserData: !Base64 |
+        #!/bin/bash
+        sudo yum update -y
+        # Install docker
+        sudo amazon-linux-extras install docker
+        sudo service docker start
+        sudo systemctl enable docker
+        sudo usermod -a -G docker ec2-user
+        # Install Node.js
+        curl -sL https://rpm.nodesource.com/setup_lts.x | sudo bash -
+        sudo yum install -y nodejs
+        # Install pnpm
+        sudo npm install -g pnpm
+        # Install git
+        sudo yum install -y git
+        # Install GitHub CLI
+        sudo yum install -y https://github.com/cli/cli/releases/download/v2.7.0/gh_2.7.0_linux_amd64.rpm
+
+  SecurityGroup:
+    Type: AWS::EC2::SecurityGroup
+    Properties:
+      GroupDescription: Telescope SSH (22) and Web Access (80)
+      GroupName: telescope-sg
+      SecurityGroupIngress:
+        - IpProtocol: tcp
+          FromPort: 22
+          ToPort: 22
+          CidrIp: !Sub ${MyIp}/32
+        - IpProtocol: tcp
+          FromPort: 22
+          ToPort: 22
+          # Also allow EC2 Connect (e.g., from console) for us-east-1
+          CidrIp: 18.206.107.24/29
+        - IpProtocol: tcp
+          FromPort: 80
+          ToPort: 80
+          CidrIp: !Sub ${MyIp}/32
+
+  EIP:
+    Type: AWS::EC2::EIP
+    Properties:
+      InstanceId: !Ref Ec2Instance
+
+Outputs:
+  PublicDnsName:
+    Value: !GetAtt Ec2Instance.PublicDnsName
+    Description: Public DNS for EC2 instance
+  PublicIp:
+    Value: !GetAtt Ec2Instance.PublicIp
+    Description: Public IP Address for EC2 instance

docker/development.yml

@@ -16,19 +16,6 @@ services:
       context: ../src/web
       cache_from:
         - docker.cdot.systems/nginx:buildcache
-      # next.js needs build-time access to a number of API URL values, forward as ARGs
-      args:
-        # Web front-end URL
-        - WEB_URL=${WEB_URL}
-        # Telescope 1.0 API URL
-        - API_URL=${API_URL}
-        # Telescope 2.0 Microservice URLs
-        - IMAGE_URL=${IMAGE_URL}
-        - SSO_URL=${SSO_URL}
-        - POSTS_URL=${POSTS_URL}
-        - SEARCH_URL=${SEARCH_URL}
-        - FEED_DISCOVERY_URL=${FEED_DISCOVERY_URL}
-        - STATUS_URL=${STATUS_URL}
     volumes:
       - ../config/nginx.conf.development.template:/etc/nginx/nginx.conf
     ports:
@@ -94,7 +81,7 @@ services:
       # In development and testing, the SSO service needs to contact the Supabase
       # service directly via Docker vs through the http://localhost/v1/supabase domain.
       # Using staging database
-      - SUPABASE_URL=https://dev.api.telescope.cdot.systems/v1/supabase
+      - SUPABASE_URL=http://kong:8000
     depends_on:
       - elasticsearch
       - traefik

docker/docker-compose.yml

@@ -265,19 +265,20 @@ services:
       # next.js needs build-time access to a number of API URL values, forward as ARGs
       args:
         # Web front-end URL
-        - WEB_URL=${WEB_URL}
+        - WEB_URL
         # Telescope 1.0 API URL
-        - API_URL=${API_URL}
+        - API_URL
         # Telescope 2.0 Microservice URLs
-        - IMAGE_URL=${IMAGE_URL}
-        - SSO_URL=${SSO_URL}
-        - POSTS_URL=${POSTS_URL}
-        - SEARCH_URL=${SEARCH_URL}
-        - FEED_DISCOVERY_URL=${FEED_DISCOVERY_URL}
-        - STATUS_URL=${STATUS_URL}
-        - GIT_COMMIT=${GIT_COMMIT}
-        - SUPABASE_URL=${SUPABASE_URL}
-        - ANON_KEY=${ANON_KEY}
+        - IMAGE_URL
+        - SSO_URL
+        - POSTS_URL
+        - SEARCH_URL
+        - FEED_DISCOVERY_URL
+        - STATUS_URL
+        - GIT_COMMIT
+        - SUPABASE_URL
+        - ANON_KEY
+        - DEPENDENCY_DISCOVERY_URL
     container_name: 'nginx'
     environment:
       - TELESCOPE_HOST

docker/production.yml

@@ -19,18 +19,6 @@ services:
     build:
       context: ..
       dockerfile: Dockerfile
-      # next.js needs build-time access to a number of API URL values, forward as ARGs
-      args:
-        # Web front-end URL
-        - WEB_URL=${WEB_URL}
-        # Telescope 1.0 API URL
-        - API_URL=${API_URL}
-        # Telescope 2.0 Microservice URLs
-        - IMAGE_URL=${IMAGE_URL}
-        - SSO_URL=${SSO_URL}
-        - POSTS_URL=${POSTS_URL}
-        - SEARCH_URL=${SEARCH_URL}
-        - FEED_DISCOVERY_URL=${FEED_DISCOVERY_URL}
     container_name: 'telescope'
     restart: unless-stopped
     environment:

jest-playwright.config.js

@@ -8,5 +8,9 @@ module.exports = {
     // slowMo: 1000,
     headless: true,
   },
-  browsers: ['chromium', 'firefox', 'webkit'],
+  browsers: [
+    /* 'chromium' - chromium disabled until we fix https://github.com/Seneca-CDOT/telescope/issues/3504 */
+    'firefox',
+    'webkit',
+  ],
 };

package.json

@@ -13,9 +13,11 @@
     "build": "pnpm turbo run build",
     "dev": "pnpm dev --prefix src/web/app --",
     "develop": "pnpm dev",
-    "eslint": "TIMING=1 eslint --config .eslintrc.js --ignore-path .gitignore \"./src/backend/**/*.js\" \"./test/**/*.js\"",
+    "eslint": "eslint --config .eslintrc.js --ignore-path .gitignore \"./src/backend/**/*.js\" \"./test/**/*.js\"",
+    "eslint-time": "TIMING=1 eslint --config .eslintrc.js --ignore-path .gitignore \"./src/backend/**/*.js\" \"./test/**/*.js\"",
     "eslint-fix": "eslint --config .eslintrc.js --ignore-path .gitignore \"./src/backend/**/*.js\" \"./test/**/*.js\" --fix",
     "lint": "pnpm turbo run lint && pnpm eslint",
+    "lint-time": "pnpm turbo run lint-time && pnpm eslint-time",
     "clean": "pnpm turbo run clean && pnpm -r exec rm -rf node_modules",
     "prettier": "prettier --write \"./**/*.{md,jsx,json,html,css,js,yml,ts,tsx}\"",
     "prettier-check": "prettier --check \"./**/*.{md,jsx,json,html,css,js,yml,ts,tsx}\"",
@@ -49,8 +51,8 @@
   },
   "homepage": "https://github.com/Seneca-CDOT/telescope#readme",
   "dependencies": {
-    "@bull-board/api": "3.10.3",
-    "@bull-board/express": "3.10.3",
+    "@bull-board/api": "3.10.4",
+    "@bull-board/express": "3.10.4",
     "@elastic/elasticsearch": "7.16.0",
     "@elastic/elasticsearch-mock": "0.3.1",
     "@wordpress/wordcount": "2.15.2",