Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop deprecated apache_pw_hash, apache::apache_pw_hash and bool2httpd #2513

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Drop deprecated apache_pw_hash, apache::apache_pw_hash and bool2httpd #2513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 0 additions & 57 deletions REFERENCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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`
Expand Down
12 changes: 0 additions & 12 deletions lib/puppet/functions/apache/apache_pw_hash.rb
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions lib/puppet/functions/apache_pw_hash.rb
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions lib/puppet/functions/bool2httpd.rb
View file
Open in desktop

This file was deleted.

12 changes: 1 addition & 11 deletions spec/functions/bool2httpd_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) }
Expand All @@ -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
16 changes: 1 addition & 15 deletions spec/functions/pw_hash_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) }
Expand All @@ -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