Merge branch 'change_from_endpoint_format_to_align_policy_with_behaviour' into 'master'

Updates fromEndpoints&toEndpoints to be allow all

See merge request gitlab-org/gitlab!53940

ee/app/assets/javascripts/threat_monitoring/components/policy_editor/lib/humanize.js

@@ -129,10 +129,10 @@ export default function humanizeNetworkPolicy(policy) {
     const template =
       direction === RuleDirectionInbound
         ? s__(
-            'NetworkPolicies|Deny all inbound traffic to %{selector} from %{ruleSelector} on %{ports}',
+            'NetworkPolicies|Allow all inbound traffic to %{selector} from %{ruleSelector} on %{ports}',
           )
         : s__(
-            'NetworkPolicies|Deny all outbound traffic from %{selector} to %{ruleSelector} on %{ports}',
+            'NetworkPolicies|Allow all outbound traffic from %{selector} to %{ruleSelector} on %{ports}',
           );
     const ruleSelector = humanizeNetworkPolicyRule(rule);
     const ports = humanizeNetworkPolicyRulePorts(rule);

ee/app/assets/javascripts/threat_monitoring/components/policy_editor/lib/rules.js

@@ -23,7 +23,6 @@ function commonSpec(rule) {
 */
 function ruleEndpointSpec({ direction, matchLabels }) {
   const matchSelector = labelSelector(matchLabels);
-  if (Object.keys(matchSelector).length === 0) return {};
 
   return {
     [direction === RuleDirectionInbound ? 'fromEndpoints' : 'toEndpoints']: [

ee/changelogs/unreleased/change_from_endpoint_format_to_align_policy_with_behaviour.yml

+---
+title: Revert text back to Allow instead of Deny. Fixes fromEndpoints/toEndpoints
+  format to keep it aligned with the allow all logic. The previous code was causing
+  a allowing none while it should be allowing all.
+merge_request: 53940
+author:
+type: fixed

ee/spec/frontend/threat_monitoring/components/policy_editor/lib/humanize_spec.js

@@ -36,7 +36,7 @@ describe('humanizeNetworkPolicy', () => {
 
   it('returns policy description', () => {
     expect(humanizeNetworkPolicy(policy)).toEqual(
-      'Deny all inbound traffic to <strong>all</strong> pods ' +
+      'Allow all inbound traffic to <strong>all</strong> pods ' +
         'from <strong>all</strong> pods ' +
         'on <strong>any</strong> port',
     );
@@ -50,7 +50,7 @@ describe('humanizeNetworkPolicy', () => {
 
     it('returns policy description', () => {
       expect(humanizeNetworkPolicy(policy)).toEqual(
-        'Deny all inbound traffic to pods <strong>[one: , two: another]</strong> ' +
+        'Allow all inbound traffic to pods <strong>[one: , two: another]</strong> ' +
           'from <strong>all</strong> pods ' +
           'on <strong>any</strong> port',
       );
@@ -66,9 +66,9 @@ describe('humanizeNetworkPolicy', () => {
 
     it('returns policy description', () => {
       expect(humanizeNetworkPolicy(policy)).toEqual(
-        'Deny all inbound traffic to <strong>all</strong> pods from <strong>all</strong> pods on <strong>any</strong> port' +
+        'Allow all inbound traffic to <strong>all</strong> pods from <strong>all</strong> pods on <strong>any</strong> port' +
           '<br><br>AND<br><br>' +
-          'Deny all outbound traffic from <strong>all</strong> pods to <strong>all</strong> pods on <strong>any</strong> port',
+          'Allow all outbound traffic from <strong>all</strong> pods to <strong>all</strong> pods on <strong>any</strong> port',
       );
     });
   });
@@ -81,7 +81,7 @@ describe('humanizeNetworkPolicy', () => {
 
     it('returns policy description', () => {
       expect(humanizeNetworkPolicy(policy)).toEqual(
-        'Deny all inbound traffic to <strong>all</strong> pods ' +
+        'Allow all inbound traffic to <strong>all</strong> pods ' +
           'from <strong>all</strong> pods ' +
           'on ports <strong>80/TCP, 81/UDP</strong>',
       );
@@ -95,7 +95,7 @@ describe('humanizeNetworkPolicy', () => {
 
     it('returns policy description', () => {
       expect(humanizeNetworkPolicy(policy)).toEqual(
-        'Deny all inbound traffic to <strong>all</strong> pods ' +
+        'Allow all inbound traffic to <strong>all</strong> pods ' +
           'from pods <strong>[one: , two: another]</strong> ' +
           'on <strong>any</strong> port',
       );
@@ -111,7 +111,7 @@ describe('humanizeNetworkPolicy', () => {
 
     it('returns policy description', () => {
       expect(humanizeNetworkPolicy(policy)).toEqual(
-        'Deny all inbound traffic to <strong>all</strong> pods ' +
+        'Allow all inbound traffic to <strong>all</strong> pods ' +
           'from <strong>host, world</strong> ' +
           'on <strong>any</strong> port',
       );
@@ -127,7 +127,7 @@ describe('humanizeNetworkPolicy', () => {
 
     it('returns policy description', () => {
       expect(humanizeNetworkPolicy(policy)).toEqual(
-        'Deny all inbound traffic to <strong>all</strong> pods ' +
+        'Allow all inbound traffic to <strong>all</strong> pods ' +
           'from <strong>0.0.0.0/32, 1.1.1.1/24</strong> ' +
           'on <strong>any</strong> port',
       );
@@ -143,7 +143,7 @@ describe('humanizeNetworkPolicy', () => {
 
     it('returns policy description', () => {
       expect(humanizeNetworkPolicy(policy)).toEqual(
-        'Deny all inbound traffic to <strong>all</strong> pods ' +
+        'Allow all inbound traffic to <strong>all</strong> pods ' +
           'from <strong>some-service.com, another-service.com</strong> ' +
           'on <strong>any</strong> port',
       );

ee/spec/frontend/threat_monitoring/components/policy_editor/lib/rules_spec.js

@@ -77,8 +77,14 @@ describe('ruleSpec', () => {
       rule = buildRule(RuleTypeEndpoint);
     });
 
-    it('returns empty spec', () => {
-      expect(ruleSpec(rule)).toEqual({});
+    it('returns empty matchLabels', () => {
+      expect(ruleSpec(rule)).toEqual({
+        fromEndpoints: [
+          {
+            matchLabels: {},
+          },
+        ],
+      });
     });
 
     testPortMatchers();

locale/gitlab.pot

@@ -19529,6 +19529,12 @@ msgstr ""
 msgid "NetworkPolicies|Allow"
 msgstr ""
 
+msgid "NetworkPolicies|Allow all inbound traffic to %{selector} from %{ruleSelector} on %{ports}"
+msgstr ""
+
+msgid "NetworkPolicies|Allow all outbound traffic from %{selector} to %{ruleSelector} on %{ports}"
+msgstr ""
+
 msgid "NetworkPolicies|Are you sure you want to delete this policy? This action cannot be undone."
 msgstr ""
 
@@ -19547,12 +19553,6 @@ msgstr ""
 msgid "NetworkPolicies|Delete policy: %{policy}"
 msgstr ""
 
-msgid "NetworkPolicies|Deny all inbound traffic to %{selector} from %{ruleSelector} on %{ports}"
-msgstr ""
-
-msgid "NetworkPolicies|Deny all outbound traffic from %{selector} to %{ruleSelector} on %{ports}"
-msgstr ""
-
 msgid "NetworkPolicies|Deny all traffic"
 msgstr ""