Merge remote-tracking branch 'origin/master' into feat/oci-download

Author: LinuxSuRen

cmd/extension.go

@@ -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/server.go

@@ -42,6 +42,7 @@ import (
 	"github.com/linuxsuren/api-testing/pkg/downloader"
 	"github.com/linuxsuren/api-testing/pkg/logging"
 	"github.com/linuxsuren/api-testing/pkg/mock"
+	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"
@@ -50,7 +51,6 @@ import (
 	"github.com/linuxsuren/api-testing/pkg/testing/remote"
 	"github.com/linuxsuren/api-testing/pkg/util"
 	fakeruntime "github.com/linuxsuren/go-fake-runtime"
-    atestoauth "github.com/linuxsuren/api-testing/pkg/oauth"
 	"github.com/linuxsuren/oauth-hub"
 
 	"github.com/prometheus/client_golang/prometheus"
@@ -469,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)

console/atest-ui/package-lock.json

@@ -17,13 +17,15 @@
   },
   "dependencies": {
     "@vueuse/core": "^10.11.0",
+    "codemirror": "^5.65.17",
+    "diff-match-patch": "^1.0.5",
     "element-plus": "^2.3.7",
     "intro.js": "^7.0.1",
     "jsonlint-mod": "^1.7.6",
     "jsonpath-plus": "^7.2.0",
     "skywalking-client-js": "^0.10.0",
     "vue": "^3.3.4",
-    "vue-codemirror": "^6.1.1",
+    "vue-codemirror": "^5.1.0",
     "vue-i18n": "^9.2.2",
     "vue-json-viewer": "^3.0.4",
     "vue-router": "^4.2.2"