fix: don't need APPSETTING prefix for App Service

RawkodeAcademy · Jul 20, 2023 · 568eb75 · 568eb75
1 parent 0a3ca5d
commit 568eb75
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 21 deletions.
diff --git a/projects/rawkode.academy/cms/.envrc b/projects/rawkode.academy/cms/.envrc
@@ -3,9 +3,9 @@ op signin --account rawkodeacademy
 export NODE_ENV="dev"
 export CLOUDFLARE_API_TOKEN=op://sa.rawkode.academy/cloudflare/api
 
-export APPSETTING_DNS_NAME="http://localhost:3000"
-export APPSETTING_MONGODB_URI=mongodb://127.0.0.1/cms
-export APPSETTING_PAYLOAD_SECRET=super-secret
-export APPSETTING_OAUTH_BASE_URL="https://github.com"
-export APPSETTING_OAUTH_CLIENT_ID="op://cms.rawkode.academy/GitHub/username"
-export APPSETTING_OAUTH_CLIENT_SECRET="op://cms.rawkode.academy/GitHub/password"
+export DNS_NAME="http://localhost:3000"
+export MONGODB_URI=mongodb://127.0.0.1/cms
+export PAYLOAD_SECRET=super-secret
+export OAUTH_BASE_URL="https://github.com"
+export OAUTH_CLIENT_ID="op://cms.rawkode.academy/GitHub/username"
+export OAUTH_CLIENT_SECRET="op://cms.rawkode.academy/GitHub/password"
diff --git a/projects/rawkode.academy/cms/Dockerfile b/projects/rawkode.academy/cms/Dockerfile
@@ -13,6 +13,9 @@ FROM base as build
 RUN pnpm install @swc/core
 
 COPY . .
+# Needed for build, not production
+ENV DNS_NAME http://localhost:3000
+
 RUN pnpm run build
 
 FROM base

diff --git a/projects/rawkode.academy/cms/deploy/main.ts b/projects/rawkode.academy/cms/deploy/main.ts
@@ -128,7 +128,7 @@ class MyStack extends TerraformStack {
  {
  keyVaultId: keyVault.id,
  name: "github-client-secret",
- value: process.env.APPSETTING_GITHUB_CLIENT_SECRET || "",
+ value: process.env.OAUTH_CLIENT_SECRET || "<MISSING>",
  },
  );
 
@@ -145,16 +145,15 @@ class MyStack extends TerraformStack {
  siteConfig: {
  alwaysOn: true,
  applicationStack: {
- dockerRegistryUrl: "https://ghcr.io",
- dockerImageName: "rawkodeacademy/cms",
+ dockerImageName: "ghcr.io/rawkodeacademy/cms:latest",
  },
  },
  appSettings: {
  WEBSITES_PORT: "3000",
- DNS_NAME: "https://cms.rawkode.academy",
+ DNS_NAME: "https://cms.rawkode.academy",
  MONGODB_URI: Fn.element(cosmosDbAccount.connectionStrings, 0),
- OAUTH_BASE_URL: process.env.APPSETTING_OAUTH_BASE_URL || "",
- OAUTH_CLIENT_ID: process.env.APPSETTING_OAUTH_CLIENT_ID || "",
+ OAUTH_BASE_URL: process.env.OAUTH_BASE_URL || "",
+ OAUTH_CLIENT_ID: process.env.OAUTH_CLIENT_ID || "",
  OAUTH_CLIENT_SECRET: `@Microsoft.KeyVault(SecretUri=${azureGitHubClientSecret.versionlessId})`,
  PAYLOAD_SECRET: `@Microsoft.KeyVault(SecretUri=${azurePayloadSecret.versionlessId})`,
  },

diff --git a/projects/rawkode.academy/cms/src/payload.config.ts b/projects/rawkode.academy/cms/src/payload.config.ts
@@ -24,7 +24,7 @@ const allCollections: CollectionConfig[] = [
 ];
 
 export default buildConfig({
- serverURL: process.env.APPSETTING_DNS_NAME,
+ serverURL: process.env.DNS_NAME,
  debug: process.env.NODE_ENV === "production" ? false : true,
  admin: {
  user: People.slug,
@@ -39,13 +39,13 @@ export default buildConfig({
  },
  plugins: [
  oAuthPlugin({
- clientID: process.env.APPSETTING_OAUTH_CLIENT_ID,
- clientSecret: process.env.APPSETTING_OAUTH_CLIENT_SECRET,
- authorizationURL: `${process.env.APPSETTING_OAUTH_BASE_URL}/login/oauth/authorize`,
- tokenURL: `${process.env.APPSETTING_OAUTH_BASE_URL}/login/oauth/access_token`,
- callbackURL: `${process.env.APPSETTING_DNS_NAME}/oauth2/callback`,
+ clientID: process.env.OAUTH_CLIENT_ID,
+ clientSecret: process.env.OAUTH_CLIENT_SECRET,
+ authorizationURL: `${process.env.OAUTH_BASE_URL}/login/oauth/authorize`,
+ tokenURL: `${process.env.OAUTH_BASE_URL}/login/oauth/access_token`,
+ callbackURL: `${process.env.DNS_NAME}/oauth2/callback`,
  scope: "basic",
- mongoUrl: process.env.APPSETTING_MONGODB_URI,
+ mongoUrl: process.env.MONGODB_URI,
  userCollection: {
  slug: People.slug,
  },

diff --git a/projects/rawkode.academy/cms/src/server.ts b/projects/rawkode.academy/cms/src/server.ts
@@ -12,8 +12,8 @@ const start = async () => {
  console.debug(process.env);
 
  await payload.init({
- secret: process.env.APPSETTING_PAYLOAD_SECRET,
- mongoURL: process.env.APPSETTING_MONGODB_URI,
+ secret: process.env.PAYLOAD_SECRET,
+ mongoURL: process.env.MONGODB_URI,
  express: app,
  onInit: async () => {
  payload.logger.info(`Payload Admin URL: ${payload.getAdminURL()}`);