components/ruby/mcollective/patches/03-mco-service-name
author saurabh.vyas@oracle.com
Tue, 22 Mar 2016 12:01:24 -0700
changeset 5643 ccf9fb8a1db9
child 5860 afd31ba91ee9
permissions -rw-r--r--
PSARC/2016/037 Common MCollective agents 21940478 Add MCollective plugins to userland gate
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5643
ccf9fb8a1db9 PSARC/2016/037 Common MCollective agents
saurabh.vyas@oracle.com
parents:
diff changeset
     1
--- mcollective-service-agent-75478ac81f80bfd5ebaab05fe5dc5b92d90af815/validator/service_name.rb.orig	2016-03-03 12:06:59.523158420 -0800
ccf9fb8a1db9 PSARC/2016/037 Common MCollective agents
saurabh.vyas@oracle.com
parents:
diff changeset
     2
+++ mcollective-service-agent-75478ac81f80bfd5ebaab05fe5dc5b92d90af815/validator/service_name.rb	2016-03-03 12:07:26.197744202 -0800
ccf9fb8a1db9 PSARC/2016/037 Common MCollective agents
saurabh.vyas@oracle.com
parents:
diff changeset
     3
@@ -2,7 +2,7 @@
ccf9fb8a1db9 PSARC/2016/037 Common MCollective agents
saurabh.vyas@oracle.com
parents:
diff changeset
     4
   module Validator
ccf9fb8a1db9 PSARC/2016/037 Common MCollective agents
saurabh.vyas@oracle.com
parents:
diff changeset
     5
     class Service_nameValidator
ccf9fb8a1db9 PSARC/2016/037 Common MCollective agents
saurabh.vyas@oracle.com
parents:
diff changeset
     6
       def self.validate(service_name)
ccf9fb8a1db9 PSARC/2016/037 Common MCollective agents
saurabh.vyas@oracle.com
parents:
diff changeset
     7
-        raise("%s is not a valid service name" % service_name) unless !!(service_name =~ /\A^[a-zA-Z\.\-_\d]+$\z/)
ccf9fb8a1db9 PSARC/2016/037 Common MCollective agents
saurabh.vyas@oracle.com
parents:
diff changeset
     8
+        raise("%s is not a valid service name" % service_name) unless !!(service_name =~ /\A^[a-zA-Z\.\-_\d\:\/]+$\z/)
ccf9fb8a1db9 PSARC/2016/037 Common MCollective agents
saurabh.vyas@oracle.com
parents:
diff changeset
     9
       end
ccf9fb8a1db9 PSARC/2016/037 Common MCollective agents
saurabh.vyas@oracle.com
parents:
diff changeset
    10
     end
ccf9fb8a1db9 PSARC/2016/037 Common MCollective agents
saurabh.vyas@oracle.com
parents:
diff changeset
    11
   end