Merge remote-tracking branch 'origin/main' into snap-release

.github/workflows/ci.yaml

@@ -30,7 +30,7 @@ jobs:
         uses: actions/[email protected]
         with:
           cache-dependency-path: "**/go.sum"
-          go-version: stable
+          go-version: ${{ vars.GO_VERSION }} # settings > secrets and variables > variables > GO_VERSION
       - name: "Go Imports"
         run: go install golang.org/x/tools/cmd/goimports@latest
       - uses: pre-commit/[email protected]

.github/workflows/internal.yaml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/[email protected]
         with:
           cache-dependency-path: "**/go.sum"
-          go-version: stable
+          go-version: ${{ vars.GO_VERSION }} # settings > secrets and variables > variables > GO_VERSION
       - name: Run GoReleaser
         continue-on-error: true
         uses: goreleaser/goreleaser-action@v6

.github/workflows/release.yaml

@@ -25,7 +25,7 @@ jobs:
         uses: actions/[email protected]
         with:
           cache-dependency-path: "**/go.sum"
-          go-version: stable
+          go-version: ${{ vars.GO_VERSION }} # settings > secrets and variables > variables > GO_VERSION
       - name: Check version candidate
         run: ./scripts/check_release_v2.sh ${{ github.ref_name }}
       - run: go version
@@ -45,7 +45,7 @@ jobs:
         uses: actions/[email protected]
         with:
           cache-dependency-path: "**/go.sum"
-          go-version: stable
+          go-version: ${{ vars.GO_VERSION }} # settings > secrets and variables > variables > GO_VERSION
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v6
         with:

mgc/sdk/static/object_storage/common/list.go

@@ -154,7 +154,6 @@ func newListRequest(ctx context.Context, cfg Config, bucketURI mgcSchemaPkg.URI,
 		listReqQuery.Set("delimiter", delimiter)
 	}
 	url.RawQuery = listReqQuery.Encode()
-
 	return http.NewRequestWithContext(ctx, http.MethodGet, url.String(), nil)
 }
 
@@ -169,9 +168,15 @@ func buildListRequestURL(cfg Config, bucketURI mgcSchemaPkg.URI) (*url.URL, erro
 		if lastChar != delimiter {
 			path += delimiter
 		}
-		q.Set("prefix", path)
+		encodedPath := url.PathEscape(path)
+
+		if len(q) > 0 {
+			u.RawQuery = u.RawQuery + "&prefix=" + encodedPath
+		} else {
+			u.RawQuery = "prefix=" + encodedPath
+		}
 	}
-	u.RawQuery = q.Encode()
+
 	return u, nil
 }
 
@@ -181,7 +186,6 @@ func ListGenerator(ctx context.Context, params ListObjectsParams, cfg Config, on
 
 	logger := listObjectsLogger().Named("ListGenerator").With(
 		"params", params,
-		"cfg", cfg,
 	)
 
 	generator := func() {
@@ -198,17 +202,19 @@ func ListGenerator(ctx context.Context, params ListObjectsParams, cfg Config, on
 			requestedItems = 0
 
 			req, err := newListRequest(ctx, cfg, dst, page, params.Recursive)
-			var result listObjectsRequestResponse
-			var resp *http.Response
-
-			if err == nil {
-				resp, err = SendRequest(ctx, req)
+			if err != nil {
+				logger.Warnw("failed to create request", "err", err)
+				return
 			}
 
-			if err == nil {
-				result, err = UnwrapResponse[listObjectsRequestResponse](resp, req)
+			resp, err := SendRequest(ctx, req)
+			if err != nil {
+				logger.Warnw("failed to send request", "err", err)
+				return
 			}
 
+			var result listObjectsRequestResponse
+			result, err = UnwrapResponse[listObjectsRequestResponse](resp, req)
 			if err != nil {
 				logger.Warnw("list request failed", "err", err, "req", (*mgcHttpPkg.LogRequest)(req))
 				select {
@@ -222,14 +228,12 @@ func ListGenerator(ctx context.Context, params ListObjectsParams, cfg Config, on
 			if onNewPage != nil {
 				onNewPage(uint64(len(result.Contents)))
 			}
-
 			for _, prefix := range result.CommonPrefixes {
 				dirEntry := pipeline.NewSimpleWalkDirEntry(
 					path.Join(dst.Path(), prefix.Path),
 					prefix,
 					nil,
 				)
-
 				select {
 				case <-ctx.Done():
 					logger.Debugw("context.Done()", "err", ctx.Err())
@@ -269,6 +273,7 @@ func ListGenerator(ctx context.Context, params ListObjectsParams, cfg Config, on
 				logger.Info("finished reading contents")
 				break
 			}
+
 		}
 	}
 

mgc/sdk/static/object_storage/common/sign.go

@@ -98,7 +98,7 @@ func buildCanonicalQuery(query url.Values) string {
 	pairs := make([]p, 0, len(query))
 	for key, values := range query {
 		for _, value := range values {
-			pairs = append(pairs, p{url.QueryEscape(key), url.QueryEscape(value)})
+			pairs = append(pairs, p{url.QueryEscape(key), url.PathEscape(value)})
 		}
 	}
 

mgc/sdk/version.txt

@@ -1 +1 @@
-v0.34.0
+v0.34.1