From 320c9cc82963b810ab3ecbe3962e030e9b399ee2 Mon Sep 17 00:00:00 2001 From: Igor Frenkel Date: Wed, 8 Dec 2021 20:26:36 -0500 Subject: [PATCH 1/5] Add deprecation warning to DS analyzers doc Add warning to the Dependency Scanning analyzers documentation regarding bundler-audit deprecation. Changelog: other --- doc/user/application_security/dependency_scanning/analyzers.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/user/application_security/dependency_scanning/analyzers.md b/doc/user/application_security/dependency_scanning/analyzers.md index f0d522f1e6dea6..5145c40332ac3f 100644 --- a/doc/user/application_security/dependency_scanning/analyzers.md +++ b/doc/user/application_security/dependency_scanning/analyzers.md @@ -32,6 +32,9 @@ to launch dedicated containers for each analysis. Dependency Scanning is pre-configured with a set of **default images** that are maintained by GitLab, but users can also integrate their own **custom images**. +WARNING: +The `bundler-audit` analyzer will be deprecated in GitLab 15.0 since it duplicates the functionality of the `gemnasium` analyzer [more info](https://gitlab.com/gitlab-org/gitlab/-/issues/288322). + ## Official default analyzers Any custom change to the official analyzers can be achieved by using a -- GitLab From a75b7124cef6607df41e5470e1ab0c5bd5954cff Mon Sep 17 00:00:00 2001 From: Igor Frenkel Date: Thu, 9 Dec 2021 17:18:25 +0000 Subject: [PATCH 2/5] Formalize the wording on deprecation and removal --- .../application_security/dependency_scanning/analyzers.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/user/application_security/dependency_scanning/analyzers.md b/doc/user/application_security/dependency_scanning/analyzers.md index 5145c40332ac3f..68f6ca8c93f2d2 100644 --- a/doc/user/application_security/dependency_scanning/analyzers.md +++ b/doc/user/application_security/dependency_scanning/analyzers.md @@ -32,8 +32,8 @@ to launch dedicated containers for each analysis. Dependency Scanning is pre-configured with a set of **default images** that are maintained by GitLab, but users can also integrate their own **custom images**. -WARNING: -The `bundler-audit` analyzer will be deprecated in GitLab 15.0 since it duplicates the functionality of the `gemnasium` analyzer [more info](https://gitlab.com/gitlab-org/gitlab/-/issues/288322). +DEPRECATION WARNING: +The `bundler-audit` analyzer will be removed in GitLab 15.0 since it duplicates the functionality of the `gemnasium` analyzer [more info](https://gitlab.com/gitlab-org/gitlab/-/issues/288322). ## Official default analyzers -- GitLab From 29f17bca0556776f6f8428924e08457f1610c10c Mon Sep 17 00:00:00 2001 From: Igor Frenkel Date: Fri, 10 Dec 2021 01:11:26 +0000 Subject: [PATCH 3/5] Update wording --- .../application_security/dependency_scanning/analyzers.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/user/application_security/dependency_scanning/analyzers.md b/doc/user/application_security/dependency_scanning/analyzers.md index 68f6ca8c93f2d2..48f4dc3ed1e123 100644 --- a/doc/user/application_security/dependency_scanning/analyzers.md +++ b/doc/user/application_security/dependency_scanning/analyzers.md @@ -32,8 +32,8 @@ to launch dedicated containers for each analysis. Dependency Scanning is pre-configured with a set of **default images** that are maintained by GitLab, but users can also integrate their own **custom images**. -DEPRECATION WARNING: -The `bundler-audit` analyzer will be removed in GitLab 15.0 since it duplicates the functionality of the `gemnasium` analyzer [more info](https://gitlab.com/gitlab-org/gitlab/-/issues/288322). +WARNING: +The `bundler-audit` analyzer is deprecated and will be removed in GitLab 15.0 since it duplicates the functionality of the `Gemnasium` analyzer [GitLab#288322](https://gitlab.com/gitlab-org/gitlab/-/issues/288322). ## Official default analyzers -- GitLab From 018ff9fd0926190eea907456ea7788f0c9dec52d Mon Sep 17 00:00:00 2001 From: Fabien Catteau Date: Fri, 10 Dec 2021 15:33:20 +0000 Subject: [PATCH 4/5] Apply 1 suggestion(s) to 1 file(s) --- doc/user/application_security/dependency_scanning/analyzers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/user/application_security/dependency_scanning/analyzers.md b/doc/user/application_security/dependency_scanning/analyzers.md index 48f4dc3ed1e123..13c9d41159481d 100644 --- a/doc/user/application_security/dependency_scanning/analyzers.md +++ b/doc/user/application_security/dependency_scanning/analyzers.md @@ -33,7 +33,7 @@ Dependency Scanning is pre-configured with a set of **default images** that are maintained by GitLab, but users can also integrate their own **custom images**. WARNING: -The `bundler-audit` analyzer is deprecated and will be removed in GitLab 15.0 since it duplicates the functionality of the `Gemnasium` analyzer [GitLab#288322](https://gitlab.com/gitlab-org/gitlab/-/issues/288322). +The `bundler-audit` analyzer is deprecated and will be removed in GitLab 15.0 since it duplicates the functionality of the `gemnasium` analyzer. For more information, see the [deprecation issue](https://gitlab.com/gitlab-org/gitlab/-/issues/347491). ## Official default analyzers -- GitLab From 55102eb6ae9569500e5447aef66c72857869815f Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Mon, 13 Dec 2021 20:01:32 +0000 Subject: [PATCH 5/5] Link to deprecation announcement --- doc/user/application_security/dependency_scanning/analyzers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/user/application_security/dependency_scanning/analyzers.md b/doc/user/application_security/dependency_scanning/analyzers.md index 13c9d41159481d..1b502b306bb503 100644 --- a/doc/user/application_security/dependency_scanning/analyzers.md +++ b/doc/user/application_security/dependency_scanning/analyzers.md @@ -33,7 +33,7 @@ Dependency Scanning is pre-configured with a set of **default images** that are maintained by GitLab, but users can also integrate their own **custom images**. WARNING: -The `bundler-audit` analyzer is deprecated and will be removed in GitLab 15.0 since it duplicates the functionality of the `gemnasium` analyzer. For more information, see the [deprecation issue](https://gitlab.com/gitlab-org/gitlab/-/issues/347491). +The `bundler-audit` analyzer is deprecated and will be removed in GitLab 15.0 since it duplicates the functionality of the `gemnasium` analyzer. For more information, read the [deprecation announcement](../../../update/deprecations.md#deprecation-of-bundler-audit-dependency-scanning-tool). ## Official default analyzers -- GitLab