From 64d481ae2f2a6eb289709d89c8db8fa8bb4a4a4b Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Mon, 22 May 2023 11:02:25 +0700 Subject: [PATCH] Revert "fix(stacks): confirm enable tls verification [EE-5410]" (#8972) --- .../kubernetes-redeploy-app-git-form.controller.js | 8 -------- .../stack-redeploy-git-form.controller.js | 14 ++------------ app/react/portainer/gitops/utils.ts | 10 ---------- 3 files changed, 2 insertions(+), 30 deletions(-) diff --git a/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.controller.js b/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.controller.js index e4eff1ca6..e18232f34 100644 --- a/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.controller.js +++ b/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.controller.js @@ -4,7 +4,6 @@ import { buildConfirmButton } from '@@/modals/utils'; import { ModalType } from '@@/modals'; import { parseAutoUpdateResponse } from '@/react/portainer/gitops/AutoUpdateFieldset/utils'; import { baseStackWebhookUrl, createWebhookId } from '@/portainer/helpers/webhookHelper'; -import { confirmEnableTLSVerify } from '@/react/portainer/gitops/utils'; class KubernetesRedeployAppGitFormController { /* @ngInject */ @@ -72,13 +71,6 @@ class KubernetesRedeployAppGitFormController { onChangeTLSSkipVerify(value) { return this.$async(async () => { - if (this.stack.GitConfig.TLSSkipVerify && !value) { - const confirmed = await confirmEnableTLSVerify(); - - if (!confirmed) { - return; - } - } this.onChange({ TLSSkipVerify: value }); }); } diff --git a/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.controller.js b/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.controller.js index 8fc48e276..4e436c208 100644 --- a/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.controller.js +++ b/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.controller.js @@ -4,7 +4,6 @@ import { confirmStackUpdate } from '@/react/docker/stacks/common/confirm-stack-u import { parseAutoUpdateResponse } from '@/react/portainer/gitops/AutoUpdateFieldset/utils'; import { baseStackWebhookUrl, createWebhookId } from '@/portainer/helpers/webhookHelper'; -import { confirmEnableTLSVerify } from '@/react/portainer/gitops/utils'; class StackRedeployGitFormController { /* @ngInject */ @@ -96,17 +95,8 @@ class StackRedeployGitFormController { this.onChange({ Env: value }); } - async onChangeTLSSkipVerify(value) { - return this.$async(async () => { - if (this.model.TLSSkipVerify && !value) { - const confirmed = await confirmEnableTLSVerify(); - - if (!confirmed) { - return; - } - } - this.onChange({ TLSSkipVerify: value }); - }); + onChangeTLSSkipVerify(value) { + this.onChange({ TLSSkipVerify: value }); } onChangeOption(values) { diff --git a/app/react/portainer/gitops/utils.ts b/app/react/portainer/gitops/utils.ts index 2b5157890..676756f55 100644 --- a/app/react/portainer/gitops/utils.ts +++ b/app/react/portainer/gitops/utils.ts @@ -1,5 +1,3 @@ -import { confirm } from '@@/modals/confirm'; - import { GitFormModel } from './types'; export function getAuthentication( @@ -20,11 +18,3 @@ export function getAuthentication( password: model.RepositoryPassword, }; } - -export function confirmEnableTLSVerify() { - return confirm({ - title: 'Enable TLS Verification?', - message: - 'Enabling the verification of TLS certificates without ensuring the correct configuration of your Certificate Authority (CA) for self-signed certificates can result in deployment failures.', - }); -}