ci: merge main to release (#9769)

Author: rjsparks

.devcontainer/devcontainer.json

@@ -23,7 +23,6 @@
                 "dbaeumer.vscode-eslint",
                 "eamodio.gitlens",
                 "editorconfig.editorconfig",
-                // Newer volar >=3.0.0 causes crashes in devcontainers
                 "[email protected]",
                 "mrmlnc.vscode-duplicate",
                 "ms-azuretools.vscode-docker",
@@ -35,7 +34,8 @@
                 "redhat.vscode-yaml",
                 "spmeesseman.vscode-taskexplorer",
                 "visualstudioexptteam.vscodeintellicode",
-                "ms-python.pylint"
+                "ms-python.pylint",
+                "charliermarsh.ruff"
             ],
             "settings": {
                 "terminal.integrated.defaultProfile.linux": "zsh",

.github/workflows/build.yml

@@ -16,13 +16,13 @@ on:
           - Skip
           - Staging Only
           - Staging + Prod
-      sandbox:
-        description: 'Deploy to Sandbox'
+      dev:
+        description: 'Deploy to Dev'
         default: true
         required: true
         type: boolean
-      sandboxNoDbRefresh:
-        description: 'Sandbox Disable Daily DB Refresh'
+      devNoDbRefresh:
+        description: 'Dev Disable Daily DB Refresh'
         default: false
         required: true
         type: boolean
@@ -278,8 +278,6 @@ jobs:
         tags: |
           ghcr.io/ietf-tools/datatracker:${{ env.PKG_VERSION }}
           ${{ env.FEATURE_LATEST_TAG && format('ghcr.io/ietf-tools/datatracker:{0}-latest', env.FEATURE_LATEST_TAG) || null }}
-        cache-from: type=gha
-        cache-to: type=gha,mode=max
 
     - name: Update CHANGELOG
       id: changelog
@@ -392,44 +390,45 @@ jobs:
                   value: "Failed"
         
   # -----------------------------------------------------------------
-  # SANDBOX
+  # DEV
   # -----------------------------------------------------------------
-  sandbox:
-    name: Deploy to Sandbox
-    if: ${{ !failure() && !cancelled() && github.event.inputs.sandbox == 'true' }}
+  dev:
+    name: Deploy to Dev
+    if: ${{ !failure() && !cancelled() && github.event.inputs.dev == 'true' }}
     needs: [prepare, release]
-    runs-on: [self-hosted, dev-server]
+    runs-on: ubuntu-latest
     environment:
-      name: sandbox
+      name: dev
     env:
       PKG_VERSION: ${{needs.prepare.outputs.pkg_version}}
 
     steps:
-    - uses: actions/checkout@v4
-        
-    - name: Download a Release Artifact
-      uses: actions/[email protected]
-      with:
-        name: release-${{ env.PKG_VERSION }}
-        
-    - name: Deploy to containers
-      env:
-        DEBIAN_FRONTEND: noninteractive
-      run: |
-        echo "Reset production flags in settings.py..."
-        sed -i -r -e 's/^DEBUG *= *.*$/DEBUG = True/' -e "s/^SERVER_MODE *= *.*\$/SERVER_MODE = 'development'/" ietf/settings.py
-        echo "Install Deploy to Container CLI dependencies..."
-        cd dev/deploy-to-container
-        npm ci
-        cd ../..
-        echo "Start Deploy..."
-        node ./dev/deploy-to-container/cli.js --branch ${{ github.ref_name }} --domain dev.ietf.org --appversion ${{ env.PKG_VERSION }} --commit ${{ github.sha }} --ghrunid ${{ github.run_id }} --nodbrefresh ${{ github.event.inputs.sandboxNoDbRefresh }}
-        
-    - name: Cleanup old docker resources
-      env:
-        DEBIAN_FRONTEND: noninteractive
-      run: |
-        docker image prune -a -f
+      - uses: actions/checkout@v4
+        with:
+          ref: main
+          
+      - name: Get Deploy Name
+        env:
+          DEBIAN_FRONTEND: noninteractive
+        run: |
+          echo "Install Get Deploy Name CLI dependencies..."
+          cd dev/k8s-get-deploy-name
+          npm ci
+          echo "Get Deploy Name..."
+          echo "DEPLOY_NAMESPACE=$(node cli.js --branch ${{ github.ref_name }})" >> "$GITHUB_ENV"
+
+      - name: Deploy to dev
+        uses: the-actions-org/workflow-dispatch@v4
+        with:
+          workflow: deploy-dev.yml
+          repo: ietf-tools/infra-k8s
+          ref: main
+          token: ${{ secrets.GH_INFRA_K8S_TOKEN }}
+          inputs: '{ "app":"datatracker", "appVersion":"${{ env.PKG_VERSION }}", "remoteRef":"${{ github.sha }}", "namespace":"${{ env.DEPLOY_NAMESPACE }}", "disableDailyDbRefresh":${{ inputs.devNoDbRefresh }} }'
+          wait-for-completion: true
+          wait-for-completion-timeout: 30m
+          wait-for-completion-interval: 30s
+          display-workflow-run-url: false
 
   # -----------------------------------------------------------------
   # STAGING

dev/k8s-get-deploy-name/.editorconfig

@@ -0,0 +1,7 @@
+[*]
+indent_size = 2
+indent_style = space
+charset = utf-8
+trim_trailing_whitespace = false
+end_of_line = lf
+insert_final_newline = true

dev/k8s-get-deploy-name/.gitignore

@@ -0,0 +1 @@
+/node_modules

dev/k8s-get-deploy-name/.npmrc

@@ -0,0 +1,3 @@
+audit = false
+fund = false
+save-exact = true

dev/k8s-get-deploy-name/README.md

@@ -0,0 +1,16 @@
+# Datatracker Get Deploy Name
+
+This tool process and slugify a git branch into an appropriate subdomain name.
+
+## Usage
+
+1. From the `dev/k8s-get-deploy-name` directory, install the dependencies:
+```sh
+npm install
+```
+2. Run the command: (replacing the `branch` argument)
+```sh
+node /cli.js --branch feat/fooBar-123
+```
+
+The subdomain name will be output. It can then be used in a workflow as a namespace name and subdomain value.

dev/k8s-get-deploy-name/cli.js

@@ -0,0 +1,22 @@
+#!/usr/bin/env node
+
+import yargs from 'yargs/yargs'
+import { hideBin } from 'yargs/helpers'
+import slugify from 'slugify'
+
+const argv = yargs(hideBin(process.argv)).argv
+
+let branch = argv.branch
+if (!branch) {
+  throw new Error('Missing --branch argument!')
+}
+if (branch.indexOf('/') >= 0) {
+  branch = branch.split('/').slice(1).join('-')
+}
+branch = slugify(branch, { lower: true, strict: true })
+if (branch.length < 1) {
+  throw new Error('Branch name is empty!')
+}
+process.stdout.write(`dt-${branch}`)
+
+process.exit(0)