Skip to content

Commit 0964ccc

Browse files
authored
feat: [MC-690] Separate Pocket dev and prod JWK key ids (#361)
* feat: [MC-690] use different keys in Pocket-Dev * chore: use --elv2-license accept in start:dev * chore: fix lint errors in test * wip: try to get test coverage for prod key ids * fix: test for getSigningKeysFromServer mock env * chore: clean up tests * fix: lint errors * fix: try to fix errors in Github superlinter * fix: try to upgrade superlinter eslint * fix: Failed to get [GITHUB_TOKEN] * fix: lint error * fix attempt: secret or public key must be provided Possibly admin-api can't find the key id when it's not cached..? Locally it works fine, but on Pocket-Dev the following error occurs for the same request: Context creation failed: Could not validate User: secret or public key must be provided * fix: NODE_ENV should be development in Pocket-Dev I pulled the latest image from Pocket-Dev and it's set to production # echo $NODE_ENV production * fix: distinguish development (Pocket-Dev) from local dev * chore: re-run checks Required 'Lint Code Base' failed to run. * fix: linter error
1 parent 77741cb commit 0964ccc

14 files changed

+969
-808
lines changed

.aws/src/main.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class AdminAPI extends TerraformStack {
9898
workspaces: {
9999
name: 'incident-management',
100100
},
101-
}
101+
},
102102
);
103103

104104
return new PocketPagerDuty(this, 'pagerduty', {
@@ -147,7 +147,7 @@ class AdminAPI extends TerraformStack {
147147
],
148148
envVars: [
149149
{
150-
name: 'ENVIRONMENT',
150+
name: 'NODE_ENV',
151151
value: process.env.NODE_ENV, // this gives us a nice lowercase production and development
152152
},
153153
{

.github/workflows/linter.yml

+13-8
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,21 @@ jobs:
3636
##########################
3737
# Checkout the code base #
3838
##########################
39-
- name: Checkout Code
40-
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
39+
- name: Checkout code
40+
uses: actions/checkout@v4
41+
with:
42+
# super-linter needs the full git history to get the
43+
# list of files that changed across commits
44+
fetch-depth: 0
4145

4246
##########################
4347
# Github Super Linter needs
4448
# the latest definitions installed
4549
##########################
46-
- name: Use Node.js 16.x
47-
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
50+
- name: Use Node.js 18.x
51+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
4852
with:
49-
node-version: 16.x
53+
node-version: 18.x
5054
# Install our eslint packages.
5155
# We may have custom tsconfigs, eslints that are brought in via a package.
5256
- run: npm install
@@ -55,12 +59,13 @@ jobs:
5559
# Run Linter against code base #
5660
################################
5761
- name: Lint Code Base
58-
59-
# We use the Github super linter, it can be cranky at times, so in that moment here are the docs https://github.com/github/super-linter
60-
uses: docker://ghcr.io/github/super-linter:slim-v4@sha256:80ecaa58ad5f9480c66e3c77af5c955831861a41fb78ce7e0ffb1b443eca0f0f
62+
uses: super-linter/super-linter@v6.0.0 # x-release-please-version
6163

6264
# All Environment variables are defined here https://github.com/github/super-linter#environment-variables
6365
env:
66+
# To report GitHub Actions status checks
67+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
68+
6469
# The name of the repository default branch.
6570
DEFAULT_BRANCH: main
6671

0 commit comments

Comments
 (0)