Fix rubocop errors

Author: moleske

app/actions/app_apply_manifest.rb

@@ -136,7 +136,7 @@ def validate_name_dns_compliant!(name)
 
       error!(prefix + ' Host cannot exceed 63 characters') if name.present? && name.length > 63
 
-      return if name&.match(/\A[\w\-]+\z/)
+      return if name&.match(/\A[\w-]+\z/)
 
       error!(prefix + ' Host must be either "*" or contain only alphanumeric characters, "_", or "-"')
     end

app/messages/domain_create_message.rb

@@ -45,7 +45,7 @@ def self.relationships_requested?
 
     validates :name,
               format: {
-                with: /\A^([^\.]{0,63}\.)*[^\.]{0,63}$\Z/,
+                with: /\A^([^.]{0,63}\.)*[^.]{0,63}$\Z/,
                 message: 'subdomains must each be at most 63 characters'
               }
 
@@ -74,7 +74,7 @@ def router_group_guid
     private
 
     def alpha_numeric
-      return unless /[^a-z0-9\-\.]/i.match?(name.to_s)
+      return unless /[^a-z0-9\-.]/i.match?(name.to_s)
 
       errors.add(:name, 'must consist of alphanumeric characters and hyphens')
     end

app/messages/metadata_validator_helper.rb

@@ -8,7 +8,7 @@ class MetadataValidatorHelper
     MAX_METADATA_KEY_SIZE = 63
     MAX_METADATA_PREFIX_SIZE = 253
 
-    INVALID_CHAR_REGEX = /[^\w\-\.]/
+    INVALID_CHAR_REGEX = /[^\w\-.]/
     ALPHANUMERIC_START_END_REGEX = /\A(?=[a-zA-Z\d]).*[a-zA-Z\d]\z/
 
     RESERVED_DOMAIN = 'cloudfoundry.org'.freeze

app/messages/route_create_message.rb

@@ -25,7 +25,7 @@ def self.options_requested?
                 maximum: MAXIMUM_DOMAIN_LABEL_LENGTH
               },
               format: {
-                with: /\A([\w\-]+|\*)?\z/,
+                with: /\A([\w-]+|\*)?\z/,
                 message: 'must be either "*" or contain only alphanumeric characters, "_", or "-"'
               }
 

app/models/helpers/metadata_helpers.rb

@@ -2,7 +2,7 @@ module VCAP::CloudController
   class MetadataHelpers
     KEY_SEPARATOR = '/'.freeze
     REQUIREMENT_SPLITTER = /(?:\(.*?\)|[^,])+/
-    KEY_CHARACTERS = %r{[\w\-\.\_\/]+}
+    KEY_CHARACTERS = %r{[\w\-._/]+}
 
     IN_PATTERN = /\A(?<key>.*?) in \((?<values>.*)\)\z/                     # foo in (bar,baz)
     NOT_IN_PATTERN = /\A(?<key>.*?) notin \((?<values>.*)\)\z/              # funky notin (uptown,downtown)

app/models/runtime/route.rb

@@ -109,7 +109,7 @@ def validate
 
       errors.add(:host, :presence) if host.nil?
 
-      validates_format(/\A([\w\-]+|\*)\z/, :host) if host && !host.empty?
+      validates_format(/\A([\w-]+|\*)\z/, :host) if host && !host.empty?
 
       validate_uniqueness_on_host_and_domain if path.empty? && port.nil?
       validate_uniqueness_on_host_domain_and_port if path.empty?

lib/cloud_controller/domain_decorator.rb

@@ -1,6 +1,6 @@
 module CloudController
   class DomainDecorator
-    DOMAIN_REGEX = /\A(([a-z0-9]|[a-z0-9][a-z0-9\-]{0,61}[a-z0-9])\.)+([a-z0-9]|[a-z0-9][a-z0-9\-]{0,61}[a-z0-9])\Z/ix
+    DOMAIN_REGEX = /\A(([a-z0-9]|[a-z0-9][a-z0-9-]{0,61}[a-z0-9])\.)+([a-z0-9]|[a-z0-9][a-z0-9-]{0,61}[a-z0-9])\Z/ix
     DOMAIN_DELIMITER = '.'.freeze
 
     attr_reader :name

lib/utils/uri_utils.rb

@@ -4,8 +4,8 @@ module UriUtils
   SSH_REGEX = %r{ \A (?:ssh://)? git@ .+? : .+? \.git \z }x
   GIT_REGEX = %r{ \A git:// .+? : .+? \.git \z }x
   DOCKER_INDEX_SERVER = 'docker.io'.freeze
-  DOCKER_PATH_REGEX = %r{\A[a-z0-9_\-\.\/]{2,255}\Z}
-  DOCKER_TAG_REGEX = /[a-zA-Z0-9_\-\.]{1,128}/
+  DOCKER_PATH_REGEX = %r{\A[a-z0-9_\-./]{2,255}\Z}
+  DOCKER_TAG_REGEX = /[a-zA-Z0-9_\-.]{1,128}/
   DOCKER_DIGEST_REGEX = /sha256:[a-z0-9]{64}/
   DOCKER_TAG_DIGEST_REGEX = Regexp.new("\\A(#{DOCKER_TAG_REGEX.source} |
 (#{DOCKER_TAG_REGEX.source}@#{DOCKER_DIGEST_REGEX.source}) | #{DOCKER_DIGEST_REGEX.source})\\Z", Regexp::EXTENDED)
@@ -36,7 +36,7 @@ def self.is_cnb_buildpack_uri?(candidate)
   end
 
   def self.is_uri_path?(candidate)
-    !!(candidate.is_a?(String) && candidate =~ %r{^(?:/|/([^\s/][\S]*)?)$})
+    !!(candidate.is_a?(String) && candidate =~ %r{^(?:/|/([^\s/]\S*)?)$})
   end
 
   # This escapes only the values in queries.

middleware/vcap_request_id.rb

@@ -28,7 +28,7 @@ def external_request_id(env)
         request_id = env['HTTP_X_VCAP_REQUEST_ID'].presence || env['HTTP_X_REQUEST_ID'].presence
         return unless request_id
 
-        "#{request_id.gsub(/[^\w\-]/, '').first(255)}::#{SecureRandom.uuid}"
+        "#{request_id.gsub(/[^\w-]/, '').first(255)}::#{SecureRandom.uuid}"
       end
 
       def internal_request_id

spec/support/time_helpers.rb

@@ -7,6 +7,6 @@ def iso8601
 
   # https://gist.github.com/marcelotmelo/b67f58a08bee6c2468f8
   def rfc3339
-    /^([0-9]+)-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])[Tt]([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(([Zz])|([\+|\-]([01][0-9]|2[0-3]):[0-5][0-9]))$/
+    /^([0-9]+)-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])[Tt]([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(([Zz])|([+|-]([01][0-9]|2[0-3]):[0-5][0-9]))$/
   end
 end