Skip to content

Commit

Permalink
Update workflows, configs, and scripts for new API keys
Browse files Browse the repository at this point in the history
  • Loading branch information
sjoerdbeentjes committed Oct 3, 2024
1 parent 38588a5 commit 87361bf
Show file tree
Hide file tree
Showing 8 changed files with 81 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main-migrations.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Main migrations
name: Deploy production

on:
pull_request:
Expand Down
69 changes: 68 additions & 1 deletion .github/workflows/staging-migrations.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Staging migrations
name: Deploy staging

on:
pull_request:
Expand Down Expand Up @@ -43,3 +43,70 @@ jobs:
DATO_API_KEY_OPENEARTH_DATA_VIEWER: ${{ secrets.DATO_API_KEY_OPENEARTH_DATA_VIEWER }}
DATO_API_KEY_NL2120: ${{ secrets.DATO_API_KEY_NL2120 }}
run: npm run migrations:apply-staging

prepare:
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: "20"

- name: Install dependencies
run: npm install --force

- name: Set matrix data
id: set-matrix
run: |
instances=$(node -e 'console.log(JSON.stringify(require("./config/dato/instances.js").instances))')
echo "matrix=$(echo $instances | jq -c '.')" >> $GITHUB_OUTPUT
echo "matrix is set to: $instances"
deploy-application:
needs: prepare
runs-on: ubuntu-latest
strategy:
matrix:
include: ${{ fromJson(needs.prepare.outputs.matrix) }}
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: "20"

- name: Install dependencies
run: npm install --force

- name: Build application
run: NODE_OPTIONS="--openssl-legacy-provider" npm run build
env:
DATO_API_KEY_OPENEARTH_RWS_VIEWER: ${{ secrets.DATO_API_KEY_OPENEARTH_RWS_VIEWER }}
DATO_API_KEY_OPENEARTH_DATA_VIEWER: ${{ secrets.DATO_API_KEY_OPENEARTH_DATA_VIEWER }}
DATO_API_KEY_NL2120: ${{ secrets.DATO_API_KEY_NL2120 }}
DATO_INSTANCE_CURRENT: ${{ matrix.name }}
DATO_ENVIRONMENT: staging
VUE_APP_MAPBOX_TOKEN: ${{ secrets.VUE_APP_MAPBOX_TOKEN }}
VUE_APP_API_ENDPOINT: ${{ secrets.VUE_APP_API_ENDPOINT }}
VUE_APP_AQUADESK_KEY: ${{ secrets.VUE_APP_AQUADESK_KEY }}
VUE_APP_PIWIK_CONTAINER_ID: ${{ secrets.VUE_APP_PIWIK_CONTAINER_ID }}
VUE_APP_WMR_KEY: ${{ secrets.VUE_APP_WMR_KEY }}
DEEPL_KEY: ${{ secrets.DEEPL_KEY }}

- name: Deploy to Netlify
uses: nwtgck/[email protected]
with:
publish-dir: "./dist"
production-branch: main
github-token: ${{ secrets.GITHUB_TOKEN }}
deploy-message: Preview deployment for ${{ matrix.name }}
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ matrix.netlifySiteId }}
2 changes: 1 addition & 1 deletion config/dato/datocms.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if (!currentInstance) {
throw new Error("No current instance found");
}

const token = currentInstance.key;
const token = currentInstance.datoApiKey;

const endpoint =
process.env.NODE_ENV === 'production'
Expand Down
3 changes: 2 additions & 1 deletion config/dato/instances.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export const instances: Array<{
name: string;
key: string;
datoApiKey: string;
netlifySiteId: string;
}>;
9 changes: 6 additions & 3 deletions config/dato/instances.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,17 @@ dotenv.config();
module.exports.instances = [
{
name: "nl2120",
key: process.env.DATO_API_KEY_NL2120,
datoApiKey: process.env.DATO_API_KEY_NL2120,
netlifySiteId: "1f6372f6-c532-4e0e-bba7-dee08678d518",
},
{
name: "openearth-data-viewer",
key: process.env.DATO_API_KEY_OPENEARTH_DATA_VIEWER,
datoApiKey: process.env.DATO_API_KEY_OPENEARTH_DATA_VIEWER,
netlifySiteId: "1785f3f6-b4cf-42de-bea6-b57d48a5c664",
},
{
name: "openearth-rws-viewer",
key: process.env.DATO_API_KEY_OPENEARTH_RWS_VIEWER,
datoApiKey: process.env.DATO_API_KEY_OPENEARTH_RWS_VIEWER,
netlifySiteId: "119b8ff3-5b22-4995-b43b-b31f21ba77c3",
},
];
2 changes: 1 addition & 1 deletion scripts/dato/apply-main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ async function main() {
for (const instance of instances) {
console.log(`Managing environments for ${instance.name}`);

const client = new DatoClient(instance.key);
const client = new DatoClient(instance.datoApiKey);

await client.runCommand(["maintenance:on"]);

Expand Down
2 changes: 1 addition & 1 deletion scripts/dato/apply-staging.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ async function main() {
for (const instance of instances) {
console.log(`Setting up staging environment for ${instance.name}`);

const client = new DatoClient(instance.key);
const client = new DatoClient(instance.datoApiKey);

const existingEnvironments = await client.listEnvironments();

Expand Down
2 changes: 1 addition & 1 deletion scripts/dato/create.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if (!currentInstance) {
throw new Error("No current instance found");
}

const apiKey = currentInstance.key;
const apiKey = currentInstance.datoApiKey;
const client = new DatoClient(apiKey);

const promptGet = promisify(prompt.get);
Expand Down

0 comments on commit 87361bf

Please sign in to comment.