From 51687eee080618778dc34237d4a3326838a750e0 Mon Sep 17 00:00:00 2001 From: Adam Leff Date: Wed, 7 Dec 2016 17:45:40 -0500 Subject: update org name regex to match Chef Server's Signed-off-by: Adam Leff --- lib/chef/data_collector/messages/helpers.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chef/data_collector/messages/helpers.rb b/lib/chef/data_collector/messages/helpers.rb index a56ea4e829..f42ddaaa4e 100644 --- a/lib/chef/data_collector/messages/helpers.rb +++ b/lib/chef/data_collector/messages/helpers.rb @@ -76,7 +76,7 @@ class Chef def chef_server_organization return "unknown_organization" unless Chef::Config[:chef_server_url] - Chef::Config[:chef_server_url].match(%r{/+organizations/+([\w-]+)}).nil? ? "unknown_organization" : $1 + Chef::Config[:chef_server_url].match(%r{/+organizations/+([a-z0-9][a-z0-9_-]{0,254})}).nil? ? "unknown_organization" : $1 end # -- cgit v1.2.1