Merge remote-tracking branch 'upstream/main' into pr/wave4k-pgx

Signed-off-by: DoDiODev <DoDiDev@proton.me>

# Conflicts:
#	.github/workflows/golangci-lint.yml
#	.github/workflows/test.yml

Author: DoDiODev

.devcontainer/docker-compose.yml

@@ -24,7 +24,7 @@ services:
       - default
     command: sleep infinity
   mysql:
-    image: mysql:8.4.10
+    image: mysql:8.4.11
     volumes:
       - mysql-storage:/var/lib/mysql
     restart: always

.github/workflows/golangci-lint.yml

@@ -34,6 +34,8 @@ jobs:
         run: backend/scripts/install-libgit2.sh
       - name: Install Go 1.26.2
         run: backend/scripts/install-go.sh
+      - name: Install mockery 3.7.2
+        run: backend/scripts/install-mockery.sh
       - name: Cache golangci-lint
         id: cache-golangci-lint
         uses: actions/cache@v5

.github/workflows/test.yml

@@ -51,6 +51,8 @@ jobs:
       run: backend/scripts/install-libgit2.sh
     - name: Install Go 1.26.2
       run: backend/scripts/install-go.sh
+    - name: Install mockery 3.7.2
+      run: backend/scripts/install-mockery.sh
     - name: Build Python
       run: |
         cd backend

backend/.mockery.core.yml

@@ -0,0 +1,38 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# mockery v3 configuration for the ./core tree.
+#
+# Replaces the v2 command line
+#   mockery --recursive --keeptree --dir=./core --output=./mocks/core \
+#           --unroll-variadic=false --name='.*'
+# and reproduces the exact same layout: backend/mocks/core/<pkg>/<Interface>.go
+# with package name `mocks` and an un-prefixed mock struct name.
+#
+# NOTE: this config is deliberately kept separate from `.mockery.helpers.yml`.
+# `helpers/unithelper` imports the generated `mocks/core/...` packages, so the
+# core mocks have to exist before the helpers tree can be type-checked by
+# mockery v3 (which, unlike v2, loads packages via go/packages).
+all: true
+recursive: true
+template: testify
+dir: "mocks/{{.InterfaceDirRelative}}"
+filename: "{{.InterfaceName}}.go"
+pkgname: "mocks"
+structname: "{{.InterfaceName}}"
+template-data:
+  unroll-variadic: false
+packages:
+  github.com/apache/incubator-devlake/core:

backend/.mockery.helpers.yml

@@ -0,0 +1,35 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# mockery v3 configuration for the ./helpers tree.
+#
+# Replaces the v2 command line
+#   mockery --recursive --keeptree --dir=./helpers --output=./mocks/helpers \
+#           --unroll-variadic=false --name='.*'
+# and reproduces the exact same layout: backend/mocks/helpers/<pkg>/<Interface>.go
+# with package name `mocks` and an un-prefixed mock struct name.
+#
+# Must run *after* `.mockery.core.yml` — see the note there.
+all: true
+recursive: true
+template: testify
+dir: "mocks/{{.InterfaceDirRelative}}"
+filename: "{{.InterfaceName}}.go"
+pkgname: "mocks"
+structname: "{{.InterfaceName}}"
+template-data:
+  unroll-variadic: false
+packages:
+  github.com/apache/incubator-devlake/helpers:

backend/Dockerfile

@@ -49,7 +49,7 @@ RUN if [ "$(arch)" != "x86_64" ] ; then \
         apt-get install -y gcc-x86-64-linux-gnu binutils-x86-64-linux-gnu ; \
     fi
 
-RUN go install github.com/vektra/mockery/v2@v2.53.6
+RUN go install github.com/vektra/mockery/v3@v3.7.2
 RUN go install github.com/swaggo/swag/cmd/swag@v1.16.6
 
 COPY --from=debian-amd64 /usr/include /rootfs-amd64/usr/include

backend/Dockerfile.local

@@ -47,7 +47,7 @@ RUN mkdir -p /tmp/build && cd /tmp/build && \
     make -j$(nproc) install && \
     ldconfig
 
-RUN go install github.com/vektra/mockery/v2@v2.53.6
+RUN go install github.com/vektra/mockery/v3@v3.7.2
 RUN go install github.com/swaggo/swag/cmd/swag@v1.16.6
 
 WORKDIR /app

backend/Makefile

@@ -27,7 +27,7 @@ PYTHON_DIR ?= "./python"
 all: build
 
 go-dep:
-	go install github.com/vektra/mockery/v2@v2.53.6
+	go install github.com/vektra/mockery/v3@v3.7.2
 	go install github.com/swaggo/swag/cmd/swag@v1.16.6
 	go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.12.2
 
@@ -73,8 +73,12 @@ debug: build-plugin-debug
 
 mock:
 	rm -rf mocks
-	mockery --recursive --keeptree --dir=./core --output=./mocks/core --unroll-variadic=false --name='.*'
-	mockery --recursive --keeptree --dir=./helpers --output=./mocks/helpers --unroll-variadic=false --name='.*'
+	# mockery v3 is configured via YAML instead of CLI flags. Two invocations are
+	# required (and must run in this order): `helpers/unithelper` imports the
+	# generated `mocks/core/...` packages, and v3 type-checks the sources it
+	# parses, so the core mocks have to exist before the helpers tree loads.
+	mockery --config .mockery.core.yml
+	mockery --config .mockery.helpers.yml
 
 test: unit-test e2e-test
 

backend/helpers/pluginhelper/api/api_client.go

@@ -324,7 +324,7 @@ func (apiClient *ApiClient) Do(
 	body interface{},
 	headers http.Header,
 ) (*http.Response, errors.Error) {
-	uri, err := GetURIStringPointer(apiClient.endpoint, path, query)
+	uri, err := ResolveRequestURI(apiClient.endpoint, path, query)
 	if err != nil {
 		return nil, errors.Default.Wrap(err, fmt.Sprintf("Unable to construct URI from %s, %s, %s", apiClient.endpoint, path, query))
 	}
@@ -453,8 +453,12 @@ func UnmarshalResponseXML(res *http.Response, v interface{}) errors.Error {
 	return nil
 }
 
-// GetURIStringPointer FIXME ...
-func GetURIStringPointer(baseUrl string, relativePath string, query url.Values) (*string, errors.Error) {
+// ResolveRequestURI combines baseUrl, relativePath and query into the absolute URI used
+// for an API request. relativePath must be a relative reference (no scheme or host of its
+// own): url.URL.ResolveReference resolves an absolute reference by discarding the base
+// entirely (RFC 3986 §5.3), so an absolute or protocol-relative relativePath would silently
+// ignore baseUrl and target whatever host it carries instead.
+func ResolveRequestURI(baseUrl string, relativePath string, query url.Values) (*string, errors.Error) {
 	// If the base URL doesn't end with a slash, and has a relative path attached
 	// the values will be removed by the Go package, therefore we need to add a missing slash.
 	AddMissingSlashToURL(&baseUrl)
@@ -468,6 +472,9 @@ func GetURIStringPointer(baseUrl string, relativePath string, query url.Values)
 	if err != nil {
 		return nil, errors.Convert(err)
 	}
+	if u.IsAbs() || u.Host != "" {
+		return nil, errors.BadInput.New(fmt.Sprintf("relativePath must be a relative path, not an absolute URL: %s", relativePath))
+	}
 	if query != nil {
 		queryString := u.Query()
 		for key, values := range query {

backend/plugins/github/token/refresh_api_client.go

@@ -74,7 +74,7 @@ func (c *refreshApiClient) Post(path string, query url.Values, body interface{},
 }
 
 func (c *refreshApiClient) do(method, path string, query url.Values, body interface{}, headers http.Header) (*http.Response, errors.Error) {
-	uri, err := api.GetURIStringPointer(c.endpoint, path, query)
+	uri, err := api.ResolveRequestURI(c.endpoint, path, query)
 	if err != nil {
 		return nil, err
 	}