From bc0b9a101d054e5fd73d51ece5c3ac16608a7474 Mon Sep 17 00:00:00 2001 From: Devils-Knight Date: Wed, 26 Jul 2023 21:25:59 +0530 Subject: [PATCH 1/2] directory path test case added --- remediation/dependabot/dependabotconfig.go | 2 +- remediation/dependabot/dependabotconfig_test.go | 5 +++++ testfiles/dependabotfiles/input/extra-slash.yml | 7 +++++++ testfiles/dependabotfiles/output/extra-slash.yml | 7 +++++++ 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 testfiles/dependabotfiles/input/extra-slash.yml create mode 100644 testfiles/dependabotfiles/output/extra-slash.yml diff --git a/remediation/dependabot/dependabotconfig.go b/remediation/dependabot/dependabotconfig.go index 26609cd32..33483297e 100644 --- a/remediation/dependabot/dependabotconfig.go +++ b/remediation/dependabot/dependabotconfig.go @@ -105,7 +105,7 @@ func UpdateDependabotConfig(dependabotConfig string) (*UpdateDependabotConfigRes for _, Update := range updateDependabotConfigRequest.Ecosystems { updateAlreadyExist := false for _, update := range configMetadata.Updates { - if update.PackageEcosystem == Update.PackageEcosystem && update.Directory == Update.Directory { + if update.PackageEcosystem == Update.PackageEcosystem && (update.Directory == Update.Directory || update.Directory == Update.Directory+"/") { updateAlreadyExist = true break } diff --git a/remediation/dependabot/dependabotconfig_test.go b/remediation/dependabot/dependabotconfig_test.go index c3f4898da..c4e4f7c78 100644 --- a/remediation/dependabot/dependabotconfig_test.go +++ b/remediation/dependabot/dependabotconfig_test.go @@ -48,6 +48,11 @@ func TestConfigDependabotFile(t *testing.T) { Ecosystems: []Ecosystem{{"npm", "/sample", "daily"}}, isChanged: true, }, + { + fileName: "extra-slash.yml", + Ecosystems: []Ecosystem{{"npm", "/sample", "daily"}}, + isChanged: false, + }, } for _, test := range tests { diff --git a/testfiles/dependabotfiles/input/extra-slash.yml b/testfiles/dependabotfiles/input/extra-slash.yml new file mode 100644 index 000000000..5ab1c551d --- /dev/null +++ b/testfiles/dependabotfiles/input/extra-slash.yml @@ -0,0 +1,7 @@ +version: 2 +updates: + - package-ecosystem: "npm" + # Files stored in `app` directory + directory: "/sample/" + schedule: + interval: "daily" \ No newline at end of file diff --git a/testfiles/dependabotfiles/output/extra-slash.yml b/testfiles/dependabotfiles/output/extra-slash.yml new file mode 100644 index 000000000..6f65f32e6 --- /dev/null +++ b/testfiles/dependabotfiles/output/extra-slash.yml @@ -0,0 +1,7 @@ +version: 2 +updates: + - package-ecosystem: "npm" + # Files stored in `app` directory + directory: "/sample/" + schedule: + interval: "daily" From 45e099bf58f3c45d2332748d19e70a9a4768abe1 Mon Sep 17 00:00:00 2001 From: Varun Sharma Date: Tue, 1 Aug 2023 23:54:56 -0700 Subject: [PATCH 2/2] Delete action-security.yml --- .../dev-infra/github-actions/lock-closed/action-security.yml | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 knowledge-base/actions/angular/dev-infra/github-actions/lock-closed/action-security.yml diff --git a/knowledge-base/actions/angular/dev-infra/github-actions/lock-closed/action-security.yml b/knowledge-base/actions/angular/dev-infra/github-actions/lock-closed/action-security.yml deleted file mode 100644 index 051053cdd..000000000 --- a/knowledge-base/actions/angular/dev-infra/github-actions/lock-closed/action-security.yml +++ /dev/null @@ -1,2 +0,0 @@ -name: 'Lock Closed Issues' # angular/dev-infra/github-actions/lock-closed -# GITHUB_TOKEN not used