From 67455754cd7a04b44e9b5c6c2dc219b5f34f7fd6 Mon Sep 17 00:00:00 2001 From: nathanmartinszup <63246935+nathanmartinszup@users.noreply.github.com> Date: Wed, 19 May 2021 14:11:31 -0300 Subject: [PATCH 1/3] Adding update analysis queue and exchange (#41) * Adding update analysis queue and exchange * Removing unnecessary typing form exchanges * Removing update exchange and queues --- pkg/enums/exchange/kind.go | 10 ++-------- pkg/enums/exchange/kind_test.go | 8 ++++---- pkg/enums/exchange/name.go | 9 +-------- pkg/enums/exchange/name_test.go | 6 +++--- pkg/enums/queues/queues.go | 20 ++++++++++---------- 5 files changed, 20 insertions(+), 33 deletions(-) diff --git a/pkg/enums/exchange/kind.go b/pkg/enums/exchange/kind.go index b0d0747..0cc7d06 100644 --- a/pkg/enums/exchange/kind.go +++ b/pkg/enums/exchange/kind.go @@ -14,13 +14,7 @@ package exchange -type Kind string - const ( - Topic Kind = "topic" - Fanout Kind = "fanout" + Topic = "topic" + Fanout = "fanout" ) - -func (k Kind) ToString() string { - return string(k) -} diff --git a/pkg/enums/exchange/kind_test.go b/pkg/enums/exchange/kind_test.go index 62b4e09..ab0b02d 100644 --- a/pkg/enums/exchange/kind_test.go +++ b/pkg/enums/exchange/kind_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/assert" ) -func TestKind_ToString(t *testing.T) { - t.Run("should parse exchange kind with success", func(t *testing.T) { - assert.Equal(t, "topic", Topic.ToString()) - assert.Equal(t, "fanout", Fanout.ToString()) +func TestEqualValuesExchangeTypes(t *testing.T) { + t.Run("should return equal values", func(t *testing.T) { + assert.Equal(t, "topic", Topic) + assert.Equal(t, "fanout", Fanout) }) } diff --git a/pkg/enums/exchange/name.go b/pkg/enums/exchange/name.go index 56bc0d2..105e73f 100644 --- a/pkg/enums/exchange/name.go +++ b/pkg/enums/exchange/name.go @@ -14,13 +14,6 @@ package exchange -type Name string - const ( - NewAnalysis Name = "new-analysis" - UpdateAnalysis Name = "update-analysis" + NewAnalysis = "new-analysis" ) - -func (n Name) ToString() string { - return string(n) -} diff --git a/pkg/enums/exchange/name_test.go b/pkg/enums/exchange/name_test.go index 15a3bbc..3d84325 100644 --- a/pkg/enums/exchange/name_test.go +++ b/pkg/enums/exchange/name_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" ) -func TestName_ToString(t *testing.T) { - t.Run("should parse exchange name with success", func(t *testing.T) { - assert.Equal(t, "new-analysis", NewAnalysis.ToString()) +func TestEqualValuesExchangeName(t *testing.T) { + t.Run("should return equal exchange names", func(t *testing.T) { + assert.Equal(t, "new-analysis", NewAnalysis) }) } diff --git a/pkg/enums/queues/queues.go b/pkg/enums/queues/queues.go index be63103..8b2b363 100644 --- a/pkg/enums/queues/queues.go +++ b/pkg/enums/queues/queues.go @@ -19,20 +19,20 @@ import "strings" type Queue string const ( - HorusecAnalyticAuthors Queue = "horusec-analytic::news-authors" - HorusecAnalyticRepositories Queue = "horusec-analytic::news-repositories" - HorusecAnalyticLanguages Queue = "horusec-analytic::news-languages" - HorusecAnalyticTimes Queue = "horusec-analytic::news-times" - HorusecEmail Queue = "horusec-email" - HorusecWebhook Queue = "horusec-webhook" + HorusecAnalyticNewAnalysisByAuthors Queue = "horusec-analytic::new-analysis-by-author" + HorusecAnalyticNewAnalysisByRepository Queue = "horusec-analytic::new-analysis-by-repository" + HorusecAnalyticNewAnalysisByLanguage Queue = "horusec-analytic::new-analysis-by-language" + HorusecAnalyticNewAnalysisByTime Queue = "horusec-analytic::new-analysis-by-time" + HorusecEmail Queue = "horusec-email" + HorusecWebhook Queue = "horusec-webhook" ) func Values() []Queue { return []Queue{ - HorusecAnalyticAuthors, - HorusecAnalyticRepositories, - HorusecAnalyticLanguages, - HorusecAnalyticTimes, + HorusecAnalyticNewAnalysisByAuthors, + HorusecAnalyticNewAnalysisByRepository, + HorusecAnalyticNewAnalysisByLanguage, + HorusecAnalyticNewAnalysisByTime, HorusecEmail, HorusecWebhook, } From 70b80bd3b85ae97b01226911e0c7ccc97c779bb1 Mon Sep 17 00:00:00 2001 From: matheusalcantarazup <84723211+matheusalcantarazup@users.noreply.github.com> Date: Tue, 1 Jun 2021 09:27:47 -0300 Subject: [PATCH 2/3] add language Swift (#43) --- pkg/enums/languages/language.go | 4 ++++ pkg/enums/languages/language_test.go | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg/enums/languages/language.go b/pkg/enums/languages/language.go index bb7b692..96cbf97 100644 --- a/pkg/enums/languages/language.go +++ b/pkg/enums/languages/language.go @@ -38,6 +38,7 @@ const ( Elixir Language = "Elixir" Shell Language = "Shell" Nginx Language = "Nginx" + Swift Language = "Swift" Unknown Language = "Unknown" ) @@ -73,6 +74,7 @@ func Values() []Language { Elixir, Shell, Nginx, + Swift, Unknown, } } @@ -99,6 +101,7 @@ func mapEnableLanguages() map[string]Language { Elixir.ToString(): Elixir, Shell.ToString(): Shell, Nginx.ToString(): Nginx, + Swift.ToString(): Swift, Unknown.ToString(): Unknown, } } @@ -131,5 +134,6 @@ func (l Language) MapLanguagesEnableInCLI() map[Language]string { Yaml: "yaml", Dart: "dart", Nginx: "nginx", + Swift: "swift", } } diff --git a/pkg/enums/languages/language_test.go b/pkg/enums/languages/language_test.go index 8f3c49a..4cec8dc 100644 --- a/pkg/enums/languages/language_test.go +++ b/pkg/enums/languages/language_test.go @@ -41,13 +41,14 @@ func TestParseStringToLanguage(t *testing.T) { assert.Equal(t, Elixir, ParseStringToLanguage("Elixir")) assert.Equal(t, Shell, ParseStringToLanguage("Shell")) assert.Equal(t, Nginx, ParseStringToLanguage("Nginx")) + assert.Equal(t, Swift, ParseStringToLanguage("Swift")) assert.Equal(t, Unknown, ParseStringToLanguage("")) }) } func TestValues(t *testing.T) { - t.Run("should return 20 valid values", func(t *testing.T) { - assert.Len(t, Values(), 20) + t.Run("should return 21 valid values", func(t *testing.T) { + assert.Len(t, Values(), 21) }) } @@ -74,6 +75,7 @@ func TestMapEnableLanguages(t *testing.T) { assert.Equal(t, Elixir, mapLanguages["Elixir"]) assert.Equal(t, Shell, mapLanguages["Shell"]) assert.Equal(t, Nginx, mapLanguages["Nginx"]) + assert.Equal(t, Swift, mapLanguages["Swift"]) assert.Equal(t, Unknown, mapLanguages["Unknown"]) }) } @@ -99,6 +101,7 @@ func TestToString(t *testing.T) { assert.Equal(t, "Elixir", Elixir.ToString()) assert.Equal(t, "Shell", Shell.ToString()) assert.Equal(t, "Nginx", Nginx.ToString()) + assert.Equal(t, "Swift", Swift.ToString()) assert.Equal(t, "Unknown", Unknown.ToString()) }) } @@ -121,5 +124,6 @@ func TestGetCustomImagesKeyByLanguage(t *testing.T) { assert.Equal(t, "elixir", Elixir.GetCustomImagesKeyByLanguage()) assert.Equal(t, "shell", Shell.GetCustomImagesKeyByLanguage()) assert.Equal(t, "nginx", Nginx.GetCustomImagesKeyByLanguage()) + assert.Equal(t, "swift", Swift.GetCustomImagesKeyByLanguage()) }) } From 33d0678a78ac847feae0384213826956c534d281 Mon Sep 17 00:00:00 2001 From: nathanmartinszup <63246935+nathanmartinszup@users.noreply.github.com> Date: Mon, 14 Jun 2021 08:31:37 -0300 Subject: [PATCH 3/3] Adding owasp dependency check tool (#46) --- pkg/enums/tools/tools.go | 36 ++++++++++++++++++----------------- pkg/enums/tools/tools_test.go | 6 ++++-- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/pkg/enums/tools/tools.go b/pkg/enums/tools/tools.go index bb5a566..3ae7a4f 100644 --- a/pkg/enums/tools/tools.go +++ b/pkg/enums/tools/tools.go @@ -19,23 +19,24 @@ import "github.com/iancoleman/strcase" type Tool string const ( - HorusecEngine Tool = "HorusecEngine" - GoSec Tool = "GoSec" - SecurityCodeScan Tool = "SecurityCodeScan" - Brakeman Tool = "Brakeman" - Safety Tool = "Safety" - Bandit Tool = "Bandit" - NpmAudit Tool = "NpmAudit" - YarnAudit Tool = "YarnAudit" - GitLeaks Tool = "GitLeaks" - TfSec Tool = "TfSec" - Semgrep Tool = "Semgrep" - Flawfinder Tool = "Flawfinder" - PhpCS Tool = "PhpCS" - MixAudit Tool = "MixAudit" - Sobelow Tool = "Sobelow" - ShellCheck Tool = "ShellCheck" - BundlerAudit Tool = "BundlerAudit" + HorusecEngine Tool = "HorusecEngine" + GoSec Tool = "GoSec" + SecurityCodeScan Tool = "SecurityCodeScan" + Brakeman Tool = "Brakeman" + Safety Tool = "Safety" + Bandit Tool = "Bandit" + NpmAudit Tool = "NpmAudit" + YarnAudit Tool = "YarnAudit" + GitLeaks Tool = "GitLeaks" + TfSec Tool = "TfSec" + Semgrep Tool = "Semgrep" + Flawfinder Tool = "Flawfinder" + PhpCS Tool = "PhpCS" + MixAudit Tool = "MixAudit" + Sobelow Tool = "Sobelow" + ShellCheck Tool = "ShellCheck" + BundlerAudit Tool = "BundlerAudit" + OwaspDependencyCheck Tool = "OwaspDependencyCheck" ) func (t Tool) ToString() string { @@ -66,5 +67,6 @@ func Values() []Tool { Sobelow, ShellCheck, BundlerAudit, + OwaspDependencyCheck, } } diff --git a/pkg/enums/tools/tools_test.go b/pkg/enums/tools/tools_test.go index f62635e..01b421c 100644 --- a/pkg/enums/tools/tools_test.go +++ b/pkg/enums/tools/tools_test.go @@ -39,6 +39,7 @@ func TestToString(t *testing.T) { assert.Equal(t, "Sobelow", Sobelow.ToString()) assert.Equal(t, "ShellCheck", ShellCheck.ToString()) assert.Equal(t, "BundlerAudit", BundlerAudit.ToString()) + assert.Equal(t, "OwaspDependencyCheck", OwaspDependencyCheck.ToString()) }) } @@ -61,11 +62,12 @@ func TestToLowerCase(t *testing.T) { assert.Equal(t, "sobelow", Sobelow.ToLowerCamel()) assert.Equal(t, "shellCheck", ShellCheck.ToLowerCamel()) assert.Equal(t, "bundlerAudit", BundlerAudit.ToLowerCamel()) + assert.Equal(t, "owaspDependencyCheck", OwaspDependencyCheck.ToLowerCamel()) }) } func TestValues(t *testing.T) { - t.Run("should return 17 valid values", func(t *testing.T) { - assert.Len(t, Values(), 17) + t.Run("should return 18 valid values", func(t *testing.T) { + assert.Len(t, Values(), 18) }) }