Add latest changes from gitlab-org/gitlab@master

1 files changed, 25 insertions, 0 deletions

diff --git a/app/models/concerns/clusters/agents/authorization_config_scopes.rb b/app/models/concerns/clusters/agents/authorization_config_scopes.rb
new file mode 100644
index 00000000000..0a0406c3389
--- /dev/null
+++ b/app/models/concerns/clusters/agents/authorization_config_scopes.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Clusters
+  module Agents
+    module AuthorizationConfigScopes
+      extend ActiveSupport::Concern
+
+      included do
+        scope :with_available_ci_access_fields, ->(project) {
+          where("config->'access_as' IS NULL")
+            .or(where("config->'access_as' = '{}'"))
+            .or(where("config->'access_as' ?| array[:fields]", fields: available_ci_access_fields(project)))
+        }
+      end
+
+      class_methods do
+        def available_ci_access_fields(_project)
+          %w(agent)
+        end
+      end
+    end
+  end
+end
+
+Clusters::Agents::AuthorizationConfigScopes.prepend_mod