diff --git a/app/assets/javascripts/clusters/clusters_bundle.js b/app/assets/javascripts/clusters/clusters_bundle.js
index 5cb3d913210d5918e85a4de01dd35037bbca8720..2a2f3ff2dc10567597a4ae5e0ada95a68edc5e9b 100644
--- a/app/assets/javascripts/clusters/clusters_bundle.js
+++ b/app/assets/javascripts/clusters/clusters_bundle.js
@@ -55,7 +55,6 @@ export default class Clusters {
helmHelpPath,
ingressHelpPath,
ingressDnsHelpPath,
- ingressModSecurityHelpPath,
environmentsHelpPath,
clustersHelpPath,
deployBoardsHelpPath,
@@ -74,7 +73,6 @@ export default class Clusters {
helmHelpPath,
ingressHelpPath,
ingressDnsHelpPath,
- ingressModSecurityHelpPath,
environmentsHelpPath,
clustersHelpPath,
deployBoardsHelpPath,
@@ -168,7 +166,6 @@ export default class Clusters {
ingressHelpPath: this.state.ingressHelpPath,
managePrometheusPath: this.state.managePrometheusPath,
ingressDnsHelpPath: this.state.ingressDnsHelpPath,
- ingressModSecurityHelpPath: this.state.ingressModSecurityHelpPath,
cloudRunHelpPath: this.state.cloudRunHelpPath,
providerType: this.state.providerType,
preInstalledKnative: this.state.preInstalledKnative,
@@ -253,9 +250,6 @@ export default class Clusters {
eventHub.$on('setKnativeDomain', (data) => this.setKnativeDomain(data));
eventHub.$on('uninstallApplication', (data) => this.uninstallApplication(data));
eventHub.$on('setCrossplaneProviderStack', (data) => this.setCrossplaneProviderStack(data));
- eventHub.$on('setIngressModSecurityEnabled', (data) => this.setIngressModSecurityEnabled(data));
- eventHub.$on('setIngressModSecurityMode', (data) => this.setIngressModSecurityMode(data));
- eventHub.$on('resetIngressModSecurityChanges', (id) => this.resetIngressModSecurityChanges(id));
eventHub.$on('setFluentdSettings', (data) => this.setFluentdSettings(data));
// Add event listener to all the banner close buttons
this.addBannerCloseHandler(this.unreachableContainer, 'unreachable');
@@ -274,12 +268,6 @@ export default class Clusters {
// eslint-disable-next-line @gitlab/no-global-event-off
eventHub.$off('uninstallApplication');
// eslint-disable-next-line @gitlab/no-global-event-off
- eventHub.$off('setIngressModSecurityEnabled');
- // eslint-disable-next-line @gitlab/no-global-event-off
- eventHub.$off('setIngressModSecurityMode');
- // eslint-disable-next-line @gitlab/no-global-event-off
- eventHub.$off('resetIngressModSecurityChanges');
- // eslint-disable-next-line @gitlab/no-global-event-off
eventHub.$off('setFluentdSettings');
}
@@ -519,21 +507,6 @@ export default class Clusters {
this.store.updateAppProperty(appId, 'validationError', null);
}
- setIngressModSecurityEnabled({ id, modSecurityEnabled }) {
- this.store.updateAppProperty(id, 'isEditingModSecurityEnabled', true);
- this.store.updateAppProperty(id, 'modsecurity_enabled', modSecurityEnabled);
- }
-
- setIngressModSecurityMode({ id, modSecurityMode }) {
- this.store.updateAppProperty(id, 'isEditingModSecurityMode', true);
- this.store.updateAppProperty(id, 'modsecurity_mode', modSecurityMode);
- }
-
- resetIngressModSecurityChanges(id) {
- this.store.updateAppProperty(id, 'isEditingModSecurityEnabled', false);
- this.store.updateAppProperty(id, 'isEditingModSecurityMode', false);
- }
-
destroy() {
this.destroyed = true;
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index 8ef3169dc65a45abf6995761046af1194228fcc1..e589b67fba0d4a5d77c9aa9109e0cc7c2157ad8e 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -16,7 +16,6 @@ import { CLUSTER_TYPE, PROVIDER_TYPE, APPLICATION_STATUS, INGRESS } from '../con
import applicationRow from './application_row.vue';
import CrossplaneProviderStack from './crossplane_provider_stack.vue';
import FluentdOutputSettings from './fluentd_output_settings.vue';
-import IngressModsecuritySettings from './ingress_modsecurity_settings.vue';
import KnativeDomainEditor from './knative_domain_editor.vue';
export default {
@@ -28,7 +27,6 @@ export default {
GlLink,
KnativeDomainEditor,
CrossplaneProviderStack,
- IngressModsecuritySettings,
FluentdOutputSettings,
GlAlert,
},
@@ -63,11 +61,7 @@ export default {
required: false,
default: '',
},
- ingressModSecurityHelpPath: {
- type: String,
- required: false,
- default: '',
- },
+
cloudRunHelpPath: {
type: String,
required: false,
@@ -219,10 +213,6 @@ export default {
:request-reason="applications.ingress.requestReason"
:installed="applications.ingress.installed"
:install-failed="applications.ingress.installFailed"
- :install-application-request-params="{
- modsecurity_enabled: applications.ingress.modsecurity_enabled,
- modsecurity_mode: applications.ingress.modsecurity_mode,
- }"
:uninstallable="applications.ingress.uninstallable"
:uninstall-successful="applications.ingress.uninstallSuccessful"
:uninstall-failed="applications.ingress.uninstallFailed"
@@ -238,11 +228,6 @@ export default {
}}
</p>
- <ingress-modsecurity-settings
- :ingress="ingress"
- :ingress-mod-security-help-path="ingressModSecurityHelpPath"
- />
-
<template v-if="ingressInstalled">
<div class="form-group">
<label for="ingress-endpoint">{{ s__('ClusterIntegration|Ingress Endpoint') }}</label>
@@ -658,7 +643,6 @@ export default {
host: applications.fluentd.host,
port: applications.fluentd.port,
protocol: applications.fluentd.protocol,
- waf_log_enabled: applications.fluentd.wafLogEnabled,
cilium_log_enabled: applications.fluentd.ciliumLogEnabled,
}"
:uninstallable="applications.fluentd.uninstallable"
@@ -680,7 +664,6 @@ export default {
:port="applications.fluentd.port"
:protocol="applications.fluentd.protocol"
:host="applications.fluentd.host"
- :waf-log-enabled="applications.fluentd.wafLogEnabled"
:cilium-log-enabled="applications.fluentd.ciliumLogEnabled"
:status="applications.fluentd.status"
:update-failed="applications.fluentd.updateFailed"
diff --git a/app/assets/javascripts/clusters/components/fluentd_output_settings.vue b/app/assets/javascripts/clusters/components/fluentd_output_settings.vue
index aaad0009ef39612311274e4dccd4f6321a497293..d167b8f89dd9bb732b0e75a2927fc76011e21d13 100644
--- a/app/assets/javascripts/clusters/components/fluentd_output_settings.vue
+++ b/app/assets/javascripts/clusters/components/fluentd_output_settings.vue
@@ -45,10 +45,6 @@ export default {
required: false,
default: '',
},
- wafLogEnabled: {
- type: Boolean,
- required: false,
- },
ciliumLogEnabled: {
type: Boolean,
required: false,
@@ -60,7 +56,6 @@ export default {
host: null,
port: null,
protocol: null,
- wafLogEnabled: null,
ciliumLogEnabled: null,
},
};
@@ -109,7 +104,6 @@ export default {
port: this.port,
protocol: this.protocol,
host: this.host,
- waf_log_enabled: this.wafLogEnabled,
cilium_log_enabled: this.ciliumLogEnabled,
},
});
@@ -151,9 +145,6 @@ export default {
portChanged(port) {
this.setFluentdSettings({ port: Number(port) });
},
- wafLogChanged(wafLogEnabled) {
- this.setFluentdSettings({ wafLogEnabled });
- },
ciliumLogChanged(ciliumLogEnabled) {
this.setFluentdSettings({ ciliumLogEnabled });
},
@@ -210,9 +201,6 @@ export default {
</gl-dropdown>
</div>
<div class="form-group flex flex-wrap">
- <gl-form-checkbox :checked="wafLogEnabled" @input="wafLogChanged">
- <strong>{{ s__('ClusterIntegration|Send Web Application Firewall Logs') }}</strong>
- </gl-form-checkbox>
<gl-form-checkbox :checked="ciliumLogEnabled" @input="ciliumLogChanged">
<strong>{{ s__('ClusterIntegration|Send Container Network Policies Logs') }}</strong>
</gl-form-checkbox>
diff --git a/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue b/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue
deleted file mode 100644
index 1ba28660e5c42bf18f2a7583acaea24f3fb9c1d3..0000000000000000000000000000000000000000
--- a/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue
+++ /dev/null
@@ -1,266 +0,0 @@
-<script>
-import {
- GlAlert,
- GlSprintf,
- GlLink,
- GlToggle,
- GlButton,
- GlDropdown,
- GlDropdownItem,
- GlIcon,
-} from '@gitlab/ui';
-import { escape } from 'lodash';
-import modSecurityLogo from 'images/cluster_app_logos/gitlab.png';
-import { APPLICATION_STATUS, INGRESS, LOGGING_MODE, BLOCKING_MODE } from '~/clusters/constants';
-import eventHub from '~/clusters/event_hub';
-import { s__, __ } from '../../locale';
-
-const { UPDATING, UNINSTALLING, INSTALLING, INSTALLED, UPDATED } = APPLICATION_STATUS;
-
-export default {
- i18n: {
- modSecurityEnabled: s__('ClusterIntegration|ModSecurity enabled'),
- },
- title: __('Web Application Firewall'),
- modsecurityUrl: 'https://modsecurity.org/about.html',
- components: {
- GlAlert,
- GlSprintf,
- GlLink,
- GlToggle,
- GlButton,
- GlDropdown,
- GlDropdownItem,
- GlIcon,
- },
- props: {
- ingress: {
- type: Object,
- required: true,
- },
- ingressModSecurityHelpPath: {
- type: String,
- required: false,
- default: '',
- },
- modes: {
- type: Object,
- required: false,
- default: () => ({
- [LOGGING_MODE]: {
- name: s__('ClusterIntegration|Logging mode'),
- },
- [BLOCKING_MODE]: {
- name: s__('ClusterIntegration|Blocking mode'),
- },
- }),
- },
- },
- data() {
- return {
- modSecurityLogo,
- initialValue: null,
- initialMode: null,
- };
- },
- computed: {
- modSecurityEnabled: {
- get() {
- return this.ingress.modsecurity_enabled;
- },
- set(isEnabled) {
- if (this.initialValue === null) {
- this.initialValue = this.ingress.modsecurity_enabled;
- }
- eventHub.$emit('setIngressModSecurityEnabled', {
- id: INGRESS,
- modSecurityEnabled: isEnabled,
- });
- },
- },
- hasValueChanged() {
- return this.modSecurityEnabledChanged || this.modSecurityModeChanged;
- },
- modSecurityEnabledChanged() {
- return this.initialValue !== null && this.initialValue !== this.ingress.modsecurity_enabled;
- },
- modSecurityModeChanged() {
- return (
- this.ingress.modsecurity_enabled &&
- this.initialMode !== null &&
- this.initialMode !== this.ingress.modsecurity_mode
- );
- },
- ingressModSecurityDescription() {
- return escape(this.ingressModSecurityHelpPath);
- },
- saving() {
- return [UPDATING].includes(this.ingress.status);
- },
- saveButtonDisabled() {
- return (
- [UNINSTALLING, UPDATING, INSTALLING].includes(this.ingress.status) ||
- this.ingress.updateAvailable
- );
- },
- saveButtonLabel() {
- return this.saving ? __('Saving') : __('Save changes');
- },
- /**
- * Returns true either when:
- * - The application is getting updated.
- * - The user has changed some of the settings for an application which is
- * neither getting installed nor updated.
- */
- showButtons() {
- return this.saving || this.valuesChangedByUser;
- },
- modSecurityModeName() {
- return this.modes[this.ingress.modsecurity_mode].name;
- },
- valuesChangedByUser() {
- return this.hasValueChanged && [INSTALLED, UPDATED].includes(this.ingress.status);
- },
- },
- methods: {
- updateApplication() {
- eventHub.$emit('updateApplication', {
- id: INGRESS,
- params: {
- modsecurity_enabled: this.ingress.modsecurity_enabled,
- modsecurity_mode: this.ingress.modsecurity_mode,
- },
- });
- this.resetStatus();
- },
- resetStatus() {
- if (this.initialMode !== null) {
- // eslint-disable-next-line vue/no-mutating-props
- this.ingress.modsecurity_mode = this.initialMode;
- }
- if (this.initialValue !== null) {
- // eslint-disable-next-line vue/no-mutating-props
- this.ingress.modsecurity_enabled = this.initialValue;
- }
- this.initialValue = null;
- this.initialMode = null;
- eventHub.$emit('resetIngressModSecurityChanges', INGRESS);
- },
- selectMode(modeKey) {
- if (this.initialMode === null) {
- this.initialMode = this.ingress.modsecurity_mode;
- }
- eventHub.$emit('setIngressModSecurityMode', {
- id: INGRESS,
- modSecurityMode: modeKey,
- });
- },
- },
-};
-</script>
-
-<template>
- <div>
- <gl-alert
- v-if="ingress.updateFailed"
- class="mb-3"
- variant="danger"
- :dismissible="false"
- @dismiss="alert = null"
- >
- {{
- s__(
- 'ClusterIntegration|Something went wrong while trying to save your settings. Please try again.',
- )
- }}
- </gl-alert>
- <div class="gl-responsive-table-row-layout" role="row">
- <div class="table-section gl-mr-3 section-align-top" role="gridcell">
- <img
- :src="modSecurityLogo"
- :alt="`${$options.title} logo`"
- class="cluster-application-logo avatar s40"
- />
- </div>
- <div class="table-section section-wrap" role="gridcell">
- <strong>
- <gl-link :href="$options.modsecurityUrl" target="_blank">{{ $options.title }} </gl-link>
- </strong>
- <div class="form-group">
- <p class="form-text text-muted">
- <strong>
- <gl-sprintf
- :message="
- s__(
- 'ClusterIntegration|Real-time web application monitoring, logging and access control. %{linkStart}More information%{linkEnd}',
- )
- "
- >
- <template #link="{ content }">
- <gl-link :href="ingressModSecurityDescription" target="_blank"
- >{{ content }}
- </gl-link>
- </template>
- </gl-sprintf>
- </strong>
- </p>
- <div class="form-check form-check-inline mt-3">
- <gl-toggle
- v-model="modSecurityEnabled"
- :disabled="saveButtonDisabled"
- :label="$options.i18n.modSecurityEnabled"
- label-position="hidden"
- />
- </div>
- <div
- v-if="ingress.modsecurity_enabled"
- class="gl-responsive-table-row-layout mt-3"
- role="row"
- >
- <div class="table-section section-wrap" role="gridcell">
- <strong>
- {{ s__('ClusterIntegration|Global default') }}
- <gl-icon name="earth" class="align-text-bottom" />
- </strong>
- <div class="form-group">
- <p class="form-text text-muted">
- <strong>
- {{
- s__(
- 'ClusterIntegration|Set the global mode for the WAF in this cluster. This can be overridden at the environmental level.',
- )
- }}
- </strong>
- </p>
- </div>
- <gl-dropdown :text="modSecurityModeName" :disabled="saveButtonDisabled">
- <gl-dropdown-item v-for="(mode, key) in modes" :key="key" @click="selectMode(key)">
- {{ mode.name }}
- </gl-dropdown-item>
- </gl-dropdown>
- </div>
- </div>
- <div v-if="showButtons" class="gl-mt-5 gl-display-flex">
- <gl-button
- variant="success"
- category="primary"
- data-qa-selector="save_ingress_modsecurity_settings"
- :loading="saving"
- :disabled="saveButtonDisabled"
- @click="updateApplication"
- >
- {{ saveButtonLabel }}
- </gl-button>
- <gl-button
- data-qa-selector="cancel_ingress_modsecurity_settings"
- :disabled="saveButtonDisabled"
- @click="resetStatus"
- >
- {{ __('Cancel') }}
- </gl-button>
- </div>
- </div>
- </div>
- </div>
- </div>
-</template>
diff --git a/app/assets/javascripts/clusters/stores/clusters_store.js b/app/assets/javascripts/clusters/stores/clusters_store.js
index d45696c98c2600f622204522abf42505da90c98f..88a1d648451f0943913add4982f037814b32ddbd 100644
--- a/app/assets/javascripts/clusters/stores/clusters_store.js
+++ b/app/assets/javascripts/clusters/stores/clusters_store.js
@@ -55,12 +55,8 @@ export default class ClusterStore {
ingress: {
...applicationInitialState,
title: s__('ClusterIntegration|Ingress'),
- modsecurity_enabled: false,
- modsecurity_mode: null,
externalIp: null,
externalHostname: null,
- isEditingModSecurityEnabled: false,
- isEditingModSecurityMode: false,
updateFailed: false,
updateAvailable: false,
},
@@ -112,7 +108,6 @@ export default class ClusterStore {
host: null,
port: null,
protocol: null,
- wafLogEnabled: null,
ciliumLogEnabled: null,
isEditingSettings: false,
},
@@ -219,12 +214,6 @@ export default class ClusterStore {
this.state.applications.ingress.externalIp = serverAppEntry.external_ip;
this.state.applications.ingress.externalHostname = serverAppEntry.external_hostname;
this.state.applications.ingress.updateAvailable = updateAvailable;
- if (!this.state.applications.ingress.isEditingModSecurityEnabled) {
- this.state.applications.ingress.modsecurity_enabled = serverAppEntry.modsecurity_enabled;
- }
- if (!this.state.applications.ingress.isEditingModSecurityMode) {
- this.state.applications.ingress.modsecurity_mode = serverAppEntry.modsecurity_mode;
- }
} else if (appId === CERT_MANAGER) {
this.state.applications.cert_manager.email =
this.state.applications.cert_manager.email || serverAppEntry.email;
@@ -262,7 +251,6 @@ export default class ClusterStore {
this.state.applications.fluentd.port = serverAppEntry.port;
this.state.applications.fluentd.host = serverAppEntry.host;
this.state.applications.fluentd.protocol = serverAppEntry.protocol;
- this.state.applications.fluentd.wafLogEnabled = serverAppEntry.waf_log_enabled;
this.state.applications.fluentd.ciliumLogEnabled = serverAppEntry.cilium_log_enabled;
}
}
diff --git a/app/models/clusters/applications/fluentd.rb b/app/models/clusters/applications/fluentd.rb
index 91aa422b85922c55f0404ec9679bcdfafabc5aba..8d0bf7b63210b121084c87027c79c44704a6d9f2 100644
--- a/app/models/clusters/applications/fluentd.rb
+++ b/app/models/clusters/applications/fluentd.rb
@@ -16,6 +16,7 @@ class Fluentd < ApplicationRecord
default_value_for :version, VERSION
default_value_for :port, 514
default_value_for :protocol, :tcp
+ default_value_for :waf_log_enabled, false
enum protocol: { tcp: 0, udp: 1 }
diff --git a/app/services/clusters/applications/base_service.rb b/app/services/clusters/applications/base_service.rb
index 39a2d6bf7587fcb773744295a65c59802f4dc529..489360f90701615f00eed454817cebc05c0228ff 100644
--- a/app/services/clusters/applications/base_service.rb
+++ b/app/services/clusters/applications/base_service.rb
@@ -5,7 +5,7 @@ module Applications
class BaseService
InvalidApplicationError = Class.new(StandardError)
- FLUENTD_KNOWN_ATTRS = %i[host protocol port waf_log_enabled cilium_log_enabled].freeze
+ FLUENTD_KNOWN_ATTRS = %i[host protocol port cilium_log_enabled].freeze
attr_reader :cluster, :current_user, :params
diff --git a/app/views/clusters/clusters/show.html.haml b/app/views/clusters/clusters/show.html.haml
index 001ca80dbd6ea88ec66bd6bc521cf26bece7ca52..7639b472a0bd5c737dac556f6804e8730c4e27cf 100644
--- a/app/views/clusters/clusters/show.html.haml
+++ b/app/views/clusters/clusters/show.html.haml
@@ -30,7 +30,6 @@
helm_help_path: help_page_path('user/clusters/applications.md', anchor: 'helm'),
ingress_help_path: help_page_path('user/clusters/applications.md', anchor: 'determining-the-external-endpoint-automatically'),
ingress_dns_help_path: help_page_path('user/clusters/applications.md', anchor: 'pointing-your-dns-at-the-external-endpoint'),
- ingress_mod_security_help_path: help_page_path('user/clusters/applications.md', anchor: 'web-application-firewall-modsecurity'),
environments_help_path: help_page_path('ci/environments/index.md', anchor: 'create-a-static-environment'),
clusters_help_path: help_page_path('user/project/clusters/index.md', anchor: 'deploying-to-a-kubernetes-cluster'),
deploy_boards_help_path: help_page_path('user/project/deploy_boards.md', anchor: 'enabling-deploy-boards'),
diff --git a/ee/app/assets/javascripts/threat_monitoring/components/app.vue b/ee/app/assets/javascripts/threat_monitoring/components/app.vue
index 9185e5f3af9e9bd4db12e8d5cecc04d4e0076d03..18bf6831099aaed7f57d59dc1a38069776655dd1 100644
--- a/ee/app/assets/javascripts/threat_monitoring/components/app.vue
+++ b/ee/app/assets/javascripts/threat_monitoring/components/app.vue
@@ -28,10 +28,6 @@ export default {
type: Number,
required: true,
},
- wafNoDataSvgPath: {
- type: String,
- required: true,
- },
networkPolicyNoDataSvgPath: {
type: String,
required: true,
@@ -62,15 +58,6 @@ export default {
return Number.isInteger(id) && id >= 0;
},
},
- chartEmptyStateDescription: s__(
- `ThreatMonitoring|While it's rare to have no traffic coming to your
- application, it can happen. In any event, we ask that you double check your
- settings to make sure you've set up the WAF correctly.`,
- ),
- wafChartEmptyStateDescription: s__(
- `ThreatMonitoring|The firewall is not installed or has been disabled. To view
- this data, ensure the web application firewall is installed and enabled for your cluster.`,
- ),
networkPolicyChartEmptyStateDescription: s__(
`ThreatMonitoring|Container Network Policies are not installed or have been disabled. To view
this data, ensure your Network Policies are installed and enabled for your cluster.`,
@@ -118,23 +105,6 @@ export default {
<template v-else>
<threat-monitoring-filters />
- <threat-monitoring-section
- ref="wafSection"
- store-namespace="threatMonitoringWaf"
- :title="s__('ThreatMonitoring|Web Application Firewall')"
- :subtitle="s__('ThreatMonitoring|Requests')"
- :anomalous-title="s__('ThreatMonitoring|Anomalous Requests')"
- :nominal-title="s__('ThreatMonitoring|Total Requests')"
- :y-legend="s__('ThreatMonitoring|Requests')"
- :chart-empty-state-title="s__('ThreatMonitoring|Application firewall not detected')"
- :chart-empty-state-text="$options.wafChartEmptyStateDescription"
- :chart-empty-state-svg-path="wafNoDataSvgPath"
- :documentation-path="documentationPath"
- documentation-anchor="web-application-firewall"
- />
-
- <hr />
-
<threat-monitoring-section
ref="networkPolicySection"
store-namespace="threatMonitoringNetworkPolicy"
diff --git a/ee/app/assets/javascripts/threat_monitoring/index.js b/ee/app/assets/javascripts/threat_monitoring/index.js
index 920dba3e7916a04cc613f6e86a5138c99ee8827c..4dea8f1e1daa4d8331c4435436db28bb617ca6b5 100644
--- a/ee/app/assets/javascripts/threat_monitoring/index.js
+++ b/ee/app/assets/javascripts/threat_monitoring/index.js
@@ -27,12 +27,10 @@ const apolloProvider = new VueApollo({
export default () => {
const el = document.querySelector('#js-threat-monitoring-app');
const {
- wafStatisticsEndpoint,
networkPolicyStatisticsEndpoint,
environmentsEndpoint,
networkPoliciesEndpoint,
emptyStateSvgPath,
- wafNoDataSvgPath,
networkPolicyNoDataSvgPath,
newPolicyPath,
documentationPath,
@@ -42,7 +40,6 @@ export default () => {
const store = createStore();
store.dispatch('threatMonitoring/setEndpoints', {
- wafStatisticsEndpoint,
networkPolicyStatisticsEndpoint,
environmentsEndpoint,
});
@@ -62,7 +59,6 @@ export default () => {
render(createElement) {
return createElement(ThreatMonitoringApp, {
props: {
- wafNoDataSvgPath,
networkPolicyNoDataSvgPath,
defaultEnvironmentId: parseInt(defaultEnvironmentId, 10),
newPolicyPath,
diff --git a/ee/app/assets/javascripts/threat_monitoring/store/index.js b/ee/app/assets/javascripts/threat_monitoring/store/index.js
index 069949798bd438e222798853a64d9905b0d7824a..84272bf0d718d8be2304d2f7b280666dac5722e5 100644
--- a/ee/app/assets/javascripts/threat_monitoring/store/index.js
+++ b/ee/app/assets/javascripts/threat_monitoring/store/index.js
@@ -11,10 +11,6 @@ export default () =>
new Vuex.Store({
modules: {
threatMonitoring: threatMonitoring(),
- threatMonitoringWaf: threatMonitoringStatistics((payload) => {
- const { totalTraffic, anomalousTraffic, history } = convertObjectPropsToCamelCase(payload);
- return { total: totalTraffic, anomalous: anomalousTraffic, history };
- }),
threatMonitoringNetworkPolicy: threatMonitoringStatistics((payload) => {
const {
opsRate,
diff --git a/ee/app/assets/javascripts/threat_monitoring/store/modules/threat_monitoring/actions.js b/ee/app/assets/javascripts/threat_monitoring/store/modules/threat_monitoring/actions.js
index 832448e6334c227187f6d50fde60a3a9ef40d6a1..89e53fd9fd8f5fe263d2ef85270dd6a9e6cdb5c4 100644
--- a/ee/app/assets/javascripts/threat_monitoring/store/modules/threat_monitoring/actions.js
+++ b/ee/app/assets/javascripts/threat_monitoring/store/modules/threat_monitoring/actions.js
@@ -5,9 +5,6 @@ import * as types from './mutation_types';
export const setEndpoints = ({ commit }, endpoints) => {
commit(types.SET_ENDPOINT, endpoints.environmentsEndpoint);
- commit(`threatMonitoringWaf/${types.SET_ENDPOINT}`, endpoints.wafStatisticsEndpoint, {
- root: true,
- });
commit(
`threatMonitoringNetworkPolicy/${types.SET_ENDPOINT}`,
endpoints.networkPolicyStatisticsEndpoint,
diff --git a/ee/app/assets/javascripts/threat_monitoring/store/modules/threat_monitoring/getters.js b/ee/app/assets/javascripts/threat_monitoring/store/modules/threat_monitoring/getters.js
index 5179c509b59fadcb106004bd3ef6a02407a8540c..c5c8baef3fb4e3253ffd6b030c184390fc28a68e 100644
--- a/ee/app/assets/javascripts/threat_monitoring/store/modules/threat_monitoring/getters.js
+++ b/ee/app/assets/javascripts/threat_monitoring/store/modules/threat_monitoring/getters.js
@@ -7,11 +7,6 @@ export const currentEnvironmentName = ({ currentEnvironmentId, environments }) =
export const canChangeEnvironment = ({
isLoadingEnvironments,
- isLoadingWafStatistics,
isLoadingNetworkPolicyStatistics,
environments,
-}) =>
- !isLoadingEnvironments &&
- !isLoadingWafStatistics &&
- !isLoadingNetworkPolicyStatistics &&
- environments.length > 0;
+}) => !isLoadingEnvironments && !isLoadingNetworkPolicyStatistics && environments.length > 0;
diff --git a/ee/spec/frontend/threat_monitoring/components/__snapshots__/app_spec.js.snap b/ee/spec/frontend/threat_monitoring/components/__snapshots__/app_spec.js.snap
index 2aba65808927ff89dddefd611c73dd9f131a9f9b..0fd9b927ddadf0c8bdc1cb6cf6adaffa44902597 100644
--- a/ee/spec/frontend/threat_monitoring/components/__snapshots__/app_spec.js.snap
+++ b/ee/spec/frontend/threat_monitoring/components/__snapshots__/app_spec.js.snap
@@ -27,19 +27,3 @@ exports[`ThreatMonitoringApp component given there is a default environment with
/>
</gl-tab-stub>
`;
-
-exports[`ThreatMonitoringApp component given there is a default environment with data renders the waf section 1`] = `
-<threat-monitoring-section-stub
- anomaloustitle="Anomalous Requests"
- chartemptystatesvgpath="/waf-no-data-svg"
- chartemptystatetext="The firewall is not installed or has been disabled. To view this data, ensure the web application firewall is installed and enabled for your cluster."
- chartemptystatetitle="Application firewall not detected"
- documentationanchor="web-application-firewall"
- documentationpath="/docs"
- nominaltitle="Total Requests"
- storenamespace="threatMonitoringWaf"
- subtitle="Requests"
- title="Web Application Firewall"
- ylegend="Requests"
-/>
-`;
diff --git a/ee/spec/frontend/threat_monitoring/components/app_spec.js b/ee/spec/frontend/threat_monitoring/components/app_spec.js
index fe47b4a3554f4b123191e145eb9a1301c1654d5a..e5fdb8968095e25f1b9b5994a8d48bacd978140a 100644
--- a/ee/spec/frontend/threat_monitoring/components/app_spec.js
+++ b/ee/spec/frontend/threat_monitoring/components/app_spec.js
@@ -12,10 +12,8 @@ const defaultEnvironmentId = 3;
const documentationPath = '/docs';
const newPolicyPath = '/policy/new';
const emptyStateSvgPath = '/svgs';
-const wafNoDataSvgPath = '/waf-no-data-svg';
const networkPolicyNoDataSvgPath = '/network-policy-no-data-svg';
const environmentsEndpoint = `${TEST_HOST}/environments`;
-const wafStatisticsEndpoint = `${TEST_HOST}/waf`;
const networkPolicyStatisticsEndpoint = `${TEST_HOST}/network_policy`;
describe('ThreatMonitoringApp component', () => {
@@ -26,7 +24,6 @@ describe('ThreatMonitoringApp component', () => {
store = createStore();
Object.assign(store.state.threatMonitoring, {
environmentsEndpoint,
- wafStatisticsEndpoint,
networkPolicyStatisticsEndpoint,
...state,
});
@@ -38,7 +35,6 @@ describe('ThreatMonitoringApp component', () => {
propsData: {
defaultEnvironmentId,
emptyStateSvgPath,
- wafNoDataSvgPath,
networkPolicyNoDataSvgPath,
newPolicyPath,
...propsData,
@@ -56,7 +52,6 @@ describe('ThreatMonitoringApp component', () => {
const findAlertsView = () => wrapper.find(ThreatMonitoringAlerts);
const findNetworkPolicyList = () => wrapper.find(NetworkPolicyList);
const findFilters = () => wrapper.find(ThreatMonitoringFilters);
- const findWafSection = () => wrapper.find({ ref: 'wafSection' });
const findNetworkPolicySection = () => wrapper.find({ ref: 'networkPolicySection' });
const findNoEnvironmentEmptyStates = () => wrapper.findAll(NoEnvironmentEmptyState);
const findNetworkPolicyTab = () => wrapper.find({ ref: 'networkPolicyTab' });
@@ -119,10 +114,6 @@ describe('ThreatMonitoringApp component', () => {
expect(findFilters().exists()).toBe(true);
});
- it('renders the waf section', () => {
- expect(findWafSection().element).toMatchSnapshot();
- });
-
it('renders the network policy section', () => {
expect(findNetworkPolicySection().element).toMatchSnapshot();
});
diff --git a/ee/spec/frontend/threat_monitoring/components/environment_picker_spec.js b/ee/spec/frontend/threat_monitoring/components/environment_picker_spec.js
index 825062392a14a8da82851c6e3841c3f9bcc97518..bbf5b910aa52e68d7e0def004546d55f77e0c5c9 100644
--- a/ee/spec/frontend/threat_monitoring/components/environment_picker_spec.js
+++ b/ee/spec/frontend/threat_monitoring/components/environment_picker_spec.js
@@ -99,24 +99,17 @@ describe('EnvironmentPicker component', () => {
});
describe.each`
- context | isLoadingEnvironments | isLoadingWafStatistics | isLoadingNetworkPolicyStatistics | environments
- ${'environments are loading'} | ${true} | ${false} | ${false} | ${mockEnvironments}
- ${'WAF statistics are loading'} | ${false} | ${true} | ${false} | ${mockEnvironments}
- ${'NetPol statistics are loading'} | ${false} | ${false} | ${true} | ${mockEnvironments}
- ${'there are no environments'} | ${false} | ${false} | ${false} | ${[]}
+ context | isLoadingEnvironments | isLoadingNetworkPolicyStatistics | environments
+ ${'environments are loading'} | ${true} | ${false} | ${mockEnvironments}
+ ${'NetPol statistics are loading'} | ${false} | ${true} | ${mockEnvironments}
+ ${'there are no environments'} | ${false} | ${false} | ${[]}
`(
'given $context',
- ({
- isLoadingEnvironments,
- isLoadingWafStatistics,
- isLoadingNetworkPolicyStatistics,
- environments,
- }) => {
+ ({ isLoadingEnvironments, isLoadingNetworkPolicyStatistics, environments }) => {
beforeEach(() => {
factory({
environments,
isLoadingEnvironments,
- isLoadingWafStatistics,
isLoadingNetworkPolicyStatistics,
});
diff --git a/ee/spec/frontend/threat_monitoring/components/threat_monitoring_filters_spec.js b/ee/spec/frontend/threat_monitoring/components/threat_monitoring_filters_spec.js
index db0d7aede6a36b1ec63d213b47e69a62d99d8f26..dadadbfa8f68400c024de49ff7f5500a37e9bde3 100644
--- a/ee/spec/frontend/threat_monitoring/components/threat_monitoring_filters_spec.js
+++ b/ee/spec/frontend/threat_monitoring/components/threat_monitoring_filters_spec.js
@@ -66,24 +66,17 @@ describe('ThreatMonitoringFilters component', () => {
});
describe.each`
- context | isLoadingEnvironments | isLoadingWafStatistics | isLoadingNetworkPolicyStatistics | environments
- ${'environments are loading'} | ${true} | ${false} | ${false} | ${mockEnvironments}
- ${'WAF statistics are loading'} | ${false} | ${true} | ${false} | ${mockEnvironments}
- ${'NetPol statistics are loading'} | ${false} | ${false} | ${true} | ${mockEnvironments}
- ${'there are no environments'} | ${false} | ${false} | ${false} | ${[]}
+ context | isLoadingEnvironments | isLoadingNetworkPolicyStatistics | environments
+ ${'environments are loading'} | ${true} | ${false} | ${mockEnvironments}
+ ${'NetPol statistics are loading'} | ${false} | ${true} | ${mockEnvironments}
+ ${'there are no environments'} | ${false} | ${false} | ${[]}
`(
'given $context',
- ({
- isLoadingEnvironments,
- isLoadingWafStatistics,
- isLoadingNetworkPolicyStatistics,
- environments,
- }) => {
+ ({ isLoadingEnvironments, isLoadingNetworkPolicyStatistics, environments }) => {
beforeEach(() => {
factory({
environments,
isLoadingEnvironments,
- isLoadingWafStatistics,
isLoadingNetworkPolicyStatistics,
});
diff --git a/ee/spec/frontend/threat_monitoring/components/threat_monitoring_section_spec.js b/ee/spec/frontend/threat_monitoring/components/threat_monitoring_section_spec.js
index 3c831e2b9d0dd03d3669c66dbd0501bdd91e424e..28de1d1503e6beeabca835149d3e8be3bbbe9df9 100644
--- a/ee/spec/frontend/threat_monitoring/components/threat_monitoring_section_spec.js
+++ b/ee/spec/frontend/threat_monitoring/components/threat_monitoring_section_spec.js
@@ -18,7 +18,7 @@ describe('ThreatMonitoringSection component', () => {
const factory = ({ propsData, state } = {}) => {
store = createStore();
- Object.assign(store.state.threatMonitoringWaf, {
+ Object.assign(store.state.threatMonitoringNetworkPolicy, {
isLoadingStatistics: false,
statistics: {
total: 100,
@@ -36,7 +36,7 @@ describe('ThreatMonitoringSection component', () => {
wrapper = shallowMount(ThreatMonitoringSection, {
propsData: {
- storeNamespace: 'threatMonitoringWaf',
+ storeNamespace: 'threatMonitoringNetworkPolicy',
title: 'Web Application Firewall',
subtitle: 'Requests',
nominalTitle: 'Total Requests',
@@ -113,21 +113,21 @@ describe('ThreatMonitoringSection component', () => {
});
it('fetches statistics', () => {
- expect(store.dispatch).toHaveBeenCalledWith('threatMonitoringWaf/fetchStatistics');
+ expect(store.dispatch).toHaveBeenCalledWith('threatMonitoringNetworkPolicy/fetchStatistics');
});
it('fetches statistics on environment change', async () => {
store.dispatch.mockReset();
await store.commit('threatMonitoring/SET_CURRENT_ENVIRONMENT_ID', 2);
- expect(store.dispatch).toHaveBeenCalledWith('threatMonitoringWaf/fetchStatistics');
+ expect(store.dispatch).toHaveBeenCalledWith('threatMonitoringNetworkPolicy/fetchStatistics');
});
it('fetches statistics on time window change', async () => {
store.dispatch.mockReset();
await store.commit('threatMonitoring/SET_CURRENT_TIME_WINDOW', 'hour');
- expect(store.dispatch).toHaveBeenCalledWith('threatMonitoringWaf/fetchStatistics');
+ expect(store.dispatch).toHaveBeenCalledWith('threatMonitoringNetworkPolicy/fetchStatistics');
});
describe('given the statistics are loading', () => {
diff --git a/ee/spec/frontend/threat_monitoring/mocks/mock_data.js b/ee/spec/frontend/threat_monitoring/mocks/mock_data.js
index 12622ea6b0e211cab94e796d2a74f2d58de21916..37fd8e082b6e5ad54555e1224b510e35fed7c7c9 100644
--- a/ee/spec/frontend/threat_monitoring/mocks/mock_data.js
+++ b/ee/spec/frontend/threat_monitoring/mocks/mock_data.js
@@ -7,7 +7,7 @@ export const mockEnvironmentsResponse = {
},
{
id: 1156094,
- name: 'review/enable-blocking-waf',
+ name: 'review/enable-network-policies',
state: 'available',
},
],
@@ -51,15 +51,6 @@ export const mockAnomalousHistory = [
['2019-12-05T00:00:00.000Z', 83],
];
-export const mockWafStatisticsResponse = {
- total_traffic: 2703,
- anomalous_traffic: 0.03,
- history: {
- nominal: mockNominalHistory,
- anomalous: mockAnomalousHistory,
- },
-};
-
export const mockNetworkPolicyStatisticsResponse = {
ops_total: {
total: 2703,
diff --git a/ee/spec/frontend/threat_monitoring/store/modules/threat_monitoring/actions_spec.js b/ee/spec/frontend/threat_monitoring/store/modules/threat_monitoring/actions_spec.js
index 6af2d37ba390f2caf10acdc7c49d2371654d9f0d..b41bf3a64837e63f5519e100260f2bf78dd99f31 100644
--- a/ee/spec/frontend/threat_monitoring/store/modules/threat_monitoring/actions_spec.js
+++ b/ee/spec/frontend/threat_monitoring/store/modules/threat_monitoring/actions_spec.js
@@ -13,7 +13,6 @@ import { mockEnvironmentsResponse } from '../../../mocks/mock_data';
jest.mock('~/flash');
const environmentsEndpoint = 'environmentsEndpoint';
-const wafStatisticsEndpoint = 'wafStatisticsEndpoint';
const networkPolicyStatisticsEndpoint = 'networkPolicyStatisticsEndpoint';
describe('Threat Monitoring actions', () => {
@@ -33,7 +32,6 @@ describe('Threat Monitoring actions', () => {
actions.setEndpoints,
{
environmentsEndpoint,
- wafStatisticsEndpoint,
networkPolicyStatisticsEndpoint,
},
state,
@@ -42,10 +40,6 @@ describe('Threat Monitoring actions', () => {
type: types.SET_ENDPOINT,
payload: environmentsEndpoint,
},
- {
- type: `threatMonitoringWaf/${types.SET_ENDPOINT}`,
- payload: wafStatisticsEndpoint,
- },
{
type: `threatMonitoringNetworkPolicy/${types.SET_ENDPOINT}`,
payload: networkPolicyStatisticsEndpoint,
diff --git a/ee/spec/frontend/threat_monitoring/store/modules/threat_monitoring_statistics/actions_spec.js b/ee/spec/frontend/threat_monitoring/store/modules/threat_monitoring_statistics/actions_spec.js
index a6be2fadd7310dfc329f7a91a8ed010a92b49baf..e351db23b44d6dfce8f3aa4471ce71c35fc09097 100644
--- a/ee/spec/frontend/threat_monitoring/store/modules/threat_monitoring_statistics/actions_spec.js
+++ b/ee/spec/frontend/threat_monitoring/store/modules/threat_monitoring_statistics/actions_spec.js
@@ -8,7 +8,7 @@ import createFlash from '~/flash';
import axios from '~/lib/utils/axios_utils';
import httpStatus from '~/lib/utils/http_status';
-import { mockWafStatisticsResponse } from '../../../mocks/mock_data';
+import { mockNetworkPolicyStatisticsResponse } from '../../../mocks/mock_data';
jest.mock('~/flash');
@@ -51,12 +51,12 @@ describe('threatMonitoringStatistics actions', () => {
it('commits the RECEIVE_STATISTICS_SUCCESS mutation', () =>
testAction(
actions.receiveStatisticsSuccess,
- mockWafStatisticsResponse,
+ mockNetworkPolicyStatisticsResponse,
state,
[
{
type: types.RECEIVE_STATISTICS_SUCCESS,
- payload: mockWafStatisticsResponse,
+ payload: mockNetworkPolicyStatisticsResponse,
},
],
[],
@@ -105,7 +105,7 @@ describe('threatMonitoringStatistics actions', () => {
...timeRange,
},
})
- .replyOnce(httpStatus.OK, mockWafStatisticsResponse);
+ .replyOnce(httpStatus.OK, mockNetworkPolicyStatisticsResponse);
});
it('should dispatch the request and success actions', () =>
@@ -121,7 +121,7 @@ describe('threatMonitoringStatistics actions', () => {
},
{
type: 'receiveStatisticsSuccess',
- payload: mockWafStatisticsResponse,
+ payload: mockNetworkPolicyStatisticsResponse,
},
],
));
diff --git a/ee/spec/frontend/threat_monitoring/store/modules/threat_monitoring_statistics/mutations_spec.js b/ee/spec/frontend/threat_monitoring/store/modules/threat_monitoring_statistics/mutations_spec.js
index 63d47ca8903ee766ad8eefce15603645b2470e2f..f2afe3490b1bd8e8cc58db4cb24acfa7ba3bf88e 100644
--- a/ee/spec/frontend/threat_monitoring/store/modules/threat_monitoring_statistics/mutations_spec.js
+++ b/ee/spec/frontend/threat_monitoring/store/modules/threat_monitoring_statistics/mutations_spec.js
@@ -1,6 +1,6 @@
import * as types from 'ee/threat_monitoring/store/modules/threat_monitoring_statistics/mutation_types';
import mutationsFactory from 'ee/threat_monitoring/store/modules/threat_monitoring_statistics/mutations';
-import { mockWafStatisticsResponse } from '../../../mocks/mock_data';
+import { mockNetworkPolicyStatisticsResponse } from '../../../mocks/mock_data';
describe('threatMonitoringStatistics mutations', () => {
let state;
@@ -39,11 +39,11 @@ describe('threatMonitoringStatistics mutations', () => {
describe(types.RECEIVE_STATISTICS_SUCCESS, () => {
beforeEach(() => {
- mutations[types.RECEIVE_STATISTICS_SUCCESS](state, mockWafStatisticsResponse);
+ mutations[types.RECEIVE_STATISTICS_SUCCESS](state, mockNetworkPolicyStatisticsResponse);
});
it('sets statistics according to the payload', () => {
- expect(state.statistics).toEqual(mockWafStatisticsResponse);
+ expect(state.statistics).toEqual(mockNetworkPolicyStatisticsResponse);
});
it('sets isLoadingStatistics to false', () => {
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 5a45b42a22581e29f1a39925fb06fc3b16790b65..2e7363675e904e92ee7f90ef43c8a482e9d7bb5a 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -7027,9 +7027,6 @@ msgstr ""
msgid "ClusterIntegration|Base domain"
msgstr ""
-msgid "ClusterIntegration|Blocking mode"
-msgstr ""
-
msgid "ClusterIntegration|CA Certificate"
msgstr ""
@@ -7279,9 +7276,6 @@ msgstr ""
msgid "ClusterIntegration|GitLab-managed cluster"
msgstr ""
-msgid "ClusterIntegration|Global default"
-msgstr ""
-
msgid "ClusterIntegration|Google Cloud Platform project"
msgstr ""
@@ -7438,9 +7432,6 @@ msgstr ""
msgid "ClusterIntegration|Loading subnetworks"
msgstr ""
-msgid "ClusterIntegration|Logging mode"
-msgstr ""
-
msgid "ClusterIntegration|Machine type"
msgstr ""
@@ -7453,9 +7444,6 @@ msgstr ""
msgid "ClusterIntegration|Manage your Kubernetes cluster by visiting %{provider_link}"
msgstr ""
-msgid "ClusterIntegration|ModSecurity enabled"
-msgstr ""
-
msgid "ClusterIntegration|Namespace per environment"
msgstr ""
@@ -7552,9 +7540,6 @@ msgstr ""
msgid "ClusterIntegration|Read our %{link_start}help page%{link_end} on Kubernetes cluster integration."
msgstr ""
-msgid "ClusterIntegration|Real-time web application monitoring, logging and access control. %{linkStart}More information%{linkEnd}"
-msgstr ""
-
msgid "ClusterIntegration|Remove Kubernetes cluster integration"
msgstr ""
@@ -7693,9 +7678,6 @@ msgstr ""
msgid "ClusterIntegration|Send Container Network Policies Logs"
msgstr ""
-msgid "ClusterIntegration|Send Web Application Firewall Logs"
-msgstr ""
-
msgid "ClusterIntegration|Service Token"
msgstr ""
@@ -7708,9 +7690,6 @@ msgstr ""
msgid "ClusterIntegration|Set a prefix for your namespaces. If not set, defaults to your project path. If modified, existing environments will use their current namespaces until the cluster cache is cleared."
msgstr ""
-msgid "ClusterIntegration|Set the global mode for the WAF in this cluster. This can be overridden at the environmental level."
-msgstr ""
-
msgid "ClusterIntegration|Something went wrong on our end."
msgstr ""
@@ -33720,9 +33699,6 @@ msgstr ""
msgid "ThreatMonitoring|Anomalous Requests"
msgstr ""
-msgid "ThreatMonitoring|Application firewall not detected"
-msgstr ""
-
msgid "ThreatMonitoring|Container Network Policies are not installed or have been disabled. To view this data, ensure your Network Policies are installed and enabled for your cluster."
msgstr ""
@@ -33801,9 +33777,6 @@ msgstr ""
msgid "ThreatMonitoring|Status"
msgstr ""
-msgid "ThreatMonitoring|The firewall is not installed or has been disabled. To view this data, ensure the web application firewall is installed and enabled for your cluster."
-msgstr ""
-
msgid "ThreatMonitoring|There was an error displaying the alerts. Confirm your endpoint's configuration details to ensure alerts appear."
msgstr ""
@@ -33834,12 +33807,6 @@ msgstr ""
msgid "ThreatMonitoring|View documentation"
msgstr ""
-msgid "ThreatMonitoring|Web Application Firewall"
-msgstr ""
-
-msgid "ThreatMonitoring|While it's rare to have no traffic coming to your application, it can happen. In any event, we ask that you double check your settings to make sure you've set up the WAF correctly."
-msgstr ""
-
msgid "Throughput"
msgstr ""
@@ -36556,9 +36523,6 @@ msgstr ""
msgid "We've found no vulnerabilities"
msgstr ""
-msgid "Web Application Firewall"
-msgstr ""
-
msgid "Web IDE"
msgstr ""
diff --git a/spec/frontend/clusters/components/applications_spec.js b/spec/frontend/clusters/components/applications_spec.js
index db5915cb1ebd54ad1bcbf1ee1eed8f85ba27e3d6..e371ad998d24c0445ded91e78104c8c21444b8eb 100644
--- a/spec/frontend/clusters/components/applications_spec.js
+++ b/spec/frontend/clusters/components/applications_spec.js
@@ -3,7 +3,6 @@ import ApplicationRow from '~/clusters/components/application_row.vue';
import Applications from '~/clusters/components/applications.vue';
import CrossplaneProviderStack from '~/clusters/components/crossplane_provider_stack.vue';
import FluentdOutputSettings from '~/clusters/components/fluentd_output_settings.vue';
-import IngressModsecuritySettings from '~/clusters/components/ingress_modsecurity_settings.vue';
import KnativeDomainEditor from '~/clusters/components/knative_domain_editor.vue';
import { CLUSTER_TYPE, PROVIDER_TYPE } from '~/clusters/constants';
import eventHub from '~/clusters/event_hub';
@@ -185,24 +184,6 @@ describe('Applications', () => {
expect(findByTestId('ingressCostWarning').element).toMatchSnapshot();
});
- describe('with nested component', () => {
- const propsData = {
- applications: {
- ingress: {
- title: 'Ingress',
- status: 'installed',
- },
- },
- };
-
- beforeEach(() => createShallowComponent(propsData));
-
- it('renders IngressModsecuritySettings', () => {
- const modsecuritySettings = wrapper.find(IngressModsecuritySettings);
- expect(modsecuritySettings.exists()).toBe(true);
- });
- });
-
describe('when installed', () => {
describe('with ip address', () => {
it('renders ip address with a clipboard button', () => {
@@ -231,7 +212,6 @@ describe('Applications', () => {
title: 'Ingress',
status: 'installed',
externalHostname: 'localhost.localdomain',
- modsecurity_enabled: false,
},
cert_manager: { title: 'Cert-Manager' },
crossplane: { title: 'Crossplane', stack: '' },
diff --git a/spec/frontend/clusters/components/fluentd_output_settings_spec.js b/spec/frontend/clusters/components/fluentd_output_settings_spec.js
index 2c6e5bbd46a3193477d6bb63d107b2550bf41c6f..fdb67a0426a4adbd5f9ffabc5483b1791b6397f9 100644
--- a/spec/frontend/clusters/components/fluentd_output_settings_spec.js
+++ b/spec/frontend/clusters/components/fluentd_output_settings_spec.js
@@ -13,7 +13,6 @@ describe('FluentdOutputSettings', () => {
protocol: 'tcp',
host: '127.0.0.1',
port: 514,
- wafLogEnabled: true,
ciliumLogEnabled: false,
};
const defaultProps = {
@@ -52,9 +51,8 @@ describe('FluentdOutputSettings', () => {
const changePort = (val) => changeInput(findPort(), val);
const changeHost = (val) => changeInput(findHost(), val);
const changeProtocol = (idx) => findProtocolDropdown().vm.$children[idx].$emit('click');
- const toApplicationSettings = ({ wafLogEnabled, ciliumLogEnabled, ...settings }) => ({
+ const toApplicationSettings = ({ ciliumLogEnabled, ...settings }) => ({
...settings,
- waf_log_enabled: wafLogEnabled,
cilium_log_enabled: ciliumLogEnabled,
});
@@ -74,7 +72,6 @@ describe('FluentdOutputSettings', () => {
${'when protocol dropdown is triggered'} | ${() => changeProtocol(1)} | ${'protocol'} | ${'udp'}
${'when host is changed'} | ${() => changeHost('test-host')} | ${'host'} | ${'test-host'}
${'when port is changed'} | ${() => changePort(123)} | ${'port'} | ${123}
- ${'when wafLogEnabled changes'} | ${() => changeCheckbox(findCheckbox('Send Web Application Firewall Logs'))} | ${'wafLogEnabled'} | ${!defaultSettings.wafLogEnabled}
${'when ciliumLogEnabled changes'} | ${() => changeCheckbox(findCheckbox('Send Container Network Policies Logs'))} | ${'ciliumLogEnabled'} | ${!defaultSettings.ciliumLogEnabled}
`('$desc', ({ changeFn, key, value }) => {
beforeEach(() => {
diff --git a/spec/frontend/clusters/components/ingress_modsecurity_settings_spec.js b/spec/frontend/clusters/components/ingress_modsecurity_settings_spec.js
deleted file mode 100644
index f83a350a27c9ceaf355d28e9d6b192c6282487cb..0000000000000000000000000000000000000000
--- a/spec/frontend/clusters/components/ingress_modsecurity_settings_spec.js
+++ /dev/null
@@ -1,192 +0,0 @@
-import { GlAlert, GlToggle, GlDropdown } from '@gitlab/ui';
-import { shallowMount } from '@vue/test-utils';
-import IngressModsecuritySettings from '~/clusters/components/ingress_modsecurity_settings.vue';
-import { APPLICATION_STATUS, INGRESS } from '~/clusters/constants';
-import eventHub from '~/clusters/event_hub';
-
-const { UPDATING } = APPLICATION_STATUS;
-
-describe('IngressModsecuritySettings', () => {
- let wrapper;
-
- const defaultProps = {
- modsecurity_enabled: false,
- status: 'installable',
- installed: false,
- modsecurity_mode: 'logging',
- updateAvailable: false,
- };
-
- const createComponent = (props = defaultProps) => {
- wrapper = shallowMount(IngressModsecuritySettings, {
- propsData: {
- ingress: {
- ...defaultProps,
- ...props,
- },
- },
- });
- };
-
- const findSaveButton = () =>
- wrapper.find('[data-qa-selector="save_ingress_modsecurity_settings"]');
- const findCancelButton = () =>
- wrapper.find('[data-qa-selector="cancel_ingress_modsecurity_settings"]');
- const findModSecurityToggle = () => wrapper.find(GlToggle);
- const findModSecurityDropdown = () => wrapper.find(GlDropdown);
-
- describe('when ingress is installed', () => {
- beforeEach(() => {
- createComponent({ installed: true, status: 'installed' });
- jest.spyOn(eventHub, '$emit');
- });
-
- it('does not render save and cancel buttons', () => {
- expect(findSaveButton().exists()).toBe(false);
- expect(findCancelButton().exists()).toBe(false);
- });
-
- describe('with toggle changed by the user', () => {
- beforeEach(() => {
- findModSecurityToggle().vm.$emit('change');
- wrapper.setProps({
- ingress: {
- ...defaultProps,
- installed: true,
- status: 'installed',
- modsecurity_enabled: true,
- },
- });
- });
-
- it('renders toggle with label', () => {
- expect(findModSecurityToggle().props('label')).toBe(
- IngressModsecuritySettings.i18n.modSecurityEnabled,
- );
- });
-
- it('renders save and cancel buttons', () => {
- expect(findSaveButton().exists()).toBe(true);
- expect(findCancelButton().exists()).toBe(true);
- });
-
- it('enables related toggle and buttons', () => {
- expect(findSaveButton().attributes().disabled).toBeUndefined();
- expect(findCancelButton().attributes().disabled).toBeUndefined();
- });
-
- describe('with dropdown changed by the user', () => {
- beforeEach(() => {
- findModSecurityDropdown().vm.$children[1].$emit('click');
- wrapper.setProps({
- ingress: {
- ...defaultProps,
- installed: true,
- status: 'installed',
- modsecurity_enabled: true,
- modsecurity_mode: 'blocking',
- },
- });
- });
-
- it('renders both save and cancel buttons', () => {
- expect(findSaveButton().exists()).toBe(true);
- expect(findCancelButton().exists()).toBe(true);
- });
-
- describe('and the save changes button is clicked', () => {
- beforeEach(() => {
- findSaveButton().vm.$emit('click');
- });
-
- it('triggers save event and pass current modsecurity value', () => {
- expect(eventHub.$emit).toHaveBeenCalledWith('updateApplication', {
- id: INGRESS,
- params: { modsecurity_enabled: true, modsecurity_mode: 'blocking' },
- });
- });
- });
- });
-
- describe('and the cancel button is clicked', () => {
- beforeEach(() => {
- findCancelButton().vm.$emit('click');
- });
-
- it('triggers reset event and hides both cancel and save changes button', () => {
- expect(eventHub.$emit).toHaveBeenCalledWith('resetIngressModSecurityChanges', INGRESS);
- expect(findSaveButton().exists()).toBe(false);
- expect(findCancelButton().exists()).toBe(false);
- });
- });
-
- describe('with a new version available', () => {
- beforeEach(() => {
- wrapper.setProps({
- ingress: {
- ...defaultProps,
- installed: true,
- status: 'installed',
- modsecurity_enabled: true,
- updateAvailable: true,
- },
- });
- });
-
- it('disables related toggle and buttons', () => {
- expect(findSaveButton().attributes().disabled).toBe('true');
- expect(findCancelButton().attributes().disabled).toBe('true');
- });
- });
- });
-
- it('triggers set event to be propagated with the current modsecurity value', () => {
- wrapper.setData({ modSecurityEnabled: true });
- return wrapper.vm.$nextTick().then(() => {
- expect(eventHub.$emit).toHaveBeenCalledWith('setIngressModSecurityEnabled', {
- id: INGRESS,
- modSecurityEnabled: true,
- });
- });
- });
-
- describe(`when ingress status is ${UPDATING}`, () => {
- beforeEach(() => {
- createComponent({ installed: true, status: UPDATING });
- });
-
- it('renders loading spinner in save button', () => {
- expect(findSaveButton().props('loading')).toBe(true);
- });
-
- it('renders disabled save button', () => {
- expect(findSaveButton().props('disabled')).toBe(true);
- });
-
- it('renders save button with "Saving" label', () => {
- expect(findSaveButton().text()).toBe('Saving');
- });
- });
-
- describe('when ingress fails to update', () => {
- beforeEach(() => {
- createComponent({ updateFailed: true });
- });
-
- it('displays a error message', () => {
- expect(wrapper.find(GlAlert).exists()).toBe(true);
- });
- });
- });
-
- describe('when ingress is not installed', () => {
- beforeEach(() => {
- createComponent();
- });
-
- it('does not render the save button', () => {
- expect(findSaveButton().exists()).toBe(false);
- expect(findModSecurityToggle().props('value')).toBe(false);
- });
- });
-});
diff --git a/spec/frontend/clusters/services/mock_data.js b/spec/frontend/clusters/services/mock_data.js
index 4f8b27d623cf15a1e280de628e9847b69cc2c697..6ab94d6d95b3d8078d24373377d485e771cb4100 100644
--- a/spec/frontend/clusters/services/mock_data.js
+++ b/spec/frontend/clusters/services/mock_data.js
@@ -20,7 +20,6 @@ const CLUSTERS_MOCK_DATA = {
external_ip: null,
external_hostname: null,
can_uninstall: false,
- modsecurity_enabled: false,
},
{
name: 'runner',
@@ -154,7 +153,6 @@ const APPLICATIONS_MOCK_STATE = {
ingress: {
title: 'Ingress',
status: 'installable',
- modsecurity_enabled: false,
},
crossplane: { title: 'Crossplane', status: 'installable', stack: '' },
cert_manager: { title: 'Cert-Manager', status: 'installable' },
diff --git a/spec/frontend/clusters/stores/clusters_store_spec.js b/spec/frontend/clusters/stores/clusters_store_spec.js
index c80949531c82ce221c281fc679d87b92a02d5cdc..8fa373349b8cb25a2547b323b75896ab2ae75fc1 100644
--- a/spec/frontend/clusters/stores/clusters_store_spec.js
+++ b/spec/frontend/clusters/stores/clusters_store_spec.js
@@ -84,16 +84,12 @@ describe('Clusters Store', () => {
externalHostname: null,
installable: true,
installed: false,
- isEditingModSecurityEnabled: false,
- isEditingModSecurityMode: false,
installFailed: true,
uninstallable: false,
updateFailed: false,
uninstallSuccessful: false,
uninstallFailed: false,
validationError: null,
- modsecurity_enabled: false,
- modsecurity_mode: undefined,
},
runner: {
title: 'GitLab Runner',
@@ -143,7 +139,6 @@ describe('Clusters Store', () => {
uninstallSuccessful: false,
uninstallFailed: false,
validationError: null,
- wafLogEnabled: null,
},
jupyter: {
title: 'JupyterHub',