From 59a37392c20ed09a398766b4705cbefffe236323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20C=CC=8Cavoj?= <mcavoj@gitlab.com>
Date: Mon, 29 Jan 2024 12:47:52 +0100
Subject: [PATCH] Update policy type param for editing to use approval_policy
Changelog: changed
EE: true
---
.../graphql/resolvers/concerns/construct_security_policies.rb | 2 +-
.../security_policies/scan_result_policy_resolver_spec.rb | 2 +-
.../security_orchestration/scan_result_policy_resolver_spec.rb | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ee/app/graphql/resolvers/concerns/construct_security_policies.rb b/ee/app/graphql/resolvers/concerns/construct_security_policies.rb
index 26640ca3c163e..e144ccb0be863 100644
--- a/ee/app/graphql/resolvers/concerns/construct_security_policies.rb
+++ b/ee/app/graphql/resolvers/concerns/construct_security_policies.rb
@@ -29,7 +29,7 @@ def construct_scan_result_policies(policies)
{
name: policy[:name],
description: policy[:description],
- edit_path: edit_path(policy, :scan_result_policy),
+ edit_path: edit_path(policy, :approval_policy),
enabled: policy[:enabled],
yaml: YAML.dump(policy.slice(*POLICY_YAML_ATTRIBUTES).deep_stringify_keys),
updated_at: policy[:config].policy_last_updated_at,
diff --git a/ee/spec/graphql/resolvers/compliance_management/security_policies/scan_result_policy_resolver_spec.rb b/ee/spec/graphql/resolvers/compliance_management/security_policies/scan_result_policy_resolver_spec.rb
index b6c52fb01d0e4..6bba39941b9c1 100644
--- a/ee/spec/graphql/resolvers/compliance_management/security_policies/scan_result_policy_resolver_spec.rb
+++ b/ee/spec/graphql/resolvers/compliance_management/security_policies/scan_result_policy_resolver_spec.rb
@@ -41,7 +41,7 @@
name: policy[:name],
description: policy[:description],
edit_path: Gitlab::Routing.url_helpers.edit_project_security_policy_url(
- project, id: CGI.escape(policy[:name]), type: 'scan_result_policy'
+ project, id: CGI.escape(policy[:name]), type: 'approval_policy'
),
enabled: policy[:enabled],
yaml: YAML.dump(policy.deep_stringify_keys),
diff --git a/ee/spec/graphql/resolvers/security_orchestration/scan_result_policy_resolver_spec.rb b/ee/spec/graphql/resolvers/security_orchestration/scan_result_policy_resolver_spec.rb
index b02cc856c22af..0c0199318d3ce 100644
--- a/ee/spec/graphql/resolvers/security_orchestration/scan_result_policy_resolver_spec.rb
+++ b/ee/spec/graphql/resolvers/security_orchestration/scan_result_policy_resolver_spec.rb
@@ -15,7 +15,7 @@
name: 'Require security approvals',
description: 'This policy considers only container scanning and critical severities',
edit_path: Gitlab::Routing.url_helpers.edit_project_security_policy_url(
- project, id: CGI.escape(policy[:name]), type: 'scan_result_policy'
+ project, id: CGI.escape(policy[:name]), type: 'approval_policy'
),
enabled: true,
yaml: YAML.dump(policy.deep_stringify_keys),
--
GitLab