diff --git a/.github/workflows/frogbot-scan-and-fix.yml b/.github/workflows/frogbot-scan-and-fix.yml index 510651bb3..2977b659c 100644 --- a/.github/workflows/frogbot-scan-and-fix.yml +++ b/.github/workflows/frogbot-scan-and-fix.yml @@ -1,5 +1,6 @@ name: "Frogbot Scan and Fix" on: + workflow_dispatch: schedule: # The repository will be scanned once a day at 00:00 GMT. - cron: "0 0 * * *" diff --git a/commands/testdata/config/frogbot-config-test-unmarshal.yml b/commands/testdata/config/frogbot-config-test-unmarshal.yml index 369dba1bd..cc0d6cc79 100644 --- a/commands/testdata/config/frogbot-config-test-unmarshal.yml +++ b/commands/testdata/config/frogbot-config-test-unmarshal.yml @@ -4,6 +4,7 @@ branches: - master - main + emailAuthor: "myemail@jfrog.com" scan: projects: - installCommand: nuget restore diff --git a/commands/utils/consts.go b/commands/utils/consts.go index 1875d5f93..d50310fd8 100644 --- a/commands/utils/consts.go +++ b/commands/utils/consts.go @@ -79,6 +79,7 @@ const ( GitPullRequestIDEnv = "JF_GIT_PULL_REQUEST_ID" GitApiEndpointEnv = "JF_GIT_API_ENDPOINT" GitAggregateFixesEnv = "JF_GIT_AGGREGATE_FIXES" + GitEmailAuthorEnv = "JF_GIT_EMAIL_AUTHOR" // Comment vulnerabilitiesTableHeader = "\n| SEVERITY | DIRECT DEPENDENCIES | IMPACTED DEPENDENCY | FIXED VERSIONS |\n| :---------------------: | :----------------------------------: | :-----------------------------------: | :---------------------------------: |" diff --git a/commands/utils/git.go b/commands/utils/git.go index ed1f4db8b..837223a66 100644 --- a/commands/utils/git.go +++ b/commands/utils/git.go @@ -214,7 +214,7 @@ func (gm *GitManager) commit(commitMessage string) error { _, err = worktree.Commit(commitMessage, &git.CommitOptions{ Author: &object.Signature{ Name: frogbotAuthorName, - Email: frogbotAuthorEmail, + Email: gm.git.EmailAuthor, When: time.Now(), }, }) diff --git a/commands/utils/params.go b/commands/utils/params.go index 18274c0f7..03f8236c6 100644 --- a/commands/utils/params.go +++ b/commands/utils/params.go @@ -191,6 +191,7 @@ type Git struct { BranchNameTemplate string `yaml:"branchNameTemplate,omitempty"` CommitMessageTemplate string `yaml:"commitMessageTemplate,omitempty"` PullRequestTitleTemplate string `yaml:"pullRequestTitleTemplate,omitempty"` + EmailAuthor string `yaml:"emailAuthor,omitempty"` AggregateFixes bool `yaml:"aggregateFixes,omitempty"` PullRequestID int } @@ -223,7 +224,14 @@ func (g *Git) setDefaultsIfNeeded(git *Git) (err error) { } g.AggregateFixes = git.AggregateFixes if !g.AggregateFixes { - g.AggregateFixes, err = getBoolEnv(GitAggregateFixesEnv, false) + if g.AggregateFixes, err = getBoolEnv(GitAggregateFixesEnv, false); err != nil { + return + } + } + if g.EmailAuthor == "" { + if g.EmailAuthor = getTrimmedEnv(GitEmailAuthorEnv); g.EmailAuthor == "" { + g.EmailAuthor = frogbotAuthorEmail + } } // Non-mandatory git branch pr id. if pullRequestIDString := getTrimmedEnv(GitPullRequestIDEnv); pullRequestIDString != "" { @@ -291,9 +299,8 @@ func getConfigFileContent(client vcsclient.VcsClient, clientInfo *ClientInfo) (c if err != nil && !missingConfigErr { return nil, err } - // Read the config from the current working dir - if len(configFileContent) == 0 && err == nil { + if len(configFileContent) == 0 { configFileContent, err = ReadConfigFromFileSystem(osFrogbotConfigPath) } return diff --git a/commands/utils/params_test.go b/commands/utils/params_test.go index bfbc15fbd..fcdae5bae 100644 --- a/commands/utils/params_test.go +++ b/commands/utils/params_test.go @@ -137,6 +137,7 @@ func TestExtractAndAssertRepoParams(t *testing.T) { GitBaseBranchEnv: "dev", GitPullRequestIDEnv: "1", GitAggregateFixesEnv: "true", + GitEmailAuthorEnv: "myemail@jfrog.com", MinSeverityEnv: "high", FixableOnlyEnv: "true", }) @@ -164,7 +165,7 @@ func TestExtractAndAssertRepoParams(t *testing.T) { assert.Equal(t, "High", repo.MinSeverity) assert.True(t, repo.FixableOnly) assert.Equal(t, true, repo.AggregateFixes) - + assert.Equal(t, "myemail@jfrog.com", repo.EmailAuthor) assert.ElementsMatch(t, []string{"watch-2", "watch-1"}, repo.Watches) for _, project := range repo.Projects { testExtractAndAssertProjectParams(t, project) @@ -191,6 +192,7 @@ func TestBuildRepoAggregatorWithEmptyScan(t *testing.T) { configAggregator, err := BuildRepoAggregator(configFileContent, gitParams, server) assert.NoError(t, err) assert.Len(t, configAggregator, 1) + assert.Equal(t, frogbotAuthorEmail, configAggregator[0].EmailAuthor) assert.False(t, configAggregator[0].AggregateFixes) scan := configAggregator[0].Scan assert.False(t, scan.IncludeAllVulnerabilities) @@ -398,6 +400,7 @@ func TestFrogbotConfigAggregator_unmarshalFrogbotConfigYaml(t *testing.T) { assert.NoError(t, err) firstRepo := configAggregator[0] assert.Equal(t, "npm-repo", firstRepo.RepoName) + assert.Equal(t, "myemail@jfrog.com", firstRepo.EmailAuthor) assert.ElementsMatch(t, []string{"master", "main"}, firstRepo.Branches) assert.False(t, *firstRepo.FailOnSecurityIssues) firstRepoProject := firstRepo.Projects[0] diff --git a/docs/install-azure-repos.md b/docs/install-azure-repos.md index b58df235b..fbd739d8a 100644 --- a/docs/install-azure-repos.md +++ b/docs/install-azure-repos.md @@ -170,6 +170,10 @@ To install Frogbot on Azure Repos repositories, follow these steps. # Set the minimum severity for vulnerabilities that should be fixed and commented on in pull requests # The following values are accepted: Low, Medium, High or Critical # JF_MIN_SEVERITY: "" + + # [Optional, Default: eco-system+frogbot@jfrog.com] + # Set the email of the commit author + # JF_GIT_EMAIL_AUTHOR: "" displayName: 'Download and Run Frogbot' inputs: script: | diff --git a/docs/install-bitbucket-server.md b/docs/install-bitbucket-server.md index ac16d1f08..400a3a47f 100644 --- a/docs/install-bitbucket-server.md +++ b/docs/install-bitbucket-server.md @@ -86,17 +86,17 @@ // JF_RELEASES_REPO= "" /////////////////////////////////////////////////////////////////////////// - // If your project uses a 'frogbot-config.yml' file, you should define // - // the following variables inside the file, instead of here. // - /////////////////////////////////////////////////////////////////////////// - - // [Mandatory] - // The name of the repository - JF_GIT_REPO: "" - - // [Mandatory] - // The name of the branch on which Frogbot will perform the scan - JF_GIT_BASE_BRANCH: "" + // If your project uses a 'frogbot-config.yml' file, you should define // + // the following variables inside the file, instead of here. // + /////////////////////////////////////////////////////////////////////////// + + // [Mandatory] + // The name of the repository + JF_GIT_REPO= "" + + // [Mandatory] + // The name of the branch on which Frogbot will perform the scan + JF_GIT_BASE_BRANCH= "" // [Mandatory if the two conditions below are met] // 1. The project uses yarn 2, NuGet or .NET to download its dependencies @@ -168,6 +168,10 @@ // Set the minimum severity for vulnerabilities that should be fixed and commented on in pull requests // The following values are accepted: Low, Medium, High or Critical // JF_MIN_SEVERITY= "" + + // [Optional, Default: eco-system+frogbot@jfrog.com] + // Set the email of the commit author + // JF_GIT_EMAIL_AUTHOR: "" } stages { @@ -204,15 +208,12 @@ // powershell """.\frogbot.exe scan-and-fix-repos""" } } - } - } - ``` - - **Important** - - - Make sure that either **JF_USER** and **JF_PASSWORD** or **JF_ACCESS_TOKEN** are set in the Jenkinsfile, but not both. - - Make sure that all the build tools that are used to build the project are installed on the Jenkins agent. - + } + } + +**Important** +- Make sure that either **JF_USER** and **JF_PASSWORD** or **JF_ACCESS_TOKEN** are set in the Jenkinsfile, but not both. +- Make sure that all the build tools that are used to build the project are installed on the Jenkins agent. diff --git a/docs/install-github.md b/docs/install-github.md index e2230c785..11295b2b8 100644 --- a/docs/install-github.md +++ b/docs/install-github.md @@ -196,6 +196,10 @@ // Set the minimum severity for vulnerabilities that should be fixed and commented on in pull requests // The following values are accepted: Low, Medium, High or Critical // JF_MIN_SEVERITY= "" + + // [Optional, Default: eco-system+frogbot@jfrog.com] + // Set the email of the commit author + // JF_GIT_EMAIL_AUTHOR: "" } stages { stage('Download Frogbot') { diff --git a/docs/install-gitlab.md b/docs/install-gitlab.md index 17dbd6462..164e0380f 100644 --- a/docs/install-gitlab.md +++ b/docs/install-gitlab.md @@ -134,6 +134,10 @@ frogbot-scan: # Set the minimum severity for vulnerabilities that should be fixed and commented on in pull requests # The following values are accepted: Low, Medium, High or Critical # JF_MIN_SEVERITY: "" + + # [Optional, Default: eco-system+frogbot@jfrog.com] + # Set the email of the commit author + # JF_GIT_EMAIL_AUTHOR: "" script: # For Linux / MacOS runner: - | diff --git a/docs/templates/.frogbot/frogbot-config.yml b/docs/templates/.frogbot/frogbot-config.yml index f35d5a16c..6c3991e5a 100644 --- a/docs/templates/.frogbot/frogbot-config.yml +++ b/docs/templates/.frogbot/frogbot-config.yml @@ -34,6 +34,10 @@ # If false, Frogbot creates a separate pull request for each fix. # aggregateFixes: false + # [Optional, Default: eco-system+frogbot@jfrog.com] + # Set the email of the commit author + # emailAuthor: "" + # Frogbot scanning parameters scan: # [Default: false] diff --git a/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-go.yml b/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-go.yml index 3b229b72e..c5545d0f9 100644 --- a/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-go.yml +++ b/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-go.yml @@ -1,5 +1,6 @@ name: "Frogbot Scan and Fix" on: + workflow_dispatch: schedule: # The repository will be scanned once a day at 00:00 GMT. - cron: "0 0 * * *" @@ -57,8 +58,6 @@ jobs: # The 'frogbot' executable and other tools it needs will be downloaded through this repository. # JF_RELEASES_REPO: "" - - ########################################################################## ## If your project uses a 'frogbot-config.yml' file, you can define ## ## the following variables inside the file, instead of here. ## @@ -115,3 +114,7 @@ jobs: # Set the minimum severity for vulnerabilities that should be fixed and commented on in pull requests # The following values are accepted: Low, Medium, High or Critical # JF_MIN_SEVERITY: "" + + # [Optional, Default: eco-system+frogbot@jfrog.com] + # Set the email of the commit author + # JF_GIT_EMAIL_AUTHOR: "" diff --git a/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-maven.yml b/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-maven.yml index 2307f9ada..971646d67 100644 --- a/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-maven.yml +++ b/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-maven.yml @@ -1,5 +1,6 @@ name: "Frogbot Scan and Fix" on: + workflow_dispatch: schedule: # The repository will be scanned once a day at 00:00 GMT. - cron: "0 0 * * *" @@ -58,8 +59,6 @@ jobs: # The 'frogbot' executable and other tools it needs will be downloaded through this repository. # JF_RELEASES_REPO: "" - - ########################################################################## ## If your project uses a 'frogbot-config.yml' file, you can define ## ## the following variables inside the file, instead of here. ## @@ -116,3 +115,7 @@ jobs: # Set the minimum severity for vulnerabilities that should be fixed and commented on in pull requests # The following values are accepted: Low, Medium, High or Critical # JF_MIN_SEVERITY: "" + + # [Optional, Default: eco-system+frogbot@jfrog.com] + # Set the email of the commit author + # JF_GIT_EMAIL_AUTHOR: "" \ No newline at end of file diff --git a/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-npm.yml b/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-npm.yml index ef83459d2..fbc6350e0 100644 --- a/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-npm.yml +++ b/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-npm.yml @@ -1,5 +1,6 @@ name: "Frogbot Scan and Fix" on: + workflow_dispatch: schedule: # The repository will be scanned once a day at 00:00 GMT. - cron: "0 0 * * *" @@ -57,8 +58,6 @@ jobs: # The 'frogbot' executable and other tools it needs will be downloaded through this repository. # JF_RELEASES_REPO: "" - - ########################################################################## ## If your project uses a 'frogbot-config.yml' file, you can define ## ## the following variables inside the file, instead of here. ## @@ -121,4 +120,8 @@ jobs: # [Optional] # Set the minimum severity for vulnerabilities that should be fixed and commented on in pull requests # The following values are accepted: Low, Medium, High or Critical - # JF_MIN_SEVERITY: "" \ No newline at end of file + # JF_MIN_SEVERITY: "" + + # [Optional, Default: eco-system+frogbot@jfrog.com] + # Set the email of the commit author + # JF_GIT_EMAIL_AUTHOR: "" \ No newline at end of file diff --git a/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-pip.yml b/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-pip.yml index 2046357c5..a8d20b60a 100644 --- a/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-pip.yml +++ b/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-pip.yml @@ -1,5 +1,6 @@ name: "Frogbot Scan and Fix" on: + workflow_dispatch: schedule: # The repository will be scanned once a day at 00:00 GMT. - cron: "0 0 * * *" @@ -57,8 +58,6 @@ jobs: # The 'frogbot' executable and other tools it needs will be downloaded through this repository. # JF_RELEASES_REPO: "" - - ########################################################################## ## If your project uses a 'frogbot-config.yml' file, you can define ## ## the following variables inside the file, instead of here. ## @@ -118,4 +117,8 @@ jobs: # [Optional] # Set the minimum severity for vulnerabilities that should be fixed and commented on in pull requests # The following values are accepted: Low, Medium, High or Critical - # JF_MIN_SEVERITY: "" \ No newline at end of file + # JF_MIN_SEVERITY: "" + + # [Optional, Default: eco-system+frogbot@jfrog.com] + # Set the email of the commit author + # JF_GIT_EMAIL_AUTHOR: "" \ No newline at end of file diff --git a/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-pipenv.yml b/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-pipenv.yml index 32132a599..cca22bb2f 100644 --- a/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-pipenv.yml +++ b/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-pipenv.yml @@ -1,5 +1,6 @@ name: "Frogbot Scan and Fix" on: + workflow_dispatch: schedule: # The repository will be scanned once a day at 00:00 GMT. - cron: "0 0 * * *" @@ -60,8 +61,6 @@ jobs: # The 'frogbot' executable and other tools it needs will be downloaded through this repository. # JF_RELEASES_REPO: "" - - ########################################################################## ## If your project uses a 'frogbot-config.yml' file, you can define ## ## the following variables inside the file, instead of here. ## @@ -121,4 +120,8 @@ jobs: # [Optional] # Set the minimum severity for vulnerabilities that should be fixed and commented on in pull requests # The following values are accepted: Low, Medium, High or Critical - # JF_MIN_SEVERITY: "" \ No newline at end of file + # JF_MIN_SEVERITY: "" + + # [Optional, Default: eco-system+frogbot@jfrog.com] + # Set the email of the commit author + # JF_GIT_EMAIL_AUTHOR: "" \ No newline at end of file diff --git a/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-poetry.yml b/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-poetry.yml index 10e0384ff..e301057fb 100644 --- a/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-poetry.yml +++ b/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-poetry.yml @@ -1,5 +1,6 @@ name: "Frogbot Scan and Fix" on: + workflow_dispatch: schedule: # The repository will be scanned once a day at 00:00 GMT. - cron: "0 0 * * *" @@ -61,8 +62,6 @@ jobs: # The 'frogbot' executable and other tools it needs will be downloaded through this repository. # JF_RELEASES_REPO: "" - - ########################################################################## ## If your project uses a 'frogbot-config.yml' file, you can define ## ## the following variables inside the file, instead of here. ## @@ -118,4 +117,8 @@ jobs: # [Optional] # Set the minimum severity for vulnerabilities that should be fixed and commented on in pull requests # The following values are accepted: Low, Medium, High or Critical - # JF_MIN_SEVERITY: "" \ No newline at end of file + # JF_MIN_SEVERITY: "" + + # [Optional, Default: eco-system+frogbot@jfrog.com] + # Set the email of the commit author + # JF_GIT_EMAIL_AUTHOR: "" \ No newline at end of file diff --git a/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-yarn.yml b/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-yarn.yml index ef83459d2..fbc6350e0 100644 --- a/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-yarn.yml +++ b/docs/templates/github-actions/scan-and-fix/frogbot-scan-and-fix-yarn.yml @@ -1,5 +1,6 @@ name: "Frogbot Scan and Fix" on: + workflow_dispatch: schedule: # The repository will be scanned once a day at 00:00 GMT. - cron: "0 0 * * *" @@ -57,8 +58,6 @@ jobs: # The 'frogbot' executable and other tools it needs will be downloaded through this repository. # JF_RELEASES_REPO: "" - - ########################################################################## ## If your project uses a 'frogbot-config.yml' file, you can define ## ## the following variables inside the file, instead of here. ## @@ -121,4 +120,8 @@ jobs: # [Optional] # Set the minimum severity for vulnerabilities that should be fixed and commented on in pull requests # The following values are accepted: Low, Medium, High or Critical - # JF_MIN_SEVERITY: "" \ No newline at end of file + # JF_MIN_SEVERITY: "" + + # [Optional, Default: eco-system+frogbot@jfrog.com] + # Set the email of the commit author + # JF_GIT_EMAIL_AUTHOR: "" \ No newline at end of file diff --git a/docs/templates/jfrog-pipelines/pipelines-dotnet.yml b/docs/templates/jfrog-pipelines/pipelines-dotnet.yml index 19bb193f9..ab57c9507 100644 --- a/docs/templates/jfrog-pipelines/pipelines-dotnet.yml +++ b/docs/templates/jfrog-pipelines/pipelines-dotnet.yml @@ -143,6 +143,10 @@ pipelines: # The following values are accepted: Low, Medium, High or Critical # JF_MIN_SEVERITY: "" + # [Optional, Default: eco-system+frogbot@jfrog.com] + # Set the email of the commit author + # JF_GIT_EMAIL_AUTHOR: "" + execution: onExecute: - cd $res_frogbotGitRepo_resourcePath diff --git a/docs/templates/jfrog-pipelines/pipelines-go.yml b/docs/templates/jfrog-pipelines/pipelines-go.yml index 367c96663..2037e3ac6 100644 --- a/docs/templates/jfrog-pipelines/pipelines-go.yml +++ b/docs/templates/jfrog-pipelines/pipelines-go.yml @@ -144,6 +144,10 @@ pipelines: # The following values are accepted: Low, Medium, High or Critical # JF_MIN_SEVERITY: "" + # [Optional, Default: eco-system+frogbot@jfrog.com] + # Set the email of the commit author + # JF_GIT_EMAIL_AUTHOR: "" + execution: onExecute: - cd $res_frogbotGitRepo_resourcePath diff --git a/docs/templates/jfrog-pipelines/pipelines-gradle.yml b/docs/templates/jfrog-pipelines/pipelines-gradle.yml index 7cc455305..c2a8c0d5a 100644 --- a/docs/templates/jfrog-pipelines/pipelines-gradle.yml +++ b/docs/templates/jfrog-pipelines/pipelines-gradle.yml @@ -148,6 +148,10 @@ pipelines: # The following values are accepted: Low, Medium, High or Critical # JF_MIN_SEVERITY: "" + # [Optional, Default: eco-system+frogbot@jfrog.com] + # Set the email of the commit author + # JF_GIT_EMAIL_AUTHOR: "" + execution: onExecute: - cd $res_frogbotGitRepo_resourcePath diff --git a/docs/templates/jfrog-pipelines/pipelines-maven.yml b/docs/templates/jfrog-pipelines/pipelines-maven.yml index c5763e381..7b43cd078 100644 --- a/docs/templates/jfrog-pipelines/pipelines-maven.yml +++ b/docs/templates/jfrog-pipelines/pipelines-maven.yml @@ -136,6 +136,10 @@ pipelines: # The following values are accepted: Low, Medium, High or Critical # JF_MIN_SEVERITY: "" + # [Optional, Default: eco-system+frogbot@jfrog.com] + # Set the email of the commit author + # JF_GIT_EMAIL_AUTHOR: "" + execution: onExecute: - cd $res_frogbotGitRepo_resourcePath diff --git a/docs/templates/jfrog-pipelines/pipelines-npm.yml b/docs/templates/jfrog-pipelines/pipelines-npm.yml index 770c68db1..4f08401da 100644 --- a/docs/templates/jfrog-pipelines/pipelines-npm.yml +++ b/docs/templates/jfrog-pipelines/pipelines-npm.yml @@ -159,6 +159,10 @@ pipelines: # The following values are accepted: Low, Medium, High or Critical # JF_MIN_SEVERITY: "" + # [Optional, Default: eco-system+frogbot@jfrog.com] + # Set the email of the commit author + # JF_GIT_EMAIL_AUTHOR: "" + execution: onExecute: - cd $res_frogbotGitRepo_resourcePath diff --git a/docs/templates/jfrog-pipelines/pipelines-pip.yml b/docs/templates/jfrog-pipelines/pipelines-pip.yml index dd87bd995..7ad11ff1c 100644 --- a/docs/templates/jfrog-pipelines/pipelines-pip.yml +++ b/docs/templates/jfrog-pipelines/pipelines-pip.yml @@ -147,6 +147,10 @@ pipelines: # The following values are accepted: Low, Medium, High or Critical # JF_MIN_SEVERITY: "" + # [Optional, Default: eco-system+frogbot@jfrog.com] + # Set the email of the commit author + # JF_GIT_EMAIL_AUTHOR: "" + execution: onExecute: - cd $res_frogbotGitRepo_resourcePath diff --git a/docs/templates/jfrog-pipelines/pipelines-pipenv.yml b/docs/templates/jfrog-pipelines/pipelines-pipenv.yml index 74fe8ae89..6e11de195 100644 --- a/docs/templates/jfrog-pipelines/pipelines-pipenv.yml +++ b/docs/templates/jfrog-pipelines/pipelines-pipenv.yml @@ -140,6 +140,10 @@ pipelines: # The following values are accepted: Low, Medium, High or Critical # JF_MIN_SEVERITY: "" + # [Optional, Default: eco-system+frogbot@jfrog.com] + # Set the email of the commit author + # JF_GIT_EMAIL_AUTHOR: "" + execution: onExecute: - cd $res_frogbotGitRepo_resourcePath diff --git a/docs/templates/jfrog-pipelines/pipelines-poetry.yml b/docs/templates/jfrog-pipelines/pipelines-poetry.yml index 19a8397cf..abe1cd284 100644 --- a/docs/templates/jfrog-pipelines/pipelines-poetry.yml +++ b/docs/templates/jfrog-pipelines/pipelines-poetry.yml @@ -140,6 +140,10 @@ pipelines: # The following values are accepted: Low, Medium, High or Critical # JF_MIN_SEVERITY: "" + # [Optional, Default: eco-system+frogbot@jfrog.com] + # Set the email of the commit author + # JF_GIT_EMAIL_AUTHOR: "" + execution: onExecute: - cd $res_frogbotGitRepo_resourcePath diff --git a/docs/templates/jfrog-pipelines/pipelines-yarn2.yml b/docs/templates/jfrog-pipelines/pipelines-yarn2.yml index a3df8c8ec..aab4c81a2 100644 --- a/docs/templates/jfrog-pipelines/pipelines-yarn2.yml +++ b/docs/templates/jfrog-pipelines/pipelines-yarn2.yml @@ -143,6 +143,10 @@ pipelines: # The following values are accepted: Low, Medium, High or Critical # JF_MIN_SEVERITY: "" + # [Optional, Default: eco-system+frogbot@jfrog.com] + # Set the email of the commit author + # JF_GIT_EMAIL_AUTHOR: "" + execution: onExecute: - cd $res_frogbotGitRepo_resourcePath diff --git a/go.mod b/go.mod index cbd9b6919..6c6508597 100644 --- a/go.mod +++ b/go.mod @@ -8,8 +8,8 @@ require ( github.com/jfrog/build-info-go v1.9.6 github.com/jfrog/froggit-go v1.8.1 github.com/jfrog/gofrog v1.3.0 - github.com/jfrog/jfrog-cli-core/v2 v2.36.0 - github.com/jfrog/jfrog-client-go v1.30.1 + github.com/jfrog/jfrog-cli-core/v2 v2.37.1 + github.com/jfrog/jfrog-client-go v1.31.0 github.com/mholt/archiver/v3 v3.5.1 github.com/stretchr/testify v1.8.4 github.com/urfave/cli/v2 v2.25.1 diff --git a/go.sum b/go.sum index 62a3ac94f..5540c11a7 100644 --- a/go.sum +++ b/go.sum @@ -222,10 +222,10 @@ github.com/jfrog/build-info-go v1.9.6 h1:lCJ2j5uXAlJsSwDe5J8WD7Co1f/hUlZvMfwfb5A github.com/jfrog/build-info-go v1.9.6/go.mod h1:GbuFS+viHCKZYx9nWHYu7ab1DgQkFdtVN3BJPUNb2D4= github.com/jfrog/gofrog v1.3.0 h1:o4zgsBZE4QyDbz2M7D4K6fXPTBJht+8lE87mS9bw7Gk= github.com/jfrog/gofrog v1.3.0/go.mod h1:IFMc+V/yf7rA5WZ74CSbXe+Lgf0iApEQLxRZVzKRUR0= -github.com/jfrog/jfrog-cli-core/v2 v2.36.0 h1:SRS41DL34VkCZMxdIamQ/jUhM2lI72LGxLgLV+EouNs= -github.com/jfrog/jfrog-cli-core/v2 v2.36.0/go.mod h1:Wvf/XWVcRSu1ZuloLOofkifuM8BLZZ2LiYYzmdUn80Y= -github.com/jfrog/jfrog-client-go v1.30.1 h1:wASYBrFkpWzQHTNnCIIfqpDLtQF5oNcwQK9rrv8I8AA= -github.com/jfrog/jfrog-client-go v1.30.1/go.mod h1:qEJxoe68sUtqHJ1YhXv/7pKYP/9p1D5tJrruzJKYeoI= +github.com/jfrog/jfrog-cli-core/v2 v2.37.1 h1:VE/6cagGor/5lWB7l+aU5FlhztoHM9q9M2FlWcn3ESo= +github.com/jfrog/jfrog-cli-core/v2 v2.37.1/go.mod h1:i62WcX9jQbH0dJjQdkmJAGridZgFVIK1B3yIPfXayHI= +github.com/jfrog/jfrog-client-go v1.31.0 h1:VIptdPkECaM0UDbKE2ZjFZh9i85W99xM65c6rFxDNj4= +github.com/jfrog/jfrog-client-go v1.31.0/go.mod h1:qEJxoe68sUtqHJ1YhXv/7pKYP/9p1D5tJrruzJKYeoI= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= diff --git a/schema/frogbot-schema.json b/schema/frogbot-schema.json index 0ec2e445f..460d86f38 100644 --- a/schema/frogbot-schema.json +++ b/schema/frogbot-schema.json @@ -69,10 +69,17 @@ "[Security_Update]-${FIX_VERSION}", "[Feature]" ] - } , + }, "aggregateFixes": { "type": "boolean", "default": "false" + }, + "emailAuthor": { + "type": "string", + "default": "eco-system+frogbot@jfrog.com", + "examples": [ + "myemail@jfrog.com" + ] } }, "examples": [