Drop deprecated apache_pw_hash, apache::apache_pw_hash and bool2httpd

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

Hide file tree

Showing 6 changed files with 2 additions and 119 deletions.
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -156,12 +156,9 @@ outside of the defaults.
 
 ### Functions
 
-* [`apache::apache_pw_hash`](#apache--apache_pw_hash): DEPRECATED.  Use the function [`apache::pw_hash`](#apachepw_hash) instead.
 * [`apache::authz_core_config`](#apache--authz_core_config): Function to generate the authz_core configuration directives.
 * [`apache::bool2httpd`](#apache--bool2httpd): Transform a supposed boolean to On or Off. Passes all other values through.
 * [`apache::pw_hash`](#apache--pw_hash): Hashes a password in a format suitable for htpasswd files read by apache.
-* [`apache_pw_hash`](#apache_pw_hash): DEPRECATED.  Use the namespaced function [`apache::pw_hash`](#apachepw_hash) instead.
-* [`bool2httpd`](#bool2httpd): DEPRECATED.  Use the namespaced function [`apache::bool2httpd`](#apachebool2httpd) instead.
 
 ### Data types
 
@@ -11033,24 +11030,6 @@ Default value: `false`
 
 ## Functions
 
-### <a name="apache--apache_pw_hash"></a>`apache::apache_pw_hash`
-
-Type: Ruby 4.x API
-
-DEPRECATED.  Use the function [`apache::pw_hash`](#apachepw_hash) instead.
-
-#### `apache::apache_pw_hash(Any *$args)`
-
-The apache::apache_pw_hash function.
-
-Returns: `Any`
-
-##### `*args`
-
-Data type: `Any`
-
-
-
 ### <a name="apache--authz_core_config"></a>`apache::authz_core_config`
 
 Type: Ruby 4.x API
@@ -11212,42 +11191,6 @@ Data type: `String[1]`
 
 The input that is to be hashed.
 
-### <a name="apache_pw_hash"></a>`apache_pw_hash`
-
-Type: Ruby 4.x API
-
-DEPRECATED.  Use the namespaced function [`apache::pw_hash`](#apachepw_hash) instead.
-
-#### `apache_pw_hash(Any *$args)`
-
-The apache_pw_hash function.
-
-Returns: `Any`
-
-##### `*args`
-
-Data type: `Any`
-
-
-
-### <a name="bool2httpd"></a>`bool2httpd`
-
-Type: Ruby 4.x API
-
-DEPRECATED.  Use the namespaced function [`apache::bool2httpd`](#apachebool2httpd) instead.
-
-#### `bool2httpd(Any *$args)`
-
-The bool2httpd function.
-
-Returns: `Any`
-
-##### `*args`
-
-Data type: `Any`
-
-
-
 ## Data types
 
 ### <a name="Apache--LogLevel"></a>`Apache::LogLevel`

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