Drop deprecated apache_pw_hash, apache::apache_pw_hash and bool2httpd

puppetlabs · Jan 2, 2024 · f6d1e13 · f6d1e13
1 parent 4b316af
commit f6d1e13
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 62 deletions.
diff --git a/lib/puppet/functions/apache/apache_pw_hash.rb b/lib/puppet/functions/apache/apache_pw_hash.rb
diff --git a/lib/puppet/functions/apache_pw_hash.rb b/lib/puppet/functions/apache_pw_hash.rb
diff --git a/lib/puppet/functions/bool2httpd.rb b/lib/puppet/functions/bool2httpd.rb
diff --git a/spec/functions/bool2httpd_spec.rb b/spec/functions/bool2httpd_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-shared_examples 'apache::bool2httpd function' do
+describe 'apache::bool2httpd' do
   it { is_expected.not_to eq(nil) }
   it { is_expected.to run.with_params.and_raise_error(ArgumentError) }
   it { is_expected.to run.with_params('1', '2').and_raise_error(ArgumentError) }
@@ -25,13 +25,3 @@
   it { is_expected.to run.with_params(:undef).and_return('Off') }
   it { is_expected.to run.with_params('foo').and_return('foo') }
 end
-
-describe 'apache::bool2httpd' do
-  it_behaves_like 'apache::bool2httpd function'
-
-  describe 'deprecated non-namespaced shim' do
-    describe 'bool2httpd', type: :puppet_function do
-      it_behaves_like 'apache::bool2httpd function'
-    end
-  end
-end
diff --git a/spec/functions/pw_hash_spec.rb b/spec/functions/pw_hash_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-shared_examples 'apache::pw_hash function' do
+describe 'apache::pw_hash' do
   it { is_expected.not_to eq(nil) }
   it { is_expected.to run.with_params.and_raise_error(ArgumentError) }
   it { is_expected.to run.with_params('').and_raise_error(ArgumentError) }
@@ -12,17 +12,3 @@
   it { is_expected.to run.with_params([]).and_raise_error(ArgumentError) }
   it { is_expected.to run.with_params('test').and_return('{SHA}qUqP5cyxm6YcTAhz05Hph5gvu9M=') }
 end
-
-describe 'apache::pw_hash' do
-  it_behaves_like 'apache::pw_hash function'
-
-  describe 'deprecated shims' do
-    describe 'apache_pw_hash', type: :puppet_function do
-      it_behaves_like 'apache::pw_hash function'
-    end
-
-    describe 'apache::apache_pw_hash', type: :puppet_function do
-      it_behaves_like 'apache::pw_hash function'
-    end
-  end
-end