add expiration validation

devops-service/db/mongo/models/deploy_env_base.rb

@@ -21,10 +21,8 @@ class DeployEnvBase < MongoModel
   def validate!
     super
     Validators::DeployEnv::RunList.new(self).validate!
+    Validators::DeployEnv::Expiration.new(self).validate!
 
-    unless self.expires.nil?
-      check_expires!(self.expires)
-    end
     check_users!(self.users)
   end
 

devops-service/db/validators/all.rb

@@ -4,5 +4,5 @@ module Validators
 end
 
 require "db/validators/base"
-require "db/validators/helpers/run_list"
+Dir["db/validators/helpers/*.rb"].each {|file| require file }
-require "db/validators/deploy_env/run_list"
+Dir["db/validators/deploy_env/*.rb"].each {|file| require file }

devops-service/db/validators/deploy_env/expiration.rb

@@ -0,0 +1,16 @@
+module Validators
+  class DeployEnv::Expiration < Base
+
+    def valid?
+      if @model.expires
+        @model.expires.match(/^[0-9]+[smhdw]$/)
+      else
+        true
+      end
+    end
+
+    def message
+      "Parameter 'expires' is invalid. Valid format: [0-9]+[smhdw] or null."
+    end
+  end
+end