Commit 04f30657 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '270130-policy-preview-for-egress-deny-all-reports-egress-allow-all' into 'master'

Correct preview for egress & ingress `deny all` policy which incorrectly reports `allow all`

See merge request gitlab-org/gitlab!52370
parents 35a3072f 4d046a2e
---
title: Correct the egress 'deny all' policy preview from Allow to Deny
merge_request: 52370
author:
type: fixed
...@@ -129,10 +129,10 @@ export default function humanizeNetworkPolicy(policy) { ...@@ -129,10 +129,10 @@ export default function humanizeNetworkPolicy(policy) {
const template = const template =
direction === RuleDirectionInbound direction === RuleDirectionInbound
? s__( ? s__(
'NetworkPolicies|Allow all inbound traffic to %{selector} from %{ruleSelector} on %{ports}', 'NetworkPolicies|Deny all inbound traffic to %{selector} from %{ruleSelector} on %{ports}',
) )
: s__( : s__(
'NetworkPolicies|Allow all outbound traffic from %{selector} to %{ruleSelector} on %{ports}', 'NetworkPolicies|Deny all outbound traffic from %{selector} to %{ruleSelector} on %{ports}',
); );
const ruleSelector = humanizeNetworkPolicyRule(rule); const ruleSelector = humanizeNetworkPolicyRule(rule);
const ports = humanizeNetworkPolicyRulePorts(rule); const ports = humanizeNetworkPolicyRulePorts(rule);
......
...@@ -36,7 +36,7 @@ describe('humanizeNetworkPolicy', () => { ...@@ -36,7 +36,7 @@ describe('humanizeNetworkPolicy', () => {
it('returns policy description', () => { it('returns policy description', () => {
expect(humanizeNetworkPolicy(policy)).toEqual( expect(humanizeNetworkPolicy(policy)).toEqual(
'Allow all inbound traffic to <strong>all</strong> pods ' + 'Deny all inbound traffic to <strong>all</strong> pods ' +
'from <strong>all</strong> pods ' + 'from <strong>all</strong> pods ' +
'on <strong>any</strong> port', 'on <strong>any</strong> port',
); );
...@@ -50,7 +50,7 @@ describe('humanizeNetworkPolicy', () => { ...@@ -50,7 +50,7 @@ describe('humanizeNetworkPolicy', () => {
it('returns policy description', () => { it('returns policy description', () => {
expect(humanizeNetworkPolicy(policy)).toEqual( expect(humanizeNetworkPolicy(policy)).toEqual(
'Allow all inbound traffic to pods <strong>[one: , two: another]</strong> ' + 'Deny all inbound traffic to pods <strong>[one: , two: another]</strong> ' +
'from <strong>all</strong> pods ' + 'from <strong>all</strong> pods ' +
'on <strong>any</strong> port', 'on <strong>any</strong> port',
); );
...@@ -66,9 +66,9 @@ describe('humanizeNetworkPolicy', () => { ...@@ -66,9 +66,9 @@ describe('humanizeNetworkPolicy', () => {
it('returns policy description', () => { it('returns policy description', () => {
expect(humanizeNetworkPolicy(policy)).toEqual( expect(humanizeNetworkPolicy(policy)).toEqual(
'Allow all inbound traffic to <strong>all</strong> pods from <strong>all</strong> pods on <strong>any</strong> port' + 'Deny all inbound traffic to <strong>all</strong> pods from <strong>all</strong> pods on <strong>any</strong> port' +
'<br><br>AND<br><br>' + '<br><br>AND<br><br>' +
'Allow all outbound traffic from <strong>all</strong> pods to <strong>all</strong> pods on <strong>any</strong> port', 'Deny all outbound traffic from <strong>all</strong> pods to <strong>all</strong> pods on <strong>any</strong> port',
); );
}); });
}); });
...@@ -81,7 +81,7 @@ describe('humanizeNetworkPolicy', () => { ...@@ -81,7 +81,7 @@ describe('humanizeNetworkPolicy', () => {
it('returns policy description', () => { it('returns policy description', () => {
expect(humanizeNetworkPolicy(policy)).toEqual( expect(humanizeNetworkPolicy(policy)).toEqual(
'Allow all inbound traffic to <strong>all</strong> pods ' + 'Deny all inbound traffic to <strong>all</strong> pods ' +
'from <strong>all</strong> pods ' + 'from <strong>all</strong> pods ' +
'on ports <strong>80/TCP, 81/UDP</strong>', 'on ports <strong>80/TCP, 81/UDP</strong>',
); );
...@@ -95,7 +95,7 @@ describe('humanizeNetworkPolicy', () => { ...@@ -95,7 +95,7 @@ describe('humanizeNetworkPolicy', () => {
it('returns policy description', () => { it('returns policy description', () => {
expect(humanizeNetworkPolicy(policy)).toEqual( expect(humanizeNetworkPolicy(policy)).toEqual(
'Allow all inbound traffic to <strong>all</strong> pods ' + 'Deny all inbound traffic to <strong>all</strong> pods ' +
'from pods <strong>[one: , two: another]</strong> ' + 'from pods <strong>[one: , two: another]</strong> ' +
'on <strong>any</strong> port', 'on <strong>any</strong> port',
); );
...@@ -111,7 +111,7 @@ describe('humanizeNetworkPolicy', () => { ...@@ -111,7 +111,7 @@ describe('humanizeNetworkPolicy', () => {
it('returns policy description', () => { it('returns policy description', () => {
expect(humanizeNetworkPolicy(policy)).toEqual( expect(humanizeNetworkPolicy(policy)).toEqual(
'Allow all inbound traffic to <strong>all</strong> pods ' + 'Deny all inbound traffic to <strong>all</strong> pods ' +
'from <strong>host, world</strong> ' + 'from <strong>host, world</strong> ' +
'on <strong>any</strong> port', 'on <strong>any</strong> port',
); );
...@@ -127,7 +127,7 @@ describe('humanizeNetworkPolicy', () => { ...@@ -127,7 +127,7 @@ describe('humanizeNetworkPolicy', () => {
it('returns policy description', () => { it('returns policy description', () => {
expect(humanizeNetworkPolicy(policy)).toEqual( expect(humanizeNetworkPolicy(policy)).toEqual(
'Allow all inbound traffic to <strong>all</strong> pods ' + 'Deny all inbound traffic to <strong>all</strong> pods ' +
'from <strong>0.0.0.0/32, 1.1.1.1/24</strong> ' + 'from <strong>0.0.0.0/32, 1.1.1.1/24</strong> ' +
'on <strong>any</strong> port', 'on <strong>any</strong> port',
); );
...@@ -143,7 +143,7 @@ describe('humanizeNetworkPolicy', () => { ...@@ -143,7 +143,7 @@ describe('humanizeNetworkPolicy', () => {
it('returns policy description', () => { it('returns policy description', () => {
expect(humanizeNetworkPolicy(policy)).toEqual( expect(humanizeNetworkPolicy(policy)).toEqual(
'Allow all inbound traffic to <strong>all</strong> pods ' + 'Deny all inbound traffic to <strong>all</strong> pods ' +
'from <strong>some-service.com, another-service.com</strong> ' + 'from <strong>some-service.com, another-service.com</strong> ' +
'on <strong>any</strong> port', 'on <strong>any</strong> port',
); );
......
...@@ -18836,12 +18836,6 @@ msgstr "" ...@@ -18836,12 +18836,6 @@ msgstr ""
msgid "NetworkPolicies|Allow" msgid "NetworkPolicies|Allow"
msgstr "" 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." msgid "NetworkPolicies|Are you sure you want to delete this policy? This action cannot be undone."
msgstr "" msgstr ""
...@@ -18860,6 +18854,12 @@ msgstr "" ...@@ -18860,6 +18854,12 @@ msgstr ""
msgid "NetworkPolicies|Delete policy: %{policy}" msgid "NetworkPolicies|Delete policy: %{policy}"
msgstr "" 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" msgid "NetworkPolicies|Deny all traffic"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment