From e89837214ea16cc04d4aaf2c87c4a45265b2690b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 10:45:12 +0100 Subject: [PATCH 1/5] fix(deps): update module gopkg.in/yaml.v2 to v3 (#5114) * fix(deps): update module gopkg.in/yaml.v2 to v3 * Migrate yaml.v2 to yaml.v3 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Ivan Nikiforov --- go.mod | 2 +- pkg/codeql/github_repo_upload.go | 2 +- pkg/kubernetes/utils.go | 2 +- pkg/yaml/yamlUtil.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 8c229f73a29..201dcf231ed 100644 --- a/go.mod +++ b/go.mod @@ -60,6 +60,7 @@ require ( google.golang.org/api v0.169.0 gopkg.in/ini.v1 v1.67.0 gopkg.in/yaml.v2 v2.4.0 + gopkg.in/yaml.v3 v3.0.1 helm.sh/helm/v3 v3.14.4 mvdan.cc/xurls/v2 v2.4.0 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd @@ -260,7 +261,6 @@ require ( google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/api v0.29.0 // indirect k8s.io/apimachinery v0.29.0 // indirect k8s.io/cli-runtime v0.29.0 // indirect diff --git a/pkg/codeql/github_repo_upload.go b/pkg/codeql/github_repo_upload.go index c857c2b988c..8f50f4620f2 100644 --- a/pkg/codeql/github_repo_upload.go +++ b/pkg/codeql/github_repo_upload.go @@ -21,7 +21,7 @@ import ( "github.com/go-git/go-git/v5/plumbing/transport" "github.com/go-git/go-git/v5/plumbing/transport/http" "github.com/go-git/go-git/v5/storage/memory" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) type GitUploader interface { diff --git a/pkg/kubernetes/utils.go b/pkg/kubernetes/utils.go index 63841ff96d5..2dc652d7792 100644 --- a/pkg/kubernetes/utils.go +++ b/pkg/kubernetes/utils.go @@ -8,7 +8,7 @@ import ( "github.com/SAP/jenkins-library/pkg/command" piperhttp "github.com/SAP/jenkins-library/pkg/http" "github.com/SAP/jenkins-library/pkg/piperutils" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" "github.com/SAP/jenkins-library/pkg/log" ) diff --git a/pkg/yaml/yamlUtil.go b/pkg/yaml/yamlUtil.go index d072e6303d4..a6ab5bb2af4 100644 --- a/pkg/yaml/yamlUtil.go +++ b/pkg/yaml/yamlUtil.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/SAP/jenkins-library/pkg/log" "github.com/SAP/jenkins-library/pkg/piperutils" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" "io" "os" "reflect" From 5c5750dfd9f311d1db6e47e4347c8455f692c6a9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 12:40:02 +0100 Subject: [PATCH 2/5] fix(deps): update module github.com/imdario/mergo to v1 (#5113) * fix(deps): update module github.com/imdario/mergo to v1 * Fix 'module declares its path as: dario.cat/mergo but was required as: github.com/imdario/mergo' --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Ivan Nikiforov --- go.mod | 4 +++- go.sum | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 201dcf231ed..3b2c473dab9 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,8 @@ module github.com/SAP/jenkins-library go 1.23.4 +replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16 + require ( cloud.google.com/go/pubsub v1.36.1 cloud.google.com/go/storage v1.38.0 @@ -36,7 +38,7 @@ require ( github.com/hashicorp/vault/api v1.15.0 github.com/hashicorp/vault/api/auth/approle v0.8.0 github.com/iancoleman/orderedmap v0.2.0 - github.com/imdario/mergo v0.3.15 + github.com/imdario/mergo v1.0.1 github.com/influxdata/influxdb-client-go/v2 v2.13.0 github.com/jarcoal/httpmock v1.0.8 github.com/magiconair/properties v1.8.7 diff --git a/go.sum b/go.sum index b1b74d16d89..dfd3cc84620 100644 --- a/go.sum +++ b/go.sum @@ -598,8 +598,8 @@ github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq github.com/iancoleman/orderedmap v0.2.0 h1:sq1N/TFpYH++aViPcaKjys3bDClUEU7s5B+z6jq8pNA= github.com/iancoleman/orderedmap v0.2.0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM= -github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= +github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= +github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= From c7e31116439b73e4568384563060214078fc1493 Mon Sep 17 00:00:00 2001 From: Manjunath Date: Thu, 23 Jan 2025 13:41:42 +0100 Subject: [PATCH 3/5] Update README about no contributions (#5240) * Update README about no contributions --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6e0e340b81a..b64a24ca3ea 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,30 @@ +# **_Important:_** **_This project is no longer accepting contributions. We appreciate all the past contributions and support from the community._** + [![Maintainability](https://api.codeclimate.com/v1/badges/0e6a23344616e29b4ed0/maintainability)](https://codeclimate.com/github/SAP/jenkins-library/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/0e6a23344616e29b4ed0/test_coverage)](https://codeclimate.com/github/SAP/jenkins-library/test_coverage) [![Go Report Card](https://goreportcard.com/badge/github.com/SAP/jenkins-library)](https://goreportcard.com/report/github.com/SAP/jenkins-library) [![REUSE status](https://api.reuse.software/badge/github.com/SAP/jenkins-library)](https://api.reuse.software/info/github.com/SAP/jenkins-library) -# Project Piper Repository +## Project Piper Repository The Project "Piper" offers default pipelines to easily implement CI/CD processes integrating SAP systems. The corresponding "Shared Library" provides a set of "steps" to build your own scenarios beyond defaults. -# User Documentation +## User Documentation If you want to view the User Documentation of Project Piper please follow this [Piper Pages Link][piper-library-user-doc]. -# Known Issues +## Known Issues A list of known issues is available on the [GitHub issues page of this project][piper-library-issues]. -# How to obtain support +## How to obtain support Feel free to open new issues for feature requests, bugs or general feedback on the [GitHub issues page of this project][piper-library-issues]. Register to our [google group][google-group] in order to get updates or for asking questions. -# Contributing +## Contributing Read and understand our [contribution guidelines][piper-library-contribution] before opening a pull request. From 961cdacec3ce1b4cdddcc2281d58eeb4f67ed738 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 16:17:25 +0100 Subject: [PATCH 4/5] chore(deps): update github artifact actions to v4 (#5102) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/integration-tests-pr.yml | 8 ++++---- .github/workflows/integration-tests.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/integration-tests-pr.yml b/.github/workflows/integration-tests-pr.yml index 0768315a1f7..90aa16b6c16 100644 --- a/.github/workflows/integration-tests-pr.yml +++ b/.github/workflows/integration-tests-pr.yml @@ -82,7 +82,7 @@ jobs: run: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o piper -tags release - name: Upload Piper binary if: success() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: piper path: piper @@ -110,7 +110,7 @@ jobs: echo "matrix=$(go run .github/workflows/parse_integration_test_list.go -file ./integration/github_actions_integration_test_list.yml)" >> "$GITHUB_OUTPUT" - name: Upload integration tests binary if: success() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: integration_tests path: integration_tests @@ -134,11 +134,11 @@ jobs: with: go-version: ${{ needs.start.outputs.go_version }} - name: Download Piper binary - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: piper - name: Download integration tests binary - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: integration_tests path: ./integration/ diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 82adb66867f..edefc99b808 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -53,7 +53,7 @@ jobs: run: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o piper -tags release - name: Upload Piper binary if: success() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: piper path: piper @@ -82,7 +82,7 @@ jobs: echo "matrix=$(go run .github/workflows/parse_integration_test_list.go -file ./integration/github_actions_integration_test_list.yml)" >> "$GITHUB_OUTPUT" - name: Upload integration tests binary if: success() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: integration_tests path: integration_tests @@ -106,11 +106,11 @@ jobs: with: go-version: ${{ needs.start.outputs.go_version }} - name: Download Piper binary - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: piper - name: Download integration tests binary - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: integration_tests path: ./integration/ From dff1749a0751e6c2333162cf30dcb8e607e41a54 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 16:36:08 +0100 Subject: [PATCH 5/5] fix(deps): update module github.com/jeffail/gabs/v2 to v2.7.0 (#5085) * fix(deps): update module github.com/jeffail/gabs/v2 to v2.7.0 * go mod tidy --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Ivan Nikiforov Co-authored-by: Ivan Nikiforov --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3b2c473dab9..86efc102461 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( cloud.google.com/go/storage v1.38.0 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.1 github.com/BurntSushi/toml v1.3.2 - github.com/Jeffail/gabs/v2 v2.6.1 + github.com/Jeffail/gabs/v2 v2.7.0 github.com/Masterminds/sprig v2.22.0+incompatible github.com/antchfx/htmlquery v1.2.4 github.com/aws/aws-sdk-go-v2/config v1.27.31 diff --git a/go.sum b/go.sum index dfd3cc84620..84cc9701676 100644 --- a/go.sum +++ b/go.sum @@ -85,8 +85,8 @@ github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/CycloneDX/cyclonedx-go v0.6.0 h1:SizWGbZzFTC/O/1yh072XQBMxfvsoWqd//oKCIyzFyE= github.com/CycloneDX/cyclonedx-go v0.6.0/go.mod h1:nQCiF4Tvrg5Ieu8qPhYMvzPGMu5I7fANZkrSsJjl5mg= -github.com/Jeffail/gabs/v2 v2.6.1 h1:wwbE6nTQTwIMsMxzi6XFQQYRZ6wDc1mSdxoAN+9U4Gk= -github.com/Jeffail/gabs/v2 v2.6.1/go.mod h1:xCn81vdHKxFUuWWAaD5jCTQDNPBMh5pPs9IJ+NcziBI= +github.com/Jeffail/gabs/v2 v2.7.0 h1:Y2edYaTcE8ZpRsR2AtmPu5xQdFDIthFG0jYhu5PY8kg= +github.com/Jeffail/gabs/v2 v2.7.0/go.mod h1:dp5ocw1FvBBQYssgHsG7I1WYsiLRtkUaB1FEtSwvNUw= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=