Skip to content

Commit d34f651

Browse files
committed
Drop deprecated apache_pw_hash, apache::apache_pw_hash and bool2httpd
1 parent 4b316af commit d34f651

File tree

6 files changed

+2
-119
lines changed

6 files changed

+2
-119
lines changed

REFERENCE.md

-57
Original file line numberDiff line numberDiff line change
@@ -156,12 +156,9 @@ outside of the defaults.
156156

157157
### Functions
158158

159-
* [`apache::apache_pw_hash`](#apache--apache_pw_hash): DEPRECATED. Use the function [`apache::pw_hash`](#apachepw_hash) instead.
160159
* [`apache::authz_core_config`](#apache--authz_core_config): Function to generate the authz_core configuration directives.
161160
* [`apache::bool2httpd`](#apache--bool2httpd): Transform a supposed boolean to On or Off. Passes all other values through.
162161
* [`apache::pw_hash`](#apache--pw_hash): Hashes a password in a format suitable for htpasswd files read by apache.
163-
* [`apache_pw_hash`](#apache_pw_hash): DEPRECATED. Use the namespaced function [`apache::pw_hash`](#apachepw_hash) instead.
164-
* [`bool2httpd`](#bool2httpd): DEPRECATED. Use the namespaced function [`apache::bool2httpd`](#apachebool2httpd) instead.
165162

166163
### Data types
167164

@@ -11033,24 +11030,6 @@ Default value: `false`
1103311030

1103411031
## Functions
1103511032

11036-
### <a name="apache--apache_pw_hash"></a>`apache::apache_pw_hash`
11037-
11038-
Type: Ruby 4.x API
11039-
11040-
DEPRECATED. Use the function [`apache::pw_hash`](#apachepw_hash) instead.
11041-
11042-
#### `apache::apache_pw_hash(Any *$args)`
11043-
11044-
The apache::apache_pw_hash function.
11045-
11046-
Returns: `Any`
11047-
11048-
##### `*args`
11049-
11050-
Data type: `Any`
11051-
11052-
11053-
1105411033
### <a name="apache--authz_core_config"></a>`apache::authz_core_config`
1105511034

1105611035
Type: Ruby 4.x API
@@ -11212,42 +11191,6 @@ Data type: `String[1]`
1121211191

1121311192
The input that is to be hashed.
1121411193

11215-
### <a name="apache_pw_hash"></a>`apache_pw_hash`
11216-
11217-
Type: Ruby 4.x API
11218-
11219-
DEPRECATED. Use the namespaced function [`apache::pw_hash`](#apachepw_hash) instead.
11220-
11221-
#### `apache_pw_hash(Any *$args)`
11222-
11223-
The apache_pw_hash function.
11224-
11225-
Returns: `Any`
11226-
11227-
##### `*args`
11228-
11229-
Data type: `Any`
11230-
11231-
11232-
11233-
### <a name="bool2httpd"></a>`bool2httpd`
11234-
11235-
Type: Ruby 4.x API
11236-
11237-
DEPRECATED. Use the namespaced function [`apache::bool2httpd`](#apachebool2httpd) instead.
11238-
11239-
#### `bool2httpd(Any *$args)`
11240-
11241-
The bool2httpd function.
11242-
11243-
Returns: `Any`
11244-
11245-
##### `*args`
11246-
11247-
Data type: `Any`
11248-
11249-
11250-
1125111194
## Data types
1125211195

1125311196
### <a name="Apache--LogLevel"></a>`Apache::LogLevel`

lib/puppet/functions/apache/apache_pw_hash.rb

-12
This file was deleted.

lib/puppet/functions/apache_pw_hash.rb

-12
This file was deleted.

lib/puppet/functions/bool2httpd.rb

-12
This file was deleted.

spec/functions/bool2httpd_spec.rb

+1-11
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require 'spec_helper'
44

5-
shared_examples 'apache::bool2httpd function' do
5+
describe 'apache::bool2httpd' do
66
it { is_expected.not_to eq(nil) }
77
it { is_expected.to run.with_params.and_raise_error(ArgumentError) }
88
it { is_expected.to run.with_params('1', '2').and_raise_error(ArgumentError) }
@@ -25,13 +25,3 @@
2525
it { is_expected.to run.with_params(:undef).and_return('Off') }
2626
it { is_expected.to run.with_params('foo').and_return('foo') }
2727
end
28-
29-
describe 'apache::bool2httpd' do
30-
it_behaves_like 'apache::bool2httpd function'
31-
32-
describe 'deprecated non-namespaced shim' do
33-
describe 'bool2httpd', type: :puppet_function do
34-
it_behaves_like 'apache::bool2httpd function'
35-
end
36-
end
37-
end

spec/functions/pw_hash_spec.rb

+1-15
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require 'spec_helper'
44

5-
shared_examples 'apache::pw_hash function' do
5+
describe 'apache::pw_hash' do
66
it { is_expected.not_to eq(nil) }
77
it { is_expected.to run.with_params.and_raise_error(ArgumentError) }
88
it { is_expected.to run.with_params('').and_raise_error(ArgumentError) }
@@ -12,17 +12,3 @@
1212
it { is_expected.to run.with_params([]).and_raise_error(ArgumentError) }
1313
it { is_expected.to run.with_params('test').and_return('{SHA}qUqP5cyxm6YcTAhz05Hph5gvu9M=') }
1414
end
15-
16-
describe 'apache::pw_hash' do
17-
it_behaves_like 'apache::pw_hash function'
18-
19-
describe 'deprecated shims' do
20-
describe 'apache_pw_hash', type: :puppet_function do
21-
it_behaves_like 'apache::pw_hash function'
22-
end
23-
24-
describe 'apache::apache_pw_hash', type: :puppet_function do
25-
it_behaves_like 'apache::pw_hash function'
26-
end
27-
end
28-
end

0 commit comments

Comments
 (0)