diff --git a/devops-service/db/mongo/models/stack/stack_base.rb b/devops-service/db/mongo/models/stack/stack_base.rb index a6bea8c..cf118e5 100644 --- a/devops-service/db/mongo/models/stack/stack_base.rb +++ b/devops-service/db/mongo/models/stack/stack_base.rb @@ -19,37 +19,37 @@ module Devops run_list: {type: Array, value_type: String, empty: true, nil: true} # details: {type: Hash, nil: true} # Hash type isn't supported yet - set_field_validators :id, ::Validators::FieldValidator::NotNil, + set_field_validators :id, [::Validators::FieldValidator::NotNil, ::Validators::FieldValidator::FieldType::String, - ::Validators::FieldValidator::NotEmpty + ::Validators::FieldValidator::NotEmpty] - set_field_validators :provider, ::Validators::FieldValidator::NotNil, + set_field_validators :provider, [::Validators::FieldValidator::NotNil, ::Validators::FieldValidator::FieldType::String, - ::Validators::FieldValidator::NotEmpty + ::Validators::FieldValidator::NotEmpty] - set_field_validators :project, ::Validators::FieldValidator::NotNil, + set_field_validators :project, [::Validators::FieldValidator::NotNil, ::Validators::FieldValidator::FieldType::String, - ::Validators::FieldValidator::NotEmpty + ::Validators::FieldValidator::NotEmpty] - set_field_validators :deploy_env, ::Validators::FieldValidator::NotNil, + set_field_validators :deploy_env, [::Validators::FieldValidator::NotNil, ::Validators::FieldValidator::FieldType::String, - ::Validators::FieldValidator::NotEmpty + ::Validators::FieldValidator::NotEmpty] - set_field_validators :stack_template, ::Validators::FieldValidator::NotNil, + set_field_validators :stack_template, [::Validators::FieldValidator::NotNil, ::Validators::FieldValidator::FieldType::String, - ::Validators::FieldValidator::NotEmpty + ::Validators::FieldValidator::NotEmpty] - set_field_validators :name, ::Validators::FieldValidator::Nil, + set_field_validators :name, [::Validators::FieldValidator::Nil, ::Validators::FieldValidator::FieldType::String, - ::Validators::FieldValidator::NotEmpty + ::Validators::FieldValidator::NotEmpty] - set_field_validators :owner, ::Validators::FieldValidator::NotNil, + set_field_validators :owner, [::Validators::FieldValidator::NotNil, ::Validators::FieldValidator::FieldType::String, - ::Validators::FieldValidator::NotEmpty + ::Validators::FieldValidator::NotEmpty] - set_field_validators :run_list, ::Validators::FieldValidator::NotNil, + set_field_validators :run_list, [::Validators::FieldValidator::NotNil, ::Validators::FieldValidator::FieldType::Array, - ::Validators::FieldValidator::RunList + ::Validators::FieldValidator::RunList] def initialize attrs={} # self.provider = self.class.provider diff --git a/devops-service/db/mongo/models/stack_template/stack_template_base.rb b/devops-service/db/mongo/models/stack_template/stack_template_base.rb index 6e43166..2bdfb1e 100644 --- a/devops-service/db/mongo/models/stack_template/stack_template_base.rb +++ b/devops-service/db/mongo/models/stack_template/stack_template_base.rb @@ -16,22 +16,22 @@ module Devops template_body: {type: String, empty: false}, owner: {type: String, empty: false} - set_field_validators :id, ::Validators::FieldValidator::NotNil, + set_field_validators :id, [::Validators::FieldValidator::NotNil, ::Validators::FieldValidator::FieldType::String, - ::Validators::FieldValidator::NotEmpty, + ::Validators::FieldValidator::NotEmpty,] ::Validators::FieldValidator::Name - set_field_validators :provider, ::Validators::FieldValidator::NotNil, + set_field_validators :provider, [::Validators::FieldValidator::NotNil, ::Validators::FieldValidator::FieldType::String, - ::Validators::FieldValidator::NotEmpty + ::Validators::FieldValidator::NotEmpty] - set_field_validators :template_body, ::Validators::FieldValidator::NotNil, + set_field_validators :template_body, [::Validators::FieldValidator::NotNil, ::Validators::FieldValidator::FieldType::String, - ::Validators::FieldValidator::NotEmpty + ::Validators::FieldValidator::NotEmpty] - set_field_validators :owner, ::Validators::FieldValidator::NotNil, + set_field_validators :owner, [::Validators::FieldValidator::NotNil, ::Validators::FieldValidator::FieldType::String, - ::Validators::FieldValidator::NotEmpty + ::Validators::FieldValidator::NotEmpty] set_validators ::Validators::StackTemplate::TemplateContent