[GRDM-44131] Upstreamの取り込み(~2025-02-11)

.eslintrc.js

@@ -0,0 +1,48 @@
+module.exports = {
+  env: {
+    browser: true,
+    es2021: true,
+  },
+  extends: ["eslint:recommended", "plugin:react/recommended"],
+  ignorePatterns: ["dist"],
+  overrides: [
+    {
+      env: {
+        node: true,
+      },
+      files: [".eslintrc.{js,cjs}"],
+      parserOptions: {
+        sourceType: "script",
+      },
+    },
+    {
+      files: ["**/*.test.js", "**/*.test.jsx"],
+      env: {
+        jest: true,
+        node: true,
+      },
+    },
+  ],
+  parserOptions: {
+    ecmaVersion: "latest",
+    sourceType: "module",
+  },
+  plugins: ["react"],
+  rules: {
+    "react/react-in-jsx-scope": "off",
+    "react/jsx-uses-react": "off",
+    // Temporarily turn off prop-types
+    "react/prop-types": "off",
+    "no-unused-vars": ["error", { args: "after-used" }],
+  },
+  ignorePatterns: [
+    "jupyterhub_fancy_profiles/static/*.js",
+    "webpack.config.js",
+    "babel.config.js",
+  ],
+  settings: {
+    react: {
+      version: "detect",
+    },
+  },
+};

.flake8

@@ -0,0 +1,16 @@
+# flake8 is a Python linting tool run by pre-commit as declared by our
+# pre-commit-config.yaml file.
+#
+# This configuration is compatible with the autoformatter tool black, and
+# further relaxed to not bug us with too small details.
+#
+# flake8 configuration reference:
+# https://flake8.pycqa.org/en/latest/user/configuration.html
+#
+[flake8]
+max-line-length = 88
+extend-ignore = C, E, W
+
+# Adjustments to linting the binderhub repo
+builtins = c, load_subconfig
+exclude = versioneer.py,binderhub/_version.py

.git-blame-ignore-revs

@@ -0,0 +1,21 @@
+# This file can be used to disregard certain commits when using `git blame`, and
+# GitHub will automatically use it for that by file name convention.
+#
+# Reference 1: https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt
+# Reference 2: https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
+#
+
+# pre-commit: run requirements-txt-fixer
+da40927c5b187e37755901e675eee092e12ae2eb
+# pre-commit: run end-of-file-fixer
+b815163691eade7daeeb01549d0fc6bdf4a33186
+# pre-commit: run prettier
+9fefdc42ec4d1701117f8f2880a80695eeaad5c9
+# pre-commit: run update-values-based-on-bindarspawner-mixin
+d32e9efa34cf0ca8880939e82ff01d3edc35705b
+# pre-commit: run isort
+f0fe0257506fd667279e97354f0207168aa1368c
+# pre-commit: run black
+bb047d8bce89655e197a7fdf2bdec2cb9c79940a
+# pre-commit: run pyupgrade
+24da4e593461640aaa47dc008b1f657b92189085

.github/ISSUE_TEMPLATE.md

@@ -11,4 +11,3 @@ If you aren't sure where to go use https://github.com/jupyterhub/binder/issues/n
 
 Thank you for being awesome!
 -->
-

.github/dependabot.yaml

@@ -0,0 +1,17 @@
+# dependabot.yml reference: https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+#
+# Notes:
+# - Status and logs from dependabot are provided at
+#   https://github.com/jupyterhub/binderhub/network/updates.
+# - YAML anchors are not supported here or in GitHub Workflows.
+#
+version: 2
+updates:
+  # Maintain dependencies in our GitHub Workflows
+  - package-ecosystem: github-actions
+    directory: /
+    labels: [ci]
+    schedule:
+      interval: monthly
+      time: "05:00"
+      timezone: Etc/UTC

.github/workflows/diff.yml

@@ -1,31 +1,42 @@
 # This workflow provides a diff of the rendered Helm chart's templates with the
 # latest released dev version of the chart.
----
+#
 name: Helm diff
 
 on:
   pull_request:
+    paths:
+      - ".github/workflows/diff.yml"
+      - "helm-chart/binderhub/**"
   push:
+    paths:
+      - ".github/workflows/diff.yml"
+      - "helm-chart/binderhub/**"
+    branches-ignore:
+      - "dependabot/**"
+      - "pre-commit-ci-update-config"
+      - "update-*"
   workflow_dispatch:
 
 jobs:
   diff-rendered-templates:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - uses: jupyterhub/action-k3s-helm@v1
+      - uses: jupyterhub/action-k3s-helm@v4
         with:
-          k3s-channel: v1.22
+          k3s-channel: stable
           metrics-enabled: false
           traefik-enabled: false
           docker-enabled: true
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v5
         with:
-          python-version: '3.8'
+          python-version: "3.12"
+
       - name: Install helm diff plugin, update local chart dependencies
         run: |
           helm plugin install https://github.com/databus23/helm-diff
@@ -44,11 +55,20 @@ jobs:
 
           # NOTE: We change the directory so binderhub the chart name won't be
           #       misunderstood as the local folder name.
+          # validation is disabled, because the config is for a different version!
           cd testing
 
+          old_config="../testing/k8s-binder-k8s-hub/binderhub-chart-config-old.yaml"
+          if [ -f "$old_config" ]; then
+            echo "using old config"
+          else
+            old_config="../testing/k8s-binder-k8s-hub/binderhub-chart-config.yaml"
+          fi
+
           helm install binderhub-test binderhub \
-              --values ./k8s-binder-k8s-hub/binderhub-chart-config.yaml \
+              --values "$old_config" \
               --repo https://rcosdp.github.io/CS-jhub-helm-chart/ \
+              --disable-openapi-validation \
               --version=$UPGRADE_FROM_VERSION
 
       - name: "Helm diff latest released dev chart with local chart"

.github/workflows/eslint.yml

@@ -0,0 +1,36 @@
+# Lints the binderhub/static/js folders content with eslint, influenced by
+# ".eslintrc.js", by running "npm run lint" where "lint" is a command defined in
+# package.json.
+#
+name: eslint
+
+on:
+  pull_request:
+    paths:
+      - ".github/workflows/eslint.yml"
+      - ".eslintrc.js"
+      - "package.json"
+      - "binderhub/static/js/**"
+      - "js/**"
+  push:
+    paths:
+      - ".github/workflows/eslint.yml"
+      - ".eslintrc.js"
+      - "package.json"
+      - "binderhub/static/js/**"
+      - "js/**"
+    branches-ignore:
+      - "dependabot/**"
+      - "pre-commit-ci-update-config"
+      - "update-*"
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - run: npm install
+
+      - run: npm run lint

.github/workflows/jest.yml

@@ -0,0 +1,36 @@
+# Runs jest based unit tests for frontend javascript and @jupyterhub/binderhub-client
+name: "JS Unit tests"
+
+on:
+  pull_request:
+    paths:
+      - "binderhub/static/js/**"
+      - "js/packages/binderhub-client/**"
+      - ".github/workflows/jest.yml"
+  push:
+    paths:
+      - "binderhub/static/js/**"
+      - "js/packages/binderhub-client/**"
+      - ".github/workflows/jest.yml"
+    branches-ignore:
+      - "dependabot/**"
+      - "pre-commit-ci-update-config"
+      - "update-*"
+  workflow_dispatch:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: "Setup dependencies"
+        run: |
+          npm install
+
+      - name: "Run all unit tests"
+        run: |
+          npm test
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v5