Resolved merge conflict by deleting old tutorial file

Author: jhosman

.eslintrc.cjs

@@ -13,7 +13,7 @@ module.exports = {
     babelOptions: { configFile: './.babelrc' },
     sourceType: 'module',
   },
-  ignorePatterns: ['tmp/*', '!/.*', '/.next/', 'script/bookmarklets/*'],
+  ignorePatterns: ['tmp/*', '!/.*', '/.next/', 'script/bookmarklets/*', 'rest-api-description/'],
   rules: {
     'import/no-extraneous-dependencies': ['error', { packageDir: '.' }],
   },

.github/actions-scripts/rendered-content-link-checker.js

@@ -14,15 +14,15 @@ import contextualize from '../../middleware/context.js'
 import features from '../../middleware/contextualizers/features.js'
 import getRedirect from '../../lib/get-redirect.js'
 import warmServer from '../../lib/warm-server.js'
-import liquid from '../../lib/render-content/liquid.js'
+import { liquid } from '../../src/content-render/index.js'
 import { deprecated } from '../../lib/enterprise-server-releases.js'
 import excludedLinks from '../../lib/excluded-links.js'
 import { getEnvInputs, boolEnvVar } from './lib/get-env-inputs.js'
 import { debugTimeEnd, debugTimeStart } from './lib/debug-time-taken.js'
 import { uploadArtifact as uploadArtifactLib } from './lib/upload-artifact.js'
 import github from '../../script/helpers/github.js'
 import { getActionContext } from './lib/action-context.js'
-import { createMinimalProcessor } from '../../lib/render-content/create-processor.js'
+import { createMinimalProcessor } from '../../src/content-render/unified/processor.js'
 
 const STATIC_PREFIXES = {
   assets: path.resolve('assets'),
@@ -158,7 +158,7 @@ if (import.meta.url.endsWith(process.argv[1])) {
  *  linkReports {boolean} - When createReport is true, link the issue report to previous report(s) via comments
  *  reportRepository {string} - Repository in form of "owner/repo-name" that report issue will be created in
  *  reportLabel {string} - Label assigned to report issue,
- *  reportAuthor {string} - Expected author of previous report issue for linking reports (a bot user like Docubot)
+ *  reportAuthor {string} - Expected author of previous report issue for linking reports (a bot user like docs-bot)
  *  actionUrl {string} - Used to link report or comment to the action instance for debugging
  *  actionContext {object} - Event payload context when run from action or injected. Should include { repo, owner }
  *  verbose {boolean} - Set to true for more verbose logging

.github/workflows/add-review-template.yml

@@ -34,6 +34,6 @@ jobs:
         run: |
           gh pr comment $PR --body "$TEMPLATE"
         env:
-          GITHUB_TOKEN: ${{ secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES }}
+          GITHUB_TOKEN: ${{ secrets.DOCS_BOT_PAT_WORKFLOW_READORG }}
           PR: ${{ github.event.pull_request.html_url }}
           TEMPLATE: ${{ env.TEMPLATE }}

.github/workflows/azure-preview-env-deploy.yml

@@ -126,7 +126,7 @@ jobs:
         env:
           BRANCH_NAME: ${{ env.BRANCH_NAME }}
         with:
-          github-token: ${{ secrets.DOCUBOT_REPO_PAT }}
+          github-token: ${{ secrets.DOCS_BOT_PAT_READPUBLICKEY }}
           result-encoding: string
           script: |
             const { BRANCH_NAME } = process.env
@@ -154,7 +154,7 @@ jobs:
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
         with:
           repository: github/docs-early-access
-          token: ${{ secrets.DOCUBOT_REPO_PAT }}
+          token: ${{ secrets.DOCS_BOT_PAT_READPUBLICKEY }}
           path: docs-early-access
           ref: ${{ steps.check-early-access.outputs.result }}
 
@@ -180,7 +180,7 @@ jobs:
       - if: ${{ steps.with-translations.outputs.result == 'true' }}
         uses: ./.github/actions/clone-translations
         with:
-          token: ${{ secrets.DOCUBOT_REPO_PAT }}
+          token: ${{ secrets.DOCS_BOT_PAT_READPUBLICKEY }}
 
       - if: ${{ env.IS_PUBLIC_BUILD == 'true' }}
         name: Check out user code to temp directory

.github/workflows/azure-preview-env-destroy.yml

@@ -68,5 +68,5 @@ jobs:
       - uses: strumwolf/delete-deployment-environment@3cb547f8ec03ee6c0473d90cce57c74c688c2510
         with:
           # The token provided by the workflow does not have the permissions to delete created environments
-          token: ${{ secrets.DOCUBOT_REPO_PAT }}
+          token: ${{ secrets.DOCS_BOT_PAT_READPUBLICKEY }}
           environment: preview-env-${{ env.PR_NUMBER }}

.github/workflows/azure-prod-build-deploy.yml

@@ -65,7 +65,7 @@ jobs:
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
         with:
           repository: github/docs-early-access
-          token: ${{ secrets.DOCUBOT_REPO_PAT }}
+          token: ${{ secrets.DOCS_BOT_PAT_READPUBLICKEY }}
           path: docs-early-access
 
       - name: Merge docs-early-access repo's folders
@@ -77,7 +77,7 @@ jobs:
 
       - uses: ./.github/actions/clone-translations
         with:
-          token: ${{ secrets.DOCUBOT_REPO_PAT }}
+          token: ${{ secrets.DOCS_BOT_PAT_READPUBLICKEY }}
 
       - name: 'Build and push image'
         uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671

.github/workflows/azure-staging-build-deploy.yml

@@ -83,7 +83,7 @@ jobs:
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
         with:
           repository: github/docs-early-access
-          token: ${{ secrets.DOCUBOT_REPO_PAT }}
+          token: ${{ secrets.DOCS_BOT_PAT_READPUBLICKEY }}
           path: docs-early-access
           ref: main
 

.github/workflows/check-broken-links-github-github.yml

@@ -27,9 +27,9 @@ jobs:
     runs-on: ubuntu-latest
     env:
       # need to use a token from a user with access to github/github for this step
-      GITHUB_TOKEN: ${{ secrets.DOCS_BOT_FR }}
+      GITHUB_TOKEN: ${{ secrets.DOCS_BOT_PAT_WRITEORG_PROJECT }}
       FIRST_RESPONDER_PROJECT: Docs content first responder
-      REPORT_AUTHOR: docubot
+      REPORT_AUTHOR: docs-bot
       REPORT_LABEL: github github broken link report
       REPORT_REPOSITORY: github/docs-content
     steps:
@@ -48,7 +48,7 @@ jobs:
 
       - uses: ./.github/actions/get-docs-early-access
         with:
-          token: ${{ secrets.DOCUBOT_REPO_PAT }}
+          token: ${{ secrets.DOCS_BOT_PAT_READPUBLICKEY }}
 
       - name: Build server
         run: npm run build

.github/workflows/check-for-spammy-issues.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975
         with:
-          github-token: ${{ secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES }}
+          github-token: ${{ secrets.DOCS_BOT_PAT_WORKFLOW_READORG }}
           script: |
 
             const issue = context.payload.issue

.github/workflows/close-bad-repo-sync-prs.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Close pull request if unwanted
         uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410
         with:
-          github-token: ${{ secrets.DOCS_BOT_FR }}
+          github-token: ${{ secrets.DOCS_BOT_PAT_WRITEORG_PROJECT }}
           script: |
             const { owner, repo } = context.repo
             const prCreator = context.actor