Merge pull request #1115 from Kuermel/master

Increase of the role-name length to 40
voxpupuli · Dec 1, 2021 · b1ab9c2 · b1ab9c2
2 parents 243abb5 + 61ddce4
commit b1ab9c2
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/lib/puppet/type/elasticsearch_role.rb b/lib/puppet/type/elasticsearch_role.rb
@@ -6,7 +6,7 @@
   newparam(:name, :namevar => true) do
     desc 'Role name.'
 
-    newvalues(/^[a-zA-Z_]{1}[-\w@.$]{0,29}$/)
+    newvalues(/^[a-zA-Z_]{1}[-\w@.$]{0,39}$/)
   end
 
   newproperty(:privileges) do

diff --git a/lib/puppet/type/elasticsearch_role_mapping.rb b/lib/puppet/type/elasticsearch_role_mapping.rb
@@ -6,7 +6,7 @@
   newparam(:name, :namevar => true) do
     desc 'Role name.'
 
-    newvalues(/^[a-zA-Z_]{1}[-\w@.$]{0,29}$/)
+    newvalues(/^[a-zA-Z_]{1}[-\w@.$]{0,39}$/)
   end
 
   newproperty(:mappings, :array_matching => :all) do

diff --git a/manifests/role.pp b/manifests/role.pp
@@ -32,7 +32,7 @@
   Array                     $mappings   = [],
   Hash                      $privileges = {},
 ) {
-  validate_slength($name, 30, 1)
+  validate_slength($name, 40, 1)
 
   if empty($privileges) or $ensure == 'absent' {
     $_role_ensure = 'absent'

diff --git a/spec/defines/008_elasticsearch_role_spec.rb b/spec/defines/008_elasticsearch_role_spec.rb
@@ -39,7 +39,7 @@ class { 'elasticsearch': }
 
       context 'with an invalid role name' do
         context 'too long' do
-          let(:title) { 'A' * 31 }
+          let(:title) { 'A' * 41 }
           it { should raise_error(Puppet::Error, /expected length/i) }
         end
       end

diff --git a/spec/unit/type/elasticsearch_role_mapping_spec.rb b/spec/unit/type/elasticsearch_role_mapping_spec.rb
@@ -44,7 +44,7 @@
     describe 'name' do
       it 'should reject long role names' do
         expect { described_class.new(
-          :name => 'a' * 31
+          :name => 'a' * 41
         ) }.to raise_error(
           Puppet::ResourceError,
           /valid values/i

diff --git a/spec/unit/type/elasticsearch_role_spec.rb b/spec/unit/type/elasticsearch_role_spec.rb
@@ -44,7 +44,7 @@
     describe 'name' do
       it 'should reject long role names' do
         expect { described_class.new(
-          :name => 'a' * 31
+          :name => 'a' * 41
         ) }.to raise_error(
           Puppet::ResourceError,
           /valid values/i