From ce878523afa2c50c6696868a0e2d26977f2dac85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9lio=20Rocha?= Date: Wed, 24 Jul 2024 10:37:58 +0100 Subject: [PATCH 1/5] bump semgrep to 1.80.0 --- .tool_version | 2 +- internal/docgen/parsing.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.tool_version b/.tool_version index 5422724..aaceec0 100644 --- a/.tool_version +++ b/.tool_version @@ -1 +1 @@ -1.78.0 +1.80.0 diff --git a/internal/docgen/parsing.go b/internal/docgen/parsing.go index 34c949b..276298b 100644 --- a/internal/docgen/parsing.go +++ b/internal/docgen/parsing.go @@ -93,7 +93,7 @@ func semgrepRules(destinationDir string) ([]PatternWithExplanation, *ParsedSemgr func getSemgrepRegistryRules() (*ParsedSemgrepRules, error) { return getRules( "https://github.com/semgrep/semgrep-rules", - "4ccd3b9cce2321a5fe3793868e4c2d4cfa5e9c43", + "1366b5ba8d7e733ea7f4b140087b78d6a7ef90a2", isValidSemgrepRegistryRuleFile, prefixRuleIDWithPath) } @@ -453,6 +453,7 @@ func toCodacyLanguages(r SemgrepRule) []string { "dart": "Dart", "dockerfile": "Dockerfile", "elixir": "Elixir", + "generic": "Generic", "go": "Go", "java": "Java", "javascript": "Javascript", From 09b29b359b36173df0cc5edbdb76469408adad4b Mon Sep 17 00:00:00 2001 From: Stefan Vacareanu Date: Wed, 24 Jul 2024 13:02:48 +0300 Subject: [PATCH 2/5] Update to the latest commit in develop branch of semgrep-rules --- internal/docgen/parsing.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/docgen/parsing.go b/internal/docgen/parsing.go index 276298b..937cdef 100644 --- a/internal/docgen/parsing.go +++ b/internal/docgen/parsing.go @@ -93,7 +93,7 @@ func semgrepRules(destinationDir string) ([]PatternWithExplanation, *ParsedSemgr func getSemgrepRegistryRules() (*ParsedSemgrepRules, error) { return getRules( "https://github.com/semgrep/semgrep-rules", - "1366b5ba8d7e733ea7f4b140087b78d6a7ef90a2", + "cd6cd52881500fb4f2ed8c0d31ed29abb4894a8a", isValidSemgrepRegistryRuleFile, prefixRuleIDWithPath) } From ce5fcb9fe5259e350a04130f94ca071a0134ea77 Mon Sep 17 00:00:00 2001 From: Stefan Vacareanu Date: Wed, 24 Jul 2024 13:04:27 +0300 Subject: [PATCH 3/5] remove Generic language --- internal/docgen/parsing.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/docgen/parsing.go b/internal/docgen/parsing.go index 937cdef..27c07b1 100644 --- a/internal/docgen/parsing.go +++ b/internal/docgen/parsing.go @@ -453,7 +453,6 @@ func toCodacyLanguages(r SemgrepRule) []string { "dart": "Dart", "dockerfile": "Dockerfile", "elixir": "Elixir", - "generic": "Generic", "go": "Go", "java": "Java", "javascript": "Javascript", From 74737826198da8e48e5656b5b085cd9c6160383d Mon Sep 17 00:00:00 2001 From: Stefan Vacareanu Date: Wed, 24 Jul 2024 13:05:37 +0300 Subject: [PATCH 4/5] update dockerfile --- .circleci/config.yml | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2048812..e962229 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 orbs: - codacy: codacy/base@12.1.1 + codacy: codacy/base@12.1.2 codacy_plugins_test: codacy/plugins-test@2.0.11 jobs: diff --git a/Dockerfile b/Dockerfile index c5b6192..19cc197 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG TOOL_VERSION=1.78.0 +ARG TOOL_VERSION=1.80.0 # Development image used to build the codacy-semgrep wrapper # Explicitly adding go.mod and go.sum avoids re-downloading dependencies on every build From 5e2a6fe30e12735cb6691edf406d3776db2c7f7b Mon Sep 17 00:00:00 2001 From: Stefan Vacareanu Date: Wed, 24 Jul 2024 13:14:43 +0300 Subject: [PATCH 5/5] update commit --- internal/docgen/parsing.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/docgen/parsing.go b/internal/docgen/parsing.go index 27c07b1..34c949b 100644 --- a/internal/docgen/parsing.go +++ b/internal/docgen/parsing.go @@ -93,7 +93,7 @@ func semgrepRules(destinationDir string) ([]PatternWithExplanation, *ParsedSemgr func getSemgrepRegistryRules() (*ParsedSemgrepRules, error) { return getRules( "https://github.com/semgrep/semgrep-rules", - "cd6cd52881500fb4f2ed8c0d31ed29abb4894a8a", + "4ccd3b9cce2321a5fe3793868e4c2d4cfa5e9c43", isValidSemgrepRegistryRuleFile, prefixRuleIDWithPath) }