Remove deprecated nodejs-protect agent, use nodejs or nodejs-esm inst…

…read
Contrast-Security-OSS · Jan 15, 2025 · 7bff737 · 7bff737
1 parent cf7de79
commit 7bff737
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 142 deletions.
diff --git a/Contrast.K8s.AgentOperator.v3.ncrunchsolution b/Contrast.K8s.AgentOperator.v3.ncrunchsolution
diff --git a/docs/public/02-supported-technologies.md b/docs/public/02-supported-technologies.md
@@ -25,7 +25,6 @@
 | NodeJS ESM            | nodejs-esm     | Beta           | [Supported NodeJS technologies](https://docs.contrastsecurity.com/en/node-js-supported-technologies.html )     |
 | PHP                   | php            | Beta           | [Supported PHP technologies](https://docs.contrastsecurity.com/en/php-supported-technologies.html)             |
 | Python                | python         | Beta           | [Supported Python technologies](https://docs.contrastsecurity.com/en/python-supported-technologies.html)       |
-| NodeJS (Protect only) | nodejs-protect | Deprecated     | [Supported NodeJS technologies](https://docs.contrastsecurity.com/en/node-js-supported-technologies.html )     |
 
 - Injection of NodeJS and PHP applications is in beta. Beta status means the feature might change or act unexpectedly. By using this feature, you agree to the [Contrast Beta Terms and Conditions](https://docs.contrastsecurity.com/en/beta-terms-and-conditions.html "Contrast Beta Terms and Conditions").
 - Injection of the NodeJS Agent may result in a substantial increase in the startup time of the instrumented application. If startup time is unacceptable, injecting the agent during compilation may be desireable. If the application was injected by the NodeJS agent during compilation then injection during runtime by the operator should be disabled. See the [rewriter CLI](https://docs.contrastsecurity.com/en/node-js-agent-rewriter-cli.html) for more information.
diff --git a/manifests/examples/testing/scenarios/namespaced/injection-nodejs-protect.yaml b/manifests/examples/testing/scenarios/namespaced/injection-nodejs-protect.yaml
diff --git a/manifests/examples/testing/scenarios/namespaced/kustomization.yaml b/manifests/examples/testing/scenarios/namespaced/kustomization.yaml
@@ -16,7 +16,6 @@ resources:
   - ./injection-javatooloptions.yaml
   - ./injection-nodejs-cjs.yaml
   - ./injection-nodejs-esm.yaml
-  - ./injection-nodejs-protect.yaml
   - ./injection-php.yaml
   - ./injection-python.yaml
   - ./missing-deps.yaml

diff --git a/manifests/install/all/crds/base/agentinjectors_agents_contrastsecurity_com.yaml b/manifests/install/all/crds/base/agentinjectors_agents_contrastsecurity_com.yaml
@@ -29,7 +29,7 @@ spec:
                 type: string
               type:
                 description: The type of agent to inject. Can be one of ['dotnet-core', 'java', 'nodejs', 'nodejs-esm', 'php', 'python']. Required.
-                pattern: ^(dotnet-core|dotnet|java|node|nodejs|node-esm|nodejs-esm|node-protect|nodejs-protect|php|personal-home-page|python|dummy)$
+                pattern: ^(dotnet-core|dotnet|java|node|nodejs|node-esm|nodejs-esm|php|personal-home-page|python|dummy)$
                 type: string
               image:
                 description: Overrides the default agent images.

diff --git a/src/Contrast.K8s.AgentOperator/Core/AgentInjectionTypeConverter.cs b/src/Contrast.K8s.AgentOperator/Core/AgentInjectionTypeConverter.cs
@@ -40,7 +40,6 @@ public string GetDefaultImageName(AgentInjectionType type)
             AgentInjectionType.Java => "agent-java",
             AgentInjectionType.NodeJs => "agent-nodejs",
             AgentInjectionType.NodeJsEsm => "agent-nodejs",
-            AgentInjectionType.NodeJsProtect => "agent-nodejs-protect",
             AgentInjectionType.Php => "agent-php",
             AgentInjectionType.Python => "agent-python",
             AgentInjectionType.Dummy => "busybox",
@@ -57,10 +56,8 @@ public AgentInjectionType GetTypeFromString(string type)
             "java" => AgentInjectionType.Java,
             "node" => AgentInjectionType.NodeJs,
             "node-esm" => AgentInjectionType.NodeJsEsm,
-            "node-protect" => AgentInjectionType.NodeJsProtect,
             "nodejs" => AgentInjectionType.NodeJs,
             "nodejs-esm" => AgentInjectionType.NodeJsEsm,
-            "nodejs-protect" => AgentInjectionType.NodeJsProtect,
             "php" => AgentInjectionType.Php,
             "personal-home-page" => AgentInjectionType.Php,
             "python" => AgentInjectionType.Python,

diff --git a/...t.K8s.AgentOperator/Core/Reactions/Injecting/Patching/Agents/NodeJsProtectAgentPatcher.cs b/...t.K8s.AgentOperator/Core/Reactions/Injecting/Patching/Agents/NodeJsProtectAgentPatcher.cs
diff --git a/src/Contrast.K8s.AgentOperator/Core/State/Resources/Primitives/AgentInjectionType.cs b/src/Contrast.K8s.AgentOperator/Core/State/Resources/Primitives/AgentInjectionType.cs
@@ -9,7 +9,6 @@ public enum AgentInjectionType
     Java,
     NodeJs,
     NodeJsEsm,
-    NodeJsProtect, //deprecated
     Php,
     Python,
     Dummy

diff --git a/src/Contrast.K8s.AgentOperator/Entities/RegexConstants.cs b/src/Contrast.K8s.AgentOperator/Entities/RegexConstants.cs
@@ -8,7 +8,7 @@ namespace Contrast.K8s.AgentOperator.Entities;
 public static class RegexConstants
 {
     [RegexPattern]
-    public const string AgentTypeRegex = @"^(dotnet-core|dotnet|java|node|nodejs|node-esm|nodejs-esm|node-protect|nodejs-protect|php|personal-home-page|python|dummy)$";
+    public const string AgentTypeRegex = @"^(dotnet-core|dotnet|java|node|nodejs|node-esm|nodejs-esm|php|personal-home-page|python|dummy)$";
 
     [RegexPattern]
     public const string InjectorVersionRegex = @"^(latest|(\d+(\.\d+){0,3}(-.+)?))$";

diff --git a/...s.AgentOperator.FunctionalTests/Scenarios/Injection/Agents/NodeJsProtectInjectionTests.cs b/...s.AgentOperator.FunctionalTests/Scenarios/Injection/Agents/NodeJsProtectInjectionTests.cs
diff --git a/tests/Contrast.K8s.AgentOperator.Tests/Entities/RegexConstantsTests.cs b/tests/Contrast.K8s.AgentOperator.Tests/Entities/RegexConstantsTests.cs
@@ -18,8 +18,6 @@ public class RegexConstantsTests
     [InlineData("nodejs")]
     [InlineData("node-esm")]
     [InlineData("nodejs-esm")]
-    [InlineData("node-protect")]
-    [InlineData("nodejs-protect")]
     [InlineData("php")]
     [InlineData("personal-home-page")]
     [InlineData("python")]
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ public enum AgentInjectionType @@
         Java,
         NodeJs,
         NodeJsEsm,
-        NodeJsProtect, //deprecated
         Php,
         Python,
         Dummy
@@ Expand Down @@