Commit afbe48aa authored by Siddharth Asthana's avatar Siddharth Asthana Committed by Kerri Miller

Fix Gitlab/DelegatePredicateMethods offenses

parent 70a1dc76
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
Gitlab/DelegatePredicateMethods: Gitlab/DelegatePredicateMethods:
Exclude: Exclude:
- app/models/clusters/cluster.rb - app/models/clusters/cluster.rb
- app/models/clusters/platforms/kubernetes.rb
- app/models/concerns/ci/metadatable.rb - app/models/concerns/ci/metadatable.rb
- app/models/concerns/diff_positionable_note.rb - app/models/concerns/diff_positionable_note.rb
- app/models/concerns/integrations/base_data_fields.rb - app/models/concerns/integrations/base_data_fields.rb
......
...@@ -50,12 +50,6 @@ module Clusters ...@@ -50,12 +50,6 @@ module Clusters
alias_attribute :ca_pem, :ca_cert alias_attribute :ca_pem, :ca_cert
delegate :enabled?, to: :cluster, allow_nil: true
delegate :provided_by_user?, to: :cluster, allow_nil: true
delegate :allow_user_defined_namespace?, to: :cluster, allow_nil: true
alias_method :active?, :enabled?
enum_with_nil authorization_type: { enum_with_nil authorization_type: {
unknown_authorization: nil, unknown_authorization: nil,
rbac: 1, rbac: 1,
...@@ -66,6 +60,19 @@ module Clusters ...@@ -66,6 +60,19 @@ module Clusters
nullify_if_blank :namespace nullify_if_blank :namespace
def enabled?
!!cluster&.enabled?
end
alias_method :active?, :enabled?
def provided_by_user?
!!cluster&.provided_by_user?
end
def allow_user_defined_namespace?
!!cluster&.allow_user_defined_namespace?
end
def predefined_variables(project:, environment_name:, kubernetes_namespace: nil) def predefined_variables(project:, environment_name:, kubernetes_namespace: nil)
Gitlab::Ci::Variables::Collection.new.tap do |variables| Gitlab::Ci::Variables::Collection.new.tap do |variables|
variables.append(key: 'KUBE_URL', value: api_url) variables.append(key: 'KUBE_URL', value: api_url)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment