Skip to content

Commit 5fc06ab

Browse files
committed
Merge remote-tracking branch 'origin' into malwarescan-async-scan
* origin: (61 commits) fix(deps):update python to v3.10 for pythonBuild (SAP#5468) ABAP assemblePackages Alternative phase name (SAP#5469) feat: add pnpm to path after installation (SAP#5465) fix: url encoding for branch, repo name (SAP#5466) fix(logging): shorten secret not resolved message and attach param.name to it (SAP#5467) Revert "ci(release): update/create dynamic tags with each release" (SAP#5456) feat(CxOne): Scan summary in PR (SAP#5464) fix(sonar): Fix null value for errors entry in sonarscan report (SAP#5459) feat(codeqlExecuteScan): multi language support (SAP#5462) fix: handle dockerImage from custom workflow inputs (SAP#5460) Fix influx counter for whitesource (SAP#5406) docs: error patterns in steps (SAP#5455) ci(release): update/create dynamic tags with each release (SAP#5454) feat: add GitHub Actions log format support and auto-detect environment (SAP#5450) fix(deps): Updated mtaBuild docker image (SAP#5419) Updated mavenBuild description (SAP#5439) deprecate 'useDetect8' (SAP#5443) Revert "chore(cloudFoundryDeploy): deployDescriptor stash resource" (SAP#5444) chore(cloudFoundryDeploy): deployDescriptor stash resource (SAP#5302) feat: introducing json encoder with escape html for event (SAP#5442) ...
2 parents f44ab6e + db7e796 commit 5fc06ab

File tree

249 files changed

+4953
-1795
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

249 files changed

+4953
-1795
lines changed

.github/CODEOWNERS

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,13 @@ AscAppUpload* @Mau04 @inf2381
6666
credentialdiggerScan* @SAP/credential-digger-members @SAP/credential-digger-admins
6767
CredentialdiggerScan* @SAP/credential-digger-admins @SAP/credential-digger-members
6868

69+
detectExecuteScan* @SAP/oss-team
70+
DetectExecuteScan* @SAP/oss-team
71+
whitesourceExecuteScan* @SAP/oss-team
72+
WhitesourceExecuteScan* @SAP/oss-team
73+
protecodeExecuteScan* @SAP/oss-team
74+
ProtecodeExecuteScan* @SAP/oss-team
75+
6976
#####################
7077
# Integration tests #
7178
#####################
@@ -88,6 +95,10 @@ integration/testdata/TestCnbIntegration/ @SAP/jenkins-library-cnb
8895
/pkg/abap/ @SAP/jenkins-library-abap
8996
/pkg/abaputils/ @SAP/jenkins-library-abap
9097

98+
/pkg/blackduck/ @SAP/oss-team
99+
/pkg/whitesource/ @SAP/oss-team
100+
/pkg/protecode/ @SAP/oss-team
101+
91102
####################
92103
# Misc #
93104
####################

.github/renovate.json

Lines changed: 87 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,107 @@
33
"extends": [
44
"config:base"
55
],
6-
"ignorePaths": [
7-
"integration/testdata/**",
8-
"test/resources/**"
9-
],
106
"labels": [
117
"dependencies"
128
],
139
"packageRules": [
1410
{
1511
"description": "Create PRs to roll back Go module if the current version is not found in the registry.",
1612
"matchManagers": ["gomod"],
17-
"rollbackPrs": true
13+
"rollbackPrs": true,
14+
"matchPaths": [
15+
"!integration/testdata/**",
16+
"!test/resources/**"
17+
]
1818
},
1919
{
2020
"description": "Automerge patch version updates for Go modules (except versions 0.x as they could have breaking changes)",
2121
"matchManagers": ["gomod"],
2222
"matchUpdateTypes": ["patch"],
2323
"matchCurrentVersion": "!/^(v?0)/",
2424
"automerge": true,
25-
"addLabels": ["renovate-automerge"]
25+
"addLabels": ["renovate-automerge"],
26+
"matchPaths": [
27+
"!integration/testdata/**",
28+
"!test/resources/**"
29+
]
30+
}
31+
],
32+
"customManagers": [
33+
{
34+
"customType": "regex",
35+
"matchStringsStrategy": "any",
36+
"managerFilePatterns": [
37+
"cmd\/golangBuild.go"
38+
],
39+
"matchStrings": [
40+
"\"github.com\/CycloneDX\/(?<depName>cyclonedx-gomod)\/cmd\/cyclonedx-gomod@v(?<currentValue>[^\"]+)\""
41+
],
42+
"depTypeTemplate": "dependencies",
43+
"datasourceTemplate": "github-releases",
44+
"depNameTemplate": "CycloneDX/{{{depName}}}",
45+
"extractVersionTemplate": "v(?<version>.*)",
46+
"autoReplaceStringTemplate": "\"github.com/{{{depName}}}/cmd/cyclonedx-gomod@v{{{newValue}}}\""
47+
},
48+
{
49+
"customType": "regex",
50+
"matchStringsStrategy": "any",
51+
"managerFilePatterns": [
52+
"cmd\/gradleExecuteBuild.go"
53+
],
54+
"matchStrings": [
55+
"\"org.cyclonedx:(?<depName>cyclonedx-gradle-plugin):(?<currentValue>[^\"\n]+)\""
56+
],
57+
"depTypeTemplate": "dependencies",
58+
"datasourceTemplate": "gradle-version",
59+
"depNameTemplate": "org.cyclonedx:{{{depName}}}",
60+
"extractVersionTemplate": "^(?<version>.*)",
61+
"autoReplaceStringTemplate": "\"{{{depName}}}:{{{newValue}}}\""
62+
},
63+
{
64+
"customType": "regex",
65+
"matchStringsStrategy": "any",
66+
"managerFilePatterns": [
67+
"cmd\/mavenBuild.go"
68+
],
69+
"matchStrings": [
70+
"\"org.cyclonedx:(?<depName>cyclonedx-maven-plugin):(?<currentValue>[^\"]+)\""
71+
],
72+
"depTypeTemplate": "dependencies",
73+
"datasourceTemplate": "maven",
74+
"depNameTemplate": "org.cyclonedx:{{{depName}}}",
75+
"extractVersionTemplate": "^(?<version>.*)",
76+
"autoReplaceStringTemplate": "\"{{{depName}}}:{{{newValue}}}\""
77+
},
78+
{
79+
"customType": "regex",
80+
"matchStringsStrategy": "any",
81+
"managerFilePatterns": [
82+
"integration\/testdata\/TestGradleIntegration\/java-project-with-bom-plugin\/build.gradle"
83+
],
84+
"matchStrings": [
85+
"id \"(?<depName>org.cyclonedx.bom)\" version \"(?<currentValue>.*)\""
86+
],
87+
"depTypeTemplate": "dependencies",
88+
"datasourceTemplate": "gradle-version",
89+
"depNameTemplate": "{{depName}}",
90+
"extractVersionTemplate": "(?<version>.*)",
91+
"autoReplaceStringTemplate": "id \"{{depName}}\" version \"{{newValue}}\""
92+
},
93+
{
94+
"customType": "regex",
95+
"matchStringsStrategy": "any",
96+
"managerFilePatterns": [
97+
"integration\/integration_golang_test.go"
98+
],
99+
"matchStrings": [
100+
"\"github.com\/CycloneDX\/(?<depName>cyclonedx-gomod)\/cmd\/cyclonedx-gomod@v(?<currentValue>[^\"]+)\""
101+
],
102+
"depTypeTemplate": "dependencies",
103+
"datasourceTemplate": "github-releases",
104+
"depNameTemplate": "CycloneDX/{{{depName}}}",
105+
"extractVersionTemplate": "v(?<version>.*)",
106+
"autoReplaceStringTemplate": "\"github.com/{{{depName}}}/cmd/cyclonedx-gomod@v{{{newValue}}}\""
26107
}
27108
],
28109
"postUpdateOptions": [

.github/workflows/consumer-tests-pr.yml

Lines changed: 0 additions & 72 deletions
This file was deleted.

.github/workflows/consumer-tests.yml

Lines changed: 0 additions & 42 deletions
This file was deleted.

.github/workflows/verify-go.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,7 @@ jobs:
2828
- name: unit-test
2929
id: unit-test
3030
run: go test -tags=unit ./... -coverprofile cover.out
31-
# run code coverage upload to code climate on main branch since PR branch will not have access to secret
32-
- name: unit-test-code-climate-upload
33-
if: ${{ (github.event_name != 'pull_request') || (github.event.pull_request.head.repo.full_name == github.repository) }}
34-
uses: paambaati/codeclimate-action@v5
35-
env:
36-
CC_TEST_REPORTER_ID: ${{ secrets.CODE_CLIMATE_REPORTER_ID }}
37-
with:
38-
coverageLocations: cover.out:gocov
39-
# truncate package name from file paths in report
40-
prefix: github.com/SAP/jenkins-library/
31+
4132
format:
4233
runs-on: ubuntu-latest
4334
steps:

cmd/abapAddonAssemblyKitCheckCVs_generated.go

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/abapAddonAssemblyKitCheckPV_generated.go

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/abapAddonAssemblyKitCheck_generated.go

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/abapAddonAssemblyKitCreateTargetVector_generated.go

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/abapAddonAssemblyKitPublishTargetVector_generated.go

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)