Merge branch 'LinuxSuRen:master' into history-api

Author: SamYSF

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())
 

pkg/downloader/oci.go

@@ -44,6 +44,7 @@ type PlatformAwareOCIDownloader interface {
 	WithOS(string)
 	WithArch(string)
 	GetTargetFile() string
+	WithImagePrefix(string)
 }
 
 type defaultOCIDownloader struct {

pkg/downloader/store.go

@@ -27,8 +27,9 @@ import (
 
 type storeDownloader struct {
 	OCIDownloader
-	os, arch string
-	extFile  string
+	os, arch    string
+	extFile     string
+	imagePrefix string
 }
 
 func NewStoreDownloader() PlatformAwareOCIDownloader {
@@ -37,6 +38,7 @@ func NewStoreDownloader() PlatformAwareOCIDownloader {
 	}
 	ociDownloader.WithOS(runtime.GOOS)
 	ociDownloader.WithArch(runtime.GOARCH)
+	ociDownloader.WithImagePrefix("linuxsuren")
 	return ociDownloader
 }
 
@@ -46,7 +48,7 @@ func (d *storeDownloader) Download(name, tag, _ string) (reader io.Reader, err e
 	if d.os == "windows" {
 		d.extFile = fmt.Sprintf("%s.exe", d.extFile)
 	}
-	image := fmt.Sprintf("linuxsuren/atest-ext-store-%s", name)
+	image := fmt.Sprintf("%s/atest-ext-store-%s", d.imagePrefix, name)
 	reader, err = d.OCIDownloader.Download(image, tag, d.extFile)
 	return
 }
@@ -70,6 +72,10 @@ func (d *storeDownloader) WithOS(os string) {
 	d.os = os
 }
 
+func (d *storeDownloader) WithImagePrefix(imagePrefix string) {
+	d.imagePrefix = imagePrefix
+}
+
 func (d *storeDownloader) WithArch(arch string) {
 	d.arch = arch
 	if d.arch == "amd64" {

pkg/runner/http.go

@@ -188,7 +188,7 @@ func (r *simpleTestCaseRunner) RunTestCase(testcase *testing.TestCase, dataConte
 		return
 	}
 
-	r.log.Debug("test case %q, status code: %d\n", testcase.Name, resp.StatusCode)
+	r.log.Debug("test case %q, test case info: %v, status code: %d\n", testcase.Name, testcase, resp.StatusCode)
 
 	if err = testcase.Expect.Render(dataContext); err != nil {
 		return

pkg/server/remote_server_test.go

@@ -148,7 +148,7 @@ func TestRunTestCase(t *testing.T) {
 		})
 		assert.NoError(t, err)
 		assert.Equal(t, sampleBody, result.Body)
-		assert.Contains(t, result.Output, "start to run: 'get'\nstart to send request to http://foo\ntest case \"get\", status code: 200\n")
+		assert.Contains(t, result.Output, "start to run: 'get'\nstart to send request to http://foo\ntest case \"get\", test case info: &{ get  <nil> <nil> {http://foo GET map[] map[key:value] map[] map[]  } {0  map[] map[] [] [] }}, status code: 200\n")
 	})
 
 	t.Run("text response", func(t *testing.T) {

pkg/server/store_ext_manager.go

@@ -185,6 +185,9 @@ func (n *nonDownloader) WithRegistry(string) {
 	// Do nothing because this is an empty implementation
 }
 
+func (n *nonDownloader) WithImagePrefix(imagePrefix string) {
+	// Do nothing because this is an empty implementation
+}
 func (d *nonDownloader) WithRoundTripper(rt http.RoundTripper) {
 	// Do nothing because this is an empty implementation
 }