Skip to content

remove deprecated validate_ functions #36

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

Open
nomennesc-io wants to merge 1 commit into
base: master
Choose a base branch
from
Open

remove deprecated validate_ functions #36

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
24 changes: 10 additions & 14 deletions manifests/project.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,23 +50,19 @@
#

define composer::project (
$ensure = present,
$source = undef,
$target = $title,
$dev = false,
$prefer = 'dist',
$scripts = true,
$custom_inst = true,
$lock = false,
$user = 'root',
$php_bin = '',
Enum['present','installed','latest'] $ensure = present,
Enum['dist','source'] $prefer = 'dist',
Boolean $dev = false,
Boolean $scripts = true,
Boolean $custom_inst = true,
$source = undef,
$target = $title,
$lock = false,
$user = 'root',
$php_bin = '',
) {
include composer

validate_re($ensure, '^(present|installed|latest)$', '$ensure must be one of present or latest.')
validate_re($prefer, '^(dist|source)$', '$prefer can only be one of source or dist. See `composer install --help`.')
validate_bool($dev, $scripts, $custom_inst)

$composer = strip("${php_bin} ${composer::target_dir}/${composer::command_name}")
$base_opts = '--no-interaction --quiet --no-progress'

Expand Down
16 changes: 6 additions & 10 deletions manifests/repository.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,15 @@
#

define composer::repository (
$ensure = present,
$type = undef,
$url = undef,
$target = undef,
$global = false,
$user = 'root',
Enum['present','absent'] $ensure = present,
Enum['composer','vcs','pear','package'] $type = undef,
Boolean $global = false,
$url = undef,
$target = undef,
$user = 'root',
) {
include composer

validate_re($ensure, '^(present|absent)$', 'composer::repository::ensure must be one of present or absent.')
validate_re($type, '^(composer|vcs|pear|package)$', 'composer::repository::type must be one of composer, vcs, pear or package.')
validate_bool($global)

if !$url {
fail('composer::repository::url must be set')
}
Expand Down
7 changes: 4 additions & 3 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"dependencies": [
{
"name": "puppetlabs-stdlib",
"version_requirement": ">= 8.0.0 <= 9.0.0"
"version_requirement": ">= 8.0.0 <= 9.7.0"
},
{
"name": "puppet-archive",
"version_requirement": ">= 1.0.0 <= 2.0.0"
"version_requirement": ">= 1.0.0 <= 7.1.0"
}
],
"operatingsystem_support": [
Expand Down Expand Up @@ -57,7 +57,8 @@
"operatingsystem": "Debian",
"operatingsystemrelease": [
"10",
"11"
"11",
"12"
]
},
{
Expand Down