Merge remote-tracking branch 'origin/master' into refactor/components

Author: LinuxSuRen

.github/workflows/docs.yaml

@@ -2,13 +2,13 @@ name: Hugo Docs
 on:
   push:
     branches:
-    - "master"
+      - "master"
   pull_request:
     branches:
-    - "master"
+      - "master"
     paths:
-    - 'docs/site/**'
-    - 'tools/make/docs.mk'
+      - "docs/site/**"
+      - "tools/make/docs.mk"
 
 permissions:
   contents: read
@@ -17,63 +17,64 @@ jobs:
   docs-lint:
     runs-on: ubuntu-22.04
     steps:
-    - name: Check out code
-      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29  # v4.1.6
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
+      - name: Check out code
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
 
-    - uses: ./tools/github-actions/setup-deps
+      - uses: ./tools/github-actions/setup-deps
 
-    - name: Run markdown linter
-      uses: nosborn/github-action-markdown-cli@9b5e871c11cc0649c5ac2526af22e23525fa344d  # v3.3.0
-      with:
-        files: docs/site/content/*
-        config_file: ".github/markdown_lint_config.json"
+      - name: Run markdown linter
+        uses: nosborn/github-action-markdown-cli@9b5e871c11cc0649c5ac2526af22e23525fa344d # v3.3.0
+        with:
+          files: docs/site/content/*
+          config_file: ".github/markdown_lint_config.json"
 
-    - name: Install linkinator
-      run: npm install -g [email protected]
+      - name: Install linkinator
+        run: npm install -g [email protected]
 
-    - name: Check links
-      run: make docs # docs-check-links
+      - name: Check links
+        run: make docs # docs-check-links
 
   docs-build:
     runs-on: ubuntu-latest
     needs: docs-lint
     permissions:
       contents: write
     steps:
-    - name: Git checkout
-      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29  # v4.1.6
-      with:
-        submodules: true
-        ref: ${{ github.event.pull_request.head.sha }}
-
-    - uses: ./tools/github-actions/setup-deps
-
-    - name: Setup Hugo
-      uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f  # v3.0.0
-      with:
-        hugo-version: 'latest'
-        extended: true
-
-    - name: Setup Node
-      uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8  # v4.1.0
-      with:
-        node-version: '18'
-
-    - name: Install Site Dependencies and Build Site
-      run: |
-        cp docs/api-testing-schema.json docs/site/static/api-testing-schema.json
-        make docs # docs-check-links
-
-    # Upload docs for GitHub Pages
-    - name: Upload GitHub Pages artifact
-      uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa  # v3.0.1
-      with:
-        # Path of the directory containing the static assets.
-        path: docs/site/public
-        # Duration after which artifact will expire in days.
-        # retention-days: # optional, default is 1
+      - name: Git checkout
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        with:
+          submodules: true
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - uses: ./tools/github-actions/setup-deps
+
+      - name: Setup Hugo
+        uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3.0.0
+        with:
+          hugo-version: "latest"
+          extended: true
+
+      - name: Setup Node
+        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.1.0
+        with:
+          node-version: "18"
+
+      - name: Install Site Dependencies and Build Site
+        run: |
+          cp docs/api-testing-schema.json docs/site/static/api-testing-schema.json
+          cp docs/api-testing-mock-schema.json docs/site/static/api-testing-mock-schema.json
+          make docs # docs-check-links
+
+      # Upload docs for GitHub Pages
+      - name: Upload GitHub Pages artifact
+        uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3.0.1
+        with:
+          # Path of the directory containing the static assets.
+          path: docs/site/public
+          # Duration after which artifact will expire in days.
+          # retention-days: # optional, default is 1
 
   # This workflow contains a single job called "build"
   docs-publish:
@@ -83,16 +84,16 @@ jobs:
 
     # Grant GITHUB_TOKEN the permissions required to make a Pages deployment
     permissions:
-      pages: write      # to deploy to Pages
+      pages: write # to deploy to Pages
       deployments: write
-      id-token: write   # to verify the deployment originates from an appropriate source
+      id-token: write # to verify the deployment originates from an appropriate source
 
     # Deploy to the github-pages environment
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
 
     steps:
-    - name: Deploy to GitHub Pages
-      id: deployment
-      uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e  # v4.0.5
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4.0.5

.github/workflows/stale.yml

@@ -5,7 +5,7 @@ COPY console/atest-ui .
 RUN npm install --ignore-scripts --registry=https://registry.npmmirror.com
 RUN npm run build-only
 
-FROM docker.io/golang:1.22.2 AS builder
+FROM docker.io/golang:1.22.4 AS builder
 
 ARG VERSION
 ARG GOPROXY

Dockerfile

@@ -35,6 +35,7 @@ type extensionOption struct {
 	os            string
 	arch          string
 	timeout       time.Duration
+	imagePrefix   string
 }
 
 func createExtensionCommand(ociDownloader downloader.PlatformAwareOCIDownloader) (c *cobra.Command) {
@@ -55,13 +56,15 @@ func createExtensionCommand(ociDownloader downloader.PlatformAwareOCIDownloader)
 	flags.StringVarP(&opt.os, "os", "", runtime.GOOS, "The OS")
 	flags.StringVarP(&opt.arch, "arch", "", runtime.GOARCH, "The architecture")
 	flags.DurationVarP(&opt.timeout, "timeout", "", time.Minute, "The timeout of downloading")
+	flags.StringVarP(&opt.imagePrefix, "image-prefix", "", "linuxsuren", "The prefix for the image address")
 	return
 }
 
 func (o *extensionOption) runE(cmd *cobra.Command, args []string) (err error) {
 	o.ociDownloader.WithOS(o.os)
 	o.ociDownloader.WithArch(o.arch)
 	o.ociDownloader.WithRegistry(o.registry)
+	o.ociDownloader.WithImagePrefix(o.imagePrefix)
 	o.ociDownloader.WithTimeout(o.timeout)
 	o.ociDownloader.WithContext(cmd.Context())
 

cmd/extension.go

@@ -42,7 +42,7 @@ import (
 	"github.com/linuxsuren/api-testing/pkg/downloader"
 	"github.com/linuxsuren/api-testing/pkg/logging"
 	"github.com/linuxsuren/api-testing/pkg/mock"
-	"github.com/linuxsuren/api-testing/pkg/oauth"
+	atestoauth "github.com/linuxsuren/api-testing/pkg/oauth"
 	template "github.com/linuxsuren/api-testing/pkg/render"
 	"github.com/linuxsuren/api-testing/pkg/server"
 	"github.com/linuxsuren/api-testing/pkg/service"
@@ -51,6 +51,7 @@ import (
 	"github.com/linuxsuren/api-testing/pkg/testing/remote"
 	"github.com/linuxsuren/api-testing/pkg/util"
 	fakeruntime "github.com/linuxsuren/go-fake-runtime"
+	"github.com/linuxsuren/oauth-hub"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/collectors"
@@ -182,7 +183,7 @@ func (o *serverOption) preRunE(cmd *cobra.Command, args []string) (err error) {
 			return
 		}
 
-		grpcOpts = append(grpcOpts, oauth.NewAuthInterceptor(o.oauthGroup))
+		grpcOpts = append(grpcOpts, atestoauth.NewAuthInterceptor(o.oauthGroup))
 	}
 	if o.tls {
 		if o.tlsCert != "" && o.tlsKey != "" {
@@ -468,7 +469,7 @@ func debugHandler(mux *runtime.ServeMux, remoteServer server.RunnerServer) {
 				Name: sub,
 			})
 			if err == nil {
-				w.Header().Set("Content-Type", "application/octet-stream")
+				w.Header().Set(util.ContentType, "application/octet-stream")
 				w.Write(data.Data)
 			} else {
 				w.WriteHeader(http.StatusBadRequest)