summaryrefslogtreecommitdiff
path: root/app/validators
diff options
context:
space:
mode:
authorMayra Cabrera <mcabrera@gitlab.com>2019-03-29 18:23:18 +0000
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-03-29 18:23:18 +0000
commitab06d1eda2fa222b4de400d2b18eab611ffefa68 (patch)
tree978ed57b01da01e1187db25f0423e2ada85550b7 /app/validators
parent0df75d241a5054a19086dca29cca4d65ac1736fe (diff)
downloadgitlab-ce-ab06d1eda2fa222b4de400d2b18eab611ffefa68.tar.gz
Renames Cluster#managed? to provided_by_user?
This will allow to user the term managed? on https://gitlab.com/gitlab-org/gitlab-ce/issues/56557. Managed? will be used to distinct clusters that are automatically managed by GitLab
Diffstat (limited to 'app/validators')
-rw-r--r--app/validators/cluster_name_validator.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/app/validators/cluster_name_validator.rb b/app/validators/cluster_name_validator.rb
index 85fd63f08e5..79c9c67ae58 100644
--- a/app/validators/cluster_name_validator.rb
+++ b/app/validators/cluster_name_validator.rb
@@ -5,7 +5,9 @@
# Custom validator for ClusterName.
class ClusterNameValidator < ActiveModel::EachValidator
def validate_each(record, attribute, value)
- if record.managed?
+ if record.provided_by_user?
+ record.errors.add(attribute, " has to be present") unless value.present?
+ else
if record.persisted? && record.name_changed?
record.errors.add(attribute, " can not be changed because it's synchronized with provider")
end
@@ -17,10 +19,6 @@ class ClusterNameValidator < ActiveModel::EachValidator
unless value =~ Gitlab::Regex.kubernetes_namespace_regex
record.errors.add(attribute, Gitlab::Regex.kubernetes_namespace_regex_message)
end
- else
- unless value.present?
- record.errors.add(attribute, " has to be present")
- end
end
end
end