Merge pull request #218 from ritza-co/prometheusConflict

Prometheus conflict

.github/CODEOWNERS

@@ -2,5 +2,5 @@
 # If you need to add codeowners to the repository please add them to the CODEOWNERS file in the scripts/files directory at
 # https://github.com/FusionAuth/fusionauth-public-repos/
 
-* @fusionauth/owners @fusionauth/platform @FusionAuth/developer-relations-admins @FusionAuth/website-admins @FusionAuth/developer-relations @FusionAuth/developers @FusionAuth/customer-support
+* @fusionauth/owners @fusionauth/platform @FusionAuth/developer-relations-admins @FusionAuth/website-admins @FusionAuth/developer-relations @FusionAuth/developers @FusionAuth/customer-support @FusionAuth/marketing
 .github/ @fusionauth/owners @fusionauth/platform @FusionAuth/website-admins

.github/workflows/dev-astro.yml

@@ -1,6 +1,5 @@
-# Sample workflow for building and deploying an Astro site to GitHub Pages
 #
-# To get started with Astro see: https://docs.astro.build/en/getting-started/
+# Build the astro-based artifacts and deploy them to the dev website S3 bucket
 #
 name: Dev astro deployment
 env:
@@ -9,11 +8,15 @@ env:
   AWS_REGION: "us-east-2"
 on:
   # Runs on pushes targeting the default branch
-  push:
-    branches: ["release/1.53.0"]
+  # push:
+  #   branches: ["release/1.53.0"]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
+    inputs:
+      branch:
+        required: true
+        type: string
 
 permissions:
   id-token: write # Used to get an access token, which is then used to assume an AWS IAM role
@@ -36,8 +39,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.branch }}
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ env.PUBLISHER_ROLE_ARN }}
           role-session-name: site_publisher_session
@@ -53,8 +58,4 @@ jobs:
       - name: CloudFront request handler and cache invalidation
         working-directory: .
         run: |
-          CLOUDFRONT_FUNCTION_ETAG=$(aws cloudfront describe-function --name fusionauth-website-request-handler --query 'ETag' --output text)
-          CLOUDFRONT_FUNCTION_ETAG=$(aws cloudfront update-function --name fusionauth-website-request-handler --function-code fileb://src/cloudfront/functions/fusionauth-website-request-handler.js --function-config Comment="Request handler for the FusionAuth website",Runtime="cloudfront-js-1.0" --if-match ${CLOUDFRONT_FUNCTION_ETAG} --query 'ETag' --output text)
-          aws cloudfront publish-function --name fusionauth-website-request-handler --if-match ${CLOUDFRONT_FUNCTION_ETAG}
           aws cloudfront create-invalidation --distribution-id ${{ secrets.DEV_DISTRIBUTION_ID }} --paths "/*"
-

.github/workflows/vale.yml

@@ -9,5 +9,5 @@ jobs:
       - uses: actions/checkout@v4
       - uses: errata-ai/vale-action@reviewdog
         with:
-          files: '["astro/src/content"]'
-          fail_on_error: false
+          files: '["astro/src/components","astro/src/content"]'
+          fail_on_error: true

.vale.ini

@@ -11,14 +11,31 @@ astro = md
 BasedOnStyles = Vale, write-good
 BlockIgnores = <RemoteCode ([^>]+)?/>
 TokenIgnores = (?m)^import .+ from [^\n]+$, \
-(?m)^export const .+, \
+(?m)^export const.*, \
+(?m)^image: .*oauth.*, \
+(?m)^tags: .*oauth.*, \
+(?m)^tags: .*ciam.*, \
+(?m)\[[^]]*\]\(.*/apis/.*\), \
+(?m)\[[^]]*\]\(.*-apis-.*\), \
+(?m)\[[^]]*\]\(.*/oauth/.*\), \
+class="[^"]*", \
+img src=\{.*supabase.*\}, \
 <Aside( [^>]+)?>, \
 </Aside>, \
 <InlineField>[^<]+<\/InlineField>, \
 <InlineUIElement>[^<]+<\/InlineUIElement>, \
 <API( [^>]+)?/>, \
 <DockerSpinup( [^>]+)?/>, \
+<OauthIdpOperations( [^>]+)?/>, \
+<LambdaTypeAPI( [^>]+)?/>, \
+<TokenStorageNote( [^>]+)?/>, \
 <Intro( [^>]+)?/>, \
 <LoginArchitecture([^>]+)?/>, \
 <APIField( [^>]+)?>[^<]+<\/APIField>, \
+{[^}]+}, \
+\s\s+mtls:.*, \
+```[^`]*```, \
+(<http[^\n]+>+?), \
 <APIURI( [^>]+)?>[^<]+<\/APIURI>
+
+

DocsDevREADME.md

@@ -1,4 +1,4 @@
-## Running builds
+# Running builds
 Almost all of the content for site now lives under the [astro](./astro) directory and is built by astro. You can run the site by cd-ing into the astro directory and running npm scripts from there or by running savant targets from the top level.
 
 The build targets are
@@ -456,10 +456,11 @@ The main configuration file is located at [`.vale.ini`](./.vale.ini), where we s
 - Right now, we're using [`write-good`](./config/vale/styles/write-good), a collection of simple rules to avoid common mistakes and awkward sentences.
 - We also have a custom vocabulary at [`config/vale/styles/config/vocabularies/FusionAuth/accept.txt`](./config/vale/styles/config/vocabularies/FusionAuth/accept.txt) with known words.
   - Note that this file can use regular expressions to match words in a case-insensitive manner, as described [in their docs](https://vale.sh/docs/topics/vocab/).
+- Anything marked as code (with backticks) is ignored, so if you have a UUID or config string, surrounding it with backticks is a good way to satisfy vale.
 
 ### GitHub Actions
 
-There's [a GitHub Action](./.github/workflows/vale.yml) that runs Vale on added/modified files when opening a pull request. It'll only cover files located at `astro/src/content`, but it won't block merging the PR, as we currently have lots of errors to fix. So, use it as a guide to improve what you are writing.
+There's [a GitHub Action](./.github/workflows/vale.yml) that runs Vale on added/modified files when opening a pull request. It'll only cover files located at `astro/src/content` and `astro/src/components`. It will block merging the PR.
 
 ### Running locally