diff --git a/ee/app/assets/javascripts/threat_monitoring/components/policy_drawer/container_runtime_policy.vue b/ee/app/assets/javascripts/threat_monitoring/components/policy_drawer/cilium_network_policy.vue similarity index 96% rename from ee/app/assets/javascripts/threat_monitoring/components/policy_drawer/container_runtime_policy.vue rename to ee/app/assets/javascripts/threat_monitoring/components/policy_drawer/cilium_network_policy.vue index 54f8c92f6284c792814fe5c4db9cd80adbe8f5f2..9360de3bbf3224a964be1ec1b214bb507fbfa06a 100644 --- a/ee/app/assets/javascripts/threat_monitoring/components/policy_drawer/container_runtime_policy.vue +++ b/ee/app/assets/javascripts/threat_monitoring/components/policy_drawer/cilium_network_policy.vue @@ -41,7 +41,7 @@ export default { <template> <div> <h5 class="gl-mt-3">{{ __('Type') }}</h5> - <p>{{ s__('NetworkPolicies|Container runtime') }}</p> + <p>{{ s__('NetworkPolicies|Network policy') }}</p> <div v-if="policy"> <template v-if="policy.description"> diff --git a/ee/app/assets/javascripts/threat_monitoring/components/policy_drawer/network_policy_drawer.vue b/ee/app/assets/javascripts/threat_monitoring/components/policy_drawer/network_policy_drawer.vue index cd8fd1b2df5d99dd4d64c5e74f0e682516341d0e..8cb2b7838084e856701c68a1dc45bb11dc2b5ea5 100644 --- a/ee/app/assets/javascripts/threat_monitoring/components/policy_drawer/network_policy_drawer.vue +++ b/ee/app/assets/javascripts/threat_monitoring/components/policy_drawer/network_policy_drawer.vue @@ -2,7 +2,7 @@ import { GlButton, GlDrawer } from '@gitlab/ui'; import { getContentWrapperHeight } from '../../utils'; import { CiliumNetworkPolicyKind } from '../policy_editor/constants'; -import ContainerRuntimePolicy from './container_runtime_policy.vue'; +import CiliumNetworkPolicy from './cilium_network_policy.vue'; export default { components: { @@ -10,7 +10,7 @@ export default { GlDrawer, NetworkPolicyEditor: () => import(/* webpackChunkName: 'network_policy_editor' */ '../network_policy_editor.vue'), - ContainerRuntimePolicy, + CiliumNetworkPolicy, }, props: { policy: { @@ -25,7 +25,7 @@ export default { }, }, computed: { - isContainerRuntimePolicy() { + isCiliumNetworkPolicy() { return this.policy ? this.policy.manifest.includes(CiliumNetworkPolicyKind) : false; }, }, @@ -59,7 +59,7 @@ export default { </div> </template> <div v-if="policy"> - <container-runtime-policy v-if="isContainerRuntimePolicy" :value="policy.manifest" /> + <cilium-network-policy v-if="isCiliumNetworkPolicy" :value="policy.manifest" /> <div v-else> <h5>{{ s__('NetworkPolicies|Policy definition') }}</h5> diff --git a/ee/spec/frontend/threat_monitoring/components/policy_editor/__snapshots__/container_runtime_policy_spec.js.snap b/ee/spec/frontend/threat_monitoring/components/policy_drawer/__snapshots__/cilium_network_policy_spec.js.snap similarity index 80% rename from ee/spec/frontend/threat_monitoring/components/policy_editor/__snapshots__/container_runtime_policy_spec.js.snap rename to ee/spec/frontend/threat_monitoring/components/policy_drawer/__snapshots__/cilium_network_policy_spec.js.snap index befb8e7c1f2463ec06e56aa6ce8115a58ae708e3..616a663dcac02f3cff536d06814337dc579ee5f7 100644 --- a/ee/spec/frontend/threat_monitoring/components/policy_editor/__snapshots__/container_runtime_policy_spec.js.snap +++ b/ee/spec/frontend/threat_monitoring/components/policy_drawer/__snapshots__/cilium_network_policy_spec.js.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`ContainerRuntimePolicy component supported YAML renders policy preview tabs 1`] = ` +exports[`CiliumNetworkPolicy component supported YAML renders policy preview tabs 1`] = ` <div> <h5 class="gl-mt-3" @@ -9,7 +9,7 @@ exports[`ContainerRuntimePolicy component supported YAML renders policy preview </h5> <p> - Container runtime + Network policy </p> <div> @@ -54,7 +54,7 @@ spec: </div> `; -exports[`ContainerRuntimePolicy component unsupported YAML renders policy preview tabs 1`] = ` +exports[`CiliumNetworkPolicy component unsupported YAML renders policy preview tabs 1`] = ` <div> <h5 class="gl-mt-3" @@ -63,7 +63,7 @@ exports[`ContainerRuntimePolicy component unsupported YAML renders policy previe </h5> <p> - Container runtime + Network policy </p> <!----> diff --git a/ee/spec/frontend/threat_monitoring/components/policy_editor/container_runtime_policy_spec.js b/ee/spec/frontend/threat_monitoring/components/policy_drawer/cilium_network_policy_spec.js similarity index 90% rename from ee/spec/frontend/threat_monitoring/components/policy_editor/container_runtime_policy_spec.js rename to ee/spec/frontend/threat_monitoring/components/policy_drawer/cilium_network_policy_spec.js index 70458a868415608b94d5423d9a1734daf712bc42..b7fae7020f67c118635f2b8e80af1dc832882098 100644 --- a/ee/spec/frontend/threat_monitoring/components/policy_editor/container_runtime_policy_spec.js +++ b/ee/spec/frontend/threat_monitoring/components/policy_drawer/cilium_network_policy_spec.js @@ -1,9 +1,9 @@ -import ContainerRuntimePolicy from 'ee/threat_monitoring/components/policy_drawer/container_runtime_policy.vue'; +import CiliumNetworkPolicy from 'ee/threat_monitoring/components/policy_drawer/cilium_network_policy.vue'; import toYaml from 'ee/threat_monitoring/components/policy_editor/lib/to_yaml'; import PolicyPreview from 'ee/threat_monitoring/components/policy_editor/policy_preview.vue'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; -describe('ContainerRuntimePolicy component', () => { +describe('CiliumNetworkPolicy component', () => { let wrapper; const policy = { name: 'test-policy', @@ -17,7 +17,7 @@ describe('ContainerRuntimePolicy component', () => { const findDescription = () => wrapper.findByTestId('description'); const factory = ({ propsData } = {}) => { - wrapper = shallowMountExtended(ContainerRuntimePolicy, { + wrapper = shallowMountExtended(CiliumNetworkPolicy, { propsData: { ...propsData, }, diff --git a/ee/spec/frontend/threat_monitoring/components/policy_drawer/network_policy_drawer_spec.js b/ee/spec/frontend/threat_monitoring/components/policy_drawer/network_policy_drawer_spec.js index f64d2f437e430c21b1fc93bf725587d0dd7c10a0..e6b2c735c6499a1bce38f15b098d3fd19690976c 100644 --- a/ee/spec/frontend/threat_monitoring/components/policy_drawer/network_policy_drawer_spec.js +++ b/ee/spec/frontend/threat_monitoring/components/policy_drawer/network_policy_drawer_spec.js @@ -1,4 +1,4 @@ -import ContainerRuntimePolicy from 'ee/threat_monitoring/components/policy_drawer/container_runtime_policy.vue'; +import CiliumNetworkPolicy from 'ee/threat_monitoring/components/policy_drawer/cilium_network_policy.vue'; import NetworkPolicyDrawer from 'ee/threat_monitoring/components/policy_drawer/network_policy_drawer.vue'; import { mountExtended } from 'helpers/vue_test_utils_helper'; import { mockPoliciesResponse, mockCiliumPolicy } from '../../mocks/mock_data'; @@ -22,7 +22,7 @@ describe('NetworkPolicyDrawer component', () => { // Finders const findEditButton = () => wrapper.findByTestId('edit-button'); const findPolicyEditor = () => wrapper.findByTestId('policyEditor'); - const findCiliumPolicy = () => wrapper.findComponent(ContainerRuntimePolicy); + const findCiliumNetworkPolicy = () => wrapper.findComponent(CiliumNetworkPolicy); // Shared assertions const itRendersEditButton = () => { @@ -75,8 +75,8 @@ describe('NetworkPolicyDrawer component', () => { }); }); - it('renders the container runtime component', () => { - expect(findCiliumPolicy().exists()).toBe(true); + it('renders the network policy component', () => { + expect(findCiliumNetworkPolicy().exists()).toBe(true); }); itRendersEditButton(); diff --git a/locale/gitlab.pot b/locale/gitlab.pot index da43500f26cfe20f50e6dc5ed898c2ceaf3c63bc..9e71206644e6a29c1888173e834eb16400593042 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -21818,9 +21818,6 @@ msgstr "" msgid "NetworkPolicies|Are you sure you want to delete this policy? This action cannot be undone." msgstr "" -msgid "NetworkPolicies|Container runtime" -msgstr "" - msgid "NetworkPolicies|Create policy" msgstr "" @@ -21872,6 +21869,9 @@ msgstr "" msgid "NetworkPolicies|Network Policy" msgstr "" +msgid "NetworkPolicies|Network policy" +msgstr "" + msgid "NetworkPolicies|Network traffic" msgstr ""